Package: python-svn
Version: 1.6.1-1
Tags: patch
Followup-For: Bug #501646
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi
attached is patch for this issue. I will NMU it if there will be
no reaction in this bug report.
- --
Michal Čihař | http://cihar.com | http://blog.cihar.com
- -- System Information:
Debian Release: lenny/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.25.16-0.1-default (SMP w/2 CPU cores)
Locale: LANG=cs_CZ.UTF-8, LC_CTYPE=cs_CZ.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages python-svn depends on:
ii libc6 2.7-15 GNU C Library: Shared libraries
ii libcomerr2 1.41.3-1 common error description library
ii libexpat1 2.0.1-4 XML parsing C library - runtime li
ii libgcc1 1:4.3.2-1 GCC support library
ii libneon27-gnutls 0.28.2-5 An HTTP and WebDAV client library
ii libssl0.9.8 0.9.8g-13 SSL shared libraries
ii libstdc++6 4.3.2-1 The GNU Standard C++ Library v3
ii libsvn1 1.5.1dfsg1-1 Shared libraries used by Subversio
ii python 2.5.2-2 An interactive high-level object-o
ii python-central 0.6.8 register and build utility for Pyt
python-svn recommends no packages.
Versions of packages python-svn suggests:
pn python-svn-dbg <none> (no description available)
- -- no debconf information
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEARECAAYFAkj94ZUACgkQ3DVS6DbnVgTYaQCgtK1VICwQNcuqdP9LOmyrAbbw
QakAmQHqfnIjGSuSY6Nf1f4yBMWJF9md
=3+ll
-----END PGP SIGNATURE-----
diff -u pysvn-1.6.1/debian/rules pysvn-1.6.1/debian/rules
--- pysvn-1.6.1/debian/rules
+++ pysvn-1.6.1/debian/rules
@@ -51,6 +51,7 @@
PYSVN_BUILD_REVISION=1 \
$(MAKE) -C Source
mv Source/pysvn/_pysvn_$(subst .,_,$*).so _pysvn_$(subst .,_,$*).so
+ mv Source/pysvn/__init__.py __init__$(subst .,_,$*).py
touch $@
dbg-build-stamp%:
@@ -63,6 +64,7 @@
PYSVN_BUILD_REVISION=1 \
$(MAKE) -C Source
mv Source/pysvn/_pysvn_$(subst .,_,$*).so _pysvn_$(subst .,_,$*)_d.so
+ mv Source/pysvn/__init__.py __init__$(subst .,_,$*).py
touch $@
clean:
@@ -72,6 +74,7 @@
rm -f Source/*.o Source/pysvn/*.so Source/pysvn_version.hpp
rm -f Source/pysvn_docs.[ch]pp Source/Makefile Tests/Makefile
rm -f _pysvn*.so*
+ rm -f __init__*.py
dh_clean
install: install-stamp
@@ -83,8 +86,9 @@
install-python%:
dh_installdirs -ppython-svn \
usr/lib/python$*/site-packages/pysvn
- cp -pr Source/pysvn $(d)/usr/lib/python$*/site-packages/
+ install -d $(d)/usr/lib/python$*/site-packages/pysvn/
cp -p _pysvn_$(subst .,_,$*).so $(d)/usr/lib/python$*/site-packages/pysvn/
+ cp -p __init__$(subst .,_,$*).py $(d)/usr/lib/python$*/site-packages/pysvn/__init__.py
-find $(d) -name .svn | xargs rm -rf
diff -u pysvn-1.6.1/debian/changelog pysvn-1.6.1/debian/changelog
--- pysvn-1.6.1/debian/changelog
+++ pysvn-1.6.1/debian/changelog
@@ -1,3 +1,11 @@
+pysvn (1.6.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Store __init__.py for each python version and don't mix them
+ (Closes: #501646).
+
+ -- Michal Čihař <[EMAIL PROTECTED]> Tue, 21 Oct 2008 15:51:35 +0200
+
pysvn (1.6.1-1) unstable; urgency=low
* New upstream version (supporting subversion-1.5.2).
