[SCM] x264/master: Drop basic-spell-check.patch which is upstream

ricotz-guest at users.alioth.debian.org ricotz-guest at users.alioth.debian.org
Thu Oct 13 08:31:06 UTC 2011


The following commit has been merged in the master branch:
commit 71b81d36da2ea1f288350c90759093fdb87170d1
Author: Rico Tzschichholz <ricotz at t-online.de>
Date:   Thu Oct 13 10:20:29 2011 +0200

    Drop basic-spell-check.patch which is upstream

diff --git a/debian/patches/basic-spell-check.patch b/debian/patches/basic-spell-check.patch
deleted file mode 100644
index d857882..0000000
--- a/debian/patches/basic-spell-check.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Basic spell check.
-Origin: http://git.debian.org/?p=pkg-multimedia/x264.git;a=blob;f=debian/patches/basic-spell-check.patch
-
---- a/filters/video/resize.c
-+++ b/filters/video/resize.c
-@@ -79,7 +79,7 @@
-             "            - resolution only: resizes and adapts sar to avoid stretching\n"
-             "            - sar only: sets the sar and resizes to avoid stretching\n"
-             "            - resolution and sar: resizes to given resolution and sets the sar\n"
--            "            - fittobox: resizes the video based on the desired contraints\n"
-+            "            - fittobox: resizes the video based on the desired constraints\n"
-             "               - width, height, both\n"
-             "            - fittobox and sar: same as above except with specified sar\n"
-             "            - csp: convert to the given csp. syntax: [name][:depth]\n"
diff --git a/debian/patches/series b/debian/patches/series
index da2b436..8a84557 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-basic-spell-check.patch
 build-on-hurd.patch
 arch-alpha.patch

-- 
x264 packaging



More information about the pkg-multimedia-commits mailing list