[Python-modules-commits] r21396 - in packages/python-poppler/trunk/debian (6 files)

[gaspa-guest at users.alioth.debian.org]

    Date: Monday, April 23, 2012 @ 22:25:31
  Author: gaspa-guest
Revision: 21396

added dh-autoreconf build-dep, watch file updated, fixed clean target, minors

Modified:
  packages/python-poppler/trunk/debian/changelog
  packages/python-poppler/trunk/debian/control
  packages/python-poppler/trunk/debian/copyright
  packages/python-poppler/trunk/debian/patches/04-closefiles.diff
  packages/python-poppler/trunk/debian/rules
  packages/python-poppler/trunk/debian/watch

Modified: packages/python-poppler/trunk/debian/changelog
===================================================================
--- packages/python-poppler/trunk/debian/changelog	2012-04-23 20:42:16 UTC (rev 21395)
+++ packages/python-poppler/trunk/debian/changelog	2012-04-23 22:25:31 UTC (rev 21396)
@@ -1,4 +1,4 @@
-python-poppler (0.12.1-7) experimental; urgency=low
+python-poppler (0.12.1-7) unstable; urgency=low
 
   * debian/patches:
       + series: reenabled poppler-0.18.diff (Closes: #651388)

Modified: packages/python-poppler/trunk/debian/control
===================================================================
--- packages/python-poppler/trunk/debian/control	2012-04-23 20:42:16 UTC (rev 21395)
+++ packages/python-poppler/trunk/debian/control	2012-04-23 22:25:31 UTC (rev 21396)
@@ -3,10 +3,11 @@
 Priority: optional
 Maintainer: Andrea Gasparini <gaspa at yattaweb.it>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.0.50~), python-all-dev (>=  2.6.6-3~), python-all-dbg, python-gtk2-dev (>= 2.10),
+Build-Depends: debhelper (>= 7.0.50~), dh-autoreconf, quilt,
+ python-all-dev (>=  2.6.6-3~), python-all-dbg, python-gtk2-dev (>= 2.10),
  python-gobject-dev (>= 2.10.1), python-cairo-dev (>= 1.8.4), libpoppler-glib-dev (>= 0.15),
- libatk1.0-dev (>= 1.6.0),
- libxcb-render-util0-dev (>= 0.2+git36-1~) | libxcb-render0-dev, quilt
+ libatk1.0-dev (>= 1.6.0), 
+ libxcb-render-util0-dev (>= 0.2+git36-1~) | libxcb-render0-dev
 Standards-Version: 3.9.3
 X-Python-Version: >= 2.4
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-poppler/trunk/

Modified: packages/python-poppler/trunk/debian/copyright
===================================================================
--- packages/python-poppler/trunk/debian/copyright	2012-04-23 20:42:16 UTC (rev 21395)
+++ packages/python-poppler/trunk/debian/copyright	2012-04-23 22:25:31 UTC (rev 21396)
@@ -8,9 +8,8 @@
 Gian Mario Tagliaretti <gianmt at gnome.it>
 Ali Afshar <aafshar at gmail.com>
 
+Copyright © 2007-2012 Gian Mario Tagliaretti <gianmt at gnome.org>
 
-Copyright © 2007-2009 Gian Mario Tagliaretti <gianmt at gnome.org>
-
 License:
 
  This program is free software; you can redistribute it and/or modify

Modified: packages/python-poppler/trunk/debian/patches/04-closefiles.diff
===================================================================
--- packages/python-poppler/trunk/debian/patches/04-closefiles.diff	2012-04-23 20:42:16 UTC (rev 21395)
+++ packages/python-poppler/trunk/debian/patches/04-closefiles.diff	2012-04-23 22:25:31 UTC (rev 21396)
@@ -1,3 +1,11 @@
+Description: Python-poppler leaks memory while openinig/closing files.
+ Needed for pdfshuffler poppler 0.18 transition,
+   http://bugs.debian.org/660937
+Origin: https://bugs.launchpad.net/poppler-python/+bug/316722
+Bug-Ubuntu: https://bugs.launchpad.net/poppler-python/+bug/316722
+Forwarded: yes
+Last-Update: 2012-04-22
+
 --- a/poppler.defs
 +++ b/poppler.defs
 @@ -923,6 +923,7 @@

Modified: packages/python-poppler/trunk/debian/rules
===================================================================
--- packages/python-poppler/trunk/debian/rules	2012-04-23 20:42:16 UTC (rev 21395)
+++ packages/python-poppler/trunk/debian/rules	2012-04-23 22:25:31 UTC (rev 21396)
@@ -8,9 +8,8 @@
 override_dh_strip:
 	dh_strip --dbg-package=python-poppler-dbg -Xpoppler_d.so
 
-clean:
+override_dh_clean:
 	rm -fr build
-	dh $@ --with quilt,python2,autoreconf
 
 override_dh_auto_configure:
 	for pyvers in ${PYTHONS}; do \
@@ -22,14 +21,14 @@
 
 override_dh_auto_build:  
 	for pyvers in ${PYTHONS}; do \
-		(cd build/py$$pyvers/; $(MAKE) PYTHON=python$$pyvers); \
-		(cd build/py$$pyvers-dbg/; $(MAKE) PYTHON=python$$pyvers-dbg PYTHON_INCLUDES=`python$$pyvers-dbg-config --include`); \
+		$(MAKE) -C build/py$$pyvers/ PYTHON=python$$pyvers; \
+		$(MAKE) -C build/py$$pyvers-dbg/ PYTHON=python$$pyvers-dbg PYTHON_INCLUDES=`python$$pyvers-dbg-config --include`; \
 	done
 
 override_dh_auto_install:
 	for pyvers in ${PYTHONS}; do \
-	(cd build/py$$pyvers/; $(MAKE) install DESTDIR=$(CURDIR)/debian/python-poppler); \
-	(cd build/py$$pyvers-dbg/; $(MAKE) install DESTDIR=$(CURDIR)/debian/python-poppler-dbg); \
+	$(MAKE) -C build/py$$pyvers/ install DESTDIR=$(CURDIR)/debian/python-poppler; \
+	$(MAKE) -C build/py$$pyvers-dbg/ install DESTDIR=$(CURDIR)/debian/python-poppler-dbg; \
 	(cd $(CURDIR)/debian/python-poppler-dbg/usr/lib/python$$pyvers/*-packages; mv poppler.so poppler_d.so); \
 	done
 	find $(CURDIR)/debian/python-poppler -name "*.la" -delete

Modified: packages/python-poppler/trunk/debian/watch
===================================================================
--- packages/python-poppler/trunk/debian/watch	2012-04-23 20:42:16 UTC (rev 21395)
+++ packages/python-poppler/trunk/debian/watch	2012-04-23 22:25:31 UTC (rev 21396)
@@ -1,2 +1,2 @@
 version=3
-https://launchpad.net/poppler-python/trunk/development http://launchpad.net/poppler-python/.*/pypoppler-([0-9\.]*)\.tar\.gz
+https://launchpad.net/poppler-python/ trunk/development/\+download/pypoppler-(.+)\.tar\.gz