This is an automated email from the git hooks/post-receive script. bmarc pushed a commit to branch master in repository playonlinux.
commit c2319bb1d3199d4ee7c9f18df93488c5f8800706 Author: Bertrand Marc <[email protected]> Date: Sun Aug 21 14:13:14 2011 +0000 Refresh patches --- debian/patches/locale.diff | 33 ++++++++++++------------- debian/patches/series | 1 - debian/patches/x-terminal-emulator.diff | 44 +++++++-------------------------- 3 files changed, 25 insertions(+), 53 deletions(-) diff --git a/debian/patches/locale.diff b/debian/patches/locale.diff index cf792f1..e9ed86c 100644 --- a/debian/patches/locale.diff +++ b/debian/patches/locale.diff @@ -1,26 +1,25 @@ --- a/lib/variables +++ b/lib/variables -@@ -88,7 +88,6 @@ - fi +@@ -27,7 +27,6 @@ + if [ ! "$NOGETTEXT" = "TRUE" ] + then - ### Language -export TEXTDOMAINDIR="$PLAYONLINUX/lang/locale/" export TEXTDOMAIN="pol" . gettext.sh - + eval_gettext > /dev/null || eval_gettext() { printf "$@"; } --- a/python/lib/lng.py +++ b/python/lib/lng.py -@@ -6,11 +6,10 @@ - import locale, string, wx - class Lang(object): - def __init__(self): -- languages = os.listdir(Variables.playonlinux_env+'/lang/locale') -+ languages = os.listdir('/usr/share/locale') +@@ -26,10 +26,10 @@ - langid = wx.LANGUAGE_DEFAULT -- basepath = os.popen("printf \"$PLAYONLINUX\"","r").read() -- localedir = os.path.join(basepath, "lang/locale") -+ localedir = "/usr/share/locale" - domain = "pol" - mylocale = wx.Locale(langid) - mylocale.AddCatalogLookupPathPrefix(localedir) + class iLang(object): + def __init__(self): +- languages = os.listdir(Variables.playonlinux_env+'/lang/locale') ++ languages = os.listdir('/usr/share/locale') + + langid = wx.LANGUAGE_DEFAULT +- localedir = os.path.join(Variables.playonlinux_env, "lang/locale") ++ localedir = "/usr/share/locale" + domain = "pol" + mylocale = wx.Locale(langid) + mylocale.AddCatalogLookupPathPrefix(localedir) diff --git a/debian/patches/series b/debian/patches/series index 50c6b43..d29b1fd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ -mscorefonts.diff locale.diff x-terminal-emulator.diff diff --git a/debian/patches/x-terminal-emulator.diff b/debian/patches/x-terminal-emulator.diff index f4b3808..df46f7f 100644 --- a/debian/patches/x-terminal-emulator.diff +++ b/debian/patches/x-terminal-emulator.diff @@ -3,56 +3,30 @@ @@ -0,0 +1,2 @@ +#!/bin/sh +x-terminal-emulator -e "$@" ---- a/lib/check_depend -+++ b/lib/check_depend -@@ -45,7 +45,6 @@ +--- a/lib/depend.lib ++++ b/lib/depend.lib +@@ -57,7 +57,6 @@ + check_one wget "wget" 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 cabextract "cabextract" + check_one gpg "gnupg" --- a/lib/variables +++ b/lib/variables -@@ -57,14 +57,14 @@ - fi +@@ -18,7 +18,7 @@ + # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ### Terminal -export POL_TERM="xterm" +export POL_TERM="Default" - 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="Default" - fi ### Desktop -@@ -84,7 +84,7 @@ - fi - if [ $POL_TERM = "" ] - then -- export POL_TERM="xterm" -+ export POL_TERM="Default" - fi - - ### Language -@@ -139,7 +139,7 @@ - - if [ $POL_TERM = "" ] - then -- export POL_TERM="xterm" -+ export POL_TERM="Default" - fi - - export POL_LANG=$(echo "$LANG" | cut -d\_ -f 1) + [ "$(which xdg-user-dir)" ] && export DESKTOP="$(xdg-user-dir DESKTOP)" || export DESKTOP="$HOME/Desktop" --- a/python/options.py +++ b/python/options.py -@@ -106,7 +106,7 @@ +@@ -113,7 +113,7 @@ if(os.path.exists(Variables.playonlinux_rep+"/configurations/options/terminal")): default_terminal = open(Variables.playonlinux_rep+"/configurations/options/terminal","r").read() else: -- 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
