[Pkg-octave-commit] [octave] 02/05: Bump SONAME of liboctave (2->3).

[Sébastien Villemot]

This is an automated email from the git hooks/post-receive script.

sebastien pushed a commit to branch master
in repository octave.

commit 7344e5e590e172d1d29ffc526a4f1af9239f68ed
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Fri Apr 24 15:47:03 2015 +0200

    Bump SONAME of liboctave (2->3).
    
    - d/p/bump-soname.patch: patch to anticipate the bump by upstream.
    - d/control, d/liboctave?.install: rename the package
---
 debian/changelog                 |  3 +++
 debian/control                   |  6 +++---
 debian/liboctave2.install        |  5 -----
 debian/liboctave3.install        |  5 +++++
 debian/patches/bump-soname.patch | 39 +++++++++++++++++++++++++++++++++++++++
 debian/patches/series            |  1 +
 6 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e98de56..48070ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,9 @@ octave (4.0.0~rc3-1) UNRELEASED; urgency=low
   * d/p/hurd_path_max.diff: drop patch (applied upstream).
   * d/p/dblquad-s390x.diff: drop patch (no longer needed).
   * Add entry in d/NEWS (GUI now by default, pkg autoload disabled).
+  * Bump SONAME of liboctave (2->3).
+    - d/p/bump-soname.patch: patch to anticipate the bump by upstream.
+    - d/control, d/liboctave?.install: rename the package
 
  -- Rafael Laboissiere <rafael at laboissiere.net>  Wed, 22 Apr 2015 06:25:00 -0300
 
diff --git a/debian/control b/debian/control
index 9c76366..1cb76ff 100644
--- a/debian/control
+++ b/debian/control
@@ -60,7 +60,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-octave/octave.git
 Package: octave
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, texinfo, octave-common (= ${source:Version}),
-         liboctave2 (= ${binary:Version}),
+         liboctave3 (= ${binary:Version}),
          default-jre-headless [!armhf !hurd-i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !sparc]
 Recommends: gnuplot-x11 | gnuplot-qt, libopenblas-base | libatlas3-base,
  pstoedit
@@ -198,7 +198,7 @@ Description: GNU Info documentation on the GNU Octave language
  on the C++ classes used by Octave, as well as the main octave documentation
  which is needed for the 'help -i foo' command within Octave.
 
-Package: liboctave2
+Package: liboctave3
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -214,7 +214,7 @@ Description: Shared libraries of the GNU Octave language
 Package: liboctave-dev
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- liboctave2 (= ${binary:Version}), octave (= ${binary:Version}),
+ liboctave3 (= ${binary:Version}), octave (= ${binary:Version}),
  libreadline-dev | libreadline6-dev | libreadline5-dev, libncurses5-dev,
  libhdf5-dev (>= 1.8.8) | libhdf5-openmpi-dev (>= 1.8.8) | libhdf5-mpich2-dev (>= 1.8.8),
  libgl1-mesa-dev | libgl-dev,
diff --git a/debian/liboctave2.install b/debian/liboctave2.install
deleted file mode 100755
index 54d680a..0000000
--- a/debian/liboctave2.install
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/dh-exec
-
-usr/lib/${DEB_HOST_MULTIARCH}/liboctave.so.2* /usr/lib/${DEB_HOST_MULTIARCH}
-
-usr/lib/${DEB_HOST_MULTIARCH}/liboctinterp.so.2* /usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/liboctave3.install b/debian/liboctave3.install
new file mode 100755
index 0000000..ccf66cb
--- /dev/null
+++ b/debian/liboctave3.install
@@ -0,0 +1,5 @@
+#!/usr/bin/dh-exec
+
+usr/lib/${DEB_HOST_MULTIARCH}/liboctave.so.3* /usr/lib/${DEB_HOST_MULTIARCH}
+
+usr/lib/${DEB_HOST_MULTIARCH}/liboctinterp.so.3* /usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/patches/bump-soname.patch b/debian/patches/bump-soname.patch
new file mode 100644
index 0000000..6260163
--- /dev/null
+++ b/debian/patches/bump-soname.patch
@@ -0,0 +1,39 @@
+Description: Bump SONAMEs of libraries
+Origin: upstream, http://lists.gnu.org/archive/html/octave-maintainers/2015-04/msg00333.html
+Reviewed-by: Sébastien Villemot <sebastien at debian.org>
+Last-Update: 2015-04-24
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/libgui/Makefile.am
++++ b/libgui/Makefile.am
+@@ -77,7 +77,7 @@ liboctgui_la_LIBADD = \
+   $(LIBOCTGUI_LINK_DEPS)
+ 
+ # Increment these as needed and according to the rules in the libtool manual:
+-liboctgui_current = 0
++liboctgui_current = 1
+ liboctgui_revision = 0
+ liboctgui_age = 0
+ 
+--- a/libinterp/Makefile.am
++++ b/libinterp/Makefile.am
+@@ -201,7 +201,7 @@ liboctinterp_la_LIBADD = \
+   $(LIBOCTINTERP_LINK_DEPS)
+ 
+ # Increment these as needed and according to the rules in the libtool manual:
+-liboctinterp_current = 2
++liboctinterp_current = 3
+ liboctinterp_revision = 0
+ liboctinterp_age = 0
+ 
+--- a/liboctave/Makefile.am
++++ b/liboctave/Makefile.am
+@@ -98,7 +98,7 @@ liboctave_la_LIBADD += \
+   $(LIBOCTAVE_LINK_DEPS)
+ 
+ # Increment these as needed and according to the rules in the libtool manual:
+-liboctave_current = 2
++liboctave_current = 3
+ liboctave_revision = 0
+ liboctave_age = 0
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e4ec420..a7755e3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ mkoctfile-mpi.diff
 always-build-octave-jar.patch
 hdf5-flags.patch
 hdf5-mkoctfile.patch
+bump-soname.patch

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave.git