[SCM] Audacity debian packaging branch, master, updated. debian/1.3.9-7-8-geb67440

[bdrung-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d489f40ff9182e99972fc8c51b7006dbffdb18b7
Author: Benjamin Drung <bdrung at gmail.com>
Date:   Tue Dec 1 23:30:17 2009 +0100

    Drop gsocket.patch (applied upstream).

diff --git a/debian/patches/gsocket.patch b/debian/patches/gsocket.patch
deleted file mode 100644
index 5505d0d..0000000
--- a/debian/patches/gsocket.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Fix conflicting GSocket definition
- If you try to build audacity with a recent release of GLib (I am
- using 2.21.6) it will fail building code that links in the
- wxWidgets GSockets code complaining that GSocket is already defined
- as a typedef by Glib. This patch is a workaround similar to the
- way that the following wxWidgets bug #10883 bug is fixed:
- .
- http://trac.wxwidgets.org/ticket/10883
- .
- Though a better fix might be to split up the code so that the
- code which needs the glib header files and the code that needs
- the wxWidgets header files are separated into different files,
- thus avoiding the issue.
-Origin: vendor: http://sourceforge.net/mailarchive/message.php?msg_name=4AA73303.2020409%40sun.com
---- audacity-src-1.3.9/src/AudacityApp.cpp-orig	2009-09-05 03:01:32.893559794 -0500
-+++ audacity-src-1.3.9/src/AudacityApp.cpp	2009-09-05 03:06:30.243420380 -0500
-@@ -329,7 +329,9 @@ void QuitAudacity()
- ///////////////////////////////////////////////////////////////////////////////
- 
- #include <dlfcn.h>
-+#define GSocket GlibGSocket
- #include <gtk/gtk.h>
-+#undef GSocket
- 
- typedef struct _GnomeProgram GnomeProgram;
- typedef struct _GnomeModuleInfo GnomeModuleInfo;

-- 
Audacity debian packaging