[SCM] grass branch, master, updated. upstream/6.4.1-112-g762e739

[M. Hamish Bowman]

The following commit has been merged in the master branch:
commit 762e739059129fde2db021242352ec1cafc29c65
Author: M. Hamish Bowman <hamish_b at yahoo.com>
Date:   Sun Feb 17 21:33:53 2013 +1300

    grass-dev needs to depend on libfreetype6-dev to build addon modules

diff --git a/debian/changelog b/debian/changelog
index a7049ca..5b2db56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ grass (6.4.2-3) unstable; urgency=low
 
   * Build-Depends on libpng-dev for LibPNG transition.
     (closes: #662361)
+  * grass-dev needs to depend on libfreetype6-dev for building addons.
 
- -- M. Hamish Bowman <hamish_b at yahoo.com>  Sat, 09 Jun 2012 17:15:10 +1200
+ -- M. Hamish Bowman <hamish_b at yahoo.com>  Sun, 17 Feb 2013 21:30:53 +1300
 
 grass (6.4.2-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index b97bf1a..0c79949 100644
--- a/debian/control
+++ b/debian/control
@@ -164,7 +164,9 @@ Depends:
   grass-core (= ${binary:Version}),
 # fakeroot used by patches/htmlgen-fakeroot; see changelog entry for 5.7.0+6.0.0beta2-2
   fakeroot,
-  libproj-dev, libgdal-dev | libgdal1-dev (>= 1.5.0),
+  libproj-dev,
+  libgdal-dev | libgdal1-dev (>= 1.5.0),
+  libfreetype6-dev,
   ${misc:Depends}
 # Subversion is needed by g.extension, a primary motivator for installing the grass-dev pkg
 Recommends: subversion
diff --git a/debian/control.in b/debian/control.in
index 10d6ce3..d47e109 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -164,7 +164,9 @@ Depends:
   grass-core (= ${binary:Version}),
 # fakeroot used by patches/htmlgen-fakeroot; see changelog entry for 5.7.0+6.0.0beta2-2
   fakeroot,
-  libproj-dev, libgdal-dev | libgdal1-dev (>= 1.5.0),
+  libproj-dev,
+  libgdal-dev | libgdal1-dev (>= 1.5.0),
+  libfreetype6-dev,
   ${misc:Depends}
 # Subversion is needed by g.extension, a primary motivator for installing the grass-dev pkg
 Recommends: subversion

-- 
Geographic Resources Analysis Support System