diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 18 | ||||
| -rw-r--r-- | debian/libxine2-doc.docs | 1 | ||||
| -rwxr-xr-x | debian/rules | 6 |
4 files changed, 16 insertions, 16 deletions
diff --git a/debian/changelog b/debian/changelog index 63a658013..803c3f72f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,13 +5,16 @@ 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.9~hg-0) unstable; urgency=low +xine-lib (1.1.10+hg-0) unstable; urgency=low + + [ Darren Salt ] + * Hg snapshot. [ Reinhard Tartler ] * remove gs from build-dependencies * change the maintainer field to xine-devel@lists.sourceforge.net. - -- Reinhard Tartler <siretart@tauware.de> Sun, 25 Nov 2007 23:45:52 +0100 + -- Darren Salt <linux@youmustbejoking.demon.co.uk> Sun, 27 Jan 2008 01:41:45 +0000 xine-lib (1.1.5~cvs-0) unstable; urgency=low diff --git a/debian/control b/debian/control index c0e5b0f40..d3a1b1bde 100644 --- a/debian/control +++ b/debian/control @@ -4,11 +4,13 @@ Priority: optional 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, + libavcodec-dev (>= 0.cvs20070307-3) | libavcodeccvs-dev, + libavformat-dev (>= 0.cvs20070307-3) | libavformatcvs-dev, + libpostproc-dev (>= 0.cvs20070307-3) | libpostproccvs-dev, libxcb-xinerama0-dev | libxv-dev (<< 1:1.0.3), libxcb-xv0-dev | libxv-dev (<< 1:1.0.3), libxcb-xvmc0-dev | libxv-dev (<< 1:1.0.3), libxcb-shm0-dev | libxv-dev (<< 1:1.0.3), libxcb-shape0-dev | libxv-dev (<< 1:1.0.3), libxinerama-dev, libxv-dev, libxvmc-dev, libxt-dev, - libdirectfb-dev (>= 0.9.22), libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaa1-dev, libcaca-dev, libmodplug-dev, libmagick9-dev, libpng12-dev, libfreetype6-dev, @@ -16,7 +18,7 @@ Build-Depends: debhelper (>= 5.0.1), binutils (>= 2.12.90.0.9), pkg-config, libesd0-dev, libgnomevfs2-dev, zlib1g-dev, libartsc0-dev, liblircclient-dev, libjack0.100.0-dev | libjack-dev, - libdirectfb-dev, libgtk2.0-dev, + libdirectfb-dev (>= 0.9.22), libgtk2.0-dev, 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, @@ -27,7 +29,7 @@ Standards-Version: 3.7.2 Package: libxine-dev Architecture: any Section: libdevel -Depends: libxine2 (= ${Source-Version}), libc6-dev, zlib1g-dev | libz-dev, libslang2-dev | slang1-dev, libfreetype6-dev +Depends: libxine2 (= ${Source-Version}), libc6-dev, zlib1g-dev | libz-dev, libslang2-dev | slang1-dev, libfreetype6-dev, pkg-config Conflicts: xine-ui (<< 0.9.10), libxine-dev Description: the xine video player library, development packages This contains development files (headers, documentation and the like) @@ -63,11 +65,11 @@ Description: the xine video player library, development packages Package: libxine2 Architecture: any Depends: ${shlibs:Depends} -Recommends: ${shlibs:Recommends}, libxine2-doc | libxine-doc -Suggests: ${shlibs:Suggests}, libartsc0 -Conflicts: libxine2-console, libxine2-ffmpeg, libxine2-gnome, libxine2-misc-plugins, libxine2-plugins, libxine2-x -Replaces: libxine2-console, libxine2-ffmpeg, libxine2-gnome, libxine2-misc-plugins, libxine2-plugins, libxine2-x -Provides: libxine2-console, libxine2-ffmpeg, libxine2-gnome, libxine2-misc-plugins, libxine2-plugins, libxine2-x +Recommends: ${shlibs:Recommends} +Suggests: ${shlibs:Suggests}, libxine2-doc | libxine-doc +Conflicts: libxine2-all-plugins, libxine2-bin, libxine2-console, libxine2-ffmpeg, libxine2-gnome, libxine2-misc-plugins, libxine2-plugins, libxine2-x +Replaces: libxine2-all-plugins, libxine2-bin, libxine2-console, libxine2-ffmpeg, libxine2-gnome, libxine2-misc-plugins, libxine2-plugins, libxine2-x +Provides: libxine2-all-plugins, libxine2-bin, libxine2-console, libxine2-ffmpeg, libxine2-gnome, libxine2-misc-plugins, libxine2-plugins, libxine2-x Description: the xine video/media player library, binary files This is the xine media player library (libxine). . diff --git a/debian/libxine2-doc.docs b/debian/libxine2-doc.docs index a1e62bcf1..799c2c091 100644 --- a/debian/libxine2-doc.docs +++ b/debian/libxine2-doc.docs @@ -2,7 +2,6 @@ debian/tmp/usr/share/doc/libxine2/faq/* debian/tmp/usr/share/doc/libxine2/README_xxmc.html debian/tmp/usr/share/doc/libxine2/README debian/tmp/usr/share/doc/libxine2/faq.* -debian/tmp/usr/share/doc/libxine2/README.syncfb* debian/tmp/usr/share/doc/libxine2/README.opengl* debian/tmp/usr/share/doc/libxine2/README.dxr3* debian/tmp/usr/share/doc/libxine2/README.dvb* diff --git a/debian/rules b/debian/rules index 0f38fb778..76b0a6c63 100755 --- a/debian/rules +++ b/debian/rules @@ -58,17 +58,13 @@ ifeq (,$(findstring optimize,$(DEB_BUILD_OPTIONS))) DEB_BUILD_CONFIG_OPTIONS += --build=$(DEB_BUILD_GNU_TYPE) endif -# enable SyncFB video output plugin on Linux -ifeq (linux,$(filter linux,$(subst -, ,$(DEB_BUILD_GNU_TYPE)))) - DEB_BUILD_CONFIG_OPTIONS += --enable-syncfb -endif - # --mandir - remove after etch released (autoconf >= 2.59c gets it right) CONFIGURE_FLAGS := --prefix=/usr \ --with-external-libmad \ --with-external-a52dec \ --with-external-libdts \ --with-external-faad \ + --with-external-ffmpeg=soft \ --with-freetype \ --with-wavpack \ $(DEB_BUILD_CONFIG_OPTIONS) \ |