Woody compatibility for Graham Brooks. *sigh*

CVS patchset: 6074
CVS date: 2004/01/27 19:40:31

3 files changed, 30 insertions, 29 deletions

diff --git a/debian/libxine-dev.install b/debian/libxine-dev.install
index 34b7670eb..312684d8d 100644
--- a/debian/libxine-dev.install
+++ b/debian/libxine-dev.install
@@ -1,13 +1,13 @@
-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
-usr/share/doc/xine/README.freebsd
-usr/share/doc/xine/README.irix
-usr/share/doc/xine/README.solaris
+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
diff --git a/debian/libxine1.install b/debian/libxine1.install
index 1324be156..3f58ef48d 100644
--- a/debian/libxine1.install
+++ b/debian/libxine1.install
@@ -1,14 +1,14 @@
-usr/lib/libxine*.so.*
-usr/lib/xine/plugins/*/post/*.so
-usr/lib/xine/plugins/*/*.so
-usr/lib/xine/plugins/*/vidix/*.so
-usr/share/doc/xine/faq
-usr/share/doc/xine/README
-usr/share/doc/xine/README.config_en
-usr/share/doc/xine/README.dvb
-usr/share/doc/xine/README.dxr3
-usr/share/doc/xine/README.network_dvd
-usr/share/doc/xine/README.opengl
-usr/share/doc/xine/README.syncfb
-usr/share/locale
-usr/share/xine
+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/doc/xine/faq
+debian/tmp/usr/share/doc/xine/README
+debian/tmp/usr/share/doc/xine/README.config_en
+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
diff --git a/debian/rules b/debian/rules
index ec9090f75..7fae3ae20 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,9 +91,10 @@ 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 --sourcedir=debian/tmp
+	dh_install --autodest
 	dh_installdocs
 	dh_installchangelogs -k ChangeLog
 	dh_link