[SCM] libav/libav-extra: Change packaging to only build libavcodec-extra* package. Other extra packages are unnecessary.
ceros-guest at users.alioth.debian.org
ceros-guest at users.alioth.debian.org
Wed Mar 21 02:26:35 UTC 2012
The following commit has been merged in the libav-extra branch:
commit 1b7ca8d372075118db12c8f1d8fb565eca874183
Author: Andres Mejia <amejia004 at gmail.com>
Date: Tue Mar 20 22:26:21 2012 -0400
Change packaging to only build libavcodec-extra* package.
Other extra packages are unnecessary.
diff --git a/debian/changelog b/debian/changelog
index 1216cbc..47d8535 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libav (5:0.8.1-2) UNRELEASED; urgency=low
+
+ * Merge libav-extra packages to libav. (Closes: #658084)
+ * Provide only libavcodec-extra package, the other packages are unnecessary.
+
+ -- Andres Mejia <amejia at debian.org> Tue, 20 Mar 2012 21:16:47 -0400
+
libav (4:0.8.1-1) unstable; urgency=medium
[ Reinhard Tartler ]
diff --git a/debian/control b/debian/control
index 6d8d4f5..1f250a6 100644
--- a/debian/control
+++ b/debian/control
@@ -198,6 +198,12 @@ Pre-Depends: ${misc:Pre-Depends}
Depends:
${misc:Depends},
${shlibs:Depends}
+Conflicts:
+ libavutil-extra-51
+Replaces:
+ libavutil-extra-51
+Breaks:
+ libavutil-extra-51 (<< 5:0.8.1-2)
Description: Libav utility library
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
@@ -229,6 +235,12 @@ Pre-Depends: ${misc:Pre-Depends}
Depends:
${misc:Depends},
${shlibs:Depends}
+Conflicts:
+ libavdevice-extra-53
+Replaces:
+ libavdevice-extra-53
+Breaks:
+ libavdevice-extra-53 (<< 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.
@@ -242,6 +254,12 @@ Pre-Depends: ${misc:Pre-Depends}
Depends:
${misc:Depends},
${shlibs:Depends}
+Conflicts:
+ libavformat-extra-53
+Replaces:
+ libavformat-extra-53
+Breaks:
+ libavformat-extra-53 (<< 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.
@@ -258,6 +276,12 @@ Pre-Depends: ${misc:Pre-Depends}
Depends:
${misc:Depends},
${shlibs:Depends}
+Conflicts:
+ libavfilter-extra-2
+Replaces:
+ libavfilter-extra-2
+Breaks:
+ libavfilter-extra-2 (<< 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.
@@ -271,6 +295,12 @@ Pre-Depends: ${misc:Pre-Depends}
Depends:
${misc:Depends},
${shlibs:Depends}
+Conflicts:
+ libpostproc-extra-52
+Replaces:
+ libpostproc-extra-52
+Breaks:
+ libpostproc-extra-52 (<< 5:0.8.1-2)
Description: Libav video postprocessing library
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
@@ -284,6 +314,12 @@ Pre-Depends: ${misc:Pre-Depends}
Depends:
${misc:Depends},
${shlibs:Depends}
+Conflicts:
+ libswscale-extra-2
+Replaces:
+ libswscale-extra-2
+Breaks:
+ libswscale-extra-2 (<< 5:0.8.1-2)
Description: Libav video scaling library
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
@@ -294,8 +330,7 @@ Package: libavutil-dev
Section: libdevel
Architecture: any
Depends:
- libavutil51 (<= ${source:Upstream-Version}-99) | libavutil-extra-51 (<= ${source:Upstream-Version}-99),
- libavutil51 (>= ${binary:Version}) | libavutil-extra-51 (>= ${binary:Version}),
+ libavutil51 (= ${binary:Version}),
${misc:Depends}
Description: Development files for libavutil
Libav is a complete, cross-platform solution to decode, encode, record,
@@ -340,8 +375,7 @@ Package: libavdevice-dev
Section: libdevel
Architecture: any
Depends:
- libavdevice53 (<= ${source:Upstream-Version}-99) | libavdevice-extra-53 (<= ${source:Upstream-Version}-99),
- libavdevice53 (>= ${binary:Version}) | libavdevice-extra-53 (>= ${binary:Version}),
+ libavdevice53 (= ${binary:Version}),
libavformat-dev (= ${binary:Version}),
${misc:Depends}
Description: Development files for libavdevice
@@ -358,8 +392,7 @@ Section: libdevel
Architecture: any
Depends:
libavcodec-dev (= ${binary:Version}),
- libavformat53 (<= ${source:Upstream-Version}-99) | libavformat-extra-53 (<= ${source:Upstream-Version}-99),
- libavformat53 (>= ${binary:Version}) | libavformat-extra-53 (>= ${binary:Version}),
+ libavformat53 (= ${binary:Version}),
libavutil-dev (= ${binary:Version}),
${misc:Depends}
Description: Development files for libavformat
@@ -377,8 +410,7 @@ Section: libdevel
Architecture: any
Depends:
libavcodec-dev (= ${binary:Version}),
- libavfilter2 (<= ${source:Upstream-Version}-99) | libavfilter-extra-2 (<= ${source:Upstream-Version}-99),
- libavfilter2 (>= ${binary:Version}) | libavfilter-extra-2 (>= ${binary:Version}),
+ libavfilter2 (= ${binary:Version}),
${misc:Depends}
Description: Development files for libavfilter
Libav is a complete, cross-platform solution to decode, encode, record,
@@ -394,8 +426,7 @@ Section: libdevel
Architecture: any
Depends:
libavutil-dev (= ${binary:Version}),
- libpostproc52 (<= ${source:Upstream-Version}-99) | libpostproc-extra-52 (<= ${source:Upstream-Version}-99),
- libpostproc52 (>= ${binary:Version}) | libpostproc-extra-52 (>= ${binary:Version}),
+ libpostproc52 (= ${binary:Version}),
${misc:Depends}
Description: Development files for libpostproc
Libav is a complete, cross-platform solution to decode, encode, record,
@@ -411,8 +442,7 @@ Section: libdevel
Architecture: any
Depends:
libavutil-dev (= ${binary:Version}),
- libswscale2 (<= ${source:Upstream-Version}-99) | libswscale-extra-2 (<= ${source:Upstream-Version}-99),
- libswscale2 (>= ${binary:Version}) | libswscale-extra-2 (>= ${binary:Version}),
+ libswscale2 (= ${binary:Version}),
${misc:Depends}
Description: Development files for libswscale
Libav is a complete, cross-platform solution to decode, encode, record,
@@ -424,22 +454,19 @@ Description: Development files for libswscale
compile applications or shared objects that use libswscale.
Package: libavutil-extra-51
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
+Section: oldlibs
+Priority: extra
+Architecture: all
+Multi-Arch: foreign
Depends:
+ libavutil51,
${misc:Depends},
- ${shlibs:Depends}
-Conflicts:
- libavutil51
-Replaces:
- libavutil51
-Description: Libav utility library
+Description: Libav utility library (transitional package)
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
.
- This is the common utility library from Libav. It contains shared code
- used by all other Libav libraries.
+ This package is only used for transitional purposes and can be safely
+ removed when no other packages depend on this package.
Package: libavcodec-extra-53
Architecture: any
@@ -463,89 +490,76 @@ Description: Libav codec library
This is the codec library from Libav (both encoding and decoding).
Package: libavdevice-extra-53
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
+Section: oldlibs
+Priority: extra
+Architecture: all
+Multi-Arch: foreign
Depends:
+ libavdevice53,
${misc:Depends},
- ${shlibs:Depends}
-Conflicts:
- libavdevice53
-Replaces:
- libavdevice53
-Description: Libav device handling library
+Description: Libav device handling library (transitional package)
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.
+ This package is only used for transitional purposes and can be safely
+ removed when no other packages depend on this package.
Package: libavfilter-extra-2
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
+Section: oldlibs
+Priority: extra
+Architecture: all
+Multi-Arch: foreign
Depends:
+ libavfilter2,
${misc:Depends},
- ${shlibs:Depends}
-Conflicts:
- libavfilter2
-Replaces:
- libavfilter2
-Description: Libav filter library
+Description: Libav filter library (transitional package)
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
.
- This is the video filtering library from Libav.
+ This package is only used for transitional purposes and can be safely
+ removed when no other packages depend on this package.
Package: libpostproc-extra-52
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
+Section: oldlibs
+Priority: extra
+Architecture: all
+Multi-Arch: foreign
Depends:
+ libpostproc52,
${misc:Depends},
- ${shlibs:Depends}
-Conflicts:
- libpostproc52
-Replaces:
- libpostproc52
-Description: Libav video postprocessing library
+Description: Libav video postprocessing library (transitional package)
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
.
- This is the video postprocessing library from Libav.
+ This package is only used for transitional purposes and can be safely
+ removed when no other packages depend on this package.
Package: libavformat-extra-53
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
+Section: oldlibs
+Priority: extra
+Architecture: all
+Multi-Arch: foreign
Depends:
+ libavformat53,
${misc:Depends},
- ${shlibs:Depends}
-Conflicts:
- libavformat53
-Replaces:
- libavformat53
-Description: Libav video postprocessing library
+Description: Libav video postprocessing library (transitional package)
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
.
- This is the demuxer library from Libav. It supports most existing file
- formats (AVI, MPEG, OGG, Matroska, ASF...).
+ This package is only used for transitional purposes and can be safely
+ removed when no other packages depend on this package.
Package: libswscale-extra-2
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
+Section: oldlibs
+Priority: extra
+Architecture: all
+Multi-Arch: foreign
Depends:
+ libswscale2,
${misc:Depends},
- ${shlibs:Depends}
-Conflicts:
- libswscale-extra-1 (>> 4:0.7~),
- libswscale2
-Replaces:
- libswscale-extra-1 (>> 4:0.7~),
- libswscale2
-Description: Libav video software scaling library
+Description: Libav video software scaling library (transitional package)
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
.
- This is the video software scaling library from Libav.
+ This package is only used for transitional purposes and can be safely
+ removed when no other packages depend on this package.
diff --git a/debian/libavdevice-extra-53.copyright b/debian/libavdevice-extra-53.copyright
deleted file mode 100644
index ddda12a..0000000
--- a/debian/libavdevice-extra-53.copyright
+++ /dev/null
@@ -1,98 +0,0 @@
-This package was downloaded from http://libav.org
-
-Upstream Authors: Fabrice Bellard
- Alex Beregszaszi
- BERO
- Mario Brito
- Ronald Bultje
- Tim Ferguson
- Brian Foley
- Arpad Gereoffy
- Philip Gladstone
- Vladimir Gneushev
- Wolfgang Hesseler
- Falk Hueffner
- Zdenek Kabelac
- Robin Kay
- Todd Kirby
- Nick Kurshev
- Mike Melanson
- Michael Niedermayer
- François Revol
- Roman Shaposhnik
- Dieter Shirley
- Juan J. Sierralta
- Ewald Snel
- Leon van Stuivenberg
- Roberto Togni
- Lionel Ulmer
-
-Copyright (c) 2000-2004 Fabrice Bellard et al.
-
-The following files are licensed under the GNU GPL, as clarified below:
-
- * ffmpeg.c
- * libavcodec:
- + dtsdec.c
- + i386/idct_mmx.c
- + liba52/*.[ch]
- * libavformat:
- + x11grab.c
- + gxfenc.c
- * libpostproc:
- + postprocess_internal.h
- + postprocess_altivec_template.c
- + postprocess.h
- + postprocess_template.c
- + postprocess.c
- + mangle.h
- * libswscale:
- + swscale.c
- + swscale-example.c
- + yuv2rgb_template.c
- + swscale_altivec_template.c
- + yuv2rgb_altivec.c
- + swscale_template.c
- + rgb2rgb_template.c
- + rgb2rgb.c
- + cs_test.c
- + yuv2rgb_mlib.c
- + yuv2rgb.c
-
- | This library is free software; you can redistribute it and/or
- | modify it under the terms of the GNU General Public License as
- | published by the Free Software Foundation; either version 2 of
- | the License, or (at your option) any later version.
- |
- | This library is distributed in the hope that it will be useful,
- | but WITHOUT ANY WARRANTY; without even the implied warranty of
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- | Lesser General Public License for more details.
- |
- | You should have received a copy of the GNU General Public License
- | along with this program; if not, write to the Free Software
- | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The rest of the code is licensed under the GNU LGPL:
-
- | This library is free software; you can redistribute it and/or
- | modify it under the terms of the GNU Lesser General Public License as
- | published by the Free Software Foundation; either version 2.1 of
- | the License, or (at your option) any later version.
- |
- | This library is distributed in the hope that it will be useful,
- | but WITHOUT ANY WARRANTY; without even the implied warranty of
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- | Lesser General Public License for more details.
- |
- | You should have received a copy of the GNU General Public License
- | along with this program; if not, write to the Free Software
- | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License can be found in `/usr/share/common-licenses/GPL' and the text of the
-GNU Lesser General Public License is in `/usr/share/common-licenses/LGPL'.
-
-Note: Because this package links against libraries that are licensed
-under Apache License 2.0, the resulting binaries are distributed under the
-GPL version 3.
diff --git a/debian/libavdevice-extra-53.install.in b/debian/libavdevice-extra-53.install.in
deleted file mode 100644
index e942547..0000000
--- a/debian/libavdevice-extra-53.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/@DEB_HOST_MULTIARCH_OPT@/libavdevice.so.*
diff --git a/debian/libavfilter-extra-2.copyright b/debian/libavfilter-extra-2.copyright
deleted file mode 100644
index ddda12a..0000000
--- a/debian/libavfilter-extra-2.copyright
+++ /dev/null
@@ -1,98 +0,0 @@
-This package was downloaded from http://libav.org
-
-Upstream Authors: Fabrice Bellard
- Alex Beregszaszi
- BERO
- Mario Brito
- Ronald Bultje
- Tim Ferguson
- Brian Foley
- Arpad Gereoffy
- Philip Gladstone
- Vladimir Gneushev
- Wolfgang Hesseler
- Falk Hueffner
- Zdenek Kabelac
- Robin Kay
- Todd Kirby
- Nick Kurshev
- Mike Melanson
- Michael Niedermayer
- François Revol
- Roman Shaposhnik
- Dieter Shirley
- Juan J. Sierralta
- Ewald Snel
- Leon van Stuivenberg
- Roberto Togni
- Lionel Ulmer
-
-Copyright (c) 2000-2004 Fabrice Bellard et al.
-
-The following files are licensed under the GNU GPL, as clarified below:
-
- * ffmpeg.c
- * libavcodec:
- + dtsdec.c
- + i386/idct_mmx.c
- + liba52/*.[ch]
- * libavformat:
- + x11grab.c
- + gxfenc.c
- * libpostproc:
- + postprocess_internal.h
- + postprocess_altivec_template.c
- + postprocess.h
- + postprocess_template.c
- + postprocess.c
- + mangle.h
- * libswscale:
- + swscale.c
- + swscale-example.c
- + yuv2rgb_template.c
- + swscale_altivec_template.c
- + yuv2rgb_altivec.c
- + swscale_template.c
- + rgb2rgb_template.c
- + rgb2rgb.c
- + cs_test.c
- + yuv2rgb_mlib.c
- + yuv2rgb.c
-
- | This library is free software; you can redistribute it and/or
- | modify it under the terms of the GNU General Public License as
- | published by the Free Software Foundation; either version 2 of
- | the License, or (at your option) any later version.
- |
- | This library is distributed in the hope that it will be useful,
- | but WITHOUT ANY WARRANTY; without even the implied warranty of
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- | Lesser General Public License for more details.
- |
- | You should have received a copy of the GNU General Public License
- | along with this program; if not, write to the Free Software
- | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The rest of the code is licensed under the GNU LGPL:
-
- | This library is free software; you can redistribute it and/or
- | modify it under the terms of the GNU Lesser General Public License as
- | published by the Free Software Foundation; either version 2.1 of
- | the License, or (at your option) any later version.
- |
- | This library is distributed in the hope that it will be useful,
- | but WITHOUT ANY WARRANTY; without even the implied warranty of
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- | Lesser General Public License for more details.
- |
- | You should have received a copy of the GNU General Public License
- | along with this program; if not, write to the Free Software
- | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License can be found in `/usr/share/common-licenses/GPL' and the text of the
-GNU Lesser General Public License is in `/usr/share/common-licenses/LGPL'.
-
-Note: Because this package links against libraries that are licensed
-under Apache License 2.0, the resulting binaries are distributed under the
-GPL version 3.
diff --git a/debian/libavfilter-extra-2.install.in b/debian/libavfilter-extra-2.install.in
deleted file mode 100644
index 4e4157c..0000000
--- a/debian/libavfilter-extra-2.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/@DEB_HOST_MULTIARCH_OPT@/libavfilter.so.*
diff --git a/debian/libavformat-extra-53.copyright b/debian/libavformat-extra-53.copyright
deleted file mode 100644
index ddda12a..0000000
--- a/debian/libavformat-extra-53.copyright
+++ /dev/null
@@ -1,98 +0,0 @@
-This package was downloaded from http://libav.org
-
-Upstream Authors: Fabrice Bellard
- Alex Beregszaszi
- BERO
- Mario Brito
- Ronald Bultje
- Tim Ferguson
- Brian Foley
- Arpad Gereoffy
- Philip Gladstone
- Vladimir Gneushev
- Wolfgang Hesseler
- Falk Hueffner
- Zdenek Kabelac
- Robin Kay
- Todd Kirby
- Nick Kurshev
- Mike Melanson
- Michael Niedermayer
- François Revol
- Roman Shaposhnik
- Dieter Shirley
- Juan J. Sierralta
- Ewald Snel
- Leon van Stuivenberg
- Roberto Togni
- Lionel Ulmer
-
-Copyright (c) 2000-2004 Fabrice Bellard et al.
-
-The following files are licensed under the GNU GPL, as clarified below:
-
- * ffmpeg.c
- * libavcodec:
- + dtsdec.c
- + i386/idct_mmx.c
- + liba52/*.[ch]
- * libavformat:
- + x11grab.c
- + gxfenc.c
- * libpostproc:
- + postprocess_internal.h
- + postprocess_altivec_template.c
- + postprocess.h
- + postprocess_template.c
- + postprocess.c
- + mangle.h
- * libswscale:
- + swscale.c
- + swscale-example.c
- + yuv2rgb_template.c
- + swscale_altivec_template.c
- + yuv2rgb_altivec.c
- + swscale_template.c
- + rgb2rgb_template.c
- + rgb2rgb.c
- + cs_test.c
- + yuv2rgb_mlib.c
- + yuv2rgb.c
-
- | This library is free software; you can redistribute it and/or
- | modify it under the terms of the GNU General Public License as
- | published by the Free Software Foundation; either version 2 of
- | the License, or (at your option) any later version.
- |
- | This library is distributed in the hope that it will be useful,
- | but WITHOUT ANY WARRANTY; without even the implied warranty of
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- | Lesser General Public License for more details.
- |
- | You should have received a copy of the GNU General Public License
- | along with this program; if not, write to the Free Software
- | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The rest of the code is licensed under the GNU LGPL:
-
- | This library is free software; you can redistribute it and/or
- | modify it under the terms of the GNU Lesser General Public License as
- | published by the Free Software Foundation; either version 2.1 of
- | the License, or (at your option) any later version.
- |
- | This library is distributed in the hope that it will be useful,
- | but WITHOUT ANY WARRANTY; without even the implied warranty of
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- | Lesser General Public License for more details.
- |
- | You should have received a copy of the GNU General Public License
- | along with this program; if not, write to the Free Software
- | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License can be found in `/usr/share/common-licenses/GPL' and the text of the
-GNU Lesser General Public License is in `/usr/share/common-licenses/LGPL'.
-
-Note: Because this package links against libraries that are licensed
-under Apache License 2.0, the resulting binaries are distributed under the
-GPL version 3.
diff --git a/debian/libavformat-extra-53.install.in b/debian/libavformat-extra-53.install.in
deleted file mode 100644
index 660f3a5..0000000
--- a/debian/libavformat-extra-53.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/@DEB_HOST_MULTIARCH_OPT@/libavformat.so.*
diff --git a/debian/libavutil-extra-51.copyright b/debian/libavutil-extra-51.copyright
deleted file mode 100644
index ddda12a..0000000
--- a/debian/libavutil-extra-51.copyright
+++ /dev/null
@@ -1,98 +0,0 @@
-This package was downloaded from http://libav.org
-
-Upstream Authors: Fabrice Bellard
- Alex Beregszaszi
- BERO
- Mario Brito
- Ronald Bultje
- Tim Ferguson
- Brian Foley
- Arpad Gereoffy
- Philip Gladstone
- Vladimir Gneushev
- Wolfgang Hesseler
- Falk Hueffner
- Zdenek Kabelac
- Robin Kay
- Todd Kirby
- Nick Kurshev
- Mike Melanson
- Michael Niedermayer
- François Revol
- Roman Shaposhnik
- Dieter Shirley
- Juan J. Sierralta
- Ewald Snel
- Leon van Stuivenberg
- Roberto Togni
- Lionel Ulmer
-
-Copyright (c) 2000-2004 Fabrice Bellard et al.
-
-The following files are licensed under the GNU GPL, as clarified below:
-
- * ffmpeg.c
- * libavcodec:
- + dtsdec.c
- + i386/idct_mmx.c
- + liba52/*.[ch]
- * libavformat:
- + x11grab.c
- + gxfenc.c
- * libpostproc:
- + postprocess_internal.h
- + postprocess_altivec_template.c
- + postprocess.h
- + postprocess_template.c
- + postprocess.c
- + mangle.h
- * libswscale:
- + swscale.c
- + swscale-example.c
- + yuv2rgb_template.c
- + swscale_altivec_template.c
- + yuv2rgb_altivec.c
- + swscale_template.c
- + rgb2rgb_template.c
- + rgb2rgb.c
- + cs_test.c
- + yuv2rgb_mlib.c
- + yuv2rgb.c
-
- | This library is free software; you can redistribute it and/or
- | modify it under the terms of the GNU General Public License as
- | published by the Free Software Foundation; either version 2 of
- | the License, or (at your option) any later version.
- |
- | This library is distributed in the hope that it will be useful,
- | but WITHOUT ANY WARRANTY; without even the implied warranty of
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- | Lesser General Public License for more details.
- |
- | You should have received a copy of the GNU General Public License
- | along with this program; if not, write to the Free Software
- | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The rest of the code is licensed under the GNU LGPL:
-
- | This library is free software; you can redistribute it and/or
- | modify it under the terms of the GNU Lesser General Public License as
- | published by the Free Software Foundation; either version 2.1 of
- | the License, or (at your option) any later version.
- |
- | This library is distributed in the hope that it will be useful,
- | but WITHOUT ANY WARRANTY; without even the implied warranty of
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- | Lesser General Public License for more details.
- |
- | You should have received a copy of the GNU General Public License
- | along with this program; if not, write to the Free Software
- | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License can be found in `/usr/share/common-licenses/GPL' and the text of the
-GNU Lesser General Public License is in `/usr/share/common-licenses/LGPL'.
-
-Note: Because this package links against libraries that are licensed
-under Apache License 2.0, the resulting binaries are distributed under the
-GPL version 3.
diff --git a/debian/libavutil-extra-51.install.in b/debian/libavutil-extra-51.install.in
deleted file mode 100644
index 3dc6cc2..0000000
--- a/debian/libavutil-extra-51.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/@DEB_HOST_MULTIARCH_OPT@/libavutil.so.*
diff --git a/debian/libpostproc-extra-52.copyright b/debian/libpostproc-extra-52.copyright
deleted file mode 100644
index ddda12a..0000000
--- a/debian/libpostproc-extra-52.copyright
+++ /dev/null
@@ -1,98 +0,0 @@
-This package was downloaded from http://libav.org
-
-Upstream Authors: Fabrice Bellard
- Alex Beregszaszi
- BERO
- Mario Brito
- Ronald Bultje
- Tim Ferguson
- Brian Foley
- Arpad Gereoffy
- Philip Gladstone
- Vladimir Gneushev
- Wolfgang Hesseler
- Falk Hueffner
- Zdenek Kabelac
- Robin Kay
- Todd Kirby
- Nick Kurshev
- Mike Melanson
- Michael Niedermayer
- François Revol
- Roman Shaposhnik
- Dieter Shirley
- Juan J. Sierralta
- Ewald Snel
- Leon van Stuivenberg
- Roberto Togni
- Lionel Ulmer
-
-Copyright (c) 2000-2004 Fabrice Bellard et al.
-
-The following files are licensed under the GNU GPL, as clarified below:
-
- * ffmpeg.c
- * libavcodec:
- + dtsdec.c
- + i386/idct_mmx.c
- + liba52/*.[ch]
- * libavformat:
- + x11grab.c
- + gxfenc.c
- * libpostproc:
- + postprocess_internal.h
- + postprocess_altivec_template.c
- + postprocess.h
- + postprocess_template.c
- + postprocess.c
- + mangle.h
- * libswscale:
- + swscale.c
- + swscale-example.c
- + yuv2rgb_template.c
- + swscale_altivec_template.c
- + yuv2rgb_altivec.c
- + swscale_template.c
- + rgb2rgb_template.c
- + rgb2rgb.c
- + cs_test.c
- + yuv2rgb_mlib.c
- + yuv2rgb.c
-
- | This library is free software; you can redistribute it and/or
- | modify it under the terms of the GNU General Public License as
- | published by the Free Software Foundation; either version 2 of
- | the License, or (at your option) any later version.
- |
- | This library is distributed in the hope that it will be useful,
- | but WITHOUT ANY WARRANTY; without even the implied warranty of
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- | Lesser General Public License for more details.
- |
- | You should have received a copy of the GNU General Public License
- | along with this program; if not, write to the Free Software
- | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The rest of the code is licensed under the GNU LGPL:
-
- | This library is free software; you can redistribute it and/or
- | modify it under the terms of the GNU Lesser General Public License as
- | published by the Free Software Foundation; either version 2.1 of
- | the License, or (at your option) any later version.
- |
- | This library is distributed in the hope that it will be useful,
- | but WITHOUT ANY WARRANTY; without even the implied warranty of
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- | Lesser General Public License for more details.
- |
- | You should have received a copy of the GNU General Public License
- | along with this program; if not, write to the Free Software
- | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License can be found in `/usr/share/common-licenses/GPL' and the text of the
-GNU Lesser General Public License is in `/usr/share/common-licenses/LGPL'.
-
-Note: Because this package links against libraries that are licensed
-under Apache License 2.0, the resulting binaries are distributed under the
-GPL version 3.
diff --git a/debian/libpostproc-extra-52.install.in b/debian/libpostproc-extra-52.install.in
deleted file mode 100644
index 5c4aee3..0000000
--- a/debian/libpostproc-extra-52.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/@DEB_HOST_MULTIARCH_OPT@/libpostproc.so.*
diff --git a/debian/libswscale-extra-2.copyright b/debian/libswscale-extra-2.copyright
deleted file mode 100644
index ddda12a..0000000
--- a/debian/libswscale-extra-2.copyright
+++ /dev/null
@@ -1,98 +0,0 @@
-This package was downloaded from http://libav.org
-
-Upstream Authors: Fabrice Bellard
- Alex Beregszaszi
- BERO
- Mario Brito
- Ronald Bultje
- Tim Ferguson
- Brian Foley
- Arpad Gereoffy
- Philip Gladstone
- Vladimir Gneushev
- Wolfgang Hesseler
- Falk Hueffner
- Zdenek Kabelac
- Robin Kay
- Todd Kirby
- Nick Kurshev
- Mike Melanson
- Michael Niedermayer
- François Revol
- Roman Shaposhnik
- Dieter Shirley
- Juan J. Sierralta
- Ewald Snel
- Leon van Stuivenberg
- Roberto Togni
- Lionel Ulmer
-
-Copyright (c) 2000-2004 Fabrice Bellard et al.
-
-The following files are licensed under the GNU GPL, as clarified below:
-
- * ffmpeg.c
- * libavcodec:
- + dtsdec.c
- + i386/idct_mmx.c
- + liba52/*.[ch]
- * libavformat:
- + x11grab.c
- + gxfenc.c
- * libpostproc:
- + postprocess_internal.h
- + postprocess_altivec_template.c
- + postprocess.h
- + postprocess_template.c
- + postprocess.c
- + mangle.h
- * libswscale:
- + swscale.c
- + swscale-example.c
- + yuv2rgb_template.c
- + swscale_altivec_template.c
- + yuv2rgb_altivec.c
- + swscale_template.c
- + rgb2rgb_template.c
- + rgb2rgb.c
- + cs_test.c
- + yuv2rgb_mlib.c
- + yuv2rgb.c
-
- | This library is free software; you can redistribute it and/or
- | modify it under the terms of the GNU General Public License as
- | published by the Free Software Foundation; either version 2 of
- | the License, or (at your option) any later version.
- |
- | This library is distributed in the hope that it will be useful,
- | but WITHOUT ANY WARRANTY; without even the implied warranty of
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- | Lesser General Public License for more details.
- |
- | You should have received a copy of the GNU General Public License
- | along with this program; if not, write to the Free Software
- | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The rest of the code is licensed under the GNU LGPL:
-
- | This library is free software; you can redistribute it and/or
- | modify it under the terms of the GNU Lesser General Public License as
- | published by the Free Software Foundation; either version 2.1 of
- | the License, or (at your option) any later version.
- |
- | This library is distributed in the hope that it will be useful,
- | but WITHOUT ANY WARRANTY; without even the implied warranty of
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- | Lesser General Public License for more details.
- |
- | You should have received a copy of the GNU General Public License
- | along with this program; if not, write to the Free Software
- | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License can be found in `/usr/share/common-licenses/GPL' and the text of the
-GNU Lesser General Public License is in `/usr/share/common-licenses/LGPL'.
-
-Note: Because this package links against libraries that are licensed
-under Apache License 2.0, the resulting binaries are distributed under the
-GPL version 3.
diff --git a/debian/libswscale-extra-2.install.in b/debian/libswscale-extra-2.install.in
deleted file mode 100644
index 2ac5f14..0000000
--- a/debian/libswscale-extra-2.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/@DEB_HOST_MULTIARCH_OPT@/libswscale.so.*
diff --git a/debian/rules b/debian/rules
index 74afab8..9036303 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,15 @@
#!/usr/bin/make -f
-EPOCH=4:
+EPOCH=5:
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 := 4:0.8-2~
+SHLIBS_VERSION := 5:0.8-2~
-LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avfilter|postproc|swscale)[0-9]+)[[:space:]]*$$/\1/p' debian/control)
-LIB_EXTRA_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avfilter|postproc|swscale)(-extra-)[0-9]+)[[:space:]]*$$/\1/p' debian/control)
-DEV_PKGS := $(shell echo $(LIB_PKGS) | sed 's/[0-9]\+\>/-dev/g')
+LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avdevice|avformat|avfilter|postproc|swscale)[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+LIB_PKGS2 := $(shell sed -nr 's/^Package:[[:space:]]*(libavcodec[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+LIB_EXTRA_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(libavcodec-extra-[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+DEV_PKGS := $(shell echo $(LIB_PKGS) $(LIB_PKGS2) | sed 's/[0-9]\+\>/-dev/g')
# Support multiple makes at once
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -37,7 +38,7 @@ define dh_install_file_opt_flavor
endef
-DH_INSTALL_FILES := $(foreach pkg, $(LIB_PKGS) $(LIB_EXTRA_PKGS) $(DEV_PKGS), debian/$(pkg).install)
+DH_INSTALL_FILES := $(foreach pkg, $(LIB_PKGS) $(LIB_PKGS2) $(LIB_EXTRA_PKGS) $(DEV_PKGS), debian/$(pkg).install)
$(DH_INSTALL_FILES):
sed 's/@DEB_HOST_MULTIARCH\(_OPT\)\?@/$(DEB_HOST_MULTIARCH)/g' $@.in > $@
$(foreach opt_flavor,$(OPT_FLAVORS),$(call dh_install_file_opt_flavor,$@,$(opt_flavor)))
@@ -144,10 +145,7 @@ install-extra: build $(DH_INSTALL_FILES)
-Xusr/share/doc/libav --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 -formats | tee formats.txt
- 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 -plibavformat-extra-53 formats.txt
dh_installdocs -plibavcodec-extra-53 codecs.txt
binary-indep: build-doxy install
@@ -173,6 +171,9 @@ binary-arch: build install
# strict internal dependencies
for pkg in $(LIB_PKGS); do \
+ dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(DEB_VERSION)), $$pkg (<< $(EPOCH)$(UPSTREAM_VERSION)-99)"; \
+ done
+ for pkg in $(LIB_PKGS2); do \
upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-extra-\1/'); \
dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(DEB_VERSION)) | $$upkg (>= $(DEB_VERSION)), $$pkg (<< $(EPOCH)$(UPSTREAM_VERSION)-99) | $$upkg (<< $(EPOCH)$(UPSTREAM_VERSION)-99)"; \
done
@@ -184,13 +185,13 @@ binary-arch: build install
env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/extra/usr/lib/$(DEB_HOST_MULTIARCH)" \
dh_shlibdeps $(addprefix -p,$(LIB_EXTRA_PKGS)) $(addprefix -L,$(LIB_EXTRA_PKGS))
# target dependencies for external packages
- for pkg in $(LIB_PKGS); do \
+ for pkg in $(LIB_PKGS) $(LIB_EXTRA_PKGS); do \
+ dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION))"; \
+ done
+ for pkg in $(LIB_PKGS2); do \
upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-extra-\1/'); \
dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION)) | $$upkg (>= $(SHLIBS_VERSION))"; \
done
- for pkg in $(LIB_EXTRA_PKGS); do \
- dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION))"; \
- done
dh_installdeb
dh_gencontrol -- -Vlib1394-dev="$(lib1394-dev)"
dh_md5sums
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list