[pkg-java] r12110 - in trunk/libjlha-java/debian: . patches

[Torsten Werner]

Author: twerner
Date: 2010-04-11 14:56:32 +0000 (Sun, 11 Apr 2010)
New Revision: 12110

Modified:
   trunk/libjlha-java/debian/patches/01_AntBuildfiles.patch
   trunk/libjlha-java/debian/patches/02_AccessingClassField.patch
   trunk/libjlha-java/debian/patches/03_DateDeprecation.patch
   trunk/libjlha-java/debian/rules
Log:
make patches compatible with source format 3.0


Modified: trunk/libjlha-java/debian/patches/01_AntBuildfiles.patch
===================================================================
--- trunk/libjlha-java/debian/patches/01_AntBuildfiles.patch	2010-04-11 14:50:06 UTC (rev 12109)
+++ trunk/libjlha-java/debian/patches/01_AntBuildfiles.patch	2010-04-11 14:56:32 UTC (rev 12110)
@@ -1,5 +1,5 @@
---- compile.xml
-+++ compile.xml
+--- a/compile.xml
++++ a/compile.xml
 @@ -4,8 +4,11 @@
  	<!-- properties -->
  	<property name="javac.compiler" value="modern"/>
@@ -57,8 +57,8 @@
  			<patternset includesfile="${basedir}/lists/srcfiles.nodeprecation.list" />
  		</javac>
  	</target>
---- javadoc.xml
-+++ javadoc.xml
+--- a/javadoc.xml
++++ a/javadoc.xml
 @@ -5,6 +5,9 @@
  	<property name="src.dir"  value="."/>
  	<property name="dest.dir" value="./docs"/>

Modified: trunk/libjlha-java/debian/patches/02_AccessingClassField.patch
===================================================================
--- trunk/libjlha-java/debian/patches/02_AccessingClassField.patch	2010-04-11 14:50:06 UTC (rev 12109)
+++ trunk/libjlha-java/debian/patches/02_AccessingClassField.patch	2010-04-11 14:56:32 UTC (rev 12110)
@@ -1,5 +1,5 @@
---- jp/gr/java_conf/dangan/util/lha/PostLz5Encoder.java
-+++ jp/gr/java_conf/dangan/util/lha/PostLz5Encoder.java
+--- a/jp/gr/java_conf/dangan/util/lha/PostLz5Encoder.java
++++ a/jp/gr/java_conf/dangan/util/lha/PostLz5Encoder.java
 @@ -219,7 +219,7 @@
          this.buf[ this.index++ ] = (byte)pos;
          this.buf[ this.index++ ] = (byte)( ( ( pos >> 4 ) & 0xF0 ) | matchlen );
@@ -9,8 +9,8 @@
  
      }
  
---- jp/gr/java_conf/dangan/util/lha/PostLzsEncoder.java
-+++ jp/gr/java_conf/dangan/util/lha/PostLzsEncoder.java
+--- a/jp/gr/java_conf/dangan/util/lha/PostLzsEncoder.java
++++ a/jp/gr/java_conf/dangan/util/lha/PostLzsEncoder.java
 @@ -200,8 +200,8 @@
  
          this.position += this.matchLength + PostLzsEncoder.Threshold;
@@ -22,8 +22,8 @@
      }
  
  
---- jp/gr/java_conf/dangan/util/lha/PreLzsDecoder.java
-+++ jp/gr/java_conf/dangan/util/lha/PreLzsDecoder.java
+--- a/jp/gr/java_conf/dangan/util/lha/PreLzsDecoder.java
++++ a/jp/gr/java_conf/dangan/util/lha/PreLzsDecoder.java
 @@ -213,8 +213,8 @@
                  this.position++;
                  return this.in.readBits( 8 );

Modified: trunk/libjlha-java/debian/patches/03_DateDeprecation.patch
===================================================================
--- trunk/libjlha-java/debian/patches/03_DateDeprecation.patch	2010-04-11 14:50:06 UTC (rev 12109)
+++ trunk/libjlha-java/debian/patches/03_DateDeprecation.patch	2010-04-11 14:56:32 UTC (rev 12110)
@@ -1,5 +1,5 @@
---- jp/gr/java_conf/dangan/util/MsdosDate.java
-+++ jp/gr/java_conf/dangan/util/MsdosDate.java
+--- a/jp/gr/java_conf/dangan/util/MsdosDate.java
++++ a/jp/gr/java_conf/dangan/util/MsdosDate.java
 @@ -85,7 +85,6 @@
  public class MsdosDate extends Date
                         implements Cloneable {

Modified: trunk/libjlha-java/debian/rules
===================================================================
--- trunk/libjlha-java/debian/rules	2010-04-11 14:50:06 UTC (rev 12109)
+++ trunk/libjlha-java/debian/rules	2010-04-11 14:56:32 UTC (rev 12110)
@@ -8,7 +8,7 @@
 DEB_ANT_BUILD_TARGET := all
 
 install/libjlha-java::
-	install -m 644 target/jlha.jar \
+	install -m 644 -D target/jlha.jar \
 		$(CURDIR)/debian/libjlha-java/usr/share/java/jlha-$(DEB_UPSTREAM_VERSION).jar
 	dh_link /usr/share/java/jlha-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jlha.jar