[Pkg-voip-commits] r8178 - in /qutecom/trunk/debian: changelog control patches/libpurple-glib.patch

[cavedon at alioth.debian.org]

Author: cavedon
Date: Tue Mar  9 09:14:20 2010
New Revision: 8178

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8178
Log:
Fix libpurple-glib.patch.
Update Standards-Version to 3.8.4.
Prepare to upload into unstable.

Modified:
    qutecom/trunk/debian/changelog
    qutecom/trunk/debian/control
    qutecom/trunk/debian/patches/libpurple-glib.patch

Modified: qutecom/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/changelog?rev=8178&op=diff
==============================================================================
--- qutecom/trunk/debian/changelog (original)
+++ qutecom/trunk/debian/changelog Tue Mar  9 09:14:20 2010
@@ -1,12 +1,14 @@
-qutecom (2.2~rc3.hg396~dfsg1-6) UNRELEASED; urgency=low
-
-  * Add fix-binutils-gold.patch for building with binutils-gold, although it
-    may still FTBFS because of #563366. Closes: #556311.
-  * Add libpurple-glib.patch for fixing crash with external liburple.
+qutecom (2.2~rc3.hg396~dfsg1-6) unstable; urgency=low
+
+  * Add fix-binutils-gold.patch for building with binutils-gold.
+    Closes: #556311.
+  * Add libpurple-glib.patch from upstream for fixing crash with external
+    liburple.
   * Compile against external libpurple (CVE-2010-0423, CVE-2010-0420,
     CVE-2010-0277). Closes: #559785, #572946.
-
- -- Ludovico Cavedon <cavedon at debian.org>  Mon, 08 Mar 2010 18:20:00 +0100
+  * Update Standards-Version to 3.8.4.
+
+ -- Ludovico Cavedon <cavedon at debian.org>  Tue, 09 Mar 2010 10:11:08 +0100
 
 qutecom (2.2~rc3.hg396~dfsg1-5) unstable; urgency=low
 

Modified: qutecom/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/control?rev=8178&op=diff
==============================================================================
--- qutecom/trunk/debian/control (original)
+++ qutecom/trunk/debian/control Tue Mar  9 09:14:20 2010
@@ -14,7 +14,7 @@
  libsndfile1-dev (>= 1.0.12), libcurl4-openssl-dev (>= 7.16.1),
  dpkg-dev (>= 1.13.19), libx11-dev, python-dev, libpurple-dev (>= 2.6.6)
 Build-Conflicts: qt3-dev-tools
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://www.qutecom.org/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/qutecom/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/?op=log

Modified: qutecom/trunk/debian/patches/libpurple-glib.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/libpurple-glib.patch?rev=8178&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/libpurple-glib.patch (original)
+++ qutecom/trunk/debian/patches/libpurple-glib.patch Tue Mar  9 09:14:20 2010
@@ -11,8 +11,8 @@
 
 Index: qutecom-2.2~rc3.hg396~dfsg1/libs/imwrapper/src/purple/PurpleIMFactory.cpp
 ===================================================================
---- qutecom-2.2~rc3.hg396~dfsg1.orig/libs/imwrapper/src/purple/PurpleIMFactory.cpp	2009-05-23 05:49:45.000000000 +0200
-+++ qutecom-2.2~rc3.hg396~dfsg1/libs/imwrapper/src/purple/PurpleIMFactory.cpp	2010-03-08 22:37:03.000000000 +0100
+--- qutecom-2.2~rc3.hg396~dfsg1.orig/libs/imwrapper/src/purple/PurpleIMFactory.cpp	2010-03-08 22:59:01.000000000 +0100
++++ qutecom-2.2~rc3.hg396~dfsg1/libs/imwrapper/src/purple/PurpleIMFactory.cpp	2010-03-08 23:02:40.000000000 +0100
 @@ -198,6 +198,63 @@
  	NULL
  };
@@ -77,17 +77,16 @@
  bool PurpleIMFactory::equals(const IMAccount & imAccount, std::string login, EnumIMProtocol::IMProtocol protocol) {
  	return ((imAccount.getLogin() == login) && (imAccount.getProtocol() == protocol));
  }
-@@ -270,7 +327,8 @@
+@@ -270,7 +327,7 @@
  }
  
  void PurpleIMFactory::init(const std::string & pathToProfile) {
 -	PurpleIMInit(pathToProfile);
-+	g_idle_add(purple_wg_init_lib, (gpointer)&pathToProfile);
-+	//PurpleIMInit(pathToProfile);
++	g_idle_add(purple_wg_init_lib, (gpointer)g_strdup(pathToProfile.c_str()));
  	PurpleWrapperInit();
  }
  
-@@ -285,12 +343,12 @@
+@@ -285,12 +342,12 @@
  	if (AccountMngr) {
  		AccountMngr->reset();
  	}