Control: tags 767659 + patch
Control: tags 767659 + pending

Dear maintainer,

I've prepared an NMU for poppler (versioned as 0.26.5-2.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Regards,
    S
diffstat for poppler-0.26.5 poppler-0.26.5

 changelog |   11 +++++++++++
 rules     |    5 +++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff -Nru poppler-0.26.5/debian/changelog poppler-0.26.5/debian/changelog
--- poppler-0.26.5/debian/changelog	2014-10-19 17:24:18.000000000 +0100
+++ poppler-0.26.5/debian/changelog	2014-11-10 19:29:35.000000000 +0000
@@ -1,3 +1,14 @@
+poppler (0.26.5-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Bump generated dependencies for libpoppler46 and other semi-private ABI
+    from $(UPSTREAM_VERSION) to $(DEB_VERSION)~. The patch added by 0.26.5-2
+    added new ABI, so the normal dependency was insufficient.
+    This can be reverted when upgrading to an upstream release that
+    incorporates that patch. (Closes: #767659)
+
+ -- Simon McVittie <s...@debian.org>  Mon, 10 Nov 2014 19:28:37 +0000
+
 poppler (0.26.5-2) unstable; urgency=medium
 
   * Backport upstream commit 01723aa17e836e818158dbdc56df642a290be300 to map
diff -Nru poppler-0.26.5/debian/rules poppler-0.26.5/debian/rules
--- poppler-0.26.5/debian/rules	2014-07-09 17:03:11.000000000 +0100
+++ poppler-0.26.5/debian/rules	2014-11-10 19:29:35.000000000 +0000
@@ -2,6 +2,7 @@
 
 # the upstream version (i.e. without the Debian revision)
 UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | cut -f1 -d '-')
+DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
 # symbols.in files & their "generated" file names
 SYMBOLS_in := $(wildcard debian/*.symbols.in)
 SYMBOLS_generated := $(patsubst %.in,%,$(SYMBOLS_in))
@@ -69,11 +70,11 @@
 	dh_strip --dbg-package=poppler-dbg
 
 override_dh_makeshlibs: $(SYMBOLS_generated)
-	dh_makeshlibs -plibpoppler46 -V
+	dh_makeshlibs -plibpoppler46 -V"libpoppler46 (>= $(DEB_VERSION)~)"
 	dh_makeshlibs -plibpoppler-cpp0 -V"libpoppler-cpp0 (>= 0.16)"
 	dh_makeshlibs --remaining-packages
 
 debian/%.symbols: debian/%.symbols.in
-	cat $^ | sed -e 's/#CURVER#/$(UPSTREAM_VERSION)/g' > $@
+	cat $^ | sed -e 's/#CURVER#/$(DEB_VERSION)~/g' > $@
 
 .PHONY: override_dh_auto_test

Reply via email to