[SCM] x264/ubuntu: Revert "remove libgpac-dev from build-depends, not available in debian yet."
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Thu Oct 28 11:10:37 UTC 2010
The following commit has been merged in the ubuntu branch:
commit 941cd48a232867e7af5b0d9335752566546041db
Author: Reinhard Tartler <siretart at tauware.de>
Date: Thu Oct 28 13:07:49 2010 +0200
Revert "remove libgpac-dev from build-depends, not available in debian yet."
in Ubuntu, gpac *is* available
This reverts commit 5e166cdb1ac62c3cb8bbbbf72f1570256b741559.
Conflicts:
debian/control
diff --git a/debian/control b/debian/control
index 129ef1f..c4944ae 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends: debhelper (>= 7),
libavformat-dev (>= 4:0.5),
help2man,
yasm [i386 amd64 kfreebsd-amd64 lpia],
+ libgpac-dev,
libx11-dev,
quilt
Standards-Version: 3.9.1
--
x264 packaging
More information about the pkg-multimedia-commits
mailing list