[Python-apps-commits] r2831 - in packages/debomatic/trunk/debian (changelog control rules)

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

    Date: Friday, May 1, 2009 @ 18:03:58
  Author: dktrkranz-guest
Revision: 2831

Changes for upcoming Python 2.6

Modified:
  packages/debomatic/trunk/debian/changelog
  packages/debomatic/trunk/debian/control
  packages/debomatic/trunk/debian/rules

Modified: packages/debomatic/trunk/debian/changelog
===================================================================
--- packages/debomatic/trunk/debian/changelog	2009-05-01 17:57:44 UTC (rev 2830)
+++ packages/debomatic/trunk/debian/changelog	2009-05-01 18:03:58 UTC (rev 2831)
@@ -3,10 +3,19 @@
   * Switch to debhelper 7.
   * Switch to python-support.
   * Install Debomatic module in a private directory.
+  * Changes for upcoming Python 2.6:
+    + debian/control:
+      - Add python (>= 2.5.4-1~) to Build-Depends-Indep to enable use of
+        /usr/share/python/python.mk macros.
+      - Remove python-all-dev from Build-Depends-Indep.
+    + debian/rules:
+      - Include /usr/share/python/python.mk.
+      - Pass $(py_setup_install_args) to setup.py to let distutils install
+        modules in the correct directory.
   * Add ${misc:Depends} to debomatic dependencies.
   * Bump Standards-Version to 3.8.1, no changes required.
 
- -- Luca Falavigna <dktrkranz at ubuntu.com>  Fri, 01 May 2009 19:16:48 +0200
+ -- Luca Falavigna <dktrkranz at ubuntu.com>  Fri, 01 May 2009 20:04:05 +0200
 
 debomatic (0.6-2) unstable; urgency=low
 

Modified: packages/debomatic/trunk/debian/control
===================================================================
--- packages/debomatic/trunk/debian/control	2009-05-01 17:57:44 UTC (rev 2830)
+++ packages/debomatic/trunk/debian/control	2009-05-01 18:03:58 UTC (rev 2831)
@@ -4,7 +4,7 @@
 Maintainer: Luca Falavigna <dktrkranz at ubuntu.com>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 7)
-Build-Depends-Indep: python-support (>= 0.5.3), python-all-dev, docbook2x, docbook-xml
+Build-Depends-Indep: python (>= 2.5.4-1~), python-support (>= 0.5.3), docbook2x, docbook-xml
 XS-Python-Version: all
 Standards-Version: 3.8.1
 Homepage: https://launchpad.net/debomatic

Modified: packages/debomatic/trunk/debian/rules
===================================================================
--- packages/debomatic/trunk/debian/rules	2009-05-01 17:57:44 UTC (rev 2830)
+++ packages/debomatic/trunk/debian/rules	2009-05-01 18:03:58 UTC (rev 2831)
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+include /usr/share/python/python.mk
+
 %:
 	dh $@
 
@@ -7,4 +9,5 @@
 	python setup.py install \
 		--root=$(CURDIR)/debian/debomatic \
 		--install-scripts=/usr/share/debomatic \
-		--install-lib=/usr/share/debomatic
+		--install-lib=/usr/share/debomatic \
+		$(py_setup_install_args)