The following commit has been merged in the master branch:
commit 582b53c40af3c02036ea9394a1413978fbc0cb0f
Author: Miriam Ruiz <mir...@debian.org>
Date: Mon Oct 24 03:48:42 2011 +0200
Transition to dh_python2
Clean up debian/rules a bit
diff --git a/model/autotools-lib/rules b/model/autotools-lib/rules
index 8ffa90b..70cc1f4 100644
--- a/model/autotools-lib/rules
+++ b/model/autotools-lib/rules
@@ -80,12 +80,10 @@ binary-arch: install
# dh_installemacsen
# dh_installpam
# dh_installmime
-# dh_python
# dh_installinit
# dh_installcron
# dh_installinfo
dh_installman
-# dh_desktop
dh_link
dh_strip --dbg-package=lib%PACKAGE%%MAJOR%-dbg
dh_compress
diff --git a/model/autotools/rules b/model/autotools/rules
index 3c2a941..fd408d6 100644
--- a/model/autotools/rules
+++ b/model/autotools/rules
@@ -71,12 +71,10 @@ binary-arch: install
# dh_installemacsen
# dh_installpam
# dh_installmime
-# dh_python
# dh_installinit
# dh_installcron
# dh_installinfo
dh_installman
-# dh_desktop
dh_link
dh_strip --dbg-package=%PACKAGE%-dbg
dh_compress
diff --git a/model/c-exe/rules b/model/c-exe/rules
index 8656cd8..4b8c1a9 100755
--- a/model/c-exe/rules
+++ b/model/c-exe/rules
@@ -49,12 +49,10 @@ binary-arch: install
# dh_installemacsen
# dh_installpam
# dh_installmime
-# dh_python
# dh_installinit
# dh_installcron
# dh_installinfo
dh_installman
-# dh_desktop
dh_link
dh_strip --dbg-package=%PACKAGE%-dbg
dh_compress
diff --git a/model/c-lib/rules b/model/c-lib/rules
index a122b5e..c78b2bf 100755
--- a/model/c-lib/rules
+++ b/model/c-lib/rules
@@ -49,12 +49,10 @@ binary-arch: install
# dh_installemacsen
# dh_installpam
# dh_installmime
-# dh_python
# dh_installinit
# dh_installcron
# dh_installinfo
dh_installman
-# dh_desktop
dh_link
dh_strip --dbg-package=lib%PACKAGE%%MAJOR%-dbg
dh_compress
diff --git a/model/cmake-lib/rules b/model/cmake-lib/rules
index b3606af..cf6bf57 100644
--- a/model/cmake-lib/rules
+++ b/model/cmake-lib/rules
@@ -59,12 +59,10 @@ binary-arch: install
# dh_installemacsen
# dh_installpam
# dh_installmime
-# dh_python
# dh_installinit
# dh_installcron
# dh_installinfo
dh_installman
-# dh_desktop
dh_link
dh_strip --dbg-package=lib%PACKAGE%%MAJOR%-dbg
dh_compress
diff --git a/model/cmake/rules b/model/cmake/rules
index fac052b..21a5c8a 100644
--- a/model/cmake/rules
+++ b/model/cmake/rules
@@ -59,12 +59,10 @@ binary-arch: install
# dh_installemacsen
# dh_installpam
# dh_installmime
-# dh_python
# dh_installinit
# dh_installcron
# dh_installinfo
dh_installman
-# dh_desktop
dh_link
dh_strip --dbg-package=%PACKAGE%-dbg
dh_compress
diff --git a/model/makefile/rules b/model/makefile/rules
index 86996c7..86eb14e 100644
--- a/model/makefile/rules
+++ b/model/makefile/rules
@@ -49,12 +49,10 @@ binary-arch: install
# dh_installemacsen
# dh_installpam
# dh_installmime
-# dh_python
# dh_installinit
# dh_installcron
# dh_installinfo
dh_installman
-# dh_desktop
dh_link
dh_strip --dbg-package=%PACKAGE%-dbg
dh_compress
diff --git a/model/pymodule/control b/model/pymodule/control
index 6e01c50..488a476 100644
--- a/model/pymodule/control
+++ b/model/pymodule/control
@@ -3,7 +3,7 @@ Section: unknown
Priority: extra
Maintainer: %DEBNAME% <%DEBEMAIL%>
Build-Depends: debhelper (>= 7), dh-buildinfo, quilt,
- python-all-dev, python-support, python-setuptools
+ python-all-dev (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.2
Homepage: URL://HOMEPAGE
diff --git a/model/pymodule/rules b/model/pymodule/rules
index 8d81126..960a8bd 100644
--- a/model/pymodule/rules
+++ b/model/pymodule/rules
@@ -56,7 +56,7 @@ binary-indep: build install
dh_link -i
dh_compress -i --exclude=.js --exclude=.pdf --exclude=.py
dh_fixperms -i
- dh_pysupport -i
+ dh_python2 -i
# dh_perl -i
[ ! -e /usr/bin/dh_buildinfo ] || dh_buildinfo -i
dh_installdeb -i
@@ -83,7 +83,7 @@ binary-arch: build install
# dh_installinfo -a
dh_installman -a
dh_link -a
- dh_pysupport -a
+ dh_python2 -a
dh_strip -a --dbg-package=python-%PACKAGE%-dbg
dh_compress -a
dh_fixperms -a
--
templates for different package types
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
