[DebianGIS-dev] [SCM] saga branch, master, updated. f48c21dcc0fbd87f0b69199d927a8d3e20b02b65

[Johan Van de Wauw]

The following commit has been merged in the master branch:
commit f48c21dcc0fbd87f0b69199d927a8d3e20b02b65
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Mon Mar 8 17:44:00 2010 +0100

    Remove version number from package name

diff --git a/debian/control b/debian/control
index 00b4674..eeed14f 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,7 @@ Description: System for Automatic Geoscientific Analysis
    altitudes.
  * Vector tools: polygon intersection, contour lines from grid.
 
-Package: libsaga-2.0.4-dev
+Package: libsaga-dev
 Section: libdevel
 Architecture: any
 Suggests: saga (= ${binary:Version})
@@ -52,11 +52,11 @@ Description: SAGA GIS development files
  This package contains the header files for developing with SAGA.
  Install this package if you wish to develop software that uses the SAGA API.
 
-Package: libsaga-2.0.4
+Package: libsaga
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Provides: libsaga
+Provides: libsaga-2.0.4
 Description: SAGA GIS development files
  SAGA GIS (System for Automated Geoscientific Analysis) is a geographic
  information system usable for editing and analysing spatial data.
diff --git a/debian/control b/debian/control.in
similarity index 97%
copy from debian/control
copy to debian/control.in
index 00b4674..d664496 100644
--- a/debian/control
+++ b/debian/control.in
@@ -40,7 +40,7 @@ Description: System for Automatic Geoscientific Analysis
    altitudes.
  * Vector tools: polygon intersection, contour lines from grid.
 
-Package: libsaga-2.0.4-dev
+Package: libsaga-dev
 Section: libdevel
 Architecture: any
 Suggests: saga (= ${binary:Version})
@@ -52,11 +52,11 @@ Description: SAGA GIS development files
  This package contains the header files for developing with SAGA.
  Install this package if you wish to develop software that uses the SAGA API.
 
-Package: libsaga-2.0.4
+Package: libsaga
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Provides: libsaga
+Provides: libsaga- at VERSION@
 Description: SAGA GIS development files
  SAGA GIS (System for Automated Geoscientific Analysis) is a geographic
  information system usable for editing and analysing spatial data.
diff --git a/debian/libsaga-2.0.4-dev.install b/debian/libsaga-dev.install
similarity index 100%
rename from debian/libsaga-2.0.4-dev.install
rename to debian/libsaga-dev.install
diff --git a/debian/libsaga-2.0.4.install b/debian/libsaga.install
similarity index 100%
rename from debian/libsaga-2.0.4.install
rename to debian/libsaga.install
diff --git a/debian/rules b/debian/rules
index 515334e..8bf9c69 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,9 @@ include /usr/share/cdbs/1/class/autotools.mk
 DEB_CONFIGURE_EXTRA_FLAGS = --enable-unicode
 DEB_INSTALL_MANPAGES_saga = saga_cmd.1
 
+VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | \
+   cut -f 2 -d ' ' | cut -f 1 -d '-')
+
 # remove libtool helpers
 install/saga::
 	find debian/tmp/usr/lib ! -type d -a -name "*.la" -delete
@@ -18,5 +21,5 @@ cleanbuilddir/saga::
 	rm -f saga_gui.1
 
 debian/% :: debian/%.in
-	sed -e 's/@LIBSAGAAPISO@/$(LIBSAGAAPISO)/' -e 's/@LIBSAGAGDISO@/$(LIBSAGAGDISO)/' $< >$@
+	sed -e 's/@VERSION@/$(VERSION)/' -e 's/@LIBSAGAGDISO@/$(LIBSAGAGDISO)/' $< >$@
 

-- 
Saga GIS