Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock aspcud_2011.03.17.dfsg-6. The version currently in testing (-4) has an RC bug #686356 which is fixed in version (-5) of the package, but that package had some accidential changes which are fixed in (-6). About bug #686356: this fixes an incompatibility with clasp 2.1 which is in sid, while the version (-4) currently in testing works fine with the version 2.0 of clasp currently in testing. However, this may cause trouble in future upgrades from wheezy. The solution adopted is a patch provided by upstream which makes aspcud work with both versions of clasp (2.0 and 2.1). Debdiff between (-6) and (-4) is attached. Besides the mentionend patch it contains minor fixes to debian/copyright. Cheers -Ralf. -- Ralf Treinen Laboratoire Preuves, Programmes et Systèmes Université Paris Diderot, Paris, France. http://www.pps.univ-paris-diderot.fr/~treinen/ =====> New email address: trei...@pps.univ-paris-diderot.fr <=====
diff -Nru aspcud-2011.03.17.dfsg/debian/changelog aspcud-2011.03.17.dfsg/debian/changelog --- aspcud-2011.03.17.dfsg/debian/changelog 2012-05-15 04:09:42.000000000 +0900 +++ aspcud-2011.03.17.dfsg/debian/changelog 2012-09-07 10:43:31.000000000 +0900 @@ -1,3 +1,24 @@ +aspcud (2011.03.17.dfsg-6) unstable; urgency=low + + * Restored build-dependency on libboost-dev which was accidentially + changed in the last upload. + * Restored changelog-entry of version 2011.03.17.dfsg-4 that was + accidentially mangled in the upload of 2011.03.17.dfsg-5. + + -- Ralf Treinen <trei...@debian.org> Fri, 07 Sep 2012 10:33:50 +0900 + +aspcud (2011.03.17.dfsg-5) unstable; urgency=low + + * Patch clasp-2.1-apichange: make aspcud work both with clasp 2.0 and + clasp 2.1. Thanks a lot to Roland Kaminski for the patch + (closes: #686356). + * debian/copyright: + - Fixed typo (Licence -> License) + - separate paragraph for the GPL3 license + - text of the "public domain" license. + + -- Ralf Treinen <trei...@debian.org> Sun, 02 Sep 2012 22:54:51 +0900 + aspcud (2011.03.17.dfsg-4) unstable; urgency=low * Replace build-dependency on libboost1.46-dev by libboost-dev (closes: diff -Nru aspcud-2011.03.17.dfsg/debian/copyright aspcud-2011.03.17.dfsg/debian/copyright --- aspcud-2011.03.17.dfsg/debian/copyright 2012-05-15 04:15:26.000000000 +0900 +++ aspcud-2011.03.17.dfsg/debian/copyright 2012-09-07 10:37:22.000000000 +0900 @@ -3,7 +3,7 @@ Upstream-Contact: Roland Kaminski <kamin...@cs.uni-potsdam.de> Source: https://potassco.svn.sourceforge.net/svnroot/potassco/trunk/aspcud/ Copyright: 2010, Roland Kaminski <kamin...@cs.uni-potsdam.de> -Licence: GPL-3+ +License: GPL-3+ Comment: cmake/macros.cmake has been removed from the tarball since it has a BSD licence. @@ -12,9 +12,8 @@ License: GPL-3+ Files: lemon/* -Copyright: disclaimed by the author License: public-domain - The author of this program disclaims copyright. + The author disclaims copyright to this source code. Files: libprogram_opts/* Copyright: 2006-2007, Benjamin Kaufmann @@ -44,6 +43,3 @@ On Debian systems, the full text of the GNU General Public License version 3 can be found in the file `/usr/share/common-licenses/GPL-3'. - - - diff -Nru aspcud-2011.03.17.dfsg/debian/patches/clasp-2.1-apichange aspcud-2011.03.17.dfsg/debian/patches/clasp-2.1-apichange --- aspcud-2011.03.17.dfsg/debian/patches/clasp-2.1-apichange 1970-01-01 09:00:00.000000000 +0900 +++ aspcud-2011.03.17.dfsg/debian/patches/clasp-2.1-apichange 2012-09-02 16:17:08.000000000 +0900 @@ -0,0 +1,16 @@ +diff -rup aspcud_2011.03.17.dfsg.orig/scripts/aspcud.sh aspcud_2011.03.17.dfsg/scripts/aspcud.sh +--- aspcud_2011.03.17.dfsg.orig/scripts/aspcud.sh 2011-03-14 17:52:27.000000000 +0100 ++++ aspcud_2011.03.17.dfsg/scripts/aspcud.sh 2012-09-01 13:00:35.000000000 +0200 +@@ -62,7 +62,11 @@ base="$(dirname "$(readlink -f "$0")")" + PATH=".:$base:$base/../build/release/bin:$PATH" + + # default options +-clasp_opts_def=( "--opt-he=1" "--sat" "--restarts=32" "--heu=VSIDS" "--restart-o" "--opt-hi=2" ) ++if clasp -v | grep -q "clasp 2.0"; then ++ clasp_opts_def=( "--opt-he=1" "--sat" "--restarts=32" "--heu=VSIDS" "--restart-o" "--opt-hi=2" ) ++else ++ clasp_opts_def=( "--opt-he=1" "--sat" "--restarts=L,32" "--heu=VSIDS" "--restart-o" "--opt-hi=2" ) ++fi + gringo_opts_def=( "$(enc configuration.lp)" "$(enc optimize-define.lp)" ) + + cudf_opts=( ) diff -Nru aspcud-2011.03.17.dfsg/debian/patches/series aspcud-2011.03.17.dfsg/debian/patches/series --- aspcud-2011.03.17.dfsg/debian/patches/series 2011-05-04 05:21:50.000000000 +0900 +++ aspcud-2011.03.17.dfsg/debian/patches/series 2012-09-02 16:18:30.000000000 +0900 @@ -1,3 +1,4 @@ pathes no-cmake-macros gcc4.6 +clasp-2.1-apichange