This is an automated email from the git hooks/post-receive script. bmarc pushed a commit to branch master in repository playonlinux.
commit 50e8585bc04241c4585806c5558b63ccd02d1f2f Author: Bertrand Marc <[email protected]> Date: Wed Mar 4 19:46:38 2009 +0000 mscorefonts.diff : try to comply with main category --- debian/control | 3 ++- debian/patches/mscorefonts.diff | 40 ++++++++++++++++++++++++++-------------- 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/debian/control b/debian/control index a84bc80..8330289 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,8 @@ Homepage: http://www.playonlinux.com/ Package: playonlinux Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, wine, unzip, wget, x-terminal-emulator, python-wxgtk2.8, imagemagick, cabextract -Recommends: mesa-utils, ttf-mscorefonts-installer +Recommends: mesa-utils +Suggests: ttf-mscorefonts-installer Description: front-end for Wine PlayOnLinux is a front-end for wine. It permits you to easily install Windows Games and softwares on Linux. It is advised to have a functional internet diff --git a/debian/patches/mscorefonts.diff b/debian/patches/mscorefonts.diff index dde2565..f89c881 100644 --- a/debian/patches/mscorefonts.diff +++ b/debian/patches/mscorefonts.diff @@ -1,5 +1,5 @@ ---- playonlinux-3.3.1.orig/lib/sources -+++ playonlinux-3.3.1/lib/sources +--- playonlinux-3.3.1.obsolete.0.145008676060574.orig/lib/sources ++++ playonlinux-3.3.1.obsolete.0.145008676060574/lib/sources @@ -28,9 +28,10 @@ cfg_check @@ -8,30 +8,29 @@ if [ ! -d "$HOME/.PlayOnLinux/configurations/listes" ] then maj_check --first -+ fonts_install ++ sleep 1 && fonts_install fi - fonts_install fi ---- playonlinux-3.3.1.orig/lib/main -+++ playonlinux-3.3.1/lib/main -@@ -102,6 +102,37 @@ +--- playonlinux-3.3.1.obsolete.0.145008676060574.orig/lib/main ++++ playonlinux-3.3.1.obsolete.0.145008676060574/lib/main +@@ -102,12 +102,46 @@ $PYTHON "$PLAYONLINUX/python/mainwindow.py" "$1" fi } +install_debfonts() +{ -+ DEBFONTS="/usr/share/fonts/truetype/msttcorefonts" -+ if [ -e "$HOME/.PlayOnLinux/configurations/msfonts_installed" ] ++ if [ ! -e "$HOME/.PlayOnLinux/configurations/msfonts_installed" ] + then -+ if [ ! -e $HOME/.PlayOnLinux/fonts/ADVPACK.DLL ] && [ ! -d $DEBFONTS ] ++ DEBFONTS="/usr/share/fonts/truetype/msttcorefonts" ++ if [ -e "$HOME/.PlayOnLinux/configurations/msfonts_deb_installed" ] && [ ! -d $DEBFONTS ] + then + rm $HOME/.PlayOnLinux/fonts/ -r 2> /dev/null + rm $HOME/.PlayOnLinux/fonts 2> /dev/null + rm $HOME/.PlayOnLinux/configurations/fonts_installed 2> /dev/null -+ rm $HOME/.PlayOnLinux/configurations/msfonts_installed 2> /dev/null ++ rm $HOME/.PlayOnLinux/configurations/msfonts_deb_installed 2> /dev/null + fi -+ else -+ if [ -d $DEBFONTS ] ++ if [ ! -e "$HOME/.PlayOnLinux/configurations/msfonts_deb_installed" ] && [ -d $DEBFONTS ] + then + rm $HOME/.PlayOnLinux/fonts/ -r 2> /dev/null + rm $HOME/.PlayOnLinux/fonts 2> /dev/null @@ -45,10 +44,23 @@ + ln -s $DEBFONTS/$ttf $FONTDIR/$ttf + done + cd $OLDDIR -+ touch "$HOME/.PlayOnLinux/configurations/msfonts_installed" ++ touch "$HOME/.PlayOnLinux/configurations/msfonts_deb_installed" + fi + fi +} fonts_install() { - if [ ! "$DEJADIS" == "True" ] +- if [ ! "$DEJADIS" == "True" ] ++ if [ ! -e "$HOME/.PlayOnLinux/configurations/msfonts_installed" ] && [ ! -e "$HOME/.PlayOnLinux/configurations/msfonts_deb_installed" ] + then +- export DEJADIS="True" +- (sleep 1 && install_fonts)& ++ FONTS_WARNING="Microsoft fonts aren't installed.\n\n\ ++If you encounter any fonts trouble, you should think about installing\ ++ the debian package\nttf-mscorefonts-installer (see README.Debian)." ++ POL_SetupWindow_Init "$PLAYONLINUX/etc/setups/fonts/top.png" ++ POL_SetupWindow_message "$FONTS_WARNING" "Microsoft fonts" ++ POL_SetupWindow_Close + fi + } + install_fonts () -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/playonlinux.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
