This is an automated email from the git hooks/post-receive script. bmarc pushed a commit to branch master in repository playonlinux.
commit f21678ca0d0eede07c1aedd866ef6d9b369a0087 Author: Bertrand Marc <[email protected]> Date: Wed Jan 26 10:14:49 2011 +0000 refresh patches --- debian/changelog | 3 ++- debian/patches/license.diff | 6 +++--- debian/patches/locale.diff | 4 ++-- debian/patches/mscorefonts.diff | 8 ++++---- debian/patches/x-terminal-emulator.diff | 8 ++++---- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index e6f1e6d..13a67b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ playonlinux (3.8.8-1) unstable; urgency=low * New upstream release. + * Refresh patches. - -- Bertrand Marc <[email protected]> Wed, 26 Jan 2011 11:03:03 +0100 + -- Bertrand Marc <[email protected]> Wed, 26 Jan 2011 11:13:57 +0100 playonlinux (3.8-1) UNRELEASED; urgency=low diff --git a/debian/patches/license.diff b/debian/patches/license.diff index 0af9980..d2398c1 100644 --- a/debian/patches/license.diff +++ b/debian/patches/license.diff @@ -1,8 +1,8 @@ --- a/python/mainwindow.py +++ b/python/mainwindow.py -@@ -430,7 +430,7 @@ - self.aboutBox.AddDeveloper("Helped for the program : kiplantt, NSLW") - self.aboutBox.AddArtist("Icons are provided by Tango Desktop Project") +@@ -454,7 +454,7 @@ + self.aboutBox.AddTranslator("https://translations.launchpad.net/playonlinux/";) + self.aboutBox.AddArtist(_("Icons are provided by the Tango Desktop Project")) self.aboutBox.SetWebSite("http://www.playonlinux.com";) - self.aboutBox.SetLicence(open(Variables.playonlinux_env+"/LICENCE",'r').read()) + self.aboutBox.SetLicence(open("/usr/share/common-licenses/GPL",'r').read()) diff --git a/debian/patches/locale.diff b/debian/patches/locale.diff index 6c45dd8..e1d2365 100644 --- a/debian/patches/locale.diff +++ b/debian/patches/locale.diff @@ -1,6 +1,6 @@ --- a/lib/variables +++ b/lib/variables -@@ -79,7 +79,6 @@ +@@ -86,7 +86,6 @@ fi ### Language @@ -10,7 +10,7 @@ --- a/python/lib/lng.py +++ b/python/lib/lng.py -@@ -5,11 +5,10 @@ +@@ -6,11 +6,10 @@ import locale, string, wx class Lang(object): def __init__(self): diff --git a/debian/patches/mscorefonts.diff b/debian/patches/mscorefonts.diff index f3df37b..e188d1b 100644 --- a/debian/patches/mscorefonts.diff +++ b/debian/patches/mscorefonts.diff @@ -1,7 +1,7 @@ --- a/lib/main +++ b/lib/main -@@ -113,12 +113,46 @@ - $PYTHON "$PLAYONLINUX/python/mainwindow.py" "$1" +@@ -115,12 +115,46 @@ + $PYTHON "$PLAYONLINUX/python/mainwindow.py" "$1" "$2" fi } +install_debfonts() @@ -50,7 +50,7 @@ fi } install_fonts () -@@ -299,13 +333,14 @@ +@@ -349,13 +383,14 @@ cfg_check construire_repertoire_personnel @@ -65,4 +65,4 @@ - fonts_install install_plugins - + check_new_pol diff --git a/debian/patches/x-terminal-emulator.diff b/debian/patches/x-terminal-emulator.diff index 6632774..17e0ec6 100644 --- a/debian/patches/x-terminal-emulator.diff +++ b/debian/patches/x-terminal-emulator.diff @@ -15,7 +15,7 @@ #check_one lzma "lzma" --- a/lib/variables +++ b/lib/variables -@@ -48,14 +48,14 @@ +@@ -55,14 +55,14 @@ fi ### Terminal @@ -32,7 +32,7 @@ fi ### Desktop -@@ -75,7 +75,7 @@ +@@ -82,7 +82,7 @@ fi if [ $POL_TERM = "" ] then @@ -41,7 +41,7 @@ fi ### Language -@@ -130,7 +130,7 @@ +@@ -137,7 +137,7 @@ if [ $POL_TERM = "" ] then @@ -52,7 +52,7 @@ export POL_LANG=$(echo "$LANG" | cut -d\_ -f 1) --- a/python/options.py +++ b/python/options.py -@@ -105,7 +105,7 @@ +@@ -106,7 +106,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
