[med-svn] [libbpp-qt] 03/03: Version 2.3.2 (temptative)

[Julien Dutheil]

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

jdutheil-guest pushed a commit to branch master
in repository libbpp-qt.

commit 03f3ccd10cc12073a477a1bd2f7044b1d6d4ffa7
Author: Julien Y. Dutheil <dutheil at evolbio.mpg.de>
Date:   Tue Feb 6 22:25:04 2018 +0100

    Version 2.3.2 (temptative)
    
    debuild complaining
---
 CMakeLists.txt                        |  2 +-
 debian/changelog                      |  8 ++++++++
 debian/control                        | 12 ++++++------
 debian/patches/unforce-cxxflags.patch |  2 +-
 debian/rules                          |  2 +-
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6cb0834..d7a8232 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ cmake_minimum_required (VERSION 2.8.11)
 project (bpp-qt CXX)
 
 # Compile options
-set (CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wshadow -Wconversion")
+set (CMAKE_CXX_FLAGS "-std=c++11 -Wno-deprecated -g")
 
 IF(NOT CMAKE_BUILD_TYPE)
   SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
diff --git a/debian/changelog b/debian/changelog
index 009d0e5..7a7b376 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libbpp-qt (2.3.2-1) UNRELEASED; urgency=medium
+
+  [ Julien Dutheil ]
+  * Standards-Version: 4.1.2 (no changes needed)
+  * Builds against Qt5.
+
+ -- Andreas Tille <tille at debian.org>  Tue, 06 Feb 2018 15:44:23 +0200
+
 libbpp-qt (2.3.1-4) unstable; urgency=medium
 
   [ Julien Dutheil ]
diff --git a/debian/control b/debian/control
index c905763..8c3f010 100644
--- a/debian/control
+++ b/debian/control
@@ -7,10 +7,10 @@ Priority: optional
 Build-Depends: debhelper (>= 10),
                cmake,
                d-shlibs (>= 0.80),
-               qt4-qmake,
-               libqt4-dev,
-               libbpp-phyl-dev (>= 2.3.1)
-Standards-Version: 4.1.0
+               qt5-qmake,
+               qtdeclarative5-dev,
+               libbpp-phyl-dev (>= 2.3.2)
+Standards-Version: 4.1.2
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/libbpp-qt.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/libbpp-qt.git
 Homepage: http://biopp.univ-montp2.fr/wiki/index.php/Main_Page
@@ -20,8 +20,8 @@ Architecture: any
 Section: libdevel
 Depends: libbpp-qt1 (= ${binary:Version}),
          ${misc:Depends},
-         libbpp-phyl-dev (>= 2.3.1),
-         libqt4-dev
+         libbpp-phyl-dev (>= 2.3.2),
+         qtdeclarative5-dev
 Description: Bio++ Qt Graphic classes library development files
  Bio++ is a set of C++ libraries for Bioinformatics, including sequence
  analysis, phylogenetics, molecular evolution and population genetics.
diff --git a/debian/patches/unforce-cxxflags.patch b/debian/patches/unforce-cxxflags.patch
index 719c88a..7cafbdd 100644
--- a/debian/patches/unforce-cxxflags.patch
+++ b/debian/patches/unforce-cxxflags.patch
@@ -11,7 +11,7 @@ Comment: Upstream version 2.3.0 now has additional -std=c++11 which might
  
  # Compile options
 -set (CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wshadow -Wconversion")
-+# set (CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wshadow -Wconversion")
++set (CMAKE_CXX_FLAGS "-std=c++11 -Wno-deprecated -g")
  
  IF(NOT CMAKE_BUILD_TYPE)
    SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
diff --git a/debian/rules b/debian/rules
index 5fc04d4..73f9a0b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ override_dh_install:
 	d-shlibmove --commit \
 		    --multiarch \
 		    --devunversioned \
-		    --override s/libQtGui4-dev/libqt4-dev/ \
+		    --override s/libQtGui5-dev/libqt5-dev/ \
 		    --exclude-la \
                     --movedev debian/tmp/usr/include/* usr/include \
                     --movedev debian/tmp/usr/lib/*/cmake usr/lib/$(DEB_HOST_MULTIARCH) \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libbpp-qt.git