[maemo-commits] [maemo-commits] r15631 - in projects/haf/trunk/osso-af-startup: . debian services

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2008-06-05 15:15:16 +0300 (Thu, 05 Jun 2008)
New Revision: 15631

Added:
   projects/haf/trunk/osso-af-startup/services/locale
Removed:
   projects/haf/trunk/osso-af-startup/locale.rx34+rx44
Modified:
   projects/haf/trunk/osso-af-startup/debian/control
   projects/haf/trunk/osso-af-startup/debian/rules
Log:
  * Make multiple packages, each containing a different default language


Modified: projects/haf/trunk/osso-af-startup/debian/control
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/control	2008-06-05 10:19:26 UTC (rev 15630)
+++ projects/haf/trunk/osso-af-startup/debian/control	2008-06-05 12:15:16 UTC (rev 15631)
@@ -14,11 +14,6 @@
  These scripts are for the target only -- they have not been necessarily
  tested in Scratchbox.
 
-Package: osso-af-startup-locale-rx34+rx44
-Architecture: all
-Depends: osso-af-startup (>= ${Source-Version})
-Description: Default language file
-
 Package: osso-af-startup-locale-rx48
 Architecture: all
 Depends: osso-af-startup (>= ${Source-Version})

Modified: projects/haf/trunk/osso-af-startup/debian/rules
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/rules	2008-06-05 10:19:26 UTC (rev 15630)
+++ projects/haf/trunk/osso-af-startup/debian/rules	2008-06-05 12:15:16 UTC (rev 15631)
@@ -90,12 +90,9 @@
 #	dh_makeshlibs
 	dh_installdeb
 
-	mkdir -p $(CURDIR)/debian/osso-af-startup-locale-rx34+rx44/etc/osso-af-init/
-	cp -a $(CURDIR)/locale.rx34+rx44 $(CURDIR)/debian/osso-af-startup-locale-rx34+rx44/etc/osso-af-init/locale
+	mkdir -p $(CURDIR)/debian/osso-af-startup-locale-rx48/usr/share/osso-af-init
+	cp -a $(CURDIR)/locale.rx48 $(CURDIR)/debian/osso-af-startup-locale-rx48/usr/share/osso-af-init/locale
 
-	mkdir -p $(CURDIR)/debian/osso-af-startup-locale-rx48/etc/osso-af-init
-	cp -a $(CURDIR)/locale.rx48 $(CURDIR)/debian/osso-af-startup-locale-rx48/etc/osso-af-init/locale
-
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums

Deleted: projects/haf/trunk/osso-af-startup/locale.rx34+rx44
===================================================================
--- projects/haf/trunk/osso-af-startup/locale.rx34+rx44	2008-06-05 10:19:26 UTC (rev 15630)
+++ projects/haf/trunk/osso-af-startup/locale.rx34+rx44	2008-06-05 12:15:16 UTC (rev 15631)
@@ -1,5 +0,0 @@
-#!/bin/sh
-unset LC_ALL
-unset LANGUAGE
-export LANG=en_GB
-export LC_MESSAGES=en_GB

Copied: projects/haf/trunk/osso-af-startup/services/locale (from rev 15629, projects/haf/trunk/osso-af-startup/locale.rx34+rx44)
===================================================================
--- projects/haf/trunk/osso-af-startup/locale.rx34+rx44	2008-06-05 09:52:43 UTC (rev 15629)
+++ projects/haf/trunk/osso-af-startup/services/locale	2008-06-05 12:15:16 UTC (rev 15631)
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ -f /usr/share/osso-af-init/locale ]; then
+  source /usr/share/osso-af-init/locale
+else
+  unset LC_ALL
+  unset LANGUAGE
+  export LANG=en_GB
+  export LC_MESSAGES=en_GB
+fi