[med-svn] r11923 - in trunk/packages/micromanager/trunk/debian: . patches

Mathieu Malaterre malat at alioth.debian.org
Fri Jul 27 20:44:53 UTC 2012 

Author: malat
Date: 2012-07-27 20:44:53 +0000 (Fri, 27 Jul 2012)
New Revision: 11923

Added:
   trunk/packages/micromanager/trunk/debian/patches/fixcomp.patch
Modified:
   trunk/packages/micromanager/trunk/debian/changelog
   trunk/packages/micromanager/trunk/debian/get-orig-source
   trunk/packages/micromanager/trunk/debian/patches/fixuplibz.patch
   trunk/packages/micromanager/trunk/debian/patches/fixuplinking.patch
   trunk/packages/micromanager/trunk/debian/patches/removeinstallrule.patch
   trunk/packages/micromanager/trunk/debian/patches/series
Log:
Give 1.4.10 a compilation try...

Modified: trunk/packages/micromanager/trunk/debian/changelog
===================================================================
--- trunk/packages/micromanager/trunk/debian/changelog	2012-07-27 20:27:37 UTC (rev 11922)
+++ trunk/packages/micromanager/trunk/debian/changelog	2012-07-27 20:44:53 UTC (rev 11923)
@@ -1,9 +1,5 @@
-micromanager (1.4.6-1) UNRELEASED; urgency=low
+micromanager (1.4.10-1) UNRELEASED; urgency=low
 
   * Initial Debian Upload (Closes: #646853)
 
-  [ Thorsten Alteholz ]
-  * debian/rules get-orig-source: put orig.tar.gz in ../tarballs to allow
-    automatic build with svn-buildpackage
-
  -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Fri, 28 Oct 2011 16:25:32 -0400

Modified: trunk/packages/micromanager/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/micromanager/trunk/debian/get-orig-source	2012-07-27 20:27:37 UTC (rev 11922)
+++ trunk/packages/micromanager/trunk/debian/get-orig-source	2012-07-27 20:44:53 UTC (rev 11923)
@@ -24,8 +24,10 @@
 
 FOLDER=${PACKAGE}-${VERSION}
 
-svn export --quiet -r 7920 https://valelab.ucsf.edu/svn/micromanager2/trunk ${FOLDER}
-# ???
+# svn up -r "{2012-04-19}"
+# however the version.txt only change around ~r9300:
+svn export --quiet -r 9308 https://valelab.ucsf.edu/svn/micromanager2/trunk ${FOLDER}
+# ???
 rm ${FOLDER}/yyyymmdd.exe
 rm -rf ${FOLDER}/bin_Win32
 rm -rf ${FOLDER}/bin_x64
@@ -33,18 +35,18 @@
 rm -rf ${FOLDER}/Install_Win32
 # remove some more dll:
 rm -rf ${FOLDER}/Install_x64
-# remove macosx stuff
+# remove macosx stuff
 rm -rf ${FOLDER}/MacInstaller
 # all drivers are binaries:
 rm -rf ${FOLDER}/drivers
-# cleanup Test_Programs dir:
+# cleanup Test_Programs dir:
 find ${FOLDER}/Test_Programs -type f -name *.dll -delete -o -name *.exe -delete
-# cleanup some files:
+# cleanup some files:
 find ${FOLDER}/DeviceAdapters -type f -name *.sln -delete -o -name *.vcproj -delete -o -name *.suo -delete -o -name *.dll -delete -o -name *.lib -delete
 # wotsit ?
 rm ${FOLDER}/sandbox/mmlaunch/mmlaunch.ncb
 # looks like some kind of dll
-rm ${FOLDER}/DeviceAdapters/AndorSDK3/AndorSDK3.sdf
+#rm ${FOLDER}/DeviceAdapters/AndorSDK3/AndorSDK3.sdf
 # looks like an export SVN rep:
 rm -rf ${FOLDER}/DeviceAdapters/Piper/conf/authz
 rm -rf ${FOLDER}/DeviceAdapters/Piper/conf/dav
@@ -65,7 +67,7 @@
 # FIXME
 # let's remove all .doc file for now. One day we'll have a doc package
 rm ${FOLDER}/doc/*.doc
-rm ${FOLDER}/DeviceAdapters/DiConIlluminator/Properties.doc
+#rm ${FOLDER}/DeviceAdapters/DiConIlluminator/Properties.doc
 
 # TODO. What should I do with TWAIN stuff:
 # ./DeviceAdapters/TwainCamera/twain.h

Added: trunk/packages/micromanager/trunk/debian/patches/fixcomp.patch
===================================================================
--- trunk/packages/micromanager/trunk/debian/patches/fixcomp.patch	                        (rev 0)
+++ trunk/packages/micromanager/trunk/debian/patches/fixcomp.patch	2012-07-27 20:44:53 UTC (rev 11923)
@@ -0,0 +1,33 @@
+--- micromanager-1.4.10.orig/MMCore/Host.cpp
++++ micromanager-1.4.10/MMCore/Host.cpp
+@@ -45,6 +45,7 @@
+ #include <net/if.h>
+ #include <string.h>
+ #include <errno.h>
++#include <unistd.h>
+ #endif // linux
+ 
+ 
+--- micromanager-1.4.10.orig/MMCore/FastLogger.cpp
++++ micromanager-1.4.10/MMCore/FastLogger.cpp
+@@ -508,7 +508,7 @@ void FastLogger::Log(IMMLogger::priority
+ 		}
+ 
+ 		// display the process id
+-		boost::interprocess::detail::OS_process_id_t pidd = boost::interprocess::detail::get_current_process_id();
++		boost::interprocess::ipcdetail::OS_process_id_t pidd = boost::interprocess::ipcdetail::get_current_process_id();
+ 
+ 		std::ostringstream percentPReplacement;
+ 		percentPReplacement << pidd;
+--- micromanager-1.4.10.orig/MMDevice/DeviceUtils.cpp
++++ micromanager-1.4.10/MMDevice/DeviceUtils.cpp
+@@ -29,6 +29,8 @@
+    #include <windows.h>
+    #define snprintf _snprintf 
+ #pragma warning(disable : 4996)
++#else
++#include <unistd.h> // usleep
+ #endif
+ 
+ char CDeviceUtils::m_pszBuffer[MM::MaxStrLength]={""};
+

Modified: trunk/packages/micromanager/trunk/debian/patches/fixuplibz.patch
===================================================================
--- trunk/packages/micromanager/trunk/debian/patches/fixuplibz.patch	2012-07-27 20:27:37 UTC (rev 11922)
+++ trunk/packages/micromanager/trunk/debian/patches/fixuplibz.patch	2012-07-27 20:44:53 UTC (rev 11923)
@@ -1,8 +1,8 @@
-Index: micromanager-1.4.6/configure.in
+Index: micromanager-1.4.10/configure.in
 ===================================================================
---- micromanager-1.4.6.orig/configure.in	2011-10-27 17:27:14.000000000 +0200
-+++ micromanager-1.4.6/configure.in	2011-10-27 17:27:35.000000000 +0200
-@@ -165,13 +165,13 @@
+--- micromanager-1.4.10.orig/configure.in	2012-07-27 20:22:32.000000000 +0000
++++ micromanager-1.4.10/configure.in	2012-07-27 20:23:01.658149804 +0000
+@@ -175,13 +175,13 @@
     else 
        AC_CHECK_HEADERS([$ZLIBINCDIR/zlib.h])
        if test -z "$LIBZLIB" ; then

Modified: trunk/packages/micromanager/trunk/debian/patches/fixuplinking.patch
===================================================================
--- trunk/packages/micromanager/trunk/debian/patches/fixuplinking.patch	2012-07-27 20:27:37 UTC (rev 11922)
+++ trunk/packages/micromanager/trunk/debian/patches/fixuplinking.patch	2012-07-27 20:44:53 UTC (rev 11923)
@@ -11,12 +11,12 @@
 undefined symbol: deflateInit2_	(/usr/lib/jni/libMMCoreJ_wrap.so)
 undefined symbol: pthread_join	(/usr/lib/jni/libMMCoreJ_wrap.so)
 
-Index: micromanager-1.4.6/MMCoreJ_wrap/Makefile.am
+Index: micromanager-1.4.10/MMCoreJ_wrap/Makefile.am
 ===================================================================
---- micromanager-1.4.6.orig/MMCoreJ_wrap/Makefile.am	2011-10-27 17:17:25.000000000 -0400
-+++ micromanager-1.4.6/MMCoreJ_wrap/Makefile.am	2011-10-27 17:18:03.000000000 -0400
-@@ -36,7 +36,7 @@
-         $(top_srcdir)/MMCore/Host.cpp
+--- micromanager-1.4.10.orig/MMCoreJ_wrap/Makefile.am	2012-04-19 17:51:56.000000000 +0000
++++ micromanager-1.4.10/MMCoreJ_wrap/Makefile.am	2012-07-27 20:22:59.066149894 +0000
+@@ -38,7 +38,7 @@
+ 	$(top_srcdir)/MMCore/Host.cpp
   
  #not sure if Boost linking is needed
 -libMMCoreJ_wrap_la_LDFLAGS = -Wl, -module -ldl $(BOOST_LDFLAGS)

Modified: trunk/packages/micromanager/trunk/debian/patches/removeinstallrule.patch
===================================================================
--- trunk/packages/micromanager/trunk/debian/patches/removeinstallrule.patch	2012-07-27 20:27:37 UTC (rev 11922)
+++ trunk/packages/micromanager/trunk/debian/patches/removeinstallrule.patch	2012-07-27 20:44:53 UTC (rev 11923)
@@ -1,8 +1,8 @@
-Index: micromanager-1.4.6/mmstudio/Makefile.am
+Index: micromanager-1.4.10/mmstudio/Makefile.am
 ===================================================================
---- micromanager-1.4.6.orig/mmstudio/Makefile.am	2011-10-27 14:53:58.000000000 +0200
-+++ micromanager-1.4.6/mmstudio/Makefile.am	2011-10-27 14:56:04.000000000 +0200
-@@ -154,9 +154,6 @@
+--- micromanager-1.4.10.orig/mmstudio/Makefile.am	2012-02-19 05:01:39.000000000 +0000
++++ micromanager-1.4.10/mmstudio/Makefile.am	2012-07-27 20:22:54.174150074 +0000
+@@ -145,9 +145,6 @@
  install: 
  	test -d $(DESTDIR)$(IJPATH)/plugins/Micro-Manager || mkdir -p $(DESTDIR)$(IJPATH)/plugins/Micro-Manager
  	cp MMJ_.jar $(DESTDIR)$(IJPATH)/plugins/Micro-Manager

Modified: trunk/packages/micromanager/trunk/debian/patches/series
===================================================================
--- trunk/packages/micromanager/trunk/debian/patches/series	2012-07-27 20:27:37 UTC (rev 11922)
+++ trunk/packages/micromanager/trunk/debian/patches/series	2012-07-27 20:44:53 UTC (rev 11923)
@@ -1,7 +1,6 @@
 fixupcommonsmath.patch
 fixext.patch
-fixupfreeimage.patch
-fixupgphoto2.patch
 removeinstallrule.patch
 fixuplinking.patch
 fixuplibz.patch
+fixcomp.patch

More information about the debian-med-commit mailing list