From 372b68a990ec0f9bce6126ee80f5fb6e5226be1e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 17 Feb 2012 11:12:01 +0100 Subject: [PATCH] Switch from python-central to dh_python2. (This was initially done in the 4.0-0ubuntu12 upload but is now done slightly differently.) Note that 2.6.6-6~ is needed (instead of 2.6.6-3~) because of "- create symlinks for files installed into /usr/share/pyshared/ if there are no other public modules available" Closes: #606354 Signed-off-by: Didier Raboud --- debian/control | 5 +---- debian/lsb-release.dirs | 3 --- debian/lsb-release.install | 2 +- debian/pycompat | 1 - debian/rules | 6 +++++- 5 files changed, 7 insertions(+), 10 deletions(-) delete mode 100644 debian/lsb-release.dirs delete mode 100644 debian/pycompat diff --git a/debian/control b/debian/control index daa32c2..7408594 100644 --- a/debian/control +++ b/debian/control @@ -6,9 +6,8 @@ Uploaders: Didier Raboud Build-Depends: debhelper (>> 7.0.50~), po-debconf (>= 0.5.0), dpkg-dev (>= 1.10), - python-support, python-all-dev + python-all-dev (>= 2.6.6-6~) Standards-Version: 3.9.1 -XS-Python-Version: all Homepage: http://www.linux-foundation.org/en/LSB Package: lsb-core @@ -51,7 +50,6 @@ Depends: lsb-release, lsb-base, time Provides: lsb-core-noarch, ${provides} -XB-Python-Version: ${python:Versions} Description: Linux Standard Base 3.2 core support package The Linux Standard Base (http://www.linuxbase.org/) is a standard core system that third-party applications written for Linux can @@ -306,7 +304,6 @@ Depends: ${python:Depends}, ${misc:Depends} Recommends: apt Suggests: lsb -XB-Python-Version: ${python:Versions} Description: Linux Standard Base version reporting utility The Linux Standard Base (http://www.linuxbase.org/) is a standard core system that third-party applications written for Linux can diff --git a/debian/lsb-release.dirs b/debian/lsb-release.dirs deleted file mode 100644 index 8f49a81..0000000 --- a/debian/lsb-release.dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin -usr/share/bug -usr/share/python-support/lsb-release diff --git a/debian/lsb-release.install b/debian/lsb-release.install index b28783d..7cb506f 100644 --- a/debian/lsb-release.install +++ b/debian/lsb-release.install @@ -1,2 +1,2 @@ lsb_release /usr/bin -lsb_release.py /usr/share/python-support/lsb-release +lsb_release.py /usr/share/pyshared/ diff --git a/debian/pycompat b/debian/pycompat deleted file mode 100644 index 0cfbf08..0000000 --- a/debian/pycompat +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/debian/rules b/debian/rules index 47ea9ec..599f64e 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f %: - dh $@ + dh --with python2 $@ # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) @@ -42,6 +42,10 @@ override_dh_clean: dh_clean rm -f *.py[co] +override_dh_python2: + dh_python2 + dh_python2 /usr/lib/lsb + override_dh_gencontrol: @echo >> debian/lsb-core.substvars "glibc=${LIBC}" # @[ ${DEB_HOST_GNU_TYPE} != 'arm-linux-gnueabi' ] && echo >> debian/lsb-cxx.substvars "depends=libstdc++5" || true -- 2.30.2