diff -ub easypg-0.0.16.org/debian/changelog easypg-0.0.16/debian/changelog --- easypg-0.0.16.org/debian/changelog 2009-09-25 18:13:35.000000000 +0000 +++ easypg-0.0.16/debian/changelog 2009-09-25 18:40:28.000000000 +0000 @@ -1,3 +1,16 @@ +easypg (0.0.16-2.1) unstable; urgency=low + + * NMU + * Don't byte-compile and don't add this package to load-path for emacs23. + (closes: #503480, #543790) + * Fix download URL in watch file. + * Make package lintian clean: + control.in (Standards-Version): Increase to 3.8.3. + control.in (Build-Depends): Depend on debhelper (>5) + control.in (Depends): add {misc:Depends} + + -- Ralf Doering Fri, 25 Sep 2009 12:48:57 +0000 + easypg (0.0.16-2) unstable; urgency=low * watch: Fix a download URL. diff -ub easypg-0.0.16.org/debian/control easypg-0.0.16/debian/control --- easypg-0.0.16.org/debian/control 2009-09-25 18:13:35.000000000 +0000 +++ easypg-0.0.16/debian/control 2009-09-25 18:24:22.000000000 +0000 @@ -2,13 +2,13 @@ Section: utils Priority: optional Maintainer: OHASHI Akira -Build-Depends: cdbs, debhelper, gnupg (>= 1.4.3) +Build-Depends: cdbs, debhelper, gnupg (>= 1.4.3), debhelper (> 5) Build-Depends-Indep: autoconf, automake1.9 | automaken, emacs | emacsen -Standards-Version: 3.8.0 +Standards-Version: 3.8.3 Package: easypg Architecture: all -Depends: emacs | emacsen, gnupg (>= 1.4.3) +Depends: emacs | emacsen, gnupg (>= 1.4.3), ${misc:Depends} Description: yet another GnuPG interface for Emacs EasyPG is an all-in-one GnuPG interface for Emacs. It has two aspects: convenient tools which allow to use GnuPG from Emacs (EasyPG diff -ub easypg-0.0.16.org/debian/control.in easypg-0.0.16/debian/control.in --- easypg-0.0.16.org/debian/control.in 2009-09-25 18:13:35.000000000 +0000 +++ easypg-0.0.16/debian/control.in 2009-09-25 13:00:59.000000000 +0000 @@ -2,13 +2,13 @@ Section: utils Priority: optional Maintainer: OHASHI Akira -Build-Depends: @cdbs@, gnupg (>= 1.4.3) +Build-Depends: @cdbs@, gnupg (>= 1.4.3), debhelper (> 5) Build-Depends-Indep: autoconf, automake1.9 | automaken, emacs | emacsen -Standards-Version: 3.8.0 +Standards-Version: 3.8.3 Package: easypg Architecture: all -Depends: emacs | emacsen, gnupg (>= 1.4.3) +Depends: emacs | emacsen, gnupg (>= 1.4.3), ${misc:Depends} Description: yet another GnuPG interface for Emacs EasyPG is an all-in-one GnuPG interface for Emacs. It has two aspects: convenient tools which allow to use GnuPG from Emacs (EasyPG Only in easypg-0.0.16/debian/: easypg Only in easypg-0.0.16/debian/: easypg.debhelper.log Only in easypg-0.0.16/debian/: easypg.postinst.debhelper Only in easypg-0.0.16/debian/: easypg.prerm.debhelper Only in easypg-0.0.16/debian/: easypg.substvars diff -ub easypg-0.0.16.org/debian/emacsen-install easypg-0.0.16/debian/emacsen-install --- easypg-0.0.16.org/debian/emacsen-install 2009-09-25 18:13:35.000000000 +0000 +++ easypg-0.0.16/debian/emacsen-install 2009-09-21 13:24:25.000000000 +0000 @@ -22,6 +22,12 @@ # EXCLUDED_xemacs21="" # EXCLUDED_emacs_snapshot="" +EXCLUDED_FLAVORS="emacs emacs23" + +for F in $EXCLUDED_FLAVORS; do + [ ${FLAVOR} = $F ] && exit 0; +done + SOURCEONLY_ALL="COMPILE" eval included_here=\$$(echo INCLUDED_$FLAVOR | tr - _) @@ -40,7 +46,6 @@ eval echo \$$i done | sort -u) -if [ ${FLAVOR} = emacs ]; then exit 0; fi # Install-info-altdir does not actually exist. # Maybe somebody will write it. diff -ub easypg-0.0.16.org/debian/emacsen-startup easypg-0.0.16/debian/emacsen-startup --- easypg-0.0.16.org/debian/emacsen-startup 2009-09-25 18:13:35.000000000 +0000 +++ easypg-0.0.16/debian/emacsen-startup 2009-09-25 18:23:57.000000000 +0000 @@ -5,6 +5,8 @@ ;; Originally contributed by Nils Naumann ;; Modified by Dirk Eddelbuettel ;; Adapted for dh-make by Jim Van Zandt +;; Adapted to only load on emacsen where we have built this package +;; by Ralf Doering ;; The easypg package follows the Debian/GNU Linux 'emacsen' policy and ;; byte-compiles its elisp files for each 'emacs flavor' (emacs19, @@ -13,8 +15,11 @@ ;; We have to add this to the load-path: (if (not (file-exists-p "/usr/share/emacs/site-lisp/easypg")) (message "Package easypg removed but not purged. Skipping setup.") - (debian-pkg-add-load-path-item - (concat "/usr/share/" (symbol-name debian-emacs-flavor) - "/site-lisp/easypg")) + (let ((easypg-pkg-path (concat "/usr/share/" (symbol-name debian-emacs-flavor) "/site-lisp/easypg"))) + (if (not (file-exists-p easypg-pkg-path)) + (message "Package easypg not available for this emacs flavour. Skipping.") + (debian-pkg-add-load-path-item easypg-pkg-path) + (require 'epa-setup)))) + + - (require 'epa-setup)) Only in easypg-0.0.16/debian/: files diff -ub easypg-0.0.16.org/debian/watch easypg-0.0.16/debian/watch --- easypg-0.0.16.org/debian/watch 2009-09-25 18:13:35.000000000 +0000 +++ easypg-0.0.16/debian/watch 2009-09-25 12:34:37.000000000 +0000 @@ -19,7 +19,7 @@ # Uncomment to find new files on sourceforge, for debscripts >= 2.9 # http://sf.net/#PACKAGE#/#PACKAGE#-(.*)\.tar\.gz -opts="downloadurlmangle=s/sourceforge/iij.dl.sourceforge/;s/downloads\///;s/projects\///,\ +opts="downloadurlmangle=s/sourceforge/iij.dl.sourceforge/;s/downloads\///;s/projects\///;s/\/$//,\ uversionmangle=s/-beta/~beta/;s/-rc/~rc/;s/-preview/~preview/" \ http://sourceforge.jp/projects/epg/files/ \ - /projects/epg/downloads/.*/epg-(.*\..*)\.tar.gz debian uupdate + /projects/epg/downloads/.*/epg-(.*\..*)\.tar.gz/ debian uupdate