Mercurial > mplayer.hg
changeset 7096:6746866a94c6
Use the confdir we compiled with (/etc/mplayer/mplayer.conf instead of
/etc/mplayer.conf). Spotted by Kiss Gabor <kissg@sztaki.hu>.
| author | diego |
|---|---|
| date | Tue, 27 Aug 2002 09:57:12 +0000 |
| parents | fad0147bd3aa |
| children | 5c87f14ad947 |
| files | debian/changelog debian/config debian/postinst debian/postinst.templates |
| diffstat | 4 files changed, 15 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/debian/changelog Tue Aug 27 08:33:05 2002 +0000 +++ b/debian/changelog Tue Aug 27 09:57:12 2002 +0000 @@ -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
--- a/debian/config Tue Aug 27 08:33:05 2002 +0000 +++ b/debian/config Tue Aug 27 09:57:12 2002 +0000 @@ -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");
--- a/debian/postinst Tue Aug 27 08:33:05 2002 +0000 +++ b/debian/postinst Tue Aug 27 09:57:12 2002 +0000 @@ -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");
--- a/debian/postinst.templates Tue Aug 27 08:33:05 2002 +0000 +++ b/debian/postinst.templates Tue Aug 27 09:57:12 2002 +0000 @@ -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