diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 13 | ||||
| -rw-r--r-- | debian/control | 21 | ||||
| -rw-r--r-- | debian/libxine2.install (renamed from debian/libxine1.install) | 10 | ||||
| -rw-r--r-- | debian/reportbug.presubj | 4 | ||||
| -rwxr-xr-x | debian/rules | 5 |
5 files changed, 33 insertions, 20 deletions
diff --git a/debian/changelog b/debian/changelog index e3fcde9a3..640044a8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +xine-lib (1.2.0~hg-0) unstable; urgency=low + + * Hg snapshot. + * Adjust for libxine2. + + -- 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 + + * Hg snapshot. + + -- Darren Salt <linux@youmustbejoking.demon.co.uk> Mon, 16 Apr 2007 22:00:07 +0100 + xine-lib (1.1.5~cvs-0) unstable; urgency=low * CVS snapshot. diff --git a/debian/control b/debian/control index 6a72f689d..fc7bf047c 100644 --- a/debian/control +++ b/debian/control @@ -3,20 +3,21 @@ 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), binutils (>= 2.12.90.0.9), pkg-config, +Build-Depends: debhelper (>= 5.0.1), binutils (>= 2.12.90.0.9), pkg-config, automake1.9, autoconf, libtool, 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 (>= 0.99.beta4-1), libmodplug-dev, + libaa1-dev, libcaca-dev, libmodplug-dev, libmagick9-dev, libpng12-dev, libfreetype6-dev, libogg-dev, libvorbis-dev, libtheora-dev, libesd0-dev, libgnomevfs2-dev, - zlib1g-dev, libartsc0-dev (>>1.1.0), - liblircclient-dev, - libflac-dev (>>1.1.0), libpulse-dev, libsdl1.2-dev (>=1.2.11), + zlib1g-dev, libartsc0-dev, + liblircclient-dev, libjack0.100.0-dev, + libdirectfb-dev, libgtk2.0-dev, + libflac-dev, libpulse-dev, libsdl1.2-dev, libsmbclient-dev, libspeex-dev, libmng-dev, - libmad0-dev, libcdio-dev (>= 0.76-1), + libmad0-dev, libmpcdec-dev, libcdio-dev (>= 0.76-1), w3m, transfig, gs, sgmltools-lite Build-Conflicts: libdvdnav-dev, libvcdinfo-dev Standards-Version: 3.7.2 @@ -24,7 +25,7 @@ Standards-Version: 3.7.2 Package: libxine-dev Architecture: any Section: libdevel -Depends: libxine1 (= ${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 Conflicts: xine-ui (<< 0.9.10) Description: the xine video player library, development packages This contains development files (headers, documentation and the like) @@ -41,7 +42,7 @@ Description: the xine video player library, development packages The xine-ui and gxine packages each provide one for your convenience, so you can just start watching your VCDs ;-) -Package: libxine1 +Package: libxine2 Architecture: any Depends: ${shlibs:Depends} Recommends: ${shlibs:Recommends} @@ -60,10 +61,10 @@ Description: the xine video/media player library, binary files The xine-ui and gxine packages each provide one for your convenience, so you can just start watching your VCDs ;-) -Package: libxine1-dbg +Package: libxine2-dbg Priority: extra Architecture: any -Depends: libxine1 (= ${Source-Version}) +Depends: libxine2 (= ${Source-Version}) Description: the xine video/media player library, debug data This is the xine media player library (libxine). . diff --git a/debian/libxine1.install b/debian/libxine2.install index 1efbabbea..42f7937c2 100644 --- a/debian/libxine1.install +++ b/debian/libxine2.install @@ -3,9 +3,9 @@ usr/lib/xine/plugins/*/post/*.so usr/lib/xine/plugins/*/*.so usr/lib/xine/plugins/*/vidix/*.so usr/share/locale -usr/share/xine +usr/share/xine-lib usr/share/man/man5/xine.5 -usr/share/doc/libxine1/faq/* -usr/share/doc/libxine1/README* -usr/share/doc/libxine1/hackersguide/* -usr/share/bug/libxine1/presubj +usr/share/doc/libxine2/faq/* +usr/share/doc/libxine2/README* +usr/share/doc/libxine2/hackersguide/* +usr/share/bug/libxine2/presubj diff --git a/debian/reportbug.presubj b/debian/reportbug.presubj index 229cd9d74..847ff0bad 100644 --- a/debian/reportbug.presubj +++ b/debian/reportbug.presubj @@ -21,9 +21,9 @@ with xine-ui, then file the bug against gxine) Report bugs for xine crashes ============================ -If you report a bug that applications linked against libxine1 +If you report a bug that applications linked against libxine2 (xine-ui, gxine, amarok, totem, etc) segfault, please install the -packages 'xine-ui' and 'libxine1-dbg', and try to reproduce it with +packages 'xine-ui' and 'libxine2-dbg', and try to reproduce it with this command: > ulimit -c unlimited ; /usr/bin/xine --bug-report <mrl> diff --git a/debian/rules b/debian/rules index 8e4ca67fe..6ff7d17f0 100755 --- a/debian/rules +++ b/debian/rules @@ -64,7 +64,6 @@ CONFIGURE_FLAGS := --prefix=/usr \ --with-external-libmad \ --with-external-a52dec \ --with-external-libdts \ - --disable-cacatest \ $(DEB_BUILD_CONFIG_OPTIONS) \ CFLAGS="$(CFLAGS)" @@ -129,10 +128,10 @@ binary-arch: build install dh_installdocs dh_installchangelogs -k ChangeLog dh_link - dh_strip --dbg-package=libxine1 + dh_strip --dbg-package=libxine2 dh_compress dh_fixperms - dh_makeshlibs -V 'libxine1 (>= 1.1.2-5)' + dh_makeshlibs -V 'libxine2 (>= 1.2.0~)' dh_installdeb chmod +x debian/shlibdeps.sh debian/shlibdeps.sh libxine${major} |