[libjlha-java] 03/11: make patches compatible with source format 3.0

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libjlha-java.

commit d7b8eba5f76ed6691fdbd3f569fb3c19ccb8488e
Author: Torsten Werner <twerner at debian.org>
Date:   Sun Apr 11 14:56:32 2010 +0000

    make patches compatible with source format 3.0
---
 debian/patches/01_AntBuildfiles.patch       |  8 ++++----
 debian/patches/02_AccessingClassField.patch | 12 ++++++------
 debian/patches/03_DateDeprecation.patch     |  4 ++--
 debian/rules                                |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/debian/patches/01_AntBuildfiles.patch b/debian/patches/01_AntBuildfiles.patch
index f8b247f..85ea23b 100644
--- a/debian/patches/01_AntBuildfiles.patch
+++ b/debian/patches/01_AntBuildfiles.patch
@@ -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"/>
diff --git a/debian/patches/02_AccessingClassField.patch b/debian/patches/02_AccessingClassField.patch
index 2a867f1..73e76f3 100644
--- a/debian/patches/02_AccessingClassField.patch
+++ b/debian/patches/02_AccessingClassField.patch
@@ -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 );
diff --git a/debian/patches/03_DateDeprecation.patch b/debian/patches/03_DateDeprecation.patch
index 2bd91fc..3a331bb 100644
--- a/debian/patches/03_DateDeprecation.patch
+++ b/debian/patches/03_DateDeprecation.patch
@@ -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 {
diff --git a/debian/rules b/debian/rules
index d39233a..e10f5f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ DEB_ANT_BUILDFILE := debian/build.xml
 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
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjlha-java.git