[commons-io] 07/47: o Cleaning up after some comments from Arnaud.

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository commons-io.

commit 6064d4ea3e5c5c5fb80c1411a2caeaabd230cf83
Author: Trygve Laugstøl <trygvis at inamo.no>
Date:   Fri Sep 23 13:01:42 2005 +0000

    o Cleaning up after some comments from Arnaud.
---
 debian/changelog                     | 1 -
 debian/control                       | 4 ++--
 debian/patches/01_build_files.dpatch | 6 +++---
 debian/rules                         | 3 ---
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cab4ed7..ac1e2f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,5 @@
 commons-io (1.0-1) unstable; urgency=low
 
-  * Non-maintainer upload.
   * Initial Release (closes: #321475).
 
  -- Trygve Laugstøl <trygvis at inamo.no>  Tue,  2 Aug 2005 07:12:24 +0200
diff --git a/debian/control b/debian/control
index 01a93b1..48d3ee6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Trygve Laugstøl <trygvis at inamo.no>
-Build-Depends-Indep: ant (>= 1.6.5), classpath (>= 2:0.17), debhelper (>> 4.0.0), dpatch (>= 2.0.15), gjdoc (>= 0.7.5), junit (>= 3.8.1), kaffe (>= 2:1.1.5), libgcj6 (>= 4.0.1)
+Build-Depends-Indep: ant (>= 1.6.5), classpath (>= 2:0.17), debhelper (>> 4.0.0), dpatch (>= 2.0.15), junit (>= 3.8.1), kaffe (>= 2:1.1.5), libgcj6 (>= 4.0.1)
 Standards-Version: 3.6.2
 
 Package: libcommons-io-java
 Architecture: all
-Depends: kaffe (>> 2:1.1.5-3) | java2-runtime
+Depends: kaffe (>= 2:1.1.5) | java1-runtime | java2-runtime
 Description: Common useful IO related classes
  Commons-IO contains utility classes, stream implementations, file filters and
  endian classes.
diff --git a/debian/patches/01_build_files.dpatch b/debian/patches/01_build_files.dpatch
index f8a005e..a9f1ed9 100755
--- a/debian/patches/01_build_files.dpatch
+++ b/debian/patches/01_build_files.dpatch
@@ -5,9 +5,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./build.xml /tmp/dpep-work.WJoeEC/commons-io/build.xml
---- ./build.xml	2005-09-19 12:58:02.000000000 +0200
-+++ /tmp/dpep-work.WJoeEC/commons-io/build.xml	2005-09-19 13:10:54.289251024 +0200
+diff -urNad commons-io~/build.xml commons-io/build.xml
+--- commons-io~/build.xml	2005-09-21 18:10:29.000000000 +0200
++++ commons-io/build.xml	2005-09-21 18:10:59.139430704 +0200
 @@ -145,6 +145,7 @@
      </javadoc>
    </target>
diff --git a/debian/rules b/debian/rules
index 203e732..b6719da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,9 +33,6 @@ install: build
 	dh_clean -k 
 	dh_installdirs
 	mkdir -p target/lib
-	cp /usr/share/java/ant-1.6.jar target/lib/ant-1.5.jar
-	cp /usr/share/java/junit-3.8.1.jar target/lib
-	cp /usr/share/java/ant-1.6.jar target/lib/ant-optional-1.5.jar
 	mkdir -p target/javadoc
 	# The javadoc goal will implicitly call the jar goal
 	$(ANT) javadoc

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