[SCM] conflict-driven nogood learning answer set solver branch, master, updated. f257439c54de95981d27f374a7de68bc45df072a

Thomas Krennwallner tkren at kr.tuwien.ac.at
Sun Sep 25 19:18:22 UTC 2011 

The following commit has been merged in the master branch:
commit f257439c54de95981d27f374a7de68bc45df072a
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Sun Sep 25 21:07:30 2011 +0200

    Fix libtbb-dev Build-Depends.

diff --git a/debian/changelog b/debian/changelog
index 480e093..9f2692c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+clasp (2.0.3-3) unstable; urgency=low
+
+  * debian/control: Do not Build-Depends on libtbb-dev with i386, see
+    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=642248.
+  * debian/copyright: Fix obsolete-field-in-dep5-copyright and
+    unversioned-copyright-format-uri lintian warnings.
+  * debian/rules: Only set WITH_TBB for amd64, ia64, ppc64.
+
+ -- Thomas Krennwallner <tkren at kr.tuwien.ac.at>  Sun, 25 Sep 2011 21:05:22 +0200
+
 clasp (2.0.3-2) unstable; urgency=low
 
   * Bug fixed with new upstream release: "Segfaults with --pre argument
@@ -8,7 +18,7 @@ clasp (2.0.3-2) unstable; urgency=low
 clasp (2.0.3-1) unstable; urgency=low
 
   * New upstream release.
-  * copyright: Fix year.
+  * debian/copyright: Fix year.
 
  -- Thomas Krennwallner <tkren at kr.tuwien.ac.at>  Wed, 24 Aug 2011 10:12:53 +0200
 
@@ -21,19 +31,19 @@ clasp (2.0.2-1ubuntu1~oneiric1) oneiric; urgency=low
 clasp (2.0.2-1) unstable; urgency=low
 
   * New upstream release.
-  * patches/clasp-ld-as-needed.patch: Remove.
+  * debian/patches/clasp-ld-as-needed.patch: Remove.
 
  -- Thomas Krennwallner <tkren at kr.tuwien.ac.at>  Fri, 01 Jul 2011 05:25:39 +0200
 
 clasp (2.0.1-2) unstable; urgency=low
 
-  * control: Setup as Debian Science project.
+  * debian/control: Setup as Debian Science project.
     - Set Maintainer to Debian Science Maintainers and Uploaders to Thomas
       Krennwallner.
     - Set DM-Upload-Allowed to yes.
     - Convert bzr repository to git and use Vcs-Git and Vcs-Browser
     accourdingly.
-  * patches/clasp-ld-as-needed.patch: Bug fix: "FTBFS with ld
+  * debian/patches/clasp-ld-as-needed.patch: Bug fix: "FTBFS with ld
     --as-needed", thanks to stefanor at debian.org; (Closes: #631270).
 
  -- Thomas Krennwallner <tkren at kr.tuwien.ac.at>  Wed, 22 Jun 2011 19:44:48 +0200
@@ -41,22 +51,25 @@ clasp (2.0.1-2) unstable; urgency=low
 clasp (2.0.1-1) unstable; urgency=low
 
   * New upstream release.
-  * control: Bump Standards-Version to 3.9.2.
-  * patches/clasp-istreameof.patch,patches/clasp-rpath.patch: Remove.
-  
+  * debian/control: Bump Standards-Version to 3.9.2.
+  * debian/patches/clasp-istreameof.patch debian/patches/clasp-rpath.patch:
+    Remove.
+
  -- Thomas Krennwallner <tkren at kr.tuwien.ac.at>  Wed, 27 Apr 2011 10:50:10 +0200
 
 clasp (2.0.0-3) unstable; urgency=low
 
