diff -Nru minisat2-2.2.1/debian/changelog minisat2-2.2.1/debian/changelog --- minisat2-2.2.1/debian/changelog 2013-07-12 20:42:53.000000000 +0000 +++ minisat2-2.2.1/debian/changelog 2014-07-30 09:54:31.000000000 +0000 @@ -1,3 +1,10 @@ +minisat2 (1:2.2.1-5) unstable; urgency=low + + * Fix C++ syntax to enable Clang builds (closes: #756336) + * Bumped standards version to 3.9.5 (no changes) + + -- Michael Tautschnig Wed, 30 Jul 2014 10:38:25 +0100 + minisat2 (1:2.2.1-4) unstable; urgency=low * Require a non-zero memory limit (closes: #716229) diff -Nru minisat2-2.2.1/debian/control minisat2-2.2.1/debian/control --- minisat2-2.2.1/debian/control 2013-07-12 20:47:35.000000000 +0000 +++ minisat2-2.2.1/debian/control 2014-07-30 09:54:17.000000000 +0000 @@ -3,7 +3,7 @@ Priority: extra Maintainer: Michael Tautschnig Build-Depends: debhelper (>= 9), libz-dev -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Homepage: http://minisat.se/ Vcs-Browser: http://github.com/niklasso/minisat Vcs-Git: git://gitorious.org/minisat-debian/minisat2.git diff -Nru minisat2-2.2.1/debian/patches/clang_build minisat2-2.2.1/debian/patches/clang_build --- minisat2-2.2.1/debian/patches/clang_build 1970-01-01 00:00:00.000000000 +0000 +++ minisat2-2.2.1/debian/patches/clang_build 2014-07-30 09:41:33.000000000 +0000 @@ -0,0 +1,44 @@ +Description: Fix C++ syntax to ensure build using Clang works + Using the patch I earlier applied in FShell + https://github.com/tautschnig/fshell/commit/7a2169aa7dc4719ae3df6a59555a32692696f74f + as it seemed simpler than the proposed patch in #756336 + . + minisat2 (1:2.2.1-5) unstable; urgency=low + . + * Fix C++ syntax to enable Clang builds (closes: #756336) +Author: Michael Tautschnig +Bug-Debian: http://bugs.debian.org/756336 + +--- +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: , +Bug: +Bug-Debian: http://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +--- minisat2-2.2.1.orig/minisat/core/SolverTypes.h ++++ minisat2-2.2.1/minisat/core/SolverTypes.h +@@ -47,7 +47,7 @@ struct Lit { + int x; + + // Use this as a constructor: +- friend Lit mkLit(Var var, bool sign = false); ++ friend Lit mkLit(Var var, bool sign); + + bool operator == (Lit p) const { return x == p.x; } + bool operator != (Lit p) const { return x != p.x; } +@@ -55,7 +55,7 @@ struct Lit { + }; + + +-inline Lit mkLit (Var var, bool sign) { Lit p; p.x = var + var + (int)sign; return p; } ++inline Lit mkLit (Var var, bool sign = false) { Lit p; p.x = var + var + (int)sign; return p; } + inline Lit operator ~(Lit p) { Lit q; q.x = p.x ^ 1; return q; } + inline Lit operator ^(Lit p, bool b) { Lit q; q.x = p.x ^ (unsigned int)b; return q; } + inline bool sign (Lit p) { return p.x & 1; } diff -Nru minisat2-2.2.1/debian/patches/series minisat2-2.2.1/debian/patches/series --- minisat2-2.2.1/debian/patches/series 2013-07-12 20:49:18.000000000 +0000 +++ minisat2-2.2.1/debian/patches/series 2014-07-30 09:40:05.000000000 +0000 @@ -1 +1,2 @@ memory_limit +clang_build