[SCM] polybori: Polynomials over Boolean Rings branch, master, updated. upstream/0.8.2-45-g0014e99
Alexander Dreyer
adreyer at gmx.de
Mon Jan 7 23:34:48 UTC 2013
The following commit has been merged in the master branch:
commit 0014e99e2b9de86f1107d137c5be4e4e6ecb265a
Author: Alexander Dreyer <adreyer at gmx.de>
Date: Mon Jan 7 15:26:56 2013 +0100
Cleanup patched
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..845ca06
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc
diff --git a/debian/patches/0001-add-doc-Makefile-to-assist-cleaning.patch b/debian/patches/0001-add-doc-Makefile-to-assist-cleaning.patch
deleted file mode 100644
index df9681a..0000000
--- a/debian/patches/0001-add-doc-Makefile-to-assist-cleaning.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 2d68d516313ad44948c658adc23267f86516ad1e Mon Sep 17 00:00:00 2001
-From: Felix Salfelder <felix at salfelder.org>
-Date: Thu, 15 Mar 2012 10:49:36 +0100
-Subject: add doc/Makefile to assist cleaning.
-
----
- doc/Makefile | 9 +++++++++
- doc/python/Makefile | 17 +++++++++++++++++
- doc/tutorial/Makefile | 21 +++++++++++++++++++++
- 3 files changed, 47 insertions(+)
- create mode 100644 doc/Makefile
- create mode 100644 doc/python/Makefile
- create mode 100644 doc/tutorial/Makefile
-
-diff --git a/doc/Makefile b/doc/Makefile
-new file mode 100644
-index 0000000..909da80
---- /dev/null
-+++ b/doc/Makefile
-@@ -0,0 +1,9 @@
-+
-+SUBDIRS=python tutorial
-+
-+all:
-+
-+clean: clean-recursive
-+
-+%-recursive:
-+ for i in $(SUBDIRS); do $(MAKE) -C $$i $*; done
-diff --git a/doc/python/Makefile b/doc/python/Makefile
-new file mode 100644
-index 0000000..bbc5564
---- /dev/null
-+++ b/doc/python/Makefile
-@@ -0,0 +1,17 @@
-+
-+all:
-+
-+clean:
-+ rm -f polybori.addition.html
-+ rm -f polybori.cluster.html
-+ rm -f polybori.cnf.html
-+ rm -f polybori.context.html
-+ rm -f polybori.easy_polynomials.html
-+ rm -f polybori.fglm.html
-+ rm -f polybori.intersect.html
-+ rm -f polybori.intpolys.html
-+ rm -f polybori.parallel.html
-+ rm -f polybori.parsegat.html
-+ rm -f polybori.plot.html
-+ rm -f polybori.rank.html
-+
-diff --git a/doc/tutorial/Makefile b/doc/tutorial/Makefile
-new file mode 100644
-index 0000000..47d7100
---- /dev/null
-+++ b/doc/tutorial/Makefile
-@@ -0,0 +1,21 @@
-+
-+all:
-+
-+clean:
-+ rm -f tutorial.4ct
-+ rm -f tutorial.4tc
-+ rm -f tutorial.aux
-+ rm -f tutorial.css
-+ rm -f tutorial.dvi
-+ rm -f tutorial.html
-+ rm -f tutorial.idv
-+ rm -f tutorial.lg
-+ rm -f tutorialli1.html
-+ rm -f tutorial.log
-+ rm -f tutorialse1.html
-+ rm -f tutorialse2.html
-+ rm -f tutorialse3.html
-+ rm -f tutorialse4.html
-+ rm -f tutorial.tmp
-+ rm -f tutorial.xref
-+
diff --git a/debian/patches/0002-customize-library-version.patch b/debian/patches/0001-make-LIBRARY_VERSION-customizable.patch
similarity index 60%
rename from debian/patches/0002-customize-library-version.patch
rename to debian/patches/0001-make-LIBRARY_VERSION-customizable.patch
index 998227e..12c18d5 100644
--- a/debian/patches/0002-customize-library-version.patch
+++ b/debian/patches/0001-make-LIBRARY_VERSION-customizable.patch
@@ -1,26 +1,15 @@
-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>
+From: Alexander Dreyer <adreyer at gmx.de>
+Date: Mon, 7 Jan 2013 15:16:12 +0100
+Subject: make LIBRARY_VERSION customizable
---
-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:
+ SConstruct | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
-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
+diff --git a/SConstruct b/SConstruct
+index 1970764..2f58ee6 100644
+--- a/SConstruct
++++ b/SConstruct
@@ -15,7 +15,6 @@ except:
pborirelease = "0"
@@ -62,3 +51,4 @@ Last-Update: 2012-12-18
simple = fname.replace(suffix, simplesuffix)
for (dest, src) in [(soname, fname), (versionname, soname),
+--
diff --git a/debian/patches/0002-Supporting-pkg-config-file.patch b/debian/patches/0002-Supporting-pkg-config-file.patch
new file mode 100644
index 0000000..d13ec21
--- /dev/null
+++ b/debian/patches/0002-Supporting-pkg-config-file.patch
@@ -0,0 +1,69 @@
+From: Alexander Dreyer <adreyer at gmx.de>
+Date: Mon, 7 Jan 2013 15:13:42 +0100
+Subject: Supporting pkg-config file
+
+---
+ SConstruct | 42 ++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 42 insertions(+)
+
+diff --git a/SConstruct b/SConstruct
+index 2f58ee6..1c31036 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -435,6 +435,10 @@ def setup_env(defaultenv):
+
+ opts.Add('CONFFILE', "Dump settings to file, if given", '')
+
++ opts.Add('PKGCONFIGPATH',
++ "Write settings to pkg-config file in path, if given", '')
++ opts.Add('TMPINSTALLDIR', "Temporary installation directory, if given", '')
++
+ opts.Add('PLATFORM', "Manually set another platform (unusual)",
+ defaultenv['PLATFORM'])
+
+@@ -1745,6 +1749,44 @@ if 'install' in COMMAND_LINE_TARGETS:
+ env.AlwaysBuild(conffile)
+ env.Alias('install', conffile)
+
++ pkgconfigdirname = env['PKGCONFIGPATH']
++ if pkgconfigdirname:
++ def build_pcfile(target, source, env):
++ localenv = source[0].get_env()
++ libflags = localenv.subst("$LINKFLAGS $_LIBDIRFLAGS $_LIBFLAGS ${_stripixes(LIBLINKPREFIX, GD_LIBS, LIBLINKSUFFIX, LIBPREFIXES, LIBSUFFIXES, __env__)}");
++ libs = ' '.join(set([l.replace('-l','') for l in libflags.split()
++ if l.startswith('-l')]))
++ page = """
++prefix=$PREFIX
++exec_prefix=$${prefix}
++includedir=$DEVEL_INCLUDE_PREFIX
++libdir=$DEVEL_LIB_PREFIX
++
++Name: %s
++Description: The PolyBoRi library
++URL: http://polybori.sourceforge.net
++Version: %s
++Requires: %s
++Cflags: $CXXFLAGS $CCFLAGS $_CCCOMCOM
++Libs: %s
++ """ % (env.File(target[0]).name.replace('.pc',''),
++ pboriversion + '.' + pborirelease,
++ libs, libflags)
++ page = localenv.subst_target_source(page).replace(env.subst("$TMPINSTALLDIR"),'') + '\n'
++ open(str(target[0]), 'w').writelines(page)
++
++ return None
++
++ pcfiles = [env.Command(path.join(pkgconfigdirname,
++ "polybori-groebner.pc"),
++ libgbShared, build_pcfile),
++ env.Command(path.join(pkgconfigdirname,
++ "polybori.pc"), libpbShared, build_pcfile)
++ ]
++
++ env.AlwaysBuild(pcfiles)
++ env.Alias('install', pcfiles)
++
+
+ env.Alias('prepare-devel', dylibs + stlibs + readabledevellibs)
+ env.Alias('prepare-install', [pyroot, DocPath()])
+--
diff --git a/debian/patches/0005_PolyGUI.patch b/debian/patches/0003-Upstream-patch-for-broken-PolyGUI.patch
similarity index 58%
rename from debian/patches/0005_PolyGUI.patch
rename to debian/patches/0003-Upstream-patch-for-broken-PolyGUI.patch
index bc2aa0a..15565e3 100644
--- a/debian/patches/0005_PolyGUI.patch
+++ b/debian/patches/0003-Upstream-patch-for-broken-PolyGUI.patch
@@ -1,23 +1,15 @@
-Description: Upstream patch for broken PolyGUI
- Running PolyGui was broken, but this was fixed upstream in the development
- branch.
- .
- polybori (0.8.2-1~exp1) unstable; urgency=low
- .
- * Updating to recent Debian standards
-Author: Alexander Dreyer <adreyer at gmx.de>
+From: Alexander Dreyer <adreyer at gmx.de>
+Date: Mon, 7 Jan 2013 15:16:12 +0100
+Subject: Upstream patch for broken PolyGUI
---
-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:
+ gui/PolyGUI | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
-Origin: upstream, http://bitbucket.org/brickenstein/polybori/commits/e3dd38cfb2 http://bitbucket.org/brickenstein/polybori/commits/72e6bf8d
-Forwarded: not-needed
-Last-Update: 2013-01-04
-
---- polybori-0.8.2.orig/gui/PolyGUI
-+++ polybori-0.8.2/gui/PolyGUI
+diff --git a/gui/PolyGUI b/gui/PolyGUI
+index e9d1b43..0b5864a 100755
+--- a/gui/PolyGUI
++++ b/gui/PolyGUI
@@ -528,18 +528,21 @@ class BoxLayout(QtGui.QWidget):
options.ordering='block_' + options.ordering
#mydata=load_file('/p/sys/IndAlg/share/data/uf20_45.py')
@@ -44,3 +36,4 @@ Last-Update: 2013-01-04
else:
I= groebner_basis(I,prot=options.prot)
+--
diff --git a/debian/patches/0003_support_pkgconfig.patch b/debian/patches/0003_support_pkgconfig.patch
deleted file mode 100644
index ffdd5eb..0000000
--- a/debian/patches/0003_support_pkgconfig.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Description: Supporting pkg-config file
- The upstream patch allows for exporting the current built config
- to a pkg-config .pc file.
- .
- 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/a7e1c046d4db93f6eda5ed77000bf6b402957841/raw/
-Bug: https://bitbucket.org/brickenstein/polybori/commits/a7e1c046d4db93f6eda5ed77000bf6b402957841/raw/
-Forwarded: not-needed
-Last-Update: 2012-12-21
-
---- polybori-0.8.2.orig/SConstruct
-+++ polybori-0.8.2/SConstruct
-@@ -435,6 +435,9 @@ def setup_env(defaultenv):
-
- opts.Add('CONFFILE', "Dump settings to file, if given", '')
-
-+ opts.Add('PKGCONFIGFILE', "Write settings to pkg-config file, if given", '')
-+ opts.Add('TMPINSTALLDIR', "Temporary installation directory, if given", '')
-+
- opts.Add('PLATFORM', "Manually set another platform (unusual)",
- defaultenv['PLATFORM'])
-
-@@ -1745,6 +1748,34 @@ if 'install' in COMMAND_LINE_TARGETS:
- env.AlwaysBuild(conffile)
- env.Alias('install', conffile)
-
-+ pkgconfigfilename = env['PKGCONFIGFILE']
-+ if pkgconfigfilename:
-+ def build_pcfile(target, source, env):
-+ from string import Template
-+ page = """
-+prefix=$PREFIX
-+exec_prefix=$${prefix}
-+includedir=$DEVEL_INCLUDE_PREFIX
-+libdir=$DEVEL_LIB_PREFIX
-+
-+Name: polybori
-+Description: The PolyBoRi library
-+URL: http://polybori.sourceforge.net
-+Version: %s
-+Requires: $GD_LIBS
-+Cflags: $CXXFLAGS $CCFLAGS $_CCCOMCOM
-+Libs: $LINKFLAGS $SOURCES $_LIBDIRFLAGS $_LIBFLAGS ${_stripixes(LIBLINKPREFIX, GD_LIBS, LIBLINKSUFFIX, LIBPREFIXES, LIBSUFFIXES, __env__)}
-+ """ % (pboriversion + '.' + pborirelease)
-+ page = env.subst(page).replace(env.subst("$TMPINSTALLDIR"),'') + '\n'
-+ open(str(target[0]), 'w').writelines(page)
-+
-+ return None
-+
-+ pcfile = env.Command(pkgconfigfilename, 'SConstruct', build_pcfile)
-+ env.AlwaysBuild(pcfile)
-+ env.Alias('install', pcfile)
-+
-+
-
- env.Alias('prepare-devel', dylibs + stlibs + readabledevellibs)
- env.Alias('prepare-install', [pyroot, DocPath()])
diff --git a/debian/patches/0004_SConstruct.patch b/debian/patches/0004_SConstruct.patch
deleted file mode 100644
index 4b2dc5e..0000000
--- a/debian/patches/0004_SConstruct.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Description: Updating SConstruct
- ... s.th. it can handle multiple .py files
- .
- polybori (0.8.2-1~exp1) 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/eeb1d65a951c0dfd61442bd44ab545e2068736c7
-Bug: https://bitbucket.org/brickenstein/polybori/commits/eeb1d65a951c0dfd61442bd44ab545e2068736c7
-Forwarded: already upstream.
-dddd<dddddddo|not-needed|url proving that it has been forwarded>
-Reviewed-By: Alexander Dreyer <adreyer at gmx.de>
-Last-Update: 2012-12-22
-
---- polybori-0.8.2.orig/SConstruct
-+++ polybori-0.8.2/SConstruct
-@@ -435,7 +435,8 @@ def setup_env(defaultenv):
-
- opts.Add('CONFFILE', "Dump settings to file, if given", '')
-
-- opts.Add('PKGCONFIGFILE', "Write settings to pkg-config file, if given", '')
-+ opts.Add('PKGCONFIGPATH',
-+ "Write settings to pkg-config file in path, if given", '')
- opts.Add('TMPINSTALLDIR', "Temporary installation directory, if given", '')
-
- opts.Add('PLATFORM', "Manually set another platform (unusual)",
-@@ -1748,33 +1749,43 @@ if 'install' in COMMAND_LINE_TARGETS:
- env.AlwaysBuild(conffile)
- env.Alias('install', conffile)
-
-- pkgconfigfilename = env['PKGCONFIGFILE']
-- if pkgconfigfilename:
-+ pkgconfigdirname = env['PKGCONFIGPATH']
-+ if pkgconfigdirname:
- def build_pcfile(target, source, env):
-- from string import Template
-+ localenv = source[0].get_env()
-+ libflags = localenv.subst("$LINKFLAGS $_LIBDIRFLAGS $_LIBFLAGS ${_stripixes(LIBLINKPREFIX, GD_LIBS, LIBLINKSUFFIX, LIBPREFIXES, LIBSUFFIXES, __env__)}");
-+ libs = ' '.join(set([l.replace('-l','') for l in libflags.split()
-+ if l.startswith('-l')]))
- page = """
- prefix=$PREFIX
- exec_prefix=$${prefix}
- includedir=$DEVEL_INCLUDE_PREFIX
- libdir=$DEVEL_LIB_PREFIX
-
--Name: polybori
-+Name: %s
- Description: The PolyBoRi library
- URL: http://polybori.sourceforge.net
- Version: %s
--Requires: $GD_LIBS
-+Requires: %s
- Cflags: $CXXFLAGS $CCFLAGS $_CCCOMCOM
--Libs: $LINKFLAGS $SOURCES $_LIBDIRFLAGS $_LIBFLAGS ${_stripixes(LIBLINKPREFIX, GD_LIBS, LIBLINKSUFFIX, LIBPREFIXES, LIBSUFFIXES, __env__)}
-- """ % (pboriversion + '.' + pborirelease)
-- page = env.subst(page).replace(env.subst("$TMPINSTALLDIR"),'') + '\n'
-+Libs: %s
-+ """ % (env.File(target[0]).name.replace('.pc',''),
-+ pboriversion + '.' + pborirelease,
-+ libs, libflags)
-+ page = localenv.subst_target_source(page).replace(env.subst("$TMPINSTALLDIR"),'') + '\n'
- open(str(target[0]), 'w').writelines(page)
-
- return None
-
-- pcfile = env.Command(pkgconfigfilename, 'SConstruct', build_pcfile)
-- env.AlwaysBuild(pcfile)
-- env.Alias('install', pcfile)
-+ pcfiles = [env.Command(path.join(pkgconfigdirname,
-+ "polybori-groebner.pc"),
-+ libgbShared, build_pcfile),
-+ env.Command(path.join(pkgconfigdirname,
-+ "polybori.pc"), libpbShared, build_pcfile)
-+ ]
-
-+ env.AlwaysBuild(pcfiles)
-+ env.Alias('install', pcfiles)
-
-
- env.Alias('prepare-devel', dylibs + stlibs + readabledevellibs)
diff --git a/debian/patches/series b/debian/patches/series
index 32873e4..72c3a3b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-0001-add-doc-Makefile-to-assist-cleaning.patch
-0002-customize-library-version.patch
-0003_support_pkgconfig.patch
-0004_SConstruct.patch
-0005_PolyGUI.patch
+0001-make-LIBRARY_VERSION-customizable.patch
+0002-Supporting-pkg-config-file.patch
+0003-Upstream-patch-for-broken-PolyGUI.patch
diff --git a/debian/rules b/debian/rules
index 6ef70c1..784f51c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,17 +59,19 @@ test-python%:
override_dh_auto_test: $(PYVERS:%=test-python%)
-override_dh_clean:
+override_dh_auto_clean:
+ # Manually cleaning, since upstream is broken (Called before patches apply, too.)
rm -f doc/tutorial/tutorial.4ct
rm -f doc/tutorial/tutorial.4tc doc/tutorial/tutorial.aux doc/tutorial/tutorial.dvi
rm -f doc/tutorial/tutorial.idv doc/tutorial/tutorial.l*g doc/tutorial/tutorial.tmp
- rm -f doc/tutorial/tutorial.xref doc/tutorial/tutorial.css
+ rm -f doc/tutorial/tutorial.xref doc/tutorial/tutorial.css
rm -f doc/tutorial/tutorial*.html
rm -f doc/python/polybori.*.html
rm -f M4RI/config.log
+
rm -rf $(PYVERS:%=debian/python-polybori%)
scons . --keep-going --clean || true
- dh_clean
+ dh_auto_clean
rm -f debian/stamp-scons-build
rm -f stamp-*
rm -rf .sconf_temp/
--
polybori: Polynomials over Boolean Rings
More information about the debian-science-commits
mailing list