[Pkg-octave-commit] [octave] 09/15: Bump SONAME of library package to liboctave2.

[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 e10d6e9919c5a8a6d5e111f152dd609966e09c87
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Wed Dec 11 14:20:41 2013 +0100

    Bump SONAME of library package to liboctave2.
    
    Also stop distributing libcruft, which no longer exists.
---
 .gitignore                   | 2 +-
 debian/control               | 6 +++---
 debian/liboctave-dev.install | 1 -
 debian/liboctave1.install    | 7 -------
 debian/liboctave2.install    | 5 +++++
 debian/rules                 | 4 ----
 6 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index c66f330..8a23911 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,7 @@
 /debian/autoreconf.after
 /debian/autoreconf.before
 /debian/liboctave-dev
-/debian/liboctave1
+/debian/liboctave2
 /debian/octave-common
 /debian/octave-dbg
 /debian/octave-doc
diff --git a/debian/control b/debian/control
index 302f651..a5804d7 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,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}),
-         liboctave1 (= ${binary:Version}), default-jre-headless
+         liboctave2 (= ${binary:Version}), default-jre-headless
 Recommends: gnuplot-x11 | gnuplot-qt, libatlas3-base | libopenblas-base,
  pstoedit
 Suggests: octave-info,
@@ -111,7 +111,7 @@ Description: GNU Info documentation on the GNU Octave language
  octave documentation which is needed for the 'help -i foo' command within
  Octave.
 
-Package: liboctave1
+Package: liboctave2
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -126,7 +126,7 @@ Description: Shared libraries of the GNU Octave language
 
 Package: liboctave-dev
 Architecture: any
-Depends: liboctave1 (= ${binary:Version}), octave (= ${binary:Version}), ${misc:Depends},
+Depends: liboctave2 (= ${binary:Version}), octave (= ${binary:Version}), ${misc:Depends},
  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/liboctave-dev.install b/debian/liboctave-dev.install
index 4e81362..ce45516 100755
--- a/debian/liboctave-dev.install
+++ b/debian/liboctave-dev.install
@@ -5,5 +5,4 @@ examples/ /usr/share/doc/liboctave-dev/
 usr/include  /usr
 debian/defs.make /usr/share/octave/debian/
 usr/lib/${DEB_HOST_MULTIARCH}/liboctave.so /usr/lib/${DEB_HOST_MULTIARCH}
-usr/lib/${DEB_HOST_MULTIARCH}/libcruft.so /usr/lib/${DEB_HOST_MULTIARCH}
 usr/lib/${DEB_HOST_MULTIARCH}/liboctinterp.so /usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/liboctave1.install b/debian/liboctave1.install
deleted file mode 100755
index 8db377d..0000000
--- a/debian/liboctave1.install
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/dh-exec
-
-usr/lib/${DEB_HOST_MULTIARCH}/liboctave.so.1* /usr/lib/${DEB_HOST_MULTIARCH}
-
-usr/lib/${DEB_HOST_MULTIARCH}/libcruft.so.1* /usr/lib/${DEB_HOST_MULTIARCH}
-
-usr/lib/${DEB_HOST_MULTIARCH}/liboctinterp.so.1* /usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/liboctave2.install b/debian/liboctave2.install
new file mode 100755
index 0000000..54d680a
--- /dev/null
+++ b/debian/liboctave2.install
@@ -0,0 +1,5 @@
+#!/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/rules b/debian/rules
index db8aea7..22a55f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,10 +43,6 @@ override_dh_shlibdeps:
 	dh_shlibdeps -O--parallel
 	find debian/octave -name '*.oct' -print0 2>/dev/null | xargs -0r chmod 644
 
-# Latest version containing a backward-compatible API change (see policy 8.6.2)
-override_dh_makeshlibs:
-	dh_makeshlibs -V 'liboctave1 (>= 3.6.2)'
-
 get-orig-source:
 	uscan --force-download --rename --destdir .
 .PHONY: get-orig-source

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