r2221 - trunk/ant/debian/patches

[Michael Koch]

Author: mkoch
Date: 2006-06-29 19:35:29 +0000 (Thu, 29 Jun 2006)
New Revision: 2221

Removed:
   trunk/ant/debian/patches/02_RemoveManifestEntries.patch
   trunk/ant/debian/patches/06_Bug126477_UpstreamPR38027.patch
Modified:
   trunk/ant/debian/patches/
Log:
Removed the patches 06_Bug126477_UpstreamPR38027.patch and
02_RemoveManifestEntries.patch as they were not included in
the latest upload anymore



Property changes on: trunk/ant/debian/patches
___________________________________________________________________
Name: svn:ignore
   + *.log


Deleted: trunk/ant/debian/patches/02_RemoveManifestEntries.patch
===================================================================
--- trunk/ant/debian/patches/02_RemoveManifestEntries.patch	2006-06-29 17:30:23 UTC (rev 2220)
+++ trunk/ant/debian/patches/02_RemoveManifestEntries.patch	2006-06-29 19:35:29 UTC (rev 2221)
@@ -1,11 +0,0 @@
---- build.xml.orig	2006-04-07 19:06:43.000000000 +0200
-+++ build.xml	2006-04-07 19:08:05.000000000 +0200
-@@ -780,7 +780,7 @@
-       </metainf>
-       <manifest>
-         <attribute name="Class-Path"
--                   value="ant.jar xml-apis.jar xercesImpl.jar xalan.jar"/>
-+                   value="ant.jar"/>
-       </manifest>
-     </jar>
- 

Deleted: trunk/ant/debian/patches/06_Bug126477_UpstreamPR38027.patch
===================================================================
--- trunk/ant/debian/patches/06_Bug126477_UpstreamPR38027.patch	2006-06-29 17:30:23 UTC (rev 2220)
+++ trunk/ant/debian/patches/06_Bug126477_UpstreamPR38027.patch	2006-06-29 19:35:29 UTC (rev 2221)
@@ -1,30 +0,0 @@
---- src/main/org/apache/tools/tar/TarOutputStream.java.orig	2005-06-02 15:20:10.000000000 +0200
-+++ src/main/org/apache/tools/tar/TarOutputStream.java	2006-04-07 19:36:04.000000000 +0200
-@@ -50,7 +50,9 @@
-     protected int       assemLen;
-     protected byte[]    assemBuf;
-     protected TarBuffer buffer;
--    protected int       longFileMode = LONGFILE_ERROR;
-+    protected int       longFileMode = LONGFILE_ERROR;
-+
-+    private boolean closed = false;
- 
-     public TarOutputStream(OutputStream os) {
-         this(os, TarBuffer.DEFAULT_BLKSIZE, TarBuffer.DEFAULT_RCDSIZE);
-@@ -110,9 +112,13 @@
-      * This means that finish() is called followed by calling the
-      * TarBuffer's close().
-      */
--    public void close() throws IOException {
--        this.finish();
--        this.buffer.close();
-+    public void close() throws IOException {
-+    	if (!closed) {
-+	        this.finish();
-+	        this.buffer.close();
-+	        out.close();
-+	        closed = true;
-+    	}
-     }
- 
-     /**