[syrthes/master] First try at optionnaly adding the upstream release number to the binary packages' name.

[Gilles Filippini]

---
 debian/control    |   22 ----------------------
 debian/control.in |   24 ++++++++++++++++++++++++
 debian/dirs       |    9 ---------
 debian/dirs.in    |    9 +++++++++
 debian/rules      |   14 +++++++++-----
 5 files changed, 42 insertions(+), 36 deletions(-)
 delete mode 100644 debian/control
 create mode 100644 debian/control.in
 delete mode 100644 debian/dirs
 create mode 100644 debian/dirs.in

diff --git a/debian/control b/debian/control
deleted file mode 100644
index 09f5ecd..0000000
--- a/debian/control
+++ /dev/null
@@ -1,22 +0,0 @@
-Source: syrthes
-Section: science
-Priority: extra
-Maintainer: Gilles Filippini <gilles.filippini at free.fr>
-DM-Upload-Allowed: yes
-Build-Depends: quilt, debhelper (>= 7), gfortran, tree
-Standards-Version: 3.8.1
-Homepage: http://rd.edf.com/syrthes
-Vcs-Browser: http://git.debian.org/?p=debian-science/packages/syrthes.git;a=summary
-Vcs-Git: git://git.debian.org/git/debian-science/packages/libgarmin.git
-
-Package: syrthes
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: gfortran
-Description: Transient thermal simulations in complex solid geometries
- SYRTHES is a general purpose thermal software developed at EDF R&D which
- models conduction and radiation heat transfers in complex geometries.
- .
- SYRTHES can be used coupled with the computational fluid dynamics (CFD)
- Code_Saturne.
-
diff --git a/debian/control.in b/debian/control.in
new file mode 100644
index 0000000..79aa6d3
--- /dev/null
+++ b/debian/control.in
@@ -0,0 +1,24 @@
+Source: syrthes
+Section: science
+Priority: extra
+Maintainer: Gilles Filippini <gilles.filippini at free.fr>
+DM-Upload-Allowed: yes
+Build-Depends: quilt, debhelper (>= 7), gfortran, tree
+Standards-Version: 3.8.1
+Homepage: http://rd.edf.com/syrthes
+Vcs-Browser: http://git.debian.org/?p=debian-science/packages/syrthes.git;a=summary
+Vcs-Git: git://git.debian.org/git/debian-science/packages/libgarmin.git
+
+Package: syrthes at EXP_VERSION@
+Architecture: any
+Provides: syrthes-${source:Upstream-Version}
+Conflicts: syrthes-${source:Upstream-Version}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: gfortran
+Description: Transient thermal simulations in complex solid geometries
+ SYRTHES is a general purpose thermal software developed at EDF R&D which
+ models conduction and radiation heat transfers in complex geometries.
+ .
+ SYRTHES can be used coupled with the computational fluid dynamics (CFD)
+ Code_Saturne.
+
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 315466c..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,9 +0,0 @@
-usr/bin
-usr/lib/syrthes/bin/Linux
-usr/lib/syrthes/data
-usr/lib/syrthes/example/cylinder/MESH
-usr/lib/syrthes/example/cylinder/RESU
-usr/lib/syrthes/example/cylinder/usr
-usr/lib/syrthes/include
-usr/lib/syrthes/lib/Linux
-usr/lib/syrthes/usr
diff --git a/debian/dirs.in b/debian/dirs.in
new file mode 100644
index 0000000..df2834a
--- /dev/null
+++ b/debian/dirs.in
@@ -0,0 +1,9 @@
+usr/bin
+usr/lib/syrthes at VERSION@/bin/Linux
+usr/lib/syrthes at VERSION@/data
+usr/lib/syrthes at VERSION@/example/cylinder/MESH
+usr/lib/syrthes at VERSION@/example/cylinder/RESU
+usr/lib/syrthes at VERSION@/example/cylinder/usr
+usr/lib/syrthes at VERSION@/include
+usr/lib/syrthes at VERSION@/lib/Linux
+usr/lib/syrthes at VERSION@/usr
diff --git a/debian/rules b/debian/rules
index 9a3c13c..d0147a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-
+DEB_NOREVISION_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ' | cut -f 1 -d '-' | sed 's/\.dfsg.*$$//')
+DEB_SCIENCE_EXPLICIT_VERSION := $(shell set -e; if [ "$(DEB_SCIENCE_EXPLICIT_VERSION)" == "yes" ]; then echo "-$(DEB_NOREVISION_VERSION)"; fi)
 
 include /usr/share/quilt/quilt.make
 
@@ -27,7 +28,7 @@ build-stamp: configure-stamp  $(QUILT_STAMPFN)
 	dh_testdir
 
 	# Add here commands to compile the package.
-	cd $(CURDIR)/bin; export NOM_ARCH=Linux; export SYRTHES_HOME=$(CURDIR); $(MAKE) install
+	cd $(CURDIR)/bin && NOM_ARCH=Linux SYRTHES_HOME=$(CURDIR) $(MAKE) install
 	#docbook-to-man debian/syrthes.sgml > syrthes.1
 
 	touch $@
@@ -42,6 +43,8 @@ clean-patched:
 	cd $(CURDIR)/bin; . ./syrthes.profile; #$(MAKE) clean
 
 	dh_clean 
+	sed "s/@VERSION@/$(DEB_SCIENCE_EXPLICIT_VERSION)/" debian/control.in > debian/control
+	sed "s/@VERSION@/$(DEB_SCIENCE_EXPLICIT_VERSION)/" debian/dirs.in > debian/dirs
 
 install: build
 	dh_testdir
@@ -50,12 +53,13 @@ install: build
 	dh_installdirs
 
 	# Add here commands to install the package into debian/syrthes.
-	tree $(CURDIR)
+	set -e; \
+	cd $(CURDIR); \
 	for dir in bin bin/Linux data example/cylinder example/cylinder/MESH \
 	  example/cylinder/RESU example/cylinder/usr include lib/Linux \
 	  usr; do \
-	  install $(CURDIR)/$$dir/* $(CURDIR)/debian/syrthes/usr/lib/syrthes/$$dir; \
-	  done
+	  find $$dir -maxdepth 1 -type f -exec install "{}" $(CURDIR)/debian/syrthes$(DEB_SCIENCE_EXPLICIT_VERSION)/usr/lib/syrthes$(DEB_SCIENCE_EXPLICIT_VERSION)/$$dir \; ; \
+	done
 
 
 # Build architecture-independent files here.
-- 
1.5.6.5