r36392 - in /packages/openigtlink/trunk/debian: changelog patches/10_all_changes.diff rules
domibel-guest at users.alioth.debian.org
domibel-guest at users.alioth.debian.org
Sat Apr 17 20:06:58 UTC 2010
Author: domibel-guest
Date: Sat Apr 17 20:06:56 2010
New Revision: 36392
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36392
Log:
patches have been pushed upstream
Modified:
packages/openigtlink/trunk/debian/changelog
packages/openigtlink/trunk/debian/patches/10_all_changes.diff
packages/openigtlink/trunk/debian/rules
Modified: packages/openigtlink/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/openigtlink/trunk/debian/changelog?rev=36392&op=diff
==============================================================================
--- packages/openigtlink/trunk/debian/changelog (original)
+++ packages/openigtlink/trunk/debian/changelog Sat Apr 17 20:06:56 2010
@@ -1,3 +1,9 @@
+openigtlink (1.0.0~svn6270-1) unstable; urgency=low
+
+ * new upstream snaphot
+
+ -- Dominique Belhachemi <domibel at cs.tu-berlin.de> Sat, 17 Apr 2010 07:42:13 -0400
+
openigtlink (1.0.0~svn5602-1) unstable; urgency=low
* Switch to dpkg-source 3.0 (quilt) format
Modified: packages/openigtlink/trunk/debian/patches/10_all_changes.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/openigtlink/trunk/debian/patches/10_all_changes.diff?rev=36392&op=diff
==============================================================================
--- packages/openigtlink/trunk/debian/patches/10_all_changes.diff (original)
+++ packages/openigtlink/trunk/debian/patches/10_all_changes.diff Sat Apr 17 20:06:56 2010
@@ -1582,100 +1582,3 @@
-# used. If set to NO the values of all tags below this one will be ignored.
-
-SEARCHENGINE = NO
-Index: openigtlink-1.0.0~svn5602/Testing/igtlMultiThreaderTest1.cxx
-===================================================================
---- openigtlink-1.0.0~svn5602.orig/Testing/igtlMultiThreaderTest1.cxx 2010-04-14 11:21:36.000000000 -0400
-+++ openigtlink-1.0.0~svn5602/Testing/igtlMultiThreaderTest1.cxx 2010-04-14 11:21:41.000000000 -0400
-@@ -44,8 +44,13 @@
- #define EXIT_FAILURE 1
-
- // NOTE: (NUM_THREAD + NUM_REPEAT) < 32 on 32-bit environment
-+#ifdef OpenIGTLink_USE_PTHREADS
- #define NUM_THREAD 5
- #define NUM_REPEAT 4
-+#else
-+#define NUM_THREAD 1
-+#define NUM_REPEAT 4
-+#endif
-
-
- typedef struct {
-Index: openigtlink-1.0.0~svn5602/Testing/igtlMultiThreaderTest2.cxx
-===================================================================
---- openigtlink-1.0.0~svn5602.orig/Testing/igtlMultiThreaderTest2.cxx 2010-04-14 11:21:36.000000000 -0400
-+++ openigtlink-1.0.0~svn5602/Testing/igtlMultiThreaderTest2.cxx 2010-04-14 11:21:41.000000000 -0400
-@@ -44,8 +44,13 @@
- #define EXIT_FAILURE 1
-
- // NOTE: (NUM_THREAD + NUM_REPEAT) < 32 on 32-bit environment
-+#ifdef OpenIGTLink_USE_PTHREADS
- #define NUM_THREAD 5
- #define NUM_REPEAT 4
-+#else
-+#define NUM_THREAD 0
-+#define NUM_REPEAT 4
-+#endif
-
-
- typedef struct {
-@@ -198,11 +203,13 @@
-
- threader->SetNumberOfThreads(NUM_THREAD);
- threader->SetMultipleMethod(0, (igtl::ThreadFunctionType) &ThreadFunction1, &td);
-+#ifdef OpenIGTLink_USE_PTHREADS
- threader->SetMultipleMethod(1, (igtl::ThreadFunctionType) &ThreadFunction2, &td);
- threader->SetMultipleMethod(2, (igtl::ThreadFunctionType) &ThreadFunction3, &td);
- threader->SetMultipleMethod(3, (igtl::ThreadFunctionType) &ThreadFunction4, &td);
- threader->SetMultipleMethod(4, (igtl::ThreadFunctionType) &ThreadFunction5, &td);
- threader->MultipleMethodExecute();
-+#endif
-
- int answer = 0x00000001;
- answer <<= (NUM_THREAD * NUM_REPEAT);
-Index: openigtlink-1.0.0~svn5602/Testing/igtlMultiThreaderTest3.cxx
-===================================================================
---- openigtlink-1.0.0~svn5602.orig/Testing/igtlMultiThreaderTest3.cxx 2010-04-14 11:21:36.000000000 -0400
-+++ openigtlink-1.0.0~svn5602/Testing/igtlMultiThreaderTest3.cxx 2010-04-14 11:21:41.000000000 -0400
-@@ -44,8 +44,13 @@
- #define EXIT_FAILURE 1
-
- // NOTE: (NUM_THREAD + NUM_REPEAT) < 32 on 32-bit environment
-+#ifdef OpenIGTLink_USE_PTHREADS
- #define NUM_THREAD 5
- #define NUM_REPEAT 4
-+#else
-+#define NUM_THREAD 0
-+#define NUM_REPEAT 4
-+#endif
-
-
- typedef struct {
-@@ -97,6 +102,7 @@
-
- igtl::MultiThreader::Pointer threader = igtl::MultiThreader::New();
-
-+#ifdef OpenIGTLink_USE_PTHREADS
- int id1 = threader->SpawnThread((igtl::ThreadFunctionType) &ThreadFunction, &td);
- int id2 = threader->SpawnThread((igtl::ThreadFunctionType) &ThreadFunction, &td);
- int id3 = threader->SpawnThread((igtl::ThreadFunctionType) &ThreadFunction, &td);
-@@ -109,6 +115,7 @@
- threader->TerminateThread(id3);
- threader->TerminateThread(id4);
- threader->TerminateThread(id5);
-+#endif
-
- int answer = 0x00000001;
- answer <<= (NUM_THREAD * NUM_REPEAT);
-Index: openigtlink-1.0.0~svn5602/Source/igtlObjectFactoryBase.cxx
-===================================================================
---- openigtlink-1.0.0~svn5602.orig/Source/igtlObjectFactoryBase.cxx 2010-04-14 11:23:53.000000000 -0400
-+++ openigtlink-1.0.0~svn5602/Source/igtlObjectFactoryBase.cxx 2010-04-14 11:24:23.000000000 -0400
-@@ -472,7 +472,7 @@
- i != m_OverrideMap->end(); ++i)
- {
- os << indent << "Class : " << (*i).first.c_str() << "\n";
-- os << indent << "Overriden with: " << (*i).second.m_OverrideWithName.c_str()
-+ os << indent << "Overridden with: " << (*i).second.m_OverrideWithName.c_str()
- << std::endl;
- os << indent << "Enable flag: " << (*i).second.m_EnabledFlag
- << std::endl;
Modified: packages/openigtlink/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/openigtlink/trunk/debian/rules?rev=36392&op=diff
==============================================================================
--- packages/openigtlink/trunk/debian/rules (original)
+++ packages/openigtlink/trunk/debian/rules Sat Apr 17 20:06:56 2010
@@ -70,7 +70,7 @@
$(MAKE) $(JOBS) -C $(STATIC_BUILD_PATH)
# perform tests ('-' ignores return values)
- cd $(STATIC_BUILD_PATH) && ctest -VV
+ - cd $(STATIC_BUILD_PATH) && ctest -VV
# build shared libs and binaries
$(MAKE) $(JOBS) -C $(SHARED_BUILD_PATH)
More information about the debian-science-commits
mailing list