tags 721108 + patch
tags 721108 + pending
thanks
Dear maintainer,
I've prepared an NMU for tribler (versioned as 6.2.0+git20130731.149555fa-1.1)
and
will ask some DD to upload it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru tribler-6.2.0+git20130731.149555fa/debian/changelog
tribler-6.2.0+git20130731.149555fa/debian/changelog
--- tribler-6.2.0+git20130731.149555fa/debian/changelog 2013-09-20
18:13:07.000000000 +0200
+++ tribler-6.2.0+git20130731.149555fa/debian/changelog 2014-04-26
14:16:14.000000000 +0200
@@ -1,3 +1,11 @@
+tribler (6.2.0+git20130731.149555fa-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Use avconf instead of ffmpeg. See patch use-libav-instead-of-ffmpeg.patch
+ (Closes: #721108) and change dependency accordingly to libav-tools
+
+ -- Tobias Frost <t...@coldtobi.de> Sat, 26 Apr 2014 14:15:52 +0200
+
tribler (6.2.0+git20130731.149555fa-1) unstable; urgency=low
* New upstream release
diff -Nru tribler-6.2.0+git20130731.149555fa/debian/control
tribler-6.2.0+git20130731.149555fa/debian/control
--- tribler-6.2.0+git20130731.149555fa/debian/control 2013-09-20
20:36:12.000000000 +0200
+++ tribler-6.2.0+git20130731.149555fa/debian/control 2014-04-26
14:00:37.000000000 +0200
@@ -12,7 +12,7 @@
Package: tribler
Architecture: all
-Depends: ffmpeg,
+Depends: libav-tools,
libjs-mootools,
python-apsw,
python-feedparser,
diff -Nru tribler-6.2.0+git20130731.149555fa/debian/patches/series
tribler-6.2.0+git20130731.149555fa/debian/patches/series
--- tribler-6.2.0+git20130731.149555fa/debian/patches/series 1970-01-01
01:00:00.000000000 +0100
+++ tribler-6.2.0+git20130731.149555fa/debian/patches/series 2014-04-26
13:59:17.000000000 +0200
@@ -0,0 +1 @@
+use-libav-instead-of-ffmpeg.patch
diff -Nru
tribler-6.2.0+git20130731.149555fa/debian/patches/use-libav-instead-of-ffmpeg.patch
tribler-6.2.0+git20130731.149555fa/debian/patches/use-libav-instead-of-ffmpeg.patch
---
tribler-6.2.0+git20130731.149555fa/debian/patches/use-libav-instead-of-ffmpeg.patch
1970-01-01 01:00:00.000000000 +0100
+++
tribler-6.2.0+git20130731.149555fa/debian/patches/use-libav-instead-of-ffmpeg.patch
2014-04-26 14:04:08.000000000 +0200
@@ -0,0 +1,16 @@
+Description: Use libav-tools instead of ffmpeg
+Forwarded: not-needed
+Applied-Upstream:
https://github.com/whirm/tribler/commit/00a03bf882eff81865a61c5415b45adfc91f3660
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/Tribler/Core/SessionConfig.py
++++ b/Tribler/Core/SessionConfig.py
+@@ -49,7 +49,7 @@
+ if sys.platform == 'win32':
+ ffmpegname = "ffmpeg.exe"
+ else:
+- ffmpegname = "ffmpeg"
++ ffmpegname = "avconv"
+
+ ffmpegpath = find_prog_in_PATH(ffmpegname)
+ if ffmpegpath is None:
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
