[SCM] libav/experimental: New upstream version Libav10 alpha1
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Fri Jan 10 14:01:58 UTC 2014
The following commit has been merged in the experimental branch:
commit 7d2063f761d9b59e1d6bd36eed3b45f6be0ddd83
Author: Reinhard Tartler <siretart at tauware.de>
Date: Fri Jan 10 14:01:15 2014 +0000
New upstream version Libav10 alpha1
freetype support had to be disabled, will be reenabled in alpha2
diff --git a/debian/confflags b/debian/confflags
index 1abf757..0b415d5 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -116,7 +116,8 @@ endif
# Additional features
confflags += $(call cond_enable,/usr/include/bzlib.h,bzlib)
confflags += $(call cond_enable,/usr/include/dc1394/dc1394.h,libdc1394)
-confflags += $(call cond_enable,/usr/include/freetype2/ft2build.h,libfreetype)
+# disabled to avoid ftbfs
+#confflags += $(call cond_enable,/usr/include/freetype2/ft2build.h,libfreetype)
confflags += $(call cond_enable,/usr/include/frei0r.h,frei0r)
confflags += $(call cond_enable,/usr/include/gnutls/gnutls.h,gnutls)
confflags += $(call cond_enable,/usr/include/gsm/gsm.h,libgsm)
diff --git a/debian/control b/debian/control
index 4bcf244..3c6bafc 100644
--- a/debian/control
+++ b/debian/control
@@ -95,10 +95,10 @@ Breaks:
libav-extra-dbg (<< 6:0.8.3-5)
Depends:
libav-tools (= ${binary:Version}),
- libavcodec54 (= ${binary:Version}) | libavcodec-extra-54 (= ${binary:Version}),
- libavdevice53 (= ${binary:Version}),
- libavformat54 (= ${binary:Version}),
- libavutil52 (= ${binary:Version}),
+ libavcodec55 (= ${binary:Version}) | libavcodec-extra-55 (= ${binary:Version}),
+ libavdevice54 (= ${binary:Version}),
+ libavformat55 (= ${binary:Version}),
+ libavutil53 (= ${binary:Version}),
libswscale2 (= ${binary:Version}),
${misc:Depends}
Description: Debug symbols for Libav related packages
@@ -123,7 +123,7 @@ Description: Documentation of the Libav API
.
Only application developers will find this package useful.
-Package: libavutil52
+Package: libavutil53
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
@@ -137,7 +137,7 @@ Description: Libav utility library
This is the common utility library from Libav. It contains shared code
used by all other Libav libraries.
-Package: libavcodec54
+Package: libavcodec55
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
@@ -145,9 +145,9 @@ Depends:
${misc:Depends},
${shlibs:Depends}
Conflicts:
- libavcodec-extra-54
+ libavcodec-extra-55
Replaces:
- libavcodec-extra-54
+ libavcodec-extra-55
Breaks:
mplayer (<< 2:1.0~rc4.dfsg1+svn34540-1~)
Description: Libav codec library
@@ -158,7 +158,7 @@ Description: Libav codec library
.
It supports most existing codecs (MPEG, MPEG2, MPEG4, AC3, DV...).
-Package: libavdevice53
+Package: libavdevice54
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
@@ -166,16 +166,16 @@ Depends:
${misc:Depends},
${shlibs:Depends}
Replaces:
- libavdevice-extra-53
+ libavdevice-extra-54
Breaks:
- libavdevice-extra-53 (<< 5:0.8.1-2)
+ libavdevice-extra-54 (<< 5:0.8.1-2)
Description: Libav device handling library
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
.
This is the device handling library from Libav.
-Package: libavformat54
+Package: libavformat55
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
@@ -183,9 +183,9 @@ Depends:
${misc:Depends},
${shlibs:Depends}
Replaces:
- libavformat-extra-54
+ libavformat-extra-55
Breaks:
- libavformat-extra-54 (<< 5:0.8.1-2)
+ libavformat-extra-55 (<< 5:0.8.1-2)
Description: Libav file format library
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
@@ -195,7 +195,7 @@ Description: Libav file format library
It supports most existing file formats (AVI, MPEG, OGG, Matroska,
ASF...).
-Package: libavfilter3
+Package: libavfilter4
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
@@ -205,9 +205,9 @@ Depends:
Suggests:
frei0r-plugins (>= 1.3)
Replaces:
- libavfilter-extra-3
+ libavfilter-extra-4
Breaks:
- libavfilter-extra-3 (<< 5:0.8.1-2)
+ libavfilter-extra-4 (<< 5:0.8.1-2)
Description: Libav video filtering library
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
@@ -235,7 +235,7 @@ Package: libavutil-dev
Section: libdevel
Architecture: any
Depends:
- libavutil52 (= ${binary:Version}),
+ libavutil53 (= ${binary:Version}),
${misc:Depends}
Description: Development files for libavutil
Libav is a complete, cross-platform solution to decode, encode, record,
@@ -250,8 +250,8 @@ Package: libavcodec-dev
Section: libdevel
Architecture: any
Depends:
- libavcodec54 (<= ${source:Upstream-Version}-99) | libavcodec-extra-54 (<= ${source:Upstream-Version}-99),
- libavcodec54 (>= ${binary:Version}) | libavcodec-extra-54 (>= ${binary:Version}),
+ libavcodec55 (<= ${source:Upstream-Version}-99) | libavcodec-extra-55 (<= ${source:Upstream-Version}-99),
+ libavcodec55 (>= ${binary:Version}) | libavcodec-extra-55 (>= ${binary:Version}),
libavutil-dev (= ${binary:Version}),
${misc:Depends}
Suggests:
@@ -280,7 +280,7 @@ Package: libavdevice-dev
Section: libdevel
Architecture: any
Depends:
- libavdevice53 (= ${binary:Version}),
+ libavdevice54 (= ${binary:Version}),
libavformat-dev (= ${binary:Version}),
${misc:Depends}
Description: Development files for libavdevice
@@ -297,7 +297,7 @@ Section: libdevel
Architecture: any
Depends:
libavcodec-dev (= ${binary:Version}),
- libavformat54 (= ${binary:Version}),
+ libavformat55 (= ${binary:Version}),
libavutil-dev (= ${binary:Version}),
${misc:Depends}
Description: Development files for libavformat
@@ -315,7 +315,7 @@ Section: libdevel
Architecture: any
Depends:
libavcodec-dev (= ${binary:Version}),
- libavfilter3 (= ${binary:Version}),
+ libavfilter4 (= ${binary:Version}),
${misc:Depends}
Description: Development files for libavfilter
Libav is a complete, cross-platform solution to decode, encode, record,
@@ -373,12 +373,12 @@ Description: Libav audo resampling library
.
This is the audio software resampling library from Libav.
-Package: libavutil-extra-52
+Package: libavutil-extra-53
Section: oldlibs
Priority: extra
Architecture: all
Depends:
- libavutil52,
+ libavutil53,
${misc:Depends},
Description: Libav utility library (transitional package)
Libav is a complete, cross-platform solution to decode, encode, record,
@@ -387,7 +387,7 @@ Description: Libav utility library (transitional package)
This package is only used for transitional purposes and can be safely
removed when no other packages depend on this package.
-Package: libavcodec-extra-54
+Package: libavcodec-extra-55
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
@@ -395,9 +395,9 @@ Depends:
${misc:Depends},
${shlibs:Depends}
Replaces:
- libavcodec54
+ libavcodec55
Conflicts:
- libavcodec54
+ libavcodec55
Breaks:
mplayer (<< 2:1.0~rc4.dfsg1+svn34540-1~)
Description: Libav codec library (additional codecs)
@@ -406,7 +406,7 @@ Description: Libav codec library (additional codecs)
.
This is the codec library from Libav (both encoding and decoding).
.
- This package is a replacement for the regular libavcodec54 library package;
+ This package is a replacement for the regular libavcodec55 library package;
it contains the following additional codecs:
.
* OpenCORE Adaptive Multi-Rate (AMR) Narrow-Band (Encoder/Decoder)
@@ -418,12 +418,12 @@ Description: Libav codec library (additional codecs)
Apache License 2.0, the resulting binaries are distributed under the
GPL version 3 or later.
-Package: libavdevice-extra-53
+Package: libavdevice-extra-54
Section: oldlibs
Priority: extra
Architecture: all
Depends:
- libavdevice53,
+ libavdevice54,
${misc:Depends},
Description: Libav device handling library (transitional package)
Libav is a complete, cross-platform solution to decode, encode, record,
@@ -432,12 +432,12 @@ Description: Libav device handling library (transitional package)
This package is only used for transitional purposes and can be safely
removed when no other packages depend on this package.
-Package: libavfilter-extra-3
+Package: libavfilter-extra-4
Section: oldlibs
Priority: extra
Architecture: all
Depends:
- libavfilter3,
+ libavfilter4,
${misc:Depends},
Description: Libav filter library (transitional package)
Libav is a complete, cross-platform solution to decode, encode, record,
@@ -446,12 +446,12 @@ Description: Libav filter library (transitional package)
This package is only used for transitional purposes and can be safely
removed when no other packages depend on this package.
-Package: libavformat-extra-54
+Package: libavformat-extra-55
Section: oldlibs
Priority: extra
Architecture: all
Depends:
- libavformat54,
+ libavformat55,
${misc:Depends},
Description: Libav file format library (transitional package)
Libav is a complete, cross-platform solution to decode, encode, record,
@@ -478,7 +478,7 @@ Package: libavcodec-extra
Priority: extra
Architecture: all
Depends:
- libavcodec-extra-54,
+ libavcodec-extra-55,
${misc:Depends},
Description: Libav codec library (additional codecs meta-package)
Libav is a complete, cross-platform solution to decode, encode, record,
diff --git a/debian/libav-tools.install b/debian/libav-tools.install
index 6616a2c..3eb991a 100644
--- a/debian/libav-tools.install
+++ b/debian/libav-tools.install
@@ -3,3 +3,4 @@ usr/bin/av*
usr/bin/qt-faststart
usr/share/avconv/*.avpreset
usr/share/man/man1/av*
+usr/share/doc/libav/*.html
diff --git a/debian/libavcodec-extra-54.lintian-overrides b/debian/libavcodec-extra-54.lintian-overrides
deleted file mode 100644
index 8de42e6..0000000
--- a/debian/libavcodec-extra-54.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# This is the sister package of libavcodec54
-libavcodec-extra-54: package-name-doesnt-match-sonames
-libavcodec-extra-54: shlib-with-non-pic-code
diff --git a/debian/libavcodec-extra-54.install.in b/debian/libavcodec-extra-55.install.in
similarity index 100%
rename from debian/libavcodec-extra-54.install.in
rename to debian/libavcodec-extra-55.install.in
diff --git a/debian/libavcodec-extra-55.lintian-overrides b/debian/libavcodec-extra-55.lintian-overrides
new file mode 100644
index 0000000..9f156a8
--- /dev/null
+++ b/debian/libavcodec-extra-55.lintian-overrides
@@ -0,0 +1,3 @@
+# This is the sister package of libavcodec54
+libavcodec-extra-55: package-name-doesnt-match-sonames
+libavcodec-extra-55: shlib-with-non-pic-code
diff --git a/debian/libavcodec54.install.in b/debian/libavcodec55.install.in
similarity index 100%
rename from debian/libavcodec54.install.in
rename to debian/libavcodec55.install.in
diff --git a/debian/libavcodec54.lintian-overrides b/debian/libavcodec55.lintian-overrides
similarity index 62%
rename from debian/libavcodec54.lintian-overrides
rename to debian/libavcodec55.lintian-overrides
index 0825375..793a574 100644
--- a/debian/libavcodec54.lintian-overrides
+++ b/debian/libavcodec55.lintian-overrides
@@ -1,2 +1,2 @@
# Overriding these fpic lintian errors. Please see bug #528080.
-libavcodec54: shlib-with-non-pic-code
+libavcodec55: shlib-with-non-pic-code
diff --git a/debian/libavdevice53.install.in b/debian/libavdevice54.install.in
similarity index 100%
rename from debian/libavdevice53.install.in
rename to debian/libavdevice54.install.in
diff --git a/debian/libavdevice53.lintian-overrides b/debian/libavdevice54.lintian-overrides
similarity index 62%
rename from debian/libavdevice53.lintian-overrides
rename to debian/libavdevice54.lintian-overrides
index 656e0aa..74d287e 100644
--- a/debian/libavdevice53.lintian-overrides
+++ b/debian/libavdevice54.lintian-overrides
@@ -1,2 +1,2 @@
# Overriding these fpic lintian errors. Please see bug #528080.
-libavdevice53: shlib-with-non-pic-code
+libavdevice54: shlib-with-non-pic-code
diff --git a/debian/libavfilter3.install.in b/debian/libavfilter4.install.in
similarity index 100%
rename from debian/libavfilter3.install.in
rename to debian/libavfilter4.install.in
diff --git a/debian/libavfilter3.lintian-overrides b/debian/libavfilter4.lintian-overrides
similarity index 62%
rename from debian/libavfilter3.lintian-overrides
rename to debian/libavfilter4.lintian-overrides
index 3561c67..4f19162 100644
--- a/debian/libavfilter3.lintian-overrides
+++ b/debian/libavfilter4.lintian-overrides
@@ -1,2 +1,2 @@
# Overriding these fpic lintian errors. Please see bug #528080.
-libavfilter3: shlib-with-non-pic-code
+libavfilter4: shlib-with-non-pic-code
diff --git a/debian/copyright b/debian/libavformat54/usr/share/doc/libavformat54/copyright
similarity index 100%
copy from debian/copyright
copy to debian/libavformat54/usr/share/doc/libavformat54/copyright
diff --git a/debian/libavformat54/usr/share/doc/libavformat54/formats-amd64.txt b/debian/libavformat54/usr/share/doc/libavformat54/formats-amd64.txt
new file mode 100644
index 0000000..dc54952
--- /dev/null
+++ b/debian/libavformat54/usr/share/doc/libavformat54/formats-amd64.txt
@@ -0,0 +1,208 @@
+File formats:
+ D. = Demuxing supported
+ .E = Muxing supported
+ --
+ E 3g2 3GP2 (3GPP2 file format)
+ E 3gp 3GP (3GPP file format)
+ D 4xm 4X Technologies
+ E a64 a64 - video for Commodore 64
+ D aac raw ADTS AAC (Advanced Audio Coding)
+ DE ac3 raw AC-3
+ E adts ADTS AAC (Advanced Audio Coding)
+ DE adx CRI ADX
+ D aea MD STUDIO audio
+ DE aiff Audio IFF
+ DE alaw PCM A-law
+ DE alsa ALSA audio output
+ DE amr 3GPP AMR
+ D anm Deluxe Paint Animation
+ D apc CRYO APC
+ D ape Monkey's Audio
+ DE asf ASF (Advanced / Active Streaming Format)
+ E asf_stream ASF (Advanced / Active Streaming Format)
+ DE ass SSA (SubStation Alpha) subtitle
+ DE au Sun AU
+ DE avi AVI (Audio Video Interleaved)
+ E avm2 SWF (ShockWave Flash) (AVM2)
+ D avs AVS
+ D bethsoftvid Bethesda Softworks VID
+ D bfi Brute Force & Ignorance
+ D bink Bink
+ D bmv Discworld II BMV
+ D c93 Interplay C93
+ D caf Apple CAF (Core Audio Format)
+ DE cavsvideo raw Chinese AVS (Audio Video Standard) video
+ D cdg CD Graphics
+ D cdxl Commodore CDXL video
+ E crc CRC testing
+ DE daud D-Cinema audio
+ D dfa Chronomaster DFA
+ DE dirac raw Dirac
+ DE dnxhd raw DNxHD (SMPTE VC-3)
+ D dsicin Delphine Software International CIN
+ DE dts raw DTS
+ DE dv DV (Digital Video)
+ D dv1394 DV1394 A/V grab
+ E dvd MPEG-2 PS (DVD VOB)
+ D dxa DXA
+ D ea Electronic Arts Multimedia
+ D ea_cdata Electronic Arts cdata
+ DE eac3 raw E-AC-3
+ DE f32be PCM 32-bit floating-point big-endian
+ DE f32le PCM 32-bit floating-point little-endian
+ E f4v F4V Adobe Flash Video
+ DE f64be PCM 64-bit floating-point big-endian
+ DE f64le PCM 64-bit floating-point little-endian
+ D fbdev Linux framebuffer
+ DE ffm FFM (AVserver live feed)
+ DE ffmetadata FFmpeg metadata in text
+ D film_cpk Sega FILM / CPK
+ DE filmstrip Adobe Filmstrip
+ DE flac raw FLAC
+ D flic FLI/FLC/FLX animation
+ DE flv FLV (Flash Video)
+ E framecrc framecrc testing
+ E framemd5 Per-frame MD5 testing
+ DE g722 raw G.722
+ D g723_1 G.723.1
+ E gif GIF Animation
+ D gsm raw GSM
+ DE gxf GXF (General eXchange Format)
+ DE h261 raw H.261
+ DE h263 raw H.263
+ DE h264 raw H.264 video
+ E hds HDS Muxer
+ D hevc raw HEVC video
+ E hls Apple HTTP Live Streaming
+ D hls,applehttp Apple HTTP Live Streaming
+ D hnm Cryo HNM v4
+ D idcin id Cinematic
+ D iff IFF (Interchange File Format)
+ DE ilbc iLBC storage
+ DE image2 image2 sequence
+ DE image2pipe piped image2 sequence
+ D ingenient raw Ingenient MJPEG
+ D ipmovie Interplay MVE
+ E ipod iPod H.264 MP4 (MPEG-4 Part 14)
+ E ismv ISMV/ISMA (Smooth Streaming)
+ D iss Funcom ISS
+ D iv8 IndigoVision 8000 video
+ DE ivf On2 IVF
+ D jack JACK Audio Connection Kit
+ D jv Bitmap Brothers JV
+ DE latm LOAS/LATM
+ D libcdio
+ D libdc1394 dc1394 v.2 A/V grab
+ D lmlm4 raw lmlm4
+ D lxf VR native stream (LXF)
+ DE m4v raw MPEG-4 video
+ E matroska Matroska
+ D matroska,webm Matroska / WebM
+ E md5 MD5 testing
+ DE mjpeg raw MJPEG video
+ DE mlp raw MLP
+ D mm American Laser Games MM
+ DE mmf Yamaha SMAF
+ E mov QuickTime / MOV
+ D mov,mp4,m4a,3gp,3g2,mj2 QuickTime / MOV
+ E mp2 MP2 (MPEG audio layer 2)
+ DE mp3 MP3 (MPEG audio layer 3)
+ E mp4 MP4 (MPEG-4 Part 14)
+ D mpc Musepack
+ D mpc8 Musepack SV8
+ DE mpeg MPEG-1 Systems / MPEG program stream
+ E mpeg1video raw MPEG-1 video
+ E mpeg2video raw MPEG-2 video
+ DE mpegts MPEG-TS (MPEG-2 Transport Stream)
+ D mpegtsraw raw MPEG-TS (MPEG-2 Transport Stream)
+ D mpegvideo raw MPEG video
+ E mpjpeg MIME multipart JPEG
+ D msnwctcp MSN TCP Webcam stream
+ D mtv MTV
+ DE mulaw PCM mu-law
+ D mvi Motion Pixels MVI
+ DE mxf MXF (Material eXchange Format)
+ E mxf_d10 MXF (Material eXchange Format) D-10 Mapping
+ D mxg MxPEG clip
+ D nc NC camera feed
+ D nsv Nullsoft Streaming Video
+ E null raw null video
+ DE nut NUT
+ D nuv NuppelVideo
+ DE ogg Ogg
+ DE oma Sony OpenMG audio
+ DE oss OSS (Open Sound System) playback
+ D pmp Playstation Portable PMP
+ E psp PSP MP4 (MPEG-4 Part 14)
+ D psxstr Sony Playstation STR
+ D pulse Pulse audio input
+ D pva TechnoTrend PVA
+ D qcp QCP
+ D r3d REDCODE R3D
+ DE rawvideo raw video
+ E rcv VC-1 test bitstream
+ D rl2 RL2
+ DE rm RealMedia
+ DE roq raw id RoQ
+ D rpl RPL / ARMovie
+ DE rso Lego Mindstorms RSO
+ DE rtp RTP output
+ DE rtsp RTSP output
+ DE s16be PCM signed 16-bit big-endian
+ DE s16le PCM signed 16-bit little-endian
+ DE s24be PCM signed 24-bit big-endian
+ DE s24le PCM signed 24-bit little-endian
+ DE s32be PCM signed 32-bit big-endian
+ DE s32le PCM signed 32-bit little-endian
+ DE s8 PCM signed 8-bit
+ DE sap SAP output
+ D sdp SDP
+ E segment segment
+ D shn raw Shorten
+ D siff Beam Software SIFF
+ DE smjpeg Loki SDL MJPEG
+ D smk Smacker video
+ E smoothstreaming Smooth Streaming Muxer
+ D sol Sierra SOL
+ DE sox SoX native
+ DE spdif IEC 61937 (used on S/PDIF - IEC958)
+ DE srt SubRip subtitle
+ E svcd MPEG-2 PS (SVCD)
+ DE swf SWF (ShockWave Flash)
+ D tak raw TAK
+ D thp THP
+ D tiertexseq Tiertex Limited SEQ
+ D tmv 8088flex TMV
+ DE truehd raw TrueHD
+ D tta TTA (True Audio)
+ D tty Tele-typewriter
+ D txd Renderware TeXture Dictionary
+ DE u16be PCM unsigned 16-bit big-endian
+ DE u16le PCM unsigned 16-bit little-endian
+ DE u24be PCM unsigned 24-bit big-endian
+ DE u24le PCM unsigned 24-bit little-endian
+ DE u32be PCM unsigned 32-bit big-endian
+ DE u32le PCM unsigned 32-bit little-endian
+ DE u8 PCM unsigned 8-bit
+ D vc1 raw VC-1
+ D vc1test VC-1 test bitstream
+ E vcd MPEG-1 Systems / MPEG program stream (VCD)
+ D video4linux2 Video4Linux2 device grab
+ D vmd Sierra VMD
+ E vob MPEG-2 PS (VOB)
+ DE voc Creative Voice
+ D vqf Nippon Telegraph and Telephone Corporation (NTT) TwinVQ
+ D w64 Sony Wave64
+ DE wav WAV / WAVE (Waveform Audio)
+ D wc3movie Wing Commander III movie
+ E webm WebM
+ D wsaud Westwood Studios audio
+ D wsvqa Westwood Studios VQA
+ D wtv Windows Television (WTV)
+ DE wv raw WavPack
+ D x11grab X11grab
+ D xa Maxis XA
+ D xmv Microsoft XMV
+ D xwma Microsoft xWMA
+ D yop Psygnosis YOP
+ DE yuv4mpegpipe YUV4MPEG pipe
diff --git a/debian/libavformat54.install.in b/debian/libavformat55.install.in
similarity index 100%
rename from debian/libavformat54.install.in
rename to debian/libavformat55.install.in
diff --git a/debian/libavformat54.lintian-overrides b/debian/libavformat55.lintian-overrides
similarity index 62%
rename from debian/libavformat54.lintian-overrides
rename to debian/libavformat55.lintian-overrides
index 012fc67..f0fe536 100644
--- a/debian/libavformat54.lintian-overrides
+++ b/debian/libavformat55.lintian-overrides
@@ -1,2 +1,2 @@
# Overriding these fpic lintian errors. Please see bug #528080.
-libavformat54: shlib-with-non-pic-code
+libavformat55: shlib-with-non-pic-code
diff --git a/debian/libavutil52.install.in b/debian/libavutil53.install.in
similarity index 100%
rename from debian/libavutil52.install.in
rename to debian/libavutil53.install.in
diff --git a/debian/libavutil52.lintian-overrides b/debian/libavutil53.lintian-overrides
similarity index 63%
rename from debian/libavutil52.lintian-overrides
rename to debian/libavutil53.lintian-overrides
index 7bdc678..792ba21 100644
--- a/debian/libavutil52.lintian-overrides
+++ b/debian/libavutil53.lintian-overrides
@@ -1,2 +1,2 @@
# Overriding these fpic lintian errors. Please see bug #528080.
-libavutil52: shlib-with-non-pic-code
+libavutil53: shlib-with-non-pic-code
diff --git a/debian/rules b/debian/rules
index 9e5face..bbe4270 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ EPOCH=6:
DEB_SOURCE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//')
-SHLIBS_VERSION := $(EPOCH)9.1-1
+SHLIBS_VERSION := $(EPOCH)10~~
# The libavcodec-extra package is necessary because it links against
# libraries that are GPLv3 licensed. Make sure that you do not link
@@ -122,8 +122,7 @@ define install_flavor_extra
endef
# installs arch-dependent files only
-install: install-common install-extra
-install-common: build $(DH_INSTALL_FILES)
+install: build $(DH_INSTALL_FILES)
dh_testdir
dh_testroot
dh_prep -a
@@ -139,23 +138,16 @@ install-common: build $(DH_INSTALL_FILES)
debian/tmp/usr/bin/avconv -codecs | tee codecs.txt
dh_installdocs -plibavformat54 formats-$(DEB_HOST_ARCH).txt
dh_installdocs -plibavcodec54 codecs.txt
-install-extra: build $(DH_INSTALL_FILES)
- dh_testdir
- dh_testroot
- $(foreach flavor,$(filter-out static,$(FLAVORS)),$(call install_flavor_extra,$(flavor)))
- dh_install $(addprefix -p,$(LIB_EXTRA_PKGS)) --fail-missing \
- --sourcedir=debian/tmp/extra
- env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/extra/usr/lib/$(DEB_HOST_MULTIARCH)" \
- debian/tmp/usr/bin/avconv -codecs | tee codecs.txt
- dh_installdocs -plibavcodec-extra-54 codecs.txt
-ifeq ($(DEB_SOURCE), libav)
dh_installdocs -a doc/APIchanges
install -m 644 -D debian-shared/doc/*.html doc/t2h.init debian/libav-tools/usr/share/doc/libav-tools
dh_installexamples -p libavcodec-dev libavcodec/api-example.c
dh_installchangelogs -a Changelog
-else
- dh_installchangelogs -a libav/Changelog
-endif
+ $(foreach flavor,$(filter-out static,$(FLAVORS)),$(call install_flavor_extra,$(flavor)))
+ env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/extra/usr/lib/$(DEB_HOST_MULTIARCH)" \
+ debian/tmp/usr/bin/avconv -codecs | tee codecs.txt
+ dh_installdocs -plibavcodec-extra-54 codecs.txt
+ dh_install $(addprefix -p,$(LIB_EXTRA_PKGS)) --fail-missing \
+ --sourcedir=debian/tmp/extra
binary-indep:
dh_testdir
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list