hopefully last release preparations for 1.0xine-1_0-release1.0

CVS patchset: 7302
CVS date: 2004/12/25 21:10:59

5 files changed, 34 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 4217bc87b..feb5b6d79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-xine-lib
+xine-lib (1.0)
   * unbreak DXR3 plugin
   * fix crash in the AIFF demuxer on oversized chunks
   * fix crash in the sputext decoder when subtitles have too many lines
@@ -11,6 +11,7 @@ xine-lib
     fixed playback of some strangely authored DVDs
   * fixed problem with first subtitle not showing when using separate subtitle files
   * fixed crash related to relative HTTP redirect URLs (implemented canonicalisation)
+  * linking libXv dynamically, fixes breakage of Xv plugin
 
 xine-lib (1-rc8)
   * Multiple security vulnerabilities fixed on PNM and Real RTSP clients
diff --git a/configure.ac b/configure.ac
index 972bfeb5f..349da779f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -492,8 +492,8 @@ dnl ----------------------------------------------
 dnl Check for Xv and XvMC support (iconv is also tested here?)
 dnl ----------------------------------------------
 
-dnl static linking is preferred!
-dnl but only dynamic linking is possible when using libtool < 1.4.0
+dnl With recent XFree86 or Xorg, dynamic linking is preferred!
+dnl Only dynamic linking is possible when using libtool < 1.4.0
 
 dnl ----------------------------------------------
 dnl SECTION: Check for Xv and XvMC support (iconv is also tested here?)
@@ -502,9 +502,9 @@ AC_ARG_WITH(xv-path, AC_HELP_STRING([--with-xv-path=path], [where libXv is insta
             xv_path="$withval",)
 
 AC_ARG_ENABLE(shared-xv,
-        AC_HELP_STRING([--enable-shared-xv],[Enable this to force linking against libXv.so]),
-        xv_prefer_shared="yes",
-        xv_prefer_shared="no")
+        AC_HELP_STRING([--enable-static-xv],[Enable this to force linking against libXv.a]),
+        xv_prefer_shared="no",
+        xv_prefer_shared="yes")
 
 if test x"$no_x" != "xyes"; then
 
diff --git a/debian/changelog b/debian/changelog
index 02089de59..7c38b97db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+xine-lib (1.0-1) unstable; urgency=low
+
+  * new upstream release
+    * links libXv dynamically (closes: #287186)
+  * updated build dependancies:
+    * added libcaca (colored ASCII art) support
+    * added theora support
+    * added libsmbclient based SMB input plugin in addition to the gnomevfs one
+    * added libmodplug based support for various tracker formats
+    * added MNG support via libmng
+
+ -- Siggi Langauf <siggi@flake.langauf.de>  Sat, 25 Dec 2004 21:44:26 +0100
+
+xine-lib (1-rc8-1) unstable; urgency=high
+
+  * new upstream release (closes: #286030)
+    * fixes PNM and RTSP related security vulnerabilities (closes: #286077)
+    * fixes DVB playback for fullfeatured cards (possibly closes: #281873)
+  * added patch to fix aiff vulnerability (CAN-2004-1300, closes: #285899)
+
+ -- Siggi Langauf <siggi@debian.org>  Wed, 22 Dec 2004 11:31:09 +0100
+
 xine-lib (1-rc7-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 0dd8bbd2f..54727b618 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Siggi Langauf <siggi@debian.org>
 Uploaders: Philipp Matthias Hahn <pmhahn@debian.org>
-Build-Depends: debhelper (>= 4.0.4), aalib1-dev (>= 1.4p5-2), xlibs-dev (>> 4.1), libesd0-dev, zlib1g-dev | libz-dev, libartsc0-dev (>>1.1.0), liblircclient-dev, libogg-dev, libvorbis-dev, libasound2-dev, libflac-dev (>>1.1.0), libgnomevfs2-dev, libspeex-dev, libpng12-dev | libpng-dev, libfreetype6-dev
+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-Conflicts: libdvdnav-dev
 Standards-Version: 3.5.9
 
diff --git a/debian/shlibdeps.sh b/debian/shlibdeps.sh
index f4e9d0513..ef5fd00a4 100755
--- a/debian/shlibdeps.sh
+++ b/debian/shlibdeps.sh
@@ -18,12 +18,16 @@ OPTIONAL="$installdir/usr/lib/xine/plugins/$ver/xineplug_ao_out_alsa.so
 	  $installdir/usr/lib/xine/plugins/$ver/xineplug_vo_out_sdl.so
 	  $installdir/usr/lib/xine/plugins/$ver/xineplug_flac.so
 	  $installdir/usr/lib/xine/plugins/$ver/xineplug_inp_gnome_vfs.so
+          $installdir/usr/lib/xine/plugins/$ver/xineplug_vo_out_caca.so
+          $installdir/usr/lib/xine/plugins/$ver/xineplug_inp_smb.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
+             $installdir/usr/lib/xine/plugins/$ver/xineplug_decode_theora.so
+             $installdir/usr/lib/xine/plugins/$ver/xineplug_dmx_mng.so
 "
 
 #start with all executables and shared objects