This is an automated email from the git hooks/post-receive script. bmarc pushed a commit to branch master in repository playonlinux.
commit 4a7b4335793a0318f2930480010cfa378b09a7bd Author: Bertrand Marc <[email protected]> Date: Wed May 8 09:07:56 2013 +0000 Really delete patches included upstream. --- debian/patches/disable_update_alert.diff | 11 ----- debian/patches/locale.diff | 25 ---------- debian/patches/mscorefonts.diff | 78 -------------------------------- debian/patches/x-terminal-emulator.diff | 45 ------------------ 4 files changed, 159 deletions(-) diff --git a/debian/patches/disable_update_alert.diff b/debian/patches/disable_update_alert.diff deleted file mode 100644 index a083329..0000000 --- a/debian/patches/disable_update_alert.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/python/mainwindow.py -+++ b/python/mainwindow.py -@@ -72,7 +72,7 @@ - - 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+")") - else: - self.Show = False - diff --git a/debian/patches/locale.diff b/debian/patches/locale.diff deleted file mode 100644 index f8ea020..0000000 --- a/debian/patches/locale.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- a/lib/variables -+++ b/lib/variables -@@ -41,7 +41,6 @@ - if [ ! "$NOGETTEXT" = "TRUE" ] || [ "$(POL_Config_pRead NOGETTEXT)" = "TRUE" ] - then - --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 -@@ -12,10 +12,10 @@ - - 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/mscorefonts.diff b/debian/patches/mscorefonts.diff deleted file mode 100644 index ab807cd..0000000 --- a/debian/patches/mscorefonts.diff +++ /dev/null @@ -1,78 +0,0 @@ ---- a/bash/first_use -+++ b/bash/first_use -@@ -23,6 +23,17 @@ - - export XQUARTZ_VERSION="2.7.1" - -+fonts_install () # Debian tweak to avoid downloading Microsoft Fonts -+{ -+ if [ ! -e "$REPERTOIRE/configurations/msfonts_installed" ] && [ ! -e "$REPERTOIRE/configurations/msfonts_deb_installed" ] -+ then -+ FONTS_WARNING="Microsoft fonts aren't installed.\n\n\ -+ If you encounter any fonts trouble, you should think about installing\ -+ the debian package\nttf-mscorefonts-installer (see README.Debian)." -+ POL_SetupWindow_message "$FONTS_WARNING" "Microsoft fonts" -+ POL_SetupWindow_Close -+ fi -+} - - install_fonts () # Install Microsoft Fonts - { -@@ -315,7 +326,7 @@ - - [ "$POL_OS" == "Mac" ] && [ "$OSX_VERSION" = "9" ] && install_x11 - --install_fonts -+fonts_install - install_prefix - POL_SetupWindow_message "$(eval_gettext 'Thank you for using $APPLICATION_TITLE')" "$(eval_gettext '$APPLICATION_TITLE first use')" - POL_SetupWindow_Close ---- a/bash/startup -+++ b/bash/startup -@@ -22,6 +22,38 @@ - [ "$PLAYONLINUX" = "" ] && exit 0 - source "$PLAYONLINUX/lib/sources" - -+install_debfonts () # Debian tweak to avoid downloading Microsoft Fonts -+{ -+ if [ ! -e "$REPERTOIRE/configurations/msfonts_installed" ] && [ ! -e "$REPERTOIRE/configurations/msfonts_deb_installed" ] -+ then -+ DEBFONTS="/usr/share/fonts/truetype/msttcorefonts" -+ if [ ! -d $DEBFONTS ] -+ then -+ rm $HOME/.PlayOnLinux/fonts/ -r 2> /dev/null -+ rm $HOME/.PlayOnLinux/fonts 2> /dev/null -+ rm $HOME/.PlayOnLinux/configurations/fonts_installed 2> /dev/null -+ rm $HOME/.PlayOnLinux/configurations/msfonts_deb_installed 2> /dev/null -+ fi -+ if [ -d $DEBFONTS ] -+ then -+ rm $HOME/.PlayOnLinux/fonts/ -r 2> /dev/null -+ rm $HOME/.PlayOnLinux/fonts 2> /dev/null -+ rm $HOME/.PlayOnLinux/configurations/fonts_installed 2> /dev/null -+ FONTDIR=$HOME/.PlayOnLinux/fonts/ -+ mkdir -p $FONTDIR -+ OLDDIR="$PWD" -+ cd $DEBFONTS -+ for ttf in * -+ do -+ ln -s $DEBFONTS/$ttf $FONTDIR/$ttf -+ done -+ cd $OLDDIR -+ touch "$HOME/.PlayOnLinux/configurations/msfonts_deb_installed" -+ fi -+ fi -+} -+ -+ - # POL / POM won't work without that - construire_repertoire_personnel - # Initialize link between python and bash -@@ -38,6 +70,7 @@ - # Plugins - install_plugins - -+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" diff --git a/debian/patches/x-terminal-emulator.diff b/debian/patches/x-terminal-emulator.diff deleted file mode 100644 index f0cb160..0000000 --- a/debian/patches/x-terminal-emulator.diff +++ /dev/null @@ -1,45 +0,0 @@ ---- /dev/null -+++ b/bash/terminals/Default -@@ -0,0 +1,2 @@ -+#!/bin/sh -+x-terminal-emulator -e "$@" ---- 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 xterm "xterm" - check_one convert "imagemagick" - check_one cabextract "cabextract" - check_one gpg "gnupg" ---- a/lib/variables -+++ b/lib/variables -@@ -29,7 +29,7 @@ - [ "$(which sudo)" ] && sudo -k - - ### Terminal --export POL_TERM="xterm" -+export POL_TERM="Default" - - ### Desktop - [ "$(which xdg-user-dir)" ] && export DESKTOP="$(xdg-user-dir DESKTOP)" || export DESKTOP="$HOME/Desktop" ---- a/bash/expert/PolShell -+++ b/bash/expert/PolShell -@@ -24,4 +24,4 @@ - fi - source "$PLAYONLINUX/lib/sources" - --xterm -T "$APPLICATION_TITLE" -e "$PLAYONLINUX/bash/polshell" -+"$PLAYONLINUX/bash/terminals/$POL_TERM" "$PLAYONLINUX/bash/polshell" ---- a/lib/playonlinux.lib -+++ b/lib/playonlinux.lib -@@ -211,7 +211,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
