[med-svn] r19826 - in trunk/packages/orthanc/trunk/debian: . ThirdPartyDownloads source

[Sebastien Jodogne]

Author: jodogne-guest
Date: 2015-08-03 14:20:51 +0000 (Mon, 03 Aug 2015)
New Revision: 19826

Added:
   trunk/packages/orthanc/trunk/debian/ThirdPartyDownloads/glog-0.3.2.tar.gz
Modified:
   trunk/packages/orthanc/trunk/debian/control
   trunk/packages/orthanc/trunk/debian/rules
   trunk/packages/orthanc/trunk/debian/source/include-binaries
Log:
circumvent Debian bug #792649 in libgoogle-glog-dev

Added: trunk/packages/orthanc/trunk/debian/ThirdPartyDownloads/glog-0.3.2.tar.gz
===================================================================
(Binary files differ)


Property changes on: trunk/packages/orthanc/trunk/debian/ThirdPartyDownloads/glog-0.3.2.tar.gz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/packages/orthanc/trunk/debian/control
===================================================================
--- trunk/packages/orthanc/trunk/debian/control	2015-08-03 13:56:35 UTC (rev 19825)
+++ trunk/packages/orthanc/trunk/debian/control	2015-08-03 14:20:51 UTC (rev 19826)
@@ -14,7 +14,6 @@
                libcharls-dev,
                libcurl4-openssl-dev | libcurl4-dev,
                libdcmtk2-dev,
-               libgoogle-glog-dev (>= 0.3.3),
                libgtest-dev (>= 1.6.0),
                libjs-jquery (>= 1.7.2),
                libjsoncpp-dev,

Modified: trunk/packages/orthanc/trunk/debian/rules
===================================================================
--- trunk/packages/orthanc/trunk/debian/rules	2015-08-03 13:56:35 UTC (rev 19825)
+++ trunk/packages/orthanc/trunk/debian/rules	2015-08-03 14:20:51 UTC (rev 19826)
@@ -11,16 +11,22 @@
 %:
 	dh $@ --parallel --builddirectory=Build
 
+
+# Remarks about the flags to CMake below:
+# -DUSE_SYSTEM_GOOGLE_LOG:BOOL=OFF => to remove once Debian bug #792649 is fixed
+# -DCMAKE_BUILD_TYPE="" => The build type must be left empty, see #711515
+
 CMAKE_EXTRA_FLAGS += \
 	-DCMAKE_SKIP_RPATH:BOOL=ON \
 	-DSTATIC_BUILD:BOOL=OFF \
 	-DSTANDALONE_BUILD:BOOL=ON \
 	-DUSE_SYSTEM_MONGOOSE:BOOL=OFF \
+	-DUSE_SYSTEM_GOOGLE_LOG:BOOL=OFF \
 	-DUSE_GTEST_DEBIAN_SOURCE_PACKAGE:BOOL=ON \
 	-DDCMTK_DICTIONARY_DIR:PATH=/usr/share/libdcmtk2 \
 	-DDCMTK_LIBRARIES:STRING=dcmjpls \
 	-DUNIT_TESTS_WITH_HTTP_CONNEXIONS:BOOL=OFF \
-	-DCMAKE_BUILD_TYPE=""   # The build type must be left empty, see #711515
+	-DCMAKE_BUILD_TYPE=""
 
 override_dh_auto_configure:
         # Put 3rd party packages where the cmake build system expects them

Modified: trunk/packages/orthanc/trunk/debian/source/include-binaries
===================================================================
--- trunk/packages/orthanc/trunk/debian/source/include-binaries	2015-08-03 13:56:35 UTC (rev 19825)
+++ trunk/packages/orthanc/trunk/debian/source/include-binaries	2015-08-03 14:20:51 UTC (rev 19826)
@@ -1,3 +1,4 @@
+debian/ThirdPartyDownloads/glog-0.3.2.tar.gz
 debian/ThirdPartyDownloads/mongoose-3.8.tgz
 debian/JS/jquery.mobile-1.1.0/images/icons-18-white.png
 debian/JS/jquery.mobile-1.1.0/images/icons-36-white.png