-  * patches/clasp-istreameof.patch: Fix unsigned conversion bug. (Closes:
-    #623850)
-  * control: Conditionally Build-Depends on libtbb-dev, it is only
+  * debian/patches/clasp-istreameof.patch: Fix unsigned conversion
+    bug. (Closes: #623850)
+  * debian/control: Conditionally Build-Depends on libtbb-dev, it is only
     available on amd64,i386,ia64,ppc64.
-  * patches/clasp-makefile.patch: Allow for non-multithreading builds and
-    install clasp.
-  * rules: Check for linux amd64,i386,ia64,ppc64 and invoke make accourdingly.
-  * install: Remove as we cannot know where we are going to build upfront.
-  * watch: Fix lintian debian-watch-contains-dh_make-template.
+  * debian/patches/clasp-makefile.patch: Allow for non-multithreading
+    builds and install clasp.
+  * debian/rules: Check for linux amd64,i386,ia64,ppc64 and invoke make
+    accourdingly.
+  * debian/install: Remove as we cannot know where we are going to build
+    upfront.
+  * debian/watch: Fix lintian debian-watch-contains-dh_make-template.
 
  -- Thomas Krennwallner <tkren at kr.tuwien.ac.at>  Sat, 23 Apr 2011 12:30:18 +0200
 
@@ -69,10 +82,12 @@ clasp (2.0.0-2) unstable; urgency=low
 clasp (2.0.0-1~maverick1) maverick; urgency=low
 
   * New upstream release.
-  * patches/clasp-makefile.patch: Refreshed for multi-threading support.
-  * patches/clasp-rpath.patch: Fix lintian error binary-or-shlib-defines-rpath.
-  * control: Build-Depends on libtbb-dev.
-  * install: Install MT binary.
+  * debian/patches/clasp-makefile.patch: Refreshed for multi-threading
+    support.
+  * debian/patches/clasp-rpath.patch: Fix lintian error
+    binary-or-shlib-defines-rpath.
+  * debian/control: Build-Depends on libtbb-dev.
+  * debian/install: Install MT binary.
 
  -- Thomas Krennwallner <tkren at kr.tuwien.ac.at>  Thu, 21 Apr 2011 19:35:27 +0200
 
@@ -84,7 +99,7 @@ clasp (1.3.8-1~maverick1) maverick; urgency=low
 
 clasp (1.3.7-2) unstable; urgency=low
 
-  * copyright: Convert to DEP-5 format and add missing licenses.
+  * debian/copyright: Convert to DEP-5 format and add missing licenses.
 
  -- Thomas Krennwallner <tkren at kr.tuwien.ac.at>  Mon, 28 Feb 2011 17:44:55 +0100
 
@@ -109,7 +124,7 @@ clasp (1.3.6-2) unstable; urgency=low
 clasp (1.3.6-1~maverick1) maverick; urgency=low
 
   * New upstream version.
-  * Fix copyright information.
+  * debian/copyright: Fix copyright information.
 
  -- Thomas Krennwallner <tkren at kr.tuwien.ac.at>  Fri, 19 Nov 2010 21:42:10 +0100
 
diff --git a/debian/control b/debian/control
index 7473e4e..41a2488 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: extra
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~),
- libtbb-dev [amd64 i386 ia64 ppc64]
+Build-Depends: debhelper (>= 8.0.0),
+ libtbb-dev [amd64 ia64 ppc64]
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/debian-science/packages/clasp.git
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/clasp.git
diff --git a/debian/copyright b/debian/copyright
index ba4a3ee..c2c2554 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
 Upstream-Name: clasp
 Upstream-Contact: Benjamin Kaufmann <kaufmann at cs.uni-potsdam.de>
 Source: http://sourceforge.net/projects/potassco/files/clasp/
diff --git a/debian/rules b/debian/rules
index 7567706..8d6cd5b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,18 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# compile with libtbb-dev on linux intel/ppc architectures
-arch = $(shell dpkg-architecture -qDEB_BUILD_ARCH | egrep "(amd64|i386|ia64|ppc64)")
+# compile with libtbb-dev only with linux 64bit intel/ppc architectures,
+# fallback in pentium4 processors is not implemented, see also note of
+# libtbb-dev:
+#
+# Note: if you are a user of the i386 architecture, i.e., 32-bit Intel
+# or compatible hardware, this package only supports Pentium4-compatible
+# and higher processors.
+#
+arch = $(shell dpkg-architecture -qDEB_BUILD_ARCH | egrep "(amd64|ia64|ppc64)")
 os = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS | grep linux)
 
 with_tbb := no

-- 
conflict-driven nogood learning answer set solver

More information about the debian-science-commits mailing list