[med-svn] [Git][med-team/beads][upstream] 2 commits: New upstream version 1.1.18
Andreas Tille
gitlab at salsa.debian.org
Mon Feb 19 14:12:46 UTC 2018
Andreas Tille pushed to branch upstream at Debian Med / beads
Commits:
cd0f5a9f by Andreas Tille at 2018-02-19T13:24:07+01:00
New upstream version 1.1.18
- - - - -
232a717c by Andreas Tille at 2018-02-19T13:26:58+01:00
New upstream version 1.1.18+dfsg
- - - - -
9 changed files:
- − .gitignore
- .kdev4/beads.kdev4
- CMakeLists.txt
- debian/beads.install
- debian/changelog
- debian/control
- debian/rules
- src/CMakeLists.txt
- src/config.h
Changes:
=====================================
.gitignore deleted
=====================================
--- a/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.project
-build
-src/config.h
=====================================
.kdev4/beads.kdev4
=====================================
--- a/.kdev4/beads.kdev4
+++ b/.kdev4/beads.kdev4
@@ -4,20 +4,14 @@ BuildItems=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x01\x00\x00\x00\x0b\x00\x00\x
[CMake]
Build Directory Count=1
Current Build Directory Index=0
-ProjectRootRelative=./
[CMake][CMake Build Directory 0]
-Build Directory Path=file:///home/langella/developpement/git/beads/build
-Build Type=
-CMake Binary=file:///usr/bin/cmake
+Build Directory Path=/home/olivier/eclipse/git/beads/build
+Build Type=Debug
+CMake Binary=/usr/bin/cmake
Environment Profile=
Extra Arguments=
-Install Directory=file:///usr/local
-
-[Defines And Includes][Compiler]
-Name=GCC
-Path=gcc
-Type=GCC
+Install Directory=
[Project]
VersionControlSupport=kdevgit
=====================================
CMakeLists.txt
=====================================
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,7 +75,7 @@ SET(CMAKE_CXX_FLAGS_DEBUG "-g -s")
SET(CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG")
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
-SET (BEADS_VERSION "1.1.17")
+SET (BEADS_VERSION "1.1.18")
SET(CPACK_CMAKE_GENERATOR "Unix Makefiles")
SET(CPACK_GENERATOR "STGZ;TGZ;TZ")
@@ -111,6 +111,7 @@ SET(CPACK_SOURCE_IGNORE_FILES
"moc_.*cxx"
"/devel_archives/"
"/build/"
+ "/buildw64/"
"/cbuild/"
"/figures/"
".*\\\\.so"
@@ -127,6 +128,7 @@ SET(CPACK_SOURCE_IGNORE_FILES
"CPackConfig.cmake"
"CPackSourceConfig.cmake"
"install_manifest.txt"
+ ".gitignore"
"/CMakeFiles/"
"/_CPack_Packages/"
"/Debug/"
=====================================
debian/beads.install
=====================================
--- a/debian/beads.install
+++ b/debian/beads.install
@@ -1 +1 @@
-/usr/*
+usr/*
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+beads (1.1.17-2) stretch; urgency=medium
+
+ * better debian package
+
+ -- Olivier Langella <olivier.langella at u-psud.fr> Fri, 16 Feb 2018 06:57:23 +0100
+
beads (1.1.17-1) stretch; urgency=medium
* move to QT5
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -27,4 +27,6 @@ Depends: ${shlibs:Depends},
libodsstream-qt5-0
Pre-Depends: ${misc:Pre-Depends}
Description: 2-DE electrophoresis gel image spot detection
- 2-DE electrophoresis gel image spot detection
+ BEADS is a program for spot detection on 2-D gel images. It is based on
+ an analogy with beads flowing uphill on the surface of the gel image and
+ on the analysis of their paths (Langella & Zivy, 2008).
=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -3,13 +3,15 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
export DESTDIR=$(CURDIR)/debian/tmp
%:
dh $@ --buildsystem=cmake --parallel
override_dh_auto_configure:
- dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH=1
+ dh_auto_configure -- -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH=1 -DDEBIAN_PACKAGE=1
override_dh_auto_install:
dh_auto_install -- DESTDIR=$(DESTDIR)
=====================================
src/CMakeLists.txt
=====================================
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,7 +6,25 @@ list( APPEND CMAKE_MODULE_PATH
)
set (CImg_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/src/cimg")
-find_package( CImg REQUIRED )
+
+if (DEBIAN_PACKAGE)
+# CImg_FOUND - system has CImg lib
+ set (CImg_FOUND 1)
+# CImg_INCLUDE_DIRS - the CImg include directory
+ set (CImg_INCLUDE_DIR "/usr/include")
+# CImg_SYSTEM_LIBS - external libraries that CImg uses
+ set (CImg_SYSTEM_LIBS "/usr/lib${LIB_SUFFIX}/libz.so"
+ "/usr/lib${LIB_SUFFIX}/libpng16.so"
+ "/usr/lib${LIB_SUFFIX}/libjpeg.so"
+ "/usr/lib${LIB_SUFFIX}/libtiff.so")
+# CImg_SYSTEM_LIBS_DIR - external library directories
+ set (CImg_SYSTEM_LIBS_DIR "")
+# CImg_CFLAGS - compilation flags
+ set (CImg_CFLAGS "pthread" "-Dcimg_use_png" "-Dcimg_use_jpeg" "-Dcimg_use_tiff" "-Dcimg_use_zlib")
+
+else (DEBIAN_PACKAGE)
+ find_package( CImg REQUIRED )
+endif (DEBIAN_PACKAGE)
# Add CIMG Flags to Compilation Flags
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CIMG_CFLAGS}")
@@ -75,7 +93,7 @@ SET_TARGET_PROPERTIES(beads
)
target_link_libraries (beads cppbeads
- ${ODSSTREAM_QT5_LIBRARY} ${CImg_SYSTEM_LIBS} Qt5::Core Qt5::Gui Qt5::Xml)
+ ${ODSSTREAM_QT5_LIBRARY} ${CImg_SYSTEM_LIBS} ${CImg_CFLAGS} Qt5::Core Qt5::Gui Qt5::Xml)
add_library ( cppbeads STATIC
@@ -90,7 +108,7 @@ SET_TARGET_PROPERTIES(cppbeads
CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CImg_CFLAGS}"
)
target_link_libraries (cppbeads
- ${ODSSTREAM_QT5_LIBRARY} ${CImg_SYSTEM_LIBS} Qt5::Core Qt5::Gui Qt5::Xml)
+ ${ODSSTREAM_QT5_LIBRARY} ${CImg_SYSTEM_LIBS} ${CImg_CFLAGS} Qt5::Core Qt5::Gui Qt5::Xml)
SUBDIRS (qtbeads)
=====================================
src/config.h
=====================================
--- a/src/config.h
+++ b/src/config.h
@@ -1,7 +1,7 @@
#ifndef _CONFIG_H
#define _CONFIG_H
-#define BEADS_VERSION "1.1.17"
+#define BEADS_VERSION "1.1.18"
#define cimg_display 0
View it on GitLab: https://salsa.debian.org/med-team/beads/compare/785b0ffd47c07da4622def12e5212c50f161a446...232a717c64e20af5db4657cbb10058f682a5e569
---
View it on GitLab: https://salsa.debian.org/med-team/beads/compare/785b0ffd47c07da4622def12e5212c50f161a446...232a717c64e20af5db4657cbb10058f682a5e569
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debian-med-commit/attachments/20180219/b08552c4/attachment-0001.html>
More information about the debian-med-commit
mailing list