[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#701860: unblock: pycxx/6.2.4-3



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package pycxx.

It contains a fix for RC bug #700782 (directory vs. symlink conflict
relating to /usr/include/python3.2).

Debdiff is as follows:

diff -Nru pycxx-6.2.4/debian/changelog pycxx-6.2.4/debian/changelog
--- pycxx-6.2.4/debian/changelog	2012-12-30 11:24:04.000000000 -0800
+++ pycxx-6.2.4/debian/changelog	2013-02-27 10:50:34.000000000 -0800
@@ -1,3 +1,10 @@
+pycxx (6.2.4-3) unstable; urgency=low
+
+  * install into real include/python3* folder instead of symlink folder
+    Thanks to Sebastian Ramacher for the patch. (Closes: #700782)
+
+ -- Julian Taylor <jtaylor.debian@googlemail.com>  Wed, 27 Feb 2013
19:34:50 +0100
+
 pycxx (6.2.4-2) unstable; urgency=low

   * Remove symlink /usr/share/doc/python{,3}-cxx-dev before installing
diff -Nru pycxx-6.2.4/debian/control pycxx-6.2.4/debian/control
--- pycxx-6.2.4/debian/control	2012-12-30 11:24:04.000000000 -0800
+++ pycxx-6.2.4/debian/control	2013-02-27 10:47:27.000000000 -0800
@@ -5,7 +5,8 @@
 Uploaders: Julian Taylor <jtaylor.debian@googlemail.com>
 Build-Depends: debhelper (>= 7.0.50~),
                python-all (>= 2.6.6-3~),
-               python3-all (>= 3.1.2-10~)
+               python3-all-dev (>= 3.1.2-10~),
+               python3-all-dbg
 XS-Python-Version: all
 Standards-Version: 3.9.3
 Homepage: http://cxx.sourceforge.net
diff -Nru pycxx-6.2.4/debian/rules pycxx-6.2.4/debian/rules
--- pycxx-6.2.4/debian/rules	2012-12-30 11:24:04.000000000 -0800
+++ pycxx-6.2.4/debian/rules	2013-02-27 10:47:27.000000000 -0800
@@ -30,10 +30,12 @@
 	set -e && for i in $(PY3VERS); do \
 	  	$${i} setup.py install --force --root=$(CURDIR)/debian/tmp
--no-compile -O0 --install-layout=deb; \
 		2to3 -w -n $(CURDIR)/debian/tmp/usr/lib; \
-		dh_install -ppython3-cxx-dev CXX/*.hxx        /usr/include/$${i}/CXX/; \
-		dh_install -ppython3-cxx-dev CXX/*.h          /usr/include/$${i}/CXX/; \
-		dh_install -ppython3-cxx-dev CXX/Python3/*
/usr/include/$${i}/CXX/Python3; \
-		dh_link -ppython3-cxx-dev /usr/include/$${i}/CXX/ /usr/include/$${i}_d/CXX; \
+		python_inc_dir=$$(readlink -f /usr/include/$$i); \
+		pythond_inc_dir=$$(readlink -f /usr/include/$${i}_d); \
+		dh_install -ppython3-cxx-dev CXX/*.hxx        $${python_inc_dir}/CXX/; \
+		dh_install -ppython3-cxx-dev CXX/*.h          $${python_inc_dir}/CXX/; \
+		dh_install -ppython3-cxx-dev CXX/Python3/*
$${python_inc_dir}/CXX/Python3; \
+		dh_link -ppython3-cxx-dev $${python_inc_dir}/CXX/ $${pythond_inc_dir}/CXX; \
 		dh_install -ppython3-cxx-dev Src/*.c          /usr/share/$${i}/CXX/; \
 		dh_install -ppython3-cxx-dev Src/*.cxx        /usr/share/$${i}/CXX/; \
 		dh_install -ppython3-cxx-dev Src/Python3/*    /usr/share/$${i}/CXX/Python3; \

unblock pycxx/6.2.4-3

Regards,
Vincent


Reply to: