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

[Bertrand Marc]

Author: bbk-guest
Date: 2009-03-03 21:39:48 +0000 (Tue, 03 Mar 2009)
New Revision: 9024

Added:
   packages/trunk/playonlinux/debian/patches/x-terminal-emulator.diff
Modified:
   packages/trunk/playonlinux/debian/changelog
   packages/trunk/playonlinux/debian/control
   packages/trunk/playonlinux/debian/patches/series
Log:
Replace xterm with x-terminal-emulator

Modified: packages/trunk/playonlinux/debian/changelog
===================================================================
--- packages/trunk/playonlinux/debian/changelog	2009-03-03 20:48:37 UTC (rev 9023)
+++ packages/trunk/playonlinux/debian/changelog	2009-03-03 21:39:48 UTC (rev 9024)
@@ -6,6 +6,7 @@
   * Install locales in /usr/share/locale instead of
     custom directory and apply patch locale.diff to match
     these changes.
+  * Replace xterm with x-terminal-emulator.
 
  -- 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-03-03 20:48:37 UTC (rev 9023)
+++ packages/trunk/playonlinux/debian/control	2009-03-03 21:39:48 UTC (rev 9024)
@@ -11,7 +11,7 @@
 
 Package: playonlinux
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, wine, unzip, wget, xterm, python-wxgtk2.8, imagemagick, cabextract
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, wine, unzip, wget, x-terminal-emulator, python-wxgtk2.8, imagemagick, cabextract
 Recommends: mesa-utils, ttf-mscorefonts-installer
 Description: front-end for Wine
  PlayOnLinux is a front-end for wine. It permits you to easily install Windows

Modified: packages/trunk/playonlinux/debian/patches/series
===================================================================
--- packages/trunk/playonlinux/debian/patches/series	2009-03-03 20:48:37 UTC (rev 9023)
+++ packages/trunk/playonlinux/debian/patches/series	2009-03-03 21:39:48 UTC (rev 9024)
@@ -1,2 +1,3 @@
 mscorefonts.diff
 locale.diff
+x-terminal-emulator.diff

Added: packages/trunk/playonlinux/debian/patches/x-terminal-emulator.diff
===================================================================
--- packages/trunk/playonlinux/debian/patches/x-terminal-emulator.diff	                        (rev 0)
+++ packages/trunk/playonlinux/debian/patches/x-terminal-emulator.diff	2009-03-03 21:39:48 UTC (rev 9024)
@@ -0,0 +1,63 @@
+--- /dev/null
++++ playonlinux-3.3.1/bash/terminals/system
+@@ -0,0 +1,2 @@
++#!/bin/sh
++x-terminal-emulator -e "$@"
+--- playonlinux-3.3.1.orig/lib/check_depend
++++ playonlinux-3.3.1/lib/check_depend
+@@ -53,7 +53,6 @@
+ 	check_one wine "wine"
+ 	check_one unzip "unzip"
+ 	check_one ar "binutils" 
+-	check_one xterm "xterm"
+ 	check_one convert "imagemagick"
+ 	check_one cabextract "cabextract" 
+ 	#check_one lzma "lzma"
+--- playonlinux-3.3.1.orig/lib/variables
++++ playonlinux-3.3.1/lib/variables
+@@ -45,14 +45,14 @@
+ fi	
+ 
+ ### Terminal
+-export POL_TERM="xterm"
++export POL_TERM="system"
+ if [ -e "$REPERTOIRE/configurations/options/terminal" ]
+ then
+ 	export POL_TERM=$(cat $REPERTOIRE/configurations/options/terminal)
+ fi
+ if [ $POL_TERM = "" ]
+ then
+-	export POL_TERM="xterm"
++	export POL_TERM="system"
+ fi
+ 
+ ### Desktop
+@@ -72,7 +72,7 @@
+ fi
+ if [ $POL_TERM = "" ]
+ then
+-	export POL_TERM="xterm"
++	export POL_TERM="system"
+ fi
+ 
+ ### Language
+@@ -127,7 +127,7 @@
+ 
+ if [ $POL_TERM = "" ]
+ then
+-	export POL_TERM="xterm"
++	export POL_TERM="system"
+ fi
+ 
+ export POL_LANG=$(echo "$LANG" | cut -d\_ -f 1)
+--- playonlinux-3.3.1.orig/python/options.py
++++ playonlinux-3.3.1/python/options.py
+@@ -62,7 +62,7 @@
+ 		if(os.path.exists(Variables.playonlinux_rep+"/configurations/options/terminal")):
+ 			default_terminal = open(Variables.playonlinux_rep+"/configurations/options/terminal","r").read()
+ 		else:
+-			default_terminal = "xterm"
++			default_terminal = "system"
+ 		self.Term = wx.ComboBox(self.panelGeneral, -1, value=default_terminal, choices=os.listdir(Variables.playonlinux_env+"/bash/terminals"), pos=(20,120),style=wx.CB_READONLY)
+ 		self.buttonTestT = wx.Button(self.panelGeneral, 111, _("Tests"), pos=(230,120), size=(80,27))
+