[pkg-boost-commits] r14644 - boost/trunk/debian

[Steven Michael Robbins]

Author: smr
Date: 2011-04-15 18:52:50 +0000 (Fri, 15 Apr 2011)
New Revision: 14644

Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/control
   boost/trunk/debian/rules
Log:
Change from dh_pysupport to dh_python2 and dh_python3.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2011-04-15 17:23:25 UTC (rev 14643)
+++ boost/trunk/debian/changelog	2011-04-15 18:52:50 UTC (rev 14644)
@@ -4,8 +4,13 @@
 
   * patches/changeset_71050.diff: Fix build with Python 3.2.  Closes:
     #622021
+
+  * rules: Switch from dh_pysupport to dh_python2 and dh_python3.
+  * control: Remove X-Python-Version and X-Python3-Version lines, to
+    indicate all versions supported.  Ensure all python packages use both
+    ${python:Depends} and ${python:Breaks}.
   
- -- Steve M. Robbins <smr at debian.org>  Fri, 15 Apr 2011 12:22:25 -0500
+ -- Steve M. Robbins <smr at debian.org>  Fri, 15 Apr 2011 12:46:56 -0500
 
 boost1.46 (1.46.1-3) unstable; urgency=low
 

Modified: boost/trunk/debian/control
===================================================================
--- boost/trunk/debian/control	2011-04-15 17:23:25 UTC (rev 14643)
+++ boost/trunk/debian/control	2011-04-15 18:52:50 UTC (rev 14644)
@@ -6,8 +6,6 @@
 Uploaders: Steve M. Robbins <smr at debian.org>, Domenico Andreoli <cavok at debian.org>
 Build-Depends: debhelper (>= 8), bison, flex, docbook-to-man, help2man, xsltproc, doxygen, zlib1g-dev, libbz2-dev, libicu-dev, python-all-dev, python3-all-dev (>= 3.1), python-support (>= 0.6), mpi-default-dev
 Build-Conflicts: libopenmpi-dev (= 1.3.2-2)
-X-Python-Version: >= 2.4
-X-Python3-Version: >= 3.0
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-boost/boost/trunk/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-boost/boost/trunk
 Standards-Version: 3.9.1
@@ -358,6 +356,7 @@
 Architecture: any
 Section: python
 Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
+Breaks: ${python:Breaks}
 Conflicts: libboost-mpi-python1.40.0,
  libboost-mpi-python1.41.0,
  libboost-mpi-python1.42.0,
@@ -423,7 +422,8 @@
 Homepage: http://www.boost.org/libs/python/
 Architecture: any
 Section: python
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
+Breaks: ${python:Breaks}
 Description: Boost.Python Library 
  This package forms part of the Boost C++ Libraries collection.
  .

Modified: boost/trunk/debian/rules
===================================================================
--- boost/trunk/debian/rules	2011-04-15 17:23:25 UTC (rev 14643)
+++ boost/trunk/debian/rules	2011-04-15 18:52:50 UTC (rev 14644)
@@ -310,7 +310,7 @@
 	dh_install -plibboost-python$(PKGVERSION)-dev --autodest \
 	   debian/tmp/usr/share/python/runtime.d/libboost-python$(PKGVERSION)-dev.rtupdate
 
-	cd libs/python/pyste/install && python setup.py install --no-compile --prefix=$(pyste_prefix) --install-lib=$(pyste_prefix)/share/python-support/pyste
+	cd libs/python/pyste/install && python setup.py install --no-compile --prefix=$(pyste_prefix) --install-lib=$(pyste_prefix)/share/pyshared
 	mv $(pyste_prefix)/bin/pyste.py $(pyste_prefix)/bin/pyste
 	dh_installman -plibboost-python$(PKGVERSION)-dev debian/pyste.1
 
@@ -331,7 +331,8 @@
 	dh_strip --dbg-package=libboost$(PKGVERSION)-dbg -X"-d-"
 	dh_link
 	dh_compress -Xlibboost$(PKGVERSION)-doc/HTML
-	dh_pysupport
+	dh_python2
+	dh_python3
 	dh_fixperms
 
 	@if [ "$(DH_OPTIONS)" = "-a" ]; then \