RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Use the confdir we compiled with (/etc/mplayer/mplayer.conf instead of 

/etc/mplayer.conf).  Spotted by Kiss Gabor <kissg@sztaki.hu>.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7097 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2002-08-27 09:57:12 +00:00
parent a3ce1c658a
commit 8c39272f0a
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -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 mplayer (0.90-1) unstable; urgency=low
* 0.90 release including latest alsa9 fixes * 0.90 release including latest alsa9 fixes

2
debian/config vendored
View File

@ -19,7 +19,7 @@ checkupgrade(); # Find out if we have to upgrade.
mainloop(letsgo()); mainloop(letsgo());
sub checkupgrade { sub checkupgrade {
open(MCFG, "</etc/mplayer.conf") || return 1; open(MCFG, "</etc/mplayer/mplayer.conf") || return 1;
my $line = <MCFG>; my $line = <MCFG>;
return 1 if ($line =~ /mplayer DEBCONF AREA/); return 1 if ($line =~ /mplayer DEBCONF AREA/);
exit(0) if (input($PRIORITY, 'mplayer/replace-existing-files') eq "question skipped"); exit(0) if (input($PRIORITY, 'mplayer/replace-existing-files') eq "question skipped");

8
debian/postinst vendored
View File

@ -13,7 +13,7 @@ my $didupgrade = 0;
dealwithupgrades(); dealwithupgrades();
my $mcfg = new ConfHelper('mplayer', "/etc/mplayer.conf"); my $mcfg = new ConfHelper('mplayer', "/etc/mplayer/mplayer.conf");
$mcfg->setconfarea(" $mcfg->setconfarea("
#MPlayer config file generated by .deb package. #MPlayer config file generated by .deb package.
#ffactor = 0.9 #ffactor = 0.9
@ -48,10 +48,10 @@ get("mplayer/cfgnote");
sub dealwithupgrades { sub dealwithupgrades {
open(OLDCONF, "</etc/mplayer.conf") || return 1; open(OLDCONF, "</etc/mplayer/mplayer.conf") || return 1;
close OLDCONF; close OLDCONF;
my $mconf = new ConfHelper("mplayer", "/etc/mplayer.conf"); my $mconf = new ConfHelper("mplayer", "/etc/mplayer/mplayer.conf");
return 1 if ($mconf->hasconfarea()); return 1 if ($mconf->hasconfarea());
undef $mconf; undef $mconf;
@ -60,7 +60,7 @@ sub dealwithupgrades {
print STDERR "Upgrading...\n"; print STDERR "Upgrading...\n";
#? saveolddata("/etc/network/interfaces", "pppconf"); #? saveolddata("/etc/network/interfaces", "pppconf");
$didupgrade = 1; $didupgrade = 1;
for my $file ("/etc/mplayer.conf" for my $file ("/etc/mplayer/mplayer.conf"
#, "/etc/mplayer/fonts/sth #, "/etc/mplayer/fonts/sth
) { ) {
debug("Deleting $file"); debug("Deleting $file");

6
debian/postinst.templates vendored
View File

@ -17,14 +17,14 @@ Description: Which Video Output driver would you like?
Template: mplayer/overwrite Template: mplayer/overwrite
Type: boolean Type: boolean
Default: false Default: false
Description: Overwrite /etc/mplayer.conf ? Description: Overwrite /etc/mplayer/mplayer.conf ?
Should I overwrite your current /etc/mplayer.conf with the one created on the fly based on your answers? Should I overwrite your current /etc/mplayer/mplayer.conf with the one created on the fly based on your answers?
Template: mplayer/cfgnote Template: mplayer/cfgnote
Type: note Type: note
Description: Create your ~/.mplayer/conf file. Description: Create your ~/.mplayer/conf file.
Remember to read documentation and edit your ~/.mplayer/conf 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 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 machine it's installed to. And it also it means that it will use
your setup very effectively. Look at /usr/share/doc/mplayer your setup very effectively. Look at /usr/share/doc/mplayer