r27665 - in /desktop/unstable/pygtk/debian: changelog compat control control.in patches/60_pygtk-wakeupfd-fix.patch patches/series python-glade2.install python-gtk2.install rules
bigon at users.alioth.debian.org
bigon at users.alioth.debian.org
Mon Apr 18 19:26:37 UTC 2011
Author: bigon
Date: Mon Apr 18 19:26:36 2011
New Revision: 27665
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27665
Log:
* New upstream release (Closes: #619126).
- Built against python 2.6 and python 2.7 (Closes: #623182)
* debian/control.in:
- Bump python-gobject-dev and libgtk2.0-dev build-dependencies
- Bump python-gtk2-dev dependencies against python-gobject-dev
and libgtk2.0-dev (Closes: #554973)
- Drop pysupport build-dependency and bump python-all-dev
- Bump Standards-Version to 3.9.2 (no further changes)
- Drop all Conflicts/Replaces, all these packages only exist prior lenny
- Drop Python-Depends and use Depends instead
- Don't Depends against python-dbg, let dh_python2 generate the correct
versions
- Drop all XB-Python-Version
- Bump debhelper compatibility to 8
* debian/rules:
- Use dh_python2 instead of dh_pysupport
- Set pyexecdir to install files to py_libdir_sh
* Drop debian/patches/60_pygtk-wakeupfd-fix.patch: Fixed upstream
Removed:
desktop/unstable/pygtk/debian/patches/60_pygtk-wakeupfd-fix.patch
Modified:
desktop/unstable/pygtk/debian/changelog
desktop/unstable/pygtk/debian/compat
desktop/unstable/pygtk/debian/control
desktop/unstable/pygtk/debian/control.in
desktop/unstable/pygtk/debian/patches/series
desktop/unstable/pygtk/debian/python-glade2.install
desktop/unstable/pygtk/debian/python-gtk2.install
desktop/unstable/pygtk/debian/rules
Modified: desktop/unstable/pygtk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygtk/debian/changelog?rev=27665&op=diff
==============================================================================
--- desktop/unstable/pygtk/debian/changelog [utf-8] (original)
+++ desktop/unstable/pygtk/debian/changelog [utf-8] Mon Apr 18 19:26:36 2011
@@ -1,3 +1,27 @@
+pygtk (2.24.0-1) UNRELEASED; urgency=low
+
+ * New upstream release (Closes: #619126).
+ - Built against python 2.6 and python 2.7 (Closes: #623182)
+ * debian/control.in:
+ - Bump python-gobject-dev and libgtk2.0-dev build-dependencies
+ - Bump python-gtk2-dev dependencies against python-gobject-dev
+ and libgtk2.0-dev (Closes: #554973)
+ - Drop pysupport build-dependency and bump python-all-dev
+ - Bump Standards-Version to 3.9.2 (no further changes)
+ - Drop all Conflicts/Replaces, all these packages only exist prior lenny
+ - Drop Python-Depends and use Depends instead
+ - Don't Depends against python-dbg, let dh_python2 generate the correct
+ versions
+ - Drop all XB-Python-Version
+ - Bump debhelper compatibility to 8
+ * debian/rules:
+ - Use dh_python2 instead of dh_pysupport
+ - Set pyexecdir to install files to py_libdir_sh
+ * Drop debian/patches/60_pygtk-wakeupfd-fix.patch: Fixed upstream
+
+
+ -- Laurent Bigonville <bigon at debian.org> Mon, 18 Apr 2011 20:44:44 +0200
+
pygtk (2.17.0-4) unstable; urgency=low
* Provide proper support python-numpy upgrades, calling dh_numpy to
Modified: desktop/unstable/pygtk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygtk/debian/compat?rev=27665&op=diff
==============================================================================
--- desktop/unstable/pygtk/debian/compat [utf-8] (original)
+++ desktop/unstable/pygtk/debian/compat [utf-8] Mon Apr 18 19:26:36 2011
@@ -1,1 +1,1 @@
-5
+8
Modified: desktop/unstable/pygtk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygtk/debian/control?rev=27665&op=diff
==============================================================================
--- desktop/unstable/pygtk/debian/control [utf-8] (original)
+++ desktop/unstable/pygtk/debian/control [utf-8] Mon Apr 18 19:26:36 2011
@@ -8,14 +8,13 @@
Priority: optional
Maintainer: Sebastien Bacher <seb128 at debian.org>
Uploaders: Torsten Landschoff <torsten at debian.org>,
- Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Luca Falavigna <dktrkranz at debian.org>
-Build-Depends: debhelper (>= 5),
- python-support (>= 0.7.6),
+ Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Luca Falavigna <dktrkranz at debian.org>
+Build-Depends: debhelper (>= 8),
gnome-pkg-tools (>= 0.10),
cdbs,
autotools-dev,
xvfb (>= 2:1.6.0), xauth, xfonts-base,
- python-all-dev (>= 2.5),
+ python-all-dev (>= 2.6.6-3~),
python-all-dbg,
libgtk2.0-dev (>= 2.18.0),
libglib2.0-dev (>= 2.8.0),
@@ -25,13 +24,13 @@
python-numpy-dbg (>= 1:1.4.1-4~),
python-cairo-dev (>= 1.0.2),
python-cairo-dbg (>= 1.0.2),
- python-gobject-dev (>= 2.16.1),
- python-gobject-dbg (>= 2.16.1),
+ python-gobject-dev (>= 2.21.3),
+ python-gobject-dbg (>= 2.21.3),
xsltproc,
docbook-xsl,
gnome-icon-theme
-XS-Python-Version: >= 2.5
-Standards-Version: 3.9.1
+X-Python-Version: >= 2.5
+Standards-Version: 3.9.2
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/pygtk/
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/pygtk/
Homepage: http://www.pygtk.org/
@@ -40,19 +39,11 @@
Architecture: any
Depends: ${python:Depends},
${shlibs:Depends},
- ${misc:Depends}
-Python-Depends: python-cairo (>= 1.0.2-1.1),
- python-gobject (>= 2.15.3)
+ ${misc:Depends},
+ python-cairo (>= 1.0.2-1.1),
+ python-gobject (>= 2.21.3)
Suggests: python-gtk2-doc
Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
-Conflicts: python-gdk-imlib,
- python-glade,
- python-gnome,
- python-gtk,
- python2.3-gtk2,
- python2.4-gtk2,
- python-gtk-1.2 (<< 0.6.12-7)
Description: Python bindings for the GTK+ widget set
This archive contains modules that allow you to use GTK+ in Python
programs.
@@ -63,12 +54,12 @@
Section: debug
Depends: python-gtk2 (= ${binary:Version}),
python-glade2 (= ${binary:Version}),
- python-dbg,
python-numpy-dbg,
python-cairo-dbg,
python-gobject-dbg,
${shlibs:Depends},
- ${misc:Depends}
+ ${misc:Depends},
+ ${python:Depends}
Description: Python bindings for the GTK+ widget set (debug extension)
This archive contains modules that allow you to use GTK+ in Python
programs.
@@ -81,22 +72,10 @@
${misc:Depends},
python-gtk2 (>= ${source:Version}),
libglib2.0-dev (>= 2.8),
- libgtk2.0-dev (>= 2.13.6),
+ libgtk2.0-dev (>= 2.18.0),
python-dev,
- python-gobject-dev (>= 2.15.3)
+ python-gobject-dev (>= 2.21.3)
Recommends: python-gtk2-doc
-Replaces: python2.2-gtk2 (<< 1.99.17-4),
- python2.3-gtk2 (<< 1.99.17-4),
- python2.2-glade2 (<< 1.99.17-4),
- python2.3-glade2 (<< 1.99.17-4)
-Conflicts: python2.2-gtk2 (<< 1.99.17-4),
- python2.3-gtk2 (<< 1.99.17-4),
- python2.2-glade2 (<< 1.99.17-4),
- python2.3-glade2 (<< 1.99.17-4),
- python-gdk-imlib,
- python-glade,
- python-gnome,
- python-gtk
Description: GTK+ bindings: devel files
This archive contains files that allow you to build wrappers for addons
that interoperate with python-gtk2 (pygtk).
@@ -108,12 +87,6 @@
${misc:Depends},
python-gtk2 (= ${binary:Version})
Suggests: python-gtk2-doc
-Conflicts: python-gdk-imlib,
- python-glade,
- python-gnome,
- python-gtk,
- python2.3-glade2,
- python2.4-glade2
Provides: ${python:Provides}
Description: GTK+ bindings: Glade support
Contains bindings for the glade library from use within Python. Glade
@@ -124,11 +97,9 @@
Package: python-gtk2-doc
Architecture: all
Section: doc
-XB-Python-Version: ${python:Versions}
Depends: ${misc:Depends},
${python:Depends},
python-gtk2,
-Conflicts: python-gtk2 (<< 2.10.4-3)
Recommends: python-gobject,
python-cairo,
python-glade2
Modified: desktop/unstable/pygtk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygtk/debian/control.in?rev=27665&op=diff
==============================================================================
--- desktop/unstable/pygtk/debian/control.in [utf-8] (original)
+++ desktop/unstable/pygtk/debian/control.in [utf-8] Mon Apr 18 19:26:36 2011
@@ -4,13 +4,12 @@
Maintainer: Sebastien Bacher <seb128 at debian.org>
Uploaders: Torsten Landschoff <torsten at debian.org>,
@GNOME_TEAM@
-Build-Depends: debhelper (>= 5),
- python-support (>= 0.7.6),
+Build-Depends: debhelper (>= 8),
gnome-pkg-tools (>= 0.10),
cdbs,
autotools-dev,
xvfb (>= 2:1.6.0), xauth, xfonts-base,
- python-all-dev (>= 2.5),
+ python-all-dev (>= 2.6.6-3~),
python-all-dbg,
libgtk2.0-dev (>= 2.18.0),
libglib2.0-dev (>= 2.8.0),
@@ -20,13 +19,13 @@
python-numpy-dbg (>= 1:1.4.1-4~),
python-cairo-dev (>= 1.0.2),
python-cairo-dbg (>= 1.0.2),
- python-gobject-dev (>= 2.16.1),
- python-gobject-dbg (>= 2.16.1),
+ python-gobject-dev (>= 2.21.3),
+ python-gobject-dbg (>= 2.21.3),
xsltproc,
docbook-xsl,
gnome-icon-theme
-XS-Python-Version: >= 2.5
-Standards-Version: 3.9.1
+X-Python-Version: >= 2.5
+Standards-Version: 3.9.2
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/pygtk/
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/pygtk/
Homepage: http://www.pygtk.org/
@@ -35,19 +34,11 @@
Architecture: any
Depends: ${python:Depends},
${shlibs:Depends},
- ${misc:Depends}
-Python-Depends: python-cairo (>= 1.0.2-1.1),
- python-gobject (>= 2.15.3)
+ ${misc:Depends},
+ python-cairo (>= 1.0.2-1.1),
+ python-gobject (>= 2.21.3)
Suggests: python-gtk2-doc
Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
-Conflicts: python-gdk-imlib,
- python-glade,
- python-gnome,
- python-gtk,
- python2.3-gtk2,
- python2.4-gtk2,
- python-gtk-1.2 (<< 0.6.12-7)
Description: Python bindings for the GTK+ widget set
This archive contains modules that allow you to use GTK+ in Python
programs.
@@ -58,12 +49,12 @@
Section: debug
Depends: python-gtk2 (= ${binary:Version}),
python-glade2 (= ${binary:Version}),
- python-dbg,
python-numpy-dbg,
python-cairo-dbg,
python-gobject-dbg,
${shlibs:Depends},
- ${misc:Depends}
+ ${misc:Depends},
+ ${python:Depends}
Description: Python bindings for the GTK+ widget set (debug extension)
This archive contains modules that allow you to use GTK+ in Python
programs.
@@ -76,22 +67,10 @@
${misc:Depends},
python-gtk2 (>= ${source:Version}),
libglib2.0-dev (>= 2.8),
- libgtk2.0-dev (>= 2.13.6),
+ libgtk2.0-dev (>= 2.18.0),
python-dev,
- python-gobject-dev (>= 2.15.3)
+ python-gobject-dev (>= 2.21.3)
Recommends: python-gtk2-doc
-Replaces: python2.2-gtk2 (<< 1.99.17-4),
- python2.3-gtk2 (<< 1.99.17-4),
- python2.2-glade2 (<< 1.99.17-4),
- python2.3-glade2 (<< 1.99.17-4)
-Conflicts: python2.2-gtk2 (<< 1.99.17-4),
- python2.3-gtk2 (<< 1.99.17-4),
- python2.2-glade2 (<< 1.99.17-4),
- python2.3-glade2 (<< 1.99.17-4),
- python-gdk-imlib,
- python-glade,
- python-gnome,
- python-gtk
Description: GTK+ bindings: devel files
This archive contains files that allow you to build wrappers for addons
that interoperate with python-gtk2 (pygtk).
@@ -103,12 +82,6 @@
${misc:Depends},
python-gtk2 (= ${binary:Version})
Suggests: python-gtk2-doc
-Conflicts: python-gdk-imlib,
- python-glade,
- python-gnome,
- python-gtk,
- python2.3-glade2,
- python2.4-glade2
Provides: ${python:Provides}
Description: GTK+ bindings: Glade support
Contains bindings for the glade library from use within Python. Glade
@@ -119,11 +92,9 @@
Package: python-gtk2-doc
Architecture: all
Section: doc
-XB-Python-Version: ${python:Versions}
Depends: ${misc:Depends},
${python:Depends},
python-gtk2,
-Conflicts: python-gtk2 (<< 2.10.4-3)
Recommends: python-gobject,
python-cairo,
python-glade2
Modified: desktop/unstable/pygtk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygtk/debian/patches/series?rev=27665&op=diff
==============================================================================
--- desktop/unstable/pygtk/debian/patches/series [utf-8] (original)
+++ desktop/unstable/pygtk/debian/patches/series [utf-8] Mon Apr 18 19:26:36 2011
@@ -1,3 +1,2 @@
01_pygtk-demo.patch
03_testsuite_filechooser.patch
-60_pygtk-wakeupfd-fix.patch
Modified: desktop/unstable/pygtk/debian/python-glade2.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygtk/debian/python-glade2.install?rev=27665&op=diff
==============================================================================
--- desktop/unstable/pygtk/debian/python-glade2.install [utf-8] (original)
+++ desktop/unstable/pygtk/debian/python-glade2.install [utf-8] Mon Apr 18 19:26:36 2011
@@ -1,1 +1,1 @@
-debian/tmp/var/lib/python-support/*/gtk-2.0/gtk/glade.so
+debian/tmp/usr/lib/python*/*-packages/gtk-2.0/gtk/glade.so
Modified: desktop/unstable/pygtk/debian/python-gtk2.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygtk/debian/python-gtk2.install?rev=27665&op=diff
==============================================================================
--- desktop/unstable/pygtk/debian/python-gtk2.install [utf-8] (original)
+++ desktop/unstable/pygtk/debian/python-gtk2.install [utf-8] Mon Apr 18 19:26:36 2011
@@ -1,3 +1,3 @@
-debian/tmp/var/lib/python-support/*/gtk-2.0/*.so
-debian/tmp/var/lib/python-support/*/gtk-2.0/gtk/_gtk.so
-debian/tmp/var/lib/python-support/*/gtk-2.0/gtk/*.py
+debian/tmp/usr/lib/python*/*-packages/gtk-2.0/*.so
+debian/tmp/usr/lib/python*/*-packages/gtk-2.0/gtk/_gtk.so
+debian/tmp/usr/lib/python*/*-packages/gtk-2.0/gtk/*.py
Modified: desktop/unstable/pygtk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygtk/debian/rules?rev=27665&op=diff
==============================================================================
--- desktop/unstable/pygtk/debian/rules [utf-8] (original)
+++ desktop/unstable/pygtk/debian/rules [utf-8] Mon Apr 18 19:26:36 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)
@@ -52,7 +54,7 @@
build-%/build-stamp: build-%/configure-stamp
dh_testdir
- PYTHON=/usr/bin/python$* $(MAKE) -C build-$* pyexecdir=/var/lib/python-support/python$*
+ PYTHON=/usr/bin/python$* $(MAKE) -C build-$* pyexecdir=$(call py_libdir_sh, $*)
touch $@
dbg-build-%/configure-stamp: patch-stamp
@@ -65,7 +67,7 @@
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)
@@ -85,7 +87,7 @@
build-%/install-stamp: build-%/build-stamp
dh_testdir
dh_testroot
- PYTHON=/usr/bin/python$* $(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp pyexecdir=/var/lib/python-support/python$*
+ PYTHON=/usr/bin/python$* $(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp pyexecdir=$(call py_libdir_sh, $*)
# move installed files to a per python runtime location to allow
# comparison of the resulting files across runtimes or shipping
# multiple versions
@@ -102,7 +104,7 @@
dbg-build-%/install-stamp: dbg-build-%/build-stamp
dh_testdir
dh_testroot
- PYTHON=/usr/bin/python$* $(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-gtk2-dbg
+ PYTHON=/usr/bin/python$* $(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-gtk2-dbg pyexecdir=$(call py_libdir_sh, $*)
find debian/python-gtk2-dbg ! -type d ! -name '*.so' | xargs rm -f
find debian/python-gtk2-dbg -depth -empty -exec rmdir {} \;
touch $@
@@ -166,7 +168,7 @@
dh_fixperms -i
# More permission fixing
grep -rlZ "^#\!.*python" debian/python-gtk2-dev/usr | xargs -0r chmod 755
- dh_pysupport -ppython-gtk2-doc /usr/share/pygtk
+ dh_python2 -ppython-gtk2-doc /usr/share/pygtk
dh_installdeb -i
dh_gencontrol -i
dh_md5sums -i
@@ -184,7 +186,7 @@
dh_link -s
dh_compress -s -X.py -X.glade
dh_fixperms -s
- dh_pysupport -s
+ dh_python2 -a
dh_numpy -s -ppython-gtk2
dh_installdeb -s
dh_shlibdeps -s
More information about the pkg-gnome-commits
mailing list