This is an automated email from the git hooks/post-receive script. bmarc pushed a commit to branch master in repository playonlinux.
commit 505a2d333aa4969205690aae51bedbd008812905 Author: Bertrand Marc <[email protected]> Date: Mon Feb 23 01:28:15 2009 +0000 Clean /usr/share/playonlinux, use /usr/share/locale --- debian/bin/playonlinux | 4 ++-- debian/bin/playonlinux-daemon | 4 ++-- debian/bin/playonlinux-pkg | 4 ++-- debian/changelog | 3 +++ debian/patches/locale.diff | 26 ++++++++++++++++++++++++++ debian/patches/series | 1 + debian/playonlinux.install | 7 +++---- 7 files changed, 39 insertions(+), 10 deletions(-) diff --git a/debian/bin/playonlinux b/debian/bin/playonlinux index c757856..b8f6da1 100644 --- a/debian/bin/playonlinux +++ b/debian/bin/playonlinux @@ -1,3 +1,3 @@ -#!/bin/bash -/usr/share/playonlinux/playonlinux "$@" +#!/bin/sh +exec /usr/share/playonlinux/playonlinux "$@" exit 0 diff --git a/debian/bin/playonlinux-daemon b/debian/bin/playonlinux-daemon index 788ed66..50cf64e 100644 --- a/debian/bin/playonlinux-daemon +++ b/debian/bin/playonlinux-daemon @@ -1,3 +1,3 @@ -#!/bin/bash -/usr/share/playonlinux/playonlinux-daemon "$@" +#!/bin/sh +exec /usr/share/playonlinux/playonlinux-daemon "$@" exit 0 diff --git a/debian/bin/playonlinux-pkg b/debian/bin/playonlinux-pkg index a1f5ab1..61fb819 100644 --- a/debian/bin/playonlinux-pkg +++ b/debian/bin/playonlinux-pkg @@ -1,3 +1,3 @@ -#!/bin/bash -/usr/share/playonlinux/playonlinux-pkg "$@" +#!/bin/sh +exec /usr/share/playonlinux/playonlinux-pkg "$@" exit 0 diff --git a/debian/changelog b/debian/changelog index 2a985c4..3784d25 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ playonlinux (3.3.1-1) unstable; urgency=low * Initial release (Closes: #485149) * Recommand (and use) ttf-mscorefonts-installer instead of downloading directly the fonts. + * Install locales in /usr/share/locale instead of + custom directory and apply patch locale.diff to match + these changes. -- Bertrand Marc <[email protected]> Fri, 06 Feb 2009 02:19:41 +0100 diff --git a/debian/patches/locale.diff b/debian/patches/locale.diff new file mode 100644 index 0000000..cd2ec62 --- /dev/null +++ b/debian/patches/locale.diff @@ -0,0 +1,26 @@ +--- playonlinux-3.3.1.orig/lib/variables ++++ playonlinux-3.3.1/lib/variables +@@ -76,7 +76,6 @@ + fi + + ### Language +-export TEXTDOMAINDIR="$PLAYONLINUX/lang/locale/" + export TEXTDOMAIN="pol" + . gettext.sh + +--- playonlinux-3.3.1.orig/python/lib/lng.py ++++ playonlinux-3.3.1/python/lib/lng.py +@@ -5,11 +5,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') + + 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) diff --git a/debian/patches/series b/debian/patches/series index 16ac9fb..e108963 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ mscorefonts.diff +locale.diff diff --git a/debian/playonlinux.install b/debian/playonlinux.install index 57da372..8ebe0d2 100644 --- a/debian/playonlinux.install +++ b/debian/playonlinux.install @@ -1,14 +1,13 @@ bash/* usr/share/playonlinux/bash/ etc/* usr/share/playonlinux/etc/ -lang/* usr/share/playonlinux/lang/ +lang/locale/* usr/share/locale/ lib/* usr/share/playonlinux/lib/ python/* usr/share/playonlinux/python/ -src/* usr/share/playonlinux/src/ themes/* usr/share/playonlinux/themes/ -CHANGELOG playonlinux* usr/share/playonlinux/ +playonlinux* usr/share/playonlinux/ etc/playonlinux*.png usr/share/pixmaps/ debian/PlayOnLinux.desktop usr/share/applications/ etc/PlayOnLinux.directory usr/share/desktop-directories/ -debian//bin/playonlinux usr/bin/ +debian/bin/playonlinux usr/bin/ debian/bin/playonlinux-pkg usr/bin/ debian/bin/playonlinux-daemon usr/bin/ -- 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
