From b40a1de62b24833338d6c2c223aad5aea3bd00f5 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Thu, 13 Jun 2013 14:47:45 +0200 Subject: [PATCH] Upgrade to 4.0.2. Remove upstream applied patch. --- debian/changelog | 4 +-- debian/patches/series | 1 - ...rinting-function-name-in-log-message.patch | 26 ------------------- 3 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 debian/patches/upstream/debug/0001-core-fixed-printing-function-name-in-log-message.patch diff --git a/debian/changelog b/debian/changelog index 9b7534013..23a2a0774 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -ngcp-kamailio (4.0.1-1) UNRELEASED; urgency=low +ngcp-kamailio (4.0.2-1) UNRELEASED; urgency=low * Upstream new version. * Use Debian packaging as base. All sipwise changes as quilt patches. * Rename to ngcp-kamailio* - -- Victor Seva Wed, 24 Apr 2013 08:18:16 +0200 + -- Victor Seva Thu, 13 Jun 2013 14:44:17 +0200 kamailio (3.3+ngcp2.8.0) unstable; urgency=low diff --git a/debian/patches/series b/debian/patches/series index 533816939..fa829157a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,7 +7,6 @@ upstream/modules-usrloc-added-missing-rpc-commands.patch upstream/core-xavp-Added-helper-function-to-get-a-list-of-key.patch upstream/app_lua-Added-sr.xavp.get_keys-function.patch upstream/app_lua-Added-sr.xavp.get-function-in-order-to-get-a.patch -upstream/debug/0001-core-fixed-printing-function-name-in-log-message.patch upstream/debug/0002-core-updated-dprint-api-to-enable-support-for-debug-.patch upstream/debug/0003-debugger-option-to-set-debug-level-per-module.patch upstream/debug/core-use-pointer-to-pv_spec_t-on-lvalue-union.-Use-p.patch diff --git a/debian/patches/upstream/debug/0001-core-fixed-printing-function-name-in-log-message.patch b/debian/patches/upstream/debug/0001-core-fixed-printing-function-name-in-log-message.patch deleted file mode 100644 index e6e11a3c7..000000000 --- a/debian/patches/upstream/debug/0001-core-fixed-printing-function-name-in-log-message.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e081c2880b46174ad836ab1f56e3062bb17b4332 Mon Sep 17 00:00:00 2001 -From: Daniel-Constantin Mierla -Date: Fri, 17 May 2013 00:46:42 +0200 -Subject: [PATCH 1/4] core: fixed printing function name in log message - -- based on http://gcc.gnu.org/onlinedocs/gcc/Function-Names.html ---- - dprint.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dprint.h b/dprint.h -index 4a9fdbf..285c9f1 100644 ---- a/dprint.h -+++ b/dprint.h -@@ -46,7 +46,7 @@ - - /* C >= 99 has __func__, older gcc versions have __FUNCTION__ */ - #if __STDC_VERSION__ < 199901L --# if __GNUC__ >= 2 && defined __FUNCTION__ -+# if __GNUC__ >= 2 - # define _FUNC_NAME_ __FUNCTION__ - # else - # define _FUNC_NAME_ "" --- -1.7.10.4 -