[SCM] handbrake/master: Mark that some patches were applied 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 f65efcaff62677141e104f10dca30b99283ecdcc
Author: Rogério Brito <rbrito at ime.usp.br>
Date:   Fri Jun 15 02:59:00 2012 -0300

    Mark that some patches were applied upstream.
    
    Git-Dch: Ignore

diff --git a/debian/patches/0001-Remove-encoding-indication-from-desktop-file.patch b/debian/patches/0001-Remove-encoding-indication-from-desktop-file.patch
index bdf63e7..ab35afb 100644
--- a/debian/patches/0001-Remove-encoding-indication-from-desktop-file.patch
+++ b/debian/patches/0001-Remove-encoding-indication-from-desktop-file.patch
@@ -5,6 +5,7 @@ MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
+Applied-Upstream: https://github.com/HandBrake/HandBrake/commit/826dad9e
 Forwarded: yes
 Last-Update: 2012-06-07
 Reviewed-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
diff --git a/debian/patches/0004-Enable-compilation-on-Debian-arches-other-than-Linux.patch b/debian/patches/0004-Enable-compilation-on-Debian-arches-other-than-Linux.patch
index 823889e..742ebda 100644
--- a/debian/patches/0004-Enable-compilation-on-Debian-arches-other-than-Linux.patch
+++ b/debian/patches/0004-Enable-compilation-on-Debian-arches-other-than-Linux.patch
@@ -11,6 +11,7 @@ it is the exception, not the norm). So, we check if LINUX is defined or not
 in the appropriate places, instead of listing every operating system that is
 not Windows or MacOS X.
 
+Applied-Upstream: https://github.com/HandBrake/HandBrake/commit/cd368d7e
 Forwarded: yes
 Last-Update: 2012-06-07
 

-- 
handbrake packaging



More information about the pkg-multimedia-commits mailing list