[med-svn] r3086 - in trunk/packages/igstk/trunk/debian: . patches

[domibel-guest at alioth.debian.org]

Author: domibel-guest
Date: 2009-02-05 18:26:38 +0000 (Thu, 05 Feb 2009)
New Revision: 3086

Modified:
   trunk/packages/igstk/trunk/debian/copyright
   trunk/packages/igstk/trunk/debian/patches/34_disable_resource_intensely_tests.dpatch
   trunk/packages/igstk/trunk/debian/rules
Log:
fixed double execution of ctest


Modified: trunk/packages/igstk/trunk/debian/copyright
===================================================================
--- trunk/packages/igstk/trunk/debian/copyright	2009-02-05 18:25:35 UTC (rev 3085)
+++ trunk/packages/igstk/trunk/debian/copyright	2009-02-05 18:26:38 UTC (rev 3086)
@@ -7,8 +7,8 @@
 Files: debian/*
 Copyright: 2008, Dominique Belhachemi <domibel at cs.tu-berlin.de>
 License: GPL-2+
- The Debian packaging is licensed under the GPL,
- see `/usr/share/common-licenses/GPL'
+ The Debian packaging is licensed under the GPL-2,
+ see `/usr/share/common-licenses/GPL-2'
 
 
 Files: Utilities/MicronTracker/*

Modified: trunk/packages/igstk/trunk/debian/patches/34_disable_resource_intensely_tests.dpatch
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/34_disable_resource_intensely_tests.dpatch	2009-02-05 18:25:35 UTC (rev 3085)
+++ trunk/packages/igstk/trunk/debian/patches/34_disable_resource_intensely_tests.dpatch	2009-02-05 18:26:38 UTC (rev 3086)
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad igstk-3.0.0~cvs20090203~/Testing/IGSTKTestingMacros.cmake igstk-3.0.0~cvs20090203/Testing/IGSTKTestingMacros.cmake
---- igstk-3.0.0~cvs20090203~/Testing/IGSTKTestingMacros.cmake	2009-02-02 11:26:32.000000000 -0500
-+++ igstk-3.0.0~cvs20090203/Testing/IGSTKTestingMacros.cmake	2009-02-04 08:41:50.000000000 -0500
+--- igstk-3.0.0~cvs20090203~/Testing/IGSTKTestingMacros.cmake	2009-02-04 11:34:21.000000000 -0500
++++ igstk-3.0.0~cvs20090203/Testing/IGSTKTestingMacros.cmake	2009-02-04 11:35:26.000000000 -0500
 @@ -154,9 +154,9 @@
    ADD_TEST( igstkUSImageReaderTest ${IGSTK_TESTS} igstkUSImageReaderTest 
         ${IGSTK_DATA_ROOT}/Input/USLiver)
@@ -30,6 +30,15 @@
    ADD_TEST(igstkCylinderObjectTest ${IGSTK_TESTS} igstkCylinderObjectTest)
    ADD_TEST(igstkEllipsoidObjectTest ${IGSTK_TESTS} igstkEllipsoidObjectTest)
    ADD_TEST(igstkFLTKTextBufferLogOutputTest ${IGSTK_TESTS} igstkFLTKTextBufferLogOutputTest)
+@@ -554,7 +554,7 @@
+  
+ 
+     
+-ENDIF(${IGSTK_USE_FLTK})
++ENDIF(FALSE)
+ 
+ IF(${IGSTK_USE_MicronTracker})
+     ADD_TEST( igstkMicronTrackerTest
 @@ -574,7 +574,7 @@
  
  ENDIF(${IGSTK_USE_MicronTracker})
@@ -39,3 +48,12 @@
      ADD_TEST( igstkQTWidgetTest
                ${IGSTK_TESTS}
                igstkQTWidgetTest)
+@@ -623,7 +623,7 @@
+               ${IGSTK_DATA_ROOT}/Input/E000192 
+               ${IGSTK_TEST_OUTPUT_DIR}/igstkImageResliceScreenShot3.png)
+  
+-ENDIF(${IGSTK_USE_Qt})
++ENDIF(FALSE)
+ 
+ 
+ #-----------------------------------------------------------------------------

Modified: trunk/packages/igstk/trunk/debian/rules
===================================================================
--- trunk/packages/igstk/trunk/debian/rules	2009-02-05 18:25:35 UTC (rev 3085)
+++ trunk/packages/igstk/trunk/debian/rules	2009-02-05 18:26:38 UTC (rev 3086)
@@ -69,14 +69,14 @@
         # build static libs
 	$(MAKE) $(JOBS) -C $(STATIC_BUILD_PATH)
 
-	# perform tests ('-' ignores return values)
-#	cd $(STATIC_BUILD_PATH) && ctest -S ../debian/ctest_config.cmake -VV
-#	- cd $(STATIC_BUILD_PATH) && ctest -D Nightly -VV
+        # build shared libs
+	$(MAKE) $(JOBS) -C $(SHARED_BUILD_PATH)
+
+        # perform tests ('-' ignores return values)
+#       cd $(STATIC_BUILD_PATH) && ctest -S ../debian/ctest_config.cmake -VV
+#       - cd $(STATIC_BUILD_PATH) && ctest -D Nightly -VV
 	- cd $(STATIC_BUILD_PATH) && ctest -VV
 
-        # build shared libs and binaries
-	$(MAKE) $(JOBS) -C $(SHARED_BUILD_PATH)
-
 	touch $@
 
 build-indep: build-indep-stamp