[Python-apps-commits] r6428 - in packages/parti-all/trunk/debian (4 files)

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

    Date: Saturday, December 25, 2010 @ 15:07:33
  Author: aelmahmoudy-guest
Revision: 6428

* Use dh_python2 instead of python-central.
  + Removed debian/pycompat
  + debian/control:
    - build-dep on python-all-dev >= 2.6.6-2
    - Use X-Python-Version in source stanza and remove X[BS]-Python-Version
      fields.
* Use debhelper without CDBS.
  + debian/rules: build-dep on debhelper >= 7.0.50~ to support dh overrides.

Modified:
  packages/parti-all/trunk/debian/changelog
  packages/parti-all/trunk/debian/control
  packages/parti-all/trunk/debian/rules
Deleted:
  packages/parti-all/trunk/debian/pycompat

Modified: packages/parti-all/trunk/debian/changelog
===================================================================
--- packages/parti-all/trunk/debian/changelog	2010-12-25 14:11:08 UTC (rev 6427)
+++ packages/parti-all/trunk/debian/changelog	2010-12-25 15:07:33 UTC (rev 6428)
@@ -4,8 +4,16 @@
   * Removed stray xpra.dirs
   * Renamed wimpiggy to python-wimpiggy
   * Switch to 3.0 (quilt) source format.
+  * Use dh_python2 instead of python-central.
+    + Removed debian/pycompat
+    + debian/control:
+      - build-dep on python-all-dev >= 2.6.6-2
+      - Use X-Python-Version in source stanza and remove X[BS]-Python-Version
+        fields.
+  * Use debhelper without CDBS.
+    + debian/rules: build-dep on debhelper >= 7.0.50~ to support dh overrides.
 
- -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>  Sat, 25 Dec 2010 16:10:37 +0200
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>  Sat, 25 Dec 2010 16:59:57 +0200
 
 parti-all (0.0.6-0ubuntu10) natty; urgency=low
 

Modified: packages/parti-all/trunk/debian/control
===================================================================
--- packages/parti-all/trunk/debian/control	2010-12-25 14:11:08 UTC (rev 6427)
+++ packages/parti-all/trunk/debian/control	2010-12-25 15:07:33 UTC (rev 6428)
@@ -2,22 +2,20 @@
 Section: x11
 Priority: optional
 Maintainer: Ubuntu MOTU Developers <ubuntu-motu at lists.ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 7), libx11-dev, libxtst-dev, libxcomposite-dev, libxdamage-dev, python-central (>= 0.5.6), python, python-all-dev, python-pyrex, python-gobject-dev, python-gtk2-dev
-XS-Python-Version: all
+Build-Depends: debhelper (>= 7.0.50~), libx11-dev, libxtst-dev, libxcomposite-dev, libxdamage-dev, python-all-dev (>= 2.6.6-2), python-pyrex, python-gobject-dev, python-gtk2-dev
+X-Python-Version: all
 Standards-Version: 3.8.0
 Homepage: http://partiwm.org/
 
 Package: parti
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}, python-wimpiggy (>=${source:Version}), python-gtk2, xvfb
-XB-Python-Version: ${python:Versions}
 Description: Parti window manager
  Parti is a tabbing/tiling window manager, written in Python and GTK+.
 
 Package: xpra
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-wimpiggy (=${binary:Version}), python-gtk2, xvfb, x11-xserver-utils
-XB-Python-Version: ${python:Versions}
 Description: X Persistent Remote Applications
  Xpra gives you the functionality of GNU Screen for X applications.
  .
@@ -32,7 +30,6 @@
 Package: python-wimpiggy
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-gtk2
-XB-Python-Version: ${python:Versions}
 Description: Window manager library for parti
  A helper library for writing window managers.
  .

Deleted: packages/parti-all/trunk/debian/pycompat
===================================================================
--- packages/parti-all/trunk/debian/pycompat	2010-12-25 14:11:08 UTC (rev 6427)
+++ packages/parti-all/trunk/debian/pycompat	2010-12-25 15:07:33 UTC (rev 6428)
@@ -1 +0,0 @@
-2

Modified: packages/parti-all/trunk/debian/rules
===================================================================
--- packages/parti-all/trunk/debian/rules	2010-12-25 14:11:08 UTC (rev 6427)
+++ packages/parti-all/trunk/debian/rules	2010-12-25 15:07:33 UTC (rev 6428)
@@ -1,15 +1,7 @@
 #!/usr/bin/make -f
-DEB_PYTHON_SYSTEM=pycentral
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
+%:
+	dh $@ --with python2
 
-install/parti::
-	# Taken from calibre:
-	# cdbs >= 0.4.53 does not call setup.py install any more (#525436);
-	# hackish workaround:
-	[ -e debian/tmp/usr/bin/parti ] || python setup.py install --install-layout=deb --install-purelib=/usr/lib/$$(pyversions -d)/site-packages --install-platlib=/usr/lib/$$(pyversions -d)/site-packages --root=debian/tmp $(DEB_PYTHON_INSTALL_ARGS_ALL)
-
-clean::
-	rm -f xpra/xpra.wait_for_x_server.c
-	rm -f wimpiggy/lowlevel/wimpiggy.lowlevel.bindings.c
+override_dh_clean:
+	dh_clean xpra/xpra.wait_for_x_server.c wimpiggy/lowlevel/wimpiggy.lowlevel.bindings.c