.gitignore

-.project
-build
-src/config.h

.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

@@ -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

-/usr/*
+usr/*

debian/changelog

+beads (1.1.17-2) stretch; urgency=medium
+
+  * better debian package
+
+ -- Olivier Langella <olivier.langella@u-psud.fr>  Fri, 16 Feb 2018 06:57:23 +0100
+
 beads (1.1.17-1) stretch; urgency=medium
 
   * move to QT5

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

@@ -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

@@ -6,7 +6,25 @@ list( APPEND CMAKE_MODULE_PATH
 )
 
 set (CImg_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/src/cimg")
+
+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

 #ifndef _CONFIG_H
 #define _CONFIG_H
 
-#define BEADS_VERSION "1.1.17"
+#define BEADS_VERSION "1.1.18"
 
 #define cimg_display 0