Menu
▾
▴
[xine-cvs] CVS: xine-lib/debian changelog,1.74,1.75 control,1.33,1.34 libxine1.install,1.5,1.6 rules,1.29,1.30 shlibdeps.sh,1.9,1.10
|
From: Darren S. <ds...@us...> - 2005-10-30 22:07:04
|
Update of /cvsroot/xine/xine-lib/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32683/debian Modified Files: changelog control libxine1.install rules shlibdeps.sh Log Message: Import packaging diffs from the current official Debian package. Index: changelog =================================================================== RCS file: /cvsroot/xine/xine-lib/debian/changelog,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- changelog 3 Jun 2005 11:30:26 -0000 1.74 +++ changelog 30 Oct 2005 22:06:55 -0000 1.75 @@ -1,8 +1,81 @@ -xine-lib (1.0.1-2) unstable; urgency=high +xine-lib (1.1.0-0) unstable; urgency=high - * add debian/watch file for uscan. + * Add debian/watch file for uscan. + * Acknowledge NMUs. + Backports and gcc 4.0 fixes dropped since they're already in this version. + (Closes: #288189, #315986, #318838, #320317, #323276, #325960, #326935, + #327203, #328168, #328184, #328265, #328454) + + -- Xxx Xxx <xxx@xxx.xx> Sat, 15 Oct 2005 19:46:13 +0100 + +xine-lib (1.0.1-1.3) unstable; urgency=low + * Non-maintainer upload. + + * Backport patch from 1.0.2 that fixes hard hang-ups when a plugin listed in + ~/.xine/catalog.cache becomes unloadable (closes: #328454). Plugins can + become unloadable if DT_NEEDED libraries get uninstalled, which is + possible because the package lists many of these libraries in the + Recommends or Suggests fields only. With this fix, amarok should not + freeze with the XINE engine anymore (closes: #327203), and totem either + (closes: #328265). + + Patch included in debian/patches/fix-hangs-at-load-time.diff, but since + there's no patch applying code in debian/rules, it's present in the + .diff.gz as well. + + * Fix the script that invokes dpkg-shlibdeps to split dependencies among + Depends, Recommends, and Suggests: it generated empty fields if one of the + expected plugins was not actually available. (Closes: #328184) + + This means that now the package now suggests libgnomevfs2-0 (closes: + #326935) and libflac7 (closes: #328168). Submitters may wish to reopen if + they want a discussion with the maintainer about the need of these being + strong Depends instead of Suggests. - -- Xxx Xxx <xxx@xxx.xx> Fri, 03 Jun 2005 00:00:00 +0000 + * xineplug_flac.so now links against libflac7 instead of libflac6, which + closes: #325960 (the FLAC transition bug). + + -- Adeodato Simó <as...@al...> Thu, 15 Sep 2005 14:54:50 +0200 + +xine-lib (1.0.1-1.2) unstable; urgency=low + + * NMU. + * The -dev package should depends on libslang2-dev not + slang1-dev(Closes: #323276) + + -- Christian Marillat <mar...@de...> Tue, 16 Aug 2005 09:13:42 +0200 + +xine-lib (1.0.1-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Medium-urgency upload for RC bugfixes. + * Multiple fixes for compatibility with gcc 4.0 strictness + (closes: #288189, #318838) + * This rebuild also gets rid of the dependency on libslang1 + (closes: #315986); it only trades it for libslang2 unfortunately, + since libcaca is a static lib. + * Build-Depend on libaa1-dev instead of the removed aalib1-dev + (closes: #320317). + * Build-Depend on libxinerama-dev instead of on xlibs-static-dev, + which no longer provides this lib; it should be rolled back into + xlibs-dev as a dependency eventually, but build-depending on it + directly is sensible anyway. + * Disentangle xine from libraries it doesn't actually use directly, so + that the dependency tree is less brittle and requires fewer rebuilds + in the future (e.g., it currently has a dependency on libstdc++5 + that it shouldn't need at all); this is doubly important since some + plugins aren't mentioned at all in the dependencies, and so can be + left unusable by library changes: + - relibtoolize the package to use the Debian version of libtool, + with support for pruning indirect dependencies from the linker + commandline + - as part of the above, add AM_MAINTAINER_MODE to configure.ac to + avoid any need for autotools build-dependencies + - hard-code -lmodplug, -lartsc, and -lgnomevfs-2, because pkg-config, + artsc-config, etc. spit out lib dependencies that are spurious on + GNU/* systems. + + -- Steve Langasek <vo...@de...> Wed, 3 Aug 2005 04:21:06 -0700 xine-lib (1.0.1-1) unstable; urgency=high Index: control =================================================================== RCS file: /cvsroot/xine/xine-lib/debian/control,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- control 25 Dec 2004 21:11:00 -0000 1.33 +++ control 30 Oct 2005 22:06:55 -0000 1.34 @@ -3,14 +3,14 @@ Priority: optional Maintainer: Siggi Langauf <si...@de...> Uploaders: Philipp Matthias Hahn <pm...@de...> -Build-Depends: debhelper (>= 4.0.4), aalib1-dev (>= 1.4p5-2), libcaca-dev, xlibs-dev (>> 4.1), xlibs-static-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 +Build-Depends: debhelper (>= 4.0.4), libaa1-dev | aalib1-dev (>= 1.4p5-2), libcaca-dev, xlibs-dev (>> 4.1), libxinerama-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) Build-Conflicts: libdvdnav-dev Standards-Version: 3.5.9 Package: libxine-dev Architecture: any Section: libdevel -Depends: libxine1 (= ${Source-Version}), libc6-dev, xlibs-dev, zlib1g-dev | libz-dev, slang1-dev, libfreetype6-dev +Depends: libxine1 (= ${Source-Version}), libc6-dev, xlibs-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) Index: libxine1.install =================================================================== RCS file: /cvsroot/xine/xine-lib/debian/libxine1.install,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libxine1.install 15 May 2004 09:16:52 -0000 1.5 +++ libxine1.install 30 Oct 2005 22:06:55 -0000 1.6 @@ -2,12 +2,5 @@ debian/tmp/usr/lib/xine/plugins/*/post/*.so debian/tmp/usr/lib/xine/plugins/*/*.so debian/tmp/usr/lib/xine/plugins/*/vidix/*.so -debian/tmp/usr/share/doc/xine/faq -debian/tmp/usr/share/doc/xine/README -debian/tmp/usr/share/doc/xine/README.dvb -debian/tmp/usr/share/doc/xine/README.dxr3 -debian/tmp/usr/share/doc/xine/README.network_dvd -debian/tmp/usr/share/doc/xine/README.opengl -debian/tmp/usr/share/doc/xine/README.syncfb debian/tmp/usr/share/locale debian/tmp/usr/share/xine Index: rules =================================================================== RCS file: /cvsroot/xine/xine-lib/debian/rules,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- rules 28 Apr 2005 19:31:33 -0000 1.29 +++ rules 30 Oct 2005 22:06:55 -0000 1.30 @@ -96,12 +96,15 @@ #dh_install --autodest --sourcedir=debian/tmp --list-missing dh_install --autodest dh_installdocs + #ugly hack, documentation should never have been in /u/s/d/xine/... + mv debian/tmp/usr/share/doc/xine/{faq,README*} \ + debian/libxine1/usr/share/doc/libxine1 dh_installchangelogs -k ChangeLog dh_link dh_strip dh_compress dh_fixperms - dh_makeshlibs -V 'libxine1 (>= 1-rc3a)' + dh_makeshlibs -V 'libxine1 (>= 1.0.1)' dh_installdeb # dh_shlibdeps chmod +x debian/shlibdeps.sh Index: shlibdeps.sh =================================================================== RCS file: /cvsroot/xine/xine-lib/debian/shlibdeps.sh,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- shlibdeps.sh 25 Dec 2004 21:11:00 -0000 1.9 +++ shlibdeps.sh 30 Oct 2005 22:06:55 -0000 1.10 @@ -22,14 +22,17 @@ $installdir/usr/lib/xine/plugins/$ver/xineplug_inp_smb.so " -RECOMMENDED="$installdir/usr/lib/xine/plugins/$ver/xineplug_decode_vorbis.so +RECOMMENDED=" $installdir/usr/lib/xine/plugins/$ver/xineplug_ao_out_oss.so $installdir/usr/lib/xine/plugins/$ver/xineplug_vo_out_xv.so $installdir/usr/lib/xine/plugins/$ver/xineplug_dmx_ogg.so - $installdir/usr/lib/xine/plugins/$ver/xineplug_decode_theora.so $installdir/usr/lib/xine/plugins/$ver/xineplug_dmx_mng.so " +#these two do interdepend, so make them required for now: +# $installdir/usr/lib/xine/plugins/$ver/xineplug_decode_vorbis.so +# $installdir/usr/lib/xine/plugins/$ver/xineplug_decode_theora.so + #start with all executables and shared objects REQUIRED=`find $installdir -type f \( -name \*.so -o -perm +111 \)` @@ -44,13 +47,13 @@ for file in $RECOMMENDED; do if test ! -f "$file"; then echo "WARNING: non-existing file \"$file\" in RECOMMENDED list" - RECOMMENDED=`echo "$var" | grep -v $file` + RECOMMENDED=`echo "$RECOMMENDED" | grep -v $file` fi done for file in $OPTIONAL; do if test ! -f "$file"; then echo "WARNING: non-existing file \"$file\" in OPTIONAL list" - OPTIONAL=`echo "$var" | grep -v $file` + OPTIONAL=`echo "$OPTIONAL" | grep -v $file` fi done |