--- a/ChangeLog	Thu Nov 02 19:08:25 2006 +0000
+++ b/ChangeLog	Thu Nov 02 20:06:39 2006 +0000
@@ -7,6 +7,12 @@
 	no longer in module).
 	* patches/gaim-05-msn-crash.diff: Renamed from 07.
 	* patches/gaim-06-proxy_mnemotics.diff: Renamed from 08.
+	* patches/gaim-01-remove-unwanted-protocols.diff: Update for new 
+	tarball.
+	* patches/gaim-02-perl-common-argc.diff,
+	patches/gaim-03-libgaimperl.diff,
+	patches/gaim-04-long-preferences.diff: Correct path to files as gaim 
+	source has been moved around.
 
 2006-11-02 Erwann Chenede - <[email protected]>
 

--- a/patches/gaim-01-remove-unwanted-protocols.diff	Thu Nov 02 19:08:25 2006 +0000
+++ b/patches/gaim-01-remove-unwanted-protocols.diff	Thu Nov 02 20:06:39 2006 +0000
@@ -1,18 +1,20 @@
---- 2.0b3.1-ori/configure.ac	2006-08-20 04:36:32.000000000 +0800
-+++ 2.0b3.1-my/configure.ac	2006-08-30 14:22:21.021287000 +0800
-@@ -358,7 +358,7 @@
+--- gaim-2.0.0beta4/configure.ac.orig	2006-11-02 18:16:21.418278000 +0000
++++ gaim-2.0.0beta4/configure.ac	2006-11-02 18:19:13.774308000 +0000
+@@ -671,7 +671,7 @@
  fi
  
  if test "x$STATIC_PRPLS" = "xall" ; then
--	STATIC_PRPLS="bonjour gg irc jabber msn novell oscar sametime silc simple yahoo zephyr"
-+        STATIC_PRPLS="irc jabber msn novell oscar silc yahoo"
+-	STATIC_PRPLS="bonjour gg irc jabber msn novell oscar qq sametime silc simple yahoo zephyr"
++	STATIC_PRPLS="irc jabber msn novell oscar silc yahoo"
  fi
  if test "x$have_meanwhile" != "xyes" ; then
  	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'`
---- 2.0b3.1-ori/src/protocols/Makefile.am	2006-08-20 04:35:59.000000000 +0800
-+++ 2.0b3.1-my/src/protocols/Makefile.am	2006-08-30 14:24:16.671726000 +0800
-@@ -1,3 +1,3 @@
--DIST_SUBDIRS = bonjour gg irc jabber msn napster novell oscar sametime silc toc simple yahoo zephyr
+--- gaim-2.0.0beta4/libgaim/protocols/Makefile.am.orig	2006-11-02 18:17:12.771764000 +0000
++++ gaim-2.0.0beta4/libgaim/protocols/Makefile.am	2006-11-02 18:21:59.775442000 +0000
+@@ -1,5 +1,5 @@
+ EXTRA_DIST = Makefile.mingw
+ 
+-DIST_SUBDIRS = bonjour gg irc jabber msn novell oscar qq sametime silc toc simple yahoo zephyr
 +DIST_SUBDIRS = irc jabber msn novell oscar silc toc yahoo
  
  SUBDIRS = $(DYNAMIC_PRPLS) $(STATIC_PRPLS)

--- a/patches/gaim-02-perl-common-argc.diff	Thu Nov 02 19:08:25 2006 +0000
+++ b/patches/gaim-02-perl-common-argc.diff	Thu Nov 02 20:06:39 2006 +0000
@@ -1,5 +1,5 @@
---- 2.0b3.1-ori/plugins/perl/perl-common.c	2006-08-20 04:36:31.000000000 +0800
-+++ 2.0b3.1-my/plugins/perl/perl-common.c	2006-08-30 14:29:25.242032000 +0800
+--- 2.0b3.1-ori/libgaim/plugins/perl/perl-common.c	2006-08-20 04:36:31.000000000 +0800
++++ 2.0b3.1-my/libgaim/plugins/perl/perl-common.c	2006-08-30 14:29:25.242032000 +0800
 @@ -172,7 +172,7 @@
  execute_perl(const char *function, int argc, char **args)
  {

--- a/patches/gaim-03-libgaimperl.diff	Thu Nov 02 19:08:25 2006 +0000
+++ b/patches/gaim-03-libgaimperl.diff	Thu Nov 02 20:06:39 2006 +0000
@@ -1,5 +1,5 @@
---- 2.0b3.1-ori/plugins/perl/libgaimperl.c	2006-08-20 04:36:31.000000000 +0800
-+++ 2.0b3.1-my/plugins/perl/libgaimperl.c	2006-08-30 14:46:14.189305000 +0800
+--- 2.0b3.1-ori/libgaim/plugins/perl/libgaimperl.c	2006-08-20 04:36:31.000000000 +0800
++++ 2.0b3.1-my/libgaim/plugins/perl/libgaimperl.c	2006-08-30 14:46:14.189305000 +0800
 @@ -1,7 +1,7 @@
  #include <gmodule.h>
 -void __attribute__ ((constructor)) my_init(void);

--- a/patches/gaim-04-long-preferences.diff	Thu Nov 02 19:08:25 2006 +0000
+++ b/patches/gaim-04-long-preferences.diff	Thu Nov 02 20:06:39 2006 +0000
@@ -1,5 +1,5 @@
---- 2.0b3.1-ori/src/gtkaccount.c	2006-08-20 04:36:07.000000000 +0800
-+++ 2.0b3.1-my/src/gtkaccount.c	2006-08-30 15:34:24.903333000 +0800
+--- 2.0b3.1-ori/gtk/gtkaccount.c	2006-08-20 04:36:07.000000000 +0800
++++ 2.0b3.1-my/gtk/gtkaccount.c	2006-08-30 15:34:24.903333000 +0800
 @@ -1690,6 +1690,7 @@
  	GtkWidget *win;
  	GtkWidget *main_vbox;