[SCM] audacity/master: Drop fix-glib-include-error.patch (fixed upstream).

bdrung at users.alioth.debian.org bdrung at users.alioth.debian.org
Wed Mar 14 20:38:36 UTC 2012


The following commit has been merged in the master branch:
commit a115a68af4b57ec8f56b63d2bf21551ae3ab83e1
Author: Benjamin Drung <bdrung at debian.org>
Date:   Wed Mar 14 14:25:02 2012 +0100

    Drop fix-glib-include-error.patch (fixed upstream).

diff --git a/debian/patches/fix-glib-include-error.patch b/debian/patches/fix-glib-include-error.patch
deleted file mode 100644
index 1bb21e4..0000000
--- a/debian/patches/fix-glib-include-error.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Glib 2.31.20 does not allow to include glib/gtypes.h directly any
- more. Instead glib.h needs to be included.
-Author: Benjamin Drung <bdrung at debian.org>
-Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=484
-
---- a/src/AudacityApp.cpp
-+++ b/src/AudacityApp.cpp
-@@ -406,7 +406,7 @@
-  * Happily we can avoid the hack, as we only need some of the headers, not
-  * the full GTK headers
-  */
--#include <glib/gtypes.h>
-+#include <glib.h>
- #include <glib-object.h>
- 
- typedef struct _GnomeProgram GnomeProgram;
diff --git a/debian/patches/series b/debian/patches/series
index 6f12e31..10f170a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@ disable-dynamic-ffmpeg.patch
 disable-dynamic-lame.patch
 label-region-relation.patch
 additional-mime-types.patch
-fix-glib-include-error.patch

-- 
Audacity debian packaging



More information about the pkg-multimedia-commits mailing list