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

gaspa-guest at users.alioth.debian.org gaspa-guest at users.alioth.debian.org
Fri Apr 20 22:37:11 UTC 2012 

    Date: Friday, April 20, 2012 @ 22:37:08
  Author: gaspa-guest
Revision: 21330

moved to dh7 - added autoreconf

Modified:
  packages/python-poppler/trunk/debian/changelog
  packages/python-poppler/trunk/debian/compat
  packages/python-poppler/trunk/debian/control
  packages/python-poppler/trunk/debian/rules

Modified: packages/python-poppler/trunk/debian/changelog
===================================================================
--- packages/python-poppler/trunk/debian/changelog	2012-04-20 20:00:32 UTC (rev 21329)
+++ packages/python-poppler/trunk/debian/changelog	2012-04-20 22:37:08 UTC (rev 21330)
@@ -1,11 +1,9 @@
 python-poppler (0.12.1-7) unstable; urgency=low
 
+  * patches: reenabled poppler-0.18.diff (Closes: #651388)
   * debian/control: bump standard version to 3.9.3
-  * debian/patches:
-    + added 03-psfilenew.diff that fix a typo (Closes: #662890). Thanks to 
-      Jens Stimpfle.
-    + reenabled poppler-0.18.diff for poppler transition (Closes: #651388)
-    + renamed patches file prepending number of the patch order.
+  * debian/patches: added 03 (Closes: #662890)
+  * debian/rules: rewrite with dh7,added autoreconf (Closes: #558532)
 
  -- Andrea Gasparini <gaspa at yattaweb.it>  Fri, 06 Apr 2012 12:05:36 +0200
 

Modified: packages/python-poppler/trunk/debian/compat
===================================================================
--- packages/python-poppler/trunk/debian/compat	2012-04-20 20:00:32 UTC (rev 21329)
+++ packages/python-poppler/trunk/debian/compat	2012-04-20 22:37:08 UTC (rev 21330)
@@ -1 +1 @@
-5
+7

Modified: packages/python-poppler/trunk/debian/control
===================================================================
--- packages/python-poppler/trunk/debian/control	2012-04-20 20:00:32 UTC (rev 21329)
+++ packages/python-poppler/trunk/debian/control	2012-04-20 22:37:08 UTC (rev 21330)
@@ -3,12 +3,12 @@
 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 (>= 5), python-all-dev (>= 2.3.5-11), python-all-dbg, python-gtk2-dev (>= 2.10),
+Build-Depends: debhelper (>= 7.0.50~), 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~), python-support (>= 0.8)
+ libxcb-render-util0-dev (>= 0.2+git36-1~) | libxcb-render0-dev, quilt
 Standards-Version: 3.9.3
-XS-Python-Version: >= 2.4
+X-Python-Version: >= 2.4
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-poppler/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-poppler/trunk/
 Homepage: http://launchpad.net/poppler-python

Modified: packages/python-poppler/trunk/debian/rules
===================================================================
--- packages/python-poppler/trunk/debian/rules	2012-04-20 20:00:32 UTC (rev 21329)
+++ packages/python-poppler/trunk/debian/rules	2012-04-20 22:37:08 UTC (rev 21330)
@@ -1,83 +1,36 @@
 #!/usr/bin/make -f
-include /usr/share/python/python.mk
 
-DEB_AUTO_CLEANUP_RCS    := yes
 PYTHONS := $(shell pyversions -vr debian/control)
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	set -e; for pyvers in ${PYTHONS}; do\
-		mkdir -p build/py$$pyvers;\
-		cp -Rl `ls . |grep -v build|grep -v debian` build/py$$pyvers;\
-		(cd build/py$$pyvers;\
-		PYTHON=python$$pyvers ./configure --prefix=/usr/);\
-	done
-	set -e; for pyvers in ${PYTHONS}; do\
-		mkdir -p build/py$$pyvers-dbg;\
-		cp -Rl `ls . |grep -v build|grep -v debian` build/py$$pyvers-dbg;\
-		(cd build/py$$pyvers-dbg;\
-		PYTHON=python$${pyvers}-dbg ./configure CFLAGS="-g -ggdb `python$${pyvers}-dbg-config --include` " --prefix=/usr/ ;\
-		sed -i Makefile -e 's/\(^PYTHON_INCLUDES\s=.*\)/\1_d/' ) ;\
-	done
-	touch configure-stamp
+%:
+	dh $@ --with quilt,python2,autoreconf
 
-build build-arch build-indep: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
-	set -e; for pyvers in ${PYTHONS}; do\
-		(cd build/py$$pyvers/;\
-		PYTHON=python$$pyvers $(MAKE));\
-	done
-	set -e; for pyvers in ${PYTHONS}; do\
-		(cd build/py$$pyvers-dbg/;\
-		PYTHON=python$${pyvers}-dbg $(MAKE));\
-	done
-	touch $@
+override_dh_strip:
+	dh_strip --dbg-package=python-poppler-dbg -Xpoppler_d.so
 
 clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	rm -rf build
-	dh_clean
+	rm -fr build
+	dh $@ --with quilt,python2,autoreconf
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-	set -e; for pyvers in ${PYTHONS}; do\
-		(cd build/py$$pyvers/;\
-		DESTDIR=$(CURDIR)/debian/python-poppler $(MAKE) install);\
+override_dh_auto_configure:
+	for pyvers in ${PYTHONS}; do \
+		mkdir -p build/py$$pyvers; cp -Rl `ls . | grep -v build | grep -v debian` build/py$$pyvers;\
+		(cd build/py$$pyvers; ./configure --prefix=/usr PYTHON=python$$pyvers); \
+		mkdir -p build/py$$pyvers-dbg; cp -Rl `ls . | grep -v build | grep -v debian` build/py$$pyvers-dbg; \
+		(cd build/py$$pyvers-dbg; ./configure --prefix=/usr PYTHON=python$$pyvers-dbg CFLAGS="-g -ggdb "); \
 	done
-	set -e; for pyvers in ${PYTHONS}; do\
-		(cd build/py$${pyvers}-dbg/;\
-		DESTDIR=$(CURDIR)/debian/python-poppler-dbg $(MAKE) install);\
-		mv $(CURDIR)/debian/python-poppler-dbg/$(call py_libdir_sh,$$pyvers)/poppler.so $(CURDIR)/debian/python-poppler-dbg/$(call py_libdir_sh,$$pyvers)/poppler_d.so ; \
+
+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`); \
 	done
-	find debian -name "*.la" -exec rm -f {} \;
 
-# Build architecture-independent files here.
-binary-indep: build install
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_install
-	dh_installexamples
-	dh_strip --dbg-package=python-poppler-dbg -Xpoppler_d.so
-	dh_compress --exclude=.py --exclude=.resX
-	dh_pysupport
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install configure
+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); \
+	(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
+	find $(CURDIR)/debian/python-poppler-dbg -name "*poppler" -exec rm -fr {} +

More information about the Python-modules-commits mailing list