[syrthes/master] Drop hard coding version into the path and package name

Tue Feb 15 23:15:34 UTC 2011

---
 debian/README.source |   21 ---------------------
 debian/changelog     |   12 ++++++++++++
 debian/control       |   23 +++++++++++++++++++++++
 debian/control.in    |   25 -------------------------
 debian/dirs          |    9 +++++++++
 debian/dirs.in       |    9 ---------
 debian/rules         |   21 +++++++--------------
 7 files changed, 51 insertions(+), 69 deletions(-)
 create mode 100644 debian/control
 delete mode 100644 debian/control.in
 create mode 100644 debian/dirs
 delete mode 100644 debian/dirs.in

diff --git a/debian/README.source b/debian/README.source
index 66e6204..ed98da8 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -4,27 +4,6 @@ SYRTHES for Debian
 This file is used to keep track of packaging choices, known issues and TO-DOs.
 
 
-===========================
-0- SCIENCE_EXPLICIT_VERSION
-===========================
-
-In some cases one wants to install several versionis of a software on the
-same box. This happens to my users at work with scientific software:
-* an oldstable version is available for a not yet finished long study
-* the stable version is there for new studies
-* and a release canditade version may undergoes some heavy testing
-
-One solution is to name the packages after the version, as it is done for
-gcc for instance. But it is not comfortable for the debian archive. In this
-source package I use the environement variable SCIENCE_EXPLICIT_VERSION at
-build time to produce binary packages named after the version or not:
-
-* if SCIENCE_EXPLICIT_VERSION=yes the binary package name is "syrthes-<version>"
-* else the binary package name is "syrthes"
-
-See debian/rules for the implementation details.
-
-
 ==============================
 1- DOCUMENTATION NOT DFSG-FREE
 ==============================
