[SCM] Gerris Flow Solver branch, debian-unstable, updated. gerris-20091109-dfsg.1-1-15-gc1377bf

[Drew Parsons]

The following commit has been merged in the debian-unstable branch:
commit fde4821982980d59e5339e78198d54ca5c8f1001
Author: Drew Parsons <dparsons at debian.org>
Date:   Mon Dec 28 11:43:33 2009 +1100

    bump library names to match soname increment
    
    libraries are now /usr/lib/libgfs2D-1.3.so.2.0.0 etc, not
    libgfs2D-1.3.so.1.0.0.  When did that happen?

diff --git a/debian/changelog b/debian/changelog
index 921478c..6fc6fc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,10 @@ gerris (20091109-dfsg.1-2) UNRELEASED; urgency=low
   * Introduction of new packages with MPI support. Currently conflicts
     with single processor builds (i.e. install one or the other, can't
     install simultaneously).
+  * libgfs library package names bumped up to reflect increment in
+    library soname.
 
- -- Drew Parsons <dparsons at debian.org>  Mon, 28 Dec 2009 10:38:00 +1100
+ -- Drew Parsons <dparsons at debian.org>  Mon, 28 Dec 2009 11:44:53 +1100
 
 gerris (20091109-dfsg.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 7663d8f..3655675 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,7 @@ Description: Gerris Flow Solver
 Package: libgfs-dev
 Architecture: any
 Section: libdevel
-Depends: libgfs-1.3-1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libgfs-1.3-2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: Gerris Flow Solver -- development libraries and headers
  Gerris is a system for the solution of the partial differential
  equations describing fluid flow.
@@ -50,14 +50,14 @@ Package: libgfs-dbg
 Priority: extra
 Architecture: any
 Section: debug
-Depends: libgfs-1.3-1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libgfs-1.3-2 (= ${binary:Version}) | libgfs-mpi-1.3-2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: Gerris Flow Solver -- libraries with debugging symbols
  Gerris is a system for the solution of the partial differential
  equations describing fluid flow.
  .
  This package contains the debugging symbols for libgfs.
 
-Package: libgfs-1.3-1
+Package: libgfs-1.3-2
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -95,7 +95,7 @@ Description: Gerris Flow Solver
 Package: libgfs-mpi-dev
 Architecture: any
 Section: libdevel
-Depends: libgfs-mpi-1.3-1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libgfs-mpi-1.3-2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libgfs-dev
 Replaces: libgfs-dev
 Description: Gerris Flow Solver -- development libraries and headers
@@ -108,12 +108,12 @@ Description: Gerris Flow Solver -- development libraries and headers
  This package has MPI support built in.
 
 
-Package: libgfs-mpi-1.3-1
+Package: libgfs-mpi-1.3-2
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libgfs-1.3-1
-Replaces: libgfs-1.3-1
+Conflicts: libgfs-1.3-2
+Replaces: libgfs-1.3-2
 Description: Gerris Flow Solver -- shared libraries
  Gerris is a system for the solution of the partial differential
  equations describing fluid flow.
diff --git a/debian/libgfs-1.3-1.lintian-overrides b/debian/libgfs-1.3-1.lintian-overrides
deleted file mode 100644
index 01558c0..0000000
--- a/debian/libgfs-1.3-1.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libgfs-1.3-1: package-name-doesnt-match-sonames
diff --git a/debian/libgfs-1.3-1.install b/debian/libgfs-1.3-2.install
similarity index 100%
rename from debian/libgfs-1.3-1.install
rename to debian/libgfs-1.3-2.install
diff --git a/debian/libgfs-1.3-2.lintian-overrides b/debian/libgfs-1.3-2.lintian-overrides
new file mode 100644
index 0000000..86316e9
--- /dev/null
+++ b/debian/libgfs-1.3-2.lintian-overrides
@@ -0,0 +1 @@
+libgfs-1.3-2: package-name-doesnt-match-sonames
diff --git a/debian/libgfs-mpi-1.3-1.install b/debian/libgfs-mpi-1.3-2.install
similarity index 100%
rename from debian/libgfs-mpi-1.3-1.install
rename to debian/libgfs-mpi-1.3-2.install
diff --git a/debian/rules b/debian/rules
index 435fa9e..ac9992f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,11 +48,11 @@ override_dh_auto_install:
 # see bug#436240 for my opinion on the sensibleness of this
 override_dh_install:
 	dh_install -pgerris --exclude=darcs2dist
-	dh_install -plibgfs-1.3-1
+	dh_install -plibgfs-1.3-2
 	dh_install -plibgfs-dev
 # dh_install can't figure out the mpi install dirs on its own, so use --sourcedir
 	dh_install -pgerris-mpi --sourcedir=debian/tmp-mpi --exclude=darcs2dist
-	dh_install -plibgfs-mpi-1.3-1 --sourcedir=debian/tmp-mpi
+	dh_install -plibgfs-mpi-1.3-2 --sourcedir=debian/tmp-mpi
 	dh_install -plibgfs-mpi-dev   --sourcedir=debian/tmp-mpi
 
 override_dh_installchangelogs:

-- 
Gerris Flow Solver