This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository iqtree.
commit ce88f8c81928efcee4385da57bb82ba6a236cfdc Author: Andreas Tille <[email protected]> Date: Thu Jan 19 08:35:09 2017 +0100 New upstream version --- debian/changelog | 6 ++++++ debian/patches/32bit_name.patch | 16 ---------------- debian/patches/avoid_mavx.patch | 30 ------------------------------ debian/patches/series | 3 --- debian/patches/sse.patch | 37 ------------------------------------- 5 files changed, 6 insertions(+), 86 deletions(-) diff --git a/debian/changelog b/debian/changelog index 43f4430..d15f8c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +iqtree (1.5.3+dfsg-1) UNRELEASED; urgency=medium + + * New upstream version + + -- Andreas Tille <[email protected]> Thu, 19 Jan 2017 08:34:48 +0100 + iqtree (1.5.2+dfsg-1) unstable; urgency=medium * New upstream version 1.5.2+dfsg (Closes: #846958) diff --git a/debian/patches/32bit_name.patch b/debian/patches/32bit_name.patch deleted file mode 100644 index 6db8167..0000000 --- a/debian/patches/32bit_name.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Do not append 32 to binary name if build on 32bit architecture -Bug-Debian: https://bugs.debian.org/813437 -Author: Andreas Tille <[email protected]> -Last-Update: Tue, 02 Feb 2016 08:41:45 +0100 - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -170,7 +170,7 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 4 OR IQTREE - if (CMAKE_GENERATOR MATCHES "Win64") - error("Both 32-bit and 64-bit mode cannot be specified") - endif() -- SET(EXE_SUFFIX "${EXE_SUFFIX}32") -+ SET(EXE_SUFFIX "${EXE_SUFFIX}") - if (GCC OR CLANG) - set(COMBINED_FLAGS "${COMBINED_FLAGS} -m32") - endif() diff --git a/debian/patches/avoid_mavx.patch b/debian/patches/avoid_mavx.patch deleted file mode 100644 index a7e5c65..0000000 --- a/debian/patches/avoid_mavx.patch +++ /dev/null @@ -1,30 +0,0 @@ -Description: Do not use -mavx flag - Attention: This patch is disabled since otherwise the compilation fails - due to preprocessor directive inside the code - . - Note: Bug # 813438 report says: - "... bearing in mind that it's best to avoid - this option even on *amd64 because it normally limits the portability - of the resulting binaries (unless code relying on the extension is - carefully predicated on a CPUID test)?" - . - It needs to be discussed with upstream whether those CPUID tests are - done or not. -Bug-Debian: https://bugs.debian.org/813438 -Author: Andreas Tille <[email protected]> -Last-Update: Tue, 02 Feb 2016 08:41:45 +0100 - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -222,9 +222,9 @@ SET(AVX_FLAGS "-D__AVX") - if (VCC) - set(AVX_FLAGS "${AVX_FLAGS} /arch:AVX") - elseif (CLANG) -- set(AVX_FLAGS "${AVX_FLAGS} -mavx") -+ set(AVX_FLAGS "${AVX_FLAGS} ") - elseif (GCC) -- set(AVX_FLAGS "${AVX_FLAGS} -mavx -fabi-version=0") -+ set(AVX_FLAGS "${AVX_FLAGS} ") - elseif (ICC) - if (WIN32) - set(AVX_FLAGS "${AVX_FLAGS} /arch:AVX") diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index ca743d3..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,3 +0,0 @@ -#sse.patch -#32bit_name.patch -#avoid_mavx.patch diff --git a/debian/patches/sse.patch b/debian/patches/sse.patch deleted file mode 100644 index 4848fa6..0000000 --- a/debian/patches/sse.patch +++ /dev/null @@ -1,37 +0,0 @@ -Description: Do not use -m32 and -msse3 flags -Bug-Debian: https://bugs.debian.org/813436 -Author: Andreas Tille <[email protected]> -Last-Update: Tue, 02 Feb 2016 08:41:45 +0100 - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -172,7 +172,7 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 4 OR IQTREE - endif() - SET(EXE_SUFFIX "${EXE_SUFFIX}32") - if (GCC OR CLANG) -- set(COMBINED_FLAGS "${COMBINED_FLAGS} -m32") -+ set(COMBINED_FLAGS "${COMBINED_FLAGS}") - endif() - add_definitions(-DBINARY32) - else() -@@ -237,7 +237,7 @@ SET(SSE_FLAGS "") - if (VCC) - set(SSE_FLAGS "/arch:SSE2 -D__SSE3__") - elseif (GCC OR CLANG) -- set(SSE_FLAGS "-msse3") -+ set(SSE_FLAGS "-msse2") - elseif (ICC) - if (WIN32) - set(SSE_FLAGS "/arch:SSE3") -@@ -272,8 +272,9 @@ elseif (IQTREE_FLAGS MATCHES "avx") # AV - set(COMBINED_FLAGS "${COMBINED_FLAGS} ${AVX_FLAGS}") - SET(EXE_SUFFIX "${EXE_SUFFIX}-avx") - else() #SSE intruction set -- message("Vectorization : SSE3") -- add_definitions(-D__SSE3) -+ #message("Vectorization : SSE3") -+ #add_definitions(-D__SSE3) -+ message("Vectorization : SSE2") - endif() - - -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/iqtree.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
