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

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2008-06-05 13:19:26 +0300 (Thu, 05 Jun 2008)
New Revision: 15630

Added:
   projects/haf/trunk/osso-af-startup/locale.rx48
Modified:
   projects/haf/trunk/osso-af-startup/debian/changelog
   projects/haf/trunk/osso-af-startup/debian/control
   projects/haf/trunk/osso-af-startup/debian/rules
Log:
Corrected email address in debian/changelog

Modified: projects/haf/trunk/osso-af-startup/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/changelog	2008-06-05 09:52:43 UTC (rev 15629)
+++ projects/haf/trunk/osso-af-startup/debian/changelog	2008-06-05 10:19:26 UTC (rev 15630)
@@ -1,3 +1,9 @@
+osso-af-startup (1.61-1) unstable; urgency=low
+
+  * Make multiple packages, each containing a different default language
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Thu,  5 Jun 2008 13:14:13 +0300
+
 osso-af-startup (1.60-1) unstable; urgency=low
 
   * Complete reversion back to version 1.54-1
@@ -2,3 +8,3 @@
 
- -- Gabriel Schulhof <natalia.dobrovolskaya at nokia.com>  Wed,  4 Jun 2008 09:44:01 +0300
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Wed,  4 Jun 2008 09:44:01 +0300
 

Modified: projects/haf/trunk/osso-af-startup/debian/control
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/control	2008-06-05 09:52:43 UTC (rev 15629)
+++ projects/haf/trunk/osso-af-startup/debian/control	2008-06-05 10:19:26 UTC (rev 15630)
@@ -16,10 +16,10 @@
 
 Package: osso-af-startup-locale-rx34+rx44
 Architecture: all
-Depends: osso-af-startup (== ${Source-Version})
+Depends: osso-af-startup (>= ${Source-Version})
 Description: Default language file
 
 Package: osso-af-startup-locale-rx48
 Architecture: all
-Depends: osso-af-startup (== ${Source-Version})
+Depends: osso-af-startup (>= ${Source-Version})
 Description: Default language file

Modified: projects/haf/trunk/osso-af-startup/debian/rules
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/rules	2008-06-05 09:52:43 UTC (rev 15629)
+++ projects/haf/trunk/osso-af-startup/debian/rules	2008-06-05 10:19:26 UTC (rev 15630)
@@ -89,6 +89,13 @@
 #	dh_python
 #	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/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

Copied: projects/haf/trunk/osso-af-startup/locale.rx48 (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/locale.rx48	2008-06-05 10:19:26 UTC (rev 15630)
@@ -0,0 +1,5 @@
+#!/bin/sh
+unset LC_ALL
+unset LANGUAGE
+export LANG=en_US
+export LC_MESSAGES=en_US