[SCM] grass branch, master, updated. upstream/6.4.1-34-g071f8b1
Francesco Paolo Lovergine
frankie at debian.org
Thu Jan 19 13:43:46 UTC 2012
The following commit has been merged in the master branch:
commit 9bc17fc1e40a5a0f7d702354865a49985707824d
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date: Thu Jan 19 14:06:46 2012 +0100
Fixed a FTBS.
diff --git a/debian/changelog b/debian/changelog
index 65e4ab3..75e2e88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,10 @@ grass (6.4.1-2) unstable; urgency=low
* Remove more obsolete swig references.
* grass-dev: further support for building add-ons.
- -- Hamish Bowman <hamish_b at yahoo.com> Mon, 12 Sep 2011 19:48:52 +1200
+ [ Francesco Paolo Lovergine ]
+ * Now reset debian/rules to use wx-config current alternative.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Thu, 19 Jan 2012 14:04:52 +0100
grass (6.4.1-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 26567c9..5bed7f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,7 +75,7 @@ endif
--with-postgres-includes=$(shell pg_config --includedir) \
--with-mysql-includes=$(shell mysql_config --include|sed -e 's/-I//') \
--with-proj-share=/usr/share/proj \
- --with-wxwidgets=/usr/lib/wx/config/gtk2-unicode-release-2.8 \
+ --with-wxwidgets=/usr/bin/wx-config \
--with-python=/usr/bin/python-config \
--with-cairo
--
Geographic Resources Analysis Support System
More information about the Pkg-grass-devel
mailing list