try to fix classpath in debian_libs.patch
authorgregor herrmann <gregoa@debian.org>
Thu, 9 Jul 2015 17:46:33 +0000 (19:46 +0200)
committergregor herrmann <gregoa@debian.org>
Thu, 9 Jul 2015 17:46:33 +0000 (19:46 +0200)
Gbp-Dch: Ignore

debian/patches/debian_libs.patch

index 1502e61..f3990c2 100644 (file)
@@ -18,7 +18,23 @@ Last-Update: 2015-07-09
  
        <property name="osxbin.dir" value="osx" />
  
  
        <property name="osxbin.dir" value="osx" />
  
-@@ -149,7 +149,7 @@
+@@ -98,11 +98,13 @@
+     <!-- Done by MrDlib -->
+       <!-- Build classpath -->
+-      <filelist id="jars" />
++      <fileset id="jars" dir="${buildlib.dir}">
++              <include name="*.jar" />
++      </fileset>
+       <path id="classpath">
+               <pathelement path="${build.classes}" />
+               <pathelement path="${build.dir}" />
+-              <filelist refid="jars" />
++              <fileset refid="jars" />
+       </path>
+       <target name="run" depends="build">
+@@ -149,7 +151,7 @@
                <copy file="${osxbin.dir}/MacAdapter.class" todir="${build.classes.osx}" />
        </target>
  
                <copy file="${osxbin.dir}/MacAdapter.class" todir="${build.classes.osx}" />
        </target>
  
@@ -27,7 +43,16 @@ Last-Update: 2015-07-09
                <mkdir dir="${build.lib}" />
  
                <mkdir dir="${build.tmp}" />
                <mkdir dir="${build.lib}" />
  
                <mkdir dir="${build.tmp}" />
-@@ -519,8 +519,6 @@
+@@ -324,7 +326,7 @@
+       <target name="unjarlib" description="Unpacks jars from lib directory into temp directory">
+               <mkdir dir="${build.tmp}" />
+               <unjar dest="${build.tmp}">
+-                      <filelist refid="jars" />
++                      <fileset refid="jars" />
+               </unjar>
+               <!-- done by MrDlib -->
+               <delete includeEmptyDirs="true">
+@@ -519,8 +521,6 @@
           Auxiliary targets
          +++++++++++++++++++++++++++++++++++++++++++++++++-->
  
           Auxiliary targets
          +++++++++++++++++++++++++++++++++++++++++++++++++-->