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

[Thomas Krennwallner]

The following commit has been merged in the master branch:
commit 6125016b9787543920fe0c79633e2bb6f0af7856
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Tue Nov 29 19:00:41 2011 +0100

    New upstream release.

diff --git a/debian/changelog b/debian/changelog
index fd5ab87..f285505 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+clasp (2.0.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/rules: Override all standard targets.
+  * debian/patches/clasp-makefile.patch: Remove.
+
+ -- Thomas Krennwallner <tkren at kr.tuwien.ac.at>  Tue, 29 Nov 2011 18:29:33 +0100
+
 clasp (2.0.3-4ubuntu1~oneiric1) oneiric; urgency=low
 
   * Upload to ppa:~tkren/asp.
diff --git a/debian/patches/clasp-makefile.patch b/debian/patches/clasp-makefile.patch
deleted file mode 100644
index eb050ba..0000000
--- a/debian/patches/clasp-makefile.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
-Description: Add top-level Makefile.
-Index: clasp-2.0.0/Makefile
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ clasp-2.0.0/Makefile	2011-04-23 13:16:26.302068996 +0200
-@@ -0,0 +1,25 @@
-+.PHONY: all clean install
-+
-+CONFIGPARMS = --prefix=/usr --with-claspre
-+
-+ifeq ($(WITH_TBB), yes)
-+TOPBUILDDIR = build/release_mt
-+CONFIGPARMS += --with-mt TBB_INCLUDE=/usr/include TBB_LIB=/usr/lib
-+else
-+TOPBUILDDIR = build/release
-+endif
-+
-+CLASP = $(TOPBUILDDIR)/bin/clasp
-+
-+all: $(CLASP)
-+
-+$(CLASP):
-+	./configure.sh $(CONFIGPARMS)
-+	$(MAKE) -C $(TOPBUILDDIR)
-+
-+clean:
-+	rm -rf build
-+
-+install: $(CLASP)
-+	install -d $(DESTDIR)/usr/bin
-+	cp -a $(CLASP) $(DESTDIR)/usr/bin
diff --git a/debian/patches/series b/debian/patches/series
index 7b9845c..b31f497 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-clasp-makefile.patch
 clasp-manpage.patch
diff --git a/debian/rules b/debian/rules
index 8d6cd5b..92659c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,22 +15,32 @@
 arch = $(shell dpkg-architecture -qDEB_BUILD_ARCH | egrep "(amd64|ia64|ppc64)")
 os = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS | grep linux)
 
-with_tbb := no
+CONFIGPARMS = --prefix=/usr --with-claspre
+TOPBUILDDIR = build/release
 ifeq ($(and $(if $(os),good), $(if $(arch),good)), good)
-	with_tbb := yes
+	CONFIGPARMS += --with-mt TBB_INCLUDE=/usr/include TBB_LIB=/usr/lib
+	TOPBUILDDIR = build/release_mt
 endif
 
 
 %:
 	dh $@
 
-# add WITH_TBB as parameter to make
+# call ./configure.sh $(CONFIGPARMS)
+override_dh_auto_configure:
+	./configure.sh $(CONFIGPARMS)
+
+# build in $(TOPBUILDDIR)
 override_dh_auto_build:
-	dh_auto_build -- WITH_TBB=$(with_tbb)
+	dh_auto_build --builddirectory=$(TOPBUILDDIR)
 
-# add WITH_TBB as parameter to make install
+# install clasp binary built in $(TOPBUILDDIR)
 override_dh_auto_install:
-	dh_auto_install -- WITH_TBB=$(with_tbb)
+	dh_auto_install --builddirectory=$(TOPBUILDDIR) -- INSTALL_DIR=$(CURDIR)/debian/clasp/usr/bin
+
+# remove the whole build dir
+override_dh_auto_clean:
+	rm -rf ./build
 
 # install CHANGES as changelog
 override_dh_installchangelogs:

-- 
conflict-driven nogood learning answer set solver