Update of /cvsroot/mplayer/main/debian In directory mail:/var/tmp.root/cvs-serv19864 Modified Files: changelog config postinst postinst.templates Log Message: Use the confdir we compiled with (/etc/mplayer/mplayer.conf instead of /etc/mplayer.conf). Spotted by Kiss Gabor <kissg@sztaki.hu>. Index: changelog =================================================================== RCS file: /cvsroot/mplayer/main/debian/changelog,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- changelog 3 Jul 2002 21:42:38 -0000 1.20 +++ changelog 27 Aug 2002 09:57:12 -0000 1.21 @@ -1,3 +1,10 @@ +mplayer (0.90-2) unstable; urgency=low + + * Use the confdir we compile with in the helper scripts + (/etc/mplayer/mplayer.conf instead of /etc/mplayer). + + -- Diego Biurrun <diego@biurrun.de> Tue, 27 Aug 2002 11:18:50 +0200 + mplayer (0.90-1) unstable; urgency=low * 0.90 release including latest alsa9 fixes Index: config =================================================================== RCS file: /cvsroot/mplayer/main/debian/config,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config 3 Feb 2002 20:27:20 -0000 1.2 +++ config 27 Aug 2002 09:57:12 -0000 1.3 @@ -19,7 +19,7 @@ mainloop(letsgo()); sub checkupgrade { - open(MCFG, "</etc/mplayer.conf") || return 1; + open(MCFG, "</etc/mplayer/mplayer.conf") || return 1; my $line = <MCFG>; return 1 if ($line =~ /mplayer DEBCONF AREA/); exit(0) if (input($PRIORITY, 'mplayer/replace-existing-files') eq "question skipped"); Index: postinst =================================================================== RCS file: /cvsroot/mplayer/main/debian/postinst,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- postinst 3 Feb 2002 20:27:20 -0000 1.8 +++ postinst 27 Aug 2002 09:57:12 -0000 1.9 @@ -13,7 +13,7 @@ dealwithupgrades(); -my $mcfg = new ConfHelper('mplayer', "/etc/mplayer.conf"); +my $mcfg = new ConfHelper('mplayer', "/etc/mplayer/mplayer.conf"); $mcfg->setconfarea(" #MPlayer config file generated by .deb package. #ffactor = 0.9 @@ -48,10 +48,10 @@ sub dealwithupgrades { - open(OLDCONF, "</etc/mplayer.conf") || return 1; + open(OLDCONF, "</etc/mplayer/mplayer.conf") || return 1; close OLDCONF; - my $mconf = new ConfHelper("mplayer", "/etc/mplayer.conf"); + my $mconf = new ConfHelper("mplayer", "/etc/mplayer/mplayer.conf"); return 1 if ($mconf->hasconfarea()); undef $mconf; @@ -60,7 +60,7 @@ print STDERR "Upgrading...\n"; #? saveolddata("/etc/network/interfaces", "pppconf"); $didupgrade = 1; - for my $file ("/etc/mplayer.conf" + for my $file ("/etc/mplayer/mplayer.conf" #, "/etc/mplayer/fonts/sth ) { debug("Deleting $file"); Index: postinst.templates =================================================================== RCS file: /cvsroot/mplayer/main/debian/postinst.templates,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- postinst.templates 31 May 2001 09:04:33 -0000 1.2 +++ postinst.templates 27 Aug 2002 09:57:12 -0000 1.3 @@ -17,14 +17,14 @@ Template: mplayer/overwrite Type: boolean Default: false -Description: Overwrite /etc/mplayer.conf ? - Should I overwrite your current /etc/mplayer.conf with the one created on the fly based on your answers? +Description: Overwrite /etc/mplayer/mplayer.conf ? + Should I overwrite your current /etc/mplayer/mplayer.conf with the one created on the fly based on your answers? Template: mplayer/cfgnote Type: note Description: Create your ~/.mplayer/conf file. Remember to read documentation and edit your ~/.mplayer/conf - (or /etc/mplayer.conf) file. This binary depends heavily on + (or /etc/mplayer/mplayer.conf) file. This binary depends heavily on your hardware - which means that it needs tweaking for every single machine it's installed to. And it also it means that it will use your setup very effectively. Look at /usr/share/doc/mplayer