diff options
author | Barak A. Pearlmutter <bap@debian.org> | 2014-02-24 07:17:32 -0500 |
---|---|---|
committer | Barak A. Pearlmutter <bap@debian.org> | 2014-02-24 07:17:32 -0500 |
commit | ab341611e505d2771a6d3f51444554a245360be0 (patch) | |
tree | 87002c4748b4ede5fc01181685092901fa1b8989 |
Import bbdb_2.36-4.debian.tar.xz
[dgit import tarball bbdb 2.36-4 bbdb_2.36-4.debian.tar.xz]
-rw-r--r-- | README.Debian | 64 | ||||
-rw-r--r-- | README.source | 45 | ||||
-rw-r--r-- | bbdb-areacode-split.1 | 46 | ||||
-rw-r--r-- | bbdb-cid.1 | 45 | ||||
-rw-r--r-- | bbdb-pilot-jwz.el | 582 | ||||
-rw-r--r-- | bbdb-srv.1 | 60 | ||||
-rw-r--r-- | bbdb-unlazy-lock.1 | 41 | ||||
-rw-r--r-- | bbdb.doc-base | 14 | ||||
-rw-r--r-- | bbdb.docs | 2 | ||||
-rwxr-xr-x | bbdb.emacsen-install | 127 | ||||
-rwxr-xr-x | bbdb.emacsen-remove | 36 | ||||
-rw-r--r-- | bbdb.emacsen-startup | 29 | ||||
-rw-r--r-- | bbdb.info | 1 | ||||
-rw-r--r-- | bbdb.install | 8 | ||||
-rw-r--r-- | bbdb.manpages | 4 | ||||
-rw-r--r-- | changelog | 489 | ||||
-rw-r--r-- | compat | 1 | ||||
-rw-r--r-- | control | 23 | ||||
-rw-r--r-- | copyright | 70 | ||||
-rw-r--r-- | patches/Makefile.patch | 22 | ||||
-rw-r--r-- | patches/debian-changes | 494 | ||||
-rw-r--r-- | patches/lisp/Makefile.patch | 14 | ||||
-rw-r--r-- | patches/series | 1 | ||||
-rwxr-xr-x | rules | 26 | ||||
-rw-r--r-- | source/format | 1 | ||||
-rw-r--r-- | watch | 5 |
26 files changed, 2250 insertions, 0 deletions
diff --git a/README.Debian b/README.Debian new file mode 100644 index 0000000..06ae927 --- /dev/null +++ b/README.Debian @@ -0,0 +1,64 @@ +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/README.source b/README.source new file mode 100644 index 0000000..717bdcc --- /dev/null +++ b/README.source @@ -0,0 +1,45 @@ +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/bbdb-areacode-split.1 b/bbdb-areacode-split.1 new file mode 100644 index 0000000..8410d5f --- /dev/null +++ b/bbdb-areacode-split.1 @@ -0,0 +1,46 @@ +.\" 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/bbdb-cid.1 b/bbdb-cid.1 new file mode 100644 index 0000000..4280dbd --- /dev/null +++ b/bbdb-cid.1 @@ -0,0 +1,45 @@ +.\" 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/bbdb-pilot-jwz.el b/bbdb-pilot-jwz.el new file mode 100644 index 0000000..00458da --- /dev/null +++ b/bbdb-pilot-jwz.el @@ -0,0 +1,582 @@ +;;; 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/bbdb-srv.1 b/bbdb-srv.1 new file mode 100644 index 0000000..6fd0ef2 --- /dev/null +++ b/bbdb-srv.1 @@ -0,0 +1,60 @@ +.\" 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/bbdb-unlazy-lock.1 b/bbdb-unlazy-lock.1 new file mode 100644 index 0000000..06dd15d --- /dev/null +++ b/bbdb-unlazy-lock.1 @@ -0,0 +1,41 @@ +.\" 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/bbdb.doc-base b/bbdb.doc-base new file mode 100644 index 0000000..9e1e563 --- /dev/null +++ b/bbdb.doc-base @@ -0,0 +1,14 @@ +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/bbdb.docs b/bbdb.docs new file mode 100644 index 0000000..0871102 --- /dev/null +++ b/bbdb.docs @@ -0,0 +1,2 @@ +bits.tar.gz +texinfo/bbdb.pdf diff --git a/bbdb.emacsen-install b/bbdb.emacsen-install new file mode 100755 index 0000000..bbe45fe --- /dev/null +++ b/bbdb.emacsen-install @@ -0,0 +1,127 @@ +#!/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/bbdb.emacsen-remove b/bbdb.emacsen-remove new file mode 100755 index 0000000..f912bd1 --- /dev/null +++ b/bbdb.emacsen-remove @@ -0,0 +1,36 @@ +#!/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/bbdb.emacsen-startup b/bbdb.emacsen-startup new file mode 100644 index 0000000..b0902dc --- /dev/null +++ b/bbdb.emacsen-startup @@ -0,0 +1,29 @@ +;; 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/bbdb.info b/bbdb.info new file mode 100644 index 0000000..8b0c148 --- /dev/null +++ b/bbdb.info @@ -0,0 +1 @@ +texinfo/bbdb.info diff --git a/bbdb.install b/bbdb.install new file mode 100644 index 0000000..d9a2e4e --- /dev/null +++ b/bbdb.install @@ -0,0 +1,8 @@ +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/bbdb.manpages b/bbdb.manpages new file mode 100644 index 0000000..c283681 --- /dev/null +++ b/bbdb.manpages @@ -0,0 +1,4 @@ +debian/bbdb-areacode-split.1 +debian/bbdb-cid.1 +debian/bbdb-srv.1 +debian/bbdb-unlazy-lock.1 diff --git a/changelog b/changelog new file mode 100644 index 0000000..3b15384 --- /dev/null +++ b/changelog @@ -0,0 +1,489 @@ +bbdb (2.36-4) unstable; urgency=medium + + * engage dh autoreconf, rm ./configure, relax regarding ./configure +x bit + * updates to debian/README.Debian and debian/README.source + * remove CVS keyword expansion artifacts + * add savannah repo pointers to bbdb.texinfo + * remove PHONY stuff in debian/rules + * remove stray old-style quasiquote in macro + * allow emacs24 to satisfy dependencies + * bump standards version, dh version + * single debian patch source option + + -- Barak A. Pearlmutter <bap@debian.org> Mon, 24 Feb 2014 12:17:32 +0000 + +bbdb (2.36-3) unstable; urgency=low + + [ Sébastien Villemot ] + * debian/bbdb.emacsen-install: no longer create /root/.gnupg during + installation of the package. This is achieved by binding GNUPGHOME to a + temporary directory during bytecode compilation (Closes: #694417) + + -- Barak A. Pearlmutter <bap@debian.org> Fri, 30 Nov 2012 11:52:46 +0000 + +bbdb (2.36-2) unstable; urgency=low + + * Update to bbdb-vcard 0.3, which better parses birthdays + * bump standards version (debian/changelog) + * bump to dh 8, dh --parallel, dh --with autotools_dev (debian/compat, + debian/control, debian/rules) + * rephrase for grammar and Moore's Law (debian/bbdb.emacsen-install) + (closes: #440192, #540539) + + -- Barak A. Pearlmutter <bap@debian.org> Sun, 12 Dec 2010 14:57:47 +0000 + +bbdb (2.36-1) unstable; urgency=low + + * New "upstream" release. + * Look for upstream in github repo (debian/watch) + + -- Barak A. Pearlmutter <bap@debian.org> Tue, 20 Apr 2010 20:18:13 +0100 + +bbdb (2.35.cvs20080316-7) unstable; urgency=low + + * Update to bbdb-vcard 0.2, which no longer uses convcard + * Switch to dpkg-source 3.0 (quilt) format + * Build dependency on texlive-latex-base (closes: #577860) + + -- Barak A. Pearlmutter <bap@debian.org> Mon, 19 Apr 2010 09:59:29 +0100 + +bbdb (2.35.cvs20080316-6) unstable; urgency=low + + * Update bbdb-vcard + * Suggest multisync-tools for convcard used (default) by bbdb-vcard + * Use dpkg-source 1.0 format, as 3.0 (git) cannot handle submodules + + -- Barak A. Pearlmutter <bap@debian.org> Sat, 27 Mar 2010 10:31:32 +0000 + +bbdb (2.35.cvs20080316-5) unstable; urgency=low + + * fiddle with info stuff for robustness + * require emacs at build, avoiding extras install problem (closes: #571686) + * include bbdb-vcard in bits tarball + + -- Barak A. Pearlmutter <bap@debian.org> Tue, 09 Mar 2010 16:20:16 +0000 + +bbdb (2.35.cvs20080316-4) unstable; urgency=low + + * prevent debian build-time error when emacs not installed (closes: #571434) + * rev deb std + + -- Barak A. Pearlmutter <bap@debian.org> Fri, 26 Feb 2010 09:04:09 +0000 + +bbdb (2.35.cvs20080316-3) unstable; urgency=low + + * chmod +x configure patch, thanks to Kumar Appaiah (closes: #567197) + + -- Barak A. Pearlmutter <bap@debian.org> Wed, 03 Feb 2010 13:43:30 +0000 + +bbdb (2.35.cvs20080316-2) unstable; urgency=low + + * Misc additional files in bits/ + * Minor packaging tweaks + * Build dependency for /usr/bin/tex (closes: #560582) + + -- Barak A. Pearlmutter <bap@debian.org> Sun, 27 Dec 2009 20:26:22 -0500 + +bbdb (2.35.cvs20080316-1) unstable; urgency=low + + * Merge ongoing changes from upstream. (Closes: #440191) + - Includes menu commands (Closes: #96300) + - Fixes lisp/Makefile.in target extras mixing .el .elc (Closes: #366059) + * Bring into GIT. + * Regenerate debian/Makepatch to accommodate upstream changes. + * Fix RMAIL insinuation in Emacs 23. (Closes: #556993) + * Apply bbdb startup patch from Peter S Galbraith. (Closes: #353937) + * Correct typo. (Closes: #488729) + * Update backquote style in file lisp/bbdb-com.el. (Closes: #475600) + * Update Debian packaging. + - Avoiding double-installing bbdb-pilot-jwz.el file. (Closes: #557356) + - Avoiding double-installing .tex files. + - dh 7. + - rev deb std. + - debian/copyright updates: FSF address, common license location, expand. + - Misc housekeeping and tracking policy. + - Give debian patch files consistent names and locations. + * Switch scripts from /usr/bin/bbdb-FOO.pl to /usr/bin/bbdb-FOO. + * Merge Ununtu patch that symlinks some .el files at emacsen-install time. + * Include PDF documentation. + * Add Barak A. Pearlmutter <bap@debian.org> as co-maintainer. + + -- Barak A. Pearlmutter <bap@debian.org> Tue, 01 Dec 2009 22:10:39 -0500 + +bbdb (2.35.cvs20060204-1.2) unstable; urgency=low + + * NMU with the permission of the maintainer to adjust the dependencies + to accommodate the removal of emacs21. Change the emacs21 dependency + to emacs23 and the emacs21 build dependency to emacs22 or emacs23. + Thanks to Sven Joachim <svenjoac@gmx.de>. (Closes: #478799) + + -- Rob Browning <rlb@defaultvalue.org> Sat, 01 Aug 2009 12:16:02 -0700 + +bbdb (2.35.cvs20060204-1.1) unstable; urgency=low + + * NMU with the permission of the maintainer. + * Set coding system when writing .bbdb file to prevent data corruption. + (Closes: #351778) + + -- Hubert Chan <hubert@uhoreg.ca> Thu, 13 Apr 2006 15:42:40 +0200 + +bbdb (2.35.cvs20060204-1) unstable; urgency=low + + * New CVS co + - Bug fix: "bbdb-news-auto-create-p with 'prompt doesn't work" (Closes: #296577). + * Bug fix: "bbdb: File error: "Cannot open load file", + 'bbdb-autoloads'" (Closes: #344032, #345186, #345297, #350449, #308336, #279920). + * Bug fix: "bbdb does not work with gnus-5.10", (works for me [TM]) (Closes: #192904). + + -- Joerg Jaspert <joerg@debian.org> Sat, 4 Feb 2006 16:32:31 +0100 + +bbdb (2.35.cvs20040528-1) unstable; urgency=low + + * CVS co - last changes there are from 28.05.2004 + * Bug fix: "fails to load : missing bbdb-vm.el". (Closes: #179821, #180024, #210248, #233904). + * Removed | emacs20 from Depends. (Closes: #232731) + * Removed old w3-el-e{20|19} Suggests. + * Bug fix: "bbdb: Include /usr/share/emacs/site-lisp/bbdb/tex/", thanks + to Mario Lang (Closes: #243211). + + -- Joerg Jaspert <joerg@debian.org> Wed, 11 Aug 2004 23:12:05 +0200 + +bbdb (2.35.cvs20030801-1) unstable; urgency=low + + * CVS from 01 August 2003. + + -- Joerg Jaspert <joerg@debian.org> Sun, 24 Aug 2003 14:51:51 +0200 + +bbdb (2.34.cvs20030503-1) unstable; urgency=low + + * CVS from 03 Mai 2003. + * Removed a suggestion about charsets in .bbdb. It should work without + that (closes: #177625) + + -- Joerg Jaspert <joerg@debian.org> Sat, 3 May 2003 20:16:15 +0200 + +bbdb (2.34.cvs20030102-1) unstable; urgency=low + + * CVS checkout from 02 Januar 2003. + * A note in README.Debian about charsets and .bbdb. + (closes: #174006,173817) + * This patch for encoding issues is included upstream (closes: #159339) + * Standards 3.5.8 + + -- Joerg Jaspert <joerg@debian.org> Sun, 5 Jan 2003 15:38:42 +0100 + +bbdb (2.34.cvs20021102-1) unstable; urgency=low + + * Newest CVS Checkout. Well, new.... + + -- Joerg Jaspert <joerg@debian.org> Wed, 13 Nov 2002 21:02:25 +0100 + +bbdb (2.34.cvs20021027-1) unstable; urgency=low + + * Newest CVS checkout. This is really 2.35 :) + * Standards-Version: 3.5.7 + * Removed mk-binary from debian/ dir, it is not used. + + -- Joerg Jaspert <joerg@debian.org> Sun, 27 Oct 2002 16:09:56 +0100 + +bbdb (2.34.cvs20020819-1) unstable; urgency=low + + * Newest CVS checkout. + + -- Joerg Jaspert <joerg@debian.org> Tue, 20 Aug 2002 22:20:26 +0200 + +bbdb (2.34.cvs20020703-1) unstable; urgency=low + + * Newest cvs checkout. + * (require 'bbdb-autloads) in startup file (closes: #152435) + + -- Joerg Jaspert <joerg@debian.org> Wed, 10 Jul 2002 12:03:34 +0200 + +bbdb (2.34.cvs20020418-3) unstable; urgency=low + + * Added bbdb-pilot-jwz.el as suggested in (closes: #144465) + I dont have a handheld, so i cant test it. (Hint :) ) + + -- Joerg Jaspert <joerg@debian.org> Fri, 26 Apr 2002 00:13:03 +0200 + +bbdb (2.34.cvs20020418-2) unstable; urgency=high + + * Urgency=high because the Bugfix for #143463 should really go into + woody. I have not made any other changes in the emacsen-install files, + and there are no Bug Reports since my last Upload, so i think this is OK. + * I now generate some html Pages from the texinfo Source and install the + doc-base things. So you can read the bbdb documentation from your + Webbrowser if you want that. + + -- Joerg Jaspert <joerg@debian.org> Sun, 21 Apr 2002 20:02:31 +0200 + +bbdb (2.34.cvs20020418-1) unstable; urgency=low + + * New Upstream release. This fixes bbdb-gui which (closes: #143463) + * Changed my Email Address. + + -- Joerg Jaspert <joerg@debian.org> Thu, 18 Apr 2002 20:53:56 +0200 + +bbdb (2.34.cvs20020404-2) unstable; urgency=low + + * Changed emacsen-install: + Hide make autoloads output for the user and redirect it to the Compile-Log + Tell the User that the Byte-Compile of bbdb could be a long-running process. + + -- Joerg Jaspert (JJ) <joerg@goliathbbs.dnsalias.net> Mon, 8 Apr 2002 15:42:46 +0200 + +bbdb (2.34.cvs20020404-1) unstable; urgency=low + + * If a Variable in Makefile changes between two releases it is very + helpful to change it in the calling installscript too. Thx to + James LewisMoss for this. This (closes: #141207) + * New CVS checkout. bbdb-merge.el changed. + * I now package the bits/ subdir with bbdb. It is *not* official part + of bbdb. So i only make a .tar.gz of it and place it into + /usr/share/doc/bbdb. Have a look at it and see if you find some + things useful. If there is enough demand for one thing i can install it with + bbdb (if License is clear). + + -- Joerg Jaspert (JJ) <joerg@goliathbbs.dnsalias.net> Thu, 4 Apr 2002 23:48:32 +0200 + +bbdb (2.34.cvs20020330-4) unstable; urgency=low + + * Im so stupid blind. bbdb needs bbdb-autoloads.el. I must generate it before i compile + the package at install-time. If not we have a not existing bbdb-autoloads.el so bbdb + cant load anything and crashes. Argh, i hate me. I shold read INSTALL full. Next time... + I now generate bbdb-autoloads.el and bbdb works again. Sorry for this stupidity. + It (closes: #140968) + + -- Joerg Jaspert (JJ) <joerg@goliathbbs.dnsalias.net> Wed, 3 Apr 2002 19:45:36 +0200 + +bbdb (2.34.cvs20020330-3) unstable; urgency=low + + * Hmm, i should look if I really remove all installed files between my tests. I left some + crap and all worked fine. So i cant see that Makefile.in is neccessary. + Added it again. + * Apply a patch to the Makefile in /usr/share/emacs/site-lisp which really should remove + checking for configure.ac. This two should (closes: #140868) + + -- Joerg Jaspert (JJ) <joerg@goliathbbs.dnsalias.net> Tue, 2 Apr 2002 12:38:53 +0200 + +bbdb (2.34.cvs20020330-2) unstable; urgency=low + + * It now works to look at the bbdb info files with emacs, so this + should (closes: #111769) + * It should also (closes: #139287) + * Argh. If i want to install the info files without dh_installinfo i + have to copy them to the Packagedir. + * Suggest tetex-base. + * Install the .tex files for bbdb-print in /usr/share/texmf/tex/bbdb so + one can use bbdb-print without any extra work required. This two + changes are for this: (closes: #101282) + * -1 was not uploaded. So i just close the bug here again. + New Maintainer. (closes: #140041) + * gzip -9 for Readme.Debain + * Remove unneccessary Makefile.in from bbdb/lisp dir. + + -- Joerg Jaspert (JJ) <joerg@goliathbbs.dnsalias.net> Mon, 1 Apr 2002 13:44:19 +0200 + +bbdb (2.34.cvs20020330-1) unstable; urgency=low + + * New Maintainer. (closes: #140041) + * My first Emacs-addon Package. Hope it works. + * New Version. Used CVS from 30 March 2002 + * Added w3-el-e21 to Suggests. + * Changed URL in debian/copyright to point to right Site. + * Changed Path for License to /usr/share/common-license + * Disabled dh_installinfo in debian/rules. We do it manually so we dont need + to double it. + * Dont install Upstream README. Its just four words: Read the INSTALL file. We + dont need this for a Debian Package. :) + * Remove Files generated by configure or build-process which are not removed by + Upstream Makefiles clean target. + * Changed Depends to emacs21 | emacsen to make Lintian happy. + * Wrote manpages for the 4 Perlskripts. Better than a link to dh_undocumented. + * Use sed to change the Target all in the Makefiles so emacs-install could work. + We dont want to check for configure there so we dont check for it. :) + + -- Joerg Jaspert (JJ) <joerg@goliathbbs.dnsalias.net> Sun, 31 Mar 2002 20:15:42 +0200 + +bbdb (2.32-2) unstable; urgency=low + + * don't install FLAVOR/etc/bbdb (closes: #123612) + tex be isntalled into document directory + utils/*.el be installed into site-lisp/bbdb with byte-compile + utils/*.pl be installed into /usr/bin/ + * install /etc/emacs/site-start.d/50bbdb.el as conffile + * Build-Depends: debhelper (>> 3.0.0) + * Standards-Version: 3.5.2 + * DH_COMPAT=3 + + -- Takuo KITAME <kitame@northeye.org> Thu, 13 Dec 2001 00:45:23 +0900 + +bbdb (2.32-1) unstable; urgency=low + + * New upstream release + * fixed bashizm of emacsen-install (closes: Bug#98574) + * remove (require 'message) from init.el (closes: Bug#109062) + + -- Takuo KITAME <kitame@northeye.org> Sat, 25 Aug 2001 11:23:09 +0900 + +bbdb (2.3-2) unstable; urgency=low + + * debian/emacsen-install: insert (provide 'bbdb-autoloads) if not xemacs20 or xemacs21. (closes: Bug#88471) + + -- Takuo KITAME <kitame@northeye.org> Mon, 5 Mar 2001 00:24:20 +0900 + +bbdb (2.3-1) unstable; urgency=low + + * New upstream release + * some upstream bug ware fixed (closes: Bug#86816,Bug#83920,Bug#83601) + * fix #85283: bbdb doesn't load bbdb-autoload (closes: Bug#85283) + * fix #82338: bbdb: upgrade leaves files behind (closes: Bug#82338) + * fix #85019: bbdb complains about nonexistent directory (closes: Bug#85019) + * fix #78721: calls switch-to-buffer(-1) on exit, xemacs doesn't like this (closes: Bug#78721) + + -- Takuo KITAME <kitame@northeye.org> Sun, 4 Mar 2001 02:51:34 +0900 + +bbdb (2.2-1) unstable; urgency=low + + * New upstream release + * cloese: #82338: bbdb: upgrade leaves files behind + * closes: #81653: bbdb-complete-name fails, + * closes: #78564: bbdb breaks gnus + * closes: #80838: bbdb: perl scripts broken + + -- Takuo KITAME <kitame@northeye.org> Fri, 26 Jan 2001 11:57:09 +0900 + +bbdb (2.00.06.20001116cvs-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME <kitame@northeye.org> Wed, 29 Nov 2000 08:22:33 +0900 + +bbdb (2.00.06.20001015cvs-3) unstable; urgency=low + + * Support xemacs21 (clsoes: Bug#76254) + + -- Takuo KITAME <kitame@northeye.org> Mon, 13 Nov 2000 10:21:54 +0900 + +bbdb (2.00.06.20001015cvs-2) unstable; urgency=low + + * install info + * debian/bbdb-init.el: + (require 'bbdb) + (bbdb-initialize) + * lisp/bbdb.el: at defun bbdb-insinuate-message, + (if (not (boundp 'message-mode-map)) + (require 'message)) + (closes: Bug#74998) + + -- Takuo KITAME <kitame@northeye.org> Wed, 18 Oct 2000 11:04:30 +0900 + +bbdb (2.00.06.20001015cvs-1) unstable; urgency=low + + * New upstream release (CVS snapshot) + * closes: Bug#72315 bbdb 2.00 is known not to work with Emacs 20. + * debian/control: Suggests: w3-el-e20|w3-el-e19 instead of w3-el. + (closes: Bug#74194) + * put perl script. (closes: Bug#72481) + * from lisp/bbdb-hooks.el, + ;; Revision 1.58 2000/04/05 17:09:06 bbdb-writer + ;; * Autoload cookie for bbdb-header-start + It seems Bug#69182 was fixed. (closes: Bug#69182) + * (setq bbdb-electric-p t) is worked. I think it was fixed by Upstream. + (closes: Bug#52453) + * applied view-mode -1 patch. (closes: Bug#48805) + + -- Takuo KITAME <kitame@northeye.org> Tue, 17 Oct 2000 16:06:12 +0900 + +bbdb (2.00.06-1) unstable; urgency=low + + * New upstream release (closes: Bug#48316, Bug#19262) + * Work well on XEmacs (closes: Bug#12086) + * removing usr/share/xemacs20/etc/bbdb when package remove. + It was fixed in previous release. (closes: Bug#52527) + * install.log will be created as mode 644. (closes: Bug#55433) + + -- Takuo KITAME <kitame@northeye.org> Wed, 29 Mar 2000 03:09:33 +0900 + +bbdb (2.00-6) frozen unstable; urgency=high + + * Maintainer was changed. + * Fixed install script for bbdb-gnus.el (closes: Bug#59177) + + -- Takuo KITAME <kitame@northeye.org> Tue, 28 Mar 2000 13:30:34 +0900 + +bbdb (2.00-5) unstable frozen; urgency=high + + * ignore xemacs21 in the install stage. Closes: Bug#55432. + + -- Frederic Lepied <Lepied@debian.org> Thu, 24 Feb 2000 09:36:47 +0100 + +bbdb (2.00-4) unstable; urgency=low + + * applied documentation fixes from <jrv@vanzandt.mv.com>. Closes: Bug#36225. + * (bbdb-print.el): corrected invalid condition-case. Closes: Bug#36846, Bug#44355, Bug#44364. + * removed itimer Suggests:. + * really install README.debian. Closes: Bug#26687. + * (bbdb-print.el): hard code the location of TeX files. CLoses: Bug#36844. + * (bbdb-print.tex): applied patch from Mattia Monga to correct the + size of tt fonts. Closes: Bug#41268. + * avoid aborting the install when a file failed to compile. Closes: Bug#37373, Bug#40379. + + -- Frederic Lepied <Lepied@debian.org> Tue, 14 Sep 1999 21:57:24 +0200 + +bbdb (2.00-3) frozen unstable; urgency=low + + * (install): added vm target for xemacs19 and xemacs20. Fixes Bug#21940. + * (install): corrected echo placement. Fixes Bug#21496. + * (install): suppressed duplicate. Fixes Bug#21497. + * (README.debian): new file to explain how to initialize bbdb. Fixes Bug#21497. + + -- Frederic Lepied <Lepied@debian.org> Mon, 4 May 1998 05:56:21 +0200 + +bbdb (2.00-2) frozen unstable; urgency=low + + * (control): added a dependency on make. + * (control): priority optional. + * (control): suggests vm, w3-el, gnuserv and itimer. + * (install): byte compile with -no-site-file. + + -- Frederic Lepied <Lepied@debian.org> Sun, 19 Apr 1998 08:11:15 +0200 + +bbdb (2.00-1) unstable; urgency=low + + * new upstream version. + + -- Frederic Lepied <Lepied@Debian.org> Wed, 18 Mar 1998 21:45:28 +0100 + +bbdb (1.55unoff-1.1) unstable; urgency=low + + * Non-maintainer release. + + * Updated for new emacsen requirements. + + * Removed empty README.Debian file. + + * Removed debmake dependencies--made it easier to fix everything else. + + * Updated to standards 2.4.0.0. + + -- Ben Pfaff <pfaffben@pilot.msu.edu> Thu, 5 Mar 1998 11:48:24 -0500 + +bbdb (1.55unoff-1) unstable; urgency=low + + * upstream release. + * removed gnus-bbdb.el for lack of copyright and integration into + upstream bbdb-gnus. + + -- Frederic Lepied <Lepied@debian.org> Sun, 26 Oct 1997 11:34:06 +0100 + +bbdb (1.54unoff-1) unstable; urgency=low + + * new maintainer. + * new upstream release. + * Added the missing P binding for bbdb-print in bbdb.el. + * Added gnus-bbdb.el to work with newer version of gnus. + + -- Frederic Lepied <Lepied@debian.org> Fri, 17 Oct 1997 22:54:11 +0200 + + @@ -0,0 +1 @@ +9 @@ -0,0 +1,23 @@ +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: git://github.com/barak/BBDB.git +Vcs-Browser: http://github.com/barak/BBDB +Homepage: http://bbdb.sourceforge.net/ + +Package: bbdb +Architecture: all +Depends: make, emacs24 | emacs23 | emacsen, ${misc:Depends}, ${perl:Depends} +Suggests: vm, w3m-el, gnuserv, gnus|t-gnus, perl +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. diff --git a/copyright b/copyright new file mode 100644 index 0000000..031940c --- /dev/null +++ b/copyright @@ -0,0 +1,70 @@ +This package was debianized by Frederic Lepied <Lepied@debian.org> on +Mon, 17 Oct 1997 23:09:25 +0200. + +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. + +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/patches/Makefile.patch b/patches/Makefile.patch new file mode 100644 index 0000000..820fb8a --- /dev/null +++ b/patches/Makefile.patch @@ -0,0 +1,22 @@ +--- 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/patches/debian-changes b/patches/debian-changes new file mode 100644 index 0000000..795314b --- /dev/null +++ b/patches/debian-changes @@ -0,0 +1,494 @@ +Description: <short summary of the patch> + TODO: Put a short summary on the line above and replace this paragraph + with a longer explanation of this change. Complete the meta-information + with other relevant fields (see below for details). To make it easier, the + information below has been extracted from the changelog. Adjust it or drop + it. + . + bbdb (2.36-4) unstable; urgency=medium + . + * engage dh autoreconf, rm ./configure, relax regarding ./configure +x bit + * updates to debian/README.Debian and debian/README.source + * remove CVS keyword expansion artifacts + * add savannah repo pointers to bbdb.texinfo + * remove PHONY stuff in debian/rules + * remove stray old-style quasiquote in macro + * allow emacs24 to satisfy dependencies + * bump standards version, dh version + * single debian patch source option +Author: Barak A. Pearlmutter <bap@debian.org> + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- bbdb-2.36.orig/ChangeLog ++++ bbdb-2.36/ChangeLog +@@ -1,3 +1,12 @@ ++2010-06-03 Barak A. Pearlmutter <barak@cs.nuim.ie> ++ ++ * texinfo/bbdb.texinfo: include pointers to github repo. ++ ++2010-09-29 Julien Danjou <julien@danjou.info> ++ ++ * lisp/bbdb-gnus.el (bbdb/gnus-split-myaddr-regexp): Remove usage ++ of deprecated gnus-local-domain. ++ + 2010-04-20 Barak A. Pearlmutter <barak@cs.nuim.ie> + + * README: Emacs, meaning both GNU Emacs and XEmacs. +--- /dev/null ++++ bbdb-2.36/bits/bbdb-adapt-ispell.el +@@ -0,0 +1,120 @@ ++;;; bbdbadapt-ispell.el --- Use the BBDB to insert a gcc field ++ ++;; Copyright (C) 2009 Uwe Brauer ++ ++;; Author: Uwe Brauer oub@mat.ucm.es ++;; Maintainer: Uwe Brauer oub@mat.ucm.es ++;; Created: 17 Mar 2009 ++;; Version: 1.0 ++;; Keywords: ++ ++ ++;; 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 1, 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. ++ ++;; A copy of the GNU General Public License can be obtained from this ++;; program's author (send electronic mail to oub@mat.ucm.es) or from ++;; the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA ++;; 02139, USA. ++ ++;; LCD Archive Entry: ++;; bbdbadpt-gcc|Uwe Brauer|oub@mat.ucm.es ++;; |Use the BBDB to insert a gcc field ++;; |Date|Revision|~/packages/bbdbadpt-gcc.el ++ ++;;; Commentary: ++;; I wanted to have the ispell dict selected ++;; based on a relevant bbdb entry which I call ispell-dict. ++;; This is what the code does. ++ ++;; The starting point was some code provided to me by Robert ++;; Fenk. However the problem with that code was that it took the gcc ++;; field from some entry of the BBDB buffer and if there was more than ++;; on entry often the wrong string was inserted. So I had to use code ++;; which extracted the correct BBDB entry from the TO field . I ++;; succeeded by using to a large extend code from sigadapt.el written ++;; by by C.Queinnec (University of Paris 6 & INRIA) ++;; ++ ++;;; Change log: ++;; Revision 1.1 2009/03/17 17:27:31 oub ++;; Initial revision ++;; ++;; Revision 1.2 2009/03/17 16:50:20 oub ++;; modify the central function ++;; ++;; Revision 1.1 2009/03/17 16:32:26 oub ++;; Initial revision ++;; ++ ++;;; Code: ++ ++ ++ ++ ++(defun bbdbispelladpt-search-record (to) ++ "Search a BBDB record associated to TO or return NIL." ++ (let* ((data (mail-extract-address-components to)) ++ (name (car data)) ++ (net (car (cdr data)))) ++ (if (equal name net) (setq name nil)) ++ (if (and net bbdb-canonicalize-net-hook) ++ (setq net (bbdb-canonicalize-address net))) ++ (bbdb-search-simple name net))) ++ ++(defun bbdbispelladpt-try-bbdbispell-new () ++ "Try to adapt non-interactively the current bbdbispell. ++This function looks silently in the current message to find how to ++choose the bbdbispell. It does nothinng if not enough information is ++present. This function is useful in a hook." ++ (save-excursion ++ (condition-case nil ++ (progn ++ (goto-char (point-min)) ++ (let ((record (bbdbispelladpt-search-record ++ (bbdb-extract-field-value "To")))) ++ (if record ++ (let ((signame (bbdbispelladpt-retrieve-bbdbispell record))) ++ (when (and (stringp signame) (string= signame "castellano8")) ++ (ispell-change-dictionary "castellano8" nil)) ++ (when (and (stringp signame) (string= signame "english")) ++ (ispell-change-dictionary "american" nil )) ++ (when (and (stringp signame) (string= signame "deutsch")) ++ (ispell-change-dictionary "deutsch8" nil)) ++ (when (and (stringp signame) (string= signame "french")) ++ (ispell-change-dictionary "francais" nil))))))))) ++ ++ ++ ++ ++(defun bbdbispelladpt-retrieve-bbdbispell (&optional record) ++ "Retrieve the bbdbispell (a symbol) associated to a mailee. ++The search is done through a BBDB record. " ++ (if (not record) ++ (save-excursion ++ (goto-char (point-min)) ++ (let* ((to (bbdb-extract-field-value "To")) ++ (rec (bbdbispelladpt-search-record to)) ) ++ (if rec (bbdbispelladpt-do-retrieve-bbdbispell rec) ++ (progn (message "No bound record") ++ nil)))) ++ (bbdbispelladpt-do-retrieve-bbdbispell record) ) ) ++ ++(defun bbdbispelladpt-do-retrieve-bbdbispell (record) ++ (let ((signame ++ (bbdb-record-getprop record 'ispell-dict))) ++ (if (stringp signame) ++ (setq signame signame)) ++ signame)) ++ ++ ++(provide 'bbdbadapt-ispell) ++ ++;;; BBDBADPT-ISPELL.EL ends here +--- bbdb-2.36.orig/bits/bbdb-gnokii.el ++++ bbdb-2.36/bits/bbdb-gnokii.el +@@ -8,7 +8,6 @@ + ;; Len Trigg <len@reeltwo.com> + ;; Maintainer: Martin Schwenke <martin@meltin.net> + ;; Created: 23 August 2000 +-;; $Id: bbdb-gnokii.el,v 1.16 2006/04/19 13:02:09 martins Exp $ + ;; Keywords: BBDB, Nokia, gnokii + ;; X-URL: http://meltin.net/hacks/emacs/ + +@@ -172,7 +171,6 @@ + + ;;; History: + +-;; $Log: bbdb-gnokii.el,v $ + ;; Revision 1.16 2006/04/19 13:02:09 martins + ;; Function bbdb-gnokii-do-name now just uses firstname if lastname is + ;; not set. Suggested by Magnus Henoch <mange@freemail.hu>. +--- bbdb-2.36.orig/bits/bbdb-ldif.el ++++ bbdb-2.36/bits/bbdb-ldif.el +@@ -1,6 +1,5 @@ + ;;; Copyright (C) 1998,2000 by Niels Elgaard Larsen <elgaard@diku.dk> + +-;;; $Log: bbdb-ldif.el,v $ + ;;; Revision 1.1 2006/02/04 15:35:15 joerg + ;;; Added + ;;; +--- bbdb-2.36.orig/bits/bbdb-mail-folders.el ++++ bbdb-2.36/bits/bbdb-mail-folders.el +@@ -61,7 +61,6 @@ + ;(310) 822-1511 University of Southern California + ;http://www.isi.edu/div7/people/cengiz.home + +-;$Modified: Fri Nov 20 11:41:56 1998 by ville@isr.umd.edu $ + ; GV: - always expand filename to avoid duplicate similar path + ; - use abbreviation alist for home directory (comes from mode-line) + +--- bbdb-2.36.orig/bits/bbdb-mew.el ++++ bbdb-2.36/bits/bbdb-mew.el +@@ -11,7 +11,6 @@ + ;; Mitsuo Nishizawa <mitsuo@phys2.med.osaka-u.ac.jp> + ;; Maintenance: Chris Beggy + ;; Created: 1996/11/04 +-;; Version: $Id: bbdb-mew.el,v 1.5 2001/12/29 16:12:20 chrisb Exp $ + + ;; Keywords: mail, BBDB + +--- bbdb-2.36.orig/bits/bbdb-obsolete.el ++++ bbdb-2.36/bits/bbdb-obsolete.el +@@ -4,7 +4,6 @@ + + ;; Author: Colin Rafferty <colin@xemacs.org> + ;; Keywords: bbdb, net, obsolete +-;; Version: $Id: bbdb-obsolete.el,v 1.3 2006/02/04 15:34:30 joerg Exp $ + + ;; 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 +--- bbdb-2.36.orig/bits/bbdb-pgp.el ++++ bbdb-2.36/bits/bbdb-pgp.el +@@ -5,7 +5,6 @@ + ;; Author: Kevin Davidson tkld@quadstone.com + ;; Maintainer: Kevin Davidson tkld@quadstone.com + ;; Created: 10 Nov 1997 +-;; Version: $Revision: 1.6 $ + ;; Keywords: PGP BBDB message mailcrypt + + +@@ -27,7 +26,7 @@ + ;; LCD Archive Entry: + ;; bbdb-pgp|Kevin Davidson|tkld@quadstone.com + ;; |Use BBDB to store PGP preferences +-;; |$Date: 2003/08/11 08:54:35 $|$Revision: 1.6 $|~/packages/bbdb-pgp.el ++;; |Date|Revision|~/packages/bbdb-pgp.el + + ;;; Commentary: + ;; +@@ -74,11 +73,6 @@ + (require 'bbdb) + (condition-case nil (require 'mailcrypt) (error nil)) + +-(defconst bbdb/pgp-version (substring "$Revision: 1.6 $" 11 -2) +- "$Id: bbdb-pgp.el,v 1.6 2003/08/11 08:54:35 waider Exp $ +- +-Report bugs to: Kevin Davidson tkld@quadstone.com") +- + ;;;###autoload + (defgroup bbdb-utilities-pgp nil + "Automatically sign and/or encrypt outgoing messages." +--- bbdb-2.36.orig/bits/bbdb-signature.el ++++ bbdb-2.36/bits/bbdb-signature.el +@@ -23,7 +23,7 @@ + ;;; LCD Archive Entry: + ;;; mail-signature|Kevin Davidson|<tkld@quadstone.com> + ;;; |Add context sensitive signature +-;;; |$Date: 2001/03/01 15:38:31 $|$Revision: 1.1 $|~/packages/mail-signature.el ++;;; |Date|Revision|~/packages/mail-signature.el + + ;;; Commentary: + +@@ -54,7 +54,6 @@ + ;;; (setq message-signature 'mail-signature) + + ;;; Change log: +-;; $Log: bbdb-signature.el,v $ + ;; Revision 1.1 2001/03/01 15:38:31 waider + ;; More bits, possibly incompatible with 2.00.06. Use at own risk. + ;; +@@ -79,11 +78,6 @@ + + ;;; Code: + +-(defconst mail-signature-version (substring "$Revision: 1.1 $" 11 -2) +- "$Id: bbdb-signature.el,v 1.1 2001/03/01 15:38:31 waider Exp $ +- +-Report bugs to: Kevin Davidson <tkld@quadstone.com>") +- + + (defvar bbdb-signature-field 'signature + "*BBDB field used to store signature for") +--- bbdb-2.36.orig/bits/bbdb-sort-mailrc.el ++++ bbdb-2.36/bits/bbdb-sort-mailrc.el +@@ -18,7 +18,6 @@ + ;;; BBDB-BNG + ;;; Various functions I have added to enhance the big brother database. + ;;; Boris Goldowsky, <boris@cs.rochester.edu> +-;;; $Revision: 1.1 $ $Date: 2001/01/24 21:19:08 $ + ;;; + ;;; This file allows you to do the following things: + ;;; * Sort by firstname or company rather than last name. +--- bbdb-2.36.orig/bits/bbdb-vcard-export.el ++++ bbdb-2.36/bits/bbdb-vcard-export.el +@@ -19,7 +19,6 @@ + ;; + ;; Author: Jim Hourihan <jimh@panix.com> + ;; Created: 2002-08-08 +-;; Version: $Id: bbdb-vcard-export.el,v 1.3 2006/03/14 00:00:00 malcolmp Exp $ + ;; Keywords: vcard ipod + + ;;; Commentary +--- bbdb-2.36.orig/bits/bbdb-vcard-import.el ++++ bbdb-2.36/bits/bbdb-vcard-import.el +@@ -18,7 +18,6 @@ + ;; + ;; Author: Marcus Crestani <crestani@informatik.uni-tuebingen.de> + ;; Created: 2008-01-03 +-;; Version: $Id: bbdb-vcard-import.el,v 1.6 2008/01/31 16:19:15 cvs Exp $ + ;; Keywords: vcard bbdb + ;; + ;; This requires vcard.el by NoahFriedman for the importer to work. +--- bbdb-2.36.orig/bits/bbdbpalm.el ++++ bbdb-2.36/bits/bbdbpalm.el +@@ -5,7 +5,6 @@ + ;; Author: Neil W. Van Dyke <neil@neilvandyke.org> + ;; Version: 0.3 + ;; X-URL: http://www.neilvandyke.org/bbdbpalm/ +-;; X-CVS: $Id: bbdbpalm.el,v 1.26 2006-11-12 04:46:58 neil Exp $ + + ;; This 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 +--- bbdb-2.36.orig/bits/vcard.el ++++ bbdb-2.36/bits/vcard.el +@@ -7,8 +7,6 @@ + ;; Keywords: vcard, mail, news + ;; Created: 1997-09-27 + +-;; $Id: vcard.el,v 1.11 2000/06/29 17:07:55 friedman Exp $ +- + ;; 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) +--- bbdb-2.36.orig/configure.ac ++++ bbdb-2.36/configure.ac +@@ -23,7 +23,7 @@ dnl Inc., 675 Mass Ave, Cambridge, MA 02 + + dnl Process this file with autoconf to produce a new configure script + +-AC_PREREQ(2.65) ++AC_PREREQ([2.67]) + + BBDB_PRE_INIT + AC_INIT([BBDB],[BBDB_VERSION],[bbdb-info@lists.sourceforge.net]) +--- bbdb-2.36.orig/html/faq.html ++++ bbdb-2.36/html/faq.html +@@ -11,7 +11,7 @@ + in the mailing list archives. Feel free to mail me any things that should + be on this list. + +- <p>This is the BBDB FAQ, $Revision: 1.6 $.</p> ++ <p>This is the BBDB FAQ.</p> + + <dl> + <dt>About BBDB and this document</dt> +@@ -332,6 +332,5 @@ + + <hr> + <address>bbdb-faq@waider.ie</address> +- $Date: 2007/01/30 22:05:41 $ + </body> + </html> +--- bbdb-2.36.orig/lisp/bbdb-gnus.el ++++ bbdb-2.36/lisp/bbdb-gnus.el +@@ -580,13 +580,11 @@ excellent choice." + (defcustom bbdb/gnus-split-myaddr-regexp + (concat "^" (user-login-name) "$\\|^" + (user-login-name) "@\\([-a-z0-9]+\\.\\)*" +- (or gnus-local-domain (message-make-domain) ++ (or (message-make-domain) + (system-name) "") "$") +- "*This regular expression should match your address as found in the +-From header of your mail. You should make sure gnus-local-domain or +-gnus-use-generic-from are set before loading this module, if they differ +-from (system-name). If you send mail/news from multiple addresses, then +-you'll likely have to set this yourself anyways." ++ "This regular expression should match your address as found in ++the From header of your mail. If you send mail/news from multiple ++addresses, then you'll likely have to set this yourself anyway." + :group 'bbdb-mua-specific-gnus-splitting + :type 'string) + +--- bbdb-2.36.orig/lisp/bbdb-mhe.el ++++ bbdb-2.36/lisp/bbdb-mhe.el +@@ -33,20 +33,20 @@ + + (defmacro bbdb/mh-cache-key (message) + "Return a (numeric) key for MESSAGE" +- (`(let* ((attrs (file-attributes (, message))) +- (status-time (nth 6 attrs)) +- (status-time-2 (cdr status-time)) +- (inode (nth 10 attrs))) +- (logxor (if (integerp inode) ;; if inode is larger than an emacs int, +- inode ;; it's returned as a dotted pair +- (car inode)) +- (car status-time) +- ;; We need the following test because XEmacs returns the +- ;; status time as a dotted pair, whereas FSF and Epoch +- ;; return it as list. +- (if (integerp status-time-2) +- status-time-2 +- (car status-time-2)))))) ++ `(let* ((attrs (file-attributes , message)) ++ (status-time (nth 6 attrs)) ++ (status-time-2 (cdr status-time)) ++ (inode (nth 10 attrs))) ++ (logxor (if (integerp inode) ;; if inode is larger than an emacs int, ++ inode ;; it's returned as a dotted pair ++ (car inode)) ++ (car status-time) ++ ;; We need the following test because XEmacs returns the ++ ;; status time as a dotted pair, whereas FSF and Epoch ++ ;; return it as list. ++ (if (integerp status-time-2) ++ status-time-2 ++ (car status-time-2))))) + + ;;;###autoload + (defun bbdb/mh-update-record (&optional offer-to-create) +--- bbdb-2.36.orig/texinfo/bbdb.texinfo ++++ bbdb-2.36/texinfo/bbdb.texinfo +@@ -3527,6 +3527,10 @@ where @var{NAME} is the symbol for the n + (If you are looking for a way to create mailing lists with @b{BBDB}, you + should be looking at the section on @xref{Mail Sending Interfaces}.) + ++The locus of BBDB development is moving to savannah, ++@code{https://savannah.nongnu.org/projects/bbdb/}, ++making the below of mainly historic interest. ++ + There are three mailing lists for the @b{BBDB}. + @code{bbdb-info@@lists.sourceforge.net} gets moderate traffic, and is + intended for the discussion and distribution of development versions of +@@ -3543,6 +3547,9 @@ intended for developers to follow the ch + development version. Developers of the @b{BBDB} should consider to + subscribe to this list. + ++There is also an issue tracker associated with the @b{BBDB} ++repository at @code{http://github.com/barak/BBDB}. ++ + @node Changes, The Latest Version, Mailing Lists, Top + @section Changes in this Version + +@@ -3592,6 +3599,13 @@ and Courier fonts are used. + @node The Latest Version, The Future, Changes, Top + @section The Latest Version + ++The locus of BBDB development is moving to savannah, ++@code{https://savannah.nongnu.org/projects/bbdb/}, ++making the below of mainly historic interest. ++Development of the new v3 version, as well and maintenance releases of ++v2.x, will be available in the associated git repository, ++@code{git://git.savannah.nongnu.org/bbdb.git}. ++ + @noindent + Released versions of the @b{BBDB} can be found at the + following site: +@@ -3601,6 +3615,8 @@ following site: + WWW: @code{http://bbdb.sourceforge.net} + @item + FTP: @code{ftp://ftp.sourceforge.net/pub/bbdb} ++@item ++Git Fork: @code{http://github.com/barak/BBDB} + @end itemize + + @noindent +@@ -3612,6 +3628,8 @@ following ways: + WWW: @code{http://bbdb.sourceforge.net} + @item + Anonymous CVS: See @code{http://bbdb.sourceforge.net} for instructions. ++@item ++Git Fork: @code{http://github.com/barak/BBDB} + @end itemize + + Users of development versions of the @b{BBDB} should subscribe to the +--- bbdb-2.36.orig/utils/bbdb-unlazy-lock.pl ++++ bbdb-2.36/utils/bbdb-unlazy-lock.pl +@@ -2,9 +2,6 @@ + # + # Author: Christopher Kline <ckline@media.mit.edu> + # +-# $Id: bbdb-unlazy-lock.pl,v 1.1 1997/10/06 00:56:14 simmonmt Exp $ +-# +-# $Log: bbdb-unlazy-lock.pl,v $ + # Revision 1.1 1997/10/06 00:56:14 simmonmt + # Initial revision + # diff --git a/patches/lisp/Makefile.patch b/patches/lisp/Makefile.patch new file mode 100644 index 0000000..f27ff91 --- /dev/null +++ b/patches/lisp/Makefile.patch @@ -0,0 +1,14 @@ +*** 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/patches/series b/patches/series new file mode 100644 index 0000000..7bb8252 --- /dev/null +++ b/patches/series @@ -0,0 +1 @@ +debian-changes @@ -0,0 +1,26 @@ +#!/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/ diff --git a/source/format b/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) @@ -0,0 +1,5 @@ +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 |