[Pkg-telepathy-commits] [SCM] Butterfly packaging branch, debian, updated. debian/0.5.15-1-3-g894019e

[Laurent Bigonville]

The following commit has been merged in the debian branch:
commit 50ed1156811bc77d2d3e40842ad5a050ceca8ce8
Author: Laurent Bigonville <bigon at debian.org>
Date:   Thu Mar 31 11:23:17 2011 +0200

    Use dh_python2 instead of python-central
    
    * Use dh_python2 instead of python-central
    * debian/rules:
      - Remove DEB_PYTHON_SYSTEM variable
      - Call dh_python2 instead of dh_pycentral
    * debian/control:
      - Drop python-central Build-dependency
      - Add python (>= 2.6.6-3~) Build-dependency
      - Drop XB-Python-Version
      - Bump cdbs version to (>= 0.4.90~)

diff --git a/debian/changelog b/debian/changelog
index 55fc7c4..0106c26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+telepathy-butterfly (0.5.15-2) UNRELEASED; urgency=low
+
+  * Use dh_python2 instead of python-central
+  * debian/rules:
+    - Remove DEB_PYTHON_SYSTEM variable
+    - Call dh_python2 instead of dh_pycentral
+  * debian/control:
+    - Drop python-central Build-dependency
+    - Add python (>= 2.6.6-3~) Build-dependency
+    - Drop XB-Python-Version
+    - Bump cdbs version to (>= 0.4.90~)
+
+ -- Laurent Bigonville <bigon at debian.org>  Thu, 31 Mar 2011 11:22:13 +0200
+
 telepathy-butterfly (0.5.15-1) experimental; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 8002b2e..fb23c05 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,15 @@
 Source: telepathy-butterfly
 Section: net
 Priority: optional
-XS-Python-Version: >= 2.5
+X-Python-Version: >= 2.5
 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>,
            Sjoerd Simons <sjoerd at debian.org>,
            Jonny Lamb <jonny at debian.org>,
            Laurent Bigonville <bigon at debian.org>
-Build-Depends: cdbs, debhelper (>= 8)
-Build-Depends-Indep: pkg-config, python-central (>= 0.5), libdbus-1-dev
+Build-Depends: cdbs (>= 0.4.90~), debhelper (>= 8), python (>= 2.6.6-3~)
+Build-Depends-Indep: pkg-config, libdbus-1-dev
 Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/pkg-telepathy/telepathy-butterfly.git
 Vcs-Browser: http://git.debian.org/?p=pkg-telepathy/telepathy-butterfly.git
@@ -18,7 +18,6 @@ Package: telepathy-butterfly
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}, python-dbus, python-gobject, python-telepathy (>= 0.15.19), python-papyon (>= 0.5.3)
 Breaks: empathy (<< 2.30)
-XB-Python-Version: ${python:Versions}
 Recommends: python-libproxy (>= 0.3.1)
 Provides: telepathy-connection-manager
 Description: MSN connection manager for Telepathy
diff --git a/debian/rules b/debian/rules
index 3e00925..4f4e70e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
 #!/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
@@ -10,7 +9,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 DEB_CONFIGURE_EXTRA_FLAGS := --libexecdir=/usr/lib/telepathy
 
 binary-install/telepathy-butterfly::
-	dh_pycentral
+	dh_python2 -ptelepathy-butterfly
 
 # List any files which are not installed
 include /usr/share/cdbs/1/rules/utils.mk

-- 
Butterfly packaging