Author: twerner
Date: 2010-05-03 19:42:05 +0000 (Mon, 03 May 2010)
New Revision: 12288
Modified:
trunk/libjamon-java/debian/changelog
trunk/libjamon-java/debian/control
trunk/libjamon-java/debian/rules
Log:
* Merge from debian testing, remaining changes:
- debian/control: Build-depend on libjetty-java rather than full jetty
- debian/control, debian/rules: Depend on geronimo-interceptor-3.0-spec
rather than glassfish-javaee, to avoid pulling glassfish into main
- debian/control: Use -headless runtimes, bump dependency to java5
- debian/ant.properties: Build java5 code to match dependency
* Added debian/ant.properties to build java2-compatible code
* debian/control, debian/rules: Build with gcj-jdk
* debian/control: Depend on default-jre-headless | java2-runtime-headless
Modified: trunk/libjamon-java/debian/changelog
===================================================================
--- trunk/libjamon-java/debian/changelog 2010-05-03 19:37:01 UTC (rev
12287)
+++ trunk/libjamon-java/debian/changelog 2010-05-03 19:42:05 UTC (rev
12288)
@@ -1,3 +1,14 @@
+libjamon-java (2.7-1ubuntu1) lucid; urgency=low
+
+ * Merge from debian testing, remaining changes:
+ - debian/control: Build-depend on libjetty-java rather than full jetty
+ - debian/control, debian/rules: Depend on geronimo-interceptor-3.0-spec
+ rather than glassfish-javaee, to avoid pulling glassfish into main
+ - debian/control: Use -headless runtimes, bump dependency to java5
+ - debian/ant.properties: Build java5 code to match dependency
+
+ -- Thierry Carrez <thierry.car...@ubuntu.com> Mon, 30 Nov 2009 11:38:34 +0100
+
libjamon-java (2.7-1) unstable; urgency=low
[ Emmanuel Bourg ]
@@ -28,6 +39,19 @@
-- Luke Cycon <lcy...@gmail.com> Sun, 13 Sep 2009 10:33:36 -0700
+libjamon-java (2.5-1ubuntu2) karmic; urgency=low
+
+ * Added debian/ant.properties to build java2-compatible code
+
+ -- Thierry Carrez <thierry.car...@ubuntu.com> Tue, 25 Aug 2009 11:31:47 +0200
+
+libjamon-java (2.5-1ubuntu1) karmic; urgency=low
+
+ * debian/control, debian/rules: Build with gcj-jdk
+ * debian/control: Depend on default-jre-headless | java2-runtime-headless
+
+ -- Thierry Carrez <thierry.car...@ubuntu.com> Mon, 17 Aug 2009 09:58:10 +0200
+
libjamon-java (2.5-1) unstable; urgency=low
* Initial release (Closes: #426315)
Modified: trunk/libjamon-java/debian/control
===================================================================
--- trunk/libjamon-java/debian/control 2010-05-03 19:37:01 UTC (rev 12287)
+++ trunk/libjamon-java/debian/control 2010-05-03 19:42:05 UTC (rev 12288)
@@ -3,8 +3,8 @@
Priority: extra
Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Torsten Werner <twer...@debian.org>, Luke Cycon <lcy...@gmail.com>
-Build-Depends: ant, quilt, cdbs, debhelper (>= 5), glassfish-javaee,
- default-jdk, jetty, liblog4j1.2-java, libservlet2.5-java, libtomcat6-java
+Build-Depends: ant, quilt, cdbs, debhelper (>= 5),
+ default-jdk, libgeronimo-interceptor-3.0-spec-java, libjetty-java,
liblog4j1.2-java, libservlet2.5-java, libtomcat6-java
Standards-Version: 3.8.3
Homepage: http://commons.apache.org/attributes/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjamon-java/
@@ -13,7 +13,7 @@
Package: libjamon-java
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends},
- default-jre | java2-runtime
+ default-jre-headless | java5-runtime-headless
Description: Java API for easy monitoring production applications
The Java Application Monitor (JAMon) is a free, simple, high
performance, thread safe, Java API that allows developers to easily
Modified: trunk/libjamon-java/debian/rules
===================================================================
--- trunk/libjamon-java/debian/rules 2010-05-03 19:37:01 UTC (rev 12287)
+++ trunk/libjamon-java/debian/rules 2010-05-03 19:42:05 UTC (rev 12288)
@@ -5,7 +5,7 @@
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := catalina glassfish-javaee jetty jetty-util log4j-1.2
servlet-api-2.5
+DEB_JARS := catalina geronimo-interceptor-3.0-spec jetty jetty-util log4j-1.2
servlet-api-2.5
get-orig-source:
uscan --force-download --rename
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
