[SCM] polybori: Polynomials over Boolean Rings branch, master, updated. upstream/0.8.2-50-ge095127

Tue Jan 8 10:23:28 UTC 2013

The following commit has been merged in the master branch:
commit 17c02faed663451428e790b62472d5808674c65e
Author: Alexander Dreyer <adreyer at gmx.de>
Date:   Tue Jan 8 09:26:47 2013 +0100

    Fixed minor issues from todo list

diff --git a/debian/changelog b/debian/changelog
index f7e1f40..6fee134 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,21 +1,12 @@
-polybori (0.8.2-1~exp1) unstable; urgency=low
+polybori (0.8.2-1~exp1) experimental; urgency=low
 
   * Updating to recent Debian standards
+    - supported by Frédéric-Emmanuel Picca <picca at debian.org>
+  * Packaging of PolyBoRi 0.8 by Felix Salfelder <felix at salfelder.org>
+    - new upstream release
+    - expected to work with gcc-4.7
 
- -- Alexander Dreyer <adreyer at gmx.de>  Mon, 17 Dec 2012 23:55:17 +0100
-
-polybori (0.8.2-1~exp0) unstable; urgency=low
- 
-  * New upstream release
-  * expected to work with gcc-4.7
-
- -- Felix Salfelder <felix at salfelder.org>  Mon, 06 Aug 2012 23:16:53 +0200
-
-polybori (0.8-0) unstable; urgency=low
-
-  * New version of the PolyBoRi framework.
-
- -- Alexander Dreyer <adreyer at gmx.de>  Tue, 23 Aug 2011 12:30:00 +0100
+ -- Alexander Dreyer <adreyer at gmx.de>  Tue, 8 Jan 2013 09:31:12 +0100
 
 polybori (0.5~rc1-2.1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index a804c0d..de2bf71 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Priority: extra
 Build-Depends: debhelper (>= 9),
                patchutils,
                scons,
-               python-setuptools,
                libboost-dev,
                libboost-python-dev,
                libm4ri-dev (>= 20120613),
@@ -17,7 +16,6 @@ Build-Depends: debhelper (>= 9),
 Standards-Version: 3.9.3
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/polybori.git
 Vcs-Git: git://git.debian.org/git/debian-science/packages/polybori.git
-DM-Upload-Allowed: yes
 Homepage: http://polybori.sourceforge.net/
 X-Python-Version: >= 2.6
 
@@ -94,6 +92,8 @@ Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
          libpolybori-0.8-2 (= ${binary:Version}),
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: polynomials over Boolean Rings, core development files
  The core of PolyBoRi is a C++ library, which provides high-level data
  types for Boolean polynomials and monomials, exponent vectors, as
@@ -113,7 +113,8 @@ Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Pre-Depends: multiarch-support
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Suggests: polybori-doc (= ${binary:Version})
 Description: polynomials over Boolean Rings, shared library
  The core of PolyBoRi is a C++ library, which provides high-level data
@@ -129,12 +130,14 @@ Description: polynomials over Boolean Rings, shared library
  .
  This package contains the PolyBoRi shared library libpolybori.
 
-Package: libpolybori-dbg
+Package: libpolybori-0.8-2-dbg
 Architecture: any
 Section: debug
 Priority: extra
 Depends: ${misc:Depends},
-         libpolybori-dev (= ${binary:Version})
+         libpolybori-0.8-2 (= ${binary:Version})
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: polynomials over Boolean Rings, debug symbols for shared libraries
  The core of PolyBoRi is a C++ library, which provides high-level data
  types for Boolean polynomials and monomials, exponent vectors, as
@@ -181,7 +184,8 @@ Depends: ${shlibs:Depends},
 Breaks:  libpolybori (<< 0.8)
 Replaces: libpolybori (<< 0.8)
 Suggests: polybori-doc (= ${binary:Version})
-Pre-Depends: multiarch-support
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 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
@@ -196,12 +200,14 @@ Description: polynomials over Boolean Rings, shared library
  .
  This package contains the PolyBoRi shared library libpolybori_groebner.
 
-Package: libpolybori-groebner-dbg
+Package: libpolybori-groebner-0.8-2-dbg
 Architecture: any
 Section: debug
 Priority: extra
 Depends: ${misc:Depends},
-         libpolybori-groebner-dev (= ${binary:Version})
+         libpolybori-groebner-0.8-2 (= ${binary:Version})
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: polynomials over Boolean Rings, debug symbols for libpolybori-groebner
  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/copyright b/debian/copyright
index 76a602f..10909d6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,6 +6,7 @@ Source: http://polybori.sourceforge.net/
 Files: debian/*
 Copyright: 2008, Tim Abbott <tabbott at mit.edu>
            2012, Felix Salfelder <felix at salfelder.org>
+           2012-2013, Frédéric-Emmanuel Picca <picca at debian.org>
            2008-2012, Alexander Dreyer <adreyer at gmx.de>
 License: permissive
  Copying and distribution of this package, with or without
@@ -13,10 +14,13 @@ License: permissive
  provided the copyright notice and this notice are
  preserved.
 
-
 Files: Cudd/*
-Copyright: 1995-2004, Fabio Somenzi <fabio at colorado.edu>
-License: BSD-3
+Upstream-Contact: Fabio Somenzi <fabio at colorado.edu>
+Copyright: 1995-2012, Regents of the University of Colorado
+Comment: Patched version of The PolyBoRi Team.
+  In addition, to ensure Debian Free Software Guidelines (DFSG)
+  several files were dropped from the original CUDD distribution.
+License: BSD-3-clause
  Copyright (c) 1995-2004, Regents of the University of Colorado
  .
  All rights reserved.
@@ -67,9 +71,10 @@ License: GPL-2+
  Public License can be found in `/usr/share/common-licenses/GPL'.
 
 Files: *
+Upstream-Contact: Alexander Dreyer <adreyer at gmx.de>
 Copyright: 2006-2012, Michael Brickenstein <brickenstein at mfo.de>
            2006-2012, Alexander Dreyer <adreyer at gmx.de>
-           2006-2012, The PolyBoRi Team <polybori at mfo.de>
+           2006-2012, The PolyBoRi Team
 License: GPL-2+
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public
diff --git a/debian/libpolybori-0.5.0-0.install b/debian/libpolybori-0.5.0-0.install
deleted file mode 100644
index 6341bad..0000000
--- a/debian/libpolybori-0.5.0-0.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/*.so.* usr/lib/
diff --git a/debian/libpolybori-0.8-2.symbols b/debian/libpolybori-0.8-2.symbols
index 8a320ff..2f56c09 100644
--- a/debian/libpolybori-0.8-2.symbols
+++ b/debian/libpolybori-0.8-2.symbols
@@ -1,4 +1,4 @@
-libpolybori-0.8.so.2 libpolybori-0.8 #MINVER#
+libpolybori-0.8.so.2 libpolybori-0.8-2 #MINVER#
  _Z10error_textP15pbori_DdManager at Base 0.8.2
  _ZN5boost13intrusive_ptrI15pbori_DdManagerED1Ev at Base 0.8.2
  _ZN5boost13intrusive_ptrI15pbori_DdManagerED2Ev at Base 0.8.2
diff --git a/debian/libpolybori-groebner-0.8-2.symbols b/debian/libpolybori-groebner-0.8-2.symbols
index a62e84c..ae70c61 100644
--- a/debian/libpolybori-groebner-0.8-2.symbols
+++ b/debian/libpolybori-groebner-0.8-2.symbols
@@ -1,4 +1,4 @@
-libpolybori_groebner-0.8.so.2 libpolybori-groebner-0.8 #MINVER#
+libpolybori_groebner-0.8.so.2 libpolybori-groebner-0.8-2 #MINVER#
  _ZN5boost13intrusive_ptrI15pbori_DdManagerED1Ev at Base 0.8.2
  _ZN5boost13intrusive_ptrI15pbori_DdManagerED2Ev at Base 0.8.2
  _ZN5boost13intrusive_ptrIN8polybori9CCuddCoreEED1Ev at Base 0.8.2
diff --git a/debian/rules b/debian/rules
index 784f51c..69ecc3e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,8 @@
 
 # DH_VERBOSE=1
 
+PBORIVER=0.8
+PBORIREL=2
 PYVERS=$(shell pyversions -vr)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 NUMJOBS=$(filter parallel=%,$(DEB_BUILD_OPTIONS))
@@ -13,7 +15,7 @@ SCONSPARFLAGS=$(subst parallel=,-j, $(NUMJOBS))
 
 build-python%: TMPDEST=debian/tmp/
 build-python%: PYTHON=/usr/bin/python$*
-build-python%: PYTHONSITE=`/usr/bin/python$* -c 'import setuptools; print setuptools.distutils.sysconfig.get_python_lib() '`
+build-python%: PYTHONSITE=`/usr/bin/python$* -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib() '`
 
 override_dh_auto_configure:
 
@@ -26,7 +28,7 @@ build-python%:
 		CCFLAGS="$(CPPFLAGS)" \
 		CFLAGS="$(CFLAGS)" \
 		CXXFLAGS="$(CXXFLAGS)" \
-		LIBRARY_VERSION="2.0.0" SHLIBVERSIONSUFFIX='-0.8.so.2.0.0' \
+		LIBRARY_VERSION="${PBORIREL}.0.0" SHLIBVERSIONSUFFIX='-${PBORIVER}.so.${PBORIREL}.0.0' \
 		DEVEL_LIB_PREFIX=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH) \
 		PKGCONFIGPATH=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/ TMPINSTALLDIR=$(TMPDEST)
 
@@ -46,7 +48,7 @@ install-python%:
 		CCFLAGS="$(CPPFLAGS)" \
 		CFLAGS="$(CFLAGS)" \
 		CXXFLAGS="$(CXXFLAGS)" \
-		LIBRARY_VERSION="2.0.0" SHLIBVERSIONSUFFIX='-0.8.so.2.0.0' \
+		LIBRARY_VERSION="${PBORIREL}.0.0" SHLIBVERSIONSUFFIX='-${PBORIVER}.so.${PBORIREL}.0.0' \
 		DEVEL_LIB_PREFIX=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH) \
                 PKGCONFIGPATH=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/ TMPINSTALLDIR=$(TMPDEST)
 
@@ -59,8 +61,8 @@ test-python%:
 
 override_dh_auto_test: $(PYVERS:%=test-python%)
 
+# Manually cleaning, since upstream is broken (Called before patches apply, too.)
 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
@@ -68,7 +70,6 @@ override_dh_auto_clean:
 	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_auto_clean
@@ -81,9 +82,12 @@ override_dh_auto_clean:
 
 
 override_dh_strip:
-	dh_strip --exclude=groebner --exclude=PyPolyBoRi -plibpolybori-dev --dbg-package=libpolybori-dbg -a 
-	dh_strip --exclude=PyPolyBoRi -plibpolybori-groebner-dev  --dbg-package=libpolybori-groebner-dbg -a
-	dh_strip -ppython-polybori -a
+	dh_strip -plibpolybori-${PBORIVER}-${PBORIREL} \
+	  --dbg-package=libpolybori-${PBORIVER}-${PBORIREL}-dbg
+	dh_strip -plibpolybori-groebner-${PBORIVER}-${PBORIREL} \
+	  --dbg-package=libpolybori-groebner-${PBORIVER}-${PBORIREL}-dbg
+	dh_strip -a -Nlibpolybori-${PBORIVER}-${PBORIREL} \
+	  -Nlibpolybori-groebner-${PBORIVER}-${PBORIREL}
 
 
 
diff --git a/debian/todo b/debian/todo
index da0461c..865a65d 100644
--- a/debian/todo
+++ b/debian/todo
@@ -3,45 +3,61 @@ packaging
 
 - please remove DM-Upload-Allowed: yes.
   the procedure changed.
+  > done
 
 - full license check with at least licensecheck. Each file of the
   package should have the right copyright informations. (this is also
   why embedded libraries is a pain)
+  > I double checked and found files in Cudd, which have inclear licenses. 
+    We do not need them, so I removed them and added a Comment to
+    debian/copyright. 
 
 - 0005_PolyGUI.patch was commited applyed into the master branch. It
   would be nice to use gbp-pq to produce the patch series.
+  > The repo is not switched to gbp-pq (was git-gdm, but not consistently)
 
 - deal with all remaining bugs from debbug
 
 - replace Pre-Depends: multiarch-support by Pre-Depends:
   ${misc:Pre-Depends}
+  > done
 
 - add Multi-Arch: same where needed. libpolybori-0.8-2,
   libpolybori-groebner-0.8-2
-
+  > done
+  
 - add Pre-Depends and Multi-Arch to -dev packages and also the -dbg
   one
+  > done
 
 - if ipbori could be replace by an ipython profile, maybe install this
   profile under python-polybori binary package and remove the polybori
   package.
+  > This is not possible, since ipbori does more that a profile could do.
+    For instance, it supports various versions of ipython, which the profile
+    syntax just cannot do.
 
 - check that the changelog is ok, 0.8-0, 0.8.2-1~exp0 and 0.8.2-1~exp1
   but I have no trace of those 0.8-0 and 0.8.2-1~exp0 into the Debian
   archive. So fix this by merging the three entries into only one.
   0.8.2-1~exp1 and target experimental instead of unstable
+  > Indeed we did not mange to make those variants official, so all three
+     entries are menged into one now. It's also "experimental" now.
 
 - remove libpolybori-0.5.0-0.install from the repository
   (maybe this is just in my own repo ;)
+  > done
 
 - please use the same name for the symbol files and the the library one.
   libpolybori-0.8.symbols -> libpolybori-0.8-2.symbols
   idem for the other library.
+  > done
 
 - in the symbols files you use the wrong version number
    _Z10error_textP15pbori_DdManager at Base 0.8 this should be the
    package version (changelog) without the debian version. In your
    case 0.8.2
+   > done (Thanks for the hint!)
 
 - instread of
  override_dh_strip:
@@ -58,6 +74,8 @@ packaging
  this seems to me cleaner. (beware to use the right -dbg package name
  and change them in the control file).
 
+ > done
+
 - once done with the control file it would be very good to check with
   debian-l10n-english for it's correctness. You can send an email to
   this mailing list (I do not remember exactly the name but you can
@@ -77,6 +95,7 @@ packaging
                python-all-dev
 
  it seems to me that libboost-dev, patchutils are useless
+>>>>>>>>TODO
 
  python-setuptools should be avoid if
  build-python%: PYTHONSITE=`/usr/bin/python$* -c 'import setuptools; print setuptools.distutils.sysconfig.get_python_lib() '`
@@ -84,8 +103,12 @@ packaging
  distutils where use instead
  build-python%: PYTHONSITE=`/usr/bin/python$* -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib() '`
 
+  > done
+ 
  you depends of hevea | tex4ht is it used by doxygen ?, if not you can remove it
 
+  > no, we have a LaTeX-based tutorial, which is converted to html
+
 - your package provide a arch: all package.  it would be nice in that
   case to create an indep part like this one:
 
@@ -108,19 +131,23 @@ packaging
  better when it comes to do binary NMU. the arch all part is not
  modified.
 
+  >>>>>>>>> TODO
 upstream
 --------
 
 - remove the embeded M4RI
 
 - Cudd package or not package ?
+  > no, we forked it, it's not compatible
 
 - some part of the python code do not follow the pep8 recommendations.
   indented with 2 spaces instead of 4.
 
+
 - why not using QtDesigner instead of hard coding the ui part ?
 
 - ipbori can be an ipython profile instead of a dedicated binary ?
+  > no (see above)
 
 - integrate the .desktop file in the upstream installation process.
   this way it can be usefull to other distributions.
@@ -128,4 +155,6 @@ upstream
 - rename polybori.pc into polybori-0.8.pc this is much more consistant
   with the current naming schema. idem for the other library.
 
-- maybe add an option for the documentation compilation only.
\ No newline at end of file
+  > done
+
+- maybe add an option for the documentation compilation only.

-- 
polybori: Polynomials over Boolean Rings

