[qwtplot3d] 25/39: Change qt4 package name to libqwtplot3d-qt4-0v5 (Closes: #791264)

[Andreas Tille]

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

tille pushed a commit to branch master
in repository qwtplot3d.

commit 4cd304fb923516a59d1cfdfc00b6ab91c0f21d25
Author: Gudjon I. Gudjonsson <gudjon at gudjon.org>
Date:   Wed Sep 2 05:52:38 2015 +0000

    Change qt4 package name to libqwtplot3d-qt4-0v5 (Closes:  #791264)
---
 debian/changelog                                           |  7 ++-----
 debian/control                                             |  4 ++--
 ...ot3d-qt4-0abi1.install => libqwtplot3d-qt4-0v5.install} |  0
 ...ot3d-qt4-0abi1.symbols => libqwtplot3d-qt4-0v5.symbols} |  2 +-
 debian/patches/01_makefile.patch                           | 14 --------------
 debian/rules                                               | 10 ++--------
 6 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 58a0be0..e30c7b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,15 +7,12 @@ qwtplot3d (0.2.7+svn191-8) unstable; urgency=medium
   * Change debhelper dependency to 9
   * Add hardening flags
   * Add symbols control file
-  * Replace jquery.js with a symbolic link 
   * Fix example makefiles to work with Qt5
   * Update build system
   * Add pkg-kde-tools to build system
-  * Bump SONAME to 0abi1 for qt4 version (Closes: #791264)
-  * Change qt4 package name to libqwtplot3d-qt4-0abi1
-  * Changing OpenGL backend from GL to GLES 2 for ARM
+  * Change qt4 package name to libqwtplot3d-qt4-0v5 (Closes:  #791264)
 
- -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Wed, 26 Aug 2015 08:32:31 +0100
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Tue, 01 Sep 2015 18:49:04 +0100
 
 qwtplot3d (0.2.7+svn191-7) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 4ba2909..013a381 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Package: libqwtplot3d-qt4-dev
 Section: libdevel
 Architecture: any
 Depends: libqt4-dev,
-         libqwtplot3d-qt4-0abi1 (= ${binary:Version}),
+         libqwtplot3d-qt4-0v5 (= ${binary:Version}),
          ${misc:Depends}
 Description: 3D plotting library based on Qt4/OpenGL (development)
  QwtPlot3D is a feature rich Qt/OpenGL-based C++ programming
@@ -31,7 +31,7 @@ Description: 3D plotting library based on Qt4/OpenGL (development)
  .
  This package contains the QwtPlot3D development files for Qt4.
 
-Package: libqwtplot3d-qt4-0abi1
+Package: libqwtplot3d-qt4-0v5
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Conflicts: libqwtplot3d-qt4-0
diff --git a/debian/libqwtplot3d-qt4-0abi1.install b/debian/libqwtplot3d-qt4-0v5.install
similarity index 100%
rename from debian/libqwtplot3d-qt4-0abi1.install
rename to debian/libqwtplot3d-qt4-0v5.install
diff --git a/debian/libqwtplot3d-qt4-0abi1.symbols b/debian/libqwtplot3d-qt4-0v5.symbols
similarity index 99%
rename from debian/libqwtplot3d-qt4-0abi1.symbols
rename to debian/libqwtplot3d-qt4-0v5.symbols
index 9c8b45f..c45435b 100644
--- a/debian/libqwtplot3d-qt4-0abi1.symbols
+++ b/debian/libqwtplot3d-qt4-0v5.symbols
@@ -1,5 +1,5 @@
 # SymbolsHelper-Confirmed: 0.2.7 amd64
-libqwtplot3d-qt4.so.0abi1 libqwtplot3d-qt4-0abi1 #MINVER#
+libqwtplot3d-qt4.so.0 libqwtplot3d-qt4-0v5 #MINVER#
  _Z23qStringComparisonHelperRK7QStringPKc at Base 0.2.7
  (optional=templinst)_ZN5QListI10QByteArrayE13detach_helperEi at Base 0.2.7
  (optional=templinst)_ZN5QListI7QStringE18detach_helper_growEii at Base 0.2.7
diff --git a/debian/patches/01_makefile.patch b/debian/patches/01_makefile.patch
index 19afbac..dea95ff 100644
--- a/debian/patches/01_makefile.patch
+++ b/debian/patches/01_makefile.patch
@@ -84,20 +84,6 @@ Index: qwtplot3d-0.2.7+svn191/qwtplot3d.pro
  TEMPLATE          = lib
  CONFIG           += qt warn_on opengl thread zlib debug
  MOC_DIR           = tmp
-@@ -21,7 +27,12 @@ win32:QMAKE_CXXFLAGS     += $$QMAKE_CFLA
- win32:CONFIG -= zlib
- 
- linux-g++:TMAKE_CXXFLAGS += -fno-exceptions
--unix:VERSION = 0.2.7
-+
-+greaterThan(QT_MAJOR_VERSION, 4) {
-+	unix:VERSION = 0.2.7
-+} else {
-+	unix:VERSION = 0abi1.2.7
-+}
- 
- # Input
- SOURCES += src/qwt3d_axis.cpp \
 @@ -87,9 +98,11 @@ HEADERS+=3rdparty/gl2ps/gl2ps.h \
  SOURCES+=src/qwt3d_io_gl2ps.cpp \
           3rdparty/gl2ps/gl2ps.c
diff --git a/debian/rules b/debian/rules
index 5689cdf..9fc4659 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,20 +31,14 @@ override_dh_auto_install:
 	mkdir -p debian/tmp/usr/include/qwtplot3d-qt4
 	cp -a include/* debian/tmp/usr/include/qwtplot3d-qt4
 	dh_auto_install --builddirectory=build-qt4
-	rm debian/tmp/usr/lib/libqwtplot3d-qt4.so
-	rm debian/tmp/usr/lib/libqwtplot3d-qt4.so.0abi1
-	rm debian/tmp/usr/lib/libqwtplot3d-qt4.so.0abi1.2
-	cd debian/tmp/usr/lib/ && mv libqwtplot3d-qt4.so.0abi1.2.7 libqwtplot3d-qt4.so.0.2.7.abi1
-	cd debian/tmp/usr/lib/ && ln -s libqwtplot3d-qt4.so.0.2.7.abi1 libqwtplot3d-qt4.so
-	cd debian/tmp/usr/lib/ && ln -s libqwtplot3d-qt4.so.0.2.7.abi1 libqwtplot3d-qt4.so.0abi1
 	mkdir -p debian/tmp/usr/include/qwtplot3d
 	cp -a include/* debian/tmp/usr/include/qwtplot3d
 	dh_auto_install --builddirectory=build-qt5
 	find debian/tmp/usr -type f -name '*.md5' -exec rm -vf {} \;
 	find debian/tmp/usr -type f -name '*.js' -exec rm -vf {} \;
 	mkdir -p debian/tmp/usr/share/doc/libqwtplot3d-doc/html
-	rm -f build-qt4/doc/web/doxygen/jquery.js
-	cd build-qt4/doc/web/doxygen/ && ln -s /usr/share/javascript/jquery/jquery.js .
+	#rm -f build-qt4/doc/web/doxygen/jquery.js
+	#cd build-qt4/doc/web/doxygen/ && ln -s /usr/share/javascript/jquery/jquery.js .
 	cp -a build-qt4/doc/web/doxygen/* debian/tmp/usr/share/doc/libqwtplot3d-doc/html
 
 override_dh_compress-indep:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/qwtplot3d.git