[SCM] xjadeo/master: Removed patches - not applying anymore.

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 390223c1560ed2cb3790197ceda687f326532799
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Fri Aug 22 13:40:08 2014 +0200

    Removed patches - not applying anymore.

diff --git a/debian/patches/01-misspelling.patch b/debian/patches/01-misspelling.patch
deleted file mode 100644
index e6a81f8..0000000
--- a/debian/patches/01-misspelling.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Misspelling patch
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: robin at gareus.org
-Last-Update: 2011-10-12
----
- doc/xjadeo.1 |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- xjadeo.orig/doc/xjadeo.1
-+++ xjadeo/doc/xjadeo.1
-@@ -418,7 +418,7 @@ You may want also to shrink the size of
- Also note
- Xjadeo\*(Aqs
- \fB\-K\fR
--option which allows to seek to frames other than key\-frames and enables
-+option which allows one to seek to frames other than key\-frames and enables
- Xjadeo
- to play back any file without transcoding it\&. It comes at the expense of increased CPU usage and possibly increased seek latency\&. The latter depends on the key\-frame interval and video\-codec\&.
- .PP
diff --git a/debian/patches/02-fix_hardening.patch b/debian/patches/02-fix_hardening.patch
deleted file mode 100644
index cfd9422..0000000
--- a/debian/patches/02-fix_hardening.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fix hardening for qjadeo, passed CPPFLAGS and LDFLAGS to qmake.
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: robin at gareus.org
-Last-Update: 2013-08-10
-
-Index: xjadeo/src/qt-gui/qjadeo.pro.in
-===================================================================
---- xjadeo.orig/src/qt-gui/qjadeo.pro.in
-+++ xjadeo/src/qt-gui/qjadeo.pro.in
-@@ -19,6 +19,10 @@ QMAKE_LFLAGS += $(LDFLAGS)
- 
- QMAKE_CXXFLAGS += $(CPPFLAGS)
- 
-+QMAKE_LFLAGS += $(LDFLAGS)
-+
-+QMAKE_CXXFLAGS += $(CPPFLAGS)
-+
- TRANSLATIONS = qjadeo_fr.ts qjadeo_ru.ts qjadeo_cs.ts
- 
- DEFINES += QT_NO_DEBUG_OUTPUT
diff --git a/debian/patches/03-libav10.patch b/debian/patches/03-libav10.patch
deleted file mode 100644
index f82599a..0000000
--- a/debian/patches/03-libav10.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Author: anton at khirnov.net
-Description: Fix FTBFS with libav10
-Bug-Debian: http://bugs.debian.org/739431
-
-Index: xjadeo/src/xjadeo/avinfo.c
-===================================================================
---- xjadeo.orig/src/xjadeo/avinfo.c
-+++ xjadeo/src/xjadeo/avinfo.c
-@@ -367,7 +367,7 @@ int main(int argc, char *argv[])
- #elif LIBAVFORMAT_BUILD <= 4629
-       printf("    <framerate>%.2f</framerate>\n", 1/av_q2d(codec->time_base));
- #else
--      printf("    <framerate>%.2f</framerate>\n", av_q2d(st->r_frame_rate));
-+      printf("    <framerate>%.2f</framerate>\n", av_q2d(st->avg_frame_rate));
- #endif
- #if LIBAVFORMAT_BUILD < 3473920
-       printf("    <pixelformat>%s</pixelformat>\n", avcodec_get_pix_fmt_name(codec->pix_fmt));
-Index: xjadeo/src/xjadeo/xjadeo.c
-===================================================================
---- xjadeo.orig/src/xjadeo/xjadeo.c
-+++ xjadeo/src/xjadeo/xjadeo.c
-@@ -410,8 +410,8 @@ int open_movie(char* file_name) {
- #elif LIBAVFORMAT_BUILD <= 4623 // I'm not sure that this is correct:
- 	else framerate = (double) av_stream->r_frame_rate / (double) av_stream->r_frame_rate_base;
- #else
--	else if(av_stream->r_frame_rate.den && av_stream->r_frame_rate.num) {
--		framerate = av_q2d(av_stream->r_frame_rate);
-+	else if(av_stream->avg_frame_rate.den && av_stream->avg_frame_rate.num) {
-+		framerate = av_q2d(av_stream->avg_frame_rate);
- 		if ((framerate < 4 || framerate > 100 ) && (av_stream->time_base.num && av_stream->time_base.den))
- 			framerate = 1.0/av_q2d(av_stream->time_base);
- 	}
-@@ -687,7 +687,7 @@ int my_seek_frame (AVPacket *packet, int
- 	} else {
- 	// does not work with -F <double>, but it's more accurate when rounding ratios
- 		timestamp=av_rescale_q(timestamp,c1_Q,v_stream->time_base); 
--		timestamp=av_rescale_q(timestamp,c1_Q,v_stream->r_frame_rate); //< timestamp/=framerate; 
-+		timestamp=av_rescale_q(timestamp,c1_Q,v_stream->avg_frame_rate); //< timestamp/=framerate;
- 	}
- 
- # ifdef FFDEBUG
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6861f5f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-01-misspelling.patch
-02-fix_hardening.patch
-03-libav10.patch

-- 
xjadeo packaging