[Pkg-voip-commits] [kamailio] 03/04: remove applied upstream patches

[Victor Seva Lopez]

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

maniac-guest pushed a commit to branch master
in repository kamailio.

commit fb02772b00f5b0e8340e1022833cf8392527e58c
Author: Victor Seva <linuxmaniac at torreviejawireless.org>
Date:   Thu Aug 7 21:19:34 2014 +0200

    remove applied upstream patches
---
 debian/patches/series                              |  2 --
 ...rash-related-to-core-sockets_list-command.patch | 27 ----------------------
 .../upstream/app_java-Use-generic-libgcj.patch     | 27 ----------------------
 3 files changed, 56 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 914aed4..097470b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-upstream/app_java-Use-generic-libgcj.patch
-upstream/0001-core-fix-crash-related-to-core-sockets_list-command.patch
 no_lib64_on_64_bits.patch
 no_INSTALL_file.patch
 fix_export.patch
diff --git a/debian/patches/upstream/0001-core-fix-crash-related-to-core-sockets_list-command.patch b/debian/patches/upstream/0001-core-fix-crash-related-to-core-sockets_list-command.patch
deleted file mode 100644
index 7cddf79..0000000
--- a/debian/patches/upstream/0001-core-fix-crash-related-to-core-sockets_list-command.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 2198cb5d508055f495af29866045d51c1098d5cc Mon Sep 17 00:00:00 2001
-From: Ovidiu Sas <osas at voipembedded.com>
-Date: Thu, 12 Jun 2014 12:46:39 -0400
-Subject: [PATCH] core: fix crash related to core sockets_list  command  -
- reported by Nuno Reis <nreis at wavecom.pt> (cherry picked from commit
- 1c715b1a2a66a4a15d1a8def33ef369212712bb1)
-
----
- core_cmd.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/core_cmd.c b/core_cmd.c
-index 304c49d..52150e9 100644
---- a/core_cmd.c
-+++ b/core_cmd.c
-@@ -936,7 +936,7 @@ static void core_sockets_list(rpc_t* rpc, void* c)
- 						"proto", get_proto_name(proto),
- 						"address", si->name.s);
- 				if (!si->flags & SI_IS_IP)
--					rpc->struct_add(ha, "ss",
-+					rpc->struct_add(ha, "s",
- 						"ipaddress", si->address_str.s);
- 				rpc->struct_add(ha, "sss",
- 						"proto", si->port_no_str.s,
--- 
-2.0.0
-
diff --git a/debian/patches/upstream/app_java-Use-generic-libgcj.patch b/debian/patches/upstream/app_java-Use-generic-libgcj.patch
deleted file mode 100644
index 109edf9..0000000
--- a/debian/patches/upstream/app_java-Use-generic-libgcj.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 00d2c27cbd0c36fd8979d5b92a3f860a5e657c60 Mon Sep 17 00:00:00 2001
-From: Victor Seva <linuxmaniac at torreviejawireless.org>
-Date: Sat, 14 Jun 2014 18:20:06 +0200
-Subject: [PATCH] app_java: Use generic libgcj
-
----
- modules/app_java/Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules/app_java/Makefile b/modules/app_java/Makefile
-index 792a116..ca854ed 100644
---- a/modules/app_java/Makefile
-+++ b/modules/app_java/Makefile
-@@ -17,8 +17,8 @@ LIBS += $(shell pkg-config libgcj-4.4 --cflags) -L$(JVM_PATH) -ljvm
- else
- # try to detect JAVA_HOME
- JAVA_HOME ?= $(shell readlink -f /usr/bin/javac | sed "s:bin/javac::")
--DEFS += $(shell pkg-config libgcj12 --cflags) -I$(JAVA_HOME)/include
--LIBS += $(shell pkg-config libgcj12 --libs) -L$(JAVA_HOME)/lib  -ljvm
-+DEFS += $(shell pkg-config libgcj --cflags) -I$(JAVA_HOME)/include
-+LIBS += $(shell pkg-config libgcj --libs) -L$(JAVA_HOME)/lib  -ljvm
- 
- # On Debian 7.5 there is a bug with JAVA_HOME detection.
- # $(shell readlink -f /usr/bin/javac | sed "s:bin/javac::") points to perl wrapper script (/usr/bin/gcj-wrapper-4.7)
--- 
-2.0.0
-

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