On May 30, 2014 at 11:08AM +0200, holger (at layer-acht.org) wrote: > during a test with piuparts I noticed your package fails to upgrade from > wheezy. It installed fine in wheezy, then the upgrade to jessie fails.
To fix this RC bug and #680029, I'll NMU soon with the attached patch. Thanks, -- Tatsuya Kinoshita
diff --git a/debian/changelog b/debian/changelog index 53f46ed..b1e979b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +lsdb (0.11-10.1) unstable; urgency=medium + + * Non-maintainer upload. + * Check apel and flim to byte-compile (closes: #749852) + * New patch lsdb-make-local-hook.patch (closes: #680029) + * Refresh debian/control with *.in + + -- Tatsuya Kinoshita <t...@debian.org> Sun, 26 Oct 2014 07:31:09 +0900 + lsdb (0.11-10) unstable; urgency=low * rules (clean): Avoid lintian warning. diff --git a/debian/control b/debian/control index 01f777b..d7fb1d6 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,9 @@ Source: lsdb Section: mail Priority: optional Maintainer: OHASHI Akira <b...@debian.org> -Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5) +Build-Depends: cdbs, + debhelper, + dh-buildinfo Standards-Version: 3.7.2 Package: lsdb diff --git a/debian/emacsen-install b/debian/emacsen-install index 69d809d..ac4d64e 100644 --- a/debian/emacsen-install +++ b/debian/emacsen-install @@ -41,6 +41,8 @@ sourceonly_all=$(for i in ${!SOURCEONLY_*} ; do done | sort -u) if [ ${FLAVOR} = emacs ]; then exit 0; fi +if [ ! -f "/usr/share/$FLAVOR/site-lisp/apel/poem.elc" ]; then exit 0; fi +if [ ! -f "/usr/share/$FLAVOR/site-lisp/flim/mime.elc" ]; then exit 0; fi # Install-info-altdir does not actually exist. # Maybe somebody will write it. diff --git a/debian/patches/lsdb-make-local-hook.patch b/debian/patches/lsdb-make-local-hook.patch new file mode 100644 index 0000000..486f5cf --- /dev/null +++ b/debian/patches/lsdb-make-local-hook.patch @@ -0,0 +1,26 @@ +Subject: Conditionalize make-local-hook on XEmacs +Author: "Aaron M. Ucko" <u...@debian.org> +Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=680029 + +--- lsdb-0.11.orig/lsdb.el ++++ lsdb-0.11/lsdb.el +@@ -867,7 +867,8 @@ + (autoload 'migemo-get-pattern "migemo")) + + (defun lsdb-complete-name-highlight (start end) +- (make-local-hook 'pre-command-hook) ++ (if (featurep 'xemacs) ++ (make-local-hook 'pre-command-hook)) + (add-hook 'pre-command-hook 'lsdb-complete-name-highlight-update nil t) + (save-excursion + (goto-char start) +@@ -1048,7 +1049,8 @@ + (font-lock-set-defaults) + (set (make-local-variable 'font-lock-defaults) + '(lsdb-font-lock-keywords t))) +- (make-local-hook 'post-command-hook) ++ (if (featurep 'xemacs) ++ (make-local-hook 'post-command-hook)) + (add-hook 'post-command-hook 'lsdb-modeline-update nil t) + (make-local-variable 'lsdb-modeline-string) + (setq mode-line-buffer-identification diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..be95f95 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +lsdb-make-local-hook.patch diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt)
pgpHsj95daPRP.pgp
Description: PGP signature