diff --git a/debian/changelog b/debian/changelog
index 0ddddb4..5ed85f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+syrthes (3.4.3-dfsg1-1) unstable; urgency=low
+
+  * New upstream release:
+    + new convert2syrthes util to convert mesh files from GAMBIT, GMSH or MED
+      to the SYRTHES format
+
+  * Quit hard coding the version number in the install path (closes: #571022)
+  * Drop naming the binary package after the version when the
+    SCIENCE_EXPLICIT_VERSION variable is set
+
+ -- Gilles Filippini <pini at debian.org>  Tue, 08 Feb 2011 23:26:15 +0100
+
 syrthes (3.4.2-dfsg1-3) unstable; urgency=low
 
   * New patch:
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..1a04acf
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,23 @@
+Source: syrthes
+Section: science
+Priority: extra
+Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
+Uploaders: Gilles Filippini <gilles.filippini at free.fr>
+DM-Upload-Allowed: yes
+Build-Depends: quilt, debhelper (>= 7), gfortran
+Standards-Version: 3.8.3
+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
deleted file mode 100644
index d816e68..0000000
--- a/debian/control.in
+++ /dev/null
@@ -1,25 +0,0 @@
-Source: syrthes
-Section: science
-Priority: extra
-Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: Gilles Filippini <gilles.filippini at free.fr>
-DM-Upload-Allowed: yes
-Build-Depends: quilt, debhelper (>= 7), gfortran
-Standards-Version: 3.8.3
-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 EXPLICIT_VERSION@
-Architecture: any
-Provides: syrthes at VERSION@
-Conflicts: syrthes at 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
new file mode 100644
index 0000000..67a3efd
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1,9 @@
+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
deleted file mode 100644
index e8c6636..0000000
--- a/debian/dirs.in
+++ /dev/null
@@ -1,9 +0,0 @@
-usr/bin
- at SYRTHES_HOME@/bin/Linux
- at SYRTHES_HOME@/data
- at SYRTHES_HOME@/example/cylinder/MESH
- at SYRTHES_HOME@/example/cylinder/RESU
- at SYRTHES_HOME@/example/cylinder/usr
- at SYRTHES_HOME@/include
- at SYRTHES_HOME@/lib/Linux
- at SYRTHES_HOME@/usr
diff --git a/debian/rules b/debian/rules
index b7fa3a2..8a90f87 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,10 +9,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-NOREVISION_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ' | cut -f 1 -d '-' | sed 's/\.dfsg.*$$//')
-EXPLICIT_VERSION := $(shell set -e; if [ "x$(SCIENCE_EXPLICIT_VERSION)" = "xyes" ]; then echo "-$(NOREVISION_VERSION)"; fi)
-SYRTHES_HOME=usr/lib/syrthes/$(NOREVISION_VERSION)
-INSTALL_DIR=$(CURDIR)/debian/syrthes$(EXPLICIT_VERSION)
+SYRTHES_HOME=usr/lib/syrthes
+INSTALL_DIR=$(CURDIR)/debian/syrthes
 
 include /usr/share/quilt/quilt.make
 
@@ -31,14 +29,11 @@ build-stamp: configure-stamp  $(QUILT_STAMPFN)
 
 	# Add here commands to compile the package.
 	cd $(CURDIR)/bin && SYRTHES_HOME=$(CURDIR) $(MAKE) install
-	#docbook-to-man debian/syrthes.sgml > syrthes.1
 
 	touch $@
 
 clean: clean-patched unpatch
 clean-patched:
-	test -f $(CURDIR)/debian/control.in
-	if test ! -f $(CURDIR)/debian/control; then touch $(CURDIR)/debian/control; fi
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
@@ -47,8 +42,6 @@ clean-patched:
 	cd $(CURDIR)/bin && SYRTHES_HOME=$(CURDIR) $(MAKE) distclean
 
 	dh_clean 
-	sed "s/@EXPLICIT_VERSION@/$(EXPLICIT_VERSION)/;s/@VERSION@/-$(NOREVISION_VERSION)/" debian/control.in > debian/control
-	sed "s!@SYRTHES_HOME@!$(SYRTHES_HOME)!" debian/dirs.in > debian/dirs
 
 install: build
 	dh_testdir
@@ -70,8 +63,8 @@ install: build
 	rm -f $(INSTALL_DIR)/$(SYRTHES_HOME)/bin/syrthes.profile
 	# Move example dir to /usr/share/doc/syrthes/
 	mkdir -p $(INSTALL_DIR)/usr/share/doc/syrthes$(EXPLICIT_VERSION)
-	mv $(INSTALL_DIR)/$(SYRTHES_HOME)/example $(INSTALL_DIR)/usr/share/doc/syrthes$(EXPLICIT_VERSION)/
-	cd $(INSTALL_DIR)/usr/share/doc/syrthes$(EXPLICIT_VERSION)/example && tar czf cylinder.tar.gz cylinder && rm -fr cylinder
+	mv $(INSTALL_DIR)/$(SYRTHES_HOME)/example $(INSTALL_DIR)/usr/share/doc/syrthes/
+	cd $(INSTALL_DIR)/usr/share/doc/syrthes/example && tar czf cylinder.tar.gz cylinder && rm -fr cylinder
 
 
 # Build architecture-independent files here.
@@ -97,9 +90,9 @@ binary-arch: install
 #	dh_installcron
 #	dh_installinfo
 	dh_installman
-	EXPLICIT_VERSION=$(EXPLICIT_VERSION) && export EXPLICIT_VERSION && dh_link \
-		/$(SYRTHES_HOME)/bin/syrthes_create_case /usr/bin/syrthes$(EXPLICIT_VERSION)_create_case \
-		/$(SYRTHES_HOME)/bin/Linux/syrthes2ensight /usr/bin/syrthes$${EXPLICIT_VERSION:+$${EXPLICIT_VERSION}_}2ensight
+	dh_link \
+		/$(SYRTHES_HOME)/bin/syrthes_create_case /usr/bin/syrthes_create_case \
+		/$(SYRTHES_HOME)/bin/Linux/syrthes2ensight /usr/bin/syrthes2ensight
 	dh_strip
 	dh_compress
 	dh_fixperms
-- 
1.7.1



