[SCM] root-system: CERN's ROOT Data Analysis Framework branch, master, updated. upstream/5.34.01-51-g0242590

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 024259088f2febd77f3919952d0d44aef74bf511
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Mon Jul 16 17:24:42 2012 +0800

    Python binding: move Python runtime files from libroot-bindings-python-dev to libroot-bindings-python$ver.

diff --git a/debian/changelog b/debian/changelog
index 6ed4aa0..143bd28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ root-system (5.34.01-1) unstable; urgency=low
     to /usr/lib/$multiarch/.
   * Disable builtin lzma and libAfterImage.
   * Improve ruby path detection.
+  * Python binding: move Python runtime files from
+    libroot-bindings-python-dev to libroot-bindings-python$ver.
 
  -- Lifeng Sun <lifongsun at gmail.com>  Sat, 14 Jul 2012 20:56:35 +0800
 
diff --git a/debian/control b/debian/control
index 0c307f1..49c9a49 100644
--- a/debian/control
+++ b/debian/control
@@ -51,7 +51,9 @@ Section: libs
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends} 
+Provides: ${python:Provides}
 Replaces: root-plugin-python  (<< 5.09.01-1)
+Breaks: libroot-bindings-python-dev (<< 5.34.01-1)
 Description: Python extension for ROOT - runtime libraries 
  The ROOT system provides a set of OO frameworks with all the
  functionality needed to handle and analyze large amounts of data
@@ -64,7 +66,6 @@ Package: libroot-bindings-python-dev
 Architecture: any
 Section: libdevel
 Depends: libroot-bindings-python5.34 (= ${binary:Version}), libroot-core-dev, python-dev (>= 2.1), ${python:Depends}, ${misc:Depends} 
-Provides: ${python:Provides}
 Replaces: libroot-python-dev
 Breaks: libroot-python-dev (<< 5.19.01-1)
 Description: Python extension for ROOT - development files 
diff --git a/debian/rules b/debian/rules
index 299cfd2..dc97ee2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -523,6 +523,8 @@ pkglists:
 	rm -rf debian/*.files	debian/*.install	
 	./debian/script/makelists.sh debian debian/tmp \
 		$(VERSION) $(PREFIX) $(SYSCONFDIR) $(PKGDOCDIR)
+	mv debian/libroot-bindings-python.links \
+		debian/libroot-bindings-python$(SOVERS).links
 #	@for i in debian/libroot* ; do \
 #	  if test -d $$i ; then continue ; fi ; \
 #	  case $$i in \
@@ -699,7 +701,7 @@ install-arch: build-arch
 	case `uname -m` in \
 	    i*86 | x86_64) ;; \
 	    *) sed -i -e '/PyCintex/d' \
-	        debian/libroot-bindings-python-dev.install;; \
+	        debian/libroot-bindings-python$(SOVERS).install;; \
 	esac
 
 	mv $(DTMP)$(CINTDIR)/libRoot.a \
@@ -806,14 +808,14 @@ ifeq ($(HAVEPYTHON), libroot-bindings-python)
 	# system compiling. 
 	echo "$(PYVER)-" > debian/pyversions
 endif
-	dh_pysupport -plibroot-bindings-python-dev 
+	dh_pysupport -plibroot-bindings-python$(SOVERS)
 	#	$(CINTDIR) $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
 	dh_pysupport -plibroot-core-dev \
 		$(CINTDIR)/python/genreflex
 ifeq ($(HAVEPYTHON), libroot-bindings-python)
 	# dh_pysupport will only write this field if the package is 
 	# named something like 'python-*', so we make it ourselves. 
-	echo "python:Provides=python$(PYVER)-pyroot" >> debian/libroot-bindings-python-dev.substvars
+	echo "python:Provides=python$(PYVER)-pyroot" >> debian/libroot-bindings-python$(SOVERS).substvars
 endif
 	dh_makeshlibs -V \
 	  $(patsubst %, -p%, $(filter libroot%$(SOVERS),$(SPKGLIST)))
diff --git a/debian/skel/libroot-bindings-python-dev.links.in b/debian/skel/libroot-bindings-python-dev.links.in
deleted file mode 100644
index 3f6a5ac..0000000
--- a/debian/skel/libroot-bindings-python-dev.links.in
+++ /dev/null
@@ -1,2 +0,0 @@
- 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
diff --git a/debian/skel/libroot-bindings-python.control b/debian/skel/libroot-bindings-python.control
index 59bca4a..1d86f6d 100644
--- a/debian/skel/libroot-bindings-python.control
+++ b/debian/skel/libroot-bindings-python.control
@@ -4,7 +4,9 @@ Section: libs
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends} 
+Provides: ${python:Provides}
 Replaces: root-plugin-python  (<< 5.09.01-1)
+Breaks: libroot-bindings-python-dev (<< 5.34.01-1)
 Description: Python extension for ROOT - runtime libraries 
  The ROOT system provides a set of OO frameworks with all the
  functionality needed to handle and analyze large amounts of data
@@ -17,7 +19,6 @@ Package: libroot-bindings-python-dev
 Architecture: any
 Section: libdevel
 Depends: libroot-bindings-python at libvers@ (= ${binary:Version}), libroot-core-dev, python-dev (>= 2.1), ${python:Depends}, ${misc:Depends} 
-Provides: ${python:Provides}
 Replaces: libroot-python-dev
 Breaks: libroot-python-dev (<< 5.19.01-1)
 Description: Python extension for ROOT - development files 
diff --git a/debian/skel/libroot-bindings-python-dev.install.in b/debian/skel/libroot-bindings-python.install.in
similarity index 98%
rename from debian/skel/libroot-bindings-python-dev.install.in
rename to debian/skel/libroot-bindings-python.install.in
index 404679f..354bc98 100644
--- a/debian/skel/libroot-bindings-python-dev.install.in
+++ b/debian/skel/libroot-bindings-python.install.in
@@ -1,3 +1,2 @@
 @prefix@/lib/*/root at version@/ROOT.py
 @prefix@/lib/*/root at version@/PyCintex.py
-
diff --git a/debian/skel/libroot-bindings-python.links.in b/debian/skel/libroot-bindings-python.links.in
new file mode 100644
index 0000000..af95c6f
--- /dev/null
+++ b/debian/skel/libroot-bindings-python.links.in
@@ -0,0 +1,2 @@
+ at prefix@/lib/@multiarch@/root at libvers@/libPyROOT.so /usr/lib/python at pyver@/dist-packages/libPyROOT.so
+ at prefix@/lib/@multiarch@/root at libvers@/ROOT.py      /usr/share/python-support/root/ROOT.py

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