r24726 - in /desktop/unstable/pygobject/debian: changelog compat control control.in patches/ rules

bigon at users.alioth.debian.org bigon at users.alioth.debian.org
Sat Jul 10 23:12:20 UTC 2010


Author: bigon
Date: Sat Jul 10 23:12:20 2010
New Revision: 24726

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24726
Log:
* New upstream release.
* Bump Standards-Version to 3.9.0 (no further changes)
* Bump debhelper version to 7
* debian/control.in:
  - Build-depend on libgirepository1.0-dev, libcairo2-dev, python-cairo-dev
  - python-gobject: Conflicts/Replaces/Provides python-gi
  - Add python-gobject-cairo package and make python-gobject Recommends it
* debian/rules:
  - Don't need --enable-pygi, it is now merged
  - Install files for python-gobject-cairo
  - Replace dh_clean -k by dh_prep
* Dropped debian/patches/03_maintainer_mode.patch 
  debian/patches/04_testsuite_gtk.patch,
  debian/patches/64_gil_locking.patch,
  debian/patches/90_autofoo.patch: not needed anymore

Removed:
    desktop/unstable/pygobject/debian/patches/
Modified:
    desktop/unstable/pygobject/debian/changelog
    desktop/unstable/pygobject/debian/compat
    desktop/unstable/pygobject/debian/control
    desktop/unstable/pygobject/debian/control.in
    desktop/unstable/pygobject/debian/rules

