[SCM] libav/ubuntu: Revert "Remove libav-source package. No longer necessary."
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sat Aug 11 09:29:47 UTC 2012
The following commit has been merged in the ubuntu branch:
commit 01ffbceaf96247e1f31dc3ba9a0cf65a98e475b0
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sat Aug 11 09:47:38 2012 +0200
Revert "Remove libav-source package. No longer necessary."
In ubuntu, we still need it.
This reverts commit 16c0eea775993adcf3d59c9a0158cf8d04b156be.
Conflicts:
debian/control
diff --git a/debian/control b/debian/control
index 2641167..dcc824d 100644
--- a/debian/control
+++ b/debian/control
@@ -463,3 +463,18 @@ Description: Development files for libswscale
.
This package contains the header files and static libraries needed to
compile applications or shared objects that use libswscale.
+
+Package: libav-source
+Architecture: all
+Section: devel
+Depends:
+ ${misc:Depends}
+Description: Patched Libav sources
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
+ This package contains a tarball the source file that were used to produce
+ this package, containing all modifications that have been applied inline.
+ .
+ This package is used as build-dependency for 'libav-extra', which provides
+ the "extra" variants of libav.
diff --git a/debian/libav-source.install b/debian/libav-source.install
new file mode 100644
index 0000000..5c9844d
--- /dev/null
+++ b/debian/libav-source.install
@@ -0,0 +1 @@
+usr/src/libav-source.tar.gz
diff --git a/debian/rules b/debian/rules
index 7d0aac8..f6fcccf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -121,6 +121,9 @@ install-common: build $(DH_INSTALL_FILES)
dh_testroot
dh_prep
dh_installdirs -ptmp usr/src
+ tar czvf debian/tmp/usr/src/libav-source.tar.gz . \
+ --exclude 'debian*' --exclude .git --exclude .pc --exclude '*-stamp' \
+ --transform 's,^./,libav/,'
dh_installdirs -ptmp usr/share/doc/libav/html etc
dh_installdirs -ptmp usr/share/doc/libav-doc/html
$(foreach flavor,$(FLAVORS),$(call install_flavor,$(flavor)))
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list