r27376 - in /desktop/unstable/pygobject: ./ debian/changelog debian/control debian/control.in debian/copyright debian/patches/ debian/patches/20_deprecated_spam.patch debian/patches/series debian/rules debian/watch
bigon at users.alioth.debian.org
bigon at users.alioth.debian.org
Sun Apr 10 15:57:05 UTC 2011
Author: bigon
Date: Sun Apr 10 15:57:00 2011
New Revision: 27376
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27376
Log:
Merge experimental branch
Added:
desktop/unstable/pygobject/debian/patches/
- copied from r27374, desktop/experimental/pygobject/debian/patches/
desktop/unstable/pygobject/debian/patches/20_deprecated_spam.patch
- copied unchanged from r27374, desktop/experimental/pygobject/debian/patches/20_deprecated_spam.patch
desktop/unstable/pygobject/debian/patches/series
- copied unchanged from r27374, desktop/experimental/pygobject/debian/patches/series
Modified:
desktop/unstable/pygobject/ (props changed)
desktop/unstable/pygobject/debian/changelog
desktop/unstable/pygobject/debian/control
desktop/unstable/pygobject/debian/control.in
desktop/unstable/pygobject/debian/copyright
desktop/unstable/pygobject/debian/rules
desktop/unstable/pygobject/debian/watch
Propchange: desktop/unstable/pygobject/
------------------------------------------------------------------------------
svn:mergeinfo = /desktop/experimental/pygobject:25635-27374
Modified: desktop/unstable/pygobject/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/changelog?rev=27376&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/changelog [utf-8] (original)
+++ desktop/unstable/pygobject/debian/changelog [utf-8] Sun Apr 10 15:57:00 2011
@@ -1,3 +1,103 @@
+pygobject (2.28.3-1) experimental; urgency=low
+
+ [ Laurent Bigonville ]
+ * New upstream release (Closes: #619338).
+ * debian/control.in:
+ - Bump cdbs and python-all-dev build-dependencies
+ - Drop XB-Python-Version: ${python:Versions}
+ - Make python-gobject-dbg Depends against ${python:Depends}
+ instead of python-dbg
+ - Build-dependends against dh-autoreconf
+ - Add xauth, gir1.2-glib-2.0, gir1.2-gtk-3.0 and gir1.2-freedesktop
+ to build-depends, needed by the tests
+ * 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: Call dh_autoreconf{_clean} instead of handeling this by hand,
+ should Closes: #558530
+
+ [ 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.
+ * Fix test suite calls during package build (Closes: #619257):
+ - debian/rules: Copy Python files from our modules into build tree, so
+ that the tests actually find them. In Python you can't have Python
+ modules and compiled extensions which belong to the same import in
+ different directories. (Unfortunately it's hard to upstream this, so
+ keep it as a Debian specific hack for now.)
+ - debian/rules: Run the tests under xvfb so that the Gdk/Gtk ones can
+ succeed.
+ - debian/rules: Disable fakeroot for the tests by unsetting $LD_PRELOAD.
+ Otherwise the tests try to connect to root's session D-BUS.
+ - debian/control.in: Add build dependencies: xvfb (as we now use it in
+ debian/rules), dbus-x11 (as the test suite uses dbus-launch), and
+ python-apt-dbg/python-cairo-dbg, so that the test cases for the debug
+ builds have all dependencies met.
+
+ -- Laurent Bigonville <bigon at debian.org> Thu, 24 Mar 2011 16:05:06 +0100
+
+pygobject (2.28.0-2) experimental; urgency=low
+
+ * Add debian/patches/40_revert_libpython_link.patch: Do not link against
+ libpython, taken from upstream (Closes: #618749)
+ * Add debian/patches/99_autoreconf.patch: Run autoreconf
+
+ -- Laurent Bigonville <bigon at debian.org> Mon, 21 Mar 2011 14:15:03 +0100
+
+pygobject (2.28.0-1) experimental; urgency=low
+
+ * New upstream stable release:
+ - Fix glib.main_context_default() causes immediate segfault
+ (Closes: #580791)
+ - Fix import error with GTK3 gir binding (Closes: #618557)
+ * debian/control.in:
+ - Bump python-cairo-dev and gobject-introspection build-dependencies
+ - Bump python-gobject-dev dependency against libglib2.0-dev
+ - Drop Build-Conflicts against python2.3-dev (<< 2.3.5)
+ - Drop C/R/P against python-gobject-doc
+ - Drop Conflicts against python-gtk2{-dev,} (<< 2.10)
+ * debian/rules: Adjust installation path for cairo binding
+ * debian/copyright: Update copyright file
+ * debian/rules: Remove explicit calls to quilt as we are using '3.0 (quilt)'
+ format
+ * d/p/30_[gi-overrides]-fix-exception-block-so-it-works-in-Python-2.5.patch:
+ Make exception compatible with python 2.5 (taken from upstream)
+
+ -- Laurent Bigonville <bigon at debian.org> Wed, 16 Mar 2011 13:28:29 +0100
+
+pygobject (2.27.0-2) experimental; urgency=low
+
+ * debian/control.in:
+ - Depend on gir1.2-glib-2.0 instead of in gir1.0-glib-2.0.
+ - Build depend on libglib2.0-dev >= 2.24. Closes: #609277.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Sat, 08 Jan 2011 02:34:41 +0000
+
+pygobject (2.27.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/control.in:
+ - Bump Standards-Version to 3.9.1 (no further changes)
+ - Build-depend on libgirepository1.0-dev, libcairo2-dev, python-cairo-dev
+ and gobject-introspection
+ - python-gobject: Conflicts/Replaces/Provides python-gi
+ - python-gobject: Add dependency against gir1.0-glib-2.0
+ - Add python-gobject-cairo package and make python-gobject Recommends it
+ - Bump minimal python version to 2.5.2
+ * debian/rules:
+ - Don't need --enable-pygi, it is now merged
+ - Install files for python-gobject-cairo
+ * Drop debian/patches/03_maintainer_mode.patch: Merged upstream
+ * Drop debian/patches/90_autofoo.patch: Not needed anymore
+ * debian/watch: Bump version to 3
+
+ -- Laurent Bigonville <bigon at debian.org> Wed, 24 Nov 2010 22:10:22 +0100
+
pygobject (2.21.4+is.2.21.3-1) unstable; urgency=low
* Downgrade to version 2.21.3 since PyGI is absolutely not ready to
Modified: desktop/unstable/pygobject/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/control?rev=27376&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/control [utf-8] (original)
+++ desktop/unstable/pygobject/debian/control [utf-8] Sun Apr 10 15:57:00 2011
@@ -7,22 +7,33 @@
Section: python
Priority: optional
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>, Sjoerd Simons <sjoerd 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,
+ dh-autoreconf,
+ cdbs (>= 0.4.90~),
quilt,
- python-all-dev (>= 2.5),
- libglib2.0-dev (>= 2.22.4),
+ python-all-dev (>= 2.6.6-3~),
+ libglib2.0-dev (>= 2.24.0),
+ libcairo2-dev,
libffi-dev (>= 3.0.5),
+ gobject-introspection (>= 0.10.2),
+ libgirepository1.0-dev (>= 0.10.2),
+ python-cairo-dev (>= 1.2.0),
xsltproc,
+ xvfb,
+ xauth,
+ dbus-x11,
docbook-xsl,
autotools-dev,
python-all-dbg,
-Build-Conflicts: python2.3-dev (<< 2.3.5)
-XS-Python-Version: >= 2.5
-Standards-Version: 3.9.0
+ python-apt-dbg,
+ python-cairo-dbg,
+ gir1.2-glib-2.0,
+ gir1.2-gtk-3.0,
+ gir1.2-freedesktop
+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
@@ -30,11 +41,13 @@
Architecture: any
Depends: ${python:Depends},
${shlibs:Depends},
- ${misc:Depends}
-Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
+ ${misc:Depends},
+ gir1.2-glib-2.0
+Provides: ${python:Provides}, python-gi
+Recommends: python-gobject-cairo
Suggests: python-gobject-dbg
-Conflicts: python-gtk2 (<< 2.10)
+Conflicts: 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,
@@ -43,17 +56,29 @@
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}
+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
Architecture: all
Depends: ${python:Depends},
${misc:Depends},
python-gobject (>= ${source:Version}),
python-dev,
- libglib2.0-dev (>= 2.8.0),
+ libglib2.0-dev (>= 2.24.0),
libffi-dev (>= 3.0.5)
-Conflicts: python-gtk2-dev (<< 2.10), python-gobject-doc
-Replaces: python-gobject-doc
-Provides: python-gobject-doc
Recommends: docbook-xsl
Description: Development headers for the GObject Python bindings
GObject is an abstraction layer that allows programming with an object
@@ -67,8 +92,7 @@
Section: debug
Priority: extra
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, python-dbg, python-gobject (= ${binary:Version})
-Conflicts: python-gtk2 (<< 2.10)
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-gobject (= ${binary:Version})
Description: Python bindings for the GObject library (debug extension)
GObject is an abstraction layer that allows programming with an object
paradigm that is compatible with many languages. It is a part of Glib,
@@ -77,4 +101,4 @@
This package contains the Python bindings for GObject. It is mostly
used by other bindings to map their GObjects to Python objects.
.
- This package contains the extensions built for the python debug interpreter.
+ This package contains the extensions built for the Python debug interpreter.
Modified: desktop/unstable/pygobject/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/control.in?rev=27376&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/control.in [utf-8] (original)
+++ desktop/unstable/pygobject/debian/control.in [utf-8] Sun Apr 10 15:57:00 2011
@@ -4,20 +4,31 @@
Maintainer: Josselin Mouette <joss at debian.org>
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>= 7),
- python-support (>= 0.4),
gnome-pkg-tools (>= 0.10),
- cdbs,
+ dh-autoreconf,
+ cdbs (>= 0.4.90~),
quilt,
- python-all-dev (>= 2.5),
- libglib2.0-dev (>= 2.22.4),
+ python-all-dev (>= 2.6.6-3~),
+ libglib2.0-dev (>= 2.24.0),
+ libcairo2-dev,
libffi-dev (>= 3.0.5),
+ gobject-introspection (>= 0.10.2),
+ libgirepository1.0-dev (>= 0.10.2),
+ python-cairo-dev (>= 1.2.0),
xsltproc,
+ xvfb,
+ xauth,
+ dbus-x11,
docbook-xsl,
autotools-dev,
python-all-dbg,
-Build-Conflicts: python2.3-dev (<< 2.3.5)
-XS-Python-Version: >= 2.5
-Standards-Version: 3.9.0
+ python-apt-dbg,
+ python-cairo-dbg,
+ gir1.2-glib-2.0,
+ gir1.2-gtk-3.0,
+ gir1.2-freedesktop
+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
@@ -25,11 +36,13 @@
Architecture: any
Depends: ${python:Depends},
${shlibs:Depends},
- ${misc:Depends}
-Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
+ ${misc:Depends},
+ gir1.2-glib-2.0
+Provides: ${python:Provides}, python-gi
+Recommends: python-gobject-cairo
Suggests: python-gobject-dbg
-Conflicts: python-gtk2 (<< 2.10)
+Conflicts: 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,
@@ -38,17 +51,29 @@
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}
+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
Architecture: all
Depends: ${python:Depends},
${misc:Depends},
python-gobject (>= ${source:Version}),
python-dev,
- libglib2.0-dev (>= 2.8.0),
+ libglib2.0-dev (>= 2.24.0),
libffi-dev (>= 3.0.5)
-Conflicts: python-gtk2-dev (<< 2.10), python-gobject-doc
-Replaces: python-gobject-doc
-Provides: python-gobject-doc
Recommends: docbook-xsl
Description: Development headers for the GObject Python bindings
GObject is an abstraction layer that allows programming with an object
@@ -62,8 +87,7 @@
Section: debug
Priority: extra
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, python-dbg, python-gobject (= ${binary:Version})
-Conflicts: python-gtk2 (<< 2.10)
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-gobject (= ${binary:Version})
Description: Python bindings for the GObject library (debug extension)
GObject is an abstraction layer that allows programming with an object
paradigm that is compatible with many languages. It is a part of Glib,
@@ -72,4 +96,4 @@
This package contains the Python bindings for GObject. It is mostly
used by other bindings to map their GObjects to Python objects.
.
- This package contains the extensions built for the python debug interpreter.
+ This package contains the extensions built for the Python debug interpreter.
Modified: desktop/unstable/pygobject/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/copyright?rev=27376&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/copyright [utf-8] (original)
+++ desktop/unstable/pygobject/debian/copyright [utf-8] Sun Apr 10 15:57:00 2011
@@ -5,6 +5,22 @@
Upstream authors: James Henstridge <james at daa.com.au>
Johan Dahlin <johan at gnome.org>
+ Gustavo J A M Carneiro <gjc at gnome.org>
+ Paul Pogonyshev <pogonyshev at gmx.net>
+ Gian Mario Tagliaretti <gianmt at gnome.org>
+
+Copyright (C) 1998-2003 James Henstridge
+Copyright (C) 2005 Oracle
+Copyright (C) 2005-2009 Johan Dahlin
+Copyright (C) 2006 Johannes Hoelzl
+Copyright (C) 2006-2009 John Finlay
+Copyright (C) 2008 Gian Mario Tagliaretti
+Copyright (C) 2009 Simon van der Linden
+Copyright (C) 2010 Ignacio Casal Quinteiro
+Copyright (c) 2010 litl, LLC
+Copyright (C) 2010 Tomeu Vizoso
+Copyright (C) 2010 Collabora Ltd.
+Copyright (C) 2010 Paolo Borelli
License:
Modified: desktop/unstable/pygobject/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/rules?rev=27376&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/rules [utf-8] (original)
+++ desktop/unstable/pygobject/debian/rules [utf-8] Sun Apr 10 15:57:00 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)
@@ -13,7 +15,6 @@
configure_flags += \
--prefix=/usr \
--enable-thread \
- --enable-pygi \
--build=$(DEB_BUILD_GNU_TYPE) \
--disable-maintainer-mode
@@ -25,35 +26,12 @@
PYVERS := $(shell pyversions --requested --version debian/control)
PYVERS := $(filter-out $(PYDEFAULTVER), $(PYVERS)) $(PYDEFAULTVER)
-# how to call quilt
-PATCH_DIR := $(CURDIR)/debian/patches
-QUILT := QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null
-
patch-stamp:
dh_testdir
- # apply patches
- $(QUILT) push -a || test $$? = 2
- # backup the original files to restore them in the clean target
- [ ! -r config.sub ] || \
- (cp config.sub config.sub.orig && \
- cp /usr/share/misc/config.sub config.sub)
- [ ! -r config.guess ] || \
- (cp config.guess config.guess.orig && \
- cp /usr/share/misc/config.guess config.guess)
+ dh_autoreconf
touch $@
patch: patch-stamp
-
-unpatch:
- rm -f patch-stamp
- # restore files from backup (before unpatching)
- [ ! -r config.sub.orig ] || \
- cp config.sub.orig config.sub
- [ ! -r config.guess.orig ] || \
- cp config.guess.orig config.guess
- # unapply patches, if any
- $(QUILT) pop -a || test $$? = 2
- rm -rf .pc
build-%/configure-stamp: patch-stamp
dh_testdir
@@ -73,22 +51,28 @@
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)
build-%/check-stamp: build-%/build-stamp
- -PYTHON=/usr/bin/python$* $(MAKE) -C build-$* check
+ find gi glib gobject gio -name '*.py' -exec cp '$(CURDIR)/{}' build-$*/'{}' \;
+ # don't run the tests under fakeroot, otherwise they will try to
+ # connect to root's session D-BUS
+ -PYTHON=/usr/bin/python$* LD_PRELOAD= xvfb-run $(MAKE) -C build-$* check
touch $@
dbg-build-%/check-stamp: dbg-build-%/build-stamp
- -PYTHON=/usr/bin/python$*-dbg $(MAKE) -C dbg-build-$* check
+ find gi glib gobject gio -name '*.py' -exec cp '$(CURDIR)/{}' dbg-build-$*/'{}' \;
+ # don't run the tests under fakeroot, otherwise they will try to
+ # connect to root's session D-BUS
+ -PYTHON=/usr/bin/python$*-dbg LD_PRELOAD= xvfb-run $(MAKE) -C dbg-build-$* check
touch $@
check: $(PYVERS:%=build-%/check-stamp) $(PYVERS:%=dbg-build-%/check-stamp)
@@ -96,13 +80,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 $@
@@ -116,12 +106,16 @@
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
+ for i in $(PYVERS); do \
+ 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
@@ -134,8 +128,9 @@
dh_testdir
dh_testroot
rm -f install-stamp
+ rm -f patch-stamp
rm -rf build-* dbg-build-*
- $(MAKE) -f debian/rules unpatch
+ dh_autoreconf_clean
dh_clean *.pyc */*.pyc
maybe_check = $(if $(findstring nocheck,$(DEB_BUILD_OPTIONS)),,check)
@@ -151,7 +146,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,14 +159,15 @@
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
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
@@ -179,4 +175,4 @@
dh_builddeb -s
binary: binary-arch binary-indep
-.PHONY: patch unpatch build check install clean binary-indep binary-arch binary
+.PHONY: patch build check install clean binary-indep binary-arch binary
Modified: desktop/unstable/pygobject/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/watch?rev=27376&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/watch [utf-8] (original)
+++ desktop/unstable/pygobject/debian/watch [utf-8] Sun Apr 10 15:57:00 2011
@@ -1,2 +1,2 @@
-version=2
+version=3
http://ftp.gnome.org/pub/GNOME/sources/pygobject/([\d\.]+)[02468]/pygobject-([\d\.]+)\.tar\.gz
More information about the pkg-gnome-commits
mailing list