[SCM] PyKDE4 packaging branch, master, updated. 92473205db185f63421c69d5604329491f5c398c

Modestas Vainius modax at alioth.debian.org
Mon Jun 6 20:19:49 UTC 2011


The following commit has been merged in the master branch:
commit 095a3f04f23244e3d0ce82b0280145859f552f9c
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Mon Jun 6 17:26:37 2011 +0300

    Switch to dh_python2 (thanks to Scott Kitterman).
    
    - drop python-support from Build-Depends;
    - use python2 dh addon in place of python-support;
    - drop XB-Python-Version control field and remove debian/pyversions;
    - add "X-Python-Version: >= 2.5" to the source section.
---
 debian/changelog  |    8 ++++++--
 debian/control    |    6 +++---
 debian/pyversions |    1 -
 debian/rules      |    4 ++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6ca4d67..7966d03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,7 @@
 pykde4 (4:4.6.80-0r1) UNRELEASED; urgency=low
 
   TODO: Update debian/copyright.
-        Switch to dh_python2.
-        Less python related warnings (pyversions, dpkg-gencontrol).
+        Less python related warnings (dpkg-gencontrol).
         Fix W: python-kde4-dbg: python-debug-in-wrong-location.
 
   * Initial standalone release: split off from kdebindings.
@@ -21,5 +20,10 @@ pykde4 (4:4.6.80-0r1) UNRELEASED; urgency=low
   * Fix binNMUability of python-kde4-dev: depend on python-kde4 (>=
     ${source:Version}) rather than ${binary:Version}. python-kde4-dev is
     arch:all.
+  * Switch to dh_python2 (thanks to Scott Kitterman):
+    - drop python-support from Build-Depends;
+    - use python2 dh addon in place of python-support;
+    - drop XB-Python-Version control field and remove debian/pyversions;
+    - add "X-Python-Version: >= 2.5" to the source section.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 05 Jun 2011 20:31:17 +0300
diff --git a/debian/control b/debian/control
index ed07ce7..473fdc4 100644
--- a/debian/control
+++ b/debian/control
@@ -8,10 +8,11 @@ Build-Depends: kde-sc-dev-latest (>= 4:4.6.3),
  libphonon-dev (>= 4:4.6.0really4.4.4), libsoprano-dev (>= 2.3.0),
  libqt4-dev (>= 4:4.7.1), libqt4-opengl-dev (>= 4:4.7.1), libqtwebkit-dev,
  libboost-dev, shared-desktop-ontologies,
- python, python-all-dev, python-support (>= 0.6), 
- python-sip-dev (>= 4.12.0), python-qt4 (>> 4.8.3-1), python-qt4-dev (>> 4.8.3-1)
+ python, python-all-dev, python-sip-dev (>= 4.12.0),
+ python-qt4 (>> 4.8.3-1), python-qt4-dev (>> 4.8.3-1)
 Uploaders: Sune Vuorela <sune at debian.org>, Modestas Vainius <modax at debian.org>, Michael Meskes <meskes at debian.org>
 Standards-Version: 3.9.2
+X-Python-Version: >= 2.5
 Homepage: http://www.kde.org
 Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/pykde4.git
 Vcs-Browser: http://git.debian.org/gitweb/?p=pkg-kde/kde-sc/pykde4.git
@@ -49,7 +50,6 @@ Description: Python bindings for the KDE Development Platform
 
 Package: python-kde4-dev
 Architecture: all
-XB-Python-Version: ${python:Versions}
 Depends: ${python:Depends}, ${misc:Depends},
  python-kde4 (>= ${source:Version}), python-qt4 (>= 4.4.4),
 Breaks: python-kde4 (<< ${source:Version})
diff --git a/debian/pyversions b/debian/pyversions
deleted file mode 100644
index b3dc41e..0000000
--- a/debian/pyversions
+++ /dev/null
@@ -1 +0,0 @@
-2.5-
diff --git a/debian/rules b/debian/rules
index e9148e1..7933832 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #! /usr/bin/make -f
 
-dh = --with=python-support
+dh = --with=python2
 
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
@@ -27,7 +27,7 @@ override_dh_auto_configure:
 override_dh_auto_build override_dh_auto_install override_dh_auto_test override_dh_auto_clean:
 	$(foreach v,$(pyversions),$(overridden_command) --builddirectory=builddir-$v $(nl))
 
-override_dh_pysupport:
+override_dh_python2:
 	$(overridden_command)
 	dh_sip -ppython-kde4
 

-- 
PyKDE4 packaging



More information about the pkg-kde-commits mailing list