r29581 - in /desktop/unstable/pygobject-2/debian: changelog control control.in rules

Mon Sep 5 05:46:31 UTC 2011

Author: mpitt
Date: Mon Sep  5 05:46:30 2011
New Revision: 29581

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29581
Log:
debian/control.in, debian/rules: Rename python-gobject-dev to
python-gobject-2-dev. pygobject 2.90 now also builds a python-gobject-dev
which depends on python-gobject-2-dev.

Modified:
    desktop/unstable/pygobject-2/debian/changelog
    desktop/unstable/pygobject-2/debian/control
    desktop/unstable/pygobject-2/debian/control.in
    desktop/unstable/pygobject-2/debian/rules

Modified: desktop/unstable/pygobject-2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject-2/debian/changelog?rev=29581&op=diff
==============================================================================

--- desktop/unstable/pygobject-2/debian/changelog [utf-8] (original)
+++ desktop/unstable/pygobject-2/debian/changelog [utf-8] Mon Sep  5 05:46:30 2011
@@ -1,3 +1,11 @@
+pygobject-2 (2.28.6-7) UNRELEASED; urgency=low
+
+  * debian/control.in, debian/rules: Rename python-gobject-dev to
+    python-gobject-2-dev. pygobject 2.90 now also builds a python-gobject-dev
+    which depends on python-gobject-2-dev.
+
+ -- Martin Pitt <mpitt at debian.org>  Mon, 05 Sep 2011 07:23:46 +0200
+
 pygobject-2 (2.28.6-6) experimental; urgency=low
 
   * debian/copyright: Update to current licenses/copyrights, and convert to

Modified: desktop/unstable/pygobject-2/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject-2/debian/control?rev=29581&op=diff
==============================================================================
--- desktop/unstable/pygobject-2/debian/control [utf-8] (original)
+++ desktop/unstable/pygobject-2/debian/control [utf-8] Mon Sep  5 05:46:30 2011
@@ -52,7 +52,7 @@
  written code. These static bindings just exist to provide backwards
  compatibility for GNOME 2 based software.
 
-Package: python-gobject-dev
+Package: python-gobject-2-dev
 Architecture: all
 Depends: ${python:Depends},
          ${misc:Depends},

Modified: desktop/unstable/pygobject-2/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject-2/debian/control.in?rev=29581&op=diff
==============================================================================
--- desktop/unstable/pygobject-2/debian/control.in [utf-8] (original)
+++ desktop/unstable/pygobject-2/debian/control.in [utf-8] Mon Sep  5 05:46:30 2011
@@ -47,7 +47,7 @@
  written code. These static bindings just exist to provide backwards
  compatibility for GNOME 2 based software.
 
-Package: python-gobject-dev
+Package: python-gobject-2-dev
 Architecture: all
 Depends: ${python:Depends},
          ${misc:Depends},
@@ -56,6 +56,8 @@
          libglib2.0-dev (>= 2.24.0),
          libffi-dev (>= 3.0.5)
 Recommends: docbook-xsl
+Breaks: python-gobject-dev (<< 2.90)
+Replaces: python-gobject-dev (<< 2.90)
 Description: development headers for the static GObject Python bindings
  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/unstable/pygobject-2/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject-2/debian/rules?rev=29581&op=diff
==============================================================================
--- desktop/unstable/pygobject-2/debian/rules [utf-8] (original)
+++ desktop/unstable/pygobject-2/debian/rules [utf-8] Mon Sep  5 05:46:30 2011
@@ -81,13 +81,13 @@
 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=$(call py_libdir_sh, $*)
+	PYTHON=/usr/bin/python$* $(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/python-gobject-2-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
+	-rmdir debian/python-gobject-2-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
+	echo "/usr/lib/pymodules/python$*/gtk-2.0/" > $(CURDIR)/debian/python-gobject-2-dev/$(call py_libdir_sh, $*)/gtk-2.0-pysupport-compat.pth
 	touch $@
 
 dbg-build-%/install-stamp: dbg-build-%/build-stamp
@@ -106,12 +106,12 @@
 	dh_prep
 	rm -f $(PYVERS:%=build-%/install-stamp) $(PYVERS:%=dbg-build-%/install-stamp)
 	$(MAKE) -f debian/rules $(PYVERS:%=build-%/install-stamp) $(PYVERS:%=dbg-build-%/install-stamp)
-	find debian/python-gobject-dev -name \*.la -delete
+	find debian/python-gobject-2-dev -name \*.la -delete
 	mkdir -p debian/python-gobject-2/usr/lib
-	mv debian/python-gobject-dev/usr/lib/python* debian/python-gobject-2/usr/lib/
-	mv debian/python-gobject-dev/usr/lib/libpyglib-*so.* \
+	mv debian/python-gobject-2-dev/usr/lib/python* debian/python-gobject-2/usr/lib/
+	mv debian/python-gobject-2-dev/usr/lib/libpyglib-*so.* \
 	   debian/python-gobject-2/usr/lib
-	rm -rf debian/python-gobject-dev/usr/lib/python*
+	rm -rf debian/python-gobject-2-dev/usr/lib/python*
 	for i in $$(find debian/python-gobject-2-dbg -name '*.so' -path 'debian/python-gobject-2-dbg/usr/lib/python*/*-packages/*'); do \
 		b=$$(basename $$i .so); \
 		mv $$i $$(dirname $$i)/$${b}_d.so; \
@@ -142,7 +142,7 @@
 	dh_compress -i -X.py
 	dh_fixperms -i
 	# More permission fixing
-	chmod 755 `grep -rl "^#\!.*python" debian/python-gobject-dev/usr`
+	chmod 755 `grep -rl "^#\!.*python" debian/python-gobject-2-dev/usr`
 	dh_python2 -i /usr/share/pygobject
 	dh_installdeb -i
 	dh_gencontrol -i


