patch 547877 + pending
thanks
Dear maintainer,
I've prepared an NMU for yapps2 (versioned as 2.1.1-17.2) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.
Regards.
diff -u yapps2-2.1.1/debian/changelog yapps2-2.1.1/debian/changelog
--- yapps2-2.1.1/debian/changelog
+++ yapps2-2.1.1/debian/changelog
@@ -1,3 +1,15 @@
+yapps2 (2.1.1-17.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Python 2.6 transition (closes: #547877):
+ + debian/control:
+ - Bump python-dev to >= 2.5.4-1~.
+ + debian/rules:
+ - Use macros provided by /usr/share/python/python.mk to install
+ files in correct locations for every supported Python version.
+
+ -- Luca Falavigna <dktrkr...@debian.org> Wed, 14 Oct 2009 23:05:28 +0200
+
yapps2 (2.1.1-17.1) unstable; urgency=low
* Non-maintainer upload.
diff -u yapps2-2.1.1/debian/control yapps2-2.1.1/debian/control
--- yapps2-2.1.1/debian/control
+++ yapps2-2.1.1/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Matthias Urlichs <sm...@debian.org>
Build-Depends: debhelper (>= 4.1)
-Build-Depends-Indep: python-dev, hevea, python-support (>= 0.4)
+Build-Depends-Indep: python-dev (>= 2.5.4-1~), hevea, python-support (>= 0.4)
Standards-Version: 3.7.2
Package: yapps2
diff -u yapps2-2.1.1/debian/rules yapps2-2.1.1/debian/rules
--- yapps2-2.1.1/debian/rules
+++ yapps2-2.1.1/debian/rules
@@ -6,6 +6,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/python/python.mk
+
PWD=$(shell pwd)
PYVER=$(shell pyversions -d)
@@ -57,16 +59,16 @@
dh_testroot
dh_clean -k
dh_installdirs
- dh_installdirs -pyapps2-runtime usr/lib/$(PYVER)/site-packages/yapps
+ dh_installdirs -pyapps2-runtime usr/lib/$(PYVER)/${call py_sitename, ${PYVER}}/yapps
# Add here commands to install the package into debian/yapps.
- python setup.py install --root=$(PWD)/debian/yapps2 --no-compile
+ python setup.py install --root=$(PWD)/debian/yapps2 --no-compile ${py_setup_install_args}
install -m 755 yapps2.py debian/yapps2/usr/bin/yapps
install -m 755 doc/yapps2.html debian/yapps2/usr/share/doc/yapps2/
set -e; \
for f in runtime.py __init__.py; do \
- mv $(PWD)/debian/yapps2/usr/lib/$(PYVER)/site-packages/yapps/$$f \
- $(PWD)/debian/yapps2-runtime/usr/lib/$(PYVER)/site-packages/yapps/; \
+ mv $(PWD)/debian/yapps2/usr/lib/$(PYVER)/${call py_sitename, ${PYVER}}/yapps/$$f \
+ $(PWD)/debian/yapps2-runtime/usr/lib/$(PYVER)/${call py_sitename, ${PYVER}}/yapps/; \
done
# Build architecture-independent files here.
