[Pkg-voip-commits] r8616 - in /qutecom/trunk/debian: ./ patches/

[cavedon at alioth.debian.org]

Author: cavedon
Date: Sat Aug 28 07:30:09 2010
New Revision: 8616

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8616
Log:
* New upstream snapshot.
* get-orig.source.sh: no longer need to remove duplicate of tinyurl.
* Removed pacthes merged/fixed upstream.

Removed:
    qutecom/trunk/debian/patches/cleanlook-startup-fix.patch
    qutecom/trunk/debian/patches/fix-binutils-gold.patch
    qutecom/trunk/debian/patches/fix-build-newer-ffmpeg.patch
    qutecom/trunk/debian/patches/fix-codec-name.patch
    qutecom/trunk/debian/patches/force-palette.patch
    qutecom/trunk/debian/patches/libpurple-glib.patch
    qutecom/trunk/debian/patches/purple-wait-init.patch
    qutecom/trunk/debian/patches/track-sipaccount-init.patch
Modified:
    qutecom/trunk/debian/changelog
    qutecom/trunk/debian/get-orig-source.sh
    qutecom/trunk/debian/patches/google-breakpad-gcc44.patch
    qutecom/trunk/debian/patches/series

Modified: qutecom/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/changelog?rev=8616&op=diff
==============================================================================
--- qutecom/trunk/debian/changelog (original)
+++ qutecom/trunk/debian/changelog Sat Aug 28 07:30:09 2010
@@ -1,3 +1,18 @@
+qutecom (2.2~rc3.hg640~dfsg1-1) unstable; urgency=low
+
+  * New upstream snapshot.
+  * get-orig.source.sh: no longer need to remove duplicate of tinyurl.
+  * Removed pacthes merged/fixed upstream:
+    - fix-build-newer-ffmpeg.patch
+    - track-sipaccount-init.patch
+    - fix-codec-name.patch
+    - force-palette.patch
+    - fix-binutils-gold.patch
+    - libpurple-glib.patch
+    - purple-wait-init.patch
+
+ -- Ludovico Cavedon <cavedon at debian.org>  Fri, 27 Aug 2010 23:34:42 -0700
+
 qutecom (2.2~rc3.hg396~dfsg1-6) unstable; urgency=low
 
   * Add fix-binutils-gold.patch for building with binutils-gold.

Modified: qutecom/trunk/debian/get-orig-source.sh
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/get-orig-source.sh?rev=8616&op=diff
==============================================================================
--- qutecom/trunk/debian/get-orig-source.sh (original)
+++ qutecom/trunk/debian/get-orig-source.sh Sat Aug 28 07:30:09 2010
@@ -114,14 +114,8 @@
 # Remove openssl code
 purge_3rdparty $destdir/libs/3rdparty/openssl
 
-# Remove gaim code
-#purge_3rdparty $destdir/libs/3rdparty/gaim
-
 # Remove libpurple code
 #purge_3rdparty $destdir/libs/3rdparty/libpurple
-
-# Remove coredumper code
-#purge_3rdparty $destdir/libs/3rdparty/coredumper
 
 # Remove gnutls code
 purge_3rdparty $destdir/libs/3rdparty/gnutls
@@ -147,9 +141,6 @@
 # Remove MSVC reit libraries
 purge_3rdparty $destdir/libs/3rdparty/libstdcpp
 
-# Remove duplicate of tinyxml code
-rm -r $destdir/libs/tinyxml
-
 # Avoid lintian warning on source: ancient-libtool wifo/eXosip/scripts/ltmain.sh 1.4.3
 rm $destdir/wifo/eXosip/scripts/ltmain.sh
 

Modified: qutecom/trunk/debian/patches/google-breakpad-gcc44.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/google-breakpad-gcc44.patch?rev=8616&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/google-breakpad-gcc44.patch (original)
+++ qutecom/trunk/debian/patches/google-breakpad-gcc44.patch Sat Aug 28 07:30:09 2010
@@ -6,12 +6,13 @@
 Description: fix compilation of google-breakpad with gcc 4.4
 Author: Ludovico Cavedon <cavedon at debian.org>
 
-diff -r 3a6131ab94af -r 8fa54078ac41 libs/3rdparty/googlebreakpad/src/client/linux/handler/exception_handler.h
---- a/libs/3rdparty/googlebreakpad/src/client/linux/handler/exception_handler.h	Wed Jun 03 16:13:22 2009 +0200
-+++ b/libs/3rdparty/googlebreakpad/src/client/linux/handler/exception_handler.h	Fri Jun 05 00:30:42 2009 -0700
-@@ -39,6 +39,8 @@
- #include <vector>
- #include <signal.h>
+Index: qutecom-2.2~rc3.hg640~dfsg1/libs/3rdparty/googlebreakpad/src/client/linux/handler/exception_handler.h
+===================================================================
+--- qutecom-2.2~rc3.hg640~dfsg1.orig/libs/3rdparty/googlebreakpad/src/client/linux/handler/exception_handler.h	2010-08-22 07:57:02.000000000 -0700
++++ qutecom-2.2~rc3.hg640~dfsg1/libs/3rdparty/googlebreakpad/src/client/linux/handler/exception_handler.h	2010-08-27 23:36:26.494645255 -0700
+@@ -41,6 +41,8 @@
+ 
+ #include <stdint.h>
  
 +#include <stdint.h>
 +

Modified: qutecom/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/series?rev=8616&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/series (original)
+++ qutecom/trunk/debian/patches/series Sat Aug 28 07:30:09 2010
@@ -1,14 +1,6 @@
-fix-build-newer-ffmpeg.patch
 google-breakpad-gcc44.patch
-track-sipaccount-init.patch
-cleanlook-startup-fix.patch
-fix-codec-name.patch
 cmake-noavformat.patch
 remove-extra-copying-file.patch
 cmake-force-fpic.patch
-force-palette.patch
 #purple_perl_tcl_noload.patch
 #curl-openssl-mt-fix.patch
-fix-binutils-gold.patch
-libpurple-glib.patch
-purple-wait-init.patch