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

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2008-06-16 16:19:55 +0300 (Mon, 16 Jun 2008)
New Revision: 15656

Modified:
   projects/haf/trunk/osso-af-startup/configure.ac
   projects/haf/trunk/osso-af-startup/debian/changelog
   projects/haf/trunk/osso-af-startup/debian/rules
Log:
  * Distribute locale.orig via /usr/share/osso-af-init. Works together with a change to
    osso-app-killer-common.sh, whereby /etc/osso-af-init/locale is restored from the
    locale.orig stored in this new place


Modified: projects/haf/trunk/osso-af-startup/configure.ac
===================================================================
--- projects/haf/trunk/osso-af-startup/configure.ac	2008-06-16 13:13:50 UTC (rev 15655)
+++ projects/haf/trunk/osso-af-startup/configure.ac	2008-06-16 13:19:55 UTC (rev 15656)
@@ -1,5 +1,5 @@
 AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(osso-af-startup, 1.62)
+AM_INIT_AUTOMAKE(osso-af-startup, 1.63)
 
 AC_OUTPUT(Makefile \
 	services/Makefile \

Modified: projects/haf/trunk/osso-af-startup/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/changelog	2008-06-16 13:13:50 UTC (rev 15655)
+++ projects/haf/trunk/osso-af-startup/debian/changelog	2008-06-16 13:19:55 UTC (rev 15656)
@@ -1,3 +1,11 @@
+osso-af-startup (1.63-1) unstable; urgency=low
+
+  * Distribute locale.orig via /usr/share/osso-af-init. Works together with a change to
+    osso-app-killer-common.sh, whereby /etc/osso-af-init/locale is restored from the
+    locale.orig stored in this new place
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Mon, 16 Jun 2008 16:13:56 +0300
+
 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,

Modified: projects/haf/trunk/osso-af-startup/debian/rules
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/rules	2008-06-16 13:13:50 UTC (rev 15655)
+++ projects/haf/trunk/osso-af-startup/debian/rules	2008-06-16 13:19:55 UTC (rev 15656)
@@ -94,7 +94,7 @@
 	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
+	cp -a $(CURDIR)/debian/osso-af-startup/etc/osso-af-init/locale $(CURDIR)/debian/osso-af-startup/usr/share/osso-af-init/locale.orig
 
 	dh_shlibdeps
 	dh_gencontrol