diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-12-03 23:52:57 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-12-03 23:52:57 +0000 |
| commit | 048e921c00ddd8acbb003d24692355638ef739d4 (patch) | |
| tree | 8d3700e6b6537b48327d8e83cb4178a56f0bd8e8 /debian | |
| parent | b16de9c5e59ce99cba75f51cde8f2c441d36e55b (diff) | |
| parent | 0aa00fb217357cee4ef1008677e1247bb24eb42c (diff) | |
| download | xine-lib-048e921c00ddd8acbb003d24692355638ef739d4.tar.gz xine-lib-048e921c00ddd8acbb003d24692355638ef739d4.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/control | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index a12d9233a..63a658013 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,11 +5,13 @@ xine-lib-1.2 (1.2.0~hg-0) experimental; urgency=low -- Darren Salt <linux@youmustbejoking.demon.co.uk> Tue, 17 Apr 2007 16:50:37 +0100 -xine-lib (1.1.6~hg-0) unstable; urgency=low +xine-lib (1.1.9~hg-0) unstable; urgency=low - * Hg snapshot. + [ Reinhard Tartler ] + * remove gs from build-dependencies + * change the maintainer field to xine-devel@lists.sourceforge.net. - -- Darren Salt <linux@youmustbejoking.demon.co.uk> Mon, 16 Apr 2007 22:00:07 +0100 + -- Reinhard Tartler <siretart@tauware.de> Sun, 25 Nov 2007 23:45:52 +0100 xine-lib (1.1.5~cvs-0) unstable; urgency=low diff --git a/debian/control b/debian/control index 9486b110b..4bf8b3823 100644 --- a/debian/control +++ b/debian/control @@ -1,8 +1,7 @@ Source: xine-lib-1.2 Section: libs Priority: optional -Maintainer: Darren Salt <linux@youmustbejoking.demon.co.uk> -Uploaders: Reinhard Tartler <siretart@tauware.de> +Maintainer: xine Developers <xine-devel@lists.sourceforge.net> Build-Depends: debhelper (>= 5.0.1), binutils (>= 2.12.90.0.9), pkg-config, automake1.9, autoconf, libtool, libxcb-xinerama0-dev | libxv-dev (<< 1:1.0.3), libxcb-xv0-dev | libxv-dev (<< 1:1.0.3), @@ -21,7 +20,7 @@ Build-Depends: debhelper (>= 5.0.1), binutils (>= 2.12.90.0.9), pkg-config, libflac-dev, libpulse-dev, libsdl1.2-dev, libwavpack-dev, libsmbclient-dev, libspeex-dev, libmng-dev, libmad0-dev, libmpcdec-dev, libcdio-dev (>= 0.76-1), libvcdinfo-dev, - w3m, gs, xmlto, librsvg2-bin + w3m, xmlto, librsvg2-bin Build-Conflicts: libdvdnav-dev Standards-Version: 3.7.2 |