[Python-apps-commits] r6512 - in packages/veusz/trunk/debian (6 files)

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

    Date: Monday, January 17, 2011 @ 21:45:48
  Author: jeremysanders-guest
Revision: 6512

[svn-inject] Applying Debian modifications (1.10-3) to trunk

Added:
  packages/veusz/trunk/debian/veusz-helpers-dbg.install
Modified:
  packages/veusz/trunk/debian/changelog
  packages/veusz/trunk/debian/control
  packages/veusz/trunk/debian/rules
  packages/veusz/trunk/debian/veusz-helpers.install
  packages/veusz/trunk/debian/veusz.install

Modified: packages/veusz/trunk/debian/changelog
===================================================================
--- packages/veusz/trunk/debian/changelog	2011-01-17 18:41:32 UTC (rev 6511)
+++ packages/veusz/trunk/debian/changelog	2011-01-17 21:45:48 UTC (rev 6512)
@@ -1,4 +1,4 @@
-veusz (1.10-2) unstable; urgency=low
+veusz (1.10-3) unstable; urgency=low
 
   * Initial release (Closes: #447524)
 

Modified: packages/veusz/trunk/debian/control
===================================================================
--- packages/veusz/trunk/debian/control	2011-01-17 18:41:32 UTC (rev 6511)
+++ packages/veusz/trunk/debian/control	2011-01-17 21:45:48 UTC (rev 6512)
@@ -3,17 +3,21 @@
 Priority: optional
 Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Uploaders: Jeremy Sanders <jeremy at jeremysanders.net>
-Build-Depends: debhelper (>= 7.0.50~),
-	       docbook-utils,
+Build-Depends: debhelper (>= 7.3.5~),
+               docbook-utils,
                graphicsmagick,
                libqt4-dev,
                perl,
                python-all (>= 2.6.5-13~),
+               python-all-dbg,
                python-all-dev (>= 2.4),
                python-numpy,
+               python-numpy-dbg,
+               python-qt4-dbg,
                python-qt4-dev,
+               python-sip4-dbg,
                python-sip4-dev,
-               python-support
+               python-support (>=0.90)
 Standards-Version: 3.9.1
 X-Python-Version: >= 2.4
 Homepage: http://home.gna.org/veusz/
@@ -22,8 +26,8 @@
 Architecture: all
 Depends: python-numpy,
          python-qt4,
-         veusz-helpers (>= ${source:Version}), 
-	 veusz-helpers (<< ${source:Version}.1~),
+         veusz-helpers (<< ${source:Version}.1~),
+         veusz-helpers (>= ${source:Version}),
          ${misc:Depends},
          ${python:Depends}
 Suggests: python-pyfits
@@ -37,7 +41,8 @@
 
 Package: veusz-helpers
 Architecture: any
-Depends: python-qt4,
+Depends: python-numpy,
+         python-qt4,
          ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends}
@@ -45,3 +50,16 @@
 Suggests: veusz (= ${source:Version})
 Description: Architecture-specific helper module for Veusz
  This package contains the architecture specific files for Veusz.
+
+Package: veusz-helpers-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: veusz-helpers (= ${binary:Version}),
+         ${misc:Depends},
+         ${python:Depends},
+         ${shlibs:Depends}
+Breaks: ${python:Breaks}
+Recommends: python-dbg, python-numpy-dbg, python-qt4-dbg
+Description: Architecture-specific helper module for Veusz (debug extension)
+ This package contains the architecture specific files for Veusz.

Modified: packages/veusz/trunk/debian/rules
===================================================================
--- packages/veusz/trunk/debian/rules	2011-01-17 18:41:32 UTC (rev 6511)
+++ packages/veusz/trunk/debian/rules	2011-01-17 21:45:48 UTC (rev 6512)
@@ -8,29 +8,21 @@
 	gm convert windows/icons/veusz_32.png debian/veusz.xpm
 # regenerate docs
 	(cd Documents; ./generate_manual.sh)
-	dh_auto_build
+# -- --force works around bug #589759
+	dh_auto_build -- --force
 
-override_dh_install:
-	dh_install
+override_dh_strip:
+# handle veusz-helpers-dbg package
+ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+	dh_strip --dbg-package=veusz-helpers-dbg
+endif
 
-# remove arch-independent python stuff
-	if test -d $(CURDIR)/debian/veusz-helpers ; then \
-		find debian/veusz-helpers/usr/lib \
-			! -name '*.so' ! -type d -delete , \
-			-type d -empty -delete; \
-	fi
-# remove arch-dependent python stuff
-	if test -d $(CURDIR)/debian/veusz ; then \
-		find debian/veusz/usr/lib \
-			-name '*.so' ! -type d -delete , \
-			-type d -empty -delete; \
-	fi
-
 override_dh_compress:
 # don't compress Veusz example files
 	dh_compress -X.vsz
 
 override_dh_clean:
+# clean up generated files
 	dh_clean
 	rm -f debian/veusz.xpm
 	rm -f Documents/manual.html Documents/manual.pdf \

Added: packages/veusz/trunk/debian/veusz-helpers-dbg.install
===================================================================
--- packages/veusz/trunk/debian/veusz-helpers-dbg.install	                        (rev 0)
+++ packages/veusz/trunk/debian/veusz-helpers-dbg.install	2011-01-17 21:45:48 UTC (rev 6512)
@@ -0,0 +1 @@
+usr/lib/python*/*-packages/veusz/helpers/*_d.so

Modified: packages/veusz/trunk/debian/veusz-helpers.install
===================================================================
--- packages/veusz/trunk/debian/veusz-helpers.install	2011-01-17 18:41:32 UTC (rev 6511)
+++ packages/veusz/trunk/debian/veusz-helpers.install	2011-01-17 21:45:48 UTC (rev 6512)
@@ -1 +1 @@
-debian/tmp/usr/lib
+usr/lib/python*/*-packages/veusz/helpers/*[!_][!_].so

Modified: packages/veusz/trunk/debian/veusz.install
===================================================================
--- packages/veusz/trunk/debian/veusz.install	2011-01-17 18:41:32 UTC (rev 6511)
+++ packages/veusz/trunk/debian/veusz.install	2011-01-17 21:45:48 UTC (rev 6512)
@@ -1,4 +1,5 @@
-debian/tmp/usr/lib
-debian/tmp/usr/bin
 debian/veusz.desktop usr/share/applications/
 debian/veusz.xpm usr/share/pixmaps
+usr/bin
+usr/lib/python*/*-packages/veusz/*.py
+usr/lib/python*/*-packages/veusz/*/*.py