Modified: desktop/unstable/pygobject/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/changelog?rev=24726&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/changelog [utf-8] (original)
+++ desktop/unstable/pygobject/debian/changelog [utf-8] Sat Jul 10 23:12:20 2010
@@ -1,3 +1,23 @@
+pygobject (2.21.4-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.0 (no further changes)
+  * Bump debhelper version to 7
+  * debian/control.in:
+    - Build-depend on libgirepository1.0-dev, libcairo2-dev, python-cairo-dev
+    - python-gobject: Conflicts/Replaces/Provides python-gi
+    - Add python-gobject-cairo package and make python-gobject Recommends it
+  * debian/rules:
+    - Don't need --enable-pygi, it is now merged
+    - Install files for python-gobject-cairo
+    - Replace dh_clean -k by dh_prep
+  * Dropped debian/patches/03_maintainer_mode.patch 
+    debian/patches/04_testsuite_gtk.patch,
+    debian/patches/64_gil_locking.patch,
+    debian/patches/90_autofoo.patch: not needed anymore
+
+ -- Laurent Bigonville <bigon at debian.org>  Sun, 11 Jul 2010 01:08:33 +0200
+
 pygobject (2.21.1-2) unstable; urgency=low
 
   [ Emilio Pozuelo Monfort ]

Modified: desktop/unstable/pygobject/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/compat?rev=24726&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/compat [utf-8] (original)
+++ desktop/unstable/pygobject/debian/compat [utf-8] Sat Jul 10 23:12:20 2010
@@ -1,1 +1,1 @@
-5
+7

Modified: desktop/unstable/pygobject/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/control?rev=24726&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/control [utf-8] (original)
+++ desktop/unstable/pygobject/debian/control [utf-8] Sat Jul 10 23:12:20 2010
@@ -8,21 +8,24 @@
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Laurent Bigonville <bigon at debian.org>, Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: debhelper (>= 5),
+Build-Depends: debhelper (>= 7),
                python-support (>= 0.4),
                gnome-pkg-tools (>= 0.10),
                cdbs,
                quilt,
                python-all-dev (>= 2.5),
                libglib2.0-dev (>= 2.22.4),
+               libcairo2-dev,
                libffi-dev (>= 3.0.5),
+               libgirepository1.0-dev (>= 0.6.14),
+               python-cairo-dev (>= 1.0.2),
                xsltproc,
                docbook-xsl,
                autotools-dev,
                python-all-dbg,
 Build-Conflicts: python2.3-dev (<< 2.3.5)
 XS-Python-Version: >= 2.5
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 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,16 +34,34 @@
 Depends: ${python:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
-Provides: ${python:Provides}
+Provides: ${python:Provides}, python-gi
 XB-Python-Version: ${python:Versions}
+Recommends: python-gobject-cairo
 Suggests: python-gobject-dbg
-Conflicts: python-gtk2 (<< 2.10)
+Conflicts: python-gtk2 (<< 2.10), python-gi
+Replaces: python-gi
 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,
  the core library used to build GTK+ and GNOME.
  .
  This package contains the Python bindings for GObject. It is mostly
+ used by other bindings to map their GObjects to Python objects.
+
+Package: python-gobject-cairo
+Architecture: any
+Depends: ${python:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends},
+         python-cairo
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
+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,
+ the core library used to build GTK+ and GNOME.
+ .
+ This package contains the Python Cairo bindings for GObject. It is mostly
  used by other bindings to map their GObjects to Python objects.
 
 Package: python-gobject-dev

Modified: desktop/unstable/pygobject/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/control.in?rev=24726&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/control.in [utf-8] (original)
+++ desktop/unstable/pygobject/debian/control.in [utf-8] Sat Jul 10 23:12:20 2010
@@ -3,21 +3,24 @@
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 5),
+Build-Depends: debhelper (>= 7),
                python-support (>= 0.4),
                gnome-pkg-tools (>= 0.10),
                cdbs,
                quilt,
                python-all-dev (>= 2.5),
                libglib2.0-dev (>= 2.22.4),
+               libcairo2-dev,
                libffi-dev (>= 3.0.5),
+               libgirepository1.0-dev (>= 0.6.14),
+               python-cairo-dev (>= 1.0.2),
                xsltproc,
                docbook-xsl,
                autotools-dev,
                python-all-dbg,
 Build-Conflicts: python2.3-dev (<< 2.3.5)
 XS-Python-Version: >= 2.5
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/pygobject
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/pygobject
 
@@ -26,16 +29,34 @@
 Depends: ${python:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
-Provides: ${python:Provides}
+Provides: ${python:Provides}, python-gi
 XB-Python-Version: ${python:Versions}
+Recommends: python-gobject-cairo
 Suggests: python-gobject-dbg
-Conflicts: python-gtk2 (<< 2.10)
+Conflicts: python-gtk2 (<< 2.10), python-gi
+Replaces: python-gi
 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,
  the core library used to build GTK+ and GNOME.
  .
  This package contains the Python bindings for GObject. It is mostly
+ used by other bindings to map their GObjects to Python objects.
+
+Package: python-gobject-cairo
+Architecture: any
+Depends: ${python:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends},
+         python-cairo
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
+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,
+ the core library used to build GTK+ and GNOME.
+ .
+ This package contains the Python Cairo bindings for GObject. It is mostly
  used by other bindings to map their GObjects to Python objects.
 
 Package: python-gobject-dev

Modified: desktop/unstable/pygobject/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/rules?rev=24726&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/rules [utf-8] (original)
+++ desktop/unstable/pygobject/debian/rules [utf-8] Sat Jul 10 23:12:20 2010
@@ -13,7 +13,6 @@
 configure_flags += \
 		--prefix=/usr \
 		--enable-thread \
-                --enable-pygi \
 		--build=$(DEB_BUILD_GNU_TYPE) \
 		--disable-maintainer-mode
 
@@ -110,9 +109,13 @@
 	dh_testroot
 	# remove the install stamps to force a reinstall (since dh_clean is
 	# removing the package dirs)
-	dh_clean -k $(PYVERS:%=build-%/install-stamp) $(PYVERS:%=dbg-build-%/install-stamp)
+	dh_prep $(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
+	for i in $(PYVERS); do \
+		mkdir -p debian/python-gobject-cairo/usr/lib/pymodules/python$$i/gtk-2.0/gi; \
+		mv debian/python-gobject-dev/usr/lib/pymodules/python$$i/gtk-2.0/gi/_gi_cairo.so debian/python-gobject-cairo/usr/lib/pymodules/python$$i/gtk-2.0/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/libpyglib-*so.* \
@@ -160,6 +163,7 @@
 	dh_installexamples -s
 	dh_installchangelogs -s ChangeLog
 	dh_strip -ppython-gobject --dbg-package=python-gobject-dbg
+	dh_strip -ppython-gobject-cairo --dbg-package=python-gobject-dbg
 	rm -rf debian/python-gobject-dbg/usr/share/doc/python-gobject-dbg
 	ln -sf python-gobject debian/python-gobject-dbg/usr/share/doc/python-gobject-dbg
 	dh_link -s




More information about the pkg-gnome-commits mailing list