[SCM] snd/master: Removed patches applied upstream.

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Mon Oct 24 13:32:47 UTC 2016


The following commit has been merged in the master branch:
commit 37d5bece8496a034f0d80a2053767f135172ef17
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Mon Oct 24 13:59:58 2016 +0200

    Removed patches applied upstream.

diff --git a/debian/patches/fix-g_abort.patch b/debian/patches/fix-g_abort.patch
deleted file mode 100644
index de24ce1..0000000
--- a/debian/patches/fix-g_abort.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: undefine g_abort from GLib
- both snd and GLib(>=2.49) provide g_abort() but they are conflicting.
- it seems that GLib's g_abort() is only a macro on non-w32, so for now
- we simply undefine it.
-Author: IOhannes m zmölnig
-Forwarded: yes
-Applied-Upstream: 16.9
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- snd.orig/snd-main.c
-+++ snd/snd-main.c
-@@ -2159,6 +2159,9 @@
- }
- 
- 
-+#ifdef g_abort
-+# undef g_abort
-+#endif
- static Xen g_abort(void)
- {
-   #define H_abort "(" S_abort "): exit Snd via \"abort\", presumably to land in the debugger"
diff --git a/debian/patches/series b/debian/patches/series
index dccbf51..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-fix-g_abort.patch

-- 
snd packaging



More information about the pkg-multimedia-commits mailing list