summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2006-02-28 19:03:28 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2006-02-28 19:03:28 +0000
commit5a5b0d9a50a748dbd0f4fcf3f6ee30b44ab4daff (patch)
tree06e38aaa135bef2daa7ce65c6a9e9621930e8576
parent16e3dceff4442fa4171b0fd0d25a4f889df1858b (diff)
downloadxine-lib-5a5b0d9a50a748dbd0f4fcf3f6ee30b44ab4daff.tar.gz
xine-lib-5a5b0d9a50a748dbd0f4fcf3f6ee30b44ab4daff.tar.bz2
Add build-dep alternatives for sarge backports.
CVS patchset: 7912 CVS date: 2006/02/28 19:03:28
-rw-r--r--debian/changelog1
-rw-r--r--debian/control2
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 598bab961..5e050e67d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xine-lib (1.1.1-2) unstable; urgency=low
[ Darren Salt ]
* Tidy up the FAQ list and README installation to quieten dh_install.
* Re-update the FSF address in debian/copyright. It got lost in 1.1.1-1.
+ * Add build-dep alternatives for those of us who do backports to sarge.
* Tidy up the package descriptions a little.
-- Reinhard Tartler <siretart@tauware.de> Sat, 25 Feb 2006 12:26:10 +0100
diff --git a/debian/control b/debian/control
index f593b25f7..28ceea059 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
Priority: optional
Maintainer: Siggi Langauf <siggi@debian.org>
Uploaders: Philipp Matthias Hahn <pmhahn@debian.org>, Reinhard Tartler <siretart@tauware.de>
-Build-Depends: debhelper (>= 4.0.4), libaa1-dev | aalib1-dev (>= 1.4p5-2), libcaca-dev, libxinerama-dev, libxv-dev, libesd0-dev, zlib1g-dev | libz-dev, libartsc0-dev (>>1.1.0), liblircclient-dev, libogg-dev, libvorbis-dev, libtheora-dev, libasound2-dev, libflac-dev (>>1.1.0), libmodplug-dev, libgnomevfs2-dev, libsmbclient-dev, libspeex-dev, libmng-dev, libpng12-dev | libpng-dev, libfreetype6-dev, libsdl1.2-dev (>=1.1.5), libvcdinfo-dev, libmad0-dev, libxvmc-dev
+Build-Depends: debhelper (>= 4.0.4), libaa1-dev | aalib1-dev (>= 1.4p5-2), libcaca-dev, libxinerama-dev | xlibs-static-dev (<< 6.8.0), libxv-dev | xlibs-static-dev (<< 6.8.0), libesd0-dev, zlib1g-dev | libz-dev, libartsc0-dev (>>1.1.0), liblircclient-dev, libogg-dev, libvorbis-dev, libtheora-dev, libasound2-dev, libflac-dev (>>1.1.0), libmodplug-dev, libgnomevfs2-dev, libsmbclient-dev, libspeex-dev, libmng-dev, libpng12-dev | libpng-dev, libfreetype6-dev, libsdl1.2-dev (>=1.1.5), libvcdinfo-dev, libmad0-dev, libxvmc-dev | xlibs-dev (<< 6.8.0)
Build-Conflicts: libdvdnav-dev
Standards-Version: 3.6.2