r27034 - in /desktop/experimental/pygobject/debian: changelog control control.in patches/30_[gi-overrides]-fix-exception-block-so-it-works-in-Python-2.5.patch patches/40_revert_libpython_link.patch patches/99_autoreconf.patch patches/series rules

bigon at users.alioth.debian.org bigon at users.alioth.debian.org
Tue Mar 22 14:45:52 UTC 2011 

Author: bigon
Date: Tue Mar 22 14:45:51 2011
New Revision: 27034

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27034
Log:
* New upstream release.
* debian/control.in:
  - Bump cdbs and python-all-dev build-dependencies
  - Add Breaks: ${python:Breaks}
  - Drop XB-Python-Version: ${python:Versions}
* Drop d/p/40_revert_libpython_link.patch,
  d/p/30_[gi-overrides]-fix-exception-block-so-it-works-in-Python-2.5.patch:
  Applied upstream
* Drop debian/patches/99_autoreconf.patch: Not needed anymore
* debian/rules: Move from pysupport (which is being deprecated) to
  dh_python2. Drop python-support build dependency.
  (Closes: #614764)
* debian/rules: Install a library search path for a pysupport compatible
  gtk-2.0 directory, to avoid instantly breaking all reverse dependencies.
  This needs to stay until they get converted to dh_python2.

Removed:
    desktop/experimental/pygobject/debian/patches/30_[gi-overrides]-fix-exception-block-so-it-works-in-Python-2.5.patch
    desktop/experimental/pygobject/debian/patches/40_revert_libpython_link.patch
    desktop/experimental/pygobject/debian/patches/99_autoreconf.patch
Modified:
    desktop/experimental/pygobject/debian/changelog
    desktop/experimental/pygobject/debian/control
    desktop/experimental/pygobject/debian/control.in
    desktop/experimental/pygobject/debian/patches/series
    desktop/experimental/pygobject/debian/rules

Modified: desktop/experimental/pygobject/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygobject/debian/changelog?rev=27034&op=diff
==============================================================================
--- desktop/experimental/pygobject/debian/changelog [utf-8] (original)
+++ desktop/experimental/pygobject/debian/changelog [utf-8] Tue Mar 22 14:45:51 2011
@@ -1,3 +1,26 @@
+pygobject (2.28.1-1) UNRELEASED; urgency=low
+
+  [ Laurent Bigonville ]
+  * New upstream release.
+  * debian/control.in:
+    - Bump cdbs and python-all-dev build-dependencies
+    - Add Breaks: ${python:Breaks}
+    - Drop XB-Python-Version: ${python:Versions}
+  * Drop d/p/40_revert_libpython_link.patch,
+    d/p/30_[gi-overrides]-fix-exception-block-so-it-works-in-Python-2.5.patch:
+    Applied upstream
+  * Drop debian/patches/99_autoreconf.patch: Not needed anymore
+
+  [ Martin Pitt ]
+  * debian/rules: Move from pysupport (which is being deprecated) to
+    dh_python2. Drop python-support build dependency.
+    (Closes: #614764)
+  * debian/rules: Install a library search path for a pysupport compatible
+    gtk-2.0 directory, to avoid instantly breaking all reverse dependencies.
+    This needs to stay until they get converted to dh_python2.
+
+ -- Laurent Bigonville <bigon at debian.org>  Tue, 22 Mar 2011 13:59:39 +0100
+
 pygobject (2.28.0-2) experimental; urgency=low
 
   * Add debian/patches/40_revert_libpython_link.patch: Do not link against

Modified: desktop/experimental/pygobject/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygobject/debian/control?rev=27034&op=diff
==============================================================================
--- desktop/experimental/pygobject/debian/control [utf-8] (original)
+++ desktop/experimental/pygobject/debian/control [utf-8] Tue Mar 22 14:45:51 2011
@@ -9,11 +9,10 @@
 Maintainer: Josselin Mouette <joss at debian.org>
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Laurent Bigonville <bigon at debian.org>
 Build-Depends: debhelper (>= 7),
-               python-support (>= 0.4),
                gnome-pkg-tools (>= 0.10),
-               cdbs,
+               cdbs (>= 0.4.90~),
                quilt,
-               python-all-dev (>= 2.5.2),
+               python-all-dev (>= 2.6.6-3~),
                libglib2.0-dev (>= 2.24.0),
                libcairo2-dev,
                libffi-dev (>= 3.0.5),
@@ -24,7 +23,7 @@
                docbook-xsl,
                autotools-dev,
                python-all-dbg,
-XS-Python-Version: >= 2.5
+X-Python-Version: >= 2.5
 Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/pygobject
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/pygobject

Modified: desktop/experimental/pygobject/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygobject/debian/control.in?rev=27034&op=diff
==============================================================================
--- desktop/experimental/pygobject/debian/control.in [utf-8] (original)
+++ desktop/experimental/pygobject/debian/control.in [utf-8] Tue Mar 22 14:45:51 2011
@@ -4,11 +4,10 @@
 Maintainer: Josselin Mouette <joss at debian.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 7),
-               python-support (>= 0.4),
                gnome-pkg-tools (>= 0.10),
-               cdbs,
+               cdbs (>= 0.4.90~),
                quilt,
-               python-all-dev (>= 2.5.2),
+               python-all-dev (>= 2.6.6-3~),
                libglib2.0-dev (>= 2.24.0),
                libcairo2-dev,
                libffi-dev (>= 3.0.5),
@@ -19,7 +18,7 @@
                docbook-xsl,
                autotools-dev,
                python-all-dbg,
-XS-Python-Version: >= 2.5
+X-Python-Version: >= 2.5
 Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/pygobject
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/pygobject
@@ -31,11 +30,11 @@
          ${misc:Depends},
          gir1.2-glib-2.0
 Provides: ${python:Provides}, python-gi
-XB-Python-Version: ${python:Versions}
 Recommends: python-gobject-cairo
 Suggests: python-gobject-dbg
 Conflicts: python-gi
 Replaces: python-gi
+Breaks: ${python:Breaks}
 Description: Python bindings for the GObject library
  GObject is an abstraction layer that allows programming with an object
  paradigm that is compatible with many languages. It is a part of Glib,
@@ -51,7 +50,7 @@
          ${misc:Depends},
          python-cairo
 Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
+Breaks: ${python:Breaks}
 Description: Python Cairo bindings for the GObject library
  GObject is an abstraction layer that allows programming with an object
  paradigm that is compatible with many languages. It is a part of Glib,

Modified: desktop/experimental/pygobject/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygobject/debian/patches/series?rev=27034&op=diff
==============================================================================
--- desktop/experimental/pygobject/debian/patches/series [utf-8] (original)
+++ desktop/experimental/pygobject/debian/patches/series [utf-8] Tue Mar 22 14:45:51 2011
@@ -1,4 +1,1 @@
 20_deprecated_spam.patch
-30_[gi-overrides]-fix-exception-block-so-it-works-in-Python-2.5.patch
-40_revert_libpython_link.patch
-99_autoreconf.patch

Modified: desktop/experimental/pygobject/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygobject/debian/rules?rev=27034&op=diff
==============================================================================
--- desktop/experimental/pygobject/debian/rules [utf-8] (original)
+++ desktop/experimental/pygobject/debian/rules [utf-8] Tue Mar 22 14:45:51 2011
@@ -2,6 +2,8 @@
 
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+
+include /usr/share/python/python.mk
 
 CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
 
@@ -63,12 +65,12 @@
 
 build-%/build-stamp: build-%/configure-stamp
 	dh_testdir
-	PYTHON=/usr/bin/python$* $(MAKE) -C build-$* pyexecdir=/usr/lib/pymodules/python$*
+	PYTHON=/usr/bin/python$* $(MAKE) -C build-$* pyexecdir=$(call py_libdir_sh, $*)
 	touch $@
 
 dbg-build-%/build-stamp: dbg-build-%/configure-stamp
 	dh_testdir
-	PYTHON=/usr/bin/python$*-dbg $(MAKE) -C dbg-build-$*
+	PYTHON=/usr/bin/python$*-dbg $(MAKE) -C dbg-build-$* pyexecdir=$(call py_libdir_sh, $*)
 	touch $@
 
 build: $(PYVERS:%=build-%/build-stamp) $(PYVERS:%=dbg-build-%/build-stamp)
@@ -86,13 +88,19 @@
 build-%/install-stamp: build-%/build-stamp
 	dh_testdir
 	dh_testroot
-	PYTHON=/usr/bin/python$* $(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/python-gobject-dev pyexecdir=/usr/lib/pymodules/python$*
+	PYTHON=/usr/bin/python$* $(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/python-gobject-dev pyexecdir=$(call py_libdir_sh, $*)
+	# dh_python2 trips over this empty dir in the sanity check for >= 2.6, so remove it
+	-rmdir debian/python-gobject-dev/usr/lib/python$*/site-packages
+	# until all reverse dependencies of pygobject have been converted to
+	# dh_python2, install a library search path which is backwards
+	# compatible to pysupport (see Debian#614764)
+	echo "/usr/lib/pymodules/python$*/gtk-2.0/" > $(CURDIR)/debian/python-gobject-dev/$(call py_libdir_sh, $*)/gtk-2.0-pysupport-compat.pth
 	touch $@
 
 dbg-build-%/install-stamp: dbg-build-%/build-stamp
 	dh_testdir
 	dh_testroot
-	PYTHON=/usr/bin/python$*-dbg $(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-gobject-dbg
+	PYTHON=/usr/bin/python$*-dbg $(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-gobject-dbg pyexecdir=$(call py_libdir_sh, $*)
 	find debian/python-gobject-dbg ! -type d ! \( -name '*.so' -o -name '*.so.*' \) -delete
 	find debian/python-gobject-dbg -type d -empty -delete
 	touch $@
@@ -107,15 +115,15 @@
 	$(MAKE) -f debian/rules $(PYVERS:%=build-%/install-stamp) $(PYVERS:%=dbg-build-%/install-stamp)
 	find debian/python-gobject-dev -name \*.la -delete
 	for i in $(PYVERS); do \
-		mkdir -p debian/python-gobject-cairo/usr/lib/pymodules/python$$i/gi; \
-		mv debian/python-gobject-dev/usr/lib/pymodules/python$$i/gi/_gi_cairo.so debian/python-gobject-cairo/usr/lib/pymodules/python$$i/gi; \
+		mkdir -p debian/python-gobject-cairo/$(call py_libdir_sh, $$i)/gi; \
+		mv debian/python-gobject-dev/$(call py_libdir_sh, $$i)/gi/_gi_cairo.so debian/python-gobject-cairo/$(call py_libdir_sh, $$i)/gi; \
 	done
 	mkdir -p debian/python-gobject/usr/lib
-	mv debian/python-gobject-dev/usr/lib/pymodules debian/python-gobject/usr/lib/
+	mv debian/python-gobject-dev/usr/lib/python* debian/python-gobject/usr/lib/
 	mv debian/python-gobject-dev/usr/lib/libpyglib-*so.* \
 	   debian/python-gobject/usr/lib
 	rm -rf debian/python-gobject-dev/usr/lib/python*
-	for i in $$(find debian/python-gobject-dbg -name '*.so' -path 'debian/python-gobject-dbg/usr/lib/python*/site-packages/*'); do \
+	for i in $$(find debian/python-gobject-dbg -name '*.so' -path 'debian/python-gobject-dbg/usr/lib/python*/*-packages/*'); do \
 		b=$$(basename $$i .so); \
 		mv $$i $$(dirname $$i)/$${b}_d.so; \
 	done
@@ -145,7 +153,7 @@
 	dh_fixperms -i
 	# More permission fixing
 	chmod 755 `grep -rl "^#\!.*python" debian/python-gobject-dev/usr`
-	dh_pysupport -i /usr/share/pygobject
+	dh_python2 -i /usr/share/pygobject
 	dh_installdeb -i
 	dh_gencontrol -i
 	dh_md5sums -i
@@ -164,9 +172,9 @@
 	dh_link -s
 	dh_compress -s -X.py
 	dh_fixperms -s
-	dh_pysupport -s
-	dh_makeshlibs -ppython-gobject     -V'python-gobject (>= 2.15.2)'
-	dh_makeshlibs -ppython-gobject-dbg -V'python-gobject-dbg (>= 2.15.2)'
+	dh_python2 -a
+	dh_makeshlibs -ppython-gobject     -V'python-gobject (>= 2.28.1)'
+	dh_makeshlibs -ppython-gobject-dbg -V'python-gobject-dbg (>= 2.28.1)'
 	dh_installdeb -s
 	dh_shlibdeps -s
 	dh_gencontrol -s

More information about the pkg-gnome-commits mailing list