~ubuntu-branches/ubuntu/trusty/libav/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/03-disable-configuration-warnings.patch

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2013-10-22 23:24:08 UTC
  • mfrom: (1.3.36 sid)
  • Revision ID: package-import@ubuntu.com-20131022232408-b8tvvn4pyzri9mi3
Tags: 6:9.10-1ubuntu1
* Build all -extra flavors from this source package, as libav got demoted
  from main to universe, cf LP: #1243235
* Simplify debian/rules to follow exactly the code that debian executes
* New upstream (LP: #1180288) fixes lots of security issues (LP: #1242802)
* Merge from unstable, remaining changes:
  - build-depend on libtiff5-dev rather than libtiff4-dev,
    avoids FTBFS caused by imlib
  - follow the regular debian codepaths

Show diffs side-by-side

added added

removed removed

Lines of Context:
4
4
Bug-Ubuntu: https://launchpad.net/bugs/765357
5
5
Forwarded: not-needed
6
6
 
7
 
Index: libav/cmdutils.c
8
 
===================================================================
9
 
--- libav.orig/cmdutils.c       2013-07-11 09:20:36.705168281 +1000
10
 
+++ libav/cmdutils.c    2013-07-11 09:20:36.701168254 +1000
11
 
@@ -457,7 +457,9 @@
 
7
--- a/cmdutils.c
 
8
+++ b/cmdutils.c
 
9
@@ -712,7 +712,9 @@ void print_error(const char *filename, i
12
10
     av_log(NULL, AV_LOG_ERROR, "%s: %s\n", filename, errbuf_ptr);
13
11
 }
14
12