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

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

    Date: Sunday, May 31, 2009 @ 18:01:35
  Author: gilir-guest
Revision: 3033

Merge Ubuntu changes for Python 2.6 transition

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

Modified: packages/pykaraoke/trunk/debian/changelog
===================================================================
--- packages/pykaraoke/trunk/debian/changelog	2009-05-31 17:58:10 UTC (rev 3032)
+++ packages/pykaraoke/trunk/debian/changelog	2009-05-31 18:01:35 UTC (rev 3033)
@@ -6,8 +6,13 @@
     + Replace 'python' by 'Python' to fix
       lintian warning.
 
- -- Miriam Ruiz <little_miry at yahoo.es>  Sun, 24 Feb 2009 22:25:44 +0000
+  [ Julien Lavergne ]
+  * From Ubuntu, prepare for the future python transition:
+    - debian/rules: Add --install-layout=deb to setup.py install
+    - debian/control: Bump build-depends to python-all-dev (>= 2.5.4-1~)
 
+ -- Julien Lavergne <julien.lavergne at gmail.com>  Sun, 31 May 2009 18:52:09 +0200
+
 pykaraoke (0.5.1-1) unstable; urgency=low
 
   [ Miriam Ruiz ]

Modified: packages/pykaraoke/trunk/debian/control
===================================================================
--- packages/pykaraoke/trunk/debian/control	2009-05-31 17:58:10 UTC (rev 3032)
+++ packages/pykaraoke/trunk/debian/control	2009-05-31 18:01:35 UTC (rev 3033)
@@ -4,7 +4,7 @@
 Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Uploaders: Miriam Ruiz <little_miry at yahoo.es>
 Homepage: http://www.kibosh.org/pykaraoke/
-Build-Depends: debhelper (>= 5.0.37.2), python-all-dev, python-support (>= 0.4),
+Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.5.4-1~), python-support (>= 0.4),
  libsdl-dev | libsdl1.2-dev, python-pygame, quilt (>= 0.40-1)
 Standards-Version: 3.7.3
 

Modified: packages/pykaraoke/trunk/debian/rules
===================================================================
--- packages/pykaraoke/trunk/debian/rules	2009-05-31 17:58:10 UTC (rev 3032)
+++ packages/pykaraoke/trunk/debian/rules	2009-05-31 18:01:35 UTC (rev 3033)
@@ -34,7 +34,8 @@
 	touch $@
 install-ext-%:
 	python$* setup.py install --skip-build \
-		--root $(CURDIR)/debian/python-pykaraoke
+		--root $(CURDIR)/debian/python-pykaraoke \
+		--install-layout=deb
 	touch $@
 
 # Build architecture-independent files here.