[SCM] handbrake/master: Mark that some patches were forwarded upstream.
rbrito-guest at users.alioth.debian.org
rbrito-guest at users.alioth.debian.org
Fri Jun 15 05:59:59 UTC 2012
The following commit has been merged in the master branch:
commit 4130d715bc9ae90daab54ced27d4b0118fbb4bfc
Author: Rogério Brito <rbrito at ime.usp.br>
Date: Fri Jun 15 02:59:35 2012 -0300
Mark that some patches were forwarded upstream.
Git-Dch: Ignore
diff --git a/debian/patches/0002-Fix-include-with-the-system-s-libav.patch b/debian/patches/0002-Fix-include-with-the-system-s-libav.patch
index 79a483d..2e96dcd 100644
--- a/debian/patches/0002-Fix-include-with-the-system-s-libav.patch
+++ b/debian/patches/0002-Fix-include-with-the-system-s-libav.patch
@@ -8,7 +8,7 @@ Content-Transfer-Encoding: 8bit
Thanks to Fabian Greffrath for the more elegant solution than the "brute
force" that I employed earlier.
-Forwarded: no
+Forwarded: yes
Last-Update: 2012-05-15
Reviewed-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
diff --git a/debian/patches/0011-First-try-at-removing-some-of-mp4v2.patch b/debian/patches/0011-First-try-at-removing-some-of-mp4v2.patch
index 50f2b37..7c953aa 100644
--- a/debian/patches/0011-First-try-at-removing-some-of-mp4v2.patch
+++ b/debian/patches/0011-First-try-at-removing-some-of-mp4v2.patch
@@ -2,6 +2,7 @@ From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= <rbrito at ime.usp.br>
Date: Thu, 7 Jun 2012 07:09:37 -0300
Subject: First try at removing some of mp4v2.
+Forwarded: partially (only first hunk)
Signed-off-by: Rogério Brito <rbrito at ime.usp.br>
---
libhb/stream.c | 1 -
diff --git a/debian/patches/0012-FLAGS.patch b/debian/patches/0012-FLAGS.patch
index 7a4cf20..4a69b7c 100644
--- a/debian/patches/0012-FLAGS.patch
+++ b/debian/patches/0012-FLAGS.patch
@@ -1,6 +1,7 @@
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Subject: Consider CFLAGS, CPPFLAGS and LDFLAGS in libhb build.
+Forwarded: yes
--- a/gtk/module.rules
+++ b/gtk/module.rules
@@ -17,7 +17,7 @@
diff --git a/debian/patches/0013-format-security.patch b/debian/patches/0013-format-security.patch
index a995b52..584adea 100644
--- a/debian/patches/0013-format-security.patch
+++ b/debian/patches/0013-format-security.patch
@@ -1,6 +1,7 @@
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Subject: Fix format string security errors.
+Forwarded: no
--- a/libhb/deccc608sub.c
+++ b/libhb/deccc608sub.c
@@ -1607,7 +1607,7 @@ int write_cc_buffer_as_srt (struct eia60
--
handbrake packaging
More information about the pkg-multimedia-commits
mailing list