Author: malat Date: 2013-03-15 14:07:33 +0000 (Fri, 15 Mar 2013) New Revision: 13189
Modified: trunk/packages/activiz.net/trunk/debian/changelog trunk/packages/activiz.net/trunk/debian/compat trunk/packages/activiz.net/trunk/debian/control trunk/packages/activiz.net/trunk/debian/patches/buildindephack.patch trunk/packages/activiz.net/trunk/debian/patches/donotinstallmummydll.patch trunk/packages/activiz.net/trunk/debian/patches/doxygenversion.patch trunk/packages/activiz.net/trunk/debian/patches/mummy_runtime_path.patch trunk/packages/activiz.net/trunk/debian/patches/remove_testing.patch trunk/packages/activiz.net/trunk/debian/patches/removedoxfromall.patch trunk/packages/activiz.net/trunk/debian/patches/removeusersguide.patch trunk/packages/activiz.net/trunk/debian/patches/vtk_cxx_files.patch trunk/packages/activiz.net/trunk/debian/patches/vtk_hints_location.patch trunk/packages/activiz.net/trunk/debian/rules Log: Prepare next upload Modified: trunk/packages/activiz.net/trunk/debian/changelog =================================================================== --- trunk/packages/activiz.net/trunk/debian/changelog 2013-03-15 13:58:31 UTC (rev 13188) +++ trunk/packages/activiz.net/trunk/debian/changelog 2013-03-15 14:07:33 UTC (rev 13189) @@ -1,3 +1,12 @@ +activiz.net (1:1.0~git20111214-1) unstable; urgency=low + + * New upstream + * Bump Std-Vers to 3.9.4, no changes needed + * Use dh(9), get hardening for free + * Update patches (use DEP3) + + -- Mathieu Malaterre <ma...@debian.org> Fri, 15 Mar 2013 15:06:20 +0100 + activiz.net (1:1.0~git20111123-6) unstable; urgency=low * Installing into the gac. Modified: trunk/packages/activiz.net/trunk/debian/compat =================================================================== --- trunk/packages/activiz.net/trunk/debian/compat 2013-03-15 13:58:31 UTC (rev 13188) +++ trunk/packages/activiz.net/trunk/debian/compat 2013-03-15 14:07:33 UTC (rev 13189) @@ -1 +1 @@ -8 +9 Modified: trunk/packages/activiz.net/trunk/debian/control =================================================================== --- trunk/packages/activiz.net/trunk/debian/control 2013-03-15 13:58:31 UTC (rev 13188) +++ trunk/packages/activiz.net/trunk/debian/control 2013-03-15 14:07:33 UTC (rev 13189) @@ -4,11 +4,11 @@ Maintainer: Debian Med Packaging Team <debian-med-packag...@lists.alioth.debian.org> Uploaders: Mathieu Malaterre <ma...@debian.org>, Andreas Tille <ti...@debian.org> -Build-Depends: debhelper (>= 8), cmake (>= 2.8.3), mummy, +Build-Depends: debhelper (>= 9), cmake (>= 2.8.3), mummy, libkitware-mummy-runtime1.0-cil, gccxml, libvtk5-dev (>= 5.6), mono-devel, cli-common-dev (>= 0.8~) Build-Depends-Indep: doxygen-latex (>= 1.6.2), graphviz -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Homepage: http://www.kitware.com/products/avdownload.php Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/activiz.net/trunk Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/activiz.net/trunk/ Modified: trunk/packages/activiz.net/trunk/debian/patches/buildindephack.patch =================================================================== --- trunk/packages/activiz.net/trunk/debian/patches/buildindephack.patch 2013-03-15 13:58:31 UTC (rev 13188) +++ trunk/packages/activiz.net/trunk/debian/patches/buildindephack.patch 2013-03-15 14:07:33 UTC (rev 13189) @@ -1,8 +1,12 @@ -Index: activiz.net-1.0~git20111123/CMakeLists.txt +Description: Allow build-indep rules by conditionnaly removing doxygen rules +Author: Mathieu Malaterre <ma...@debian.org> +Forwarded: not-needed + +Index: activiz.net-1.0~git20111214/CMakeLists.txt =================================================================== ---- activiz.net-1.0~git20111123.orig/CMakeLists.txt 2012-01-31 17:48:54.000000000 +0100 -+++ activiz.net-1.0~git20111123/CMakeLists.txt 2012-01-31 17:49:39.000000000 +0100 -@@ -1309,6 +1309,7 @@ +--- activiz.net-1.0~git20111214.orig/CMakeLists.txt 2013-03-15 14:59:09.737475717 +0100 ++++ activiz.net-1.0~git20111214/CMakeLists.txt 2013-03-15 14:59:12.089475690 +0100 +@@ -1312,6 +1312,7 @@ IF(NOT DOXYGEN_EXECUTABLE) FIND_PACKAGE(Doxygen) ENDIF(NOT DOXYGEN_EXECUTABLE) @@ -10,7 +14,7 @@ IF(NOT DOXYGEN_EXECUTABLE) MESSAGE(FATAL_ERROR "error: doxygen executable not found. doygen_EXECUTABLE = '${DOXYGEN_EXECUTABLE}'") ENDIF(NOT DOXYGEN_EXECUTABLE) -@@ -1331,6 +1332,7 @@ +@@ -1334,6 +1335,7 @@ ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxygen/Doxyfile ) ADD_DEPENDENCIES(AVDN_doxygen Kitware.VTK) Modified: trunk/packages/activiz.net/trunk/debian/patches/donotinstallmummydll.patch =================================================================== --- trunk/packages/activiz.net/trunk/debian/patches/donotinstallmummydll.patch 2013-03-15 13:58:31 UTC (rev 13188) +++ trunk/packages/activiz.net/trunk/debian/patches/donotinstallmummydll.patch 2013-03-15 14:07:33 UTC (rev 13189) @@ -1,8 +1,13 @@ -Index: activiz.net-5.6.1/CMakeLists.txt +Description: Remove explicitly building targets + Those are build within mummy package +Author: Mathieu Malaterre <ma...@debian.org> +Forwarded: not-needed + +Index: activiz.net-1.0~git20111214/CMakeLists.txt =================================================================== ---- activiz.net-5.6.1.orig/CMakeLists.txt 2011-11-05 16:20:39.000000000 +0100 -+++ activiz.net-5.6.1/CMakeLists.txt 2011-11-05 16:20:41.000000000 +0100 -@@ -1250,8 +1250,8 @@ +--- activiz.net-1.0~git20111214.orig/CMakeLists.txt 2013-03-15 14:58:53.525475903 +0100 ++++ activiz.net-1.0~git20111214/CMakeLists.txt 2013-03-15 14:59:01.341475811 +0100 +@@ -1253,8 +1253,8 @@ ENDIF(CMAKE_CONFIGURATION_TYPES) SET(AVDN_INSTALL_FILES ${AVDN_INSTALL_FILES} Modified: trunk/packages/activiz.net/trunk/debian/patches/doxygenversion.patch =================================================================== --- trunk/packages/activiz.net/trunk/debian/patches/doxygenversion.patch 2013-03-15 13:58:31 UTC (rev 13188) +++ trunk/packages/activiz.net/trunk/debian/patches/doxygenversion.patch 2013-03-15 14:07:33 UTC (rev 13189) @@ -1,3 +1,8 @@ +Description: Allow flexible configuration of doxygen based on system + introspection. Also prefer svg output (instead of png) +Author: Mathieu Malaterre <ma...@debian.org> +Forwarded: not-needed + Index: activiz.net-1.0~git20111123/Doxyfile.in =================================================================== --- activiz.net-1.0~git20111123.orig/Doxyfile.in 2012-01-30 15:34:47.000000000 +0100 Modified: trunk/packages/activiz.net/trunk/debian/patches/mummy_runtime_path.patch =================================================================== --- trunk/packages/activiz.net/trunk/debian/patches/mummy_runtime_path.patch 2013-03-15 13:58:31 UTC (rev 13188) +++ trunk/packages/activiz.net/trunk/debian/patches/mummy_runtime_path.patch 2013-03-15 14:07:33 UTC (rev 13189) @@ -1,8 +1,12 @@ -Index: activizdotnet-5.6.1/CMakeLists.txt +Description: Allow linking to system installed mummy runtime libs +Author: Mathieu Malaterre <ma...@debian.org> +Forwarded: not-needed + +Index: activiz.net-1.0~git20111214/CMakeLists.txt =================================================================== ---- activizdotnet-5.6.1.orig/CMakeLists.txt 2011-02-17 09:05:23.000000000 +0100 -+++ activizdotnet-5.6.1/CMakeLists.txt 2011-02-17 09:11:49.000000000 +0100 -@@ -772,7 +772,8 @@ +--- activiz.net-1.0~git20111214.orig/CMakeLists.txt 2013-03-15 15:04:26.169472154 +0100 ++++ activiz.net-1.0~git20111214/CMakeLists.txt 2013-03-15 15:05:33.009471402 +0100 +@@ -772,12 +772,14 @@ ENDIF(WIN32) ADD_CUSTOM_COMMAND_COPYFILE( @@ -12,3 +16,10 @@ "${exe_dir}/${CMAKE_SHARED_LIBRARY_PREFIX}Kitware.mummy.Runtime.Unmanaged${CMAKE_SHARED_LIBRARY_SUFFIX}" ) + ADD_CUSTOM_COMMAND_COPYFILE( +- "${bin_src_dir}/Kitware.mummy.Runtime.dll" ++ #"${bin_src_dir}/Kitware.mummy.Runtime.dll" ++ "${Mummy_BASE_DIR}/${MUMMY_RUNTIME_UNMANAGED_INSTALL_LIB_DIR}/Kitware.mummy.Runtime.dll" + "${exe_dir}/Kitware.mummy.Runtime.dll" + ) + Modified: trunk/packages/activiz.net/trunk/debian/patches/remove_testing.patch =================================================================== --- trunk/packages/activiz.net/trunk/debian/patches/remove_testing.patch 2013-03-15 13:58:31 UTC (rev 13188) +++ trunk/packages/activiz.net/trunk/debian/patches/remove_testing.patch 2013-03-15 14:07:33 UTC (rev 13189) @@ -1,19 +1,13 @@ -Index: activizdotnet-5.6.1/CMakeLists.txt +Description: remove testing +Author: Mathieu Malaterre <ma...@debian.org> +Forwarded: not-needed + +Index: activiz.net-1.0~git20111214/CMakeLists.txt =================================================================== ---- activizdotnet-5.6.1.orig/CMakeLists.txt 2011-02-17 09:18:54.000000000 +0100 -+++ activizdotnet-5.6.1/CMakeLists.txt 2011-02-17 09:44:15.000000000 +0100 -@@ -799,7 +799,8 @@ - ) +--- activiz.net-1.0~git20111214.orig/CMakeLists.txt 2013-03-15 15:05:39.545471328 +0100 ++++ activiz.net-1.0~git20111214/CMakeLists.txt 2013-03-15 15:05:40.293471319 +0100 +@@ -1150,9 +1150,9 @@ - ADD_CUSTOM_COMMAND_COPYFILE( -- "${bin_src_dir}/Kitware.mummy.Runtime.dll" -+ #"${bin_src_dir}/Kitware.mummy.Runtime.dll" -+ "${Mummy_BASE_DIR}/${MUMMY_RUNTIME_UNMANAGED_INSTALL_LIB_DIR}/Kitware.mummy.Runtime.dll" - "${exe_dir}/Kitware.mummy.Runtime.dll" - ) - -@@ -1146,9 +1147,9 @@ - IF(AVDN_BUILD_IS_TOP_LEVEL) MESSAGE(STATUS "info: AVDN_BUILD_IS_TOP_LEVEL='${AVDN_BUILD_IS_TOP_LEVEL}'") - INCLUDE(CTest) Modified: trunk/packages/activiz.net/trunk/debian/patches/removedoxfromall.patch =================================================================== --- trunk/packages/activiz.net/trunk/debian/patches/removedoxfromall.patch 2013-03-15 13:58:31 UTC (rev 13188) +++ trunk/packages/activiz.net/trunk/debian/patches/removedoxfromall.patch 2013-03-15 14:07:33 UTC (rev 13189) @@ -1,8 +1,12 @@ -Index: activiz.net-5.6.1/CMakeLists.txt +Description: Remove doc target from `make all` rule +Author: Mathieu Malaterre <ma...@debian.org> +Forwarded: not-needed + +Index: activiz.net-1.0~git20111214/CMakeLists.txt =================================================================== ---- activiz.net-5.6.1.orig/CMakeLists.txt 2011-11-05 16:20:41.000000000 +0100 -+++ activiz.net-5.6.1/CMakeLists.txt 2011-11-05 16:20:47.000000000 +0100 -@@ -1328,7 +1328,7 @@ +--- activiz.net-1.0~git20111214.orig/CMakeLists.txt 2013-03-15 14:59:01.341475811 +0100 ++++ activiz.net-1.0~git20111214/CMakeLists.txt 2013-03-15 14:59:06.133475757 +0100 +@@ -1331,7 +1331,7 @@ @ONLY ) Modified: trunk/packages/activiz.net/trunk/debian/patches/removeusersguide.patch =================================================================== --- trunk/packages/activiz.net/trunk/debian/patches/removeusersguide.patch 2013-03-15 13:58:31 UTC (rev 13188) +++ trunk/packages/activiz.net/trunk/debian/patches/removeusersguide.patch 2013-03-15 14:07:33 UTC (rev 13189) @@ -1,8 +1,12 @@ -Index: activiz.net-5.6.1/CMakeLists.txt +Description: Remove installation of PDF doc file, since not shipped +Author: Mathieu Malaterre <ma...@debian.org> +Forwarded: not-needed + +Index: activiz.net-1.0~git20111214/CMakeLists.txt =================================================================== ---- activiz.net-5.6.1.orig/CMakeLists.txt 2011-11-06 17:56:08.000000000 +0000 -+++ activiz.net-5.6.1/CMakeLists.txt 2011-11-06 21:24:31.000000000 +0000 -@@ -1273,7 +1273,6 @@ +--- activiz.net-1.0~git20111214.orig/CMakeLists.txt 2013-03-15 14:59:06.133475757 +0100 ++++ activiz.net-1.0~git20111214/CMakeLists.txt 2013-03-15 14:59:09.737475717 +0100 +@@ -1276,7 +1276,6 @@ ) INSTALL(FILES Modified: trunk/packages/activiz.net/trunk/debian/patches/vtk_cxx_files.patch =================================================================== --- trunk/packages/activiz.net/trunk/debian/patches/vtk_cxx_files.patch 2013-03-15 13:58:31 UTC (rev 13188) +++ trunk/packages/activiz.net/trunk/debian/patches/vtk_cxx_files.patch 2013-03-15 14:07:33 UTC (rev 13189) @@ -1,3 +1,7 @@ +Description: Allow linking to system installed vtk runtime libs +Author: Mathieu Malaterre <ma...@debian.org> +Forwarded: not-needed + Index: activiz.net-5.6.1/CMakeLists.txt =================================================================== --- activiz.net-5.6.1.orig/CMakeLists.txt 2011-02-17 10:05:35.000000000 +0100 Modified: trunk/packages/activiz.net/trunk/debian/patches/vtk_hints_location.patch =================================================================== --- trunk/packages/activiz.net/trunk/debian/patches/vtk_hints_location.patch 2013-03-15 13:58:31 UTC (rev 13188) +++ trunk/packages/activiz.net/trunk/debian/patches/vtk_hints_location.patch 2013-03-15 14:07:33 UTC (rev 13189) @@ -1,8 +1,12 @@ -Index: activiz.net-5.6.1/MummySettings.xml.in +Description: Allow using of system installed vtk (out of source) +Author: Mathieu Malaterre <ma...@debian.org> +Forwarded: not-needed + +Index: activiz.net-1.0~git20111214/MummySettings.xml.in =================================================================== ---- activiz.net-5.6.1.orig/MummySettings.xml.in 2011-10-28 16:14:47.000000000 -0400 -+++ activiz.net-5.6.1/MummySettings.xml.in 2011-10-28 16:15:01.000000000 -0400 -@@ -68,7 +68,7 @@ +--- activiz.net-1.0~git20111214.orig/MummySettings.xml.in 2013-03-15 14:51:38.000000000 +0100 ++++ activiz.net-1.0~git20111214/MummySettings.xml.in 2013-03-15 14:58:56.933475861 +0100 +@@ -73,7 +73,7 @@ endExcludeRegex="^[\t ]*//ETX.*$" countedMethodsRegex="^(CreateInstance|New|NewInstance)$" emitDefaultFactoryMethod="true" @@ -11,7 +15,7 @@ /> <!-- vtkImageData: extra hand-crafted code --> -@@ -88,7 +88,7 @@ +@@ -93,7 +93,7 @@ endExcludeRegex="^[\t ]*//ETX.*$" countedMethodsRegex="^(CreateInstance|New|NewInstance)$" emitDefaultFactoryMethod="true" @@ -20,7 +24,7 @@ /> <!-- vtkImplicitFunction: shadow="true" --> -@@ -106,7 +106,7 @@ +@@ -111,7 +111,7 @@ endExcludeRegex="^[\t ]*//ETX.*$" countedMethodsRegex="^(CreateInstance|New|NewInstance)$" emitDefaultFactoryMethod="true" @@ -29,7 +33,7 @@ /> <!-- vtkObject: extra hand-crafted code --> -@@ -126,7 +126,7 @@ +@@ -131,7 +131,7 @@ endExcludeRegex="^[\t ]*//ETX.*$" countedMethodsRegex="^(CreateInstance|New|NewInstance)$" emitDefaultFactoryMethod="true" @@ -38,7 +42,7 @@ /> <!-- vtkProgrammableAttributeDataFilter: extra hand-crafted code --> -@@ -146,7 +146,7 @@ +@@ -151,7 +151,7 @@ endExcludeRegex="^[\t ]*//ETX.*$" countedMethodsRegex="^(CreateInstance|New|NewInstance)$" emitDefaultFactoryMethod="true" @@ -47,7 +51,7 @@ /> <!-- vtkStringArray: extra hand-crafted code --> -@@ -166,7 +166,7 @@ +@@ -171,7 +171,7 @@ endExcludeRegex="^[\t ]*//ETX.*$" countedMethodsRegex="^(CreateInstance|New|NewInstance)$" emitDefaultFactoryMethod="true" @@ -56,7 +60,7 @@ /> <!-- vtkTimePointUtility: excludeMarkedLines="true" --> -@@ -185,7 +185,7 @@ +@@ -190,7 +190,7 @@ excludeMarkedLines="true" countedMethodsRegex="^(CreateInstance|New|NewInstance)$" emitDefaultFactoryMethod="true" @@ -65,7 +69,7 @@ /> -@@ -204,7 +204,7 @@ +@@ -209,7 +209,7 @@ endExcludeRegex="^[\t ]*//ETX.*$" countedMethodsRegex="^(CreateImageReader2|CreateInstance|MakeTransform|New|NewInstance)$" emitDefaultFactoryMethod="true" Modified: trunk/packages/activiz.net/trunk/debian/rules =================================================================== --- trunk/packages/activiz.net/trunk/debian/rules 2013-03-15 13:58:31 UTC (rev 13188) +++ trunk/packages/activiz.net/trunk/debian/rules 2013-03-15 14:07:33 UTC (rev 13189) @@ -1,9 +1,7 @@ #!/usr/bin/make -f #export DH_VERBOSE=1 -DPKG_EXPORT_BUILDFLAGS = 1 --include /usr/share/dpkg/buildflags.mk -export LDFLAGS=-Wl,--as-needed +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed # dpkg-shlibdeps needs to know where is libKitware.mummy.Runtime.Unmanaged.so export LD_LIBRARY_PATH+=:/usr/lib/cli/Kitware.mummy.Runtime-1.0 _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit