[SCM] grass branch, master, updated. upstream/6.4.1-109-gc354d51

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit c354d51b954fde9ced0537d797e3a7b765827711
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Mon Jun 4 18:16:25 2012 +0200

    Fixating #675514

diff --git a/debian/changelog b/debian/changelog
index 7fa998e..786da04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grass (6.4.2-2) unstable; urgency=low
+
+  * Now grass-gui replacing/breaking old grass.
+    (closes: #675514)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 04 Jun 2012 18:14:50 +0200
+
 grass (6.4.2-1) unstable; urgency=low
 
   [ Hamish Bowman ]
diff --git a/debian/control b/debian/control
index 31e7cab..4effffb 100644
--- a/debian/control
+++ b/debian/control
@@ -57,6 +57,8 @@ Description: Geographic Resources Analysis Support System (GRASS GIS)
 Package: grass-core
 Section: science
 Architecture: any
+Replaces: grass (<< 6.4.2-1~)
+Breaks: grass (<< 6.4.2-1~)
 Depends:
   ${shlibs:Depends},
   ${python:Depends},
@@ -98,6 +100,8 @@ Description: GRASS GIS core components
 Package: grass-gui
 Section: science
 Architecture: any
+Replaces: grass (<< 6.4.2-1~)
+Breaks: grass (<< 6.4.2-1~)
 Depends: ${shlibs:Depends},
   grass-core,
   ${python:Depends},
@@ -158,7 +162,7 @@ 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, libgdal1-dev,
+  libproj-dev, libgdal-dev | libgdal1-dev (>= 1.5.0),
   ${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 c6a6e48..11c4b56 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -57,6 +57,8 @@ Description: Geographic Resources Analysis Support System (GRASS GIS)
 Package: grass-core
 Section: science
 Architecture: any
+Replaces: grass (<< 6.4.2-1~)
+Breaks: grass (<< 6.4.2-1~)
 Depends:
   ${shlibs:Depends},
   ${python:Depends},
@@ -98,6 +100,8 @@ Description: GRASS GIS core components
 Package: grass-gui
 Section: science
 Architecture: any
+Replaces: grass (<< 6.4.2-1~)
+Breaks: grass (<< 6.4.2-1~)
 Depends: ${shlibs:Depends},
   grass-core,
   ${python:Depends},
@@ -158,7 +162,7 @@ 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, libgdal1-dev,
+  libproj-dev, libgdal-dev | libgdal1-dev (>= 1.5.0),
   ${misc:Depends}
 # Subversion is needed by g.extension, a primary motivator for installing the grass-dev pkg
 Recommends: subversion

-- 
Geographic Resources Analysis Support System