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

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2008-06-24 15:59:12 +0300 (Tue, 24 Jun 2008)
New Revision: 15683

Modified:
   projects/haf/trunk/osso-af-startup/configure.ac
   projects/haf/trunk/osso-af-startup/debian/changelog
   projects/haf/trunk/osso-af-startup/debian/postinst
   projects/haf/trunk/osso-af-startup/debian/rules
Log:
Temp

Modified: projects/haf/trunk/osso-af-startup/configure.ac
===================================================================
--- projects/haf/trunk/osso-af-startup/configure.ac	2008-06-24 10:42:38 UTC (rev 15682)
+++ projects/haf/trunk/osso-af-startup/configure.ac	2008-06-24 12:59:12 UTC (rev 15683)
@@ -1,5 +1,5 @@
 AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(osso-af-startup, 1.63)
+AM_INIT_AUTOMAKE(osso-af-startup, 1.65)
 
 AC_OUTPUT(Makefile \
 	services/Makefile \

Modified: projects/haf/trunk/osso-af-startup/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/changelog	2008-06-24 10:42:38 UTC (rev 15682)
+++ projects/haf/trunk/osso-af-startup/debian/changelog	2008-06-24 12:59:12 UTC (rev 15683)
@@ -1,3 +1,9 @@
+osso-af-startup (1.65-1) unstable; urgency=low
+
+  * Create locale.orig
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Tue, 24 Jun 2008 15:38:48 +0300
+
 osso-af-startup (1.64-1) unstable; urgency=low
 
   * Maintain /etc/osso-af-init/locale solely via pre/postinst and do not ship it at all.

Modified: projects/haf/trunk/osso-af-startup/debian/postinst
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/postinst	2008-06-24 10:42:38 UTC (rev 15682)
+++ projects/haf/trunk/osso-af-startup/debian/postinst	2008-06-24 12:59:12 UTC (rev 15683)
@@ -15,11 +15,11 @@
 ln -s /var/lib/gconf /etc/osso-af-init/gconf-dir
 
 if test -f $LOCALE_TMP_FILE; then
+  mv -f $LOCALE_TMP_FILE /etc/osso-af-init/locale
+
   if ! test -f /usr/share/osso-af-init/locale.orig; then
     cp -f $LOCALE_TMP_FILE /usr/share/osso-af-init/locale.orig
   fi
-
-  mv -f $LOCALE_TMP_FILE /etc/osso-af-init/locale
 fi
 
 # startup wizard needs to be able to modify the locale

Modified: projects/haf/trunk/osso-af-startup/debian/rules
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/rules	2008-06-24 10:42:38 UTC (rev 15682)
+++ projects/haf/trunk/osso-af-startup/debian/rules	2008-06-24 12:59:12 UTC (rev 15683)
@@ -90,6 +90,8 @@
 #	dh_makeshlibs
 	dh_installdeb
 
+	mkdir -p $(CURDIR)/debian/osso-af-startup/usr/share/osso-af-init
+
 	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