[SCM] minisat+ packaging branch, master, updated. upstream/2011.05.10-8-gfd4f82b

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 12c70174301f35f73e84e62db5146efa285ef79c
Author: Ralf Treinen <treinen at free.fr>
Date:   Tue May 10 17:01:47 2011 +0200

    set control fields as required bu debian-science policy. Update debian/copyright to reflect the actual MIT licence.

diff --git a/debian/control b/debian/control
index 71ec98e..51d9a92 100644
--- a/debian/control
+++ b/debian/control
@@ -1,20 +1,16 @@
 Source: minisat+
 Section: science
 Priority: extra
-Maintainer: Ralf Treinen <treinen at pps.jussieu.fr>
+Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
+Uploaders: Ralf Treinen <treinen at debian.org>
 Build-Depends: debhelper (>= 8)
 Standards-Version: 3.9.2
 Homepage: http://minisat.se/MiniSat+.html
-Vcs-Svn: https://gforge.info.ucl.ac.be/svn/mancoosi/trunk/updb/debian-packages/minisat+/trunk
-Vcs-Browser: https://gforge.info.ucl.ac.be/svn/mancoosi/trunk/updb/debian-packages/minisat+/trunk
+Vcs-Git: git://git.debian.org/git/debian-science/packages/minisat+.git
+Vcs-Browser: http://git.debian.org/?p=debian-science/packages/minisat+.git
 
 Package: minisat+
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: solver for pseudo_Boolean constraints
- MiniSat+ is a two-week hack done to enable MiniSat to compete in the
- new categories of the SAT 2005 competition. Initially, we intended to
- support both Pseudo-Boolean constraints (i.e. linear constraints over
- boolean variables) and circuit based SAT input (as opposed to
- CNF). However, after we finished the conversion of PB-constraints to
- SAT, we ran out of steam and never finished the other part.
+ MiniSat+ is a solver for Pseudo-Boolean constraints.
diff --git a/debian/copyright b/debian/copyright
index 543335c..c1cd404 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,30 @@
 Upstream-Name: copyright
 Upstream-Contact: Niklas Sorensson <nik at chalmers.se>
-Source: http://minisat.se/MiniSat+.html
-Copyright: Niklas Eén and Niklas Sörensson
+Source: https://github.com/niklasso/minisatp/archives/master
+Copyright: 2005-2010 Niklas Eén and Niklas Sörensson
 Licence: MIT 
+  Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
 
 Files: *
-Copyright: Niklas Eén and Niklas Sörensson
+Copyright:2005-2010  Niklas Eén and Niklas Sörensson
 Licence: MIT
 
 

-- 
minisat+ packaging