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

mpitt at users.alioth.debian.org mpitt at users.alioth.debian.org
Tue Apr 10 11:01:39 UTC 2012


Author: mpitt
Date: Tue Apr 10 11:01:38 2012
New Revision: 34192

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34192
Log:
debian/control.in, debian/rules: Build a python3-gi-cairo package, now
that py3cairo is packaged in Debian. (LP: #879405)

Modified:
    desktop/unstable/pygobject/debian/changelog
    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=34192&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/changelog [utf-8] (original)
+++ desktop/unstable/pygobject/debian/changelog [utf-8] Tue Apr 10 11:01:38 2012
@@ -1,3 +1,10 @@
+pygobject (3.2.0-3) UNRELEASED; urgency=low
+
+  * debian/control.in, debian/rules: Build a python3-gi-cairo package, now
+    that py3cairo is packaged in Debian. (LP: #879405)
+
+ -- Martin Pitt <mpitt at debian.org>  Tue, 10 Apr 2012 13:00:38 +0200
+
 pygobject (3.2.0-2) unstable; urgency=low
 
   * Upload to unstable.

Modified: desktop/unstable/pygobject/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/control?rev=34192&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/control [utf-8] (original)
+++ desktop/unstable/pygobject/debian/control [utf-8] Tue Apr 10 11:01:38 2012
@@ -20,6 +20,7 @@
                gobject-introspection (>= 1.31.0),
                libgirepository1.0-dev (>= 1.31.0),
                python-cairo-dev (>= 1.2.0),
+               python3-cairo-dev (>= 1.10.0),
                xsltproc,
                xvfb,
                xauth,
@@ -166,6 +167,20 @@
  is here for upgrade purposes only. You can remove it safely when 
  nothing else depends on it.
 
+Package: python3-gi-cairo
+Architecture: any
+Depends: ${python3:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends},
+         python3-cairo
+Description: Python 3 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 3 Cairo bindings for GObject. It is mostly
+ used by other bindings to map their GObjects to Python objects.
+
 Package: python-gobject-dbg
 Section: debug
 Priority: extra

Modified: desktop/unstable/pygobject/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/control.in?rev=34192&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/control.in [utf-8] (original)
+++ desktop/unstable/pygobject/debian/control.in [utf-8] Tue Apr 10 11:01:38 2012
@@ -15,6 +15,7 @@
                gobject-introspection (>= 1.31.0),
                libgirepository1.0-dev (>= 1.31.0),
                python-cairo-dev (>= 1.2.0),
+               python3-cairo-dev (>= 1.10.0),
                xsltproc,
                xvfb,
                xauth,
@@ -161,6 +162,20 @@
  is here for upgrade purposes only. You can remove it safely when 
  nothing else depends on it.
 
+Package: python3-gi-cairo
+Architecture: any
+Depends: ${python3:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends},
+         python3-cairo
+Description: Python 3 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 3 Cairo bindings for GObject. It is mostly
+ used by other bindings to map their GObjects to Python objects.
+
 Package: python-gobject-dbg
 Section: debug
 Priority: extra

Modified: desktop/unstable/pygobject/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/rules?rev=34192&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/rules [utf-8] (original)
+++ desktop/unstable/pygobject/debian/rules [utf-8] Tue Apr 10 11:01:38 2012
@@ -41,30 +41,12 @@
 			$(CURDIR)/configure $(configure_flags)
 	touch $@
 
-# FIXME: temporary rule until py3cairo gets packaged
-build-3.2/configure-stamp: patch-stamp
-	dh_testdir
-	mkdir -p build-3.2
-	cd build-3.2 && \
-		PYTHON=/usr/bin/python3.2 CFLAGS="$(CFLAGS)" \
-			$(CURDIR)/configure $(configure_flags) --disable-cairo CFLAGS="-g -O2 -I/usr/include/cairo"
-	touch $@
-
 dbg-build-%/configure-stamp: patch-stamp
 	dh_testdir
 	mkdir -p dbg-build-$*
 	cd dbg-build-$* && \
 		PYTHON=/usr/bin/python$*-dbg CFLAGS="$(CFLAGS) -O0" \
 			$(CURDIR)/configure $(configure_flags)
-	touch $@
-
-# FIXME: temporary rule until py3cairo gets packaged
-dbg-build-3.2/configure-stamp: patch-stamp
-	dh_testdir
-	mkdir -p dbg-build-3.2
-	cd dbg-build-3.2 && \
-		PYTHON=/usr/bin/python3.2-dbg CFLAGS="$(CFLAGS) -O0" \
-			$(CURDIR)/configure $(configure_flags) --disable-cairo CFLAGS="-g -O2 -I/usr/include/cairo"
 	touch $@
 
 build-%/build-stamp: build-%/configure-stamp
@@ -160,9 +142,14 @@
 	rm -f $(PYVERS:%=build-%/install-stamp) $(PYVERS:%=dbg-build-%/install-stamp)
 	$(MAKE) -f debian/rules $(PYVERS:%=build-%/install-stamp) $(PYVERS:%=dbg-build-%/install-stamp)
 	for i in $(PYVERS); do \
-		[ "$${i#3.}" = "$$i" ] || continue; \
-		mkdir -p debian/python-gi-cairo/$(call py_libdir_sh, $$i)/gi; \
-		mv debian/python-gi/$(call py_libdir_sh, $$i)/gi/_gi_cairo.so debian/python-gi-cairo/$(call py_libdir_sh, $$i)/gi; \
+		if [ "$${i#3.}" = "$$i" ]; then \
+			mkdir -p debian/python-gi-cairo/$(call py_libdir_sh, $$i)/gi; \
+			mv debian/python-gi/$(call py_libdir_sh, $$i)/gi/_gi_cairo.so debian/python-gi-cairo/$(call py_libdir_sh, $$i)/gi; \
+		else \
+			ABITAG=`python$$i -c "import sysconfig; print(sysconfig.get_config_var('SOABI'))"`; \
+			mkdir -p debian/python3-gi-cairo/$(call py_libdir_sh, $$i)/gi; \
+			mv debian/python3-gi/$(call py_libdir_sh, $$i)/gi/_gi_cairo.$$ABITAG.so debian/python3-gi-cairo/$(call py_libdir_sh, $$i)/gi; \
+		fi \
 	done
 	mkdir -p debian/python-gi/usr/lib
 	for i in $$(find debian/python-gi-dbg -name '*.so' -path 'debian/python-gi-dbg/usr/lib/python*/*-packages/*'); do \




More information about the pkg-gnome-commits mailing list