[jspwiki] 11/24: Build with the default JDK instead of GCJ Removed the dependency on libgnujaf-java

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jspwiki.

commit 5c590362d0cea365e166baf6c12cea8e69618395
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Mar 6 12:31:10 2014 +0000

    Build with the default JDK instead of GCJ
    Removed the dependency on libgnujaf-java
---
 debian/changelog | 2 ++
 debian/control   | 7 ++-----
 debian/rules     | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6e668d9..5b34b1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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)
diff --git a/debian/control b/debian/control
index 4a3a7a5..6d6e2cf 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,12 @@ Section: contrib/web
 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 @@ Build-Depends-Indep: java-gcj-compat-dev,
                      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 @@ Depends: libcommons-codec-java,
          libcommons-io-java,
          libcommons-lang-java,
          libcommons-logging-java,
-         libgnujaf-java,
          libjabsorb-java,
          libjaxen-java,
          libjdom1-java,
diff --git a/debian/rules b/debian/rules
index 8ef1c9e..c62fd7e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jspwiki.git