[SCM] mjpegtools/master: Removed 05_shell-script-syntax.patch, merged upstream

lucidfox-guest at users.alioth.debian.org lucidfox-guest at users.alioth.debian.org
Sat Apr 30 18:23:28 UTC 2011


The following commit has been merged in the master branch:
commit 73cdc1bb6e91ad4a30f94d71e78d6aad56c3438e
Author: Maia Kozheva <sikon at ubuntu.com>
Date:   Sun May 1 01:20:37 2011 +0700

    Removed 05_shell-script-syntax.patch, merged upstream

diff --git a/debian/patches/05_shell-script-syntax.patch b/debian/patches/05_shell-script-syntax.patch
deleted file mode 100644
index 2fdbb0b..0000000
--- a/debian/patches/05_shell-script-syntax.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur mjpegtools-1.9.0rc3/scripts/lavtc.sh mjpegtools-1.9.0rc3.new/scripts/lavtc.sh
---- mjpegtools-1.9.0rc3/scripts/lavtc.sh
-+++ mjpegtools-1.9.0rc3.new/scripts/lavtc.sh
-@@ -791,7 +791,7 @@
- 		break;
- 	fi
- done
--if [[ -n ${needToCleanupFifo ]]; then
-+if [[ -n ${needToCleanupFifo} ]]; then
- 	cleanupFifo ;
- fi
- log_debug "chmod -x ${output}"
diff --git a/debian/patches/series b/debian/patches/series
index db060e4..5b4890c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
 02_as-needed.patch
 03_disable_optimization.patch
 04_manpage-syntax.patch
-05_shell-script-syntax.patch

-- 
mjpegtools packaging



More information about the pkg-multimedia-commits mailing list