[SCM] grounding tools for (disjunctive) logic programs branch, master, updated. 6dd3cb02ab8346ddf183ac9642f67b6ad3030b44

[Thomas Krennwallner]

The following commit has been merged in the master branch:
commit 14f61e83576afcdcecada4c51cde4f6810f7eec6
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Mon Sep 26 07:46:56 2011 +0200

    Fix lintian warnings.

diff --git a/debian/changelog b/debian/changelog
index 15505a4..62ee1ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,34 +1,45 @@
+gringo (3.0.3-7) unstable; urgency=low
+
+  * debian/copyright: Fix comma-separated-files-in-dep5-copyright,
+    obsolete-field-in-dep5-copyright and unversioned-copyright-format-uri
+    lintian warnings.
+
+ -- Thomas Krennwallner <tkren at kr.tuwien.ac.at>  Mon, 26 Sep 2011 07:46:14 +0200
+
 gringo (3.0.3-6) 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.
     - Build-Depends on debhelper >= 8.0.0.
-  * rules: Add override_dh_auto_build to get rid off
-    gringo-makefile.patch.
-  * patches/gringo-makefile.patch,patches/series: Remove
-    gringo-makefile.patch.
+  * debian/rules: Add override_dh_auto_build to get rid off
+    debian/patches/gringo-makefile.patch.
+  * debian/patches/gringo-makefile.patch debian/patches/series: Remove
+    debian/patches/gringo-makefile.patch.
     
  -- Thomas Krennwallner <tkren at kr.tuwien.ac.at>  Mon, 05 Sep 2011 13:21:51 +0200
 
 gringo (3.0.3-5~natty1) natty; urgency=low
 
-  * watch: Fix lintian debian-watch-contains-dh_make-template.
-  * control: Lower Priority to extra and bump Standards-Version to 3.9.2.
+  * debian/watch: Fix lintian debian-watch-contains-dh_make-template.
+  * debian/control: Lower Priority to extra and bump Standards-Version to
+    3.9.2.
 
  -- Thomas Krennwallner <tkren at kr.tuwien.ac.at>  Fri, 29 Apr 2011 07:11:12 +0200
 
 gringo (3.0.3-4) unstable; urgency=low
 
-  * control: Combine gringo, clingo, and iclingo binary packages into gringo.
+  * debian/control: Combine gringo, clingo, and iclingo binary packages
+    into gringo.
    + Conflicts and Replaces clingo and iclingo.
-  * copyright: Convert to DEP-5 format and add missing licenses.
-  * rules: Add override_dh_installchangelogs for CHANGES file.
-  * install: Install gringo, clingo and iclingo.
-  * Refresh gringo-makefile.patch; do not install anything here.
+  * debian/copyright: Convert to DEP-5 format and add missing licenses.
+  * debian/rules: Add override_dh_installchangelogs for CHANGES file.
+  * debian/install: Install gringo, clingo and iclingo.
+  * Refresh debian/patches/gringo-makefile.patch; do not install anything
+    here.
 
  -- Thomas Krennwallner <tkren at kr.tuwien.ac.at>  Tue, 22 Feb 2011 09:38:26 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 731d1cd..314642e 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: gringo
 Upstream-Contact: Roland Kaminski <kaminski at cs.uni-potsdam.de>
 Source: http://sourceforge.net/projects/potassco/files/gringo/
@@ -31,7 +31,7 @@ Copyright: 2009, Benjamin Kaufmann
 License: GPL-3+
 
 
-Files: app/gringo/gringo_app.*, app/gringo/gringo_options.*
+Files: app/gringo/gringo_app.* app/gringo/gringo_options.*
 Copyright: 2010, Arne König
            2010, Roland Kaminski
 License: GPL-3+
@@ -163,7 +163,7 @@ Copyright: 2003-2007, The Kepler Project
 License: MIT
 
 
-Files: libgringo/gringo/stats.h, libgringo/src/stats.cpp
+Files: libgringo/gringo/stats.h libgringo/src/stats.cpp
 Copyright: 2010, Arne König
 License: GPL-3+
 
diff --git a/debian/rules b/debian/rules
index 2c51695..bf61517 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,5 @@
 #!/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.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1

-- 
grounding tools for (disjunctive) logic programs