[Python-apps-commits] r7371 - in packages/sonata/trunk/debian (5 files)

[nijel at users.alioth.debian.org]

    Date: Thursday, July 28, 2011 @ 12:55:42
  Author: nijel
Revision: 7371

Convert to dh_python2.

Modified:
  packages/sonata/trunk/debian/changelog
  packages/sonata/trunk/debian/control
  packages/sonata/trunk/debian/rules
Deleted:
  packages/sonata/trunk/debian/pycompat
  packages/sonata/trunk/debian/pyversions

Modified: packages/sonata/trunk/debian/changelog
===================================================================
--- packages/sonata/trunk/debian/changelog	2011-07-28 12:52:42 UTC (rev 7370)
+++ packages/sonata/trunk/debian/changelog	2011-07-28 12:55:42 UTC (rev 7371)
@@ -2,6 +2,7 @@
 
   [ Michal ÄŒihaÅ™ ]
   * Adjust watch file to new upstream location.
+  * Convert to dh_python2.
 
   [ Javi Merino ]
   * New maintainer. (Closes: #612910: RFA: sonata -- GTK+ client for the
@@ -13,7 +14,7 @@
   * Change Conflicts with Breaks for python-mmkeys, as it is just a
     package split, as explained in Section 7.6 of the Debian Policy
 
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Thu, 28 Jul 2011 14:41:03 +0200
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Thu, 28 Jul 2011 14:55:12 +0200
 
 sonata (1.6.2.1-3) unstable; urgency=low
 

Modified: packages/sonata/trunk/debian/control
===================================================================
--- packages/sonata/trunk/debian/control	2011-07-28 12:52:42 UTC (rev 7370)
+++ packages/sonata/trunk/debian/control	2011-07-28 12:55:42 UTC (rev 7371)
@@ -5,8 +5,7 @@
 Uploaders: Javi Merino <cibervicho at gmail.com>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.3.0),
-    python-support (>= 0.5.3),
-    python-all-dev (>= 2.3.5-11), 
+    python-all-dev (>= 2.6.6-3~),
     pkg-config, 
     python-gtk2-dev
 Build-Conflicts: libffi4-dev
@@ -14,11 +13,11 @@
 Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/sonata/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/sonata/trunk/
 Homepage: http://sonata.berlios.de/
+X-Python-Version: >= 2.5
 
 Package: sonata
 Architecture: all
 Provides: ${python:Provides}, mpd-client
-XB-Python-Version: ${python:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-gtk2 (>= 2.10), python-dbus, python-mpd
 Recommends: python-tagpy,
     python (>= 2.5) | python-elementtree, python-eggtrayicon
@@ -34,7 +33,6 @@
 Provides: ${python:Provides}
 Breaks: sonata (<< 1.4)
 Replaces: sonata (<< 1.4)
-XB-Python-Version: ${python:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-gtk2
 Description: Multimedia key support as a PyGTK object
  This module lets you access multimedia keys found on most new keyboards

Deleted: packages/sonata/trunk/debian/pycompat
===================================================================
--- packages/sonata/trunk/debian/pycompat	2011-07-28 12:52:42 UTC (rev 7370)
+++ packages/sonata/trunk/debian/pycompat	2011-07-28 12:55:42 UTC (rev 7371)
@@ -1 +0,0 @@
-2

Deleted: packages/sonata/trunk/debian/pyversions
===================================================================
--- packages/sonata/trunk/debian/pyversions	2011-07-28 12:52:42 UTC (rev 7370)
+++ packages/sonata/trunk/debian/pyversions	2011-07-28 12:55:42 UTC (rev 7371)
@@ -1 +0,0 @@
-2.5-

Modified: packages/sonata/trunk/debian/rules
===================================================================
--- packages/sonata/trunk/debian/rules	2011-07-28 12:52:42 UTC (rev 7370)
+++ packages/sonata/trunk/debian/rules	2011-07-28 12:55:42 UTC (rev 7371)
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
 
 override_dh_auto_install:
-	dh_auto_install
+	dh_auto_install --with python2
 	rm -rf $(CURDIR)/debian/sonata/usr/share/sonata
 
 %:
-	dh $@
+	dh --with python2 $@