[sr-dev] git:master: pkg/kamailio/deb: Use gcj-jdk

Victor Seva linuxmaniac at torreviejawireless.org
Sun Jun 15 09:41:55 CEST 2014


Module: sip-router
Branch: master
Commit: 8d7d72add168c2fa592214853470f4a31515c510
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8d7d72add168c2fa592214853470f4a31515c510

Author: Victor Seva <linuxmaniac at torreviejawireless.org>
Committer: Victor Seva <linuxmaniac at torreviejawireless.org>
Date:   Sat Jun 14 18:50:56 2014 +0200

pkg/kamailio/deb: Use gcj-jdk

---

 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 ef8cefb..9ccfa6c 100644
--- a/pkg/kamailio/deb/debian/control
+++ b/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,
diff --git a/pkg/kamailio/deb/debian/rules b/pkg/kamailio/deb/debian/rules
index e2a0fba..8bb2c92 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 e08ff34..05e4ae5 100644
--- a/pkg/kamailio/deb/jessie/control
+++ b/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,
diff --git a/pkg/kamailio/deb/jessie/rules b/pkg/kamailio/deb/jessie/rules
index e33fd23..d1d2965 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 a5f56c4..a2eb2f5 100644
--- a/pkg/kamailio/deb/precise/control
+++ b/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,
diff --git a/pkg/kamailio/deb/precise/rules b/pkg/kamailio/deb/precise/rules
index d5be2df..b70f787 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 b94433e..f2b1d9c 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 a866c5c..58ce12d 100644
--- a/pkg/kamailio/deb/wheezy/control
+++ b/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,
diff --git a/pkg/kamailio/deb/wheezy/rules b/pkg/kamailio/deb/wheezy/rules
index 80323a5..8e242dd 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
 




More information about the sr-dev mailing list