[med-svn] r13426 - in trunk/packages/ginkgocadx/trunk/debian: . patches

[Dmitry Smirnov]

Author: onlyjob
Date: 2013-04-26 07:53:44 +0000 (Fri, 26 Apr 2013)
New Revision: 13426

Added:
   trunk/packages/ginkgocadx/trunk/debian/patches/series
   trunk/packages/ginkgocadx/trunk/debian/patches/unbundle-libjsoncpp.patch
Modified:
   trunk/packages/ginkgocadx/trunk/debian/changelog
   trunk/packages/ginkgocadx/trunk/debian/control
Log:
New upstream release [3.3.0.757.27]

Modified: trunk/packages/ginkgocadx/trunk/debian/changelog
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/changelog	2013-04-26 05:57:25 UTC (rev 13425)
+++ trunk/packages/ginkgocadx/trunk/debian/changelog	2013-04-26 07:53:44 UTC (rev 13426)
@@ -1,9 +1,12 @@
-ginkgocadx (3.2.0.634.25-1~exp2) UNRELEASED; urgency=low
+ginkgocadx (3.3.0.757.27-1~exp0) UNRELEASED; urgency=low
 
-  [ Dmitry Smirnov ]
+  * New upstream release [April 2013]
+    + new B-D: "libjsoncpp-dev".
+    + new patch "unbundle-libjsoncpp.patch" to avoid building bundled
+      libjsoncpp-dev.
   * Removed unnecessary versioned Build-Depends.
 
- -- Andreas Tille <tille at debian.org>  Thu, 11 Apr 2013 11:39:24 +0200
+ -- Dmitry Smirnov <onlyjob at debian.org>  Fri, 26 Apr 2013 17:32:12 +1000
 
 ginkgocadx (3.2.0.634.25-1~exp0) experimental; urgency=low
 

Modified: trunk/packages/ginkgocadx/trunk/debian/control
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/control	2013-04-26 05:57:25 UTC (rev 13425)
+++ trunk/packages/ginkgocadx/trunk/debian/control	2013-04-26 07:53:44 UTC (rev 13426)
@@ -16,6 +16,7 @@
               ,libgdcm2-dev
               ,libgtk2.0-dev
               ,libinsighttoolkit3-dev (>= 3.20.0)
+              ,libjsoncpp-dev
               ,libmysqlclient-dev (>= 5.1.57)
               ,libsqlite3-dev
               ,libssl-dev

Added: trunk/packages/ginkgocadx/trunk/debian/patches/series
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/series	2013-04-26 07:53:44 UTC (rev 13426)
@@ -0,0 +1 @@
+unbundle-libjsoncpp.patch

Added: trunk/packages/ginkgocadx/trunk/debian/patches/unbundle-libjsoncpp.patch
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/unbundle-libjsoncpp.patch	                        (rev 0)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/unbundle-libjsoncpp.patch	2013-04-26 07:53:44 UTC (rev 13426)
@@ -0,0 +1,51 @@
+Last-Update: 2013-04-26
+Forwarded: not-needed
+Author: Dmitry Smirnov <onlyjob at member.fsf.org>
+Description: don't build bundled jsoncpp, link with system libjsoncpp-dev instead.
+
+--- a/src/cadxcore/CMakeLists.txt
++++ b/src/cadxcore/CMakeLists.txt
+@@ -76,9 +76,8 @@
+ IF(NOT USE_SYSTEM_SQLITE)
+ AUX_SOURCE_DIRECTORY(sqlite SRCS)
+ ENDIF()
+ 
+-AUX_SOURCE_DIRECTORY(jsoncpp SRCS)
+ 
+ AUX_SOURCE_DIRECTORY(endpoint SRCS)
+ 
+ AUX_SOURCE_DIRECTORY(vtk SRCS)
+@@ -135,15 +134,21 @@
+ 	${CMAKE_CURRENT_SOURCE_DIR}/wx
+ 	${CMAKE_CURRENT_SOURCE_DIR}/wx/VTK
+ 	${CMAKE_CURRENT_SOURCE_DIR}/VTKInria3D
+ 	${CMAKE_CURRENT_SOURCE_DIR}/VTKInria3D/wxVTK
+-	${CMAKE_CURRENT_SOURCE_DIR}/jsoncpp
+ 	CACHE INTERNAL ""
+ )
+ 
+ INCLUDE_DIRECTORIES(${PROJECT_NAME} ${${PROJECT_NAME}_INCLUDE_DIR} )
+ 
+ ################ LIBS ################
++FIND_PATH(libjsoncpp_INCLUDE_DIR json/json.h
++/usr/include/jsoncpp
++)
++INCLUDE_DIRECTORIES(${libjsoncpp_INCLUDE_DIR})
++set(libjsoncpp_LIBRARIES jsoncpp)
++MESSAGE("libjsoncpp_LIBRARIES=${libjsoncpp_LIBRARIES} libjsoncpp_INCLUDE_DIR=${libjsoncpp_INCLUDE_DIR}")
++
+ ADD_DEFINITIONS(${libcurl_defines})
+ INCLUDE_DIRECTORIES(${libcurl_INCLUDE_DIR})
+ LINK_DIRECTORIES(${libcurl_DIR})
+ #MESSAGE("LIBCURLLibx = ${libcurl_LIBRARIES} LIBCURL_include = ${libcurl_INCLUDE_DIR}  LIBCURL_LINK_DIR= ${libcurl_DIR} LIBCURL_DEFINES=${libcurl_defines}")
+@@ -260,8 +265,10 @@
+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/pt/cadxcore.mo DESTINATION share/ginkgocadx/lang/pt)
+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/tr/cadxcore.mo DESTINATION share/ginkgocadx/lang/tr)
+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/conformance.xml DESTINATION share/ginkgocadx)
+ ################ LIBS ################
++TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${libjsoncpp_LIBRARIES})
++
+ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${libcurl_LIBRARIES})
+ 
+ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${wxWidgets_LIBRARIES})
+