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

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

    Date: Monday, October 26, 2009 @ 13:59:11
  Author: gaspa-guest
Revision: 10205

fixes to rules and control

Modified:
  packages/python-poppler/trunk/debian/control
  packages/python-poppler/trunk/debian/copyright
  packages/python-poppler/trunk/debian/rules

Modified: packages/python-poppler/trunk/debian/control
===================================================================
--- packages/python-poppler/trunk/debian/control	2009-10-24 20:55:17 UTC (rev 10204)
+++ packages/python-poppler/trunk/debian/control	2009-10-26 13:59:11 UTC (rev 10205)
@@ -7,7 +7,7 @@
  python-gobject-dev (>= 2.10.1), python-cairo-dev (>= 1.8.4), libpoppler-glib-dev (>= 0.12),
  libatk1.0-dev (>= 1.6.0),
  libxcb-render-util0-dev (>= 0.2+git36-1~), python-support (>= 0.8)
-Standards-Version: 3.8.0
+Standards-Version: 3.8.3
 XS-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/
@@ -16,9 +16,7 @@
 Package: python-poppler
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-gtk2 (>=2.10.0), python-gobject (>= 2.10.1), python-cairo (>= 1.8.4)
-Suggests: python-poppler-dbg
 Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
 Description: Poppler Python bindings
  This package includes Python bindings for LibPoppler.
  It is needed to run programs written in Python and using Poppler set.
@@ -31,7 +29,6 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-poppler (= ${binary:Version}), python-dbg, python-gobject-dbg
 Suggests: python-gtk2-dbg
 Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
 Description: Poppler Python bindings
  This package includes Python bindings for LibPoppler.
  It is needed to run programs written in Python and using Poppler set.

Modified: packages/python-poppler/trunk/debian/copyright
===================================================================
--- packages/python-poppler/trunk/debian/copyright	2009-10-24 20:55:17 UTC (rev 10204)
+++ packages/python-poppler/trunk/debian/copyright	2009-10-26 13:59:11 UTC (rev 10205)
@@ -9,7 +9,7 @@
 Ali Afshar <aafshar at gmail.com>
 
 
-Copyright (C) 2007-2008 Gian Mario Tagliaretti <g.tagliaretti at parafernalia.org>
+Copyright © 2007-2009 Gian Mario Tagliaretti <gianmt at gnome.org>
 
 License:
 
@@ -30,5 +30,5 @@
 On Debian systems, the full text of the GPL can be found in
 /usr/share/common-licenses/GPL-2
 
-The Debian packaging is (C) 2007, Andrea Gasparini <gaspa at yattaweb.it>
+The Debian packaging is © 2007, Andrea Gasparini <gaspa at yattaweb.it>
 and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.

Modified: packages/python-poppler/trunk/debian/rules
===================================================================
--- packages/python-poppler/trunk/debian/rules	2009-10-24 20:55:17 UTC (rev 10204)
+++ packages/python-poppler/trunk/debian/rules	2009-10-26 13:59:11 UTC (rev 10205)
@@ -1,4 +1,5 @@
 #!/usr/bin/make -f
+include /usr/share/python/python.mk
 
 DEB_AUTO_CLEANUP_RCS    := yes
 PYTHONS := $(shell pyversions -vr debian/control)
@@ -53,18 +54,10 @@
 	for pyvers in ${PYTHONS}; do\
 		(cd build/py$${pyvers}-dbg/;\
 		DESTDIR=$(CURDIR)/debian/python-poppler-dbg $(MAKE) install);\
-		if [ $$pyvers -eq "2.6" ] ; then \
-		mv $(CURDIR)/debian/python-poppler-dbg/usr/lib/python$$pyvers/dist-packages/poppler.so $(CURDIR)/debian/python-poppler-dbg/usr/lib/python$$pyvers/dist-packages/poppler_d.so ; \
-		else \
-		mv $(CURDIR)/debian/python-poppler-dbg/usr/lib/python$$pyvers/site-packages/poppler.so $(CURDIR)/debian/python-poppler-dbg/usr/lib/python$$pyvers/site-packages/poppler_d.so ; \
-		fi \
+		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 ; \
 	done
 	find debian -name "*.la" -exec rm -f {} \;
 
-	#mv $(CURDIR)/debian/python-poppler-dbg/usr/lib/python$$pyvers/*-packages/poppler.so $(CURDIR)/debian/python-poppler-dbg/usr/lib/python$$pyvers/{site,dist}-packages/poppler_d.so ;
-	#mv $(CURDIR)/debian/python-poppler-dbg/usr/lib/python$$pyvers/*-packages/poppler.so $(CURDIR)/debian/python-poppler-dbg/usr/lib/python$$pyvers/{site,dist}-packages/poppler_d.so ;
-	#rm -rf $(CURDIR)/debian/python-poppler-dbg/debug;\
-
 # Build architecture-independent files here.
 binary-indep: build install