[Pkg-voip-commits] r2577 - in wengophone/trunk/debian: . patches/generic

[Marco Nenciarini]

Author: mnencia
Date: 2006-10-18 13:59:54 +0000 (Wed, 18 Oct 2006)
New Revision: 2577

Modified:
   wengophone/trunk/debian/changelog
   wengophone/trunk/debian/patches/generic/fix-varargs-alpha.patch
Log:
Another alpha compilation fix


Modified: wengophone/trunk/debian/changelog
===================================================================
--- wengophone/trunk/debian/changelog	2006-10-17 20:24:08 UTC (rev 2576)
+++ wengophone/trunk/debian/changelog	2006-10-18 13:59:54 UTC (rev 2577)
@@ -1,3 +1,11 @@
+wengophone (2.0.0~rc4-svn8088-2) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Added fix for gaim_status_set_active in libs/gaim/src/src/status.c
+    to fix-varargs-alpha patch
+
+ -- Marco Nenciarini <mnencia at debian.org>  Wed, 18 Oct 2006 15:57:27 +0200
+
 wengophone (2.0.0~rc4-svn8088-1) unstable; urgency=medium
 
   * New upstream snapshot.
@@ -13,7 +21,6 @@
      + Chinese
   * Added patches
      + disable-ilbc
-     + cmake-amr-plugin-oneshot
      + fix-varargs-alpha (Closes: #393218)
   * Removed patches (merged upstream)
      + cmake-fix-static-phapi

Modified: wengophone/trunk/debian/patches/generic/fix-varargs-alpha.patch
===================================================================
--- wengophone/trunk/debian/patches/generic/fix-varargs-alpha.patch	2006-10-17 20:24:08 UTC (rev 2576)
+++ wengophone/trunk/debian/patches/generic/fix-varargs-alpha.patch	2006-10-18 13:59:54 UTC (rev 2577)
@@ -1,7 +1,7 @@
-Index: wengophone-2.0.0~rc4-svn8049/libs/gaim/src/src/account.c
+Index: wengophone-2.0.0~rc4-svn8088/libs/gaim/src/src/account.c
 ===================================================================
---- wengophone-2.0.0~rc4-svn8049.orig/libs/gaim/src/src/account.c	2006-10-16 14:23:42.000000000 +0200
-+++ wengophone-2.0.0~rc4-svn8049/libs/gaim/src/src/account.c	2006-10-16 14:23:53.000000000 +0200
+--- wengophone-2.0.0~rc4-svn8088.orig/libs/gaim/src/src/account.c	2006-09-28 10:40:25.000000000 +0200
++++ wengophone-2.0.0~rc4-svn8088/libs/gaim/src/src/account.c	2006-10-18 15:52:37.000000000 +0200
 @@ -1400,32 +1400,22 @@
  gaim_account_set_status(GaimAccount *account, const char *status_id,
  						gboolean active, ...)
@@ -43,10 +43,10 @@
  }
  
  void
-Index: wengophone-2.0.0~rc4-svn8049/libs/gaim/src/src/account.h
+Index: wengophone-2.0.0~rc4-svn8088/libs/gaim/src/src/account.h
 ===================================================================
---- wengophone-2.0.0~rc4-svn8049.orig/libs/gaim/src/src/account.h	2006-10-16 14:23:42.000000000 +0200
-+++ wengophone-2.0.0~rc4-svn8049/libs/gaim/src/src/account.h	2006-10-16 14:23:53.000000000 +0200
+--- wengophone-2.0.0~rc4-svn8088.orig/libs/gaim/src/src/account.h	2006-09-28 10:40:25.000000000 +0200
++++ wengophone-2.0.0~rc4-svn8088/libs/gaim/src/src/account.h	2006-10-18 15:52:37.000000000 +0200
 @@ -314,8 +314,7 @@
  
  /**
@@ -95,10 +95,19 @@
   *
   * Only independent statuses can be deactivated with this. To deactivate
   * an exclusive status, activate a different (and exclusive?) status.
-Index: wengophone-2.0.0~rc4-svn8049/libs/gaim/src/src/status.c
+Index: wengophone-2.0.0~rc4-svn8088/libs/gaim/src/src/status.c
 ===================================================================
---- wengophone-2.0.0~rc4-svn8049.orig/libs/gaim/src/src/status.c	2006-10-16 14:23:42.000000000 +0200
-+++ wengophone-2.0.0~rc4-svn8049/libs/gaim/src/src/status.c	2006-10-16 14:23:53.000000000 +0200
+--- wengophone-2.0.0~rc4-svn8088.orig/libs/gaim/src/src/status.c	2006-09-28 10:40:25.000000000 +0200
++++ wengophone-2.0.0~rc4-svn8088/libs/gaim/src/src/status.c	2006-10-18 15:53:51.000000000 +0200
+@@ -713,7 +713,7 @@
+ void
+ gaim_status_set_active(GaimStatus *status, gboolean active)
+ {
+-	gaim_status_set_active_with_attrs(status, active, NULL);
++	gaim_status_set_active_with_attrs_list(status, active, NULL);
+ }
+ 
+ /*
 @@ -729,14 +729,11 @@
  	const gchar *id;
  	gpointer data;