[DebianGIS-dev] r2442 - packages/grass/trunk/debian

Mon Sep 14 13:29:10 UTC 2009

Author: frankie
Date: 2009-09-14 13:29:10 +0000 (Mon, 14 Sep 2009)
New Revision: 2442

Modified:
   packages/grass/trunk/debian/changelog
   packages/grass/trunk/debian/control
   packages/grass/trunk/debian/control.in
   packages/grass/trunk/debian/rules
Log:
New ABI versioning to force inter-package coherence


Modified: packages/grass/trunk/debian/changelog
===================================================================

--- packages/grass/trunk/debian/changelog	2009-09-14 10:49:41 UTC (rev 2441)
+++ packages/grass/trunk/debian/changelog	2009-09-14 13:29:10 UTC (rev 2442)
@@ -1,3 +1,15 @@
+grass (6.4.0~rc5-3) unstable; urgency=low
+
+  * Build-dep on libreadline-dev with more preference againtst libreadline5-dev.
+  * Policy bumped to 3.8.3.
+  * Now provides a strict versioned ABI string, which changes at every new
+    release. See http://www.mail-archive.com/grass-dev@lists.osgeo.org/msg10312.html
+    for a discussion about GIS_H_VERSION. This trick should hopefully avoid
+    unoticed breakages for plugins and Qgis. Basically, forces rebuilding of
+    gdal-grass or qgis at every new Grass release.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 14 Sep 2009 15:11:57 +0200
+
 grass (6.4.0~rc5-2) unstable; urgency=low
 
   * Added a grass menu item (Hamish).

Modified: packages/grass/trunk/debian/control
===================================================================
--- packages/grass/trunk/debian/control	2009-09-14 10:49:41 UTC (rev 2441)
+++ packages/grass/trunk/debian/control	2009-09-14 13:29:10 UTC (rev 2442)
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
-Build-depends: flex, bison, libreadline5-dev, libncurses5-dev, lesstif2-dev, debhelper (>= 7), dpatch, 
+Build-depends: flex, bison,libreadline-dev | libreadline5-dev, libncurses5-dev, lesstif2-dev, debhelper (>= 7), dpatch, 
  libtiff4-dev, tcl-dev (>= 8.4), tk-dev (>= 8.4), libfftw3-dev, libxmu-dev, libglu1-mesa-dev | libglu1-xorg-dev, 
  libfreetype6-dev, autoconf2.13, autotools-dev, libgdal1-dev (>= 1.5.0), libproj-dev, proj-bin, libjpeg62-dev, 
  libpng12-dev, libpq-dev, unixodbc-dev, doxygen, fakeroot, libmysqlclient15-dev, graphviz, libsqlite3-dev, python-wxgtk2.8,
  libcairo2-dev, libwxgtk2.8-dev, python-dev (>= 2.5), swig
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Build-Conflicts: wx2.6-headers
 Homepage: http://grass.osgeo.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-grass/packages/grass/
@@ -21,7 +21,7 @@
 Suggests: grass-doc, gdal-bin, proj-bin, e00compr, avce00, gpsbabel, gpstrans,
  gnuplot, xml2, wget | curl, python-opengl, python-wxgtk2.8
 Recommends: python (>= 2.5), python-numpy, ghostscript
-Provides: grass64
+Provides: grass640-5
 Description: Geographic Resources Analysis Support System 
  Commonly referred to as GRASS, this is a Geographic Information
  System (GIS) used for geospatial data management and analysis,

Modified: packages/grass/trunk/debian/control.in
===================================================================
--- packages/grass/trunk/debian/control.in	2009-09-14 10:49:41 UTC (rev 2441)
+++ packages/grass/trunk/debian/control.in	2009-09-14 13:29:10 UTC (rev 2442)
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
-Build-depends: flex, bison, libreadline5-dev, libncurses5-dev, lesstif2-dev, debhelper (>= 7), dpatch, 
+Build-depends: flex, bison,libreadline-dev | libreadline5-dev, libncurses5-dev, lesstif2-dev, debhelper (>= 7), dpatch, 
  libtiff4-dev, tcl-dev (>= 8.4), tk-dev (>= 8.4), libfftw3-dev, libxmu-dev, libglu1-mesa-dev | libglu1-xorg-dev, 
  libfreetype6-dev, autoconf2.13, autotools-dev, libgdal1-dev (>= 1.5.0), libproj-dev, proj-bin, libjpeg62-dev, 
  libpng12-dev, libpq-dev, unixodbc-dev, doxygen, fakeroot, libmysqlclient15-dev, graphviz, libsqlite3-dev, python-wxgtk2.8,
  libcairo2-dev, libwxgtk2.8-dev, python-dev (>= 2.5), swig
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Build-Conflicts: wx2.6-headers
 Homepage: http://grass.osgeo.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-grass/packages/grass/
@@ -21,7 +21,7 @@
 Suggests: grass-doc, gdal-bin, proj-bin, e00compr, avce00, gpsbabel, gpstrans,
  gnuplot, xml2, wget | curl, python-opengl, python-wxgtk2.8
 Recommends: python (>= 2.5), python-numpy, ghostscript
-Provides: grass at VERSION@
+Provides: grass at ABI@
 Description: Geographic Resources Analysis Support System 
  Commonly referred to as GRASS, this is a Geographic Information
  System (GIS) used for geospatial data management and analysis,

Modified: packages/grass/trunk/debian/rules
===================================================================
--- packages/grass/trunk/debian/rules	2009-09-14 10:49:41 UTC (rev 2441)
+++ packages/grass/trunk/debian/rules	2009-09-14 13:29:10 UTC (rev 2442)
@@ -10,6 +10,7 @@
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 VERSION=$(shell echo `head -2 $(CURDIR)/include/VERSION`|sed -e 's/ //')
+ABI=$(shell echo `head -3 $(CURDIR)/include/VERSION`|sed -e 's/ //g' -e 's/RC/-/')
 BASE_NAME=grass$(VERSION)
 PKG_NAME=grass
 
@@ -30,10 +31,14 @@
 
 include /usr/share/dpatch/dpatch.make
 
+versions: 
+	@echo "Version: $(VERSION)"
+	@echo "ABI: $(ABI)"
+
 templates: $(patsubst %.in,%,$(wildcard debian/*.in))
 
 debian/% :: debian/%.in
-	sed -e 's/@VERSION@/$(VERSION)/' $< >$@
+	sed -e 's/@VERSION@/$(VERSION)/' -e 's/@ABI@/$(ABI)/' $< >$@
 
 configure: patch config.status
 config.status: 
@@ -221,4 +226,4 @@
 	dh_builddeb -a
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch configure clean-patched
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch configure clean-patched versions


