[med-svn] [Git][med-team/beads][master] 7 commits: Versioned Build-Depends: libodsstream-qt5-dev (>= 0.4.13-2)
Andreas Tille
gitlab at salsa.debian.org
Mon Feb 19 14:12:40 UTC 2018
Andreas Tille pushed to branch master at Debian Med / beads
Commits:
26af4067 by Andreas Tille at 2018-02-19T13:22:23+01:00
Versioned Build-Depends: libodsstream-qt5-dev (>= 0.4.13-2)
- - - - -
cd0f5a9f by Andreas Tille at 2018-02-19T13:24:07+01:00
New upstream version 1.1.18
- - - - -
ba168f67 by Andreas Tille at 2018-02-19T13:24:09+01:00
Update upstream source from tag 'upstream/1.1.18'
Update to upstream version '1.1.18'
with Debian dir 9f8df97db3d77b32a47f21d97b07ffb3023f6c4d
- - - - -
e58227d1 by Andreas Tille at 2018-02-19T13:24:58+01:00
Another new upstream version
- - - - -
232a717c by Andreas Tille at 2018-02-19T13:26:58+01:00
New upstream version 1.1.18+dfsg
- - - - -
f840155f by Andreas Tille at 2018-02-19T13:26:59+01:00
Update upstream source from tag 'upstream/1.1.18+dfsg'
Update to upstream version '1.1.18+dfsg'
with Debian dir 84474c039bff7e889bece7b49f14b08829cf6864
- - - - -
5a9c0894 by Andreas Tille at 2018-02-19T14:59:36+01:00
Drop unused lintian override, upload to unstable
- - - - -
8 changed files:
- − .gitignore
- .kdev4/beads.kdev4
- CMakeLists.txt
- debian/changelog
- debian/control
- − debian/source/lintian-overrides
- 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/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,14 @@
-beads (1.1.17+dfsg-1) UNRELEASED; urgency=medium
+beads (1.1.18+dfsg-1) unstable; urgency=medium
* New upstream version
* Watch file now reports new upstream URLs (not fit for proper download
yet since some more sophisticated name mangling is needed)
* Standards-Version: 4.1.3
* debhelper 11
- * Build-Depends: libodsstream-qt5-dev
+ * Build-Depends: libodsstream-qt5-dev (>= 0.4.13-2)
+ * Drop unused lintian override
- -- Andreas Tille <tille at debian.org> Mon, 12 Feb 2018 10:22:39 +0100
+ -- Andreas Tille <tille at debian.org> Mon, 19 Feb 2018 13:27:11 +0100
beads (1.1.13+dfsg-2) unstable; urgency=medium
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 11),
cmake,
qtbase5-dev,
qttools5-dev,
- libodsstream-qt5-dev,
+ libodsstream-qt5-dev (>= 0.4.13-2),
cimg-dev
Standards-Version: 4.1.3
Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/beads.git
=====================================
debian/source/lintian-overrides deleted
=====================================
--- a/debian/source/lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# UPstream provides only http no https
-beads source: debian-watch-uses-insecure-uri line 4
=====================================
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/3fe90960dc1e8ef24038fbbeb899943904a756b6...5a9c0894c887ad800a9c9dd7599442b5b33d4511
---
View it on GitLab: https://salsa.debian.org/med-team/beads/compare/3fe90960dc1e8ef24038fbbeb899943904a756b6...5a9c0894c887ad800a9c9dd7599442b5b33d4511
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/d456f1ed/attachment-0001.html>
More information about the debian-med-commit
mailing list