[SCM] grass branch, ubuntu/lucid, updated. upstream/6.4.1-112-g07071b5

Jerome Villeneuve Larouche jlarouche at mapgears.com
Fri Jun 15 18:01:01 UTC 2012


The following commit has been merged in the ubuntu/lucid branch:
commit 998d64e96efdfff63eb92655c2c1dd00b1523edd
Author: Jerome Villeneuve Larouche <jlarouche at mapgears.com>
Date:   Wed Jun 6 13:33:43 2012 +0000

    Initial release for Ubuntu Lucid
    
    Changed breaks and replaces in debian/control to (<< 6.4.1) so it works
    with the current package's version

diff --git a/debian/changelog b/debian/changelog
index 786da04..4ffc221 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+grass (6.4.2~upstream2-3~lucid4) lucid; urgency=low
+
+  * Launchpad build for Lucid
+  * Downgraded python(2.6.6 to 2.6.5), tcl-dev(8.5 to 8.4) and tk-dev(8.5 to
+    8.4)
+  * Changed dh_python2 to dh_pycentral in debian/rules.
+  * Lowered breaks and replaces in debian/control to (<< 6.4.1) so it works
+    with lucid's version
+
+ -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Tue, 05 Jun 2012 18:34:12 +0000
+
 grass (6.4.2-2) unstable; urgency=low
 
   * Now grass-gui replacing/breaking old grass.
diff --git a/debian/control b/debian/control
index 4effffb..9ee95cf 100644
--- a/debian/control
+++ b/debian/control
@@ -27,10 +27,10 @@ Build-depends:
   libxmu-dev,
 #install optipng if compressing the PNG images in the programmers' manual
 #  optipng,
-  python (>= 2.6.6-3~),
+  python (>= 2.6.5),
   python-wxgtk2.8, libwxgtk2.8-dev,
   python-dev,
-  tcl-dev (>= 8.5), tk-dev (>= 8.5),
+  tcl-dev (>= 8.4), tk-dev (>= 8.4),
   unixodbc-dev
 Standards-Version: 3.9.3
 Build-Conflicts: wx2.6-headers
@@ -57,8 +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~)
+Replaces: grass (<< 6.4.1)
+Breaks: grass (<< 6.4.1)
 Depends:
   ${shlibs:Depends},
   ${python:Depends},
@@ -100,8 +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~)
+Replaces: grass (<< 6.4.1)
+Breaks: grass (<< 6.4.1)
 Depends: ${shlibs:Depends},
   grass-core,
   ${python:Depends},
diff --git a/debian/control.in b/debian/control.in
index 11c4b56..edbea43 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -27,10 +27,10 @@ Build-depends:
   libxmu-dev,
 #install optipng if compressing the PNG images in the programmers' manual
 #  optipng,
-  python (>= 2.6.6-3~),
+  python (>= 2.6.5),
   python-wxgtk2.8, libwxgtk2.8-dev,
   python-dev,
-  tcl-dev (>= 8.5), tk-dev (>= 8.5),
+  tcl-dev (>= 8.4), tk-dev (>= 8.4),
   unixodbc-dev
 Standards-Version: 3.9.3
 Build-Conflicts: wx2.6-headers
@@ -57,8 +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~)
+Replaces: grass (<< 6.4.1)
+Breaks: grass (<< 6.4.1)
 Depends:
   ${shlibs:Depends},
   ${python:Depends},
@@ -100,8 +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~)
+Replaces: grass (<< 6.4.1)
+Breaks: grass (<< 6.4.1)
 Depends: ${shlibs:Depends},
   grass-core,
   ${python:Depends},
diff --git a/debian/rules b/debian/rules
index c717d65..6becc0c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -274,8 +274,8 @@ binary-arch: install
 	dh_installmenu -a
 	dh_installman -p$(PKG_NAME) debian/$(BASE_NAME).1 -a
 	dh_link -a
-	dh_python2
-	dh_python2 /usr/lib/grass64/etc
+	dh_pycentral
+	dh_pycentral /usr/lib/grass64/etc
 	dh_strip -a
 	dh_compress -a -XAUTHORS
 	dh_fixperms -a

-- 
Geographic Resources Analysis Support System



More information about the Pkg-grass-devel mailing list