Module: sip-router Branch: 4.1 Commit: 1710d4e1d80b712a00c93ae759efde22dea35f17 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1710d4e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Sat Jun 14 18:50:56 2014 +0200 pkg/kamailio/deb: Use gcj-jdk (cherry picked from commit 8d7d72add168c2fa592214853470f4a31515c510) --- pkg/kamailio/deb/debian/backports/squeeze | 3 ++- 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/precise/control | 2 +- pkg/kamailio/deb/precise/rules | 3 +-- pkg/kamailio/deb/squeeze/rules | 2 -- pkg/kamailio/deb/wheezy/control | 2 +- pkg/kamailio/deb/wheezy/rules | 3 +-- 10 files changed, 10 insertions(+), 15 deletions(-) diff --git a/pkg/kamailio/deb/debian/backports/squeeze b/pkg/kamailio/deb/debian/backports/squeeze index b037d57..a7f8ba2 100755 --- a/pkg/kamailio/deb/debian/backports/squeeze +++ b/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' \ diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index 895c615..9dffb14 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -9,13 +9,13 @@ Build-Depends: bison, docbook-xml, dpkg-dev (>= 1.16.1.1), flex, + gcj-jdk, libconfuse-dev, libcurl4-openssl-dev, libdb-dev (>= 4.6.19), libevent-dev, libexpat1-dev, libfreeradius-client-dev, - libgcj12-dev, libgeoip-dev (>= 1.4.5), libhiredis-dev (>= 0.10.0), libjson-c-dev, diff --git a/pkg/kamailio/deb/debian/rules b/pkg/kamailio/deb/debian/rules index 3b97b12..0e80348 100755 --- a/pkg/kamailio/deb/debian/rules +++ b/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 diff --git a/pkg/kamailio/deb/jessie/control b/pkg/kamailio/deb/jessie/control index f5b1714..fa67335 100644 --- a/pkg/kamailio/deb/jessie/control +++ b/pkg/kamailio/deb/jessie/control @@ -9,13 +9,13 @@ Build-Depends: bison, docbook-xml, dpkg-dev (>= 1.16.1.1), flex, + gcj-jdk, libconfuse-dev, libcurl4-openssl-dev, libdb-dev (>= 4.6.19), libevent-dev, libexpat1-dev, libfreeradius-client-dev, - libgcj12-dev, libgeoip-dev (>= 1.4.5), libhiredis-dev (>= 0.10.0), libjson-c-dev, diff --git a/pkg/kamailio/deb/jessie/rules b/pkg/kamailio/deb/jessie/rules index fe254bd..f9058d3 100755 --- a/pkg/kamailio/deb/jessie/rules +++ b/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 diff --git a/pkg/kamailio/deb/precise/control b/pkg/kamailio/deb/precise/control index 460d157..10ebf76 100644 --- a/pkg/kamailio/deb/precise/control +++ b/pkg/kamailio/deb/precise/control @@ -9,13 +9,13 @@ Build-Depends: bison, docbook-xml, dpkg-dev (>= 1.16.1.1), flex, + gcj-jdk, libconfuse-dev, libcurl4-openssl-dev, libdb-dev (>= 4.6.19), libevent-dev, libexpat1-dev, libradiusclient-ng-dev, - libgcj12-dev, libgeoip-dev (>= 1.4.5), libhiredis-dev (>= 0.10.0), libjson0-dev, diff --git a/pkg/kamailio/deb/precise/rules b/pkg/kamailio/deb/precise/rules index fdf4d36..7b9dcdf 100755 --- a/pkg/kamailio/deb/precise/rules +++ b/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 diff --git a/pkg/kamailio/deb/squeeze/rules b/pkg/kamailio/deb/squeeze/rules index df52d67..ab63b32 100755 --- a/pkg/kamailio/deb/squeeze/rules +++ b/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 diff --git a/pkg/kamailio/deb/wheezy/control b/pkg/kamailio/deb/wheezy/control index 8c37645..fe2ee80 100644 --- a/pkg/kamailio/deb/wheezy/control +++ b/pkg/kamailio/deb/wheezy/control @@ -9,13 +9,13 @@ Build-Depends: bison, docbook-xml, dpkg-dev (>= 1.16.1.1), flex, + gcj-jdk, libconfuse-dev, libcurl4-openssl-dev, libdb-dev (>= 4.6.19), libevent-dev, libexpat1-dev, libradiusclient-ng-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 7b7ab3c..369192e 100755 --- a/pkg/kamailio/deb/wheezy/rules +++ b/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