[Pkg-gtkpod-devel] r130 - in libgpod/trunk/debian: . patches

[Frank Lichtenheld]

Author: djpig
Date: 2006-09-29 16:51:58 +0000 (Fri, 29 Sep 2006)
New Revision: 130

Modified:
   libgpod/trunk/debian/changelog
   libgpod/trunk/debian/control
   libgpod/trunk/debian/patches/01_python_bind.patch
   libgpod/trunk/debian/rules
Log:
Import the python-policy NMU by Raphael Hertzog


Modified: libgpod/trunk/debian/changelog
===================================================================
--- libgpod/trunk/debian/changelog	2006-04-08 20:56:59 UTC (rev 129)
+++ libgpod/trunk/debian/changelog	2006-09-29 16:51:58 UTC (rev 130)
@@ -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 <hertzog at debian.org>  Sat, 17 Jun 2006 10:09:04 +0200
+
 libgpod (0.3.2-1) unstable; urgency=low
 
   * New upstream release. (Closes: #358561)

Modified: libgpod/trunk/debian/control
===================================================================
--- libgpod/trunk/debian/control	2006-04-08 20:56:59 UTC (rev 129)
+++ libgpod/trunk/debian/control	2006-09-29 16:51:58 UTC (rev 130)
@@ -1,8 +1,9 @@
 Source: libgpod
 Priority: optional
 Maintainer: Frank Lichtenheld <djpig at debian.org>
-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

Modified: libgpod/trunk/debian/patches/01_python_bind.patch
===================================================================
--- libgpod/trunk/debian/patches/01_python_bind.patch	2006-04-08 20:56:59 UTC (rev 129)
+++ libgpod/trunk/debian/patches/01_python_bind.patch	2006-09-29 16:51:58 UTC (rev 130)
@@ -1,13 +1,38 @@
 --- libgpod-0.3.0/bindings/python/Makefile	2005-09-20 17:20:29.000000000 +0200
 +++ libgpod-0.3.0.new/bindings/python/Makefile	2006-03-17 11:50:41.000000000 +0100
-@@ -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

Modified: libgpod/trunk/debian/rules
===================================================================
--- libgpod/trunk/debian/rules	2006-04-08 20:56:59 UTC (rev 129)
+++ libgpod/trunk/debian/rules	2006-09-29 16:51:58 UTC (rev 130)
@@ -9,14 +9,18 @@
 
 #DEB_DH_MAKESHLIBS_ARGS_libgpod0 := -V 'libgpod'
 
-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