[SCM] FreeFem++ packaging branch, master, updated. debian/3.13-1-20-gadf9e34

[Dimitrios Eftaxiopoulos]

The following commit has been merged in the master branch:
commit adf9e34b4c37278e0ebc35cf295bdac23843eaa1
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Mon Jun 20 22:40:33 2011 +0300

    Rename /usr/bin/bamg to /usr/bin/ffbamg

diff --git a/debian/changelog b/debian/changelog
index 62de851..bd69194 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+freefem++ (3.13-2) unstable; urgency=low
+
+  * Rename /usr/bin/bamg to /usr/bin/ffbamg to fix double occurence of the 
+    former, in both rheolef and freefem++ packages (Closes: #630864).
+
+ -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>  Mon, 20 Jun 2011 19:50:00 +0200
+
 freefem++ (3.13-1) unstable; urgency=low
 
   * Initial release (Closes: #500755).
diff --git a/debian/bamg.1 b/debian/ffbamg.1
similarity index 100%
rename from debian/bamg.1
rename to debian/ffbamg.1
diff --git a/debian/freefem++.manpages b/debian/freefem++.manpages
index a14c906..871437d 100644
--- a/debian/freefem++.manpages
+++ b/debian/freefem++.manpages
@@ -1,4 +1,4 @@
-debian/bamg.1
+debian/ffbamg.1
 debian/cvmsh2.1
 debian/drawbdmesh.1
 debian/ff-c++.1
diff --git a/debian/rules b/debian/rules
index ca14af8..b65057c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,10 @@ clean:
 	rm -f examples++-load/freefem++.pref examples++-mpi/freefem++.pref
 	rm -f src/medit/compil.date src/mpi/ff-mpirun
 
-build:
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
+build-stamp:
 	dh_testdir
 # See README.Debian for the rational on the gcc version.
 	dh_auto_configure -- CFLAGS=-lm CXX=g++-4.5 CC=gcc-4.5 FC=gfortran-4.5
@@ -94,6 +97,7 @@ binary-arch:
 	dh_installdirs -a
 	dh_auto_install -a
 	dh_install -a
+	mv debian/freefem++/usr/bin/bamg debian/freefem++/usr/bin/ffbamg
 	dh_installdocs -a
 	dh_installchangelogs -a
 	dh_installexamples -a

-- 
FreeFem++ packaging