This is an automated email from the git hooks/post-receive script. bmarc pushed a commit to branch master in repository playonlinux.
commit a24e920c989f9233f8f8eaf31213638a4a47125c Author: Bertrand Marc <[email protected]> Date: Tue Mar 3 21:39:48 2009 +0000 Replace xterm with x-terminal-emulator --- debian/changelog | 1 + debian/control | 2 +- debian/patches/series | 1 + debian/patches/x-terminal-emulator.diff | 63 +++++++++++++++++++++++++++++++++ 4 files changed, 66 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3784d25..1528e61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ playonlinux (3.3.1-1) unstable; urgency=low * 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 <[email protected]> Fri, 06 Feb 2009 02:19:41 +0100 diff --git a/debian/control b/debian/control index 0e57af0..a84bc80 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,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 +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 diff --git a/debian/patches/series b/debian/patches/series index e108963..50c6b43 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ mscorefonts.diff locale.diff +x-terminal-emulator.diff diff --git a/debian/patches/x-terminal-emulator.diff b/debian/patches/x-terminal-emulator.diff new file mode 100644 index 0000000..5955686 --- /dev/null +++ b/debian/patches/x-terminal-emulator.diff @@ -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)) + -- 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
