[med-svn] r10926 - in trunk/packages/king/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2012-05-21 14:13:22 +0000 (Mon, 21 May 2012)
New Revision: 10926

Modified:
   trunk/packages/king/trunk/debian/changelog
   trunk/packages/king/trunk/debian/patches/delete_mac_specific_file.patch
   trunk/packages/king/trunk/debian/patches/use_debian_packaged_jars.patch
Log:
Adapt patches to new upstream version


Modified: trunk/packages/king/trunk/debian/changelog
===================================================================
--- trunk/packages/king/trunk/debian/changelog	2012-05-21 14:08:23 UTC (rev 10925)
+++ trunk/packages/king/trunk/debian/changelog	2012-05-21 14:13:22 UTC (rev 10926)
@@ -1,6 +1,6 @@
 king (2.21.120420-1) UNRELEASED; urgency=low
 
-  * New upstream version
+  * New upstream version (including adapted patches)
   * debian/get-orig-source: This version includes molikin so the separate
     fetching of this source is not needed any more.
   * debian/README.source:

Modified: trunk/packages/king/trunk/debian/patches/delete_mac_specific_file.patch
===================================================================
--- trunk/packages/king/trunk/debian/patches/delete_mac_specific_file.patch	2012-05-21 14:08:23 UTC (rev 10925)
+++ trunk/packages/king/trunk/debian/patches/delete_mac_specific_file.patch	2012-05-21 14:13:22 UTC (rev 10926)
@@ -10,7 +10,7 @@
  but feel free to activate in case the javadoc should be builded
  as well.
 
---- king-2.20.110601.orig/king-2.20-src/src/king/MacDropTarget.java
+--- king-2.21.120420.orig/king/src/king/MacDropTarget.java
 +++ /dev/null
 @@ -1,92 +0,0 @@
 -// (jEdit options) :folding=explicit:collapseFolds=1:

Modified: trunk/packages/king/trunk/debian/patches/use_debian_packaged_jars.patch
===================================================================
--- trunk/packages/king/trunk/debian/patches/use_debian_packaged_jars.patch	2012-05-21 14:08:23 UTC (rev 10925)
+++ trunk/packages/king/trunk/debian/patches/use_debian_packaged_jars.patch	2012-05-21 14:13:22 UTC (rev 10926)
@@ -1,8 +1,8 @@
 Author: Andreas Tille <tille at debian.org>
 Description: Use Debian packaged itext.jar and jogl.jar
 
---- king-2.20.110601.orig/king-2.20-src/build.xml
-+++ king-2.20.110601/king-2.20-src/build.xml
+--- king-2.21.120420.orig/king/build.xml
++++ king-2.21.120420/king/build.xml
 @@ -68,7 +68,7 @@
      <ant antfile="../driftwood/build.xml" inheritAll="false" target="compile">
          <!-- inherited properties go here -->
@@ -21,9 +21,9 @@
           </classpath>
      </javac>
  </target>
-@@ -118,8 +118,8 @@
-         <zipfileset dir="../chiropraxis/dist/" includes="chiropraxis-*-src/"/>
-         <zipfileset dir="../extratools/dist/" includes="extratools-*-src/"/>
+@@ -125,8 +125,8 @@
+         <zipfileset dir="../extratools/dist/" includes="extratools/"/>
+         <zipfileset dir="../molikin/dist/" includes="molikin/"/> 
          <zipfileset dir="../lib/" prefix="lib/">
 -            <include name="iText/*.jar"/>
 -            <include name="jogl/*.jar"/>
@@ -32,7 +32,7 @@
          </zipfileset>
      </zip>
      <zip basedir="${dist}"
-@@ -150,7 +150,7 @@
+@@ -164,7 +164,7 @@
      <mkdir dir="${dist}/javadocs"/>
      <javadoc packagenames="driftwood.*,Jama.*,king.*"
          sourcepath="src:../driftwood/src"
@@ -41,8 +41,8 @@
          destdir="${dist}/javadocs" access="protected" source="1.5"
          breakiterator="true" noqualifier="all"
          version="true" use="true" author="true"
---- king-2.20.110601.orig/chiropraxis-1.08-src/build.xml
-+++ king-2.20.110601/chiropraxis-1.08-src/build.xml
+--- king-2.21.120420.orig/chiropraxis/build.xml
++++ king-2.21.120420/chiropraxis/build.xml
 @@ -49,7 +49,7 @@
      <ant antfile="../molikin/build.xml" inheritAll="false" target="compile">
          <!-- inherited properties go here -->