[root-system] 16/21: Switch python-support to dh-python.
Lifeng Sun
lifengsun-guest at moszumanska.debian.org
Sat Aug 2 08:35:09 UTC 2014
This is an automated email from the git hooks/post-receive script.
lifengsun-guest pushed a commit to branch master
in repository root-system.
commit 8dcbed0c4b04eb9ee446498c866236f77f3fb359
Author: Lifeng Sun <lifongsun at gmail.com>
Date: Sun Jul 13 23:18:37 2014 +0800
Switch python-support to dh-python.
---
debian/changelog | 1 +
debian/control | 6 +++---
debian/rules | 2 +-
debian/script/makebuilddepend.sh | 2 +-
debian/skel/libroot-bindings-python.control | 2 +-
debian/skel/libroot-bindings-python.links.in | 4 ++--
debian/skel/root-plugin-geom-gdml.control | 2 +-
debian/skel/root-plugin-geom-gdml.links.in | 4 ++--
8 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5a1283c..0fbe62a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ root-system (5.34.19+dfsg-1) UNRELEASED; urgency=medium
* New upstream release.
* Remove non-free font file. (Closes: #733285)
* Fix Ruby header directory. (Closes: #739775)
+ * Switch python-support to dh-python.
-- Lifeng Sun <lifongsun at gmail.com> Sun, 13 Jul 2014 09:43:47 +0800
diff --git a/debian/control b/debian/control
index 8ecfd82..178db2d 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Lifeng Sun <lifongsun at gmail.com>
Homepage: http://root.cern.ch
-Build-Depends: debhelper (>= 5.0.37.2), lsb-release, autotools-dev, po-debconf, libssl-dev, comerr-dev, libxpm-dev, libltdl-dev, x11proto-xext-dev, libxext-dev, libfreetype6-dev, libpcre3-dev, zlib1g-dev | libz-dev, liblzma-dev, python-dev (>= 2.1), graphviz, ttf-freefont, libncurses5-dev, libgraphviz-dev, libavahi-core-dev, libsqlite3-dev, libxft-dev, python-support (>= 0.3), ruby, ruby-dev, libglu1-mesa-dev| xlibmesa-glu-dev | libglu-dev, libglew-dev, libftgl-dev, libgl2ps-dev, libxml [...]
+Build-Depends: debhelper (>= 5.0.37.2), lsb-release, autotools-dev, po-debconf, libssl-dev, comerr-dev, libxpm-dev, libltdl-dev, x11proto-xext-dev, libxext-dev, libfreetype6-dev, libpcre3-dev, zlib1g-dev | libz-dev, liblzma-dev, python-dev (>= 2.1), graphviz, ttf-freefont, libncurses5-dev, libgraphviz-dev, libavahi-core-dev, libsqlite3-dev, libxft-dev, dh-python, ruby, ruby-dev, libglu1-mesa-dev| xlibmesa-glu-dev | libglu-dev, libglew-dev, libftgl-dev, libgl2ps-dev, libxml2-dev, libgsl0 [...]
Standards-Version: 3.9.5
Vcs-Git: git://anonscm.debian.org/debian-science/packages/root-system.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/root-system.git
@@ -49,7 +49,7 @@ Architecture: any
Section: libs
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, python-support
+Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, dh-python
Provides: ${python:Provides}
Replaces: root-plugin-python (<< 5.09.01-1)
Breaks: libroot-bindings-python-dev (<< 5.34.01-1~exp1)
@@ -433,7 +433,7 @@ Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Breaks: libroot-dev (<< 5.19.01-1)
Replaces: libroot-dev
-Depends: ${shlibs:Depends}, python-support, ${python:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, dh-python, ${python:Depends}, ${misc:Depends}
Description: GDML import/export module for ROOT geometries
The ROOT system provides a set of OO frameworks with all the
functionality needed to handle and analyze large amounts of data
diff --git a/debian/rules b/debian/rules
index d5beca6..e4ac2a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -247,7 +247,7 @@ HAVEPYTHON := $(filter libroot-bindings-python, $(PKGLIST))
ifeq ($(HAVEPYTHON), libroot-bindings-python)
PYVERS := $(shell pyversions -vs)
PYVER := $(shell python -c 'import sys; print "%d.%d" % (sys.version_info[0], sys.version_info[1])')
-PYTHONDIR := /usr/lib/python-support/root/python$(PYVER)
+PYTHONDIR := /usr/lib/python$(PYVER)/dist-packages/root
else
PYTHONDIR :=
endif
diff --git a/debian/script/makebuilddepend.sh b/debian/script/makebuilddepend.sh
index 6beaa54..a7b2d40 100755
--- a/debian/script/makebuilddepend.sh
+++ b/debian/script/makebuilddepend.sh
@@ -183,7 +183,7 @@ for i in $* ; do
case $i in
*-dev) ;;
libroot-bindings-python)
- echo -n ", python-support (>= 0.3)" ;;
+ echo -n ", dh-python" ;;
libroot-bindings-ruby)
echo -n ", ruby, ruby-dev" ;;
libroot-core) ;;
diff --git a/debian/skel/libroot-bindings-python.control b/debian/skel/libroot-bindings-python.control
index 3d1d9dd..db7ea0a 100644
--- a/debian/skel/libroot-bindings-python.control
+++ b/debian/skel/libroot-bindings-python.control
@@ -3,7 +3,7 @@ Architecture: any
Section: libs
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, python-support
+Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, dh-python
Provides: ${python:Provides}
Replaces: root-plugin-python (<< 5.09.01-1)
Breaks: libroot-bindings-python-dev (<< 5.34.01-1~exp1)
diff --git a/debian/skel/libroot-bindings-python.links.in b/debian/skel/libroot-bindings-python.links.in
index af95c6f..e6057c1 100644
--- a/debian/skel/libroot-bindings-python.links.in
+++ b/debian/skel/libroot-bindings-python.links.in
@@ -1,2 +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
+ at prefix@/lib/@multiarch@/root at libvers@/libPyROOT.so /usr/lib/python at pyver@/dist-packages/root/libPyROOT.so
+ at prefix@/lib/@multiarch@/root at libvers@/ROOT.py /usr/lib/python at pyver@/dist-packages/root/ROOT.py
diff --git a/debian/skel/root-plugin-geom-gdml.control b/debian/skel/root-plugin-geom-gdml.control
index 09afb41..39a9070 100644
--- a/debian/skel/root-plugin-geom-gdml.control
+++ b/debian/skel/root-plugin-geom-gdml.control
@@ -4,7 +4,7 @@ Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Breaks: libroot-dev (<< 5.19.01-1)
Replaces: libroot-dev
-Depends: ${shlibs:Depends}, python-support, ${python:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, dh-python, ${python:Depends}, ${misc:Depends}
Description: GDML import/export module for ROOT geometries
The ROOT system provides a set of OO frameworks with all the
functionality needed to handle and analyze large amounts of data
diff --git a/debian/skel/root-plugin-geom-gdml.links.in b/debian/skel/root-plugin-geom-gdml.links.in
index 35132a2..226096d 100644
--- a/debian/skel/root-plugin-geom-gdml.links.in
+++ b/debian/skel/root-plugin-geom-gdml.links.in
@@ -1,2 +1,2 @@
- at prefix@/lib/@multiarch@/root at libvers@/ROOTwriter.py /usr/share/python-support/root/ROOTwriter.py
- at prefix@/lib/@multiarch@/root at libvers@/writer.py /usr/share/python-support/root/writer.py
+ at prefix@/lib/@multiarch@/root at libvers@/ROOTwriter.py /usr/lib/python at pyver@/dist-packages/root/ROOTwriter.py
+ at prefix@/lib/@multiarch@/root at libvers@/writer.py /usr/lib/python at pyver@/dist-packages/root/writer.py
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/root-system.git
More information about the debian-science-commits
mailing list