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

[Andreas Tille]

Author: tille
Date: 2014-06-17 06:18:53 +0000 (Tue, 17 Jun 2014)
New Revision: 17191

Modified:
   trunk/packages/ginkgocadx/trunk/debian/changelog
   trunk/packages/ginkgocadx/trunk/debian/copyright
   trunk/packages/ginkgocadx/trunk/debian/patches/fix-wx.patch
   trunk/packages/ginkgocadx/trunk/debian/patches/unbundle-libjsoncpp.patch
Log:
New upstream version


Modified: trunk/packages/ginkgocadx/trunk/debian/changelog
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/changelog	2014-06-16 21:29:30 UTC (rev 17190)
+++ trunk/packages/ginkgocadx/trunk/debian/changelog	2014-06-17 06:18:53 UTC (rev 17191)
@@ -1,3 +1,11 @@
+ginkgocadx (3.6.1.1367.34+dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream version (adapt patches)
+  * debian/copyright: document removal of src/cadxcore/jsoncpp in
+    get-orig-source target
+
+ -- Andreas Tille <tille at debian.org>  Tue, 17 Jun 2014 08:20:07 +0200
+
 ginkgocadx (3.6.0.1228.33+dfsg-1) unstable; urgency=low
 
   * New upstream release [December 2013]

Modified: trunk/packages/ginkgocadx/trunk/debian/copyright
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/copyright	2014-06-16 21:29:30 UTC (rev 17190)
+++ trunk/packages/ginkgocadx/trunk/debian/copyright	2014-06-17 06:18:53 UTC (rev 17191)
@@ -2,6 +2,7 @@
 Upstream-Name: Ginkgo CADx
 Upstream-Contact: Carlos Barrales <carlos.barrales at metaemotion.com>
 Source: http://ginkgo-cadx.com
+Files-Excluded: src/cadxcore/jsoncpp
 
 Files: *
 Copyright: 2011      MetaEmotion Healthcare. http://healthcare.metaemotion.com

Modified: trunk/packages/ginkgocadx/trunk/debian/patches/fix-wx.patch
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/fix-wx.patch	2014-06-16 21:29:30 UTC (rev 17190)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/fix-wx.patch	2014-06-17 06:18:53 UTC (rev 17191)
@@ -1,4 +1,4 @@
-Last-Update: 2013-07-21
+Last-Update: Tue, 17 Jun 2014 08:20:07 +0200
 Forwarded: no
 Author: Dmitry Smirnov <onlyjob at member.fsf.org>
 Description: fix FTBFS due to missing "-lwx_gtk2u_html-2.8"
@@ -7,14 +7,12 @@
 
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -52,9 +52,9 @@
- ENDIF()
+@@ -53,7 +53,7 @@ ENDIF()
  
  IF(NOT USE_CUSTOM_WX)
  MESSAGE("Using system wxWidgets")
--FIND_PACKAGE(wxWidgets 2.8.11 COMPONENTS core base gl net xml aui adv richtext xrc REQUIRED)
-+FIND_PACKAGE(wxWidgets 2.8.11 COMPONENTS core base html gl net xml aui adv richtext xrc REQUIRED)
+-FIND_PACKAGE(wxWidgets 3.0.0 COMPONENTS core base gl net xml aui adv richtext xrc REQUIRED)
++FIND_PACKAGE(wxWidgets 3.0.0 COMPONENTS core base html gl net xml aui adv richtext xrc REQUIRED)
  ELSE()
  MESSAGE("Using custom wxWidgets")
  SET_CUSTOM_wxWidgets_PACKAGE()
- ENDIF()

Modified: trunk/packages/ginkgocadx/trunk/debian/patches/unbundle-libjsoncpp.patch
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/unbundle-libjsoncpp.patch	2014-06-16 21:29:30 UTC (rev 17190)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/unbundle-libjsoncpp.patch	2014-06-17 06:18:53 UTC (rev 17191)
@@ -5,8 +5,7 @@
 
 --- a/src/cadxcore/CMakeLists.txt
 +++ b/src/cadxcore/CMakeLists.txt
-@@ -76,9 +76,8 @@
- IF(NOT USE_SYSTEM_SQLITE)
+@@ -78,7 +78,6 @@ IF(NOT USE_SYSTEM_SQLITE)
  AUX_SOURCE_DIRECTORY(sqlite SRCS)
  ENDIF()
  
@@ -14,9 +13,7 @@
  
  AUX_SOURCE_DIRECTORY(endpoint SRCS)
  
- AUX_SOURCE_DIRECTORY(vtk SRCS)
-@@ -135,15 +134,21 @@
- 	${CMAKE_CURRENT_SOURCE_DIR}/wx
+@@ -137,13 +136,19 @@ SET(${PROJECT_NAME}_INCLUDE_DIR
  	${CMAKE_CURRENT_SOURCE_DIR}/wx/VTK
  	${CMAKE_CURRENT_SOURCE_DIR}/VTKInria3D
  	${CMAKE_CURRENT_SOURCE_DIR}/VTKInria3D/wxVTK
@@ -37,9 +34,7 @@
  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)
+@@ -262,6 +267,8 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR
  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 ################
@@ -48,4 +43,3 @@
  TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${libcurl_LIBRARIES})
  
  TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${wxWidgets_LIBRARIES})
-