[Mplayer-cvslog] CVS: main/debian config,1.1,1.2 dirs,1.3,1.4 postinst,1.7,1.8 rules,1.31,1.32

[Dariush Pietrzak]

Update of /cvsroot/mplayer/main/debian
In directory mplayer:/var/tmp.root/cvs-serv30308

Modified Files:
	config dirs postinst rules 
Log Message:
Juergen Kreileder changes, fixing some lintian errors, adding correct manpath and adding
 xvidix to array of system-selectable drivers.


Index: config
===================================================================
RCS file: /cvsroot/mplayer/main/debian/config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config	28 Jul 2001 07:54:52 -0000	1.1
+++ config	3 Feb 2002 20:27:20 -0000	1.2
@@ -3,7 +3,8 @@
 # Script to configure mplayer 
 # based on etherconf by John Goerzen <jgoerzen at progenylinux.com>
 
-use Debian::DebConf::Client::ConfModule qw(:all);
+use Debconf::Client::ConfModule qw(:all);
+
 
 my $version = version(2.0);
 title('MPlayer Configuration');
@@ -48,7 +49,7 @@
 }
 
 sub configure {
-  subst("mplayer/voutput", "vochoices", "xv, xmga, mga, x11, gl, sdl");
+  subst("mplayer/voutput", "vochoices", "xv, xmga, mga, x11, gl, sdl, xvidix");
   # db_subst mplayer/output vo xc,xmga,mga,x11,gl,sdl
   exit(0) if (input($PRIORITY, "mplayer/voutput") eq "question skipped");
   go();

Index: dirs
===================================================================
RCS file: /cvsroot/mplayer/main/debian/dirs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dirs	20 Dec 2001 17:18:48 -0000	1.3
+++ dirs	3 Feb 2002 20:27:20 -0000	1.4
@@ -1,4 +1,4 @@
 usr/bin
-usr/sbin
 usr/share/man/man1
 usr/share/mplayer
+usr/lib/mplayer

Index: postinst
===================================================================
RCS file: /cvsroot/mplayer/main/debian/postinst,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- postinst	25 Aug 2001 19:40:04 -0000	1.7
+++ postinst	3 Feb 2002 20:27:20 -0000	1.8
@@ -4,7 +4,7 @@
 
 require ConfHelper;
 
-use Debian::DebConf::Client::ConfModule qw(:all);
+use Debconf::Client::ConfModule qw(:all);
 use IO::Handle;
 use Fcntl;
 my $version = version(1.0);

Index: rules
===================================================================
RCS file: /cvsroot/mplayer/main/debian/rules,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- rules	8 Jan 2002 19:03:29 -0000	1.31
+++ rules	3 Feb 2002 20:27:20 -0000	1.32
@@ -6,7 +6,8 @@
 export DH_COMPAT=3
 
 package        := mplayer
-prefix := debian/$(package)
+prefix := $(shell pwd)/debian/$(package)
+
 arch   := $(shell dpkg --print-architecture)
   
 ifeq ($(arch),powerpc)
@@ -53,8 +54,10 @@
 	dh_installdirs
 
 	# commands to install the package into debian/<packagename>
-	$(MAKE) prefix=$(prefix)/usr CONFDIR=$(prefix)/etc/mplayer DATADIR=$(prefix)/usr/share/mplayer install
-	dh_link usr/bin/mplayer usr/bin/gmplayer
+	$(MAKE) prefix=$(prefix)/usr CONFDIR=$(prefix)/etc/mplayer DATADIR=$(prefix)/usr/share/mplayer  MANDIR=$(prefix)/usr/share/man  install
+	dh_link usr/bin/mplayer usr/bin/gmplayer \
+		usr/share/man/man1/mplayer.1.gz usr/share/man/man1/gmplayer.1.gz
+
 
 	dh_installdebconf	
 	dh_installdocs DOCS/*