Hi, Attached is the diff for my pyopenssl 0.6-2.3 NMU.
-- ·O· Pierre Habouzit ··O [EMAIL PROTECTED] OOO http://www.madism.org
diff -u pyopenssl-0.6/debian/control pyopenssl-0.6/debian/control
--- pyopenssl-0.6/debian/control
+++ pyopenssl-0.6/debian/control
@@ -2,43 +2,23 @@
Section: python
Priority: optional
Maintainer: Martin Sjogren <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 3.0.0), python, python2.3-dev (>= 2.3-4),
python2.4-dev, libssl-dev (>= 0.9.8)
-Standards-Version: 3.6.1
+Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11),
+ python-support (>= 0.3), libssl-dev (>= 0.9.8)
+Standards-Version: 3.7.2
-Package: python2.3-pyopenssl
-Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}
-Suggests: pyopenssl-doc
-Replaces: python2-pyopenssl
-Conflicts: python2-pyopenssl
-Description: Python wrapper around the OpenSSL library
- Includes: SSL Context objects, SSL Connection objects, using
- Python sockets as transport layer. The Connection object
- wraps all the socket methods and can therefore be used
- interchangeably.
- .
- This package is compiled for Python 2.3
-
-Package: python2.4-pyopenssl
+Package: python-pyopenssl
Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}
+Depends: ${python:Depends}, ${shlibs:Depends}
+Provides: ${python:Provides}
Suggests: pyopenssl-doc
-Replaces: python2-pyopenssl
-Conflicts: python2-pyopenssl
-Description: Python wrapper around the OpenSSL library
+Replaces: python2-pyopenssl, python2.3-pyopenssl (<< 0.6-2.3),
python2.4-pyopenssl (<< 0.6-2.3)
+Conflicts: python2-pyopenssl, python2.3-pyopenssl (<< 0.6-2.3),
python2.4-pyopenssl (<< 0.6-2.3)
+XB-Python-Version: ${python:Versions}
+Description: Python wrapper around the OpenSSL library (dummy package)
Includes: SSL Context objects, SSL Connection objects, using
Python sockets as transport layer. The Connection object
wraps all the socket methods and can therefore be used
interchangeably.
- .
- This package is compiled for Python 2.4
-
-Package: python-pyopenssl
-Architecture: all
-Depends: ${python:Depends}
-Description: Python wrapper around the OpenSSL library (dummy package)
- This is a dummy package that depends on the version of pyOpenSSL
- that is compiled for the default version of Python.
Package: pyopenssl-doc
Section: doc
diff -u pyopenssl-0.6/debian/rules pyopenssl-0.6/debian/rules
--- pyopenssl-0.6/debian/rules
+++ pyopenssl-0.6/debian/rules
@@ -10,26 +10,17 @@
#export DH_VERBOSE=1
# This is the debhelper compatability version to use.
-export DH_COMPAT=3
+export DH_COMPAT=5
-VERSIONS = 2.3 2.4
+PYVERS := $(shell pyversions -r)
-configure: configure-stamp
-configure-stamp:
- dh_testdir
-
- for ver in $(VERSIONS); do \
- cp debian/python-pyopenssl.docs debian/python$$ver-pyopenssl.docs; \
- done
-
- touch configure-stamp
-
-build: configure-stamp build-stamp
+build: build-stamp
build-stamp:
dh_testdir
- for ver in $(VERSIONS); do \
- /usr/bin/python$$ver setup.py build; \
+ set -e; \
+ for py in $(PYVERS); do \
+ $$py setup.py build; \
done
touch build-stamp
@@ -37,11 +28,10 @@
clean:
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp
+ rm -f build-stamp
- for ver in $(VERSIONS); do \
- rm -f debian/python$$ver-pyopenssl.docs; \
- done
+ -for py in $(PYVERS); do \
+ $$py setup.py clean --all; done
rm -rf build version.pyc
dh_clean
@@ -53,8 +43,9 @@
dh_clean -k
dh_installdirs
- for ver in $(VERSIONS); do \
- /usr/bin/python$$ver setup.py install
--prefix=$(CURDIR)/debian/python$$ver-pyopenssl/usr; \
+ set -e; \
+ for py in $(PYVERS); do \
+ $$py setup.py install --root=$(CURDIR)/debian/python-pyopenssl; \
done
# Build architecture-independent files here.
@@ -71,6 +62,7 @@
# dh_link -i
dh_compress -i
dh_fixperms -i
+ dh_pysupport -i
dh_python -i
dh_installdeb -i
dh_gencontrol -i
@@ -91,6 +83,7 @@
# dh_link -a
dh_compress -a
dh_fixperms -a
+ dh_pysupport -a
dh_python -a
dh_makeshlibs -a
dh_installdeb -a
@@ -103 +96 @@
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install
diff -u pyopenssl-0.6/debian/changelog pyopenssl-0.6/debian/changelog
--- pyopenssl-0.6/debian/changelog
+++ pyopenssl-0.6/debian/changelog
@@ -1,3 +1,10 @@
+pyopenssl (0.6-2.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update Package for last python policy (Closes: #373548).
+
+ -- Pierre Habouzit <[EMAIL PROTECTED]> Fri, 30 Jun 2006 13:31:10 +0200
+
pyopenssl (0.6-2.2) unstable; urgency=low
* Non-maintainer upload.
only in patch2:
unchanged:
--- pyopenssl-0.6.orig/debian/pycompat
+++ pyopenssl-0.6/debian/pycompat
@@ -0,0 +1 @@
+2
signature.asc
Description: Digital signature
