[Mplayer-dev-eng] [patch] Debian cleanup, part 2

[André Dahlqvist]

Below is a patch that fixes some things not yet fixed in the previous
patch and one or two things I messed up. I now list the docs we are to
install in debian/docs and run dh_installdocs on those. That's the
easiest way to get around installing CVS stuff and other stuff in DOCS
we don't want installed.

Comments?

diff -urN debian.old/docs debian/docs
--- debian.old/docs	Thu Jan  1 01:00:00 1970
+++ debian/docs	Thu Aug 23 16:57:59 2001
@@ -0,0 +1,84 @@
+DOCS/MAINTAINERS
+DOCS/BUGS
+DOCS/German
+DOCS/German/BUGREPORTS
+DOCS/German/CDROM
+DOCS/German/CODECS
+DOCS/German/DEBIAN
+DOCS/Requirements
+DOCS/SUB+OSD
+DOCS/bugreports.html
+DOCS/codecs-in.html
+DOCS/codecs.html
+DOCS/faq.html
+DOCS/sound.html
+DOCS/video.html
+DOCS/Hungarian
+DOCS/Hungarian/bugreports.html
+DOCS/Hungarian/codecs.html
+DOCS/Hungarian/documentation.html
+DOCS/Hungarian/faq.html
+DOCS/Hungarian/sound.html
+DOCS/Hungarian/video.html
+DOCS/Hungarian/cd-dvd.html
+DOCS/Polish
+DOCS/Polish/BUGREPORTS
+DOCS/Polish/BUGS
+DOCS/Polish/CDROM
+DOCS/Polish/CODECS
+DOCS/Polish/Debian
+DOCS/Polish/FreeBSD
+DOCS/Polish/INSTALL
+DOCS/Polish/LIRC
+DOCS/Polish/MTRR
+DOCS/Polish/OpenDivX
+DOCS/Polish/README
+DOCS/Polish/SDL
+DOCS/Polish/SOUNDCARDS
+DOCS/Polish/SUB+OSD
+DOCS/Russian
+DOCS/Russian/MPlayer-FAQ
+DOCS/Russian/BUGS
+DOCS/Russian/CODECS
+DOCS/Russian/DEBIAN
+DOCS/Russian/DGA
+DOCS/Russian/OpenDivX
+DOCS/Russian/README
+DOCS/Russian/SOUNDCARDS
+DOCS/Russian/TVout-G400
+DOCS/Russian/VIDEOCARDS
+DOCS/Russian/cdrom
+DOCS/Russian/dvd
+DOCS/Russian/dvd-faq
+DOCS/Russian/install
+DOCS/Russian/lirc
+DOCS/Russian/mtrr
+DOCS/Russian/sdl
+DOCS/Spanish
+DOCS/Spanish/BUGREPORTS
+DOCS/Spanish/CDROM
+DOCS/Spanish/DEBIAN
+DOCS/Spanish/DGA
+DOCS/Spanish/DVD
+DOCS/Spanish/DVD-FAQ
+DOCS/Spanish/FREEBSD
+DOCS/Spanish/INSTALL
+DOCS/Spanish/LIRC
+DOCS/Spanish/MPlayer-FAQ
+DOCS/Spanish/MTRR
+DOCS/Spanish/OpenDivX
+DOCS/Spanish/README
+DOCS/Spanish/Requirements
+DOCS/Spanish/SDL
+DOCS/Spanish/SOLARIS
+DOCS/Spanish/SOUNDCARDS
+DOCS/Spanish/SUB+OSD
+DOCS/Spanish/TVout-G400
+DOCS/Spanish/Translator
+DOCS/Spanish/VIDEOCARDS
+DOCS/tech
+DOCS/tech/mpsub.sub
+DOCS/tech/tech-eng.txt
+DOCS/tech/tech-hun.txt
+DOCS/cd-dvd.html
+DOCS/documentation.html
diff -urN debian.old/rules debian/rules
--- debian.old/rules	Thu Aug 23 17:00:21 2001
+++ debian/rules	Thu Aug 23 17:04:08 2001
@@ -12,6 +12,7 @@
 build-stamp:
 	dh_testdir
 
+	./configure --prefix=/usr
 	$(MAKE)
 
 	touch build-stamp
@@ -31,7 +32,8 @@
 	dh_clean -k
 	dh_installdirs
 
-	$(MAKE) prefix=`pwd`/debian/`dh_listpackages`/usr install
+	install -m 755 mplayer usr/bin/mplayer
+	install -o root -g root -m 4755 fibmap_mplayer usr/bin/fibmap_mplayer
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -42,10 +44,10 @@
 	dh_testdir
 	dh_testroot
 	dh_installdebconf	
-	dh_installdocs DOCS/*
-	dh_installexamples /etc/example.conf
+	dh_installdocs
+	dh_installexamples etc/example.conf
 	dh_installmenu
-	dh_installman
+	dh_installman DOCS/mplayer.1
 #	dh_undocumented
 	dh_installchangelogs
 	dh_link
-- 

André Dahlqvist <andre.dahlqvist at telia.com>

_______________________________________________
Mplayer-dev-eng mailing list
Mplayer-dev-eng at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-dev-eng