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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-10-26 16:35:19 +0000 (Wed, 26 Oct 2011)
New Revision: 8297

Added:
   trunk/packages/micromanager/trunk/debian/patches/fixupabsolutelayout.patch
Modified:
   trunk/packages/micromanager/trunk/debian/control
   trunk/packages/micromanager/trunk/debian/patches/fixupimagej.patch
   trunk/packages/micromanager/trunk/debian/patches/series
   trunk/packages/micromanager/trunk/debian/rules
Log:
split patch into two

Modified: trunk/packages/micromanager/trunk/debian/control
===================================================================
--- trunk/packages/micromanager/trunk/debian/control	2011-10-26 16:22:24 UTC (rev 8296)
+++ trunk/packages/micromanager/trunk/debian/control	2011-10-26 16:35:19 UTC (rev 8297)
@@ -8,7 +8,7 @@
 Build-Depends-Indep: libcommons-math-java, imagej, bsh, libswingx-java, libswing-layout-java, libnb-java4-java
 Standards-Version: 3.9.2
 Homepage: http://www.micro-manager.org
-Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/micromanager/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/micromanager/trunk/
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/micromanager/trunk/
 
 

Added: trunk/packages/micromanager/trunk/debian/patches/fixupabsolutelayout.patch
===================================================================
--- trunk/packages/micromanager/trunk/debian/patches/fixupabsolutelayout.patch	                        (rev 0)
+++ trunk/packages/micromanager/trunk/debian/patches/fixupabsolutelayout.patch	2011-10-26 16:35:19 UTC (rev 8297)
@@ -0,0 +1,15 @@
+Index: micromanager-1.4.6/configure.in
+===================================================================
+--- micromanager-1.4.6.orig/configure.in	2011-10-26 18:00:22.000000000 -0400
++++ micromanager-1.4.6/configure.in	2011-10-26 18:20:34.000000000 -0400
+@@ -119,8 +119,8 @@
+       ABSOLUTEJARPATH="$CLASSEXT/AbsoluteLayout.jar"
+       AC_MSG_RESULT($ABSOLUTEJARPATH)
+    fi
+-   if test -r "/usr/share/java/AbsoluteLayout.jar" ; then
+-      ABSOLUTEJARPATH="/usr/share/java/AbsoluteLayout.jar"
++   if test -r "/usr/share/netbeans/java4/modules/ext/AbsoluteLayout.jar" ; then
++      ABSOLUTEJARPATH="/usr/share/netbeans/java4/modules/ext/AbsoluteLayout.jar"
+       AC_MSG_RESULT($ABOSLUTEJARPATH)
+    fi
+    if test -r $CLASSEXT"/AbsoluteLayout.jar" ; then

Modified: trunk/packages/micromanager/trunk/debian/patches/fixupimagej.patch
===================================================================
--- trunk/packages/micromanager/trunk/debian/patches/fixupimagej.patch	2011-10-26 16:22:24 UTC (rev 8296)
+++ trunk/packages/micromanager/trunk/debian/patches/fixupimagej.patch	2011-10-26 16:35:19 UTC (rev 8297)
@@ -21,14 +21,3 @@
  
     #----------------------------------------------------------------
     # Find beanshell.jar in ImageJ plugins directory
-@@ -119,8 +119,8 @@
-       ABSOLUTEJARPATH="$CLASSEXT/AbsoluteLayout.jar"
-       AC_MSG_RESULT($ABSOLUTEJARPATH)
-    fi
--   if test -r "/usr/share/java/AbsoluteLayout.jar" ; then
--      ABSOLUTEJARPATH="/usr/share/java/AbsoluteLayout.jar"
-+   if test -r "/usr/share/netbeans/java4/modules/ext/AbsoluteLayout.jar" ; then
-+      ABSOLUTEJARPATH="/usr/share/netbeans/java4/modules/ext/AbsoluteLayout.jar"
-       AC_MSG_RESULT($ABOSLUTEJARPATH)
-    fi
-    if test -r $CLASSEXT"/AbsoluteLayout.jar" ; then

Modified: trunk/packages/micromanager/trunk/debian/patches/series
===================================================================
--- trunk/packages/micromanager/trunk/debian/patches/series	2011-10-26 16:22:24 UTC (rev 8296)
+++ trunk/packages/micromanager/trunk/debian/patches/series	2011-10-26 16:35:19 UTC (rev 8297)
@@ -1,3 +1,3 @@
 fixupcommonsmath.patch
-debian-changes-1.4.6-1
 fixupimagej.patch
+fixupabsolutelayout.patch

Modified: trunk/packages/micromanager/trunk/debian/rules
===================================================================
--- trunk/packages/micromanager/trunk/debian/rules	2011-10-26 16:22:24 UTC (rev 8296)
+++ trunk/packages/micromanager/trunk/debian/rules	2011-10-26 16:35:19 UTC (rev 8297)
@@ -15,6 +15,7 @@
 	dh_clean
 	# 
 	rm -f install-sh
+	#rm -f aclocal.m4
 	rm -f config.sub
 	rm -f missing
 	rm -f config.guess