[pkg-java] r17838 - trunk/jspwiki/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-03-06 12:31:10 +0000 (Thu, 06 Mar 2014)
New Revision: 17838

Modified:
   trunk/jspwiki/debian/changelog
   trunk/jspwiki/debian/control
   trunk/jspwiki/debian/rules
Log:
Build with the default JDK instead of GCJ
Removed the dependency on libgnujaf-java



Modified: trunk/jspwiki/debian/changelog
===================================================================
--- trunk/jspwiki/debian/changelog	2014-03-06 12:19:15 UTC (rev 17837)
+++ trunk/jspwiki/debian/changelog	2014-03-06 12:31:10 UTC (rev 17838)
@@ -1,6 +1,8 @@
 jspwiki (2.8.0-6) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Build with the default JDK instead of GCJ and removed the dependency
+    on libgnujaf-java
   * Switch to the source format 3.0 (quilt)
   * Switch to debhelper level 9
   * Standards-Version updated to 3.9.5 (no changes)

Modified: trunk/jspwiki/debian/control
===================================================================
--- trunk/jspwiki/debian/control	2014-03-06 12:19:15 UTC (rev 17837)
+++ trunk/jspwiki/debian/control	2014-03-06 12:31:10 UTC (rev 17838)
@@ -3,13 +3,12 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Adnan Hodzic <adnan at foolcontrol.org>
-Build-Depends-Indep: java-gcj-compat-dev,
-                     libcommons-codec-java,
+Build-Depends: ant, debhelper (>= 9), default-jdk
+Build-Depends-Indep: libcommons-codec-java,
                      libcommons-fileupload-java,
                      libcommons-httpclient-java,
                      libcommons-io-java,
                      libcommons-lang-java,
-                     libgnujaf-java,
                      libjaxen-java,
                      libjdom1-java,
                      liblog4j1.2-java,
@@ -19,7 +18,6 @@
                      tomcat6,
                      unzip,
                      wget
-Build-Depends: ant, debhelper (>= 9)
 Standards-Version: 3.9.5
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/jspwiki
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/jspwiki
@@ -35,7 +33,6 @@
          libcommons-io-java,
          libcommons-lang-java,
          libcommons-logging-java,
-         libgnujaf-java,
          libjabsorb-java,
          libjaxen-java,
          libjdom1-java,

Modified: trunk/jspwiki/debian/rules
===================================================================
--- trunk/jspwiki/debian/rules	2014-03-06 12:19:15 UTC (rev 17837)
+++ trunk/jspwiki/debian/rules	2014-03-06 12:31:10 UTC (rev 17838)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-export JAVA_HOME=/usr/lib/jvm/java-gcj
+export JAVA_HOME=/usr/lib/jvm/default-java
 
 patch: patch-stamp