[SCM] grass branch, master, updated. upstream/6.4.1-115-g0241031

[M. Hamish Bowman]

The following commit has been merged in the master branch:
commit 0241031cca15fc2aae1c845cda100e2877ce8dc2
Author: M. Hamish Bowman <hamish_b at yahoo.com>
Date:   Sun Jul 14 10:21:10 2013 +1200

    Build-Depends on libmotif-dev for Motif transition (#714679)

diff --git a/debian/changelog b/debian/changelog
index fb7e31c..de5ea0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ grass (6.4.2-3) unstable; urgency=low
     (closes: #662361)
   * grass-dev needs to depend on libfreetype6-dev for building addons.
   * Enable GEOS support
+  * Build-Depends on libmotif-dev for Motif transition.
+    (closes: #714679)
 
- -- M. Hamish Bowman <hamish_b at yahoo.com>  Sun, 16 Jun 2013 14:27:59 +1200
+ -- M. Hamish Bowman <hamish_b at yahoo.com>  Sun, 14 Jul 2013 10:18:40 +1200
 
 grass (6.4.2-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 20b7d74..c0e8c56 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-depends:
   fakeroot,
   flex, bison,
   graphviz,
-  lesstif2-dev,
+  libmotif-dev | lesstif2-dev,
   libcairo2-dev,
   libfftw3-dev,
   libfreetype6-dev,
diff --git a/debian/control.in b/debian/control.in
index b309f67..2cb89b8 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -10,7 +10,7 @@ Build-depends:
   fakeroot,
   flex, bison,
   graphviz,
-  lesstif2-dev,
+  libmotif-dev | lesstif2-dev,
   libcairo2-dev,
   libfftw3-dev,
   libfreetype6-dev,
diff --git a/debian/rules b/debian/rules
index cf12a95..965f021 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,7 +52,9 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 endif
 
 	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+	CFLAGS="$(CFLAGS)" ./configure \
+                    --host=$(DEB_HOST_GNU_TYPE) \
+                    --build=$(DEB_BUILD_GNU_TYPE) \
                     --prefix=/usr/lib \
                     --sysconfdir=/etc \
                     --sharedstatedir=/var \

-- 
Geographic Resources Analysis Support System