diff options
| -rw-r--r-- | TODO | 1 | ||||
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rwxr-xr-x | debian/rules | 10 | ||||
| -rwxr-xr-x | debian/shlibdeps.sh | 19 |
6 files changed, 34 insertions, 22 deletions
@@ -26,6 +26,7 @@ required for 1.0 - esd audio output plugin - arts audio output plugin - irix audio output plugin (matthias) +- null audio plugin (or fix null video out) - input_dvd: detect errors, display useful error messages - prepare architecture for post effect plugins (michael) - input_vcd diff --git a/configure.ac b/configure.ac index 487ba2372..cd2851df7 100644 --- a/configure.ac +++ b/configure.ac @@ -13,9 +13,9 @@ AC_PREREQ(2.53) dnl Making releases: dnl XINE_SUB += 1; continue with LT_* values below dnl -XINE_MAJOR=0 -XINE_MINOR=9 -XINE_SUB=14 +XINE_MAJOR=1 +XINE_MINOR=0 +XINE_SUB=0 dnl The libtool version numbers (LT_*); Don't even think about faking this! @@ -41,7 +41,7 @@ dnl for a release tarball do "rm .cvsversion" before "make dist" if test -f .cvsversion; then XINE_PRE="cvs" else - XINE_PRE="" + XINE_PRE="-alpha0" fi AC_SUBST(XINE_MAJOR) @@ -58,8 +58,10 @@ AC_SUBST(LT_CURRENT) AC_SUBST(LT_REVISION) AC_SUBST(LT_AGE) -TAR_NAME="xine-lib-"$XINE_MAJOR.$XINE_MINOR.$XINE_SUB$XINE_PRE -SPEC_VERSION=$XINE_MAJOR.$XINE_MINOR.$XINE_SUB$XINE_PRE +#TAR_NAME="xine-lib-"$XINE_MAJOR.$XINE_MINOR.$XINE_SUB$XINE_PRE +#SPEC_VERSION=$XINE_MAJOR.$XINE_MINOR.$XINE_SUB$XINE_PRE +TAR_NAME="xine-lib-"$XINE_MAJOR$XINE_PRE +SPEC_VERSION=$XINE_MAJOR$XINE_PRE AC_SUBST(TAR_NAME) AC_SUBST(SPEC_VERSION) diff --git a/debian/changelog b/debian/changelog index a5a9e7765..934dea336 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xine-lib (1-alpha0-0) unstable; urgency=low + + * new upstream (alpha!) release + (this is not suited for the Debian archives, yet.) + * NOTE: conflicts with libxine0, because of fonts and l18n + + -- Siggi Langauf <siggi@debian.org> Sun, 3 Nov 2002 03:00:41 +0100 + xine-lib (0.9.13-1) unstable; urgency=low * new upstream release diff --git a/debian/control b/debian/control index 7cc975b5b..adbcd51f0 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.2.1 Package: libxine-dev Architecture: any Section: devel -Depends: libxine0 (= ${Source-Version}), libc6-dev, xlibs-dev, libz-dev, slang1-dev +Depends: libxine1 (= ${Source-Version}), libc6-dev, xlibs-dev, libz-dev, slang1-dev Conflicts: xine-ui (<< 0.9.10) Description: the xine video player library, development packages This contains development files (headers, documentation and the like) @@ -24,7 +24,7 @@ Description: the xine video player library, development packages The xine-ui package provides one for your convenience, so you can just start watching your VCDs ;-) -Package: libxine0 +Package: libxine1 Architecture: any Depends: ${shlibs:Depends} Recommends: ${shlibs:Recommends} diff --git a/debian/rules b/debian/rules index a7da8b6b8..6babe1941 100755 --- a/debian/rules +++ b/debian/rules @@ -102,10 +102,10 @@ binary-arch: build install # build libxine${major} package by moving files from libxine-dev # dh_movefiles --sourcedir=debian/libxine-dev -plibxine$(major) \ - usr/lib/libxine*.so.$(major) \ - usr/lib/libxine*.so.$(version) \ - usr/lib/xine/plugins/*.so \ - usr/share/xine \ + usr/lib/libxine*.so.$(major) \ + usr/lib/libxine*.so.$(version) \ + $(shell cd debian/libxine-dev; find usr/lib/xine/plugins -name \*.so) \ + usr/share/xine \ usr/share/locale # dh_installdebconf @@ -117,7 +117,7 @@ binary-arch: build install dh_strip dh_compress dh_fixperms - dh_makeshlibs -V 'libxine0 (>= 0.9.11)' + dh_makeshlibs -V 'libxine1 (>= 1-alpha0)' dh_installdeb # dh_shlibdeps chmod +x debian/shlibdeps.sh diff --git a/debian/shlibdeps.sh b/debian/shlibdeps.sh index 1e56b9256..7d6c6cbcb 100755 --- a/debian/shlibdeps.sh +++ b/debian/shlibdeps.sh @@ -8,17 +8,18 @@ installdir=debian/$1 -OPTIONAL="$installdir/usr/lib/xine/plugins/xineplug_ao_out_alsa.so - $installdir/usr/lib/xine/plugins/xineplug_ao_out_arts.so - $installdir/usr/lib/xine/plugins/xineplug_ao_out_esd.so - $installdir/usr/lib/xine/plugins/xineplug_vo_out_aa.so - $installdir/usr/lib/xine/plugins/xineplug_vo_out_syncfb.so +ver=`cd $installdir/usr/lib/xine/plugins; ls [0-9]*` +OPTIONAL="$installdir/usr/lib/xine/plugins/$ver/xineplug_ao_out_alsa.so + $installdir/usr/lib/xine/plugins/$ver/xineplug_ao_out_arts.so + $installdir/usr/lib/xine/plugins/$ver/xineplug_ao_out_esd.so + $installdir/usr/lib/xine/plugins/$ver/xineplug_vo_out_aa.so + $installdir/usr/lib/xine/plugins/$ver/xineplug_vo_out_syncfb.so " -RECOMMENDED="$installdir/usr/lib/xine/plugins/xineplug_decode_vorbis.so - $installdir/usr/lib/xine/plugins/xineplug_ao_out_oss.so - $installdir/usr/lib/xine/plugins/xineplug_vo_out_xv.so - $installdir/usr/lib/xine/plugins/xineplug_dmx_ogg.so" +RECOMMENDED="$installdir/usr/lib/xine/plugins/$ver/xineplug_decode_vorbis.so + $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" #start with all executables and shared objects REQUIRED=`find $installdir -type f \( -name \*.so -o -perm +111 \)` |