--- xine-lib-1.0.1.orig/src/input/input_cdda.c
+++ xine-lib-1.0.1/src/input/input_cdda.c
@@ -1473,7 +1473,7 @@
     return;
   }
   else {
-    fprintf(fd, filecontent);
+    fprintf(fd, "%s", filecontent);
     fclose(fd);
   }
   
--- xine-lib-1.0.1.orig/debian/control
+++ xine-lib-1.0.1/debian/control
@@ -3,14 +3,14 @@
 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), 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), 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, 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, slang1-dev | slang1-utf8-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)
--- xine-lib-1.0.1.orig/debian/rules
+++ xine-lib-1.0.1/debian/rules
@@ -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
--- xine-lib-1.0.1.orig/debian/changelog
+++ xine-lib-1.0.1/debian/changelog
@@ -1,9 +1,23 @@
-xine-lib (1.0.1-0) unstable; urgency=high
+xine-lib (1.0.1-1sarge1) stable-security; urgency=high
 
-  * new upstream release
-    * fixes MMST and RTSP vulnerabilities (CAN-2005-1195, closes #305343)
+  * Non-maintainer upload by the Security Team
+  * Applied patch by Ulf Härnhammar to fix a format string vulnerability
+    [src/input/input_cdda.c, CAN-2005-2967]
+
+ -- Martin Schulze <joey@infodrom.org>  Tue,  4 Oct 2005 19:30:12 +0200
+
+xine-lib (1.0.1-1) unstable; urgency=high
 
- -- Siggi Langauf <siggi@debian.org>  Mon, 25 Apr 2005 19:05:02 +0200
+  * new upstream release
+    * fixes MMST and RTSP vulnerabilities (CAN-2005-1195, closes: #305343)
+    * presumably fixes Ogg/Vorbis/Theora audio sync (closes: #301901)
+    * fixes typo in xine-check subsystem (closes: #292341)
+  * build-depends on libsdl1.2 (closes: #297435)
+  * allow installing libxine1-dev with slang1-utf8-dev (closes: #304865)
+  * moved documentation to policy compliant directories (closes: #303463)
+  * made Vorbis and Theora hard dependancies (workaround closes: #288331)
+  
+ -- Siggi Langauf <siggi@localhost.localdomain>  Wed, 27 Apr 2005 12:41:46 +0200
 
 xine-lib (1.0-1) unstable; urgency=high
 
--- xine-lib-1.0.1.orig/debian/shlibdeps.sh
+++ xine-lib-1.0.1/debian/shlibdeps.sh
@@ -22,14 +22,18 @@
           $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 \)`
 
--- xine-lib-1.0.1.orig/debian/libxine1.install
+++ xine-lib-1.0.1/debian/libxine1.install
@@ -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
