[Pkg-voip-commits] [kamailio] 05/07: debian/patches: remove json-c.patch. Applied upstream

[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 6609611aa489824bf20052df1851a1b2f685dde6
Author: Victor Seva <linuxmaniac at torreviejawireless.org>
Date:   Fri Apr 25 09:56:43 2014 +0200

    debian/patches: remove json-c.patch. Applied upstream
---
 debian/patches/json-c.patch | 39 ---------------------------------------
 debian/patches/series       |  1 -
 2 files changed, 40 deletions(-)

diff --git a/debian/patches/json-c.patch b/debian/patches/json-c.patch
deleted file mode 100644
index a2bc54f..0000000
--- a/debian/patches/json-c.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Subject: [PATCH] json/jsonrpc-c: use json-c lib
---- a/modules/json/Makefile
-+++ b/modules/json/Makefile
-@@ -11,12 +11,12 @@
- 
- BUILDER = $(shell which pkg-config)
- ifeq ($(BUILDER),)
--	DEFS+=-I/usr/include/json -I$(LOCALBASE)/include/json \
-+	DEFS+=-I/usr/include/json -I$(LOCALBASE)/include/json-c \
-        -I$(LOCALBASE)/include
--	LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -ljson
-+	LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -ljson-c
- else
--	DEFS+= $(shell pkg-config --cflags json)
--	LIBS+= $(shell pkg-config --libs json)
-+	DEFS+= $(shell pkg-config --cflags json-c)
-+	LIBS+= $(shell pkg-config --libs json-c)
- endif
- DEFS+=-DKAMAILIO_MOD_INTERFACE
- 
---- a/modules/jsonrpc-c/Makefile
-+++ b/modules/jsonrpc-c/Makefile
-@@ -11,12 +11,12 @@
- 
- BUILDER = $(shell which pkg-config)
- ifeq ($(BUILDER),)
--	DEFS+=-I/usr/include/json -I$(LOCALBASE)/include/json \
-+	DEFS+=-I/usr/include/json-c -I$(LOCALBASE)/include/json-c \
-        -I$(LOCALBASE)/include
--	LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -levent -ljson
-+	LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -levent -ljson-c
- else
--	DEFS+= $(shell pkg-config --cflags json)
--	LIBS+= $(shell pkg-config --libs json)
-+	DEFS+= $(shell pkg-config --cflags json-c)
-+	LIBS+= $(shell pkg-config --libs json-c)
- 	DEFS+= $(shell pkg-config --cflags libevent)
- 	LIBS+= $(shell pkg-config --libs libevent)
- endif
diff --git a/debian/patches/series b/debian/patches/series
index fa07f37..55f8fe5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@ no_lib64_on_64_bits.patch
 no_INSTALL_file.patch
 fix_export.patch
 default_fifo.patch
-json-c.patch

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