[Pkg-voip-commits] r9558 - in /kamailio/trunk/debian: changelog patches/series patches/upstream/0002-xmlops-fixed-internal-module-name.patch

[maniac-guest at alioth.debian.org]

Author: maniac-guest
Date: Tue Feb 28 08:37:29 2012
New Revision: 9558

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9558
Log:
patch from upstream repository

Added:
    kamailio/trunk/debian/patches/upstream/0002-xmlops-fixed-internal-module-name.patch
Modified:
    kamailio/trunk/debian/changelog
    kamailio/trunk/debian/patches/series

Modified: kamailio/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/changelog?rev=9558&op=diff
==============================================================================
--- kamailio/trunk/debian/changelog (original)
+++ kamailio/trunk/debian/changelog Tue Feb 28 08:37:29 2012
@@ -15,7 +15,7 @@
   * debian/patches:
     + remove all patches.
     + refresh no_lib64_on_64_bits.patch
-    + added upstream fix for lua
+    + added upstream fixes
     + added no_INSTALL_file.patch
     + added spelling-errors.patch
   * debian/watch updated
@@ -24,7 +24,7 @@
   * debian/copyright
     + using copyright-format/1.0/
 
- -- Victor Seva <linuxmaniac at torreviejawireless.org>  Mon, 27 Feb 2012 16:45:38 +0100
+ -- Victor Seva <linuxmaniac at torreviejawireless.org>  Tue, 28 Feb 2012 09:36:19 +0100
 
 kamailio (1.5.1-2) unstable; urgency=low
 

Modified: kamailio/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/series?rev=9558&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/series (original)
+++ kamailio/trunk/debian/patches/series Tue Feb 28 08:37:29 2012
@@ -1,4 +1,5 @@
 upstream/0001-Proper-parsing-for-PVs.patch
+upstream/0002-xmlops-fixed-internal-module-name.patch
 no_lib64_on_64_bits.patch
 no_INSTALL_file.patch
 spelling-errors.patch

Added: kamailio/trunk/debian/patches/upstream/0002-xmlops-fixed-internal-module-name.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0002-xmlops-fixed-internal-module-name.patch?rev=9558&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0002-xmlops-fixed-internal-module-name.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0002-xmlops-fixed-internal-module-name.patch Tue Feb 28 08:37:29 2012
@@ -1,0 +1,28 @@
+From 3259ef734158d9cd63ce3fa94565f5cd4260e3f6 Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Mon, 27 Feb 2012 21:37:24 +0100
+Subject: [PATCH] xmlops: fixed internal module name
+
+- c&p error propagated when the module was split from presence_xml
+- reported by Olle E. Johansson
+(cherry picked from commit 1d51ef127bc546cbe7e950dedc135a529e9ed2aa)
+---
+ modules/xmlops/xmlops_mod.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/modules/xmlops/xmlops_mod.c b/modules/xmlops/xmlops_mod.c
+index 26e8e41..132c9e1 100644
+--- a/modules/xmlops/xmlops_mod.c
++++ b/modules/xmlops/xmlops_mod.c
+@@ -58,7 +58,7 @@ static param_export_t params[]={
+ 
+ /** module exports */
+ struct module_exports exports= {
+-	"presence_xml",		/* module name */
++	"xmlops",		/* module name */
+ 	 DEFAULT_DLFLAGS,	/* dlopen flags */
+ 	 0,  			/* exported functions */
+ 	 params,		/* exported parameters */
+-- 
+1.7.4.1
+