[SCM] conflict-driven nogood learning answer set solver branch, master, updated. debian/2.0.6-2-2-g0c2d56c

[Thomas Krennwallner]

The following commit has been merged in the master branch:
commit 0c2d56c2b068ef202f4e2db073988a1ab468967e
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Wed Nov 28 10:39:21 2012 +0100

    New upstream release.

diff --git a/debian/changelog b/debian/changelog
index 514badc..8fc7e44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+clasp (2.1.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control: Bump Standards-Version to 3.9.4 and Build-Depends on
+    libtbb-dev >= 4.0+r233.
+  * debian/copyright: Update copyright years.
+
+ -- Thomas Krennwallner <tkren at kr.tuwien.ac.at>  Wed, 28 Nov 2012 10:35:53 +0100
+
 clasp (2.1.0-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index c3ef05f..f8f1591 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,8 @@ Uploaders: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 9),
  dpkg-dev (>= 1.16.1~),
- libtbb-dev (>= 3.0+r018) [amd64 ia64 ppc64]
-Standards-Version: 3.9.3.1
+ libtbb-dev (>= 4.0+r233) [amd64 ia64 ppc64]
+Standards-Version: 3.9.4
 Vcs-Git: git://git.debian.org/git/debian-science/packages/clasp.git
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/clasp.git
 Homepage: http://www.cs.uni-potsdam.de/clasp/
diff --git a/debian/copyright b/debian/copyright
index 9adb60f..ad28580 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,12 +5,12 @@ Source: http://sourceforge.net/projects/potassco/files/clasp/
 
 
 Files: *
-Copyright: 2006-2011, Benjamin Kaufmann
+Copyright: 2006-2012, Benjamin Kaufmann
 License: GPL-2+
 
 
 Files: debian/*
-Copyright: 2010-2011, Thomas Krennwallner
+Copyright: 2010-2012, Thomas Krennwallner
 License: GPL-2+
  This package was debianized by Thomas Krennwallner <tkren at kr.tuwien.ac.at>
  on Thu, 04 Mar 2010 19:31:51 +0100
@@ -22,7 +22,7 @@ License: GPL-2+
 Files: libclasp/clasp/satelite.h
 Copyright: 2003-2006, Niklas Een
            2003-2006, Niklas Sorensson
-           2006-2007, Benjamin Kaufmann
+           2006-2010, Benjamin Kaufmann
 License: MIT
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the
@@ -45,12 +45,7 @@ License: MIT
 
 
 Files: libprogram_opts/*
-Copyright: 2004, 2006-2007, Benjamin Kaufmann
-License: GPL-2+
-
-
-Files: libprogram_opts/program_opts/detail/smartpointer.h
-Copyright: 2004, Jean Gressmann
+Copyright: 2004, 2006-2007, 2010 Benjamin Kaufmann
 License: GPL-2+
 
 

-- 
conflict-driven nogood learning answer set solver