r8930 - in packages/trunk/playonlinux/debian: . bin patches

[Bertrand Marc]

Author: bbk-guest
Date: 2009-02-23 01:28:15 +0000 (Mon, 23 Feb 2009)
New Revision: 8930

Added:
   packages/trunk/playonlinux/debian/patches/locale.diff
Modified:
   packages/trunk/playonlinux/debian/bin/playonlinux
   packages/trunk/playonlinux/debian/bin/playonlinux-daemon
   packages/trunk/playonlinux/debian/bin/playonlinux-pkg
   packages/trunk/playonlinux/debian/changelog
   packages/trunk/playonlinux/debian/patches/series
   packages/trunk/playonlinux/debian/playonlinux.install
Log:
Clean /usr/share/playonlinux, use /usr/share/locale

Modified: packages/trunk/playonlinux/debian/bin/playonlinux
===================================================================
--- packages/trunk/playonlinux/debian/bin/playonlinux	2009-02-23 00:06:30 UTC (rev 8929)
+++ packages/trunk/playonlinux/debian/bin/playonlinux	2009-02-23 01:28:15 UTC (rev 8930)
@@ -1,3 +1,3 @@
-#!/bin/bash
-/usr/share/playonlinux/playonlinux "$@"
+#!/bin/sh
+exec /usr/share/playonlinux/playonlinux "$@"
 exit 0

Modified: packages/trunk/playonlinux/debian/bin/playonlinux-daemon
===================================================================
--- packages/trunk/playonlinux/debian/bin/playonlinux-daemon	2009-02-23 00:06:30 UTC (rev 8929)
+++ packages/trunk/playonlinux/debian/bin/playonlinux-daemon	2009-02-23 01:28:15 UTC (rev 8930)
@@ -1,3 +1,3 @@
-#!/bin/bash
-/usr/share/playonlinux/playonlinux-daemon "$@"
+#!/bin/sh
+exec /usr/share/playonlinux/playonlinux-daemon "$@"
 exit 0

Modified: packages/trunk/playonlinux/debian/bin/playonlinux-pkg
===================================================================
--- packages/trunk/playonlinux/debian/bin/playonlinux-pkg	2009-02-23 00:06:30 UTC (rev 8929)
+++ packages/trunk/playonlinux/debian/bin/playonlinux-pkg	2009-02-23 01:28:15 UTC (rev 8930)
@@ -1,3 +1,3 @@
-#!/bin/bash
-/usr/share/playonlinux/playonlinux-pkg "$@"
+#!/bin/sh
+exec /usr/share/playonlinux/playonlinux-pkg "$@"
 exit 0

Modified: packages/trunk/playonlinux/debian/changelog
===================================================================
--- packages/trunk/playonlinux/debian/changelog	2009-02-23 00:06:30 UTC (rev 8929)
+++ packages/trunk/playonlinux/debian/changelog	2009-02-23 01:28:15 UTC (rev 8930)
@@ -3,6 +3,9 @@
   * 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 <beberking at gmail.com>  Fri, 06 Feb 2009 02:19:41 +0100
 

Added: packages/trunk/playonlinux/debian/patches/locale.diff
===================================================================
--- packages/trunk/playonlinux/debian/patches/locale.diff	                        (rev 0)
+++ packages/trunk/playonlinux/debian/patches/locale.diff	2009-02-23 01:28:15 UTC (rev 8930)
@@ -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)

Modified: packages/trunk/playonlinux/debian/patches/series
===================================================================
--- packages/trunk/playonlinux/debian/patches/series	2009-02-23 00:06:30 UTC (rev 8929)
+++ packages/trunk/playonlinux/debian/patches/series	2009-02-23 01:28:15 UTC (rev 8930)
@@ -1 +1,2 @@
 mscorefonts.diff
+locale.diff

Modified: packages/trunk/playonlinux/debian/playonlinux.install
===================================================================
--- packages/trunk/playonlinux/debian/playonlinux.install	2009-02-23 00:06:30 UTC (rev 8929)
+++ packages/trunk/playonlinux/debian/playonlinux.install	2009-02-23 01:28:15 UTC (rev 8930)
@@ -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/