r27688 - in /desktop/unstable/gnome-python/debian: changelog compat control control.in rules

bigon at users.alioth.debian.org bigon at users.alioth.debian.org
Tue Apr 19 23:37:18 UTC 2011


Author: bigon
Date: Tue Apr 19 23:37:12 2011
New Revision: 27688

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27688
Log:
* Use dh_python2 instead of pysupport
* Rebuild for python 2.7 transition (Closes: #623396)
* debian/control.in:
  - Bump Standards-Version to 3.9.2
  - Bump python-all-dev build-dependency to >= 2.6.6-3~
  - Bump debhelper build-dependency to 8
  - Drop Conflicts/Replaces for packages that only exist prior lenny
  - Drop quilt build-dependency
  - Drop versionize build-dependency against dpkg-dev, the required version
    exists since etch
* debian/rules:
  - Use dh_prep instead of dh_clean -k
  - Drop call to patch/unpatch target
  - Drop quilt.make include
  - Call dh_python2 instead of dh_pysupport
* Switch to dpkg-source 3.0 (quilt) format

Modified:
    desktop/unstable/gnome-python/debian/changelog
    desktop/unstable/gnome-python/debian/compat
    desktop/unstable/gnome-python/debian/control
    desktop/unstable/gnome-python/debian/control.in
    desktop/unstable/gnome-python/debian/rules

Modified: desktop/unstable/gnome-python/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-python/debian/changelog?rev=27688&op=diff
==============================================================================
--- desktop/unstable/gnome-python/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-python/debian/changelog [utf-8] Tue Apr 19 23:37:12 2011
@@ -1,3 +1,24 @@
+gnome-python (2.28.1-2) UNRELEASED; urgency=low
+
+  * Use dh_python2 instead of pysupport
+  * Rebuild for python 2.7 transition (Closes: #623396)
+  * debian/control.in:
+    - Bump Standards-Version to 3.9.2
+    - Bump python-all-dev build-dependency to >= 2.6.6-3~
+    - Bump debhelper build-dependency to 8
+    - Drop Conflicts/Replaces for packages that only exist prior lenny
+    - Drop quilt build-dependency
+    - Drop versionize build-dependency against dpkg-dev, the required version
+      exists since etch
+  * debian/rules:
+    - Use dh_prep instead of dh_clean -k
+    - Drop call to patch/unpatch target
+    - Drop quilt.make include
+    - Call dh_python2 instead of dh_pysupport
+  * Switch to dpkg-source 3.0 (quilt) format
+
+ -- Laurent Bigonville <bigon at debian.org>  Wed, 20 Apr 2011 01:27:15 +0200
+
 gnome-python (2.28.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/unstable/gnome-python/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-python/debian/compat?rev=27688&op=diff
==============================================================================
--- desktop/unstable/gnome-python/debian/compat [utf-8] (original)
+++ desktop/unstable/gnome-python/debian/compat [utf-8] Tue Apr 19 23:37:12 2011
@@ -1,1 +1,1 @@
-5
+8

Modified: desktop/unstable/gnome-python/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-python/debian/control?rev=27688&op=diff
==============================================================================
--- desktop/unstable/gnome-python/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-python/debian/control [utf-8] Tue Apr 19 23:37:12 2011
@@ -7,11 +7,10 @@
 Section: python
 Priority: optional
 Maintainer: Sebastien Bacher <seb128 at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Luca Falavigna <dktrkranz at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2),
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Luca Falavigna <dktrkranz at debian.org>
+Build-Depends: debhelper (>= 8),
                gnome-pkg-tools (>= 0.10),
-               python-all-dev (>= 2.5),
-               python-support (>= 0.7.6),
+               python-all-dev (>= 2.6.6-3~),
                python-gobject-dev (>= 2.17.0),
                python-gtk2-dev (>= 2.10.3),
                python-pyorbit-dev (>= 2.0.1-4),
@@ -24,29 +23,24 @@
                libgconf2-dev (>= 2.11.1),
                libbonobo2-dev (>= 2.8.0),
                libbonoboui2-dev (>= 2.8.0),
-               gtk-doc-tools,
-               dpkg-dev (>= 1.13.19),
-               quilt
-Standards-Version: 3.8.1
-XS-Python-Version: >= 2.5
+               gtk-doc-tools
+Standards-Version: 3.9.2
+X-Python-Version: >= 2.5
 Homepage: http://www.pygtk.org/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-python/debian/?op=log
-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gnome-python/debian
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-python/?op=log
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gnome-python/
 
 Package: python-gnome2
 Architecture: any
 Depends: ${python:Depends},
          ${shlibs:Depends},
          ${misc:Depends},
-         python-gconf (= ${binary:Version})
-Python-Depends: python-gtk2 (>= 2.10.3),
-		python-pyorbit (>= 2.0.1-4),
-		python-gobject (>= 2.17.0)
+         python-gconf (= ${binary:Version}),
+         python-gtk2 (>= 2.10.3),
+         python-pyorbit (>= 2.0.1-4),
+         python-gobject (>= 2.17.0)
 Suggests: python-gnome2-doc
 Provides: ${python:Provides}
-Conflicts: python2.3-gnome2,
-           python2.4-gnome2
-XB-Python-Version: ${python:Versions}
 Description: Python bindings for the GNOME desktop environment
  This archive contains modules that allow you to write Python programs
  using the GNOME libraries: GnomeVFS, bonobo, libgnome, libgnomeui and 
@@ -56,12 +50,12 @@
 Architecture: any
 Depends: ${python:Depends},
          ${shlibs:Depends},
-         ${misc:Depends}
-Python-Depends: python-gobject
+         ${misc:Depends},
+         python-gobject (>= 2.17.0)
 Suggests: python-gnome2-doc
 Provides: ${python:Provides}
-Conflicts: python-gnome2 (<< 2.22.3-3)
-XB-Python-Version: ${python:Versions}
+Breaks: python-gnome2 (<< 2.22.3-3)
+Replaces: python-gnome2 (<< 2.22.3-3)
 Description: Python bindings for the GConf configuration database system
  This package contains modules that allow to access and manipulate the 
  GNOME configuration database (GConf) from Python programs.
@@ -75,11 +69,6 @@
          python-gtk2-dev (>= 2.10.3),
          python-pyorbit-dev (>= 2.0.1-4)
 Recommends: python-gnome2-doc
-Replaces: python2.2-gnome2 (<< 1.99.16-7),
-          python2.3-gnome2 (<< 2.12.1-3),
-          python2.4-gnome2 (<< 2.12.1-3)
-Conflicts: python2.2-gnome2 (<< 1.99.16-7),
-           python2.3-gnome2 (<< 2.12.1-3)
 Description: Python bindings for the GNOME desktop environment - development files
  This archive contains files that allow you to build wrappers for addon
  that interoperate gnome-python.

Modified: desktop/unstable/gnome-python/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-python/debian/control.in?rev=27688&op=diff
==============================================================================
--- desktop/unstable/gnome-python/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-python/debian/control.in [utf-8] Tue Apr 19 23:37:12 2011
@@ -3,10 +3,9 @@
 Priority: optional
 Maintainer: Sebastien Bacher <seb128 at debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 5.0.37.2),
+Build-Depends: debhelper (>= 8),
                gnome-pkg-tools (>= 0.10),
-               python-all-dev (>= 2.5),
-               python-support (>= 0.7.6),
+               python-all-dev (>= 2.6.6-3~),
                python-gobject-dev (>= 2.17.0),
                python-gtk2-dev (>= 2.10.3),
                python-pyorbit-dev (>= 2.0.1-4),
@@ -19,29 +18,24 @@
                libgconf2-dev (>= 2.11.1),
                libbonobo2-dev (>= 2.8.0),
                libbonoboui2-dev (>= 2.8.0),
-               gtk-doc-tools,
-               dpkg-dev (>= 1.13.19),
-               quilt
-Standards-Version: 3.8.1
-XS-Python-Version: >= 2.5
+               gtk-doc-tools
+Standards-Version: 3.9.2
+X-Python-Version: >= 2.5
 Homepage: http://www.pygtk.org/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-python/debian/?op=log
-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gnome-python/debian
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-python/?op=log
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gnome-python/
 
 Package: python-gnome2
 Architecture: any
 Depends: ${python:Depends},
          ${shlibs:Depends},
          ${misc:Depends},
-         python-gconf (= ${binary:Version})
-Python-Depends: python-gtk2 (>= 2.10.3),
-		python-pyorbit (>= 2.0.1-4),
-		python-gobject (>= 2.17.0)
+         python-gconf (= ${binary:Version}),
+         python-gtk2 (>= 2.10.3),
+         python-pyorbit (>= 2.0.1-4),
+         python-gobject (>= 2.17.0)
 Suggests: python-gnome2-doc
 Provides: ${python:Provides}
-Conflicts: python2.3-gnome2,
-           python2.4-gnome2
-XB-Python-Version: ${python:Versions}
 Description: Python bindings for the GNOME desktop environment
  This archive contains modules that allow you to write Python programs
  using the GNOME libraries: GnomeVFS, bonobo, libgnome, libgnomeui and 
@@ -51,12 +45,12 @@
 Architecture: any
 Depends: ${python:Depends},
          ${shlibs:Depends},
-         ${misc:Depends}
-Python-Depends: python-gobject
+         ${misc:Depends},
+         python-gobject (>= 2.17.0)
 Suggests: python-gnome2-doc
 Provides: ${python:Provides}
-Conflicts: python-gnome2 (<< 2.22.3-3)
-XB-Python-Version: ${python:Versions}
+Breaks: python-gnome2 (<< 2.22.3-3)
+Replaces: python-gnome2 (<< 2.22.3-3)
 Description: Python bindings for the GConf configuration database system
  This package contains modules that allow to access and manipulate the 
  GNOME configuration database (GConf) from Python programs.
@@ -70,11 +64,6 @@
          python-gtk2-dev (>= 2.10.3),
          python-pyorbit-dev (>= 2.0.1-4)
 Recommends: python-gnome2-doc
-Replaces: python2.2-gnome2 (<< 1.99.16-7),
-          python2.3-gnome2 (<< 2.12.1-3),
-          python2.4-gnome2 (<< 2.12.1-3)
-Conflicts: python2.2-gnome2 (<< 1.99.16-7),
-           python2.3-gnome2 (<< 2.12.1-3)
 Description: Python bindings for the GNOME desktop environment - development files
  This archive contains files that allow you to build wrappers for addon
  that interoperate gnome-python.

Modified: desktop/unstable/gnome-python/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-python/debian/rules?rev=27688&op=diff
==============================================================================
--- desktop/unstable/gnome-python/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-python/debian/rules [utf-8] Tue Apr 19 23:37:12 2011
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/quilt/quilt.make
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
@@ -19,7 +18,7 @@
 
 PYVERS := $(shell pyversions -vr debian/control 2>/dev/null)
 
-build-%/configure-stamp: patch
+build-%/configure-stamp:
 	dh_testdir
 	mkdir -p build-$*
 	cd build-$* && \
@@ -37,7 +36,7 @@
 install-clean:
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 
 install-%: install-clean build-%/build-stamp
 	dh_testdir
@@ -51,7 +50,7 @@
 	dh_installdirs
 	chmod 755 debian/python-gnome2/usr/share/python/runtime.d/*
 
-clean:: unpatch
+clean::
 	dh_testdir
 	dh_testroot
 	rm -rf build-* debian/tmp-*
@@ -69,7 +68,7 @@
 	dh_link -i
 	dh_compress -i
 	dh_fixperms -i
-	dh_pysupport -i /usr/share/pygtk/2.0/argtypes
+	dh_python2 -i /usr/share/pygtk/2.0/argtypes
 	dh_installdeb -i
 	dh_gencontrol -i
 	dh_md5sums -i
@@ -88,7 +87,7 @@
 	dh_strip -s
 	dh_compress -s
 	dh_fixperms -s
-	dh_pysupport -s
+	dh_python2 -a
 	dh_installdeb -s
 	dh_shlibdeps -s -Xusr/lib/gnome-vfs-2.0/modules
 	dh_gencontrol -s




More information about the pkg-gnome-commits mailing list