[SCM] minisat+ packaging branch, master, updated. debian/1.0-1-4-g5092861

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 6ec87b9ff56731ef9052c68e19102ad1b4c4ce60
Author: Ralf Treinen <treinen at free.fr>
Date:   Tue May 24 20:36:02 2011 +0200

    use exitcode

diff --git a/debian/patches/exitcode b/debian/patches/exitcode
new file mode 100644
index 0000000..c642411
--- /dev/null
+++ b/debian/patches/exitcode
@@ -0,0 +1,39 @@
+Author: Niklas Sorensson <nik at chalmers.se> (extracted from upstream git)
+Approved: Ralf Treinen <treinen at debian.org>
+Description: use exitcode to indicate error
+
+Index: minisat+/Main.C
+===================================================================
+--- minisat+.orig/Main.C	2011-05-24 20:32:53.000000000 +0200
++++ minisat+/Main.C	2011-05-24 20:33:37.000000000 +0200
+@@ -261,7 +261,7 @@
+     reportf("*** TERMINATED ***\n");
+     outputResult(*pb_solver, false);
+     SatELite::deleteTmpFiles();
+-    _exit(pb_solver->best_goalvalue == Int_MAX ? 0 : 10); }
++    _exit(0); }
+ 
+ 
+ void printStats(BasicSolverStats& stats, double cpu_time)
+@@ -324,7 +324,7 @@
+         reportf("_______________________________________________________________________________\n");
+     }
+ 
+-    exit(pb_solver->best_goalvalue == Int_MAX ? 20 : (pb_solver->goal == NULL || opt_command == cmd_FirstSolution) ? 10 : 30);    // (faster than "return", which will invoke the destructor for 'PbSolver')
++    exit(0);    // (faster than "return", which will invoke the destructor for 'PbSolver')
+ }
+ 
+ 
+Index: minisat+/PbParser.C
+===================================================================
+--- minisat+.orig/PbParser.C	2011-05-24 20:32:53.000000000 +0200
++++ minisat+/PbParser.C	2011-05-24 20:33:37.000000000 +0200
+@@ -282,7 +282,7 @@
+             xfree(msg);
+             if (opt_satlive && !opt_try)
+                 printf("s UNKNOWN\n");
+-            exit(opt_try ? 5 : 0);
++            exit(5);
+         }else
+             throw msg;
+     }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9dd22c6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+exitcode

-- 
minisat+ packaging