convert debian packaging to dependency package

We can later bring the bbdb3 source code into this package.

25 files changed, 31 insertions, 1253 deletions

diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index 06ae927..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,64 +0,0 @@
-To enable bbdb support add a call to bbdb-initialize in your .emacs:
-
-bbdb-initialize is a compiled Lisp function in `bbdb'.
-(bbdb-initialize &rest TO-INSINUATE)
-
-*Initialize the BBDB.  One or more of the following symbols can be
-passed as arguments to initiate the appropriate insinuations.
-
- Initialization of mail/news readers:
-
-   Gnus       Initialize BBDB support for the Gnus version 3.14 or
-              older.
-   gnus       Initialize BBDB support for the Gnus mail/news reader
-              version 3.15 or newer.  If you pass the `gnus' symbol,
-              you should probably also pass the `message' symbol.
-   mh-e       Initialize BBDB support for the MH-E mail reader.
-   rmail      Initialize BBDB support for the RMAIL mail reader.
-   sendmail   Initialize BBDB support for sendmail (M-x mail).
-   vm         Initialize BBDB support for the VM mail reader.
-              NOTE: For the VM insinuation to work properly, you must
-              either call `bbdb-initialize' with the `vm' symbol from
-              within your VM initialization file ("~/.vm") or you
-              must call `bbdb-insinuate-vm' manually from within your
-              VM initialization file.
-
- Initialization of miscellaneous package:
-
-   message    Initialize BBDB support for Message mode.
-   reportmail Initialize BBDB support for the Reportmail mail
-              notification package.
-   sc         Initialize BBDB support for the Supercite message
-              citation package.
-   w3         Initialize BBDB support for Web browsers.
-
----+++---
-
-In bits.tar.gz is the bits/ Subdir of the bbdb-Source packaged.
-The README there states this:
-
-This is the collection of bits and pieces located on the net or mailed to me
-by various folk that may or may not wind up in BBDB proper. They shouldn't
-be considered part of the bbdb as-is, nor should you complain to me about
-their failure to work.
-
-Look at it if you find something useful. If there is enough demand for some of the
-files i can install them with bbdb. Just ask me. :)
-
- -- Barak A. Pearlmutter <bap@debian.org>, Sat, 19 Mar 2011 16:16:09 +0000
-
-
-Trying to bring up-to-date, and make compatible with Emacs23 RMAIL.
-
-Brought into git; see debian/README.source for details.
-
-The default upstream build process compiles the .el files, and
-therefore needs a working emacs.  The debian packaging process leaves
-this to install time, so at build time we do not actually need an
-emacs.  But the configure script looks for one anyway, in order to
-produce a proper lisp/Makefile, whose execution is however deferred
-until installation time.  Tweaking things to cause configuration to
-not bail when no emacs is present is more trouble than just requiring
-one at build time.  So that's what we do.
-
- -- Barak A. Pearlmutter <bap@debian.org>, Sat, 19 Mar 2011 16:11:11 +0000
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 717bdcc..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,45 +0,0 @@
-bbdb for Debian
----------------
-
-The upstream site on sourceforge is moribund: no one seems to have write access to CVS.
-
-I've therefore imported the sources in git.
-
-Originally imported via:
- git cvsimport -v -C bbdb -s -k -u -a bbdb -d :pserver:anonymous@bbdb.cvs.sourceforge.net:/cvsroot/bbdb
-on 17-Nov-2009
-
-The -s -k was a bug, as it substitutes "-k" for "/" in tags, oops,
-thus disabling the -k, double oops.
-
-Manually merged Debian patches and tagged Debian releases.
-
-Note that the upstream CVS repo did not contain the ./configure file,
-while the upstream .orig tarballs do.  I have left these out.
-
-Because of the bad options on the original import, the it was re-done
-with corrected options.  At this time, proper identity translation was
-also done.  This means that the file .git/cvs-authors (or the file
-passed via -A to git-cvsimport) should contain:
-
-    bbdb-writer=Ronan Waide <waider@waider.ie>
-    drv=Didier Verna <didier@xemacs.org>
-    fenk=Robert Fenk <fenk@users.sourceforge.net>
-    kensanata=Alex Schroeder <kensanata@yahoo.com>
-    kuepper=Jochen Küpper <bbdb@jochen-kuepper.de>
-    sds=Sam Steingold <sds@goems.com>
-    shenghuo=ShengHuo ZHU <zsh@cs.rochester.edu>
-    simmonmt=Matt Simmons <simmonmt@acm.org>
-    waider=Ronan Waide <waider@waider.ie>
-    winkler=Roland Winkler <winkler@gnu.org>
-
-The old imported tree is abandoned, but still present in the
-repository due to release tags.  New work should be done on the
-re-done import tree.
-
-To do an incremental update with upstream changes:
- cd src/git/BBDB
- (make sure branch origin exists, i.e., if necessary: git branch origin origin/origin)
- git cvsimport -v -k -u -a bbdb -d :pserver:anonymous@bbdb.cvs.sourceforge.net:/cvsroot/bbdb
-
- -- Barak A. Pearlmutter <bap@debian.org>, Sat, 19 Mar 2011 16:18:15 +0000
diff --git a/debian/bbdb-areacode-split.1 b/debian/bbdb-areacode-split.1
deleted file mode 100644
index 8410d5f..0000000
--- a/debian/bbdb-areacode-split.1
+++ /dev/null
@@ -1,46 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH BBDB-AREACODE-SPLIT.PL 1 "March 31, 2002"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-bbdb-areacode-split \- Looks for phone numbers in your .bbdb
-.SH SYNOPSIS
-.B bbdb-areacode-split
-<old-code> <new-code> <exchanges-file> [bbdb]
-.SH DESCRIPTION
-Looks for phone numbers in your .bbdb with a particular area code
-and one of a set of exchanges and changes the area code.  The old
-and new area codes are specified on the command line, as is the
-location of a file that contains the exchanges that are being
-changed.  (The format of that file is very loose.  Every three digit
-sequence will be used.)
-
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-Instead, it has documentation in the GNU Info format; see below.
-.SH SEE ALSO
-.BR bbdb-cid (1),
-.BR bbdb-unlazy-lock (1).
-.BR bbdb-srv (1).
-.br
-The bbdb is fully documented by
-.IR "The insidious Big Brother Database for mail and news" ,
-available via the Infonode
-.BR bbdb
-.
-.SH AUTHOR
-This manual page was written by Joerg Jaspert (JJ) <joerg@goliathbbs.dnsalias.net>,
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/bbdb-cid.1 b/debian/bbdb-cid.1
deleted file mode 100644
index 4280dbd..0000000
--- a/debian/bbdb-cid.1
+++ /dev/null
@@ -1,45 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH BBDB-CID.PL 1 "March 31, 2002"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-bbdb-cid \- Caller-ID-logger
-.SH SYNOPSIS
-.B bbdb-cid
-.SH DESCRIPTION
-Opens the modem and waits for it to print caller-ID data.  When it does,
-it logs it to a file, parses it, and pops up a window using "xmessage".
-If the number is present in your .bbdb file, it shows the name (or company)
-associated with it.  
-
-.IR "You have to edit the Skript and change it to fit into your System!"
-
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-Instead, it has documentation in the GNU Info format; see below.
-.SH SEE ALSO
-.BR bbdb-areacode-split (1),
-.BR bbdb-unlazy-lock (1).
-.BR bbdb-srv (1).
-.br
-The bbdb is fully documented by
-.IR "The insidious Big Brother Database for mail and news" ,
-available via the Infonode
-.BR bbdb
-.
-.SH AUTHOR
-This manual page was written by Joerg Jaspert (JJ) <joerg@goliathbbs.dnsalias.net>,
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/bbdb-pilot-jwz.el b/debian/bbdb-pilot-jwz.el
deleted file mode 100644
index 00458da..0000000
--- a/debian/bbdb-pilot-jwz.el
+++ /dev/null
@@ -1,582 +0,0 @@
-;;; bbdb-pilot-jwz.el --- bbdb to palmos address book conduit
-
-;; Copyright (C) 1999 Jamie Zawinski <jwz@jwz.org>, all rights reserved.
-
-;; Maintainer: Noah Friedman <friedman@splode.com>
-;; Created: 2000-01-21
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
-
-;;; Commentary:
-
-;; pilot-addresses expects a file with the following 19 fields:
-;;
-;;    Last Name
-;;    First Name
-;;    Title
-;;    Company
-;;    Named Field 1 (default: Work)
-;;    Named Field 2 (default: Home)
-;;    Named Field 3 (default: Fax)
-;;    Named Field 4 (default: Other)
-;;    Named Field 5 (default: E-mail)
-;;    Address
-;;    City
-;;    State
-;;    Zip
-;;    Country
-;;    Custom 1
-;;    Custom 2
-;;    Custom 3
-;;    Custom 4
-;;    Note
-;;
-;; The "named fields" are the ones that have a field title that can be set
-;; with a popup menu.  The available titles are:
-;;
-;;    Work
-;;    Home
-;;    Fax
-;;    Other
-;;    E-mail
-;;    Main
-;;    Pager
-;;    Mobile
-;;
-;; A record in the file consists of 19 fields followed by a newline.
-;; Field values are enclosed in double-quotes and are separated by commas.
-;; The "named" fields may also be preceeded by the field name and a
-;; semicolon, e.g.:
-;;    "Home";"(415) 555-1212",
-;;
-;; Strings may contain newlines, and are read with backslash-decoding
-;; (for \n, \t and so on.)
-;;
-;; Embedded quotes are double-quoted in csv output, e.g. " -> ""
-
-;;; Code:
-
-(require 'bbdb)
-(require 'cl)
-
-(defconst bbdb-pilot-field-names
-  '["Work" "Home" "Fax" "Other" "E-mail" "Main" "Pager" "Mobile"])
-
-;; `title' is in this list since, if present, it is handled specially and
-;; we do not want to duplicate it in the notes section of each entry.
-;; But it's still a user-defined "notes" field as far as bbdb is concerned.
-(defconst bbdb-pilot-ignored-notes
-  '(mail-name mail-alias face mark-char title creation-date timestamp))
-
-
-(bbdb-defstruct bbdb-pilot-
-  lastname		; 1
-  firstname		; 2
-  title			; 3
-  company		; 4
-  name-1 value-1	; 5
-  name-2 value-2	; 6
-  name-3 value-3	; 7
-  name-4 value-4	; 8
-  name-5 value-5	; 9
-  address		; 10
-  city			; 11
-  state			; 12
-  zip			; 13
-  country		; 14
-  custom-1		; 15
-  custom-2		; 16
-  custom-3		; 17
-  custom-4		; 18
-  note			; 19
-  )
-
-
-(defun bbdb-pilot-format (pilot)
-  "Inserts a `pilot-addresses'-compatible description of the `pilot' struct
-into the current buffer."
-  (let ((print-escape-newlines nil)
-        (print-escape-nonascii nil)
-        (standard-output (current-buffer)))
-    (save-restriction
-      (narrow-to-region (point) (point))
-      (prin1 (or (bbdb-pilot-lastname  pilot) ""))      (insert ",")
-      (prin1 (or (bbdb-pilot-firstname pilot) ""))      (insert ",")
-      (prin1 (or (bbdb-pilot-title     pilot) ""))      (insert ",")
-      (prin1 (or (bbdb-pilot-company   pilot) ""))      (insert ",")
-
-      (prin1 (or (bbdb-pilot-name-1    pilot) "Other")) (insert ";")
-      (prin1 (or (bbdb-pilot-value-1   pilot) ""))      (insert ",")
-
-      (prin1 (or (bbdb-pilot-name-2    pilot) "Other")) (insert ";")
-      (prin1 (or (bbdb-pilot-value-2   pilot) ""))      (insert ",")
-
-      (prin1 (or (bbdb-pilot-name-3    pilot) "Other")) (insert ";")
-      (prin1 (or (bbdb-pilot-value-3   pilot) ""))      (insert ",")
-
-      (prin1 (or (bbdb-pilot-name-4    pilot) "Other")) (insert ";")
-      (prin1 (or (bbdb-pilot-value-4   pilot) ""))      (insert ",")
-
-      (prin1 (or (bbdb-pilot-name-5    pilot) "Other")) (insert ";")
-      (prin1 (or (bbdb-pilot-value-5   pilot) ""))      (insert ",")
-
-      (prin1 (or (bbdb-pilot-address   pilot) ""))      (insert ",")
-      (prin1 (or (bbdb-pilot-city      pilot) ""))      (insert ",")
-      (prin1 (or (bbdb-pilot-state     pilot) ""))      (insert ",")
-      (prin1 (or (bbdb-pilot-zip       pilot) ""))      (insert ",")
-      (prin1 (or (bbdb-pilot-country   pilot) ""))      (insert ",")
-      (prin1 (or (bbdb-pilot-custom-1  pilot) ""))      (insert ",")
-      (prin1 (or (bbdb-pilot-custom-2  pilot) ""))      (insert ",")
-      (prin1 (or (bbdb-pilot-custom-3  pilot) ""))      (insert ",")
-      (prin1 (or (bbdb-pilot-custom-4  pilot) ""))      (insert ",")
-      (prin1 (or (bbdb-pilot-note      pilot) ""))      (insert "\n")
-
-      ;; Replace escaped double quotes (\") with "".
-      (goto-char (point-min))
-      (while (re-search-forward "\\\\\"" nil t)
-        (replace-match "\"\"" nil t))
-      (goto-char (point-max))))
-  nil)
-
-
-(defun bbdb-pilot-pretty-print (pilot)
-  ;; for debugging
-  (let ((i 0)
-        (names '["lastname" "firstname" "title" "company"
-                 "name-1" "value-1" "name-2" "value-2" "name-3" "value-3"
-                 "name-4" "value-4" "name-5" "value-5" "address" "city"
-                 "state" "zip" "country" "custom-1" "custom-2" "custom-3"
-                 "custom-4" "note"]))
-    (while (< i bbdb-pilot-length)
-      (insert (format "%12s: " (aref names i)))
-      (let ((s (aref pilot i))
-            (print-escape-newlines t))
-        (if (null s) (setq s ""))
-        (insert (format "%S\n" s)))
-      (setq i (1+ i))))
-  nil)
-
-
-(defun bbdb-record-to-pilot-record (record)
-  "Converts a BBDB record to a Pilot record."
-  (let ((pilot (make-vector bbdb-pilot-length nil))
-        (phones (bbdb-record-phones record))
-        (notes (bbdb-record-raw-notes record)))
-
-    (if (stringp notes)
-        (setq notes (list (cons 'notes notes)))
-      ;; may be destructively modified later
-      (setq notes (copy-alist notes)))
-
-    (if (bbdb-record-aka record)
-        (setq notes
-              (append notes
-                      (list (cons 'AKA
-                                  (mapconcat 'identity
-                                             (bbdb-record-aka record)
-                                             ",\n"))))))
-
-    ;; These fields are easy...
-    ;;
-    (bbdb-pilot-set-lastname  pilot (bbdb-record-lastname record))
-    (bbdb-pilot-set-firstname pilot (bbdb-record-firstname record))
-    (bbdb-pilot-set-title     pilot (bbdb-record-getprop record 'title))
-    (bbdb-pilot-set-company   pilot (bbdb-record-company record))
-
-    ;; Now do the phone numbers...
-    ;;
-    (let ((pilot-phones '()))
-      (while phones
-        (let ((loc (bbdb-phone-location (car phones)))
-              (num (bbdb-phone-string (car phones)))
-              field)
-          (cond ((string-match "\\b\\(work\\|office\\)" loc)
-                 (setq field "Work"))
-                ((string-match "\\b\\(home\\)" loc)
-                 (setq field "Home"))
-                ((string-match "\\b\\(fax\\|facs?imile\\)" loc)
-                 (setq field "Fax"))
-                ((string-match "\\b\\(pager?\\|beeper\\)" loc)
-                 (setq field "Pager"))
-                ((string-match "\\b\\(cell\\|mobile\\)" loc)
-                 (setq field "Mobile"))
-                ((string-match "\\b\\(voice\\|main\\|phone\\)\\b" loc)
-                 (setq field "Main"))
-                (t
-                 ;; If we don't recognise the phone label, then call it
-                 ;; "Other" but preserve the original label in the field
-                 ;; itself.
-                 (setq field "Other"
-                       num (concat loc ": " num))))
-
-          ;; If this phone number is the same type as one previously seen
-          ;; (e.g. there are two pager numbers), append with a newline to
-          ;; the existing entry.  This makes it possible to group multiple
-          ;; numbers in the same pilot field and make room for more numbers
-          ;; of different loc types.
-          (let ((seen (assoc field pilot-phones)))
-            (if seen
-                (setcdr seen (concat (cdr seen) "\n" num))
-              (setq pilot-phones (cons (cons field num) pilot-phones))))
-          (setq phones (cdr phones))))
-      (setq pilot-phones (nreverse pilot-phones))
-
-      ;; The email field goes last in the list of phone fields
-      (if (bbdb-record-net record)
-          (let ((c (cons "E-mail" (car (bbdb-record-net record)))))
-            (setq pilot-phones (nconc pilot-phones (list c)))))
-
-      (if (cdr (bbdb-record-net record))
-          (setq notes
-                (cons (cons 'other-email
-                            (mapconcat 'identity
-                                       (cdr (bbdb-record-net record))
-                                       ",\n"))
-                      notes)))
-
-      (let (pp)
-        (setq pp (pop pilot-phones))
-        (bbdb-pilot-set-name-1  pilot (car pp))
-        (bbdb-pilot-set-value-1 pilot (cdr pp))
-
-        (setq pp (pop pilot-phones))
-        (bbdb-pilot-set-name-2  pilot (car pp))
-        (bbdb-pilot-set-value-2 pilot (cdr pp))
-
-        (setq pp (pop pilot-phones))
-        (bbdb-pilot-set-name-3  pilot (car pp))
-        (bbdb-pilot-set-value-3 pilot (cdr pp))
-
-        ;; We've filled in three phone-number fields.
-        ;; If there are more than 2 phone numbers left (not counting the
-        ;; email field), put remaining numbers in 4th field (with their
-        ;; headings) and put the email address in the 5th field.
-        (cond ((< (length pilot-phones) 3)
-               (setq pp (pop pilot-phones))
-               (bbdb-pilot-set-name-4  pilot (car pp))
-               (bbdb-pilot-set-value-4 pilot (cdr pp))
-
-               (setq pp (pop pilot-phones))
-               (bbdb-pilot-set-name-5  pilot (car pp))
-               (bbdb-pilot-set-value-5 pilot (cdr pp)))
-              (t
-               (let* ((email (assoc "E-mail" pilot-phones))
-                      (val
-                       (mapconcat
-                        #'(lambda (pp)
-                            (let ((p 0) s)
-                              ;; If there are newlines in the data, make sure
-                              ;; each new line begins with the field name
-                              ;; since this record is heterogenous.
-                              (while (string-match "\n" (cdr pp) p)
-                                (setq s (concat "\n" (car pp) ": "))
-                                (setq p (+ (match-end 0) (length s)))
-                                (setcdr pp (replace-match s t t (cdr pp)))))
-                            (concat (car pp) ": " (cdr pp)))
-                        (delq email pilot-phones) "\n")))
-                 (bbdb-pilot-set-name-4  pilot "Other")
-                 (bbdb-pilot-set-value-4 pilot val)
-
-                 (bbdb-pilot-set-name-5  pilot (car email))
-                 (bbdb-pilot-set-value-5 pilot (cdr email)))))))
-
-    ;; Now do the addresses...
-    ;; Put the first address in the address field, and the others
-    ;; in the "custom" fields.
-    ;;
-    (let* ((addrs (bbdb-record-addresses record))
-           (addr1 (pop addrs)))
-      (cond
-       (addr1
- 	(let (st)
- 	  (cond ((>= bbdb-file-format 6)
-                 (setq st (bbdb-join (bbdb-address-streets addr1) "\n")))
-                (t
-                 (setq st (bbdb-address-street1 addr1))
-                 (if (> (length (bbdb-address-street2 addr1)) 0)
-                     (setq st (concat st "\n" (bbdb-address-street2 addr1))))
-                 (if (> (length (bbdb-address-street3 addr1)) 0)
-                     (setq st (concat st "\n" (bbdb-address-street3 addr1))))))
-
- 	  (setq st (concat (bbdb-address-location addr1) ":\n" st))
-
- 	  (bbdb-pilot-set-address pilot st)
- 	  (bbdb-pilot-set-city    pilot (bbdb-address-city  addr1))
- 	  (bbdb-pilot-set-state   pilot (bbdb-address-state addr1))
- 	  (bbdb-pilot-set-zip     pilot (bbdb-address-zip-string addr1))
- 	  (bbdb-pilot-set-country pilot nil))))
-
-      (cond
-       (addrs
-        (let ((indent-tabs-mode nil)
-              (formatted '())
-              addr c s)
-          (while addrs
-            (setq addr (car addrs))
-            (save-excursion
-              (set-buffer (get-buffer-create "*bbdb-tmp*"))
-              (erase-buffer)
-              (insert (bbdb-address-location addr) ":\n")
- 	      (cond
- 	       ((>= bbdb-file-format 6)
- 		(let ((sts (bbdb-address-streets addr)))
- 		  (while sts
- 		    (indent-to 8)
- 		    (insert (car sts) "\n")
- 		    (setq sts (cdr sts)))))
- 	       (t
- 		(if (= 0 (length (setq s (bbdb-address-street1 addr)))) nil
- 		  (indent-to 8) (insert s "\n"))
- 		(if (= 0 (length (setq s (bbdb-address-street2 addr)))) nil
- 		  (indent-to 8) (insert s "\n"))
- 		(if (= 0 (length (setq s (bbdb-address-street3 addr)))) nil
- 		  (indent-to 8) (insert s "\n"))))
-              (indent-to 8)
-              (insert (setq c (bbdb-address-city addr)))
-              (setq s (bbdb-address-state addr))
-              (if (and (> (length c) 0) (> (length s) 0)) (insert ", "))
-              (insert s "  ")
-              (insert (bbdb-address-zip-string addr))
-
-              (setq formatted (cons (buffer-string) formatted))
-              (setq addrs (cdr addrs))))
-          (setq formatted (nreverse formatted))
-
-          (bbdb-pilot-set-custom-1 pilot (pop formatted))
-          (bbdb-pilot-set-custom-2 pilot (pop formatted))
-          (bbdb-pilot-set-custom-3 pilot (pop formatted))
-          (if (null (cdr formatted))
-              (bbdb-pilot-set-custom-4 pilot (pop formatted))
-            (bbdb-pilot-set-custom-4 pilot
-                                     (mapconcat 'identity formatted "\n"))))))
-      )
-
-    ;; Now handle the notes...
-    ;;
-    (let ((losers bbdb-pilot-ignored-notes))
-      (while losers
-        (let ((c (assq (car losers) notes)))
-          (if c (setq notes (delete c notes))))
-        (setq losers (cdr losers))))
-
-    (bbdb-pilot-set-note pilot
-     (mapconcat
-      #'(lambda (cons)
-          (save-excursion
-            (set-buffer (get-buffer-create "*bbdb-tmp*"))
-            (erase-buffer)
-            (insert (format "%s:\n%s" (car cons) (cdr cons)))
-            (goto-char (point-min))
-            (while (search-forward "\n" nil t)
-              (replace-match "\n       " t t))
-            (goto-char (point-max))
-            (skip-chars-backward "\n\t ")
-            (buffer-substring (point-min) (point))))
-      notes
-      "\n\n"))
-
-    pilot))
-
-
-(defun bbdb-pilot-make-phone (location phone-string)
-  (let* ((num (make-vector
-               (if bbdb-north-american-phone-numbers-p
-                   bbdb-phone-length
-                 2)
-               nil))
-         (p (bbdb-parse-phone-number phone-string)))
-    (bbdb-phone-set-location num location)
-    (bbdb-phone-set-area num (nth 0 p)) ; euronumbers too.
-    (if (= (length num) 2)
-	nil
-      (bbdb-phone-set-exchange  num (nth 1 p))
-      (bbdb-phone-set-suffix    num (nth 2 p))
-      (bbdb-phone-set-extension num (or (nth 3 p) 0)))
-    num))
-
-
-(defun pilot-record-to-bbdb-record (pilot)
-  "Converts a Pilot record to a BBDB record."
-  (let ((firstname (bbdb-pilot-firstname pilot))
-        (lastname  (bbdb-pilot-lastname pilot))
-        (company   (bbdb-pilot-company pilot))
-        (title     (bbdb-pilot-title pilot)) ; ####
-        ;; #### AKA
-        (net nil)
-        (addrs '())
-        (phones '())
-        (pphones '())
-        (notes '())
-        )
-      (if (equal company "") (setq company nil))
-      (if (equal title   "") (setq title nil))
-      (if (equal notes   "") (setq notes nil))
-
-      ;; Process the phone numbers and primary net address...
-      ;;
-      (setq pphones (list (cons (bbdb-pilot-name-1  pilot)
-                                (bbdb-pilot-value-1 pilot))
-                          (cons (bbdb-pilot-name-2  pilot)
-                                (bbdb-pilot-value-2 pilot))
-                          (cons (bbdb-pilot-name-3  pilot)
-                                (bbdb-pilot-value-3 pilot))
-                          (cons (bbdb-pilot-name-4  pilot)
-                                (bbdb-pilot-value-4 pilot))
-                          (cons (bbdb-pilot-name-5  pilot)
-                                (bbdb-pilot-value-5 pilot))))
-      (while pphones
-        (cond ((equal (car (car pphones)) "E-mail")
-               (setq net (list (cdr (car pphones)))))
-              ((and (equal (car (car pphones)) "Other")
-                    (string-match "^\\([^ \t\n:]+\\):[ \t]*"
-                                  (cdr (car pphones))))
-               (let ((a (substring (cdr (car pphones))
-                                   (match-beginning 1) (match-end 1)))
-                     (b (substring (cdr (car pphones)) (match-end 0))))
-                 (setq phones (cons (bbdb-pilot-make-phone a b)
-                                    phones))))
-              ((> (length (cdr (car pphones))) 0)
-               (setq phones (cons (bbdb-pilot-make-phone (car (car pphones))
-                                                         (cdr (car pphones)))
-                                  phones))))
-        (setq pphones (cdr pphones)))
-      (setq phones (nreverse phones))
-
-      ;; Now parse the primary address...
-      ;;
-      (cond ((> (length (bbdb-pilot-address pilot)) 0)
-             (let ((addr (make-vector bbdb-address-length nil))
-                   loc sts st1 st2 st3
-                   (street (bbdb-pilot-address pilot))
-                   (cty (bbdb-pilot-city pilot))
-                   (ste (bbdb-pilot-state pilot))
-                   (zip (bbdb-pilot-zip pilot))
-                   )
-               (if (equal cty "") (setq cty nil))
-               (if (equal ste "") (setq ste nil))
-               (if (equal zip "") (setq zip nil))
-               (if zip (setq zip (bbdb-parse-zip-string zip)))
-
-               (if (string-match "^\\([^ \t\n:]+\\):[ \t\n]*" street)
-                   (setq loc (substring street 0 (match-end 1))
-                         street (substring street (match-end 0))))
-
-               (bbdb-address-set-location addr loc)
-
- 	       (cond
- 		((>= bbdb-file-format 6)
- 		 (while (string-match "^\\([^\n]+\\)\\(\n\\|$\\)" street)
-                   (setq sts (append
- 			      sts
- 			      (list (substring street 0 (match-end 1))))
-                         street (substring street (match-end 0))))
- 		 (bbdb-address-set-streets  addr sts))
- 		(t
- 		 (if (string-match "^\\([^\n]+\\)\\(\n\\|$\\)" street)
- 		     (setq st1 (substring street 0 (match-end 1))
- 			   street (substring street (match-end 0))))
- 		 (if (string-match "^\\([^\n]+\\)\\(\n\\|$\\)" street)
- 		     (setq st2 (substring street 0 (match-end 1))
- 			   street (substring street (match-end 0))))
- 		 (if (string-match "^\\([^\n]+\\)\\(\n\\|$\\)" street)
- 		     (setq st3 (substring street 0 (match-end 1))
- 			   street (substring street (match-end 0))))
- 		 (bbdb-address-set-street1  addr (or st1 ""))
- 		 (bbdb-address-set-street2  addr (or st2 ""))
- 		 (bbdb-address-set-street3  addr (or st3 ""))))
-
-               (bbdb-address-set-city     addr (or cty ""))
-               (bbdb-address-set-state    addr (or ste ""))
-               (bbdb-address-set-zip      addr zip)
-               (setq addrs (list addr))
-               )))
-
-      ;; Now parse the secondary addresses...
-      ;;
-      (let ((paddrs (list (bbdb-pilot-custom-1 pilot)
-                          (bbdb-pilot-custom-2 pilot)
-                          (bbdb-pilot-custom-3 pilot)
-                          (bbdb-pilot-custom-4 pilot))))
-        (while paddrs
-          (cond
-           ((car paddrs)
-            ;; #### parse text to address.  fmh.
-            ))
-          (setq paddrs (cdr paddrs))))
-
-      ;; Now parse the notes field.
-      ;;
-      ;; ####
-
-      (let ((record
-	     (vector firstname lastname nil company phones addrs net notes
-		     (make-vector bbdb-cache-length nil))))
-	record)))
-
-
-;;;###autoload
-(defun bbdb-to-pilot-file (filename &optional records)
-  (interactive "FWrite pilot-addresses file: ")
-  (or records (setq records (bbdb-records)))
-  (save-excursion
-    (set-buffer (find-file-noselect filename))
-    (erase-buffer)
-    (let ((len (length records))
-          (i 0))
-      (while records
-        (message "%d%%..." (/ (* 100 i) len))
-        (bbdb-pilot-format (bbdb-record-to-pilot-record (car records)))
-        (setq records (cdr records)
-              i (1+ i))))
-    (save-buffer)
-    (kill-buffer (current-buffer)))
-  filename)
-
-
-(defun bbdb-to-pilot ()
-  "Push the current contents of BBDB out to the Pilot."
-;  (interactive)
-  (bbdb-records)  ; load bbdb
-  (message "Selecting records...")
-  (let ((records
-         (remove-if-not
-          #'(lambda (record)
-              (and (or (bbdb-record-name record)
-                       (bbdb-record-company record))
-                   (let ((phones-p nil)
-                         (phones (bbdb-record-phones record)))
-                     (while phones
-                       (let ((loc (bbdb-phone-location (car phones))))
-                         (if (and (not (string-match "cid" loc))
-                                  (not (string-match "[?]" loc)))
-                             (setq phones-p t)))
-                       (setq phones (cdr phones)))
-                     phones-p)))
-          (bbdb-records)))
-
-	(file (format "/tmp/pilot-bbdb-%s-%d-%s"
-		(user-login-name) (emacs-pid) (float-time))))
-
-    (bbdb-to-pilot-file file records)
-    (shell-command (concat "pilot-addresses -p /dev/pilot "
-                           "-d BBDB -c BBDB -r " file
-                           ;;"; rm " file
-                           " &"))
-    ))
-
-(provide 'bbdb-pilot-jwz)
-
-;;; bbdb-pilot-jwz.el ends here
diff --git a/debian/bbdb-srv.1 b/debian/bbdb-srv.1
deleted file mode 100644
index 6fd0ef2..0000000
--- a/debian/bbdb-srv.1
+++ /dev/null
@@ -1,60 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH BBDB-SRV.PL 1 "March 31, 2002"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-bbdb-srv \- Converts Mail-Headers to an Emacs-Lisp String.
-.SH SYNOPSIS
-.B echo "Some Headers" | bbdb-srv
-.SH DESCRIPTION
-This script reads a block of message headers on stdin, and converts them
-to an emacs-lisp string (quoting  all dangerous characters) and then 
-uses the `gnudoit' program to cause a running Emacs process to invoke
-the `bbdb-srv' function with that string.
-
-This has the effect of causing the running Emacs to display the BBDB
-record corresponding to these headers.
-
-See the Emacs side of things in bbdb-srv.el for more info.
-
-A trivial application of this is the shell command:
-
-   echo 'From: Jamie Zawinski <jwz@netscape.com>' | bbdb-srv.perl
-
-which will cause the corresponding record to be displayed.
-A more interesting application of this is:
-
-   setenv NS_MSG_DISPLAY_HOOK bbdb-srv.perl
-
-which will hook BBDB up to Mozilla (Unix Netscape Mail and Netscape News
-versions 3.0b2 and later only.)
-
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-Instead, it has documentation in the GNU Info format; see below.
-.SH SEE ALSO
-.BR bbdb-areacode-split (1),
-.BR bbdb-unlazy-lock (1).
-.BR bbdb-srv (1).
-.br
-The bbdb is fully documented by
-.IR "The insidious Big Brother Database for mail and news" ,
-available via the Infonode
-.BR bbdb
-.
-.SH AUTHOR
-This manual page was written by Joerg Jaspert (JJ) <joerg@goliathbbs.dnsalias.net>,
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/bbdb-unlazy-lock.1 b/debian/bbdb-unlazy-lock.1
deleted file mode 100644
index 06dd15d..0000000
--- a/debian/bbdb-unlazy-lock.1
+++ /dev/null
@@ -1,41 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH BBDB-UNLAZY-LOCK.PL 1 "March 31, 2002"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-bbdb--unlazy-lock \- Removes crap from lazy-lock from your .bbdb
-.SH SYNOPSIS
-.B bbdb-unlazy-lock
-.SH DESCRIPTION
-Lazy-lock-mode has (had) a nasty habit of munging .bbdb files if you 
-visited them with it on.  This script removes the lazy-lock mung
-
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-Instead, it has documentation in the GNU Info format; see below.
-.SH SEE ALSO
-.BR bbdb-areacode-split (1),
-.BR bbdb-unlazy-lock (1).
-.BR bbdb-srv (1).
-.br
-The bbdb is fully documented by
-.IR "The insidious Big Brother Database for mail and news" ,
-available via the Infonode
-.BR bbdb
-.
-.SH AUTHOR
-This manual page was written by Joerg Jaspert (JJ) <joerg@goliathbbs.dnsalias.net>,
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/bbdb.doc-base b/debian/bbdb.doc-base
deleted file mode 100644
index 9e1e563..0000000
--- a/debian/bbdb.doc-base
+++ /dev/null
@@ -1,14 +0,0 @@
-Document: bbdb
-Title:  Insidious Big Brother Database User Manual
-Author: Jamie Zawinski, Matt Simmons and the BBDB Development Team
-Abstract: BBDB is a rolodex-like database program for GNU Emacs and
- XEmacs. BBDB stands for Insidious Big Brother Database, and is not, 
- repeat, not an obscure reference to the Buck Rogers TV series.
-Section: Editors
-
-Format: HTML
-Index: /usr/share/doc/bbdb/html/bbdb.html
-Files: /usr/share/doc/bbdb/html/*.html
-
-Format: PDF
-Files: /usr/share/doc/bbdb/bbdb.pdf.gz
diff --git a/debian/bbdb.docs b/debian/bbdb.docs
deleted file mode 100644
index 0871102..0000000
--- a/debian/bbdb.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-bits.tar.gz
-texinfo/bbdb.pdf
diff --git a/debian/bbdb.emacsen-install b/debian/bbdb.emacsen-install
deleted file mode 100755
index bbe45fe..0000000
--- a/debian/bbdb.emacsen-install
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/bin/sh
-# /usr/lib/emacsen-common/packages/install/bbdb
-
-FLAVOR=$1
-PACKAGE="bbdb"
-
-if [ "X${FLAVOR}" = "X" ]; then
-    echo Need argument to determine FLAVOR of emacs;
-    exit 1
-fi
-
-if [ "X${PACKAGE}" = "X" ]; then
-    echo Internal error: need package name;
-    exit 1;
-fi
-
-ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
-ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
-
-COMPILE="-q -batch -f batch-byte-compile"
-
-case "${FLAVOR}" in
-    emacs)
-	echo "install/${PACKAGE}: Ignoring Flavor ${FLAVOR} ..."
-	;;
-    *)
-
-	echo "install/${PACKAGE}: Byte-compiling for ${FLAVOR} ..."
-
-	rm -rf ${ELCDIR}
-	cd ${ELDIR}
-	TARGETS="rmail mhe gnus bbdb"
-
-	if [ -d /usr/share/${FLAVOR}/site-lisp/vm ]; then
-	    TARGETS="$TARGETS vm"
-	elif [ ${FLAVOR} = xemacs20 -o ${FLAVOR} = xemacs21 ]; then
-	    TARGETS="$TARGETS vm"
-	fi
-
-	if [ ${FLAVOR} = emacs19 -o ${FLAVOR} = mule2 ]; then
-            MHEDIR=/usr/share/${FLAVOR}/site-lisp/../lisp
-	elif [ ${FLAVOR} = xemacs20 -o ${FLAVOR} = xemacs21 ]; then
-            MHEDIR=/usr/share/${FLAVOR}/site-lisp/../lisp/mh-e
-	else	# emacs20
-            MHEDIR=/usr/share/${FLAVOR}/site-lisp/../lisp/mail
-	fi
-
-	## for Gnus
-	if [ -d /usr/share/${FLAVOR}/site-lisp/gnus ]; then
-	    GNUSDIR=/usr/share/${FLAVOR}/site-lisp/gnus
-	elif [ -d /usr/share/${FLAVOR}/site-lisp/semi-gnus ]; then
-	    GNUSDIR=/usr/share/${FLAVOR}/site-lisp/semi-gnus
-	elif [ -d /usr/share/${FLAVOR}/site-lisp/t-gnus ]; then
-	    GNUSDIR=/usr/share/${FLAVOR}/site-lisp/t-gnus
-	elif [ -d /usr/share/${FLAVOR}/site-lisp/chaos ]; then
-	    GNUSDIR=/usr/share/${FLAVOR}/site-lisp/chaos
-	fi
-
-	if [ -z ${GNUSDIR} ]; then
-	    if [ ${FLAVOR} = emacs19 -o ${FLAVOR} = mule2 ]; then
-		GNUSDIR=/usr/share/emacs/19.34/lisp
-	    elif [ ${FLAVOR} = xemacs20 ]; then
-		GNUSDIR=/usr/lib/xemacs-20.4/lisp/gnus
-	    elif [ ${FLAVOR} = xemacs21 ]; then
-		GNUSDIR=/usr/share/xemacs21/packages/lisp/gnus
-	    else
-		GNUSDIR=/usr/share/${FLAVOR}/site-lisp/../lisp/gnus
-	    fi
-	fi
-
-	LOG=`tempfile`
-	
-	rm -rf ${ELCDIR} && cp -a ${ELDIR} ${ELCDIR}
-
-	# at ELCDIR
-	( cd ${ELCDIR}
-
-	    # Prevent epg from manipulating /root/.gnupg (#694417)
-	    TMPGNUPGHOME=`mktemp -d --tmpdir gnupg.XXXXXXXXXX`
-	    export GNUPGHOME=${TMPGNUPGHOME}
-
-	    echo "Generating bbdb-autoloads..."
-            echo "Generating bbdb-autoloads" >> $LOG
-	    make autoloads >> $LOG 2>&1
-	    if [ $FLAVOR != xemacs20 -a $FLAVOR != xemacs21 ]; then
-		echo  "(provide 'bbdb-autoloads)" >> lisp/bbdb-autoloads.el
-	    fi
-	    echo "Byte-compiling bbdb..."
-	    make  $TARGETS EMACS_PROG=${FLAVOR} \
-		VMDIR=/usr/share/${FLAVOR}/site-lisp/vm \
-		GNUSDIR=${GNUSDIR} \
-		MHEDIR=${MHEDIR} >> $LOG 2>&1
-	    mv lisp/*.elc utils/*.el .
-	    rm -rf tex utils lisp Makefile ${TMPGNUPGHOME}
-	    ${FLAVOR} ${COMPILE} *.el >> $LOG 2>&1
-	)
-	cat > ${ELCDIR}/load-path.el <<EOF 
-(setq load-path (cons (concat "/usr/share/${FLAVOR}/site-lisp/bbdb") load-path))
-(provide 'bbdb/load-path)
-EOF
-	if [ ! -e ${ELCDIR}/bbdb-gnus.elc ]; then
-	    echo "*** installing not-compiled bbdb-gnus.el ***" >> $LOG
-	    echo "install -m 644 ${ELDIR}/lisp/bbdb-gnus.el ${ELCDIR}/" >> $LOG
-	    install -m 644 ${ELDIR}/lisp/bbdb-gnus.el ${ELCDIR}/
-	fi
-
-	# a hack to fix #179821, #210248, #233904
-	# If bbdb is installed before vm, then bbdb does not have bbdb-vm compiled....
-	install -m 644 ${ELDIR}/lisp/bbdb-vm.el ${ELCDIR}/
-
-	# make -k clean >> $LOG
-	mv $LOG ${ELCDIR}/CompilationLog
-	gzip -9 ${ELCDIR}/CompilationLog
-	chmod 644 ${ELCDIR}/CompilationLog.gz
-
-	# make symlinks for source files that were not copied over to ELCDIR
-	# this makes find-function and find-library work properly
-	cd ${ELDIR}/lisp
-	for f in *.el; do
-            if [ -e ${ELCDIR}/${f}c ] && [ ! -e ${ELCDIR}/${f} ]; then
-		ln -sf ${ELDIR}/lisp/${f} ${ELCDIR}/${f}
-            fi
-	done
-
-	echo " done."
-	;;
-esac
diff --git a/debian/bbdb.emacsen-remove b/debian/bbdb.emacsen-remove
deleted file mode 100755
index f912bd1..0000000
--- a/debian/bbdb.emacsen-remove
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-# /usr/lib/emacsen-common/packages/remove/bbdb
-
-# I don't think that remove scripts should have -e set, because
-# that makes the package unremovable if the script fails.
-# set -e 
-
-FLAVOR=$1
-PACKAGE="bbdb"
-
-if [ "X${FLAVOR}" = "X" ]; then
-    echo Need argument to determine FLAVOR of emacs;
-    exit 1
-fi
-
-if [ "X${PACKAGE}" = "X" ]; then
-    echo Internal error: need package name;
-    exit 1;
-fi
-
-ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
-ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
-
-case "${FLAVOR}" in
-   emacs)
-   echo "remove/${PACKAGE}: Ignoring Flavor ${FLAVOR} ..."
-   ;;
-   *)
-   echo -n "remove/${PACKAGE}: Handling removal of emacsen flavor ${FLAVOR} ..."
-   rm -rf ${ELCDIR}
-
-   echo " done."
-   ;;
-esac
-
-exit 0;
diff --git a/debian/bbdb.emacsen-startup b/debian/bbdb.emacsen-startup
deleted file mode 100644
index b0902dc..0000000
--- a/debian/bbdb.emacsen-startup
+++ /dev/null
@@ -1,29 +0,0 @@
-;; bbdb startup file for Debian.
-
-;; Modified by Peter S Galbraith <psg@debian.org> to skip loading when
-;;  bbdb is not fully installed, as this file still exists when the
-;;  package is removed but not purged.
-
-(cond
- ((not (file-exists-p "/usr/share/emacs/site-lisp/bbdb"))
-  (message "Package bbdb removed but not purged.  Skipping setup."))
- ((not (file-exists-p (concat "/usr/share/"
-			      (symbol-name debian-emacs-flavor)
-			      "/site-lisp/bbdb/bbdb-autoloads.elc")))
-  (message "Package bbdb not fully installed.  Skipping setup."))
- (t
-
-  (debian-pkg-add-load-path-item
-   (concat "/usr/share/" (symbol-name debian-emacs-flavor) "/site-lisp/bbdb"))
-
-  ;; (require 'message)
-
-  ;; http://bugs.debian.org/85019
-  (setq bbdb-sound-files nil)
-  (setq bbdb-sound-player nil)
-  (setq bbdb-sounds-directory nil)
-
-  ;; (require 'bbdb)
-  ;; (bbdb-initialize)
-
-  (require 'bbdb-autoloads)))
diff --git a/debian/bbdb.info b/debian/bbdb.info
deleted file mode 100644
index 8b0c148..0000000
--- a/debian/bbdb.info
+++ /dev/null
@@ -1 +0,0 @@
-texinfo/bbdb.info
diff --git a/debian/bbdb.install b/debian/bbdb.install
deleted file mode 100644
index d9a2e4e..0000000
--- a/debian/bbdb.install
+++ /dev/null
@@ -1,8 +0,0 @@
-Makefile		 usr/share/emacs/site-lisp/bbdb
-lisp/*.el                usr/share/emacs/site-lisp/bbdb/lisp
-lisp/Makefile		 usr/share/emacs/site-lisp/bbdb/lisp
-utils/*.el		 usr/share/emacs/site-lisp/bbdb/utils
-debian/bbdb-pilot-jwz.el usr/share/emacs/site-lisp/bbdb
-tex/*.tex		 usr/share/texmf/tex/bbdb
-texinfo/bbdb/*.html	 usr/share/doc/bbdb/html
-utils/*.pl		 usr/bin
diff --git a/debian/bbdb.manpages b/debian/bbdb.manpages
deleted file mode 100644
index c283681..0000000
--- a/debian/bbdb.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/bbdb-areacode-split.1
-debian/bbdb-cid.1
-debian/bbdb-srv.1
-debian/bbdb-unlazy-lock.1
diff --git a/debian/changelog b/debian/changelog
index 3b15384..942b9af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+bbdb (3.0) experimental; urgency=medium
+
+  * Salvage package (Closes: #901938)
+  * Update Vcs-*
+  * Convert to dependency package installing bbdb3
+  * convert to native package
+  * bump version number.
+  * switch to debhelper-compat 12
+  * bump Standards-Version to 4.4.0. No changes (other than deleting almost
+    everything) necessary.
+
+ -- David Bremner <bremner@debian.org>  Sat, 07 Sep 2019 15:40:14 -0300
+
 bbdb (2.36-4) unstable; urgency=medium
 
   * engage dh autoreconf, rm ./configure, relax regarding ./configure +x bit
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
index d77ac02..95f4cfe 100644
--- a/debian/control
+++ b/debian/control
@@ -1,23 +1,16 @@
 Source: bbdb
 Section: mail
 Priority: optional
-Maintainer: Joerg Jaspert <joerg@debian.org>
-Uploaders: Barak A. Pearlmutter <bap@debian.org>
-Build-Depends: debhelper (>= 9),
-    dh-autoreconf
-Build-Depends-Indep: texinfo, texi2html, ghostscript,
-    texlive-base, texlive-latex-base,
-    emacs24-nox | emacs24 | emacs23-nox | emacs23 | emacs
-Standards-Version: 3.9.5
-Vcs-Git: https://github.com/barak/BBDB.git
-Vcs-Browser: http://github.com/barak/BBDB
-Homepage: http://bbdb.sourceforge.net/
+Maintainer: Debian Emacsen team <debian-emacsen@lists.debian.org>
+Uploaders: David Bremner <bremner@debian.org>
+Build-Depends: debhelper-compat (= 12)
+Standards-Version: 4.4.0
+Vcs-Git: https://salsa.debian.org/emacsen-team/bbdb.git
+Vcs-Browser: https://salsa.debian.org/emacsen-team/bbdb
+Homepage: http://savannah.nongnu.org/projects/bbdb/
 
 Package: bbdb
 Architecture: all
-Depends: make, emacs24 | emacs23 | emacsen, ${misc:Depends}, ${perl:Depends}
-Suggests: vm, w3m-el, gnuserv, gnus|t-gnus, perl
+Depends: bbdb3
 Description: The Insidious Big Brother Database (email rolodex) for Emacs
- BBDB is a rolodex-like database program for GNU Emacs.  BBDB stands
- for Insidious Big Brother Database, and is not, repeat, *not* an
- obscure reference to the Buck Rogers TV series.
+ This is a transitional package and maybe safely deleted.
diff --git a/debian/copyright b/debian/copyright
index 031940c..4b2a344 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,70 +1,11 @@
-This package was debianized by Frederic Lepied <Lepied@debian.org> on
-Mon, 17 Oct 1997 23:09:25 +0200.
+This package is currently entirely a dependency package, and probably
+contains nothing copyrightable.
 
-Actual Maintainer: Joerg Jaspert <joerg@debian.org>
-
-It was downloaded from http://bbdb.sourceforge.net/
-
-Authors:  Jamie Zawinski, Ronan Waide (Waider), Todd Kaufmann,
-	  Boris Goldowsky, Christopher Kline, John Heidemann,
-	  Roland McGrath
-
-Current Upstream: Ronan Waide
-
-Copyright:
-
-Copyright subsets of 1991-2001, subsets of Jamie Zawinski, Ronan Waide (Waider),
-	  Todd Kaufmann, Boris Goldowsky, Christopher Kline, John Heidemann,
-	  Roland McGrath
-  lisp/*
-  texinfo/*
-  tex/*
-  utils/*
-
-Copyright (c) 1997-1999 Matt Simmons <simmonmt@@acm.org>
-  texinfo/bbdb.texinfo
-
-Copyright (c) 2000 Alex Schroeder
-  misc/bbdb-unmigrate-stuff.el
-
-Copyright 1995 Neda Communications, Inc.
-  bits/bbdb-filters/doc/main.texinfo
-  bits/bbdb-filters/bbdb-filters-0.2.sh
-
-Copyright (C) 1998 Ivar Rummelhoff
-  bits/bbdb-anniv.el
-
-Copyright (C) 1999, 2000, 2001 Shenghuo ZHU
-  bits/bbdb-edit.el
-
-Copyright (C) 1998,2000 by Niels Elgaard Larsen <elgaard@diku.dk>
-  bits/bbdb-ldif.el
-
-Copyright (C) 2001 Colin Rafferty
-  bits/bbdb-obsolete.el
-
-Copyright (C) 1997,1999 Kevin Davidson
-  bits/bbdb-pgp.el
-  bits/bbdb-signature.el
-
-Copyright (C) 1997 Kevin Davidson
-Copyright (C) 1985, 1986, 1992 Free Software Foundation, Inc
-  bits/bbdb-signature.el
-
-;;; The Insidious Big Brother Database is free software; you can redistribute
-;;; it and/or modify it under the terms of the GNU General Public License as
-;;; published by the Free Software Foundation; either version 2, or (at your
-;;; option) any later version.
-;;;
-;;; BBDB is distributed in the hope that it will be useful, but WITHOUT ANY
-;;; WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-;;; FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-;;; details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Emacs; see the file COPYING.  If not, write to
-;;; the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-;;; MA 02110-1301, USA.
+As near as I can tell, the previous version was licensed under the GNU
+public license version 2 or later. So you may also consider this
+derived work to be covered under those terms.
 
 On Debian systems, the complete text of the GNU General Public License
 version 2 can be found in /usr/share/common-licenses/GPL-2 file.
+
+
diff --git a/debian/patches/Makefile.patch b/debian/patches/Makefile.patch
deleted file mode 100644
index 820fb8a..0000000
--- a/debian/patches/Makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.orig	2009-11-17 16:13:19.000000000 -0500
-+++ Makefile	2009-11-17 16:16:25.000000000 -0500
-@@ -16,18 +16,7 @@
-            aclocal.m4 configure configure.ac install-sh Makefile.in \
-            bits lisp misc tex texinfo utils
- 
--all: Makefile bbdb info    gnus
--
--Makefile:: Makefile.in
--	./config.status
--
--Makefile:: configure
--	@echo "Configure has changed, you may need to rerun configure!"
--	exit 1
--
--configure: configure.ac
--	@echo "configure.ac has changed. Please rerun autoconf!"
--	exit 1
-+all: bbdb info    gnus
- 
- bbdb:
- 	cd lisp; $(MAKE) bbdb
diff --git a/debian/patches/lisp/Makefile.patch b/debian/patches/lisp/Makefile.patch
deleted file mode 100644
index f27ff91..0000000
--- a/debian/patches/lisp/Makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-*** lisp/Makefile	2009-11-21 19:43:53.000000000 -0500
---- debian/bbdb/usr/share/emacs/site-lisp/bbdb/lisp/Makefile	2009-11-21 20:27:35.000000000 -0500
-***************
-*** 56,64 ****
-  
-  all: Makefile  gnus   bbdb autoloadsc
-  
-- Makefile: Makefile.in
-- 	cd ..; ./config.status
-- 
-  install-pkg: uninstall-pkg bbdb autoloadsc
-  	@if test "x$(SYMLINKS)" = "xno" ; then                 \
-            mkdir -p -m 0755 $(PACKAGEDIR)/lisp/bbdb;            \
---- 56,61 ----
diff --git a/debian/rules b/debian/rules
index 1407bdb..2d33f6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,26 +1,4 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with autoreconf --parallel
-
-override_dh_auto_build: bits.tar.gz
-	$(MAKE) -C texinfo bbdb.info bbdb.pdf
-	texi2html --split=chapter --output=texinfo/bbdb texinfo/bbdb.texinfo
-
-override_dh_install:
-	dh_install
-	@echo Give perl executables to implementation-agnostic filenames
-	cd debian/bbdb/usr/bin && \
-	for f in *.pl; do \
-	  mv $$f $$(basename $$f .pl); \
-	done
-	@echo Apply Debian patches
-	for f in $$(find debian/patches -name '*.patch'); do \
-	  echo applying patch: $$f ; \
-	  d=debian/bbdb/usr/share/emacs/site-lisp/bbdb ; \
-	  patch $$d/$$(echo $$f | sed 's|^debian/patches/\(.*\)[.]patch$$|\1|') $$f; \
-	done
-
-bits.tar.gz:
-	tar -cf - extern/*/* | tar -C bits -xvf -
-	tar -czf bits.tar.gz bits/
+	dh $@
diff --git a/debian/source/format b/debian/source/format
index 163aaf8..89ae9db 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 7423a2d..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-single-debian-patch
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index b9fa30d..0000000
--- a/debian/watch
+++ /dev/null
@@ -1,5 +0,0 @@
-version=3
-http://githubredir.debian.net/github/barak/BBDB \
- /github/barak/BBDB/BBDB\.([0-9].*).tar.gz
-http://githubredir.debian.net/github/barak/BBDB \
- /github/barak/BBDB/upstream/(.*).tar.gz