[SCM] polybori: Polynomials over Boolean Rings branch, master, updated. upstream/0.8.2-22-g30151a9
Alexander Dreyer
adreyer at gmx.de
Tue Dec 18 01:05:10 UTC 2012
The following commit has been merged in the master branch:
commit 30151a92d87ffb84cc01b078357312a7628cc8e1
Author: Alexander Dreyer <adreyer at gmx.de>
Date: Mon Dec 17 21:43:29 2012 +0100
Switching to new debian standards
diff --git a/SConstruct b/SConstruct
index 1970764..2f58ee6 100644
--- a/SConstruct
+++ b/SConstruct
@@ -15,7 +15,6 @@ except:
pborirelease = "0"
-libraryversion = "0.0.0"
debname = "polybori-" + pboriversion + '.' + pborirelease
import tarfile
@@ -408,7 +407,7 @@ def setup_env(defaultenv):
opts.Add('SHLIBVERSIONSUFFIX',
'Shared libraries suffix for library versioning.',
'-' + pboriversion +'.' + pborirelease +
- defaultenv['SHLIBSUFFIX'] + '.' + libraryversion)
+ defaultenv['SHLIBSUFFIX'] + '.$LIBRARY_VERSION')
@@ -432,6 +431,8 @@ def setup_env(defaultenv):
if var != "LIBSUFFIX":
print "Variable", var, "not in default environment!"
+ opts.Add('LIBRARY_VERSION', "libtool-style library version", '0.0.0')
+
opts.Add('CONFFILE', "Dump settings to file, if given", '')
opts.Add('PLATFORM', "Manually set another platform (unusual)",
@@ -926,12 +927,12 @@ def SymlinkReadableLibname(files):
result = []
import re
soPattern = re.compile('(.*)\.[0-9]*\.[0-9]*$', re.I|re.S)
- sonameversion = soPattern.findall(path.basename(libraryversion))[0]
+ sonameversion = soPattern.findall(path.basename(env.subst('$LIBRARY_VERSION')))[0]
for fname in files:
fname = str(fname)
soname = soPattern.sub(r'\1', fname)
- versionname = fname.replace('.' + libraryversion, '')
+ versionname = fname.replace('.' + env.subst('$LIBRARY_VERSION'), '')
simple = fname.replace(suffix, simplesuffix)
for (dest, src) in [(soname, fname), (versionname, soname),
diff --git a/debian/changelog b/debian/changelog
index 293ff29..8ec86ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+polybori (0.8.2-1) unstable; urgency=low
+
+ * Updating to recent Debian standards
+
+ -- Alexander Dreyer <adreyer at gmx.de> Mon, 17 Dec 2012 23:55:17 +0100
+
polybori (0.8.2-0) unstable; urgency=low
* New upstream release
diff --git a/debian/control b/debian/control
index 226e43b..1fd36ae 100644
--- a/debian/control
+++ b/debian/control
@@ -9,16 +9,15 @@ Vcs-Browser: http://git.debian.org/?p=debian-science/packages/polybori.git
DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 5), patchutils (>= 0.2.25), scons, python-setuptools,
libboost-dev, libboost-python-dev (>=1.39), doxygen (>= 1.4.6),
- hevea | tex4ht, python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6)
-XS-Python-Version: all
-Standards-Version: 3.8.0
+ hevea | tex4ht, python-all-dev (>= 2.3.5-11)
+X-Python-Version: >= 2.6
+Standards-Version: 3.9.3
Package: python-polybori
Provides: polybori
Section: python
Architecture: any
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
@@ -36,7 +35,7 @@ Description: Polynomials over Boolean Rings, Python module
Package: libpolybori-dev
Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libpolybori-0.8.2-0 (= ${binary:Version})
+Depends: ${misc:Depends}, libpolybori-0.8.2-1 (= ${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
@@ -51,7 +50,7 @@ Description: Polynomials over Boolean Rings, development files
.
This package contains the PolyBoRi development files.
-Package: libpolybori-0.8.2-0
+Package: libpolybori-0.8.2-1
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -73,6 +72,7 @@ Description: Polynomials over Boolean Rings, shared library
Package: polybori-doc
Section: doc
Architecture: all
+Depends: ${misc:Depends}
Description: Polynomials over Boolean Rings, shared library
The core of PolyBoRi is a C++ library, which provides high-level data
types for Boolean polynomials and monomials, exponent vectors, as
diff --git a/debian/libpolybori-0.8.2-0.install b/debian/libpolybori-0.8.2-1.install
similarity index 100%
rename from debian/libpolybori-0.8.2-0.install
rename to debian/libpolybori-0.8.2-1.install
diff --git a/debian/patches/0002-customize-library-version.patch b/debian/patches/0002-customize-library-version.patch
new file mode 100644
index 0000000..998227e
--- /dev/null
+++ b/debian/patches/0002-customize-library-version.patch
@@ -0,0 +1,64 @@
+Description: make LIBRARY_VERSION customizable
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ polybori (0.8.2-1) unstable; urgency=low
+ .
+ * Updating to recent Debian standards
+Author: Alexander Dreyer <adreyer at gmx.de>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: upstream, https://bitbucket.org/brickenstein/polybori/commits/c250d7bae2f8a15bb83ff2ebfdc165c09dc36e13/raw/
+Bug: https://bitbucket.org/brickenstein/polybori/commits/c250d7bae2f8a15bb83ff2ebfdc165c09dc36e13/
+Forwarded: not-needed
+Last-Update: 2012-12-18
+--- polybori-0.8.2.orig/SConstruct
++++ polybori-0.8.2/SConstruct
+@@ -15,7 +15,6 @@ except:
+ pborirelease = "0"
+
+
+-libraryversion = "0.0.0"
+ debname = "polybori-" + pboriversion + '.' + pborirelease
+
+ import tarfile
+@@ -408,7 +407,7 @@ def setup_env(defaultenv):
+ opts.Add('SHLIBVERSIONSUFFIX',
+ 'Shared libraries suffix for library versioning.',
+ '-' + pboriversion +'.' + pborirelease +
+- defaultenv['SHLIBSUFFIX'] + '.' + libraryversion)
++ defaultenv['SHLIBSUFFIX'] + '.$LIBRARY_VERSION')
+
+
+
+@@ -432,6 +431,8 @@ def setup_env(defaultenv):
+ if var != "LIBSUFFIX":
+ print "Variable", var, "not in default environment!"
+
++ opts.Add('LIBRARY_VERSION', "libtool-style library version", '0.0.0')
++
+ opts.Add('CONFFILE', "Dump settings to file, if given", '')
+
+ opts.Add('PLATFORM', "Manually set another platform (unusual)",
+@@ -926,12 +927,12 @@ def SymlinkReadableLibname(files):
+ result = []
+ import re
+ soPattern = re.compile('(.*)\.[0-9]*\.[0-9]*$', re.I|re.S)
+- sonameversion = soPattern.findall(path.basename(libraryversion))[0]
++ sonameversion = soPattern.findall(path.basename(env.subst('$LIBRARY_VERSION')))[0]
+
+ for fname in files:
+ fname = str(fname)
+ soname = soPattern.sub(r'\1', fname)
+- versionname = fname.replace('.' + libraryversion, '')
++ versionname = fname.replace('.' + env.subst('$LIBRARY_VERSION'), '')
+ simple = fname.replace(suffix, simplesuffix)
+
+ for (dest, src) in [(soname, fname), (versionname, soname),
diff --git a/debian/patches/series b/debian/patches/series
index ccb13e8..1907bcb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
0001-add-doc-Makefile-to-assist-cleaning.patch
+0002-customize-library-version.patch
diff --git a/debian/python-polybori.install b/debian/python-polybori.install
index bfc83aa..f2faf72 100644
--- a/debian/python-polybori.install
+++ b/debian/python-polybori.install
@@ -1,4 +1,4 @@
debian/tmp/usr/lib/python* usr/lib
-debian/tmp/usr/lib/polybori usr/lib
+debian/tmp/usr/share/polybori usr/share
debian/tmp/usr/bin /usr
debian/tmp/usr/share/man /usr/share
diff --git a/debian/rules b/debian/rules
index 9cae7e4..613b8b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,10 +4,11 @@
PYVERS=$(shell pyversions -vr)
-stamp-build: $(PYVERS:%=stamp-build-python%)
+build-stamp: $(PYVERS:%=stamp-build-python%)
touch $@
-
-build: stamp-build
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
stamp-build-python%: build-python%
touch $@
@@ -17,13 +18,23 @@ build-python%: PYTHON=/usr/bin/python$*
build-python%: PYTHONSITE=`/usr/bin/python$* -c 'import setuptools; print setuptools.distutils.sysconfig.get_python_lib() '`
build-python%:
- scons prepare-install PYTHON=$(PYTHON)
+ scons prepare-install INSTALLDIR=$(TMPDEST)/usr/share/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$*/site-packages \
+ LINKFLAGS="$(LDFLAGS)" CCFLAGS="$(CPPFLAGS)" \
+ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+ LIBRARY_VERSION="1.0.0"
-mkdir -p $(TMPDEST)
- scons install devel-install INSTALLDIR=$(TMPDEST)/usr/lib/polybori \
+ scons install devel-install INSTALLDIR=$(TMPDEST)/usr/share/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$*/site-packages
+ RELATIVEPYPREFIX=/usr/lib/python$*/site-packages \
+ LINKFLAGS="$(LDFLAGS)" CCFLAGS="$(CPPFLAGS)" \
+ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+ LIBRARY_VERSION="1.0.0"
install-%:
-mkdir debian/tmp/
@@ -32,9 +43,12 @@ install-%:
install: $(PYVERS:%=install-%)
-mkdir -p debian/tmp/
-mkdir -p debian/tmp/usr/lib
+ -mkdir -p debian/tmp/usr/share
clean:
$(MAKE) -C doc clean
+ rm -f doc/python/polybori.*.html
+ rm -f M4RI/config.log
rm -rf $(PYVERS:%=debian/python-polybori%)
scons . --keep-going --clean || true
dh_clean
@@ -46,7 +60,7 @@ clean:
rm -rf build
# Build architecture-independent files here.
-binary-indep: stamp-build install
+binary-indep: build-stamp install
dh_testdir -i
dh_testroot -i
dh_installchangelogs -i
@@ -68,14 +82,14 @@ binary-indep: stamp-build install
dh_link -i
dh_compress -i
dh_fixperms -i
- dh_pycentral -ppython-polybori
+ dh_python2 -ppython-polybori
dh_installdeb -i
dh_gencontrol -i
dh_md5sums -i
dh_builddeb -i
# Build architecture-dependent files here.
-binary-arch: stamp-build install
+binary-arch: build-stamp install
dh_testdir -a
dh_testroot -a
dh_installchangelogs -a
@@ -100,7 +114,7 @@ binary-arch: stamp-build install
dh_link -a
dh_compress -a
dh_fixperms -a
- dh_pycentral -ppython-polybori
+ dh_python2 -ppython-polybori
dh_makeshlibs -a
dh_installdeb -a
dh_shlibdeps -a
--
polybori: Polynomials over Boolean Rings
More information about the debian-science-commits
mailing list