This is an automated email from the git hooks/post-receive script. bmarc pushed a commit to branch master in repository playonlinux.
commit 443bb17ef14eeeaca735300a970ba0282322d5c9 Author: Bertrand Marc <[email protected]> Date: Sun Feb 22 15:03:58 2009 +0000 Use msttcorefonts if present --- debian/PlayOnLinux.desktop | 3 +-- debian/changelog | 2 ++ debian/control | 2 +- debian/patches/mscorefonts.diff | 54 +++++++++++++++++++++++++++++++++++++++ debian/patches/msttcorefonts.diff | 11 -------- debian/patches/series | 2 +- 6 files changed, 59 insertions(+), 15 deletions(-) diff --git a/debian/PlayOnLinux.desktop b/debian/PlayOnLinux.desktop index f29ff7e..dfa3627 100644 --- a/debian/PlayOnLinux.desktop +++ b/debian/PlayOnLinux.desktop @@ -7,5 +7,4 @@ Comment=PlayOnLinux Type=Application Exec=playonlinux Icon=playonlinux -Categories=Utility; - +Categories=Game; diff --git a/debian/changelog b/debian/changelog index bffcdb2..37067f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ playonlinux (3.3.1-1) UNRELEASED; urgency=low * Initial release (Closes: #485149) + * Recommand (and use) ttf-mscorefonts-installer instead + of downloading directly the fonts. -- Bertrand Marc <[email protected]> Fri, 06 Feb 2009 02:19:41 +0100 diff --git a/debian/control b/debian/control index a3c6315..a104e1b 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Homepage: http://www.playonlinux.com/ Package: playonlinux Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, wine, unzip, wget, xterm, python-wxgtk2.8, imagemagick, cabextract -Recommends: mesa-utils +Recommends: mesa-utils, ttf-mscorefonts-installer Description: front-end for Wine PlayOnLinux is a front-end for wine. It permits you to install Windows Games and softwares on Linux. diff --git a/debian/patches/mscorefonts.diff b/debian/patches/mscorefonts.diff new file mode 100644 index 0000000..dde2565 --- /dev/null +++ b/debian/patches/mscorefonts.diff @@ -0,0 +1,54 @@ +--- playonlinux-3.3.1.orig/lib/sources ++++ playonlinux-3.3.1/lib/sources +@@ -28,9 +28,10 @@ + + cfg_check + construire_repertoire_personnel ++ install_debfonts + if [ ! -d "$HOME/.PlayOnLinux/configurations/listes" ] + then + maj_check --first ++ fonts_install + fi +- fonts_install + fi +--- playonlinux-3.3.1.orig/lib/main ++++ playonlinux-3.3.1/lib/main +@@ -102,6 +102,37 @@ + $PYTHON "$PLAYONLINUX/python/mainwindow.py" "$1" + fi + } ++install_debfonts() ++{ ++ DEBFONTS="/usr/share/fonts/truetype/msttcorefonts" ++ if [ -e "$HOME/.PlayOnLinux/configurations/msfonts_installed" ] ++ then ++ if [ ! -e $HOME/.PlayOnLinux/fonts/ADVPACK.DLL ] && [ ! -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 ++ fi ++ else ++ if [ -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 ++ FONTDIR=$HOME/.PlayOnLinux/fonts/ ++ mkdir -p $FONTDIR ++ OLDDIR="$PWD" ++ cd $DEBFONTS ++ for ttf in * ++ do ++ ln -s $DEBFONTS/$ttf $FONTDIR/$ttf ++ done ++ cd $OLDDIR ++ touch "$HOME/.PlayOnLinux/configurations/msfonts_installed" ++ fi ++ fi ++} + fonts_install() + { + if [ ! "$DEJADIS" == "True" ] diff --git a/debian/patches/msttcorefonts.diff b/debian/patches/msttcorefonts.diff deleted file mode 100644 index d4485e1..0000000 --- a/debian/patches/msttcorefonts.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- playonlinux-3.3.1.orig/lib/main -+++ playonlinux-3.3.1/lib/main -@@ -107,7 +107,7 @@ - if [ ! "$DEJADIS" == "True" ] - then - export DEJADIS="True" -- (sleep 1 && install_fonts)& -+# (sleep 1 && install_fonts)& - fi - } - install_fonts () diff --git a/debian/patches/series b/debian/patches/series index fa03fbf..16ac9fb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -msttcorefonts.diff +mscorefonts.diff -- 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
