[SCM] handbrake/master: reorganize patches
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sat Feb 15 15:18:08 UTC 2014
The following commit has been merged in the master branch:
commit eba6937a8a3d2fd8121775c9359dca1de574841a
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sat Feb 15 15:14:45 2014 +0000
reorganize patches
diff --git a/debian/patches/0019-Do-not-require-wget-or-curl.patch b/debian/patches/001-Do-not-require-wget-or-curl.patch
similarity index 100%
rename from debian/patches/0019-Do-not-require-wget-or-curl.patch
rename to debian/patches/001-Do-not-require-wget-or-curl.patch
diff --git a/debian/patches/0003-Remove-embedded-downloaded-copies-of-various-librari.patch b/debian/patches/002-Remove-embedded-downloaded-copies-of-various-librari.patch
similarity index 90%
copy from debian/patches/0003-Remove-embedded-downloaded-copies-of-various-librari.patch
copy to debian/patches/002-Remove-embedded-downloaded-copies-of-various-librari.patch
index 5e9e62f..6ff8d64 100644
--- a/debian/patches/0003-Remove-embedded-downloaded-copies-of-various-librari.patch
+++ b/debian/patches/002-Remove-embedded-downloaded-copies-of-various-librari.patch
@@ -1,18 +1,14 @@
From: Christian Marillat <marillat at debian.org>
Date: Tue, 15 May 2012 04:48:54 -0300
Subject: Remove embedded/downloaded copies of various libraries
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
Once this is acceptable, this should be forwarded upstream so that the
use of system libraries is an option, instead of downloading libraries
and programs at build time.
Forwarded: no
-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>
+Last-Update: 2013-02-15
+
---
gtk/src/Makefile.am | 4 ++--
make/include/main.defs | 26 +++++---------------------
diff --git a/debian/patches/0003-Remove-embedded-downloaded-copies-of-various-librari.patch b/debian/patches/002-Remove-embedded-downloaded-copies-of-various-librari.patch~
similarity index 100%
rename from debian/patches/0003-Remove-embedded-downloaded-copies-of-various-librari.patch
rename to debian/patches/002-Remove-embedded-downloaded-copies-of-various-librari.patch~
diff --git a/debian/patches/0020-include-cpuid.patch b/debian/patches/003-include-cpuid.patch
similarity index 100%
rename from debian/patches/0020-include-cpuid.patch
rename to debian/patches/003-include-cpuid.patch
diff --git a/debian/patches/0021-link-fix-add-ldl.patch b/debian/patches/004-link-fix-add-ldl.patch
similarity index 100%
rename from debian/patches/0021-link-fix-add-ldl.patch
rename to debian/patches/004-link-fix-add-ldl.patch
diff --git a/debian/patches/series b/debian/patches/series
index 1b6eac0..a112753 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-0019-Do-not-require-wget-or-curl.patch
-0003-Remove-embedded-downloaded-copies-of-various-librari.patch
-0020-include-cpuid.patch
-0021-link-fix-add-ldl.patch
+001-Do-not-require-wget-or-curl.patch
+002-Remove-embedded-downloaded-copies-of-various-librari.patch
+003-include-cpuid.patch
+004-link-fix-add-ldl.patch
--
handbrake packaging
More information about the pkg-multimedia-commits
mailing list