changeset 4521:0737156ad1f0

Juergen Kreileder changes, fixing some lintian errors, adding correct manpath and adding xvidix to array of system-selectable drivers.
author eyck
date Sun, 03 Feb 2002 20:27:20 +0000
parents 0dca90717403
children a7baf6ad622a
files debian/config debian/dirs debian/postinst debian/rules
diffstat 4 files changed, 11 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/debian/config	Sun Feb 03 19:19:39 2002 +0000
+++ b/debian/config	Sun Feb 03 20:27:20 2002 +0000
@@ -3,7 +3,8 @@
 # Script to configure mplayer 
 # based on etherconf by John Goerzen <jgoerzen@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();
--- a/debian/dirs	Sun Feb 03 19:19:39 2002 +0000
+++ b/debian/dirs	Sun Feb 03 20:27:20 2002 +0000
@@ -1,4 +1,4 @@
 usr/bin
-usr/sbin
 usr/share/man/man1
 usr/share/mplayer
+usr/lib/mplayer
--- a/debian/postinst	Sun Feb 03 19:19:39 2002 +0000
+++ b/debian/postinst	Sun Feb 03 20:27:20 2002 +0000
@@ -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);
--- a/debian/rules	Sun Feb 03 19:19:39 2002 +0000
+++ b/debian/rules	Sun Feb 03 20:27:20 2002 +0000
@@ -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/*