Author: mkoch
Date: 2007-09-30 21:40:57 +0000 (Sun, 30 Sep 2007)
New Revision: 4297
Added:
trunk/libcommons-collections-java/trunk/debian/patches/
trunk/libcommons-collections-java/trunk/debian/patches/01_javadoc_link.patch
Modified:
trunk/libcommons-collections-java/trunk/debian/changelog
trunk/libcommons-collections-java/trunk/debian/control
trunk/libcommons-collections-java/trunk/debian/rules
trunk/libcommons-collections-java/trunk/debian/watch
Log:
* (Build-)Depends on java-gcj-compat instead of kaffe.
* Added patch to not reference external javadocs.
* Moved debhelper and CDBS from Build-Depends-Indep to Build-Depends
* Don't suggest non-existant package libcommons-collections-java-doc.
* Added watch file.
* Added myself to Uploaders and removed Wolfgang.
* Updated Standards-Version to 3.7.2.
Modified: trunk/libcommons-collections-java/trunk/debian/changelog
===================================================================
--- trunk/libcommons-collections-java/trunk/debian/changelog 2007-09-30
20:03:35 UTC (rev 4296)
+++ trunk/libcommons-collections-java/trunk/debian/changelog 2007-09-30
21:40:57 UTC (rev 4297)
@@ -1,8 +1,14 @@
-libcommons-collections-java (2.1.1-7) UNRELEASED; urgency=low
+libcommons-collections-java (2.1.1-7) unstable; urgency=low
- * Add a watch file.
+ * (Build-)Depends on java-gcj-compat instead of kaffe.
+ * Added patch to not reference external javadocs.
+ * Moved debhelper and CDBS from Build-Depends-Indep to Build-Depends
+ * Don't suggest non-existant package libcommons-collections-java-doc.
+ * Added watch file.
+ * Added myself to Uploaders and removed Wolfgang.
+ * Updated Standards-Version to 3.7.2.
- -- Kumar Appaiah <[EMAIL PROTECTED]> Thu, 20 Sep 2007 00:04:34 +0530
+ -- Michael Koch <[EMAIL PROTECTED]> Sun, 30 Sep 2007 23:28:47 +0200
libcommons-collections-java (2.1.1-6) unstable; urgency=low
Modified: trunk/libcommons-collections-java/trunk/debian/control
===================================================================
--- trunk/libcommons-collections-java/trunk/debian/control 2007-09-30
20:03:35 UTC (rev 4296)
+++ trunk/libcommons-collections-java/trunk/debian/control 2007-09-30
21:40:57 UTC (rev 4297)
@@ -2,14 +2,14 @@
Section: libs
Priority: optional
Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]>
-Uploaders: Arnaud Vandyck <[EMAIL PROTECTED]>, Wolfgang Baer <[EMAIL
PROTECTED]>
-Build-Depends-Indep: debhelper (>= 4.2.30), ant, kaffe (>= 2:1.1.5-3), cdbs
-Standards-Version: 3.6.2
+Uploaders: Arnaud Vandyck <[EMAIL PROTECTED]>, Michael Koch <[EMAIL PROTECTED]>
+Build-Depends: debhelper (>= 4.2.30), cdbs
+Build-Depends-Indep: ant, java-gcj-compat-dev
+Standards-Version: 3.7.2
Package: libcommons-collections-java
Architecture: all
-Depends: kaffe (>= 2:1.1.5-3) | java1-runtime | java2-runtime
-Suggests: libcommons-collections-java-doc
+Depends: java-gcj-runtime | java1-runtime | java2-runtime
Description: A set of abstract data type interfaces and implementations
The Java Collections Framework provides a set of abstract data
type interfaces and implementations that offer both a wealth
Added:
trunk/libcommons-collections-java/trunk/debian/patches/01_javadoc_link.patch
===================================================================
---
trunk/libcommons-collections-java/trunk/debian/patches/01_javadoc_link.patch
(rev 0)
+++
trunk/libcommons-collections-java/trunk/debian/patches/01_javadoc_link.patch
2007-09-30 21:40:57 UTC (rev 4297)
@@ -0,0 +1,10 @@
+--- build.xml.orig 2007-09-30 23:25:22.000000000 +0200
++++ build.xml 2007-09-30 23:25:36.000000000 +0200
+@@ -190,7 +190,6 @@
+ nonavbar="false"
+ serialwarn="false">
+ <group title="Jakarta-commons Collections"
packages="org.apache.commons.collections"/>
+- <link href="http://java.sun.com/products/j2se/1.4/docs/api"/>
+ </javadoc>
+ <delete dir="${workdir}"/>
+ </target>
Modified: trunk/libcommons-collections-java/trunk/debian/rules
===================================================================
--- trunk/libcommons-collections-java/trunk/debian/rules 2007-09-30
20:03:35 UTC (rev 4296)
+++ trunk/libcommons-collections-java/trunk/debian/rules 2007-09-30
21:40:57 UTC (rev 4297)
@@ -3,8 +3,9 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
-JAVA_HOME := /usr/lib/kaffe
+JAVA_HOME := /usr/lib/jvm/java-gcj
ANT_HOME := /usr/share/ant
DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar log4j-1.2 logkit servlet-2.3
Modified: trunk/libcommons-collections-java/trunk/debian/watch
===================================================================
--- trunk/libcommons-collections-java/trunk/debian/watch 2007-09-30
20:03:35 UTC (rev 4296)
+++ trunk/libcommons-collections-java/trunk/debian/watch 2007-09-30
21:40:57 UTC (rev 4297)
@@ -1,2 +1,2 @@
version=3
-http://www.apache.org/dist/commons/collections/source/
commons-collections-(2[\.\d]+)-src.tar.gz debian uupdate
+http://www.apache.org/dist/commons/collections/source/commons-collections-(2.*)-src\.tar\.gz
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
