Bug#547877: [yapps2] Patch does not work

2009-10-12 Thread Luca Falavigna
Bastian Venthur ha scritto:
 Luca's patch does not work. It fails to build, because the for-loop
 which moves the two files does not find a file or directory.

Indeed, my bad. Attached is a new patch which hopefully fixes this.
I plan to prepare a NMU in the next few days.

-- 

  .''`.
 : :' :   Luca Falavigna dktrkr...@debian.org
 `. `'
   `-
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.



signature.asc
Description: OpenPGP digital signature


Bug#547877: [yapps2] Patch does not work

2009-10-06 Thread Bastian Venthur
Package: yapps2

Luca's patch does not work. It fails to build, because the for-loop
which moves the two files does not find a file or directory.


Cheers,

Bastian




-- 
Bastian Venthur  http://venthur.de
Debian Developer venthur at debian org




-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org