6 files changed, 48 insertions, 33 deletions

diff --git a/debian/changelog b/debian/changelog
index 695298fa4..67d3e0a8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,31 @@
-xine-lib (1.1.0-0) unstable; urgency=high
-
-  * Add debian/watch file for uscan.
+xine-lib (1.1.1-0) unstable; urgency=low
+
+  * Darren Salt:
+    - Add debian/watch file for uscan.
+    - Convert debian/copyright to UTF-8.
+    - Add build-dep on libvcdinfo-dev.
+    - Bump standards version to 3.6.2 (no changes *yet* - CHECK THIS)
+    - Make "post-Sarge"-tagged changes to debian/rules and strip debian/tmp/
+      from debian/*.install.
+    - Remove *.gmo on clean (Just In Case).
+    - Do a little preparation for a possible -dbg package.
   * 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)
+             #327203, #328168, #328184, #328265, #328454, #332919, #333692,
+	     #337996)
+
+ -- Xxx Xxx <xxx@xxx.xx>  Tue, 06 Dec 2005 19:54:07 +0000
+
+xine-lib (1.0.1-1.4) unstable; urgency=high
+
+  * Non-maintainer upload for RC-(security-)bugs.
+  * Apply patch from Ulf Harnhammar fixing a format string vulnerability
+    in CDDB response parsing (CVE-2005-2967, Closes: #332919, #333682).
+  * Fix bashism in debian/rules causing a FTBFS (Closes: #337996).
 
- -- Xxx Xxx <xxx@xxx.xx>  Sat, 15 Oct 2005 19:46:13 +0100
+ -- Thijs Kinkhorst <kink@squirrelmail.org>  Wed, 23 Nov 2005 09:42:39 +0100
 
 xine-lib (1.0.1-1.3) unstable; urgency=low
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index a69137d54..1ef4d2649 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Section: libs
 Priority: optional
 Maintainer: Siggi Langauf <siggi@debian.org>
 Uploaders: Philipp Matthias Hahn <pmhahn@debian.org>
-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-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), libvcdinfo-dev
 Build-Conflicts: libdvdnav-dev
-Standards-Version: 3.5.9
+Standards-Version: 3.6.2
 
 Package: libxine-dev
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 10a19c4b3..f98753e0f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,7 @@ This package is maintained by Siggi Langauf <siggi@debian.org>.
 
 Current versions can be downloaded from http://xine.sf.net
 
-Upstream Authors: Günter Bartsch and lots of others (see AUTHORS file)
+Upstream Authors: Günter Bartsch and lots of others (see AUTHORS file)
 
 
 Copyright (C) 2000,2001 the xine project
diff --git a/debian/libxine-dev.install b/debian/libxine-dev.install
index 312684d8d..6fadf7dc5 100644
--- a/debian/libxine-dev.install
+++ b/debian/libxine-dev.install
@@ -1,13 +1,10 @@
-debian/tmp/usr/bin/xine-config
-debian/tmp/usr/include
-debian/tmp/usr/lib/libxine.la
-debian/tmp/usr/lib/libxine*.so
-debian/tmp/usr/lib/pkgconfig/libxine.pc
-debian/tmp/usr/lib/xine/plugins/*/*.la
-debian/tmp/usr/lib/xine/plugins/*/post/*.la
-debian/tmp/usr/lib/xine/plugins/*/vidix/*.la
-debian/tmp/usr/share/aclocal/xine.m4
-debian/tmp/usr/share/man/man1/xine-config.1
-debian/tmp/usr/share/doc/xine/README.freebsd
-debian/tmp/usr/share/doc/xine/README.irix
-debian/tmp/usr/share/doc/xine/README.solaris
+usr/bin/xine-config
+usr/include
+usr/lib/libxine.la
+usr/lib/libxine*.so
+usr/lib/pkgconfig/libxine.pc
+usr/lib/xine/plugins/*/*.la
+usr/lib/xine/plugins/*/post/*.la
+usr/lib/xine/plugins/*/vidix/*.la
+usr/share/aclocal/xine.m4
+usr/share/man/man1/xine-config.1
diff --git a/debian/libxine1.install b/debian/libxine1.install
index 4e6ae6628..bd4031a57 100644
--- a/debian/libxine1.install
+++ b/debian/libxine1.install
@@ -1,6 +1,7 @@
-debian/tmp/usr/lib/libxine*.so.*
-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/locale
-debian/tmp/usr/share/xine
+usr/lib/libxine*.so.*
+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/man/man5/xine.5
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 006517c56..d43819a00 100755
--- a/debian/rules
+++ b/debian/rules
@@ -69,7 +69,7 @@ build-stamp:
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
+	rm -f build-stamp configure-stamp po/*.gmo
 	test -f Makefile && $(MAKE) distclean || true
 	dh_clean
 
@@ -91,17 +91,15 @@ binary-arch: build install
 	dh_testroot
 	#
 	# build libxine${major} package by moving files from libxine-dev
-	#TODO (when sarge is stable):
-	#use this dh_install line, and remove debian/tmp/ from *.install!
-	#dh_install --autodest --sourcedir=debian/tmp --list-missing
-	dh_install --autodest
+	dh_install --autodest --sourcedir=debian/tmp --list-missing
 	dh_installdocs
 	#ugly hack, documentation should never have been in /u/s/d/xine/...
-	mv debian/tmp/usr/share/doc/xine/{faq,README*} \
+	mv debian/tmp/usr/share/doc/xine/faq \
+	   debian/tmp/usr/share/doc/xine/README* \
 	   debian/libxine1/usr/share/doc/libxine1
 	dh_installchangelogs -k ChangeLog
 	dh_link
-	dh_strip
+	dh_strip -k
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs -V 'libxine1 (>= 1.0.1)'