Changes from Johan Henriksson

git-svn-id: https://valelab.ucsf.edu/svn/micromanager2/trunk@8004 d0ab736e-dc22-4aeb-8dc9-08def0aa14fd
seamusholden · Oct 27, 2011 · b0bf7ec · b0bf7ec
1 parent 22652aa
commit b0bf7ec
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/DeviceAdapters/PI_GCS_2/PIGCSControllerDLL.cpp b/DeviceAdapters/PI_GCS_2/PIGCSControllerDLL.cpp
@@ -735,4 +735,4 @@ bool PIGCSControllerDLL::qTPC(int* nrOutputChannels)
 	return (qTPC_(ID_, nrOutputChannels) == TRUE);
 }
 
-#endif __APPLE__
+#endif
diff --git a/MMCore/CoreProperty.h b/MMCore/CoreProperty.h
@@ -30,7 +30,7 @@
 #include <set>
 #include <vector>
 #include <map>
-#include "MMEventCallback.h";
+#include "MMEventCallback.h"
 
 class CMMCore;
 class MMEventCallback;

diff --git a/MMCore/MMEventCallback.h b/MMCore/MMEventCallback.h
@@ -35,7 +35,7 @@ class MMEventCallback
       std::cout << "onPropertiesChanged()" << std:: endl; 
    }
 
-   virtual void onPropertyChanged(char* name, const char* propName, const char* propValue)
+   virtual void onPropertyChanged(const char* name, const char* propName, const char* propValue)
    {
       std::cout << "onPropertyChanged() " << name << " " << propName << " " << propValue;
       std::cout << std:: endl; 

diff --git a/portdebian/debiancontrol.port b/portdebian/debiancontrol.port
@@ -4,7 +4,7 @@ Section: contrib/science
 Priority: optional
 Architecture: ARCH
 Essential: no
-Depends: java2-runtime, bsh, libboost1.38-dev, libusb-0.1-4, libswingx-java, libdc1394-22, libv4l-0, libgphoto2-2, libfreeimage3
+Depends: java2-runtime, bsh, libboost1.40-dev, libusb-0.1-4, libswingx-java, libdc1394-22, libv4l-0, libgphoto2-2, libfreeimage3
 Installed-Size: 8
 Maintainer: Johan Henriksson [[email protected]]
 Description: Micro-Manager provides a programmatic and user interface for research microscopes and related equipment

diff --git a/portdebian/mkdebian.sh b/portdebian/mkdebian.sh
@@ -71,8 +71,7 @@ cat portdebian/debiancontrol.ij | sed "s/ARCH/$ARCH/" | sed "s/VERSION/$VERSION/
 
 ##### JAR-files  MMIJ
 mkdir -p $ROOTIJ/usr/share/imagej/plugins/Micro-Manager/
-cp Bleach/MMBleach_.jar autofocus/MMAutofocus_.jar autofocus/MMAutofocusTB_.jar MMCoreJ_wrap/MMCoreJ.jar Tracking/Tracker_.jar \
-mmstudio/MMJ_.jar $ROOTIJ/usr/share/imagej/plugins/Micro-Manager/
+cp plugins/*.jar mmstudio/MMJ_.jar $ROOTIJ/usr/share/imagej/plugins/Micro-Manager/
 ln -s /usr/share/java/bsh.jar $ROOTIJ/usr/share/imagej/plugins/Micro-Manager/bsh_.jar
 
 ##### Overwrite imagej with fixes
-Original file line number
+Diff line change
@@ Expand Up / @@ -735,4 +735,4 @@ bool PIGCSControllerDLL::qTPC(int* nrOutputChannels) @@
     	return (qTPC_(ID_, nrOutputChannels) == TRUE);
     }
-    #endif __APPLE__
+    #endif