[pkg-java] r6478 - trunk/libswirl-java/debian

apeeters-guest at alioth.debian.org apeeters-guest at alioth.debian.org
Tue May 20 14:21:38 UTC 2008


Author: apeeters-guest
Date: 2008-05-20 14:21:36 +0000 (Tue, 20 May 2008)
New Revision: 6478

Modified:
   trunk/libswirl-java/debian/changelog
   trunk/libswirl-java/debian/control
   trunk/libswirl-java/debian/rules
Log:
Merged branch VERSION_1_0_13 changes 6360 and 6372

Modified: trunk/libswirl-java/debian/changelog
===================================================================
--- trunk/libswirl-java/debian/changelog	2008-05-20 04:49:54 UTC (rev 6477)
+++ trunk/libswirl-java/debian/changelog	2008-05-20 14:21:36 UTC (rev 6478)
@@ -4,7 +4,6 @@
   * debian/control:
     - Removed Build-Depends and Depends on libgui-commands-java
     - Added Build-Depends and Depends on libjdom1-java
-    - Bumped Standards-Version to 3.7.3: no changes needed
   * debian/rules:
     - DEB_JARS: Replaced gui-commands with jdom1
   * debian/copyright:
@@ -15,6 +14,17 @@
 
  -- Adriaan Peeters <apeeters at lashout.net>  Wed, 20 Feb 2008 23:07:30 +0100
 
+libswirl-java (1.0.13-3) unstable; urgency=low
+
+  * debian/control:
+    - Bumped Standards-Version to 3.7.3, no changes needed
+    - Do not Build-Depend on -1 revision of libgui-commands-java
+    - Build-Depend on default-jdk-builddep instead of
+      java-gcj-compat-dev (Closes: #477889)
+  * debian/rules: change JAVA_HOME accordingly to /usr/lib/jvm/default-java
+
+ -- Adriaan Peeters <apeeters at lashout.net>  Wed, 30 Apr 2008 16:58:38 +0200
+
 libswirl-java (1.0.13-2) unstable; urgency=low
 
   * Reverted Build-Depends-Indep introduction (Closes: #449194)

Modified: trunk/libswirl-java/debian/control
===================================================================
--- trunk/libswirl-java/debian/control	2008-05-20 04:49:54 UTC (rev 6477)
+++ trunk/libswirl-java/debian/control	2008-05-20 14:21:36 UTC (rev 6478)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Adriaan Peeters <apeeters at lashout.net>
 Homepage: http://swirl-lib.sourceforge.net/
-Build-Depends: debhelper (>> 5.0.0), cdbs, patchutils, ant, java-gcj-compat-dev, libjdom1-java
+Build-Depends: debhelper (>> 5.0.0), cdbs, patchutils, ant, default-jdk-builddep, libjdom1-java
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/libswirl-java/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libswirl-java/
 Standards-Version: 3.7.3

Modified: trunk/libswirl-java/debian/rules
===================================================================
--- trunk/libswirl-java/debian/rules	2008-05-20 04:49:54 UTC (rev 6477)
+++ trunk/libswirl-java/debian/rules	2008-05-20 14:21:36 UTC (rev 6478)
@@ -4,7 +4,7 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME := /usr/lib/jvm/java-gcj
+JAVA_HOME := /usr/lib/jvm/default-java
 ANT_HOME  := /usr/share/ant
 
 DEB_JARS := jdom1




More information about the pkg-java-commits mailing list