Bug#501646: pysvn: diff for NMU version 1.6.1-1.1

[Michal Cihar]

tags 501646 + patch
thanks

Dear maintainer,

I've prepared an NMU for pysvn (versioned as 1.6.1-1.1) and uploaded it
to DELAYED/2. Please feel free to tell me if I should delay it longer.

Regards.

-- 
        Michal Čihař | http://cihar.com | http://blog.cihar.com

diff -u pysvn-1.6.1/Source/setup.py pysvn-1.6.1/Source/setup.py
--- pysvn-1.6.1/Source/setup.py
+++ pysvn-1.6.1/Source/setup.py
@@ -187,7 +187,7 @@
 
             # debug_cflags
             'debug_cflags':     ' '.join( debug_cflags_list ),
-            
+
             # py_cflags
             'py_cflags':        ' '.join( py_cflags_list ),
 
@@ -253,7 +253,7 @@
                     template_values['python_exp'] = python_exp
                     break
             else:
-                python_exp = os.path.abspath(os.path.join(sys.executable, os.path.pardir, os.path.pardir, 
+                python_exp = os.path.abspath(os.path.join(sys.executable, os.path.pardir, os.path.pardir,
                                                           'lib', 'python2.4', 'config', 'python.exp'))
                 if os.path.exists(python_exp):
                     template_values['python_exp'] = python_exp
@@ -341,7 +341,7 @@
 PYCXX=%(pycxx_dir)s
 PYCXXSRC=%(pycxx_src_dir)s
 LDSHARED=g++ -shared %(debug_cflags)s
-LDLIBS=-L%(svn_lib_dir)s -Wl,--rpath -Wl,%(svn_lib_dir)s \
+LDLIBS=-L%(svn_lib_dir)s \
 -lsvn_client-1 \
 -lsvn_diff-1 \
 -lsvn_repos-1 \
@@ -763,7 +763,7 @@
                     minor = int(words[2])
                 elif words[1] == 'SVN_VER_PATCH':
                     patch = int(words[2])
- 
+
         print 'Info: Building against SVN %d.%d.%d' % (major, minor, patch)
         return (major, minor, patch)
 
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
@@ -47,10 +47,12 @@
 	cd Source && python$* setup.py configure \
 		--pycxx-src-dir=/usr/share/python$*/CXX \
 		--pycxx-dir=/usr/share/python$*/CXX \
+		--svn-lib-dir=/usr/lib \
 		--apr-inc-dir=$(APR_INC)
 	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%:
@@ -59,10 +61,12 @@
 	cd Source && python$*-dbg setup.py configure \
 		--pycxx-src-dir=/usr/share/python$*/CXX \
 		--pycxx-dir=/usr/share/python$*/CXX \
+		--svn-lib-dir=/usr/lib \
 		--apr-inc-dir=$(APR_INC)
 	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 +76,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 +88,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,12 @@
+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).
+  * Avoid setting rpath to /usr/lib64 in compiled modules.
+
+ -- Michal Čihař <[EMAIL PROTECTED]>  Wed, 22 Oct 2008 09:40:00 +0200
+
 pysvn (1.6.1-1) unstable; urgency=low
 
   * New upstream version (supporting subversion-1.5.2).