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

[Mathieu Malaterre]

Author: malat
Date: 2012-07-27 20:14:20 +0000 (Fri, 27 Jul 2012)
New Revision: 11921

Removed:
   trunk/packages/micromanager/trunk/debian/patches/fixupabsolutelayout.patch
Modified:
   trunk/packages/micromanager/trunk/debian/control
   trunk/packages/micromanager/trunk/debian/patches/series
Log:
remove extra patch. not required anymore

Modified: trunk/packages/micromanager/trunk/debian/control
===================================================================
--- trunk/packages/micromanager/trunk/debian/control	2012-07-27 19:26:21 UTC (rev 11920)
+++ trunk/packages/micromanager/trunk/debian/control	2012-07-27 20:14:20 UTC (rev 11921)
@@ -8,11 +8,10 @@
  autotools-dev, autoconf, automake, libtool, libgphoto2-2-dev, libboost-date-time-dev,
  libboost-thread-dev, libboost-system-dev, zlib1g-dev, swig,
  libdc1394-22-dev, libv4l-dev, libfreeimage-dev, libusb-dev
-#pvcam-dkms, 
 Build-Depends-Indep: libcommons-math-java, imagej, bsh, libswingx-java,
- libswing-layout-java, libnb-java4-java, clojure1.2, clojure-contrib,
- libwerken.xpath-java, clooj, libjfreechart-java
-Standards-Version: 3.9.2
+ libswing-layout-java, clojure1.2, clojure-contrib,
+ libwerken.xpath-java, libjfreechart-java, libnb-absolutelayout-java
+Standards-Version: 3.9.3
 Homepage: http://www.micro-manager.org
 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/

Deleted: trunk/packages/micromanager/trunk/debian/patches/fixupabsolutelayout.patch
===================================================================
--- trunk/packages/micromanager/trunk/debian/patches/fixupabsolutelayout.patch	2012-07-27 19:26:21 UTC (rev 11920)
+++ trunk/packages/micromanager/trunk/debian/patches/fixupabsolutelayout.patch	2012-07-27 20:14:20 UTC (rev 11921)
@@ -1,15 +0,0 @@
-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/series
===================================================================
--- trunk/packages/micromanager/trunk/debian/patches/series	2012-07-27 19:26:21 UTC (rev 11920)
+++ trunk/packages/micromanager/trunk/debian/patches/series	2012-07-27 20:14:20 UTC (rev 11921)
@@ -1,5 +1,4 @@
 fixupcommonsmath.patch
-fixupabsolutelayout.patch
 fixext.patch
 fixupfreeimage.patch
 fixupgphoto2.patch