[maemo-commits] [maemo-commits] r15648 - projects/haf/trunk/osso-af-startup/debian

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2008-06-16 10:30:36 +0300 (Mon, 16 Jun 2008)
New Revision: 15648

Modified:
   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:
  * Don't copy /etc/osso-af-init/locale to /etc/osso-af-init/locale.orig out of postinst,
    because you're gonna do that during an SSU as well as during an install. Instead,
    copy it via debian/rules, and ship the package with locale.orig in place out of unpack


Modified: projects/haf/trunk/osso-af-startup/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/changelog	2008-06-13 10:39:42 UTC (rev 15647)
+++ projects/haf/trunk/osso-af-startup/debian/changelog	2008-06-16 07:30:36 UTC (rev 15648)
@@ -1,3 +1,11 @@
+osso-af-startup (1.62-1) unstable; urgency=low
+
+  * Don't copy /etc/osso-af-init/locale to /etc/osso-af-init/locale.orig out of postinst,
+    because you're gonna do that during an SSU as well as during an install. Instead,
+    copy it via debian/rules, and ship the package with locale.orig in place out of unpack
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Mon, 16 Jun 2008 09:24:14 +0300
+
 osso-af-startup (1.61-1) unstable; urgency=low
 
   * Make multiple packages, each containing a different default language

Modified: projects/haf/trunk/osso-af-startup/debian/postinst
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/postinst	2008-06-13 10:39:42 UTC (rev 15647)
+++ projects/haf/trunk/osso-af-startup/debian/postinst	2008-06-16 07:30:36 UTC (rev 15648)
@@ -16,9 +16,9 @@
 # startup wizard needs to be able to modify the locale
 chown $USER:$GROUP /etc/osso-af-init/locale
 
-# save the original for Restore Original Settings
-cp -f /etc/osso-af-init/locale /etc/osso-af-init/locale.orig
-chown $USER:$GROUP /etc/osso-af-init/locale.orig
+# # save the original for Restore Original Settings
+# cp -f /etc/osso-af-init/locale /etc/osso-af-init/locale.orig
+# chown $USER:$GROUP /etc/osso-af-init/locale.orig
 
 update-rc.d af-services start 22 2 3 4 5 . stop 22 0 1 6 . > /dev/null
 update-rc.d af-startup start 50 2 3 4 . stop 21 0 1 6 . > /dev/null

Modified: projects/haf/trunk/osso-af-startup/debian/rules
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/rules	2008-06-13 10:39:42 UTC (rev 15647)
+++ projects/haf/trunk/osso-af-startup/debian/rules	2008-06-16 07:30:36 UTC (rev 15648)
@@ -93,6 +93,9 @@
 	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/etc/osso-af-init
+	cp -a $(CURDIR)/debian/osso-af-startup/etc/osso-af-init/locale $(CURDIR)/debian/osso-af-startup/etc/osso-af-init/locale.orig
+
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums