[Python-apps-commits] r6995 - in packages/osc/trunk/debian (changelog control rules)

[nijel at users.alioth.debian.org]

    Date: Thursday, April 28, 2011 @ 09:06:47
  Author: nijel
Revision: 6995

Migrate to dh_python2.

Modified:
  packages/osc/trunk/debian/changelog
  packages/osc/trunk/debian/control
  packages/osc/trunk/debian/rules

Modified: packages/osc/trunk/debian/changelog
===================================================================
--- packages/osc/trunk/debian/changelog	2011-04-28 09:03:14 UTC (rev 6994)
+++ packages/osc/trunk/debian/changelog	2011-04-28 09:06:47 UTC (rev 6995)
@@ -4,8 +4,9 @@
   * Fix output of recommended package when osc-source-validator is not
     installed.
   * Fix watch file.
+  * Migrate to dh_python2.
 
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Thu, 28 Apr 2011 11:03:04 +0200
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Thu, 28 Apr 2011 11:06:25 +0200
 
 osc (0.130.1-2) unstable; urgency=low
 

Modified: packages/osc/trunk/debian/control
===================================================================
--- packages/osc/trunk/debian/control	2011-04-28 09:03:14 UTC (rev 6994)
+++ packages/osc/trunk/debian/control	2011-04-28 09:06:47 UTC (rev 6995)
@@ -4,17 +4,17 @@
 Maintainer: Michal ÄŒihaÅ™ <nijel at debian.org>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 7.0.50)
-Build-Depends-Indep: python, python-support (>= 0.5.3), python-urlgrabber
+Build-Depends-Indep: python (>= 2.6.6-3~), python-urlgrabber
 Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/osc/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/osc/trunk/
 Homepage: http://wiki.opensuse.org/openSUSE:OSC
+X-Python-Version: >= 2.5
 
 Package: osc
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python (>= 2.5), python-urlgrabber, python-rpm, python-m2crypto
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-urlgrabber, python-rpm, python-m2crypto
 Recommends: rpm2cpio, cpio, sensible-utils, osc-source-validator
-XB-Python-Version: ${python:Versions}
 Suggests: python-gnomekeyring, gnome-keyring
 Description: OpenSUSE (buildsystem) commander
  Commandline client for the openSUSE Build Service, which allows to access

Modified: packages/osc/trunk/debian/rules
===================================================================
--- packages/osc/trunk/debian/rules	2011-04-28 09:03:14 UTC (rev 6994)
+++ packages/osc/trunk/debian/rules	2011-04-28 09:06:47 UTC (rev 6995)
@@ -1,13 +1,13 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
+	dh --with python2 $@
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS
 
 override_dh_auto_install:
-	dh_auto_install
+	dh_auto_install --with python2
 	# Give the binary sane name
 	mv $(CURDIR)/debian/osc/usr/bin/osc-wrapper.py $(CURDIR)/debian/osc/usr/bin/osc
 	# Not needed