[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090420-2-10-g68ae328
ceros-guest at users.alioth.debian.org
ceros-guest at users.alioth.debian.org
Mon May 11 17:58:32 UTC 2009
The following commit has been merged in the master branch:
commit f46caf5aac92bdc598c09d579b7c1f274dbee70e
Author: Andres Mejia <mcitadel at gmail.com>
Date: Mon May 11 13:55:52 2009 -0400
Revert "Add lintian overrides for remaining issue with -fPIC"
This reverts commit 9ce9aac1deb2e29d0a6e35d14638953375b037c2.
diff --git a/debian/changelog b/debian/changelog
index 9c10754..91df85d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,7 @@ ffmpeg-debian (4:0.5+svn20090420-3) unstable; urgency=low
+ Fix ordering of debhelper calls.
+ Remove redundant Section fields in control file for binary packages.
+ Add comment in patch, also refreshed it.
- + Partially fix for lintian error shlib-with-non-pic-code, remaining fix
- needs further investigation. Overrides will be installed in the meanwhile.
+ + Fix lintian error shlib-with-non-pic-code.
+ Don't install LICENSE. The licensing information should be, and is,
covered in debian/copyright.
+ Fix 'breaks-without-version libavcodec51' warning.
diff --git a/debian/libavcodec52.override b/debian/libavcodec52.override
deleted file mode 100644
index 1a69d8d..0000000
--- a/debian/libavcodec52.override
+++ /dev/null
@@ -1,4 +0,0 @@
-# ffmpeg is being built with -fPIC yet the result binaries still get these
-# TEXTRELs. This requires further investigation.
-libavcodec52: shlib-with-non-pic-code usr/lib/i686/cmov/libavcodec.so.52.20.0
-libavcodec52: shlib-with-non-pic-code usr/lib/libavcodec.so.52.20.0
diff --git a/debian/libpostproc51.override b/debian/libpostproc51.override
deleted file mode 100644
index 0fa7e78..0000000
--- a/debian/libpostproc51.override
+++ /dev/null
@@ -1,4 +0,0 @@
-# ffmpeg is being built with -fPIC yet the result binaries still get these
-# TEXTRELs. This requires further investigation.
-libpostproc51: shlib-with-non-pic-code usr/lib/i686/cmov/libpostproc.so.51.2.0
-libpostproc51: shlib-with-non-pic-code usr/lib/libpostproc.so.51.2.0
diff --git a/debian/libswscale0.override b/debian/libswscale0.override
deleted file mode 100644
index 09d83ba..0000000
--- a/debian/libswscale0.override
+++ /dev/null
@@ -1,4 +0,0 @@
-# ffmpeg is being built with -fPIC yet the result binaries still get these
-# TEXTRELs. This requires further investigation.
-libswscale0: shlib-with-non-pic-code usr/lib/i686/cmov/libswscale.so.0.7.1
-libswscale0: shlib-with-non-pic-code usr/lib/libswscale.so.0.7.1
diff --git a/debian/rules b/debian/rules
index b3a776b..2d333a2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -136,12 +136,6 @@ endif
binary-arch: build install formats.txt
dh_testdir
dh_testroot
- install -D -m 0644 debian/libswscale0.override \
- $(CURDIR)/debian/libswscale0/usr/share/lintian/overrides/libswscale0
- install -D -m 0644 debian/libpostproc51.override \
- $(CURDIR)/debian/libpostproc51/usr/share/lintian/overrides/libpostproc51
- install -D -m 0644 debian/libavcodec52.override \
- $(CURDIR)/debian/libavcodec52/usr/share/lintian/overrides/libavcodec52
dh_installdocs $(extradoc) doc/optimization.txt
dh_installdocs -A MAINTAINERS CREDITS doc/TODO
dh_installdocs -A debian/README.Debian
--
FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list