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

[Bertrand Marc]

Author: bbk-guest
Date: 2010-08-25 08:33:56 +0000 (Wed, 25 Aug 2010)
New Revision: 11284

Modified:
   packages/trunk/playonlinux/debian/changelog
   packages/trunk/playonlinux/debian/patches/mscorefonts.diff
Log:
Refresh mscorefonts.diff

Modified: packages/trunk/playonlinux/debian/changelog
===================================================================
--- packages/trunk/playonlinux/debian/changelog	2010-08-25 08:17:45 UTC (rev 11283)
+++ packages/trunk/playonlinux/debian/changelog	2010-08-25 08:33:56 UTC (rev 11284)
@@ -1,6 +1,13 @@
-playonlinux (3.7.7-1) unstable; urgency=low
+playonlinux (3.8-1) unstable; urgency=low
 
   * New upstream release.
+  * Refresh mscorefonts.diff.
+
+ -- Bertrand Marc <beberking at gmail.com>  Wed, 25 Aug 2010 10:32:43 +0200
+
+playonlinux (3.7.7-1) UNRELEASED; urgency=low
+
+  * New upstream release.
   * Remove patches/changelog, included upstream.
   * Fix clean in debian/rules to compile twice in a row.
   * Bump Standards-Version to 3.9.1 (no changes needed).

Modified: packages/trunk/playonlinux/debian/patches/mscorefonts.diff
===================================================================
--- packages/trunk/playonlinux/debian/patches/mscorefonts.diff	2010-08-25 08:17:45 UTC (rev 11283)
+++ packages/trunk/playonlinux/debian/patches/mscorefonts.diff	2010-08-25 08:33:56 UTC (rev 11284)
@@ -1,23 +1,5 @@
-Index: playonlinux-3.7.6/lib/sources
-===================================================================
---- playonlinux-3.7.6.orig/lib/sources	2010-04-30 22:44:35.000000000 +0200
-+++ playonlinux-3.7.6/lib/sources	2010-05-01 11:49:25.000000000 +0200
-@@ -28,9 +28,10 @@
- 
- 	cfg_check 
- 	construire_repertoire_personnel
-+	install_debfonts
- 	if [ ! -d "$HOME/.PlayOnLinux/configurations/listes" ]
- 	then
- 		maj_check --first
-+		sleep 1 && fonts_install
- 	fi
--	fonts_install
- fi
-Index: playonlinux-3.7.6/lib/main
-===================================================================
---- playonlinux-3.7.6.orig/lib/main	2010-04-30 22:44:35.000000000 +0200
-+++ playonlinux-3.7.6/lib/main	2010-05-01 11:49:25.000000000 +0200
+--- a/lib/main
++++ b/lib/main
 @@ -113,12 +113,46 @@
  		$PYTHON "$PLAYONLINUX/python/mainwindow.py" "$1"
  	fi
@@ -68,3 +50,19 @@
  	fi
  }
  install_fonts ()
+@@ -299,13 +333,14 @@
+ 
+ 	cfg_check 
+ 	construire_repertoire_personnel
++	install_debfonts
+ 	if [ ! -d "$HOME/.PlayOnLinux/configurations/listes" ]
+ 	then
+ 		maj_check --first
++		sleep 1 && fonts_install
+ 	else
+ 		bash "$PLAYONLINUX/bash/check_maj_" &
+ 	fi
+-	fonts_install
+ 	install_plugins
+ 
+