[Pkg-octave-commit] [octave] 01/02: Revert "Rename liboctave3 to liboctave3v5 for g++-5 transition."

[Sébastien Villemot]

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

sebastien pushed a commit to branch jessie-backports
in repository octave.

commit 2df82eeeb3377b55623b9a3460b234d0ccf27d52
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Fri Jan 1 18:42:31 2016 +0100

    Revert "Rename liboctave3 to liboctave3v5 for g++-5 transition."
    
    This reverts commit a54064f8b00b0f2a49271bc8f89f7e3ee13549c2.
---
 debian/control                                      | 8 +++-----
 debian/{liboctave3v5.install => liboctave3.install} | 0
 debian/liboctave3v5.lintian-overrides               | 2 --
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index e9373f7..f295cec 100644
--- a/debian/control
+++ b/debian/control
@@ -63,7 +63,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}),
-         liboctave3v5 (= ${binary:Version})
+         liboctave3 (= ${binary:Version})
 Recommends: gnuplot-x11 | gnuplot-qt, libopenblas-base | libatlas3-base,
  pstoedit,
  default-jre-headless [!hppa !hurd-i386 !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mipsel !sparc !sparc64],
@@ -209,12 +209,10 @@ 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: liboctave3v5
+Package: liboctave3
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: liboctave3
-Replaces: liboctave3
 Multi-Arch: same
 Section: libs
 Description: Shared libraries of the GNU Octave language
@@ -227,7 +225,7 @@ Description: Shared libraries of the GNU Octave language
 Package: liboctave-dev
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- liboctave3v5 (= ${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-mpich-dev (>= 1.8.8),
  libgl1-mesa-dev | libgl-dev,
diff --git a/debian/liboctave3v5.install b/debian/liboctave3.install
similarity index 100%
rename from debian/liboctave3v5.install
rename to debian/liboctave3.install
diff --git a/debian/liboctave3v5.lintian-overrides b/debian/liboctave3v5.lintian-overrides
deleted file mode 100644
index 4e31887..0000000
--- a/debian/liboctave3v5.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# G++5 ABI transition
-liboctave3v5: package-name-doesnt-match-sonames liboctave3

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