Author: nthykier-guest
Date: 2009-11-26 22:24:42 +0000 (Thu, 26 Nov 2009)
New Revision: 11130
Modified:
trunk/libcommons-el-java/debian/changelog
trunk/libcommons-el-java/debian/compat
trunk/libcommons-el-java/debian/control
trunk/libcommons-el-java/debian/patches/01build_xml_license_location_patch.patch
trunk/libcommons-el-java/debian/patches/02build_xml_javadoc_depends.patch
trunk/libcommons-el-java/debian/rules
Log:
[ Niels Thykier ]
* Added myself to uploaders.
* Updated Build-Depends(-Indep).
- Replace java-gcj-compat with default-jdk
- Move default-jdk and ant to Build-Depends.
* Made debian/rules respect errors.
* Bumped debhelper compat to 7.
* Bumped Standards-Version to 3.8.3:
- Changed section to java.
- Added Vcs-* fields.
* Added more alternatives to java and changed to the -headless
version of them.
* Added missing ${misc:Depends}.
* Imported patch from Ubuntu to fix FTBFS.
- Thanks to Ilya Barygin for the patch.
* Updated existing patches to be "quilt" appliable.
* Imported patch from Fedora to add OSGi metadata. (Closes: #558180)
Modified: trunk/libcommons-el-java/debian/changelog
===================================================================
--- trunk/libcommons-el-java/debian/changelog 2009-11-26 15:44:29 UTC (rev
11129)
+++ trunk/libcommons-el-java/debian/changelog 2009-11-26 22:24:42 UTC (rev
11130)
@@ -1,13 +1,29 @@
-libcommons-el-java (1.0-4.1) UNRELEASED; urgency=low
+libcommons-el-java (1.0-4) UNRELEASED; urgency=low
- * Non-maintainer upload.
-
[ Emmanuel Bourg ]
* Update of the URLs
* Rename Jakarta Commons to Apache Commons
- -- Sylvestre Ledru <sylvestre.le...@inria.fr> Wed, 17 Jun 2009 10:50:58 +0200
+ [ Niels Thykier ]
+ * Added myself to uploaders.
+ * Updated Build-Depends(-Indep).
+ - Replace java-gcj-compat with default-jdk
+ - Move default-jdk and ant to Build-Depends.
+ * Made debian/rules respect errors.
+ * Bumped debhelper compat to 7.
+ * Bumped Standards-Version to 3.8.3:
+ - Changed section to java.
+ - Added Vcs-* fields.
+ * Added more alternatives to java and changed to the -headless
+ version of them.
+ * Added missing ${misc:Depends}.
+ * Imported patch from Ubuntu to fix FTBFS.
+ - Thanks to Ilya Barygin for the patch.
+ * Updated existing patches to be "quilt" appliable.
+ * Imported patch from Fedora to add OSGi metadata. (Closes: #558180)
+ -- Niels Thykier <ni...@thykier.net> Thu, 26 Nov 2009 22:29:43 +0100
+
libcommons-el-java (1.0-4) unstable; urgency=low
* Use java-gcj-compat intead of kaffe. Closes: #399372.
Modified: trunk/libcommons-el-java/debian/compat
===================================================================
--- trunk/libcommons-el-java/debian/compat 2009-11-26 15:44:29 UTC (rev
11129)
+++ trunk/libcommons-el-java/debian/compat 2009-11-26 22:24:42 UTC (rev
11130)
@@ -1 +1 @@
-5
+7
Modified: trunk/libcommons-el-java/debian/control
===================================================================
--- trunk/libcommons-el-java/debian/control 2009-11-26 15:44:29 UTC (rev
11129)
+++ trunk/libcommons-el-java/debian/control 2009-11-26 22:24:42 UTC (rev
11130)
@@ -1,16 +1,22 @@
Source: libcommons-el-java
-Section: libs
+Section: java
Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <av...@debian.org>, Michael Koch <konque...@gmx.de>
-Build-Depends: debhelper (>=5), cdbs
-Build-Depends-Indep: java-gcj-compat-dev, ant, junit (>= 3.8.1),
libservlet2.4-java
-Standards-Version: 3.7.2
+Uploaders: Arnaud Vandyck <av...@debian.org>, Michael Koch <konque...@gmx.de>,
+ Niels Thykier <ni...@thykier.net>
+Build-Depends: debhelper (>=7), cdbs, default-jdk, ant
+Build-Depends-Indep: junit (>= 3.8.1), libservlet2.4-java
+Standards-Version: 3.8.3
Homepage: http://commons.apache.org/el/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-el-java
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-el-java
Package: libcommons-el-java
Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime, libservlet2.4-java
+Depends: default-jre-headless | java1-runtime-headless |
java2-runtime-headless |
+ java5-runtime-headless | java6-runtime-headless,
+ libservlet2.4-java,
+ ${misc:Depends}
Description: Implementation of the JSP2.0 Expression Language interpreter
The JSP 2.0 specification provides a portable API for evaluating "EL
Expressions": The classes and interfaces in the javax.servlet.jsp.el
Modified:
trunk/libcommons-el-java/debian/patches/01build_xml_license_location_patch.patch
===================================================================
---
trunk/libcommons-el-java/debian/patches/01build_xml_license_location_patch.patch
2009-11-26 15:44:29 UTC (rev 11129)
+++
trunk/libcommons-el-java/debian/patches/01build_xml_license_location_patch.patch
2009-11-26 22:24:42 UTC (rev 11130)
@@ -1,6 +1,6 @@
diff -urNad /home/arnaud/debian/ITP/jakarta/libcommons-el-java-1.0/build.xml
libcommons-el-java-1.0/build.xml
---- /home/arnaud/debian/ITP/jakarta/libcommons-el-java-1.0/build.xml
2003-06-07 00:35:28.000000000 +0200
-+++ libcommons-el-java-1.0/build.xml 2003-07-02 11:04:37.000000000 +0200
+--- a/build.xml 2003-06-07 00:35:28.000000000 +0200
++++ b/build.xml 2003-07-02 11:04:37.000000000 +0200
@@ -230,7 +230,7 @@
<target name="dist" depends="compile,javadoc"
description="Create binary distribution">
Modified:
trunk/libcommons-el-java/debian/patches/02build_xml_javadoc_depends.patch
===================================================================
--- trunk/libcommons-el-java/debian/patches/02build_xml_javadoc_depends.patch
2009-11-26 15:44:29 UTC (rev 11129)
+++ trunk/libcommons-el-java/debian/patches/02build_xml_javadoc_depends.patch
2009-11-26 22:24:42 UTC (rev 11130)
@@ -1,6 +1,6 @@
diff -urNad /home/arnaud/debian/ITP/jakarta/libcommons-el-java-1.0/build.xml
libcommons-el-java-1.0/build.xml
---- /home/arnaud/debian/ITP/jakarta/libcommons-el-java-1.0/build.xml
2003-06-07 00:35:28.000000000 +0200
-+++ libcommons-el-java-1.0/build.xml 2003-07-02 11:05:46.000000000 +0200
+--- a/libcommons-el-java-1.0/build.xml 2003-06-07 00:35:28.000000000 +0200
++++ b/build.xml 2003-07-02 11:05:46.000000000 +0200
@@ -207,7 +207,7 @@
description="Clean and compile all components"/>
Modified: trunk/libcommons-el-java/debian/rules
===================================================================
--- trunk/libcommons-el-java/debian/rules 2009-11-26 15:44:29 UTC (rev
11129)
+++ trunk/libcommons-el-java/debian/rules 2009-11-26 22:24:42 UTC (rev
11130)
@@ -12,7 +12,7 @@
include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-JAVA_HOME := /usr/lib/jvm/java-gcj
+JAVA_HOME := /usr/lib/jvm/default-java
ANT_HOME := /usr/share/ant
DEB_JARS := servlet-api jsp-api junit
DEB_ANT_BUILD_TARGET := jar-only javadoc
@@ -27,13 +27,13 @@
API_VERSION := 1.0
configure/lib$(LIBRARY_PACKAGE)-java::
- -mkdir -p target/classes
- -mkdir dist
+ mkdir -p target/classes
+ mkdir -p dist
install/lib$(LIBRARY_PACKAGE)-java::
install -m 644 dist/$(LIBRARY_PACKAGE).jar
debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE)-$(API_VERSION).jar
ln -s $(LIBRARY_PACKAGE)-$(API_VERSION).jar
debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE).jar
clean::
- -rm -r target dist
+ rm -fr target dist
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
