Package: pycurl
Severity: wishlist

the patch makes the pycurl package more independent from the default
python version and the available python versions.

dropped the 2.2 package as well. there's no need for it anymore.



diff -u pycurl-7.14.0/debian/control pycurl-7.14.0/debian/control
--- pycurl-7.14.0/debian/control
+++ pycurl-7.14.0/debian/control
@@ -3,19 +3,9 @@
 Priority: extra
 Maintainer: Domenico Andreoli <[EMAIL PROTECTED]>
 Uploaders: Matthias Klose <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 3.0.0), python2.2-dev, python2.3-dev, 
python2.4-dev, libcurl3-dev (>= 7.13.2)
+Build-Depends: debhelper (>> 3.0.0), python, python2.3-dev, python2.4-dev, 
libcurl3-dev (>= 7.13.2)
 Standards-Version: 3.6.1
 
-Package: python2.2-pycurl
-Architecture: any
-Suggests: libcurl3-dev
-Depends: ${shlibs:Depends}, python2.2
-Description: Python bindings to libcurl
- This module provides the Python bindings to libcurl. Please refer to
- the libcurl documentation available in libcurl3-dev Debian package.
- .
-  Homepage: http://pycurl.sourceforge.net
-
 Package: python2.3-pycurl
 Architecture: any
 Suggests: libcurl3-dev
diff -u pycurl-7.14.0/debian/rules pycurl-7.14.0/debian/rules
--- pycurl-7.14.0/debian/rules
+++ pycurl-7.14.0/debian/rules
@@ -9,24 +9,28 @@
 # This is the debhelper compatibility version to use.
 export DH_COMPAT=3
 
+PYVERS=$(subst -dev,,\
+           $(subst python,,\
+             $(filter python%-dev,\
+               $(shell sed -n '/^Build-Depends/s/,//gp' debian/control))))
+PYVER   := $(shell python -c 'import sys; print sys.version[:3]')
+
 build: build-stamp
 
 build-stamp: DH_OPTIONS=
-build-stamp:
+build-stamp: $(PYVERS:%=build-python%)
+       touch $@
+build-python%:
        dh_testdir
-       python2.2 setup.py build
-       python2.3 setup.py build
-       python2.4 setup.py build
+       python$* setup.py build
        touch build-stamp
 
 clean:
        dh_testdir
        dh_testroot
-       rm -f build-stamp
-       -python2.2 setup.py clean
-       -python2.3 setup.py clean
-       -python2.4 setup.py clean
+       rm -f build-*
        rm -rf build
+       -find -name '*.py[co]' | xargs rm -f
        dh_clean
 
 install: DH_OPTIONS=
@@ -35,9 +39,9 @@
        dh_testroot
        dh_clean -k
        dh_installdirs
-       install -m 644 build/lib.*-*-2.2/pycurl.so 
debian/python2.2-pycurl/usr/lib/python2.2/site-packages
-       install -m 644 build/lib.*-*-2.3/pycurl.so 
debian/python2.3-pycurl/usr/lib/python2.3/site-packages
-       install -m 644 build/lib.*-*-2.4/pycurl.so 
debian/python2.4-pycurl/usr/lib/python2.4/site-packages
+       for i in $(PYVERS); do \
+         install -m 644 build/lib.*-*-$$i/pycurl.so 
debian/python$$i-pycurl/usr/lib/python$$i/site-packages; \
+       done
 
 # Build architecture-independent files here.
 binary-indep: DH_OPTIONS=-i
@@ -49,9 +53,9 @@
 binary-arch: build install
        dh_testdir
        dh_testroot
-       cp -a doc/*.html 
debian/python2.2-pycurl/usr/share/doc/python2.2-pycurl/html
-       cp -a doc/*.html 
debian/python2.3-pycurl/usr/share/doc/python2.3-pycurl/html
-       cp -a doc/*.html 
debian/python2.4-pycurl/usr/share/doc/python2.4-pycurl/html
+       for i in $(PYVERS); do \
+         cp -a doc/*.html 
debian/python$$i-pycurl/usr/share/doc/python$$i-pycurl/html; \
+       done
        dh_installdocs -A TODO
        dh_installexamples -A examples/* tests/*
        dh_installchangelogs ChangeLog
reverted:
--- pycurl-7.14.0/debian/python2.2-pycurl.dirs
+++ pycurl-7.14.0.orig/debian/python2.2-pycurl.dirs
@@ -1,2 +0,0 @@
-usr/lib/python2.2/site-packages
-usr/share/doc/python2.2-pycurl/html
reverted:
--- pycurl-7.14.0/debian/python2.2-pycurl.doc-base
+++ pycurl-7.14.0.orig/debian/python2.2-pycurl.doc-base
@@ -1,9 +0,0 @@
-Document: python2.2-pycurl
-Title: PycURL
-Author: Markus F.X.J. Oberhumer, Kjetil Jacobsen
-Abstract: A Python interface to the cURL library
-Section: Apps/devel
-
-Format: HTML
-Index: /usr/share/doc/python2.2-pycurl/html/pycurl.html
-Files: /usr/share/doc/python2.2-pycurl/html/*.html


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to