[med-svn] [Git][med-team/populations][master] 8 commits: Depends: s/libqt4-xml/libqt5xml5/
Andreas Tille
gitlab at salsa.debian.org
Mon Dec 23 12:15:02 GMT 2019
Andreas Tille pushed to branch master at Debian Med / populations
Commits:
0b2975d1 by Andreas Tille at 2019-12-23T11:50:10Z
Depends: s/libqt4-xml/libqt5xml5/
- - - - -
0e61995d by Andreas Tille at 2019-12-23T11:50:24Z
routine-update: debhelper-compat 12
- - - - -
61fd439e by Andreas Tille at 2019-12-23T11:50:28Z
routine-update: Standards-Version: 4.4.1
- - - - -
ca3af61f by Andreas Tille at 2019-12-23T11:50:29Z
R-U: Trailing whitespace in debian/rules
- - - - -
5c9634df by Andreas Tille at 2019-12-23T11:50:31Z
Use secure URI in Homepage field.
Fixes lintian: homepage-field-uses-insecure-uri
See https://lintian.debian.org/tags/homepage-field-uses-insecure-uri.html for more details.
- - - - -
3f8fb744 by Andreas Tille at 2019-12-23T11:55:26Z
routine-update: Ready to upload to unstable
- - - - -
cd334e41 by Andreas Tille at 2019-12-23T12:08:49Z
Refresh patches
- - - - -
952d5a39 by Andreas Tille at 2019-12-23T12:10:40Z
Upload to unstable
- - - - -
6 changed files:
- debian/changelog
- − debian/compat
- debian/control
- debian/patches/fix-ftbfs-gcc-4.7-667327.patch
- debian/patches/qt5.patch
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+populations (1.2.33+svn0120106+dfsg-3) unstable; urgency=medium
+
+ * Team upload
+ * Depends: s/libqt4-xml/libqt5xml5/
+ Closes: #947227
+ * debhelper-compat 12
+ * Standards-Version: 4.4.1
+ * Remove trailing whitespace in debian/rules
+ * Use secure URI in Homepage field.
+
+ -- Andreas Tille <tille at debian.org> Mon, 23 Dec 2019 13:09:16 +0100
+
populations (1.2.33+svn0120106+dfsg-2) unstable; urgency=medium
* Team upload.
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11
=====================================
debian/control
=====================================
@@ -3,7 +3,7 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
Uploaders: Georges Khaznadar <georgesk at ofset.org>
Section: science
Priority: optional
-Build-Depends: debhelper (>= 11~),
+Build-Depends: debhelper-compat (= 12),
cmake,
qt5-qmake,
qtbase5-dev,
@@ -18,16 +18,16 @@ Build-Depends: debhelper (>= 11~),
libxext-dev,
libxrender-dev,
zlib1g-dev
-Standards-Version: 4.2.1
+Standards-Version: 4.4.1
Vcs-Browser: https://salsa.debian.org/med-team/populations
Vcs-Git: https://salsa.debian.org/med-team/populations.git
-Homepage: http://www.bioinformatics.org/~tryphon/populations/
+Homepage: https://www.bioinformatics.org/~tryphon/populations/
Package: populations
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- libqt4-xml
+ libqt5xml5
Description: population genetic software
Populations is a population genetic software. It computes genetic
distances between populations or individuals. It builds phylogenetic
=====================================
debian/patches/fix-ftbfs-gcc-4.7-667327.patch
=====================================
@@ -2,8 +2,8 @@ Author: gregor herrmann
Last-Update: 2012-04-21 13:12:39 +0200
Description: Enable building with gcc-4.7
---- a/src/vecteurs.h 2012-04-14 01:04:00.875307000 -0400
-+++ b/src/vecteurs.h 2012-04-14 01:04:06.531306699 -0400
+--- a/src/vecteurs.h
++++ b/src/vecteurs.h
@@ -86,7 +86,7 @@ public:
}
=====================================
debian/patches/qt5.patch
=====================================
@@ -2,86 +2,8 @@ Author: Andreas Tille <tille at debian.org>
Last-Update: Fri, 17 Nov 2017 21:49:33 +0100
Description: Try to upgrade from Qt4 to Qt5
-Index: populations-collab/CMakeFiles/Makefile.cmake
-===================================================================
---- populations-collab.orig/CMakeFiles/Makefile.cmake
-+++ /dev/null
-@@ -1,71 +0,0 @@
--# CMAKE generated file: DO NOT EDIT!
--# Generated by "Unix Makefiles" Generator, CMake Version 2.8
--
--# The generator used is:
--SET(CMAKE_DEPENDS_GENERATOR "Unix Makefiles")
--
--# The top level Makefile was generated from the following files:
--SET(CMAKE_MAKEFILE_DEPENDS
-- "CMakeCache.txt"
-- "CMakeFiles/CMakeCCompiler.cmake"
-- "CMakeFiles/CMakeCXXCompiler.cmake"
-- "CMakeFiles/CMakeSystem.cmake"
-- "CMakeLists.txt"
-- "src/CMakeLists.txt"
-- "src/config.h.cmake"
-- "/usr/share/cmake-2.8/Modules/CMakeCCompiler.cmake.in"
-- "/usr/share/cmake-2.8/Modules/CMakeCInformation.cmake"
-- "/usr/share/cmake-2.8/Modules/CMakeCXXCompiler.cmake.in"
-- "/usr/share/cmake-2.8/Modules/CMakeCXXInformation.cmake"
-- "/usr/share/cmake-2.8/Modules/CMakeCommonLanguageInclude.cmake"
-- "/usr/share/cmake-2.8/Modules/CMakeDetermineCCompiler.cmake"
-- "/usr/share/cmake-2.8/Modules/CMakeDetermineCXXCompiler.cmake"
-- "/usr/share/cmake-2.8/Modules/CMakeDetermineCompilerABI.cmake"
-- "/usr/share/cmake-2.8/Modules/CMakeDetermineCompilerId.cmake"
-- "/usr/share/cmake-2.8/Modules/CMakeDetermineSystem.cmake"
-- "/usr/share/cmake-2.8/Modules/CMakeFindBinUtils.cmake"
-- "/usr/share/cmake-2.8/Modules/CMakeGenericSystem.cmake"
-- "/usr/share/cmake-2.8/Modules/CMakeParseArguments.cmake"
-- "/usr/share/cmake-2.8/Modules/CMakeParseImplicitLinkInfo.cmake"
-- "/usr/share/cmake-2.8/Modules/CMakeSystem.cmake.in"
-- "/usr/share/cmake-2.8/Modules/CMakeSystemSpecificInformation.cmake"
-- "/usr/share/cmake-2.8/Modules/CMakeTestCCompiler.cmake"
-- "/usr/share/cmake-2.8/Modules/CMakeTestCXXCompiler.cmake"
-- "/usr/share/cmake-2.8/Modules/CMakeTestCompilerCommon.cmake"
-- "/usr/share/cmake-2.8/Modules/CPack.cmake"
-- "/usr/share/cmake-2.8/Modules/CPackComponent.cmake"
-- "/usr/share/cmake-2.8/Modules/CheckSymbolExists.cmake"
-- "/usr/share/cmake-2.8/Modules/Compiler/GNU-C.cmake"
-- "/usr/share/cmake-2.8/Modules/Compiler/GNU-CXX.cmake"
-- "/usr/share/cmake-2.8/Modules/Compiler/GNU.cmake"
-- "/usr/share/cmake-2.8/Modules/FindPackageHandleStandardArgs.cmake"
-- "/usr/share/cmake-2.8/Modules/FindPackageMessage.cmake"
-- "/usr/share/cmake-2.8/Modules/FindQt4.cmake"
-- "/usr/share/cmake-2.8/Modules/MacroAddFileDependencies.cmake"
-- "/usr/share/cmake-2.8/Modules/Platform/Linux-GNU-C.cmake"
-- "/usr/share/cmake-2.8/Modules/Platform/Linux-GNU-CXX.cmake"
-- "/usr/share/cmake-2.8/Modules/Platform/Linux-GNU.cmake"
-- "/usr/share/cmake-2.8/Modules/Platform/Linux.cmake"
-- "/usr/share/cmake-2.8/Modules/Platform/UnixPaths.cmake"
-- "/usr/share/cmake-2.8/Modules/Qt4ConfigDependentSettings.cmake"
-- "/usr/share/cmake-2.8/Modules/Qt4Macros.cmake"
-- "/usr/share/cmake-2.8/Modules/UseQt4.cmake"
-- "/usr/share/cmake-2.8/Templates/CPackConfig.cmake.in"
-- )
--
--# The corresponding makefile is:
--SET(CMAKE_MAKEFILE_OUTPUTS
-- "Makefile"
-- "CMakeFiles/cmake.check_cache"
-- )
--
--# Byproducts of CMake generate step:
--SET(CMAKE_MAKEFILE_PRODUCTS
-- "CMakeFiles/CMakeDirectoryInformation.cmake"
-- "src/CMakeFiles/CMakeDirectoryInformation.cmake"
-- )
--
--# Dependency information for all targets:
--SET(CMAKE_DEPEND_INFO_FILES
-- "src/CMakeFiles/populations.dir/DependInfo.cmake"
-- )
-Index: populations-collab/src/CMakeLists.txt
-===================================================================
---- populations-collab.orig/src/CMakeLists.txt
-+++ populations-collab/src/CMakeLists.txt
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
@@ -1,14 +1,22 @@
-# this command finds Qt4 libraries and sets all required variables
=====================================
debian/rules
=====================================
@@ -8,7 +8,7 @@ DESTDIR=debian/populations
export QT_SELECT=qt5
%:
- dh $@
+ dh $@
override_dh_auto_configure:
cmake -DCMAKE_INSTALL_PREFIX=/usr .
View it on GitLab: https://salsa.debian.org/med-team/populations/compare/23838b99c75472e290620747efe450dbf886014a...952d5a392c302d071a894ac2f1bf2a9e545fae46
--
View it on GitLab: https://salsa.debian.org/med-team/populations/compare/23838b99c75472e290620747efe450dbf886014a...952d5a392c302d071a894ac2f1bf2a9e545fae46
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20191223/3097500a/attachment-0001.html>
More information about the debian-med-commit
mailing list