[SCM] handbrake/master: remove accidentally committed backup file

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c80e3dcce417f68465eebbdd8753bab3d498fbc0
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Feb 15 16:01:47 2014 +0000

    remove accidentally committed backup file

diff --git a/debian/patches/002-Remove-embedded-downloaded-copies-of-various-librari.patch~ b/debian/patches/002-Remove-embedded-downloaded-copies-of-various-librari.patch~
deleted file mode 100644
index 5e9e62f..0000000
--- a/debian/patches/002-Remove-embedded-downloaded-copies-of-various-librari.patch~
+++ /dev/null
@@ -1,92 +0,0 @@
-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>
----
- gtk/src/Makefile.am    |    4 ++--
- make/include/main.defs |   26 +++++---------------------
- test/module.defs       |   10 +++-------
- 3 files changed, 10 insertions(+), 30 deletions(-)
-
---- a/make/include/main.defs
-+++ b/make/include/main.defs
-@@ -23,8 +23,6 @@ else
-     AUTOTOOL_MODULES =
- endif
- 
--MODULES += contrib/a52dec
--
- ifneq (,$(filter $(BUILD.system),cygwin mingw))
- ifneq ($(HAS.bz2),1)
-     MODULES += contrib/bzip2
-@@ -41,7 +39,6 @@ ifneq (,$(filter $(BUILD.system),darwin
-     MODULES += contrib/libvorbis
-     MODULES += contrib/libtheora
-     MODULES += contrib/libsamplerate
--endif
- 
- ifeq (1,$(FEATURE.fdk_aac))
-     MODULES += contrib/fdk-aac
-@@ -58,12 +55,8 @@ endif
- ifeq (1,$(FEATURE.libmkv))
-     MODULES += contrib/libmkv
- endif
-+endif
- 
--MODULES += contrib/lame
--MODULES += contrib/ffmpeg
--MODULES += contrib/libdvdread
--MODULES += contrib/libdvdnav
--MODULES += contrib/libbluray
- 
- ifneq (,$(filter $(BUILD.system),mingw))
- ifneq ($(HAS.pthread),1)
-@@ -75,8 +68,6 @@ ifeq (1,$(FEATURE.qsv))
-     MODULES += contrib/libmfx
- endif
- 
--MODULES += contrib/x264
--
- ifneq (,$(filter $(BUILD.system),cygwin mingw))
- ifneq ($(HAS.iconv),1)
-     MODULES += contrib/libiconv
-@@ -117,6 +108,11 @@ ifeq (1-gnu,$(FEATURE.gtk)-$(BUILD.syste
-     MODULES += gtk
- endif
- 
-+ifeq (1-kfreebsd,$(FEATURE.gtk)-$(BUILD.system))
-+    ## build gtk when gtk+linux
-+    MODULES += gtk
-+endif
-+
- ifeq (1,$(FEATURE.local_yasm))
-     MODULES += contrib/yasm
- endif
---- a/test/module.defs
-+++ b/test/module.defs
-@@ -9,13 +9,11 @@ TEST.c.o = $(patsubst $(SRC/)%.c,$(BUILD
- 
- TEST.exe = $(BUILD/)$(call TARGET.exe,$(HB.name)CLI)
- 
--TEST.GCC.L = $(CONTRIB.build/)lib
--
- TEST.libs = $(LIBHB.a)
- 
- TEST.GCC.l = \
-         a52 ass avcodec avformat avutil avresample dvdnav dvdread \
--        fontconfig fribidi mp3lame ogg \
-+        fontconfig mp3lame ogg \
-         samplerate swscale theoraenc theoradec vorbis vorbisenc x264 \
-         bluray freetype xml2 bz2 z
- 

-- 
handbrake packaging