tags 557293 + patch
thanks

Hi!

Please find attached a possible patch. I can't really tell for sure
whether it would work with Python 2.6 due to the absence of a Boost
Python 2.6 build (and it'd be really painful for me to rebuild boost
for this purpose), but other than checking if the "site-packages"
reference doesn't cause any harm with python 2.6, (it shouldn't with
an updated python-central, but I can't say for sure), you should be
good to go!

I threw in some additional lintian fixes, which I felt were absolutely
necessary (lintian errors).

HTH, and thanks.

Kumar
diff -Nru --exclude changelog polybori-0.5~rc1/debian/control polybori-0.5~rc1/debian/control
--- polybori-0.5~rc1/debian/control	2009-11-20 21:34:25.000000000 -0600
+++ polybori-0.5~rc1/debian/control	2009-11-20 21:34:26.000000000 -0600
@@ -12,7 +12,7 @@
 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}
 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 +30,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 -Nru --exclude changelog polybori-0.5~rc1/debian/control.in polybori-0.5~rc1/debian/control.in
--- polybori-0.5~rc1/debian/control.in	2009-11-20 21:34:25.000000000 -0600
+++ polybori-0.5~rc1/debian/control.in	2009-11-20 21:34:26.000000000 -0600
@@ -12,7 +12,7 @@
 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}
 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 +30,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 -Nru --exclude changelog polybori-0.5~rc1/debian/python-polybori.install polybori-0.5~rc1/debian/python-polybori.install
--- polybori-0.5~rc1/debian/python-polybori.install	2009-11-20 21:34:25.000000000 -0600
+++ polybori-0.5~rc1/debian/python-polybori.install	2009-11-20 21:34:26.000000000 -0600
@@ -1,5 +1,4 @@
-debian/tmp/usr/lib/python2.5 usr/lib
-debian/tmp/usr/lib/python2.4 usr/lib
+debian/tmp/usr/lib/python* usr/lib
 debian/tmp/usr/lib/polybori usr/lib
 debian/tmp/usr/bin /usr
 debian/tmp/usr/share/man /usr/share
diff -Nru --exclude changelog polybori-0.5~rc1/debian/rules polybori-0.5~rc1/debian/rules
--- polybori-0.5~rc1/debian/rules	2009-11-20 21:34:25.000000000 -0600
+++ polybori-0.5~rc1/debian/rules	2009-11-20 21:34:26.000000000 -0600
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+DEB_AUTO_UPDATE_DEBIAN_CONTROL := yes
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
diff -Nru --exclude changelog polybori-0.5~rc1/SConstruct polybori-0.5~rc1/SConstruct
--- polybori-0.5~rc1/SConstruct	2008-07-08 16:41:57.000000000 -0500
+++ polybori-0.5~rc1/SConstruct	2009-11-20 21:34:26.000000000 -0600
@@ -13,7 +13,7 @@
 import tarfile
 
 import sys
-from os import sep, path
+from os import sep, path, popen
 from glob import glob
 
 m4ri=["grayflex.c", "packedmatrix.c","watch.c","strassen.c","misc.c",
@@ -495,7 +495,10 @@
         CPPPATH=CPPPATH)
 
 
-LIBS = env['LIBS']+['boost_python']+USERLIBS
+current_python_command = env["PYTHON"] + """ -c 'import platform; print "".join(platform.python_version_tuple()[:2])'"""
+current_python_version = popen(current_python_command).read()[:-1]
+
+LIBS = env['LIBS']+['boost_python-py'+current_python_version]+USERLIBS
 
 LIBS_static = ["polybori", 'groebner', cudd_name] + LIBS
 #env["CPPDEFINES"].Append("Packed")

Reply via email to