[SCM] translates action languages into answer set programs branch, master, updated. 4bd91a858293b0cabef38ff11748f9145c2e512b

[Thomas Krennwallner]

The following commit has been merged in the master branch:
commit 4bd91a858293b0cabef38ff11748f9145c2e512b
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Mon Sep 5 10:53:30 2011 +0200

    Get rid off makefile patch.

diff --git a/debian/changelog b/debian/changelog
index e52681a..46b9cca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,19 @@
 coala (1.0.1-5) unstable; urgency=low
 
   * control: Setup as Debian Science project.
-    - Set Maintainer to Debian Science Maintainers and Uploaders to TK.
+    - 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.
-
- -- Thomas Krennwallner <tkren at kr.tuwien.ac.at>  Thu, 12 May 2011 18:05:03 +0200
+    - Convert bzr repository to git and use Vcs-Git and Vcs-Browser.
+      accourdingly.
+    - Build-Depends on debhelper >= 8.0.0.
+  * watch: Check SF downloads.
+  * patches/coala-makefile.patch,patches/series: Remove
+    coala-makefile.patch.
+  * install: Install coala and coala.bin.
+  * rules: Override configure, build, and clean.
+
+ -- Thomas Krennwallner <tkren at kr.tuwien.ac.at>  Mon, 05 Sep 2011 07:53:29 +0200
 
 coala (1.0.1-4~natty1) natty; urgency=low
 
diff --git a/debian/control b/debian/control
index 2a4137d..a378416 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ 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~),
+Build-Depends: debhelper (>= 8.0.0),
  cmake,
  bison++,
  flex
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..1d11915
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,2 @@
+bin/coala.bin usr/bin/
+bin/coala usr/bin/
diff --git a/debian/patches/coala-makefile.patch b/debian/patches/coala-makefile.patch
deleted file mode 100644
index c3586ad..0000000
--- a/debian/patches/coala-makefile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
-Description: Add top-level Makefile.
-Index: coala-1.0.0_src/Makefile
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ coala-1.0.0_src/Makefile	2010-10-08 08:09:46.000000000 +0200
-@@ -0,0 +1,23 @@
-+.PHONY: all clean install
-+
-+COALA=bin/coala
-+COALABIN=bin/coala.bin
-+
-+all: $(COALA) $(COALABIN)
-+
-+$(COALA):
-+
-+$(COALABIN):
-+	cd build; ./configure --prefix=/usr
-+	$(MAKE) -C build
-+
-+clean:
-+	rm -rf $(COALABIN)
-+	touch build/coala.clean
-+	find build -mindepth 1 -type f | grep -v configure | xargs rm -fv
-+	find build -mindepth 1 -maxdepth 1 -type d -exec rm -rv {} \;
-+
-+install: $(COALABIN) $(COALA)
-+	install -d $(DESTDIR)/usr/bin
-+	install -m 0755 $(COALABIN) $(DESTDIR)/usr/bin
-+	install -m 0755 $(COALA) $(DESTDIR)/usr/bin
diff --git a/debian/patches/series b/debian/patches/series
index 9260937..6a96c29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-coala-makefile.patch
 coala-manpages.patch
diff --git a/debian/rules b/debian/rules
index 955dd78..d3a981d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,3 +11,14 @@
 
 %:
 	dh $@
+
+override_dh_auto_configure:
+	cd build && ./configure --prefix=/usr
+
+override_dh_auto_build:
+	$(MAKE) -C build
+
+override_dh_auto_clean:
+	rm -rf bin/coala.bin
+	find build -mindepth 1 -type f | grep -v configure | xargs rm -fv
+	find build -mindepth 1 -maxdepth 1 -type d -exec rm -rf {} \;
diff --git a/debian/watch b/debian/watch
index 8def0b8..25fdb85 100644
--- a/debian/watch
+++ b/debian/watch
@@ -3,6 +3,7 @@
 # Compulsory line, this is a version 3 file
 version=3
 
-# Uncomment to examine a Webpage
-# <Webpage URL> <string match>
-http://www.cs.uni-potsdam.de/wv/coala/ coala-(.*)_src\.tar\.gz
+# qa.debian.org runs a redirector which allows a simpler form of URL
+# for SourceForge based projects. The format below will automatically
+# be rewritten to use the redirector.
+http://sf.net/potassco/coala-([\d\.]+)_src\.tar\.gz

-- 
translates action languages into answer set programs