r8919 - in packages/trunk/playonlinux/debian: . patches

[Bertrand Marc]

Author: bbk-guest
Date: 2009-02-22 15:03:58 +0000 (Sun, 22 Feb 2009)
New Revision: 8919

Added:
   packages/trunk/playonlinux/debian/patches/mscorefonts.diff
Removed:
   packages/trunk/playonlinux/debian/patches/msttcorefonts.diff
Modified:
   packages/trunk/playonlinux/debian/PlayOnLinux.desktop
   packages/trunk/playonlinux/debian/changelog
   packages/trunk/playonlinux/debian/control
   packages/trunk/playonlinux/debian/patches/series
Log:
Use msttcorefonts if present

Modified: packages/trunk/playonlinux/debian/PlayOnLinux.desktop
===================================================================
--- packages/trunk/playonlinux/debian/PlayOnLinux.desktop	2009-02-22 14:35:24 UTC (rev 8918)
+++ packages/trunk/playonlinux/debian/PlayOnLinux.desktop	2009-02-22 15:03:58 UTC (rev 8919)
@@ -7,5 +7,4 @@
 Type=Application
 Exec=playonlinux
 Icon=playonlinux
-Categories=Utility;
-
+Categories=Game;

Modified: packages/trunk/playonlinux/debian/changelog
===================================================================
--- packages/trunk/playonlinux/debian/changelog	2009-02-22 14:35:24 UTC (rev 8918)
+++ packages/trunk/playonlinux/debian/changelog	2009-02-22 15:03:58 UTC (rev 8919)
@@ -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 <beberking at gmail.com>  Fri, 06 Feb 2009 02:19:41 +0100
 

Modified: packages/trunk/playonlinux/debian/control
===================================================================
--- packages/trunk/playonlinux/debian/control	2009-02-22 14:35:24 UTC (rev 8918)
+++ packages/trunk/playonlinux/debian/control	2009-02-22 15:03:58 UTC (rev 8919)
@@ -12,7 +12,7 @@
 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.

Added: packages/trunk/playonlinux/debian/patches/mscorefonts.diff
===================================================================
--- packages/trunk/playonlinux/debian/patches/mscorefonts.diff	                        (rev 0)
+++ packages/trunk/playonlinux/debian/patches/mscorefonts.diff	2009-02-22 15:03:58 UTC (rev 8919)
@@ -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" ]

Deleted: packages/trunk/playonlinux/debian/patches/msttcorefonts.diff
===================================================================
--- packages/trunk/playonlinux/debian/patches/msttcorefonts.diff	2009-02-22 14:35:24 UTC (rev 8918)
+++ packages/trunk/playonlinux/debian/patches/msttcorefonts.diff	2009-02-22 15:03:58 UTC (rev 8919)
@@ -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 ()

Modified: packages/trunk/playonlinux/debian/patches/series
===================================================================
--- packages/trunk/playonlinux/debian/patches/series	2009-02-22 14:35:24 UTC (rev 8918)
+++ packages/trunk/playonlinux/debian/patches/series	2009-02-22 15:03:58 UTC (rev 8919)
@@ -1 +1 @@
-msttcorefonts.diff
+mscorefonts.diff