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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-10-26 16:41:08 +0000 (Wed, 26 Oct 2011)
New Revision: 8298

Added:
   trunk/packages/micromanager/trunk/debian/patches/fixext.patch
Modified:
   trunk/packages/micromanager/trunk/debian/patches/series
   trunk/packages/micromanager/trunk/debian/rules
Log:
trying to get things in shape

Added: trunk/packages/micromanager/trunk/debian/patches/fixext.patch
===================================================================
--- trunk/packages/micromanager/trunk/debian/patches/fixext.patch	                        (rev 0)
+++ trunk/packages/micromanager/trunk/debian/patches/fixext.patch	2011-10-26 16:41:08 UTC (rev 8298)
@@ -0,0 +1,13 @@
+Index: micromanager-1.4.6/configure.in
+===================================================================
+--- micromanager-1.4.6.orig/configure.in	2011-10-26 18:38:00.000000000 -0400
++++ micromanager-1.4.6/configure.in	2011-10-26 18:38:13.000000000 -0400
+@@ -20,7 +20,7 @@
+    #----------------------------------------------------------------
+    # Set the CLASSEXT location
+    #----------------------------------------------------------------
+-   CLASSEXT=$PWD"/../3rdpartypublic/classext"
++   CLASSEXT="/usr/share/java"
+    echo "CLASSEXT="$CLASSEXT
+ 
+    #----------------------------------------------------------------

Modified: trunk/packages/micromanager/trunk/debian/patches/series
===================================================================
--- trunk/packages/micromanager/trunk/debian/patches/series	2011-10-26 16:35:19 UTC (rev 8297)
+++ trunk/packages/micromanager/trunk/debian/patches/series	2011-10-26 16:41:08 UTC (rev 8298)
@@ -1,3 +1,3 @@
 fixupcommonsmath.patch
-fixupimagej.patch
 fixupabsolutelayout.patch
+fixext.patch

Modified: trunk/packages/micromanager/trunk/debian/rules
===================================================================
--- trunk/packages/micromanager/trunk/debian/rules	2011-10-26 16:35:19 UTC (rev 8297)
+++ trunk/packages/micromanager/trunk/debian/rules	2011-10-26 16:41:08 UTC (rev 8298)
@@ -8,8 +8,9 @@
 
 override_dh_auto_configure:
 	./mmUnixBuild.sh
+	rmdir SecretDeviceAdapters
 	#dh_auto_configure
-	./configure --with-imagej=/usr/share/java
+	./configure --with-imagej=/usr/share/java/ij.jar
 
 override_dh_clean:
 	dh_clean