pkg/kamailio/deb: Use gcj-jdk

pkg/kamailio/deb/debian/backports/squeeze

@@ -27,10 +27,11 @@ if [ -e ${DIST}/patches/series ]; then
 fi
 
 # No java module:
-sed -i -e '/libgcj12-dev/d' -e '/^Package: kamailio-java-modules/,/^$/d' \
+sed -i -e '/gcj-jdk/d' -e '/^Package: kamailio-java-modules/,/^$/d' \
 	${DIST}/control
 sed -i -e 's/ java[ ,$]*/ /' ${DIST}/rules
 sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ java/' ${DIST}/rules
+sed -i -e '/^export JAVA_HOME=.*/d' ${DIST}/rules
 
 # No dnssec module:
 sed -i -e '/libval-dev/d' -e '/^Package: kamailio-dnssec-modules/,/^$/d' \

pkg/kamailio/deb/debian/control

@@ -9,6 +9,7 @@ Build-Depends: bison,
                docbook-xml,
                dpkg-dev (>= 1.16.1.1),
                flex,
+               gcj-jdk,
                libconfuse-dev,
                libcurl4-openssl-dev,
                libdb-dev (>= 4.6.19),
@@ -16,7 +17,6 @@ Build-Depends: bison,
                libevent-dev,
                libexpat1-dev,
                libfreeradius-client-dev,
-               libgcj12-dev,
                libgeoip-dev (>= 1.4.5),
                libhiredis-dev (>= 0.10.0),
                libjson-c-dev,

pkg/kamailio/deb/debian/rules

@@ -18,8 +18,7 @@ include /usr/share/dpkg/buildflags.mk
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# java stuff using libgcj12
-export JAVA_HOME=/usr/lib/jvm/java-gcj-4.6
+export JAVA_HOME=/usr/lib/jvm/java-gcj
 
 # choose freeradius
 export FREERADIUS=1

pkg/kamailio/deb/jessie/control

@@ -9,6 +9,7 @@ Build-Depends: bison,
                docbook-xml,
                dpkg-dev (>= 1.16.1.1),
                flex,
+               gcj-jdk,
                libconfuse-dev,
                libcurl4-openssl-dev,
                libdb-dev (>= 4.6.19),
@@ -16,7 +17,6 @@ Build-Depends: bison,
                libevent-dev,
                libexpat1-dev,
                libfreeradius-client-dev,
-               libgcj12-dev,
                libgeoip-dev (>= 1.4.5),
                libhiredis-dev (>= 0.10.0),
                libjson-c-dev,

pkg/kamailio/deb/jessie/rules

@@ -18,8 +18,7 @@ include /usr/share/dpkg/buildflags.mk
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# java stuff using libgcj12
-export JAVA_HOME=/usr/lib/jvm/java-gcj-4.6
+export JAVA_HOME=/usr/lib/jvm/java-gcj
 
 # choose freeradius
 export FREERADIUS=1

pkg/kamailio/deb/precise/control

@@ -9,6 +9,7 @@ Build-Depends: bison,
                docbook-xml,
                dpkg-dev (>= 1.16.1.1),
                flex,
+               gcj-jdk,
                libconfuse-dev,
                libcurl4-openssl-dev,
                libdb-dev (>= 4.6.19),
@@ -16,7 +17,6 @@ Build-Depends: bison,
                libevent-dev,
                libexpat1-dev,
                libradiusclient-ng-dev,
-               libgcj12-dev,
                libgeoip-dev (>= 1.4.5),
                libhiredis-dev (>= 0.10.0),
                libjson0-dev,

pkg/kamailio/deb/precise/rules

@@ -18,8 +18,7 @@ include /usr/share/dpkg/buildflags.mk
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# java stuff using libgcj12
-export JAVA_HOME=/usr/lib/jvm/java-gcj-4.6
+export JAVA_HOME=/usr/lib/jvm/java-gcj
 
 # choose freeradius
 

pkg/kamailio/deb/squeeze/rules

@@ -17,8 +17,6 @@ DPKG_EXPORT_BUILDFLAGS = 1
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# stuff using libgcj12
-export JAVA_HOME=/usr/lib/jvm/java-gcj-4.6
 
 # choose freeradius
 

pkg/kamailio/deb/wheezy/control

@@ -9,6 +9,7 @@ Build-Depends: bison,
                docbook-xml,
                dpkg-dev (>= 1.16.1.1),
                flex,
+               gcj-jdk,
                libconfuse-dev,
                libcurl4-openssl-dev,
                libdb-dev (>= 4.6.19),
@@ -16,7 +17,6 @@ Build-Depends: bison,
                libevent-dev,
                libexpat1-dev,
                libradiusclient-ng-dev,
-               libgcj12-dev,
                libgeoip-dev (>= 1.4.5),
                libhiredis-dev (>= 0.10.0),
                libjson0-dev,

pkg/kamailio/deb/wheezy/rules

@@ -18,8 +18,7 @@ include /usr/share/dpkg/buildflags.mk
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# java stuff using libgcj12
-export JAVA_HOME=/usr/lib/jvm/java-gcj-4.6
+export JAVA_HOME=/usr/lib/jvm/java-gcj
 
 # choose freeradius