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

[smr at alioth.debian.org]

Author: smr
Date: 2008-05-07 02:14:19 +0000 (Wed, 07 May 2008)
New Revision: 14222

Modified:
   boost/trunk/debian/NEWS.Debian
   boost/trunk/debian/changelog
   boost/trunk/debian/control
   boost/trunk/debian/rules
Log:
Remove package pyste; install with -python-dev.

Modified: boost/trunk/debian/NEWS.Debian
===================================================================
--- boost/trunk/debian/NEWS.Debian	2008-05-07 01:55:46 UTC (rev 14221)
+++ boost/trunk/debian/NEWS.Debian	2008-05-07 02:14:19 UTC (rev 14222)
@@ -3,6 +3,9 @@
   
   * Removed package bcp.  The binary "bcp" is now found in libboost-dev.
 
+  * Removed package pyste.  The binary "pyste" is now found in
+    libboost-python-dev.
+
 Boost 1.34.0-1
 --------------
 

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2008-05-07 01:55:46 UTC (rev 14221)
+++ boost/trunk/debian/changelog	2008-05-07 02:14:19 UTC (rev 14222)
@@ -36,9 +36,6 @@
     Abstract continuation lines by a single space.  The latter means
     "display verbatim", which is not desired.
   
-  * debian/control: Remove package bcp1.35.
-  * debian/rules: Package /usr/bin/bcp and its manpage in libboost1.35-dev.
-  
   * debian/control: Build-depend on debhelper (>= 6.0.7) to ensure
     dh_lintian available.
   * debian/rules: Use dh_lintian to install lintian-overrides.  Create all
@@ -48,7 +45,14 @@
   * debian/libboost-python-dev.lintian-overrides:
   * debian/libboost-doc.lintian-overrides: Delete.
   
- -- Steve M. Robbins <smr at debian.org>  Sun, 04 May 2008 23:27:14 -0500
+  * debian/control: Remove package bcp.
+  * debian/rules: Package /usr/bin/bcp and its manpage in libboost1.35-dev.
+  
+  * debian/control: Remove package pyste.
+  * debian/rules: Package /usr/bin/pyste and its manpage in
+    libboost-python1.35-dev.
+  
+ -- Steve M. Robbins <smr at debian.org>  Tue, 06 May 2008 21:13:42 -0500
 
 boost (1.34.1-11) unstable; urgency=low
 

Modified: boost/trunk/debian/control
===================================================================
--- boost/trunk/debian/control	2008-05-07 01:55:46 UTC (rev 14221)
+++ boost/trunk/debian/control	2008-05-07 02:14:19 UTC (rev 14222)
@@ -212,8 +212,9 @@
 Homepage: http://www.boost.org/libs/python/
 Architecture: any
 Section: libdevel
-Depends: libboost1.35-dev (= ${binary:Version}), libboost-python1.35.0 (= ${binary:Version}), python-dev
-Conflicts: libboost-python-dev
+Depends: libboost1.35-dev (= ${binary:Version}), libboost-python1.35.0 (= ${binary:Version}), python-dev, ${python:Depends}, python-celementtree | python-elementtree, gccxml
+Suggests: libboost1.35-doc
+Conflicts: libboost-python-dev, pyste
 Description: Boost.Python Library development files
  Part of the Boost C++ Libraries collection.
  .
@@ -228,6 +229,11 @@
  in Python, Member function Overloading, Automatic wrapping of
  numeric operators among others.
  .
+ This package also contains the pyste Boost.Python code generator that
+ allows the user to specify classes and functions to be exported using
+ a simple interface file, which following the Boost.Python's
+ philosophy, is simple Python code.
+ .
  This package allows development of a Python interface for all current
  versions of Python in Debian.  Code using this library will need also
  one of the Python development packages.
@@ -451,21 +457,3 @@
  implementation of the mandated C99/C++ preprocessor functionality
  packed behind a simple to use interface, which integrates well with
  the well known idioms of the Standard Template Library (STL).
-
-Package: pyste1.35
-Homepage: http://www.boost.org/libs/python/pyste/
-Architecture: all
-Section: python
-Provides: ${python:Provides}
-Depends: ${python:Depends}, python-celementtree | python-elementtree, gccxml
-XB-Python-Version: ${python:Versions}
-Suggests: libboost1.35-doc
-Conflicts: pyste
-Description: Boost.Python code generator
- Part of the Boost C++ Libraries collection.
- .
- User specifies classes and functions to be exported using a simple
- interface file, which following the Boost.Python's philosophy, is
- simple Python code.
- .
- Documentation is included in libboost-doc package.

Modified: boost/trunk/debian/rules
===================================================================
--- boost/trunk/debian/rules	2008-05-07 01:55:46 UTC (rev 14221)
+++ boost/trunk/debian/rules	2008-05-07 02:14:19 UTC (rev 14222)
@@ -127,7 +127,7 @@
 
 exampledir = debian/libboost$(PKGVERSION)-doc/usr/share/doc/libboost$(PKGVERSION)-doc/examples
 htmldir = debian/libboost$(PKGVERSION)-doc/usr/share/doc/libboost$(PKGVERSION)-doc/HTML
-pyste_prefix = $(CURDIR)/debian/pyste$(PKGVERSION)/usr
+pyste_prefix = $(CURDIR)/debian/libboost-python$(PKGVERSION)-dev/usr
 bjam = $(CURDIR)/tools/jam/src/bjam
 
 JAM = $(bjam) $(JOBS) -d2 --user-config=$(CURDIR)/user-config.jam -sHAVE_ICU=1
@@ -209,11 +209,6 @@
 	# generate (some) debhelper files
 	@$(call mk_debhelper_files)
 
-	# package pyste
-	cd libs/python/pyste/install && python setup.py install --no-compile --prefix=$(pyste_prefix) --install-lib=$(pyste_prefix)/share/python-support/pyste
-	mv $(pyste_prefix)/bin/pyste.py $(pyste_prefix)/bin/pyste
-	dh_installman -ppyste$(PKGVERSION) debian/pyste.1
-
 	# package libboost-dbg
 	dh_install -plibboost$(PKGVERSION)-dbg
 	dh_install -plibboost$(PKGVERSION)-dbg --autodest \
@@ -299,6 +294,10 @@
 	   debian/tmp/usr/share/python/runtime.d/libboost-python$(PKGVERSION)-dev.rtupdate
 	dh_link -plibboost-python$(PKGVERSION)-dev
 
+	cd libs/python/pyste/install && python setup.py install --no-compile --prefix=$(pyste_prefix) --install-lib=$(pyste_prefix)/share/python-support/pyste
+	mv $(pyste_prefix)/bin/pyste.py $(pyste_prefix)/bin/pyste
+	dh_installman -plibboost-python$(PKGVERSION)-dev debian/pyste.1
+
 	# package libboost-regex$(SOVERSION)
 	dh_install -plibboost-regex$(SOVERSION)
 	# package libboost-regex$(PKGVERSION)-dev