[SCM] root-system: CERN's ROOT Data Analysis Framework branch, master, updated. upstream/5.34.00_rc1-19-g548ea84

Lifeng Sun lifongsun at gmail.com
Thu Jun 14 16:38:14 UTC 2012


The following commit has been merged in the master branch:
commit 5b3450dbd3670e30585391a7f83b5f6660f31846
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Thu Jun 14 23:57:32 2012 +0800

    Fix broken python-binding. (Closes: #574517)

diff --git a/debian/changelog b/debian/changelog
index 1943668..ab288f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ root-system (5.34.00~rc1-2) UNRELEASED; urgency=low
     - Brazilian Portuguese, thanks to Flamarion Jorge. (Closes: #545383)
     - Danish, thanks to Joe Dalton. (Closes: #600750)
   * Fix typo in package description of root-system-doc. (Closes: #567444)
+  * Fix broken python-binding, thanks to Ulrik Sverdrup and Andy Buckley.
+    (Closes: #574517)
 
  -- Lifeng Sun <lifongsun at gmail.com>  Thu, 14 Jun 2012 20:53:57 +0800
 
diff --git a/debian/rules b/debian/rules
index a6f6baf..b0a61c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -291,6 +291,7 @@ debian/%:debian/skel/%.in debian/rules
 		-e 's, at pkgdocdir@,$(PKGDOCDIR),g' \
 		-e 's, at rubyarchdir@,$(RUBYARCHDIR),g' \
 		-e 's, at pythondir@,$(PYTHONDIR),g' \
+		-e 's, at pyver@,$(PYVER),g' \
 		-e 's, at multiarch@,$(DEB_HOST_MULTIARCH),g' \
 		-e 's, at libvers@,$(SOVERS),g' < $< > $@ 
 
diff --git a/debian/skel/libroot-bindings-python-dev.links.in b/debian/skel/libroot-bindings-python-dev.links.in
index eecbeaf..3f6a5ac 100644
--- a/debian/skel/libroot-bindings-python-dev.links.in
+++ b/debian/skel/libroot-bindings-python-dev.links.in
@@ -1 +1,2 @@
- at prefix@/lib/@multiarch@/root at libvers@/ROOT.py         /usr/share/python-support/root/ROOT.py
+ at prefix@/lib/@multiarch@/root at libvers@/ROOT.py /usr/share/python-support/root/ROOT.py
+ at prefix@/lib/@multiarch@/libPyROOT.so          /usr/lib/python at pyver@/dist-packages/libPyROOT.so

-- 
root-system: CERN's ROOT Data Analysis Framework



More information about the debian-science-commits mailing list