[sr-dev] git:vseva/app_java_makefile DELETED: pkg/kamailio/deb: set JAVA_HOME and use libgcj12-dev instead of gcj-jdk

[Victor Seva]

Module: sip-router
Branch: vseva/app_java_makefile DELETED
Commit: 664ec42db562092607e7ea39b40c35fa8f85e64b
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=664ec42db562092607e7ea39b40c35fa8f85e64b

Author: Victor Seva <linuxmaniac at torreviejawireless.org>
Committer: Victor Seva <linuxmaniac at torreviejawireless.org>
Date:   Thu Dec 12 10:09:07 2013 +0100

pkg/kamailio/deb: set JAVA_HOME and use libgcj12-dev instead of gcj-jdk

---

 pkg/kamailio/deb/debian/control |    2 +-
 pkg/kamailio/deb/debian/rules   |    3 +++
 pkg/kamailio/deb/jessie/control |    2 +-
 pkg/kamailio/deb/jessie/rules   |    3 +++
 pkg/kamailio/deb/wheezy/control |    2 +-
 pkg/kamailio/deb/wheezy/rules   |    3 +++
 6 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control
index 6d8c31b..dcedbd1 100644
--- a/pkg/kamailio/deb/debian/control
+++ b/pkg/kamailio/deb/debian/control
@@ -4,7 +4,6 @@ Priority: optional
 Maintainer: Jon Bonilla <manwe at aholab.ehu.es>
 Build-Depends: bison,
                debhelper (>= 5),
-               gcj-jdk,
                docbook-xml,
                dpatch,
                dpkg-dev (>= 1.13.19),
@@ -14,6 +13,7 @@ Build-Depends: bison,
                libdb-dev (>= 4.6.19),
                libevent-dev,
                libexpat1-dev,
+               libgcj12-dev,
                libgeoip-dev (>= 1.4.5),
                libhiredis-dev (>= 0.10.0),
                libjson0-dev,
diff --git a/pkg/kamailio/deb/debian/rules b/pkg/kamailio/deb/debian/rules
index 25b9656..3f97d21 100755
--- a/pkg/kamailio/deb/debian/rules
+++ b/pkg/kamailio/deb/debian/rules
@@ -18,6 +18,9 @@
 #  -- already set in compat
 export DEB_BUILD_OPTIONS:="$(DEB_BUILD_OPTIONS) debug"
 
+# java stuff using libgcj12
+export JAVA_HOME=/usr/lib/jvm/java-gcj-4.6
+
 # modules not in the "main" kamailio package
 EXCLUDED_MODULES= 
 
diff --git a/pkg/kamailio/deb/jessie/control b/pkg/kamailio/deb/jessie/control
index 6d8c31b..dcedbd1 100644
--- a/pkg/kamailio/deb/jessie/control
+++ b/pkg/kamailio/deb/jessie/control
@@ -4,7 +4,6 @@ Priority: optional
 Maintainer: Jon Bonilla <manwe at aholab.ehu.es>
 Build-Depends: bison,
                debhelper (>= 5),
-               gcj-jdk,
                docbook-xml,
                dpatch,
                dpkg-dev (>= 1.13.19),
@@ -14,6 +13,7 @@ Build-Depends: bison,
                libdb-dev (>= 4.6.19),
                libevent-dev,
                libexpat1-dev,
+               libgcj12-dev,
                libgeoip-dev (>= 1.4.5),
                libhiredis-dev (>= 0.10.0),
                libjson0-dev,
diff --git a/pkg/kamailio/deb/jessie/rules b/pkg/kamailio/deb/jessie/rules
index 25b9656..3f97d21 100755
--- a/pkg/kamailio/deb/jessie/rules
+++ b/pkg/kamailio/deb/jessie/rules
@@ -18,6 +18,9 @@
 #  -- already set in compat
 export DEB_BUILD_OPTIONS:="$(DEB_BUILD_OPTIONS) debug"
 
+# java stuff using libgcj12
+export JAVA_HOME=/usr/lib/jvm/java-gcj-4.6
+
 # modules not in the "main" kamailio package
 EXCLUDED_MODULES= 
 
diff --git a/pkg/kamailio/deb/wheezy/control b/pkg/kamailio/deb/wheezy/control
index 70e7da8..0f924cd 100644
--- a/pkg/kamailio/deb/wheezy/control
+++ b/pkg/kamailio/deb/wheezy/control
@@ -4,7 +4,6 @@ Priority: optional
 Maintainer: Jon Bonilla <manwe at aholab.ehu.es>
 Build-Depends: bison,
                debhelper (>= 5),
-               gcj-jdk,
                docbook-xml,
                dpatch,
                dpkg-dev (>= 1.13.19),
@@ -14,6 +13,7 @@ Build-Depends: bison,
                libdb-dev (>= 4.6.19),
                libevent-dev,
                libexpat1-dev,
+               libgcj12-dev,
                libgeoip-dev (>= 1.4.5),
                libhiredis-dev (>= 0.10.0),
                libjson0-dev,
diff --git a/pkg/kamailio/deb/wheezy/rules b/pkg/kamailio/deb/wheezy/rules
index 6709a72..6db37f3 100755
--- a/pkg/kamailio/deb/wheezy/rules
+++ b/pkg/kamailio/deb/wheezy/rules
@@ -18,6 +18,9 @@
 #  -- already set in compat
 export DEB_BUILD_OPTIONS:="$(DEB_BUILD_OPTIONS) debug"
 
+# java stuff using libgcj12
+export JAVA_HOME=/usr/lib/jvm/java-gcj-4.6
+
 # modules not in the "main" kamailio package
 EXCLUDED_MODULES=