[Pkg-voip-commits] r9125 - in /ptlib/trunk/debian: changelog patches/pluginmgr.patch patches/series

[kilian at alioth.debian.org]

Author: kilian
Date: Mon Jul 11 14:28:32 2011
New Revision: 9125

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9125
Log:
include pluginmgr patch from upstream as well

Added:
    ptlib/trunk/debian/patches/pluginmgr.patch
Modified:
    ptlib/trunk/debian/changelog
    ptlib/trunk/debian/patches/series

Modified: ptlib/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/trunk/debian/changelog?rev=9125&op=diff
==============================================================================
--- ptlib/trunk/debian/changelog (original)
+++ ptlib/trunk/debian/changelog Mon Jul 11 14:28:32 2011
@@ -21,10 +21,10 @@
     (this makes c++ symbol files somewhat less painful. But still different
     g++ versions emit a bit different symbol sets so ftbfs'es happen)
   * Register API documentation with doc-base
-  * Add dlclose fix from upstream to unloading plugins without ld.so issuing
+  * Add dlclose fixes from upstream to unloading plugins without ld.so issuing
     an error
 
- -- Kilian Krause <kilian at debian.org>  Mon, 11 Jul 2011 14:12:02 +0200
+ -- Kilian Krause <kilian at debian.org>  Mon, 11 Jul 2011 16:28:05 +0200
 
 ptlib (2.8.4-1) experimental; urgency=low
 

Added: ptlib/trunk/debian/patches/pluginmgr.patch
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/trunk/debian/patches/pluginmgr.patch?rev=9125&op=file
==============================================================================
--- ptlib/trunk/debian/patches/pluginmgr.patch (added)
+++ ptlib/trunk/debian/patches/pluginmgr.patch Mon Jul 11 14:28:32 2011
@@ -1,0 +1,31 @@
+Origin: upstream
+Description: fix pluginmgr regression of dlclose fix
+Index: src/ptlib/common/pluginmgr.cxx
+===================================================================
+--- a/src/ptlib/common/pluginmgr.cxx	(revision 26179)
++++ b/src/ptlib/common/pluginmgr.cxx	(revision 26180)
+@@ -515,6 +515,8 @@
+ 
+ void PluginLoaderStartup::OnShutdown()
+ {
++  PPluginManager::GetPluginManager().OnShutdown();
++
+   while (managers.begin() != managers.end()) {
+     std::vector<PPluginModuleManager *>::iterator r = managers.begin();
+     PPluginModuleManager * mgr = *r;
+@@ -522,8 +524,6 @@
+     mgr->OnShutdown();
+     delete mgr;
+   }
+- 
+-  PPluginManager::GetPluginManager().OnShutdown();
+ }
+ 
+ PFACTORY_CREATE(PFactory<PProcessStartup>, PluginLoaderStartup, "PluginLoader", true);
+
+Property changes on: .
+___________________________________________________________________
+Modified: svn:mergeinfo
+   Merged /ptlib/trunk:r26179
+   Merged /opal/trunk:r26179
+

Modified: ptlib/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/trunk/debian/patches/series?rev=9125&op=diff
==============================================================================
--- ptlib/trunk/debian/patches/series (original)
+++ ptlib/trunk/debian/patches/series Mon Jul 11 14:28:32 2011
@@ -1,1 +1,2 @@
 dlclose_fix.patch
+pluginmgr.patch