[SCM] grass branch, master, updated. upstream/6.4.0-7-gb56179c

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 8f0b091be21f46b7fab88fb16b555043c20a7944
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Feb 16 16:36:31 2011 +0100

    Manages better autoconf aux files.

diff --git a/debian/changelog b/debian/changelog
index f5e3353..692dd0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,8 +17,29 @@ grass (6.4.0-2) unstable; urgency=low
   * Removed obsolete grass-doc conflicts/replaces.
   * Moved to source format 3.0 and quilt patch support.
   * Moved from svn to git and updated Vcs-* fields in debian/control* as due.
+  * Merged experimental changelogs.
+  * Now saves and restores upstream config.{sub|guess} to avoid annoying warnings.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 14 Feb 2011 17:35:56 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 16 Feb 2011 16:34:50 +0100
+
+grass (6.4.0-1) experimental; urgency=low
+
+  * New upstream final release.
+  * Note that now default interface is the wx one, so (wx)python related suggestions
+    have been promoted to proper dependencies. For the same reason I would
+    consider cut/paste problems of the past Tk interface obsolete.
+    (closes: #305249)
+  * Policy bumped to 3.9.1. No changes required.
+  * Added libgdal1-dev dep to grass-dev list of dependencies.
+    (closes: #598706)
+  * Merged from 6.4.0~rc6+42329-3:
+         Added missing docs used by GUIs: AUTHORS, contributors CSV files,
+         COPYING and a symlink to GPL-2 license in /usr/share/common-licenses.
+         Those files need to be symlinked in GISBASE to be found at run-time.
+         Thanks AlanB and Hamish for pointing the problem.
+         (closes: #594492)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 14 Oct 2010 16:08:06 +0200
 
 grass (6.4.0~rc6+42329-3) unstable; urgency=low
 
@@ -60,6 +81,14 @@ grass (6.4.0~rc6+42329-3) unstable; urgency=low
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 21 Sep 2010 16:45:05 +0200
 
+grass (6.4.0~rc6+42329-2) experimental; urgency=low
+
+  * Now builds against Tcl/Tk 8.5.
+    (closes: #582595)
+  * Removed obsolete grass-doc conflicts/replaces.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 01 Jun 2010 14:38:01 +0200
+
 grass (6.4.0~rc6+42329-1) unstable; urgency=low
 
   * New upstream snapshot with some fixes in modules.
diff --git a/debian/rules b/debian/rules
index 379625a..d34a75e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,6 +41,16 @@ debian/% :: debian/%.in
 configure: config.status
 config.status: 
 	dh_testdir
+
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f config.sub config.sub.original
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f config.guess config.guess.original
+	cp -f /usr/share/misc/config.guess config.guess
+endif
+
 	# Add here commands to configure the package.
 	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
                     --prefix=/usr/lib \
@@ -76,37 +86,33 @@ config.status:
 build: configure build-stamp
 build-stamp:  
 	dh_testdir
-
 	$(MAKE) 
 	chmod 755 debian/fixpaths.sh debian/fixscripts.sh
-
 	touch $@
 
 # This target generates truly arch-indep stuff
 build-indep: configure build-indep-stamp
 build-indep-stamp: 
 	dh_testdir
-
 	$(MAKE) htmldocs
-
 	touch $@
 
 clean: templates true-clean 
 true-clean:
 	dh_testdir
 	dh_testroot
-
-	# Add here commands to clean up after the build process.
-	[ ! -f $(CURDIR)/include/Make/Platform.make ] || $(MAKE) distclean
-
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	[ ! -f $(CURDIR)/configure.in ] || cp -f /usr/share/misc/config.sub config.sub
+	
+ifneq "$(wildcard /usr/share/misc/config.sub.original)" ""
+	mv -f config.sub.original config.sub
 endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	[ ! -f $(CURDIR)/configure.in ] || cp -f /usr/share/misc/config.guess config.guess
+ifneq "$(wildcard /usr/share/misc/config.guess.original)" ""
+	mv -f config.guess.original config.guess
 endif
+	
+	# Add here commands to clean up after the build process.
+	[ ! -f $(CURDIR)/include/Make/Platform.make ] || $(MAKE) distclean
 	dh_clean 
-
+	
 	rm -f lib/proj/nad2bin
 	rm -f tools/timer/main.o
 	rm -f raster/r.le/r.le.setup/polytocell/*.o

-- 
Geographic Resources Analysis Support System