r2292 - in trunk/libcommons-validator-java/debian: . patches

[Arnaud Vandyck]

Author: avdyk
Date: 2006-07-31 14:14:15 +0000 (Mon, 31 Jul 2006)
New Revision: 2292

Modified:
   trunk/libcommons-validator-java/debian/changelog
   trunk/libcommons-validator-java/debian/control
   trunk/libcommons-validator-java/debian/patches/01_dont_copy_RELEASE-NOTES.patch
   trunk/libcommons-validator-java/debian/rules
Log:
libcommons-validator-java (1:1.1.4a-1) unstable; urgency=low

  * build with java-gcj-compat-dev
  * updated Strandards-Version to 3.7.2; split build-dep and
    build-dep-indep
  * not a new upstream, but removed dos end-of-lines from original tarball
    in build.xml

 -- Arnaud Vandyck <avdyk at debian.org>  Mon, 31 Jul 2006 16:12:11 +0200

Modified: trunk/libcommons-validator-java/debian/changelog
===================================================================
--- trunk/libcommons-validator-java/debian/changelog	2006-07-31 13:39:43 UTC (rev 2291)
+++ trunk/libcommons-validator-java/debian/changelog	2006-07-31 14:14:15 UTC (rev 2292)
@@ -1,3 +1,13 @@
+libcommons-validator-java (1:1.1.4a-1) unstable; urgency=low
+
+  * build with java-gcj-compat-dev
+  * updated Strandards-Version to 3.7.2; split build-dep and
+    build-dep-indep
+  * not a new upstream, but removed dos end-of-lines from original tarball
+    in build.xml
+
+ -- Arnaud Vandyck <avdyk at debian.org>  Mon, 31 Jul 2006 16:12:11 +0200
+
 libcommons-validator-java (1:1.1.4-6) unstable; urgency=low
 
   * debian/rules:

Modified: trunk/libcommons-validator-java/debian/control
===================================================================
--- trunk/libcommons-validator-java/debian/control	2006-07-31 13:39:43 UTC (rev 2291)
+++ trunk/libcommons-validator-java/debian/control	2006-07-31 14:14:15 UTC (rev 2292)
@@ -3,8 +3,9 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends-Indep: debhelper (>= 4.2.30), kaffe, ant, junit (>= 3.8.1), libcommons-beanutils-java (>= 1.5), libcommons-collections-java (>= 2.1), libcommons-digester-java (>= 1.4), libcommons-logging-java (>= 1.0.3), liboro-java (>= 2.0.6), sgml-base, cdbs
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 4.2.30), cdbs
+Build-Depends-Indep: java-gcj-compat-dev, ant, junit (>= 3.8.1), libcommons-beanutils-java (>= 1.5), libcommons-collections-java (>= 2.1), libcommons-digester-java (>= 1.4), libcommons-logging-java (>= 1.0.3), liboro-java (>= 2.0.6), sgml-base
+Standards-Version: 3.7.2
 
 Package: libcommons-validator-java
 Architecture: all

Modified: trunk/libcommons-validator-java/debian/patches/01_dont_copy_RELEASE-NOTES.patch
===================================================================
--- trunk/libcommons-validator-java/debian/patches/01_dont_copy_RELEASE-NOTES.patch	2006-07-31 13:39:43 UTC (rev 2291)
+++ trunk/libcommons-validator-java/debian/patches/01_dont_copy_RELEASE-NOTES.patch	2006-07-31 14:14:15 UTC (rev 2292)
@@ -1,13 +1,13 @@
---- build.xml.old	2005-02-28 12:27:18.794208328 +0100
-+++ build.xml	2005-02-28 12:28:25.453074640 +0100
+--- build.xml.orig	2006-07-31 14:01:00.000000000 +0000
++++ build.xml	2006-07-31 14:01:40.000000000 +0000
 @@ -266,8 +266,8 @@
      <mkdir      dir="${dist.home}"/>
      <copy      file="LICENSE.txt"
                todir="${dist.home}"/>
 -    <copy      file="RELEASE-NOTES.readme"
 -              todir="${dist.home}"/>
-+    <!--copy      file="RELEASE-NOTES.readme"
-+              todir="${dist.home}"/-->
++    <!-- copy      file="RELEASE-NOTES.readme"
++              todir="${dist.home}"/ -->
      <mkdir      dir="${build.home}/classes/META-INF"/>
      <copy      file="LICENSE.txt"
               tofile="${build.home}/classes/META-INF/LICENSE.txt"/>

Modified: trunk/libcommons-validator-java/debian/rules
===================================================================
--- trunk/libcommons-validator-java/debian/rules	2006-07-31 13:39:43 UTC (rev 2291)
+++ trunk/libcommons-validator-java/debian/rules	2006-07-31 14:14:15 UTC (rev 2292)
@@ -8,8 +8,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME_DIRS       := /usr/lib/kaffe
-ANT_HOME             := /usr/share/ant
+JAVA_HOME       := /usr/lib/jvm/java-gcj
 DEB_JARS             := junit commons-beanutils commons-collections commons-digester commons-logging oro
 DEB_ANT_BUILD_TARGET := dist