Author: twerner
Date: 2010-04-29 05:46:41 +0000 (Thu, 29 Apr 2010)
New Revision: 12225
Modified:
trunk/jetty/debian/changelog
trunk/jetty/debian/rules
Log:
* Set JAVA_HOME in d/rules to /usr/lib/jvm/default-java. (Closes: #578618,
#579469)
* Fix the installation of jetty-util5.jar. (Closes: #569328)
Modified: trunk/jetty/debian/changelog
===================================================================
--- trunk/jetty/debian/changelog 2010-04-27 07:33:52 UTC (rev 12224)
+++ trunk/jetty/debian/changelog 2010-04-29 05:46:41 UTC (rev 12225)
@@ -1,3 +1,11 @@
+jetty (6.1.24-2) unstable; urgency=low
+
+ * Set JAVA_HOME in d/rules to /usr/lib/jvm/default-java. (Closes: #578618,
+ #579469)
+ * Fix the installation of jetty-util5.jar. (Closes: #569328)
+
+ -- Torsten Werner <twer...@debian.org> Thu, 29 Apr 2010 07:36:43 +0200
+
jetty (6.1.24-1) unstable; urgency=low
[ Niels Thykier ]
Modified: trunk/jetty/debian/rules
===================================================================
--- trunk/jetty/debian/rules 2010-04-27 07:33:52 UTC (rev 12224)
+++ trunk/jetty/debian/rules 2010-04-29 05:46:41 UTC (rev 12225)
@@ -5,11 +5,10 @@
PACKAGE := $(DEB_SOURCE_PACKAGE)
VERSION := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME := /usr/lib/jvm/java-6-openjdk
-ANT_HOME := /usr/share/ant
+JAVA_HOME := /usr/lib/jvm/default-java
DEB_JARS := servlet-api-2.5 slf4j-api mx4j mx4j-tools gnumail
activation commons-daemon
DEB_ANT_BUILD_TARGET := package
-DEB_ANT_BUILDFILE := ./debian/build.xml
+DEB_ANT_BUILDFILE := debian/build.xml
DEB_ANT_ARGS := -DVERSION=$(VERSION) -Dbuild.sysclasspath=last
DEB_INSTALL_CHANGELOGS_ALL := VERSION.txt
#API_DOCS := javadoc/
@@ -17,7 +16,7 @@
binary-post-install/lib$(PACKAGE)-java::
mh_installpoms -plib$(PACKAGE)-java
mh_installjar -plib$(PACKAGE)-java -l --usj-name=jetty-util
modules/util/pom.xml lib/jetty-util-$(VERSION).jar
/usr/share/jetty/lib/jetty-util.jar
- mh_installjar -plib$(PACKAGE)-java -l --usj-name=jetty-util5
modules/util5/pom.xml lib/util5/jetty-util5-$(VERSION).jar
/usr/share/jetty/lib/usr/share/java/servlet-api-2.5.jar
usr/share/jetty/lib/jre1.5/jetty-util5.jar
+ mh_installjar -plib$(PACKAGE)-java -l --usj-name=jetty-util5
modules/util5/pom.xml lib/util5/jetty-util5-$(VERSION).jar
/usr/share/jetty/jre1.5/jetty-util5-$(VERSION).jar
usr/share/jetty/lib/jre1.5/jetty-util5.jar
mh_installjar -plib$(PACKAGE)-java -l --usj-name=jetty
modules/jetty/pom.xml lib/jetty-$(VERSION).jar /usr/share/jetty/lib/jetty.jar
mh_installjar -plib$(PACKAGE)-java -l --usj-name=jetty-sslengine
extras/sslengine/pom.xml lib/sslengine/jetty-sslengine-$(VERSION).jar
/usr/share/jetty/lib/ext/jetty-sslengine.jar
mh_installjar -plib$(PACKAGE)-java -l --usj-name=jetty-start
modules/start/pom.xml start.jar /usr/share/jetty/start.jar
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
