Author: onlyjob Date: 2015-01-01 02:30:57 +0000 (Thu, 01 Jan 2015) New Revision: 18551
Removed: trunk/packages/ginkgocadx/trunk/debian/patches/fix-wx.patch trunk/packages/ginkgocadx/trunk/debian/patches/ginkgocadx-wxdebug.patch trunk/packages/ginkgocadx/trunk/debian/patches/skip-cn-translation.patch trunk/packages/ginkgocadx/trunk/debian/patches/wx3.0-compat.patch Modified: trunk/packages/ginkgocadx/trunk/debian/changelog trunk/packages/ginkgocadx/trunk/debian/copyright trunk/packages/ginkgocadx/trunk/debian/patches/series trunk/packages/ginkgocadx/trunk/debian/patches/unbundle-libjsoncpp.patch Log: New upstream release [3.7.1.1573.41] Modified: trunk/packages/ginkgocadx/trunk/debian/changelog =================================================================== --- trunk/packages/ginkgocadx/trunk/debian/changelog 2015-01-01 02:30:38 UTC (rev 18550) +++ trunk/packages/ginkgocadx/trunk/debian/changelog 2015-01-01 02:30:57 UTC (rev 18551) @@ -1,3 +1,10 @@ +ginkgocadx (3.7.1.1573.41+dfsg-1) UNRELEASED; urgency=medium + + * New upstream release [December 2014]. + * Standards-Version: 3.9.6. + + -- Dmitry Smirnov <[email protected]> Thu, 01 Jan 2015 12:18:14 +1100 + ginkgocadx (3.7.0.1465.37+dfsg-1) unstable; urgency=low * New upstream release [June 2014] (Closes: #740703). Modified: trunk/packages/ginkgocadx/trunk/debian/copyright =================================================================== --- trunk/packages/ginkgocadx/trunk/debian/copyright 2015-01-01 02:30:38 UTC (rev 18550) +++ trunk/packages/ginkgocadx/trunk/debian/copyright 2015-01-01 02:30:57 UTC (rev 18551) @@ -30,22 +30,28 @@ Comment: See text of license at http://www.gzip.org/zlib/zlib_license.html -Files: src/cadxcore/main/controllers/dcmtk/libi2d/i2d.cpp - src/cadxcore/main/controllers/dcmtk/libi2d/i2d.h - src/cadxcore/main/controllers/dcmtk/libi2d/i2dimgs.h - src/cadxcore/main/controllers/dcmtk/libi2d/i2djpgs.cpp - src/cadxcore/main/controllers/dcmtk/libi2d/i2djpgs.h - src/cadxcore/main/controllers/dcmtk/libi2d/i2doutpl.h - src/cadxcore/main/controllers/dcmtk/libi2d/i2dplnsc.cpp - src/cadxcore/main/controllers/dcmtk/libi2d/i2dplnsc.h - src/cadxcore/main/controllers/dcmtk/libi2d/i2dplsc.cpp - src/cadxcore/main/controllers/dcmtk/libi2d/i2dplsc.h - src/cadxcore/main/controllers/dcmtk/libi2d/i2dplvlp.cpp - src/cadxcore/main/controllers/dcmtk/libi2d/i2dplvlp.h - src/cadxcore/main/controllers/dcmtk/tls/win-only/* - src/cadxcore/main/controllers/dcmtk/ofstd/* +Files: + src/cadxcore/main/controllers/dcmtk/libi2d/d2dsource.h + src/cadxcore/main/controllers/dcmtk/libi2d/document2dcm.cpp + src/cadxcore/main/controllers/dcmtk/libi2d/document2dcm.h + src/cadxcore/main/controllers/dcmtk/libi2d/foooutpl.h + src/cadxcore/main/controllers/dcmtk/libi2d/i2dimgs.cpp + src/cadxcore/main/controllers/dcmtk/libi2d/i2dimgs.h + src/cadxcore/main/controllers/dcmtk/libi2d/i2djpgs.cpp + src/cadxcore/main/controllers/dcmtk/libi2d/i2djpgs.h + src/cadxcore/main/controllers/dcmtk/libi2d/i2doutpl.h + src/cadxcore/main/controllers/dcmtk/libi2d/i2dplnsc.cpp + src/cadxcore/main/controllers/dcmtk/libi2d/i2dplnsc.h + src/cadxcore/main/controllers/dcmtk/libi2d/i2dplsc.cpp + src/cadxcore/main/controllers/dcmtk/libi2d/i2dplsc.h + src/cadxcore/main/controllers/dcmtk/libi2d/i2dplvlp.cpp + src/cadxcore/main/controllers/dcmtk/libi2d/i2dplvlp.h + src/cadxcore/main/controllers/dcmtk/libi2d/pdf2dsource.cpp + src/cadxcore/main/controllers/dcmtk/libi2d/pdf2dsource.h + src/cadxcore/main/controllers/dcmtk/tls/win-only/* + src/cadxcore/main/controllers/dcmtk/ofstd/* Copyright: Copyright (C) 2001-2007, OFFIS -License: public domain +License: public-domain THIS SOFTWARE IS MADE AVAILABLE, AS IS, AND OFFIS MAKES NO WARRANTY REGARDING THE SOFTWARE, ITS PERFORMANCE, ITS MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR USE, FREEDOM FROM ANY COMPUTER DISEASES OR @@ -99,7 +105,6 @@ See text of license at https://gforge.inria.fr/projects/vtkinria3d/ Files: src/cadxcore/VTKInria3D/wxVTK/* - src/cadxcore/wx/VTK/* src/cadxcore/vtk/vtkopenglginkgotexture.cpp src/cadxcore/vtk/vtkopenglginkgotexture.h src/cadxcore/vtk/vtkSmartVolumeMapper.cxx @@ -183,35 +188,24 @@ ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -Files: src/cadxcore/wx/maxskedtextctrl/* +Files: src/cadxcore/wx/maskedtextctrl/* Copyright: Thomas Härtel License: wxWindows -Files: src/cadxcore/wx/propgrid/* -Copyright: 2005 Jaakko Salli -License: wxWindows - Files: src/cadxcore/wx/thumbnailctrl/thumbnailctrl.* Copyright: Julian Smart License: wxWindows -Files: src/cadxcore/wx/treelistctrl/* -Copyright: 2004-2011 Robert Roebling, Julian Smart, - Alberto Griggio, Vadim Zeitlin, Otto Wyss, Ronan Chartois -License: wxWindows - -Files: src/cadxcore/wx/wxhttpengine/* -Copyright: 2001-2005 Angelo Mandato (http://www.spaceblue.com) -License: wxWindows - Files: src/cadxcore/wx/wxsqlite3/* Copyright: Ulrich Telle License: wxWindows -Files: lang/de/*.po - lang/ja/*.po - lang/pt/*.po - lang/tr/*.po +Files: + src/visualizator/lang/de/*.po + src/cadxcore/lang/de/*.po + src/cadxcore/lang/ja/*.po + src/cadxcore/lang/pt*/*.po + src/cadxcore/lang/tr/*.po Copyright: 2011-2012 Rosetta Contributors 2011-2012 Canonical Ltd License: LGPL-3+ Deleted: trunk/packages/ginkgocadx/trunk/debian/patches/fix-wx.patch =================================================================== --- trunk/packages/ginkgocadx/trunk/debian/patches/fix-wx.patch 2015-01-01 02:30:38 UTC (rev 18550) +++ trunk/packages/ginkgocadx/trunk/debian/patches/fix-wx.patch 2015-01-01 02:30:57 UTC (rev 18551) @@ -1,22 +0,0 @@ -Last-Update: 2014-09-15 -Forwarded: yes -Author: Dmitry Smirnov <[email protected]> -Description: fix FTBFS - ~~~~ - /tmp/buildd/ginkgocadx-3.7.0.1465.37+dfsg/src/cadxcore/main/gui/paneltags/paneltagsbase.cpp:21: undefined reference to `wxPropertyGrid::wxPropertyGrid(wxWindow*, int, wxPoint const&, wxSize const&, long, wxString const&)' - collect2: error: ld returned 1 exit status - ginkgocadx/CMakeFiles/ginkgocadx.dir/build.make:147: recipe for target 'ginkgocadx/ginkgocadx' failed - ~~~~ - ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -53,8 +53,9 @@ - - IF(NOT USE_CUSTOM_WX) - MESSAGE("Using system wxWidgets") - FIND_PACKAGE(wxWidgets 3.0.0 COMPONENTS core base html 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 propgrid REQUIRED) - ELSE() - MESSAGE("Using custom wxWidgets") - SET_CUSTOM_wxWidgets_PACKAGE() - ENDIF() Deleted: trunk/packages/ginkgocadx/trunk/debian/patches/ginkgocadx-wxdebug.patch =================================================================== --- trunk/packages/ginkgocadx/trunk/debian/patches/ginkgocadx-wxdebug.patch 2015-01-01 02:30:38 UTC (rev 18550) +++ trunk/packages/ginkgocadx/trunk/debian/patches/ginkgocadx-wxdebug.patch 2015-01-01 02:30:57 UTC (rev 18551) @@ -1,29 +0,0 @@ -Last-Update: 2014-09-20 -Forwarded: yes -Author: Olly Betts <[email protected]> -Description: Fix degfaults with wxwidgets3.0 - "export DEB_CPPFLAGS_MAINT_APPEND=-DNDEBUG" ir required for this patch to work. - - ~~~~ - /usr/include/wx-3.0/wx/strvararg.h(456): assert "(argtype & (wxFormatStringSpecifier<T>::value)) == argtype" failed in wxArgNormalizer(): format specifier doesn't match argument type - Trace/breakpoint trap - ~~~~ - ---- a/src/cadxcore/api/initwx.cpp -+++ b/src/cadxcore/api/initwx.cpp -@@ -218,13 +218,15 @@ - IMPLEMENT_APP_NO_MAIN(Ginkgo) - #if defined(_WIN32) - int WINAPI InitWX(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) - { -+ wxDISABLE_DEBUG_SUPPORT(); - return wxEntry(hInstance, hPrevInstance, lpCmdLine, nCmdShow); - } - #else - int InitWX(int argc, char** argv) - { -+ wxDISABLE_DEBUG_SUPPORT(); - return wxEntry(argc, argv); - } - #endif - Modified: trunk/packages/ginkgocadx/trunk/debian/patches/series =================================================================== --- trunk/packages/ginkgocadx/trunk/debian/patches/series 2015-01-01 02:30:38 UTC (rev 18550) +++ trunk/packages/ginkgocadx/trunk/debian/patches/series 2015-01-01 02:30:57 UTC (rev 18551) @@ -1,5 +1 @@ -fix-wx.patch -skip-cn-translation.patch unbundle-libjsoncpp.patch -wx3.0-compat.patch -ginkgocadx-wxdebug.patch Deleted: trunk/packages/ginkgocadx/trunk/debian/patches/skip-cn-translation.patch =================================================================== --- trunk/packages/ginkgocadx/trunk/debian/patches/skip-cn-translation.patch 2015-01-01 02:30:38 UTC (rev 18550) +++ trunk/packages/ginkgocadx/trunk/debian/patches/skip-cn-translation.patch 2015-01-01 02:30:57 UTC (rev 18551) @@ -1,39 +0,0 @@ -Last-Update: 2014-09-15 -Forwarded: yes -Author: Dmitry Smirnov <[email protected]> -Description: fix FTBFS - ~~~~ - CMake Error at cadxcore/cmake_install.cmake:104 (file): - file INSTALL cannot find - "/tmp/buildd/ginkgocadx-3.7.0.1465.37+dfsg/src/cadxcore/lang/cn/cadxcore.mo". - Call Stack (most recent call first): - cmake_install.cmake:37 (include) - - Makefile:69: recipe for target 'install' failed - ~~~~ - ---- a/src/cadxcore/CMakeLists.txt -+++ b/src/cadxcore/CMakeLists.txt -@@ -251,10 +251,8 @@ - INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/resources/files/magnifier_bar DESTINATION share/ginkgocadx/resources/cadxcore) - INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/resources/files/menu_icons DESTINATION share/ginkgocadx/resources/cadxcore) - INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/resources/files/progress_bar DESTINATION share/ginkgocadx/resources/cadxcore) - INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/resources/files/windowlevel_bar DESTINATION share/ginkgocadx/resources/cadxcore) --INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/cn/cadxcore.mo DESTINATION share/ginkgocadx/lang/cn) --INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/cn/wxstd.mo DESTINATION share/ginkgocadx/lang/cn) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/de/cadxcore.mo DESTINATION share/ginkgocadx/lang/de) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/de/wxstd.mo DESTINATION share/ginkgocadx/lang/de) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/el/wxstd.mo DESTINATION share/ginkgocadx/lang/el) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/el/cadxcore.mo DESTINATION share/ginkgocadx/lang/el) ---- a/src/visualizator/CMakeLists.txt -+++ b/src/visualizator/CMakeLists.txt -@@ -128,9 +128,8 @@ - INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/resources/files/logos DESTINATION share/ginkgocadx/resources/visualizator) - INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/resources/files/synchronization_bar DESTINATION share/ginkgocadx/resources/visualizator) - INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/resources/files/tool_icons DESTINATION share/ginkgocadx/resources/visualizator) - --INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/cn/visualizator.mo DESTINATION share/ginkgocadx/lang/cn) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/de/visualizator.mo DESTINATION share/ginkgocadx/lang/es) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/de/visualizator.mo DESTINATION share/ginkgocadx/lang/de) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/el/visualizator.mo DESTINATION share/ginkgocadx/lang/el) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/es/visualizator.mo DESTINATION share/ginkgocadx/lang/es) Modified: trunk/packages/ginkgocadx/trunk/debian/patches/unbundle-libjsoncpp.patch =================================================================== --- trunk/packages/ginkgocadx/trunk/debian/patches/unbundle-libjsoncpp.patch 2015-01-01 02:30:38 UTC (rev 18550) +++ trunk/packages/ginkgocadx/trunk/debian/patches/unbundle-libjsoncpp.patch 2015-01-01 02:30:57 UTC (rev 18551) @@ -38,7 +38,7 @@ 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}") -@@ -270,8 +275,10 @@ +@@ -272,8 +277,10 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/tr/wxstd.mo DESTINATION share/ginkgocadx/lang/tr) 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) Deleted: trunk/packages/ginkgocadx/trunk/debian/patches/wx3.0-compat.patch =================================================================== --- trunk/packages/ginkgocadx/trunk/debian/patches/wx3.0-compat.patch 2015-01-01 02:30:38 UTC (rev 18550) +++ trunk/packages/ginkgocadx/trunk/debian/patches/wx3.0-compat.patch 2015-01-01 02:30:57 UTC (rev 18551) @@ -1,28 +0,0 @@ -Last-Update: 2014-06-21 -Forwarded: yes -Author: Olly Betts <[email protected]> -Bug-Debian: http://bugs.debian.org/749487 -Description: Fix to build with wxwidgets3.0 - ~~~~ - /tmp/buildd/ginkgocadx-3.7.0.1465.37+dfsg/src/cadxcore/VTKInria3D/wxVTK/wxVTKRenderWindowInteractor.cpp:153:36: fatal error: wx/gtk/private/win_gtk.h: No such file or directory - #include <wx/gtk/private/win_gtk.h> - ^ - compilation terminated. - cadxcore/CMakeFiles/CADxCore.dir/build.make:8705: recipe for target 'cadxcore/CMakeFiles/CADxCore.dir/VTKInria3D/wxVTK/wxVTKRenderWindowInteractor.cpp.o' failed - ~~~~ - ---- a/src/cadxcore/VTKInria3D/wxVTK/wxVTKRenderWindowInteractor.cpp -+++ b/src/cadxcore/VTKInria3D/wxVTK/wxVTKRenderWindowInteractor.cpp -@@ -147,9 +147,11 @@ - # include <gdk/gdkx.h> // GDK_WINDOW_XWINDOW is found here in wxWidgets 2.8.0 - # include "gdk/gdkprivate.h" - #if wxCHECK_VERSION(2, 8, 0) - #ifdef __WXGTK20__ --#if wxCHECK_VERSION(2, 9, 0) -+#if wxCHECK_VERSION(3, 0, 0) -+#include <gtk/gtk.h> -+#elif wxCHECK_VERSION(2, 9, 0) - #include <gtk/gtk.h> - #include <wx/gtk/private/win_gtk.h> - #else - #include <wx/gtk/win_gtk.h> _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
