tags 557293 + pending thanks Dear maintainer,
I've prepared an NMU for polybori (versioned as 0.5~rc1-2.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. -- Jakub Wilk
diff -u polybori-0.5~rc1/debian/rules polybori-0.5~rc1/debian/rules
--- polybori-0.5~rc1/debian/rules
+++ polybori-0.5~rc1/debian/rules
@@ -9,16 +9,18 @@
touch $@
build-python%: TMPDEST=debian/python-polybori$*
build-python%: PYTHON=/usr/bin/python$*
+build-python%: BOOST_LIBRARY=boost_python-py$(subst .,,$*)
build-python%: PYTHONSITE=`/usr/bin/python$* -c 'import setuptools; print setuptools.distutils.sysconfig.get_python_lib() '`
build-python%: debian/stamp-patched
echo $(TMPDEST)
- scons prepare-install PYTHON=$(PYTHON)
+ scons prepare-install PYTHON=$(PYTHON) BOOST_LIBRARY=$(BOOST_LIBRARY)
mkdir -p $(TMPDEST)
scons install devel-install INSTALLDIR=$(TMPDEST)/usr/lib/polybori \
PYINSTALLPREFIX=$(TMPDEST)$(PYTHONSITE) MANDIR=$(TMPDEST)/usr/share/man \
PREFIX=$(TMPDEST)/usr EPREFIX=$(TMPDEST)/usr/bin \
- DOCDIR=$(TMPDEST)/usr/share/doc/polybori PYTHON=$(PYTHON) \
- RELATIVEPYPREFIX=/usr/lib/python$(lastword $(PYVERS))/site-packages
+ DOCDIR=$(TMPDEST)/usr/share/doc/polybori \
+ PYTHON=$(PYTHON) BOOST_LIBRARY=$(BOOST_LIBRARY) \
+ RELATIVEPYPREFIX=$(PYTHONSITE)
touch $@
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff -u polybori-0.5~rc1/debian/changelog polybori-0.5~rc1/debian/changelog
--- polybori-0.5~rc1/debian/changelog
+++ polybori-0.5~rc1/debian/changelog
@@ -1,3 +1,20 @@
+polybori (0.5~rc1-2.1) unstable; urgency=low
+
+ * Non-maintainer upload. Thanks to Kumar Appaiah for the initial patch.
+ * debian/control:
+ - Add ‘XB-Python-Version: ${python:Version}’, as required by python-central.
+ - Tighten internal package dependencies.
+ * debian/*.install:
+ - Stop referring to particular versions of Python in debian/*.install
+ (closes: #557293).
+ * debian/rules:
+ - Use correct values for RELATIVEPYPREFIX variable.
+ - Pass name of Python-versioned Boost library to scons.
+ * debian/patches/link-with-versioned-boost.diff:
+ - Link to a correct version of Boost library.
+
+ -- Jakub Wilk <uba...@users.sf.net> Sat, 09 Jan 2010 21:53:54 +0100
+
polybori (0.5~rc1-2) unstable; urgency=low
* Boost 1.39 has removed the "-mt" suffix, so revert the previous change
diff -u polybori-0.5~rc1/debian/python-polybori.install polybori-0.5~rc1/debian/python-polybori.install
--- polybori-0.5~rc1/debian/python-polybori.install
+++ polybori-0.5~rc1/debian/python-polybori.install
@@ -1,5 +1,4 @@
-debian/tmp/usr/lib/python2.5 usr/lib
-debian/tmp/usr/lib/python2.4 usr/lib
+debian/tmp/usr/lib/python2.* usr/lib
debian/tmp/usr/lib/polybori usr/lib
debian/tmp/usr/bin /usr
debian/tmp/usr/share/man /usr/share
diff -u polybori-0.5~rc1/debian/control.in polybori-0.5~rc1/debian/control.in
--- polybori-0.5~rc1/debian/control.in
+++ polybori-0.5~rc1/debian/control.in
@@ -12,7 +12,8 @@
Provides: polybori
Section: python
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ipython, libpolybori-dev, ${python:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ipython, libpolybori-dev (= ${binary:Version}), ${python:Depends}
+XB-Python-Version: ${python:Version}
Description: Polynomials over Boolean Rings, Python module
The core of PolyBoRi is a C++ library, which provides high-level data
types for Boolean polynomials and monomials, exponent vectors, as
@@ -30,7 +31,7 @@
Package: libpolybori-dev
Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libpolybori-0.5.0-0
+Depends: ${shlibs:Depends}, ${misc:Depends}, libpolybori-0.5.0-0 (= ${binary:Version})
Description: Polynomials over Boolean Rings, development files
The core of PolyBoRi is a C++ library, which provides high-level data
types for Boolean polynomials and monomials, exponent vectors, as
diff -u polybori-0.5~rc1/debian/control polybori-0.5~rc1/debian/control
--- polybori-0.5~rc1/debian/control
+++ polybori-0.5~rc1/debian/control
@@ -12,7 +12,8 @@
Provides: polybori
Section: python
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ipython, libpolybori-dev, ${python:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ipython, libpolybori-dev (= ${binary:Version}), ${python:Depends}
+XB-Python-Version: ${python:Version}
Description: Polynomials over Boolean Rings, Python module
The core of PolyBoRi is a C++ library, which provides high-level data
types for Boolean polynomials and monomials, exponent vectors, as
@@ -30,7 +31,7 @@
Package: libpolybori-dev
Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libpolybori-0.5.0-0
+Depends: ${shlibs:Depends}, ${misc:Depends}, libpolybori-0.5.0-0 (= ${binary:Version})
Description: Polynomials over Boolean Rings, development files
The core of PolyBoRi is a C++ library, which provides high-level data
types for Boolean polynomials and monomials, exponent vectors, as
only in patch2:
unchanged:
--- polybori-0.5~rc1.orig/debian/patches/link-with-versioned-boost.diff
+++ polybori-0.5~rc1/debian/patches/link-with-versioned-boost.diff
@@ -0,0 +1,27 @@
+Description: Link to a correct version of Boost library.
+Author: Jakub Wilk <uba...@user.sf.net>
+Last-Update: 2010-01-09
+
+Index: polybori-0.5~rc1/SConstruct
+===================================================================
+--- polybori-0.5~rc1.orig/SConstruct 2010-01-09 23:00:23.000000000 +0100
++++ polybori-0.5~rc1/SConstruct 2010-01-09 23:06:17.000000000 +0100
+@@ -144,6 +144,8 @@
+ 'Build python extension, if possible', True))
+ opts.Add(BoolOption('BOOST_WORKS',
+ 'Skip check for Boost libraries', False))
++opts.Add('BOOST_LIBRARY',
++ 'Name of Boost library to link with', 'boost_python')
+
+ opts.Add(BoolOption('RELATIVE_SYMLINK',
+ 'Use relative symbolic links on install', True))
+@@ -494,8 +496,7 @@
+ [TestsPath('src', t + ".cc"), libpb, gb]+ libCudd,
+ CPPPATH=CPPPATH)
+
+-
+-LIBS = env['LIBS']+['boost_python']+USERLIBS
++LIBS = env['LIBS']+[env['BOOST_LIBRARY']]+USERLIBS
+
+ LIBS_static = ["polybori", 'groebner', cudd_name] + LIBS
+ #env["CPPDEFINES"].Append("Packed")
only in patch2:
unchanged:
--- polybori-0.5~rc1.orig/debian/patches/series
+++ polybori-0.5~rc1/debian/patches/series
@@ -0,0 +1 @@
+link-with-versioned-boost.diff
signature.asc
Description: Digital signature
