This is an automated email from the git hooks/post-receive script. bmarc pushed a commit to branch master in repository playonlinux.
commit 7f61689cc53aa7019c08a022c5922676f8357104 Author: Bertrand Marc <[email protected]> Date: Wed Feb 29 21:01:43 2012 +0000 Refresh patches --- debian/changelog | 3 ++- debian/patches/disable_update_alert.diff | 2 +- debian/patches/locale.diff | 6 +++--- debian/patches/mscorefonts.diff | 13 ++++++------- debian/patches/x-terminal-emulator.diff | 15 +++++++++++++-- 5 files changed, 25 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2b7a960..54f1fa1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ playonlinux (4.0.15-1) UNRELEASED; urgency=low * New upstream release. * Depends on x11-utils to provide xdpyinfo. + * Refresh patches. - -- Bertrand Marc <[email protected]> Wed, 29 Feb 2012 21:44:40 +0100 + -- Bertrand Marc <[email protected]> Wed, 29 Feb 2012 22:01:30 +0100 playonlinux (4.0.14-1) unstable; urgency=low diff --git a/debian/patches/disable_update_alert.diff b/debian/patches/disable_update_alert.diff index 382c3c2..c7b4d9e 100644 --- a/debian/patches/disable_update_alert.diff +++ b/debian/patches/disable_update_alert.diff @@ -2,7 +2,7 @@ +++ b/python/mainwindow.py @@ -68,7 +68,7 @@ - if(playonlinux.convertVersionToInt(os.environ["VERSION"]) < playonlinux.convertVersionToInt(self.WebVersion)): + if(playonlinux.VersionLower(os.environ["VERSION"],self.WebVersion)): self.sendToStatusBar(_('An updated version of {0} is available').format(os.environ["APPLICATION_TITLE"])+" ("+self.WebVersion+")",False) - self.sendAlert(_('An updated version of {0} is available').format(os.environ["APPLICATION_TITLE"])+" ("+self.WebVersion+")") + #self.sendAlert(_('An updated version of {0} is available').format(os.environ["APPLICATION_TITLE"])+" ("+self.WebVersion+")") diff --git a/debian/patches/locale.diff b/debian/patches/locale.diff index d0dce28..13e458d 100644 --- a/debian/patches/locale.diff +++ b/debian/patches/locale.diff @@ -1,7 +1,7 @@ --- a/lib/variables +++ b/lib/variables -@@ -27,7 +27,6 @@ - if [ ! "$NOGETTEXT" = "TRUE" ] || [ "$(POL_Config_Read NOGETTEXT)" = "TRUE" ] +@@ -37,7 +37,6 @@ + if [ ! "$NOGETTEXT" = "TRUE" ] || [ "$(POL_Config_pRead NOGETTEXT)" = "TRUE" ] then -export TEXTDOMAINDIR="$PLAYONLINUX/lang/locale/" @@ -10,7 +10,7 @@ eval_gettext > /dev/null || eval_gettext() { printf "$@"; } --- a/python/lib/lng.py +++ b/python/lib/lng.py -@@ -26,10 +26,10 @@ +@@ -12,10 +12,10 @@ class iLang(object): def __init__(self): diff --git a/debian/patches/mscorefonts.diff b/debian/patches/mscorefonts.diff index 6380d15..bddf04a 100644 --- a/debian/patches/mscorefonts.diff +++ b/debian/patches/mscorefonts.diff @@ -2,7 +2,7 @@ +++ b/bash/first_use @@ -23,6 +23,17 @@ - export XQUARTZ_VERSION="2.6.3" + export XQUARTZ_VERSION="2.7.1" +fonts_install () # Debian tweak to avoid downloading Microsoft Fonts +{ @@ -18,8 +18,8 @@ install_fonts () # Install Microsoft Fonts { -@@ -281,8 +292,8 @@ - [ "$POL_OS" == "Mac" ] && [ ! -e "/Applications/Utilities/XQuartz.app" ] && [ "$OSX_VERSION" = "10" ] && install_x11 +@@ -311,7 +322,7 @@ + [ "$POL_OS" == "Mac" ] && [ "$OSX_VERSION" = "9" ] && install_x11 -install_fonts @@ -27,9 +27,6 @@ install_prefix POL_SetupWindow_message "$(eval_gettext 'Thank you for using $APPLICATION_TITLE')" "$(eval_gettext '$APPLICATION_TITLE first use')" POL_SetupWindow_Close --$(POL_Config_Write FIRST_USE TRUE) -\ No newline at end of file -+$(POL_Config_Write FIRST_USE TRUE) --- a/bash/startup +++ b/bash/startup @@ -22,6 +22,38 @@ @@ -71,10 +68,12 @@ # POL / POM won't work without that construire_repertoire_personnel # Initialize link between python and bash -@@ -43,5 +75,6 @@ +@@ -43,6 +75,7 @@ fi fi +install_debfonts # First use ? [ "$(POL_Config_Read FIRST_USE)" = "" ] && bash "$PLAYONLINUX/bash/first_use" + [ "$POL_OS" == "Mac" ] && [ ! -e "/Applications/Utilities/XQuartz.app" ] && [ ! "$OSX_VERSION" = "11" ] && bash "$PLAYONLINUX/bash/first_use" +\ No newline at end of file diff --git a/debian/patches/x-terminal-emulator.diff b/debian/patches/x-terminal-emulator.diff index bc55540..1ac380a 100644 --- a/debian/patches/x-terminal-emulator.diff +++ b/debian/patches/x-terminal-emulator.diff @@ -15,8 +15,8 @@ check_one gpg "gnupg" --- a/lib/variables +++ b/lib/variables -@@ -18,7 +18,7 @@ - # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +@@ -28,7 +28,7 @@ + [ "$(which sudo)" ] && sudo -k ### Terminal -export POL_TERM="xterm" @@ -32,3 +32,14 @@ -xterm -T "$APPLICATION_TITLE" -e "$PLAYONLINUX/bash/polshell" +"$PLAYONLINUX/bash/terminals/$POL_TERM" "$PLAYONLINUX/bash/polshell" +--- a/lib/playonlinux.lib ++++ b/lib/playonlinux.lib +@@ -148,7 +148,7 @@ + fi + echo bash --rcfile "$POL_USER_ROOT/tmp/env_bash" > "$POL_USER_ROOT/tmp/env_bash2" + chmod +x "$POL_USER_ROOT/tmp/env_bash2" +- xterm -e "$POL_USER_ROOT/tmp/env_bash2" -T "$APPLICATION_TITLE" ++ "$PLAYONLINUX/bash/terminals/$POL_TERM" "$POL_USER_ROOT/tmp/env_bash2" + } + + -- 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
