[Pkg-telepathy-commits] [SCM] telepathy-python packaging branch, debian, updated. debian/0.15.19-1-6-g6892ac2

[Laurent Bigonville]

The following commit has been merged in the debian branch:
commit b46345bd97500a70f75062ea188ef231c6f11fd7
Author: Laurent Bigonville <bigon at debian.org>
Date:   Wed Mar 30 17:47:07 2011 +0200

    Use dh_python2 instead of python-central
    
    * Use dh_python2 instead of python-central
      - Remove DEB_PYTHON_SYSTEM variable
      - Remove explicit call to dh_pycentral
      - Include python-module.mk to call dh_python2
    * debian/control:
      - Drop python-central Build-dependency
      - Add python (>= 2.6.6-3~) Build-dependency
      - Drop XB-Python-Version

diff --git a/debian/changelog b/debian/changelog
index a635a4b..1a1897a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,17 @@
 telepathy-python (0.15.19-2) UNRELEASED; urgency=low
 
+  * Use dh_python2 instead of python-central
   * debian/rules:
     - Drop simple-patchsys.mk call since we are using 3.0 (quilt) source format
+    - Remove DEB_PYTHON_SYSTEM variable
+    - Remove explicit call to dh_pycentral
+    - Include python-module.mk to call dh_python2
+  * debian/control:
+    - Drop python-central Build-dependency
+    - Add python (>= 2.6.6-3~) Build-dependency
+    - Drop XB-Python-Version
 
- -- Laurent Bigonville <bigon at debian.org>  Wed, 30 Mar 2011 17:37:20 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Wed, 30 Mar 2011 17:44:44 +0200
 
 telepathy-python (0.15.19-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index ef903fc..9a31ad0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: telepathy-python
 Section: python
 Priority: optional
-XS-Python-Version: >= 2.4
+X-Python-Version: >= 2.4
 Maintainer: Debian Telepathy maintainers <pkg-telepathy-maintainers at lists.alioth.debian.org>
 Uploaders: Dafydd Harries <daf at debian.org>,
            Simon McVittie <smcv at debian.org>,
@@ -9,8 +9,8 @@ Uploaders: Dafydd Harries <daf at debian.org>,
            Laurent Bigonville <bigon at debian.org>,
            Jonny Lamb <jonny at debian.org>,
            Emilio Pozuelo Monfort <pochu at debian.org>
-Build-Depends: cdbs (>= 0.4.43),
-               python-central (>= 0.5),
+Build-Depends: cdbs (>= 0.4.90~),
+               python (>= 2.6.6-3~),
                debhelper (>= 5.0.37.2)
 Build-Depends-Indep: python-dbus, xsltproc
 Standards-Version: 3.9.1
@@ -21,7 +21,6 @@ Homepage: http://telepathy.freedesktop.org/wiki/Telepathy%20Python
 Package: python-telepathy
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}, python-dbus
-XB-Python-Version: ${python:Versions}
 Provides: ${python:Provides}, telepathy-python
 Conflicts: telepathy-python
 Replaces: telepathy-python
diff --git a/debian/rules b/debian/rules
index 2121068..9694932 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,11 @@
 #!/usr/bin/make -f
 
 DEB_AUTO_CLEANUP_RCS            := yes
-DEB_PYTHON_SYSTEM               := pycentral
 DEB_COMPRESS_EXCLUDE            := .py
 
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-
-binary-install/python-telepathy::
-	dh_pycentral
+include /usr/share/cdbs/1/class/python-module.mk
 
 # List any files which are not installed
 include /usr/share/cdbs/1/rules/utils.mk

-- 
telepathy-python packaging