Below is a patch that seems to produce a good python2.4 package. (It
also includes a small clean-up, I really don't think a python2.2 will be
needed in unstable again).

An unrelated small issue: the `clean` target doesn't work, this means
that `debuild` can't be run twise in the same directory.

Index: diacanvas2/diacanvas2-0.14.2/debian/changelog
===================================================================
--- diacanvas2.orig/diacanvas2-0.14.2/debian/changelog  2006-02-19 
17:08:21.000000000 +0000
+++ diacanvas2/diacanvas2-0.14.2/debian/changelog       2006-02-19 
17:13:35.000000000 +0000
@@ -1,3 +1,9 @@
+diacanvas2 (0.14.2-2mt) unstable; urgency=low
+
+  * Build for Python 2.4
+
+ -- Magnus Therning <[EMAIL PROTECTED]>  Sun, 19 Feb 2006 13:44:08 +0000
+
 diacanvas2 (0.14.2-2) unstable; urgency=low
 
   * Now use dpatch
Index: diacanvas2/diacanvas2-0.14.2/debian/rules
===================================================================
--- diacanvas2.orig/diacanvas2-0.14.2/debian/rules      2006-02-19 
17:08:21.000000000 +0000
+++ diacanvas2/diacanvas2-0.14.2/debian/rules   2006-02-19 17:55:49.000000000 
+0000
@@ -12,6 +12,8 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+PYTHON2.3 = /usr/bin/python2.3
+PYTHON2.4 = /usr/bin/python2.4
 
 CFLAGS = -Wall -g
 
@@ -57,7 +59,7 @@
        # Add here commands to clean up after the build process.
        -rm -f doc/ref/html/home.png doc/ref/html/left.png 
doc/ref/html/right.png doc/ref/html/up.png
        -rm -f python/diacanvas
-       cd python && xvfb-run -a python setup.py clean
+       cd python && xvfb-run -a $(PYTHON2.3) setup.py clean
        -rm -fr python/build
        -$(MAKE) distclean
 
@@ -79,7 +81,12 @@
 
        # Add here commands to install the package into debian/tmp
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-       cd python && LIBRARY_PATH=../debian/tmp/usr/lib 
PKG_CONFIG_PATH=../debian/tmp/usr/lib/pkgconfig xvfb-run -a python setup.py 
install --no-compile --prefix ../debian/tmp/usr
+
+       cd python && LIBRARY_PATH=../debian/tmp/usr/lib 
PKG_CONFIG_PATH=../debian/tmp/usr/lib/pkgconfig xvfb-run -a $(PYTHON2.3) 
setup.py install --no-compile --root=../debian/python2.3-diacanvas2
+       rm -rf debian/python2.3-diacanvas2/usr/share/pygtk
+
+       cd python && LIBRARY_PATH=../debian/tmp/usr/lib 
PKG_CONFIG_PATH=../debian/tmp/usr/lib/pkgconfig xvfb-run -a $(PYTHON2.4) 
setup.py install --no-compile --root=../debian/python2.4-diacanvas2
+       rm -rf debian/python2.4-diacanvas2/usr/share/pygtk
 
 # Build architecture-independent files here.
 binary-indep: build install
Index: diacanvas2/diacanvas2-0.14.2/debian/python2.2-diacanvas2.install
===================================================================
--- diacanvas2.orig/diacanvas2-0.14.2/debian/python2.2-diacanvas2.install       
2006-02-19 13:49:26.000000000 +0000
+++ /dev/null   1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib/python2.2/site-packages/diacanvas
Index: diacanvas2/diacanvas2-0.14.2/debian/python2.3-diacanvas2.install
===================================================================
--- diacanvas2.orig/diacanvas2-0.14.2/debian/python2.3-diacanvas2.install       
2006-02-19 13:49:26.000000000 +0000
+++ /dev/null   1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib/python2.3/site-packages/diacanvas
Index: diacanvas2/diacanvas2-0.14.2/debian/control
===================================================================
--- diacanvas2.orig/diacanvas2-0.14.2/debian/control    2006-02-19 
17:08:21.000000000 +0000
+++ diacanvas2/diacanvas2-0.14.2/debian/control 2006-02-19 17:57:47.000000000 
+0000
@@ -1,7 +1,7 @@
 Source: diacanvas2
 Priority: optional
 Maintainer: Cédric Delfosse <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), libgnomecanvas2-dev, 
libgnomeprint2.2-dev, python-gnome2, python-gtk2-dev, python-gnome2-dev, 
libgnomeprintui2.2-dev, python-dev, xvfb (>= 4.3.0.dfsg.1-11), xbase-clients, 
xfonts-base, dpatch
+Build-Depends: debhelper (>= 4.0.0), libgnomecanvas2-dev, 
libgnomeprint2.2-dev, python-gtk2-dev, python-gnome2-dev, python2.3-gnome2, 
python2.3-dev, python2.4-gnome2, python2.4-dev, libgnomeprintui2.2-dev, xvfb 
(>= 4.3.0.dfsg.1-11), xbase-clients, xfonts-base, dpatch
 Standards-Version: 3.6.1
 
 Package: libdiacanvas2-0
@@ -61,3 +61,13 @@
  creation.
  .
  This package contains Python 2.3 bindings for DiaCanvas2.
+
+Package: python2.4-diacanvas2
+Section: python
+Architecture: any
+Depends: ${python:Depends}, libdiacanvas2-0 (= ${Source-Version}), 
python2.4-gnome2
+Description: DiaCanvas2 library support for python 2.4
+ DiaCanvas2 is a library that implements a GNOME widget specialized in diagram
+ creation.
+ .
+ This package contains Python 2.4 bindings for DiaCanvas2.

-- 
Magnus Therning                    (OpenPGP: 0xAB4DFBA4)
[EMAIL PROTECTED]
http://therning.org/magnus

Software is not manufactured, it is something you write and publish.
Keep Europe free from software patents, we do not want censorship
by patent law on written works.

Time is a great teacher, but unfortunately it kills all its pupils.
     -- Hector Louis Berlioz

Attachment: pgpU6hdTrbVQE.pgp
Description: PGP signature

Reply via email to