[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 a8add816c5bdffc209cf13d53c70aaa4b7b46566
Author: Ralf Treinen <treinen at free.fr>
Date:   Tue May 24 20:47:22 2011 +0200

    document exitcode in manpage, update changelog

diff --git a/debian/changelog b/debian/changelog
index a3a5080..5797733 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+minisat+ (1.0-2) unstable; urgency=low
+
+  * Patch exitcode: non-null exit code on parse error.
+
+ -- Ralf Treinen <treinen at debian.org>  Tue, 24 May 2011 20:42:23 +0200
+
 minisat+ (1.0-1) unstable; urgency=low
 
   * Initial package (closes: Bug#626410)
diff --git a/debian/patches/exitcode b/debian/patches/exitcode
index c642411..9469077 100644
--- a/debian/patches/exitcode
+++ b/debian/patches/exitcode
@@ -4,8 +4,8 @@ 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
+--- minisat+.orig/Main.C	2011-05-24 20:45:16.000000000 +0200
++++ minisat+/Main.C	2011-05-24 20:45:56.000000000 +0200
 @@ -261,7 +261,7 @@
      reportf("*** TERMINATED ***\n");
      outputResult(*pb_solver, false);
@@ -26,8 +26,8 @@ Index: minisat+/Main.C
  
 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
+--- minisat+.orig/PbParser.C	2011-05-24 20:45:16.000000000 +0200
++++ minisat+/PbParser.C	2011-05-24 20:45:56.000000000 +0200
 @@ -282,7 +282,7 @@
              xfree(msg);
              if (opt_satlive && !opt_try)
@@ -37,3 +37,16 @@ Index: minisat+/PbParser.C
          }else
              throw msg;
      }
+Index: minisat+/debian/minisat+.1
+===================================================================
+--- minisat+.orig/debian/minisat+.1	2011-05-24 20:45:15.000000000 +0200
++++ minisat+/debian/minisat+.1	2011-05-24 20:46:33.000000000 +0200
+@@ -89,5 +89,8 @@
+ trivially unsatisfiable then no file is written.
+ .PP
+ 
++.SS "EXIT CODES"
++If parsing of the input fails then the program exits with exit code 5.
++
+ .SH AUTHORS
+ Minisat+ was written by Niklas Een and Niklas Sorensson.

-- 
minisat+ packaging