Hi,
I made some last minutes changes so here's a new diff for the NMU.
Cheers,
--
Raphaël Hertzog
Premier livre français sur Debian GNU/Linux :
http://www.ouaza.com/livre/admin-debian/
diff -u libgpod-0.3.2/debian/changelog libgpod-0.3.2/debian/changelog
--- libgpod-0.3.2/debian/changelog
+++ libgpod-0.3.2/debian/changelog
@@ -1,3 +1,13 @@
+libgpod (0.3.2-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update for the new python policy. Closes: #374091
+ - Create python-gpod supporting all versions.
+ - Remove python2.3-gpod.
+ - Added proper replaces/conflicts/provides for upgrade.
+
+ -- Raphael Hertzog <[EMAIL PROTECTED]> Sat, 17 Jun 2006 10:09:04 +0200
+
libgpod (0.3.2-1) unstable; urgency=low
* New upstream release. (Closes: #358561)
diff -u libgpod-0.3.2/debian/control libgpod-0.3.2/debian/control
--- libgpod-0.3.2/debian/control
+++ libgpod-0.3.2/debian/control
@@ -1,8 +1,9 @@
Source: libgpod
Priority: optional
Maintainer: Frank Lichtenheld <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5.0.0), autotools-dev, cdbs, libglib2.0-dev (>=
2.4), libgtk2.0-dev, intltool, pkg-config, swig, python, python2.3-dev
+Build-Depends: debhelper (>= 5.0.37.1), autotools-dev, cdbs, libglib2.0-dev
(>= 2.4), libgtk2.0-dev, intltool, pkg-config, swig, python (>= 2.3.5-7),
python-all-dev, python-central (>= 0.4.7)
Standards-Version: 3.6.2
+XS-Python-Version: all
Section: libs
Package: libgpod-dev
@@ -40,10 +41,14 @@
.
This package contains the files doing the internationalization.
-Package: python2.3-gpod
+Package: python-gpod
Section: python
Architecture: any
-Depends: libgpod0 (= ${Source-Version}), python2.3, ${shlibs:Depends},
${misc:Depends}, ${python:Depends}
+Depends: libgpod0 (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends},
${python:Depends}
+Replaces: python2.3-gpod (<< 0.3.2-1.1)
+Conflicts: python2.3-gpod (<< 0.3.2-1.1)
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
Description: a library to read and write songs and artwork to an iPod
libgpod is a library meant to abstract access to an iPod content. It
provides an easy to use API to retrieve the list of files and playlist
diff -u libgpod-0.3.2/debian/patches/01_python_bind.patch
libgpod-0.3.2/debian/patches/01_python_bind.patch
--- libgpod-0.3.2/debian/patches/01_python_bind.patch
+++ libgpod-0.3.2/debian/patches/01_python_bind.patch
@@ -3,11 +3,36 @@
-@@ -18,3 +18,10 @@
+@@ -1,4 +1,6 @@
+-all: _gpod.so
++PYVERS=$(shell pyversions -v -r ../../debian/control)
++
++all: $(PYVERS:%=_gpod_%.so)
+
+ gpod_wrap.c: gpod.i
+ swig -python gpod.i
+@@ -6,15 +8,22 @@
+ gpod.py: gpod.i
+ swig -python gpod.i
+
+-gpod_wrap.o: gpod_wrap.c
+- gcc -c -fpic gpod_wrap.c -I /usr/include/python2.3/ `pkg-config
glib-2.0 --cflags`
++gpod_wrap_%.o: gpod_wrap.c
++ gcc -o gpod_wrap_$*.o -c -fpic gpod_wrap.c -I /usr/include/python$*/
`pkg-config glib-2.0 --cflags`
+
+-_gpod.so: gpod_wrap.o
+- gcc -shared gpod_wrap.o -o _gpod.so -L../../src/.libs -lgpod
`pkg-config glib-2.0 --libs`
++_gpod_%.so: gpod_wrap_%.o
++ gcc -shared gpod_wrap_$*.o -o _gpod_$*.so -L../../src/.libs -lgpod
`pkg-config glib-2.0 --libs`
+
+
+ clean:
+- rm gpod.py gpod.pyc _gpod.so gpod_wrap.c gpod_wrap.o
++ rm gpod.py gpod.pyc _gpod_*.so gpod_wrap.c gpod_wrap_*.o
test: _gpod.so play.py
LD_LIBRARY_PATH=../../src/.libs ./play.py
+
+
-+install:
-+ mkdir -p $(DESTDIR)/usr/lib/python2.3/site-packages
-+ install -m 644 gpod.py $(DESTDIR)/usr/lib/python2.3/site-packages/
-+ install -m 644 _gpod.so $(DESTDIR)/usr/lib/python2.3/site-packages/
-+
++install: $(PYVERS:%=install-%)
++install-%:
++ mkdir -p $(DESTDIR)/usr/lib/python$*/site-packages
++ install -m 644 gpod.py $(DESTDIR)/usr/lib/python$*/site-packages/
++ install -m 644 _gpod_$*.so
$(DESTDIR)/usr/lib/python$*/site-packages/_gpod.so
reverted:
--- libgpod-0.3.2/debian/python2.3-gpod.install
+++ libgpod-0.3.2.orig/debian/python2.3-gpod.install
@@ -1 +0,0 @@
-debian/tmp/usr/lib/python2.3/site-packages
diff -u libgpod-0.3.2/debian/rules libgpod-0.3.2/debian/rules
--- libgpod-0.3.2/debian/rules
+++ libgpod-0.3.2/debian/rules
@@ -11,12 +11,16 @@
-clean/python2.3-gpod::
- cd bindings/python/ && $(MAKE) clean
+clean::
+ -cd bindings/python/ && $(MAKE) clean
+ # The non-patched makefile is sometimes called
+ -cd bindings/python/ && rm -f *.so *.o
-build/python2.3-gpod::
+build/python-gpod::
cd bindings/python/ && $(MAKE)
-install/python2.3-gpod::
+install/python-gpod::
cd bindings/python/ && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- dh_python
+binary-install/python-gpod::
+ dh_pycentral -ppython-gpod
+ dh_python -ppython-gpod
reverted:
--- libgpod-0.3.2/debian/python2.3-gpod.examples
+++ libgpod-0.3.2.orig/debian/python2.3-gpod.examples
@@ -1 +0,0 @@
-bindings/python/examples/*
only in patch2:
unchanged:
--- libgpod-0.3.2.orig/debian/python-gpod.install
+++ libgpod-0.3.2/debian/python-gpod.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/python*/site-packages
only in patch2:
unchanged:
--- libgpod-0.3.2.orig/debian/python-gpod.examples
+++ libgpod-0.3.2/debian/python-gpod.examples
@@ -0,0 +1 @@
+bindings/python/examples/*
