[SCM] mplayer2/master: drop fix-format-string-error.patch, all changes are merged upstream
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jan 20 15:51:13 UTC 2013
The following commit has been merged in the master branch:
commit b93f68247629dbc9b799e6710005d50d7998ab2f
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sun Jan 20 16:48:52 2013 +0100
drop fix-format-string-error.patch, all changes are merged upstream
diff --git a/debian/patches/fix-format-string-error.patch b/debian/patches/fix-format-string-error.patch
deleted file mode 100644
index c14e5b7..0000000
--- a/debian/patches/fix-format-string-error.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Fixes a format string warning
-Author: Rico Tzschichholz <ricotz at ubuntu.com>
-
-Origin: Debian/Ubuntu
-Forwarded: yes, on irc. Upstream does not see any benefit in this patch
-Reviewed-By: Reinhard Tartler <siretart at tauware.de>
-Last-Update: <2012-11-18>
-
---- mplayer2-2.0-665-gb5349bb.orig/libvo/vo_gl3.c
-+++ mplayer2-2.0-665-gb5349bb/libvo/vo_gl3.c
-@@ -2231,7 +2231,7 @@ static int preinit(struct vo *vo, const
- };
-
- if (subopt_parse(arg, subopts) != 0) {
-- mp_msg(MSGT_VO, MSGL_FATAL, help_text);
-+ mp_msg(MSGT_VO, MSGL_FATAL, "%s\n", help_text);
- goto err_out;
- }
-
diff --git a/debian/patches/series b/debian/patches/series
index 1021479..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-fix-format-string-error.patch
--
mplayer2 packaging
More information about the pkg-multimedia-commits
mailing list