Bug#375878: diff for 2.12.1-3.1 NMU
Sebastian Rittau
srittau at jroger.in-berlin.de
Wed Jun 28 16:53:07 UTC 2006
Package: gnome-python-extras
Version: 2.12.1-3
Severity: normal
Tags: patch
Hi,
Attached is the diff for my gnome-python-extras 2.12.1-3.1 NMU.
-------------- next part --------------
diff -Nru /tmp/wCXTAgOLKV/gnome-python-extras-2.12.1/debian/changelog /tmp/o8gm5ZdtfV/gnome-python-extras-2.12.1/debian/changelog
--- /tmp/wCXTAgOLKV/gnome-python-extras-2.12.1/debian/changelog 2006-06-28 18:52:34.000000000 +0200
+++ /tmp/o8gm5ZdtfV/gnome-python-extras-2.12.1/debian/changelog 2006-06-28 18:52:35.000000000 +0200
@@ -1,3 +1,29 @@
+gnome-python-extras (2.12.1-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Python policy transition.
+ + Closes: #375836: versioned dependency on virtual package python2.4-gtk2
+ + Closes: #375847: Python policy transition
+ + Closes: #373437: Python policy transition
+ + debian/control.in: Upgraded required version of debhelper in build
+ dependencies.
+ + debian/pycompat: New file.
+ + debian/control.in: Removed python2.3-gnome2-extras and
+ python2.4-gnome2-extras and added appropriate provides/conflicts to
+ python-gnome2-extras. python-gnome2-extras is not architecture any
+ instead of all.
+ + debian/control.in: Added a XB-Python-Version field to
+ python-gnome2-extras.
+ + debian/control.in: Replaced build dependency on python2.3-dev on
+ python2.4-dev by build dependency on python-all-dev. Added build
+ dependency on python-support.
+ + debian/rules: Reworked (mostly stolen from gnome-python package).
+ + debian/python-gnome2-extras.install:
+ debian/python-gnome2-extras-dev.install:
+ debian/python-gnome2-extras-doc.install: New files.
+
+ -- Sebastian Rittau <srittau at debian.org> Wed, 28 Jun 2006 18:41:17 +0200
+
gnome-python-extras (2.12.1-3) unstable; urgency=low
* Merge NMU patch, thanks Luk Claes, and acknowledge his fix.
diff -Nru /tmp/wCXTAgOLKV/gnome-python-extras-2.12.1/debian/control /tmp/o8gm5ZdtfV/gnome-python-extras-2.12.1/debian/control
--- /tmp/wCXTAgOLKV/gnome-python-extras-2.12.1/debian/control 2006-06-28 18:52:34.000000000 +0200
+++ /tmp/o8gm5ZdtfV/gnome-python-extras-2.12.1/debian/control 2006-06-28 18:52:35.000000000 +0200
@@ -3,12 +3,16 @@
Priority: optional
Maintainer: Sebastien Bacher <seb128 at debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Akira TAGOH <tagoh at debian.org>, Andreas Rottmann <rotty at debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, Cl?ment Stenac <zorglub at debian.org>, Dafydd Harries <daf at debian.org>, Guilherme de S. Pastore <gpastore at debian.org>, Gustavo Franco <stratus at debian.org>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Marco Cabizza <marco87 at gmail.com>, Ond?ej Sur? <ondrej at debian.org>, Ross Burton <ross at debian.org>, Sjoerd Simons <sjoerd at debian.org>, Takuo KITAME <kitame at debian.org>
-Build-Depends: debhelper (>= 4.2.28), dpatch, gnome-pkg-tools, python2.3-dev, python2.4-dev, libgtkhtml2-dev (>= 2.4), libpanel-applet2-dev (>= 2.0), python-gtk2-dev (>= 2.4), python-gnome2-dev (>= 2.10.0), libgnomeprintui2.2-dev (>= 2.2.0), libgtk2.0-dev (>= 2.4), libgtksourceview-dev (>= 1.1.90), libwnck-dev (>= 2.9.92), libgtkspell-dev (>= 2.0), mozilla-dev, totem, libgtop2-dev, libnautilus-burn-dev (>= 2.9.4), libgtop2-dev (>= 2.9.5), libgdl-1-dev (>= 0.4)
+Build-Depends: debhelper (>= 5.0.37.2), python-support (>= 0.3), dpatch, gnome-pkg-tools, python-all-dev, libgtkhtml2-dev (>= 2.4), libpanel-applet2-dev (>= 2.0), python-gtk2-dev (>= 2.4), python-gnome2-dev (>= 2.10.0), libgnomeprintui2.2-dev (>= 2.2.0), libgtk2.0-dev (>= 2.4), libgtksourceview-dev (>= 1.1.90), libwnck-dev (>= 2.9.92), libgtkspell-dev (>= 2.0), mozilla-dev, totem, libnautilus-burn-dev (>= 2.9.4), libgtop2-dev (>= 2.9.5), libgdl-1-dev (>= 0.4)
Standards-Version: 3.7.2
Package: python-gnome2-extras
-Architecture: all
-Depends: ${python:Depends}
+Architecture: any
+Depends: python-gtk2 (>= 2.8.6-1), python-pyorbit (>= 2.0.1-4), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, mozilla-browser
+Suggests: python-gnome2-extras-doc
+Conflicts: python2.3-gnome2-extras (<< 2.12.1-3.1), python2.4-gnome2-extras (<< 2.12.1-3.1), python2.2-gnome2
+Replaces: python2.3-gnome2-extras (<< 2.12.1-3.1), python2.4-gnome2-extras (<< 2.12.1-3.1), python2.2-gnome2
+XB-Python-Version: ${python:Versions}
Description: Python bindings for the GNOME desktop environment
This archive contains modules that allow you to write GNOME programs
in Python. This package contains the bindings that are not included
@@ -36,7 +40,7 @@
Package: python-gnome2-extras-dev
Architecture: all
-Depends: ${python:Depends}, python2.3-gnome2-extras (>= ${Source-Version}) | python2.4-gnome2-extras (>= ${Source-Version})
+Depends: ${python:Depends}, python-gnome2-extras (>= ${Source-Version})
Replaces: python2.2-gnome2 (<< 1.99.16-7), python2.3-gnome2 (<< 1.99.16-7), python-gnome2-dev (<< 2.9.0)
Conflicts: python2.2-gnome2 (<< 1.99.16-7), python2.3-gnome2 (<< 1.99.16-7), python-gnome2-dev (<< 2.9.0)
Description: Python bindings for the GNOME desktop environment
@@ -46,31 +50,3 @@
.
Author: James Henstridge <james at daa.com.au>
Homepage: http://www.daa.com.au/~james/software/pygtk/
-
-Package: python2.3-gnome2-extras
-Architecture: any
-Depends: python2.3-gtk2 (>= 2.4), python2.3-pyorbit, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, mozilla-browser
-Suggests: python-gnome2-extras-doc
-Replaces: python2.2-gnome2 (<< 1.99.16-5), python2.3-gnome2 (<< 2.9.1)
-Conflicts: python2.2-gnome2 (<< 1.99.16-5), , python2.3-gnome2 (<< 2.9.1)
-Description: Python bindings for the GNOME desktop environment
- This archive contains modules that allow you to write GNOME programs
- in Python. This package contains the bindings that are not included
- in the GNOME desktop.
- .
- Author: James Henstridge <james at daa.com.au>
- Homepage: http://www.daa.com.au/~james/software/pygtk/
-
-Package: python2.4-gnome2-extras
-Architecture: any
-Depends: python2.4-gtk2 (>= 2.4), python2.4-pyorbit, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, mozilla-browser
-Suggests: python-gnome2-extras-doc
-Replaces: python2.2-gnome2 (<< 1.99.16-5), python2.3-gnome2 (<< 2.9.1)
-Conflicts: python2.2-gnome2 (<< 1.99.16-5), , python2.3-gnome2 (<< 2.9.1)
-Description: Python bindings for the GNOME desktop environment
- This archive contains modules that allow you to write GNOME programs
- in Python. This package contains the bindings that are not included
- in the GNOME desktop.
- .
- Author: James Henstridge <james at daa.com.au>
- Homepage: http://www.daa.com.au/~james/software/pygtk/
diff -Nru /tmp/wCXTAgOLKV/gnome-python-extras-2.12.1/debian/control.in /tmp/o8gm5ZdtfV/gnome-python-extras-2.12.1/debian/control.in
--- /tmp/wCXTAgOLKV/gnome-python-extras-2.12.1/debian/control.in 2006-06-28 18:52:34.000000000 +0200
+++ /tmp/o8gm5ZdtfV/gnome-python-extras-2.12.1/debian/control.in 2006-06-28 18:52:35.000000000 +0200
@@ -3,12 +3,16 @@
Priority: optional
Maintainer: Sebastien Bacher <seb128 at debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 4.2.28), dpatch, gnome-pkg-tools, python2.3-dev, python2.4-dev, libgtkhtml2-dev (>= 2.4), libpanel-applet2-dev (>= 2.0), python-gtk2-dev (>= 2.4), python-gnome2-dev (>= 2.10.0), libgnomeprintui2.2-dev (>= 2.2.0), libgtk2.0-dev (>= 2.4), libgtksourceview-dev (>= 1.1.90), libwnck-dev (>= 2.9.92), libgtkspell-dev (>= 2.0), mozilla-dev, totem, libgtop2-dev, libnautilus-burn-dev (>= 2.9.4), libgtop2-dev (>= 2.9.5), libgdl-1-dev (>= 0.4)
+Build-Depends: debhelper (>= 5.0.37.2), python-support (>= 0.3), dpatch, gnome-pkg-tools, python-all-dev, libgtkhtml2-dev (>= 2.4), libpanel-applet2-dev (>= 2.0), python-gtk2-dev (>= 2.4), python-gnome2-dev (>= 2.10.0), libgnomeprintui2.2-dev (>= 2.2.0), libgtk2.0-dev (>= 2.4), libgtksourceview-dev (>= 1.1.90), libwnck-dev (>= 2.9.92), libgtkspell-dev (>= 2.0), mozilla-dev, totem, libnautilus-burn-dev (>= 2.9.4), libgtop2-dev (>= 2.9.5), libgdl-1-dev (>= 0.4)
Standards-Version: 3.7.2
Package: python-gnome2-extras
-Architecture: all
-Depends: ${python:Depends}
+Architecture: any
+Depends: python-gtk2 (>= 2.8.6-1), python-pyorbit (>= 2.0.1-4), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, mozilla-browser
+Suggests: python-gnome2-extras-doc
+Conflicts: python2.3-gnome2-extras (<< 2.12.1-3.1), python2.4-gnome2-extras (<< 2.12.1-3.1), python2.2-gnome2
+Replaces: python2.3-gnome2-extras (<< 2.12.1-3.1), python2.4-gnome2-extras (<< 2.12.1-3.1), python2.2-gnome2
+XB-Python-Version: ${python:Versions}
Description: Python bindings for the GNOME desktop environment
This archive contains modules that allow you to write GNOME programs
in Python. This package contains the bindings that are not included
@@ -36,7 +40,7 @@
Package: python-gnome2-extras-dev
Architecture: all
-Depends: ${python:Depends}, python2.3-gnome2-extras (>= ${Source-Version}) | python2.4-gnome2-extras (>= ${Source-Version})
+Depends: ${python:Depends}, python-gnome2-extras (>= ${Source-Version})
Replaces: python2.2-gnome2 (<< 1.99.16-7), python2.3-gnome2 (<< 1.99.16-7), python-gnome2-dev (<< 2.9.0)
Conflicts: python2.2-gnome2 (<< 1.99.16-7), python2.3-gnome2 (<< 1.99.16-7), python-gnome2-dev (<< 2.9.0)
Description: Python bindings for the GNOME desktop environment
@@ -46,31 +50,3 @@
.
Author: James Henstridge <james at daa.com.au>
Homepage: http://www.daa.com.au/~james/software/pygtk/
-
-Package: python2.3-gnome2-extras
-Architecture: any
-Depends: python2.3-gtk2 (>= 2.4), python2.3-pyorbit, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, mozilla-browser
-Suggests: python-gnome2-extras-doc
-Replaces: python2.2-gnome2 (<< 1.99.16-5), python2.3-gnome2 (<< 2.9.1)
-Conflicts: python2.2-gnome2 (<< 1.99.16-5), , python2.3-gnome2 (<< 2.9.1)
-Description: Python bindings for the GNOME desktop environment
- This archive contains modules that allow you to write GNOME programs
- in Python. This package contains the bindings that are not included
- in the GNOME desktop.
- .
- Author: James Henstridge <james at daa.com.au>
- Homepage: http://www.daa.com.au/~james/software/pygtk/
-
-Package: python2.4-gnome2-extras
-Architecture: any
-Depends: python2.4-gtk2 (>= 2.4), python2.4-pyorbit, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, mozilla-browser
-Suggests: python-gnome2-extras-doc
-Replaces: python2.2-gnome2 (<< 1.99.16-5), python2.3-gnome2 (<< 2.9.1)
-Conflicts: python2.2-gnome2 (<< 1.99.16-5), , python2.3-gnome2 (<< 2.9.1)
-Description: Python bindings for the GNOME desktop environment
- This archive contains modules that allow you to write GNOME programs
- in Python. This package contains the bindings that are not included
- in the GNOME desktop.
- .
- Author: James Henstridge <james at daa.com.au>
- Homepage: http://www.daa.com.au/~james/software/pygtk/
diff -Nru /tmp/wCXTAgOLKV/gnome-python-extras-2.12.1/debian/pycompat /tmp/o8gm5ZdtfV/gnome-python-extras-2.12.1/debian/pycompat
--- /tmp/wCXTAgOLKV/gnome-python-extras-2.12.1/debian/pycompat 1970-01-01 01:00:00.000000000 +0100
+++ /tmp/o8gm5ZdtfV/gnome-python-extras-2.12.1/debian/pycompat 2006-06-28 18:52:35.000000000 +0200
@@ -0,0 +1 @@
+2
diff -Nru /tmp/wCXTAgOLKV/gnome-python-extras-2.12.1/debian/python-gnome2-extras-dev.install /tmp/o8gm5ZdtfV/gnome-python-extras-2.12.1/debian/python-gnome2-extras-dev.install
--- /tmp/wCXTAgOLKV/gnome-python-extras-2.12.1/debian/python-gnome2-extras-dev.install 1970-01-01 01:00:00.000000000 +0100
+++ /tmp/o8gm5ZdtfV/gnome-python-extras-2.12.1/debian/python-gnome2-extras-dev.install 2006-06-28 18:52:35.000000000 +0200
@@ -0,0 +1,2 @@
+/usr/share/pygtk/2.0
+/usr/lib/pkgconfig
diff -Nru /tmp/wCXTAgOLKV/gnome-python-extras-2.12.1/debian/python-gnome2-extras-doc.install /tmp/o8gm5ZdtfV/gnome-python-extras-2.12.1/debian/python-gnome2-extras-doc.install
--- /tmp/wCXTAgOLKV/gnome-python-extras-2.12.1/debian/python-gnome2-extras-doc.install 1970-01-01 01:00:00.000000000 +0100
+++ /tmp/o8gm5ZdtfV/gnome-python-extras-2.12.1/debian/python-gnome2-extras-doc.install 2006-06-28 18:52:35.000000000 +0200
@@ -0,0 +1 @@
+/usr/share/gtk-doc
diff -Nru /tmp/wCXTAgOLKV/gnome-python-extras-2.12.1/debian/python-gnome2-extras.install /tmp/o8gm5ZdtfV/gnome-python-extras-2.12.1/debian/python-gnome2-extras.install
--- /tmp/wCXTAgOLKV/gnome-python-extras-2.12.1/debian/python-gnome2-extras.install 1970-01-01 01:00:00.000000000 +0100
+++ /tmp/o8gm5ZdtfV/gnome-python-extras-2.12.1/debian/python-gnome2-extras.install 2006-06-28 18:52:35.000000000 +0200
@@ -0,0 +1,2 @@
+/usr/lib/python*/site-packages/gtk-2.0/*.so
+/usr/lib/python*/site-packages/gtk-2.0/*/*.{py,so}
diff -Nru /tmp/wCXTAgOLKV/gnome-python-extras-2.12.1/debian/rules /tmp/o8gm5ZdtfV/gnome-python-extras-2.12.1/debian/rules
--- /tmp/wCXTAgOLKV/gnome-python-extras-2.12.1/debian/rules 2006-06-28 18:52:34.000000000 +0200
+++ /tmp/o8gm5ZdtfV/gnome-python-extras-2.12.1/debian/rules 2006-06-28 18:52:35.000000000 +0200
@@ -23,71 +23,43 @@
INSTALL_PROGRAM += -s
endif
-build-2.3/config.status: configure
+PYVERS=$(shell pyversions -vr 2>/dev/null)
+
+build-%/configure-stamp: configure
dh_testdir
- mkdir -p build-2.3
- cd build-2.3 && PYTHON=/usr/bin/python2.3 ../configure \
+ mkdir -p build-$*
+ cd build-$* && PYTHON=/usr/bin/python$* ../configure \
--host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr
+ touch $@
-build-2.4/config.status: configure
+build-%/build-stamp: build-%/configure-stamp
dh_testdir
- mkdir -p build-2.4
- cd build-2.4 && PYTHON=/usr/bin/python2.4 ../configure \
- --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr
+ $(MAKE) -C build-$*
+ touch $@
-build: patch build-stamp
+build: patch $(PYVERS:%=build-%/build-stamp)
-build-stamp: build-2.3/config.status build-2.4/config.status
+install-clean:
dh_testdir
- cd build-2.3 && $(MAKE)
- cd build-2.4 && $(MAKE)
- touch build-stamp
+ dh_testroot
+ dh_clean -k
-clean:: unpatch
+install-%: build-%/build-stamp
dh_testdir
dh_testroot
- rm -f build-stamp
-
- rm -Rf build-2.3
- rm -Rf build-2.4
+ $(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp-$*
+ dh_install --sourcedir=debian/tmp-$*
-# -test -r /usr/share/misc/config.sub && \
-# cp -f /usr/share/misc/config.sub config.sub
-# -test -r /usr/share/misc/config.guess && \
-# cp -f /usr/share/misc/config.guess config.guess
- dh_clean
+install: build install-clean $(PYVERS:%=install-%)
+ dh_installdirs
-install: build
+clean:: unpatch
dh_testdir
dh_testroot
- dh_clean -k
- dh_installdirs
-
- cd build-2.3 && \
- $(MAKE) install DESTDIR=$(CURDIR)/debian/python2.3-gnome2-extras
-
- cd build-2.4 && \
- $(MAKE) install DESTDIR=$(CURDIR)/debian/python2.4-gnome2-extras
-
- mkdir -p debian/python-gnome2-extras-dev/usr/share/pygtk/2.0
- mkdir -p debian/python-gnome2-extras-dev/usr/lib
-
- mv debian/python2.3-gnome2-extras/usr/lib/pkgconfig debian/python-gnome2-extras-dev/usr/lib/pkgconfig
- mv debian/python2.3-gnome2-extras/usr/share/pygtk/2.0/defs debian/python-gnome2-extras-dev/usr/share/pygtk/2.0/defs
-
- mkdir -p debian/python-gnome2-extras-doc/usr/share
- mv debian/python2.3-gnome2-extras/usr/share/gtk-doc debian/python-gnome2-extras-doc/usr/share/
-
- rm -Rf debian/python2.3-gnome2-extras/usr/share/pygtk
- rm -Rf debian/python2.3-gnome2-extras/usr/share/gtk-doc
- rm -Rf debian/python2.3-gnome2-extras/usr/lib/pkgconfig
- rm -Rf debian/python2.4-gnome2-extras/usr/share/pygtk
- rm -Rf debian/python2.4-gnome2-extras/usr/share/gtk-doc
- rm -Rf debian/python2.4-gnome2-extras/usr/lib/pkgconfig
+ rm -rf build-* debian/tmp-*
+ dh_clean
# Build architecture-independent files here.
binary-indep:
@@ -102,6 +74,7 @@
dh_link -i
dh_compress -i
dh_fixperms -i
+ dh_pysupport -i
dh_python -i
dh_installdeb -i
dh_gencontrol -i
@@ -114,23 +87,6 @@
dh_testroot -a
dh_installdocs -a
dh_installexamples -a
-
- # Replace all '#!' calls to python with python2.x
- # and make them executable
- for pyversion in 2.3 2.4; do \
- for i in `find debian/python${pyversion}-gnome2-extras -type f`; do \
- sed '1s,#!.*python[^ ]*\(.*\),#!/usr/bin/python${pyversion},' \
- $$i > $$i.temp; \
- if cmp --quiet $$i $$i.temp; then \
- rm -f $$i.temp; \
- else \
- mv -f $$i.temp $$i; \
- chmod 755 $$i; \
- echo "fixed interpreter: $$i"; \
- fi; \
- done; \
- done
-
dh_installmenu -a
dh_installman -a
dh_installinfo -a
@@ -139,6 +95,7 @@
dh_strip -a
dh_compress -a
dh_fixperms -a
+ dh_pysupport -a
dh_python -a
dh_installdeb -a
dh_shlibdeps -a
More information about the Pkg-gnome-maintainers
mailing list