[SCM] dans-gdal-scripts branch, master, updated. upstream/0.18-9-ge36238d

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit e36238d3398a17a180679a6668064fbc086dd400
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue Feb 22 14:52:04 2011 +0100

    Minor changes for lintian cleaning and other minor fixes.

diff --git a/debian/changelog b/debian/changelog
index f9fcfe4..b385bb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+dans-gdal-scripts (0.18-2) unstable; urgency=low
+
+  * Fixed copyright-refers-to-deprecated-bsd-license-file lintian warning.
+  * Fixed quilt-patch-missing-description lintian warning in werror.
+  * Debhelper moved to level 8. No changes required.
+  * Now config.{sub|guess} are saved and restored to be idempotent
+    when running debian/rules on the repository by hand.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 22 Feb 2011 14:50:42 +0100
+
 dans-gdal-scripts (0.18-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/copyright b/debian/copyright
index b968af8..6cd237a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -41,9 +41,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 This code was developed by Dan Stahlke for the Geographic Information Network of Alaska.
 
-On Debian systems, the complete text of the BSD License can be
-found in `/usr/share/common-licenses/BSD'.
-
 The Debian packaging is:
 
     Copyright (C) 2009 Francesco Paolo Lovergine <frankie at debian.org>
diff --git a/debian/patches/werror b/debian/patches/werror
index 36ca2e1..272276c 100644
--- a/debian/patches/werror
+++ b/debian/patches/werror
@@ -1,7 +1,8 @@
+Removing -werror option at building time.
 Index: git/src/Makefile.in
 ===================================================================
---- git.orig/src/Makefile.in	2011-02-09 18:14:17.000000000 +0100
-+++ git/src/Makefile.in	2011-02-09 18:14:27.000000000 +0100
+--- git.orig/src/Makefile.in	2011-02-09 18:14:44.000000000 +0100
++++ git/src/Makefile.in	2011-02-22 14:44:05.000000000 +0100
 @@ -254,7 +254,7 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
diff --git a/debian/rules b/debian/rules
index 285347f..7244dc9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,10 +18,10 @@ config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
+	mv config.sub config.sub.original && cp -f /usr/share/misc/config.sub config.sub
 endif
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
+	mv config.guess config.guess.original && cp -f /usr/share/misc/config.guess config.guess
 endif
 	dh_auto_configure
 
@@ -41,6 +41,9 @@ clean:
 	# Add here commands to clean up after the build process.
 	dh_auto_clean	
 	rm -f config.sub config.guess
+	mv config.sub.original config.sub
+	mv config.guess.original config.guess
+	cp -f 
 	dh_clean 
 
 install: build

-- 
GDAL contributed tools by Geographic Information Network of Alaska