[maemo-commits] [maemo-commits] r8426 - in projects/haf/trunk/maemo-launcher: . debian launcher

Tue Nov 28 22:59:18 EET 2006

Author: guillem
Date: 2006-11-28 22:59:17 +0200 (Tue, 28 Nov 2006)
New Revision: 8426

Modified:
   projects/haf/trunk/maemo-launcher/ChangeLog
   projects/haf/trunk/maemo-launcher/debian/changelog
   projects/haf/trunk/maemo-launcher/debian/rules
   projects/haf/trunk/maemo-launcher/launcher/Makefile.am
   projects/haf/trunk/maemo-launcher/launcher/booster.c
   projects/haf/trunk/maemo-launcher/launcher/comm_dbus.c
Log:
	Unbranding (second part).

	* launcher/comm_dbus.c (main): Replace explicit maemo-launcher string
	path with the LAUNCHER macro.
	* launcher/booster.c (booster_module_load): Rename booster modules
	from 'maemo-booster-NAME.so' to 'booster-NAME.so'.
	* launcher/Makefile.am (helper_PROGRAMS): Rename maemo-defender to
	defender.
	(DEFENDER): Likewise.
	(maemo_defender_SOURCES): Renamed to ...
	(defender_SOURCES): ... this.
	(maemo_defender_CPPFLAGS): Renamed to ...
	(defender_CPPFLAGS): ... this.
	(booster_PROGRAMS): Rename booster modules from 'maemo-booster-NAME.so'
	to 'booster-NAME.so'.
	(maemo_booster_null_so_SOURCES): Renamed to ...
	(booster_null_so_SOURCES): ... this.
	(maemo_booster_null_so_CFLAGS): Renamed to ...
	(booster_null_so_CFLAGS): ... this.
	(maemo_booster_null_so_LDFLAGS): Renamed to ...
	(booster_null_so_LDFLAGS): ... this.
	(maemo_booster_gtk_so_SOURCES): Renamed to ...
	(booster_gtk_so_SOURCES): ... this.
	(maemo_booster_gtk_so_CFLAGS): Renamed to ...
	(booster_gtk_so_CFLAGS): ... this.
	(maemo_booster_gtk_so_LDFLAGS): Renamed to ...
	(booster_gtk_so_LDFLAGS): ... this.
	(maemo_booster_gtk_so_CPPFLAGS): Renamed to ...
	(booster_gtk_so_CPPFLAGS): ... this.
	(maemo_booster_gtk_so_LDADD): Renamed to ...
	(booster_gtk_so_LDADD): ... this.


Modified: projects/haf/trunk/maemo-launcher/ChangeLog
===================================================================

--- projects/haf/trunk/maemo-launcher/ChangeLog	2006-11-28 20:39:32 UTC (rev 8425)
+++ projects/haf/trunk/maemo-launcher/ChangeLog	2006-11-28 20:59:17 UTC (rev 8426)
@@ -1,5 +1,39 @@
 2006-11-28  Guillem Jover  <guillem.jover at nokia.com>
 
+	Unbranding (second part).
+
+	* launcher/comm_dbus.c (main): Replace explicit maemo-launcher string
+	path with the LAUNCHER macro.
+	* launcher/booster.c (booster_module_load): Rename booster modules
+	from 'maemo-booster-NAME.so' to 'booster-NAME.so'.
+	* launcher/Makefile.am (helper_PROGRAMS): Rename maemo-defender to
+	defender.
+	(DEFENDER): Likewise.
+	(maemo_defender_SOURCES): Renamed to ...
+	(defender_SOURCES): ... this.
+	(maemo_defender_CPPFLAGS): Renamed to ...
+	(defender_CPPFLAGS): ... this.
+	(booster_PROGRAMS): Rename booster modules from 'maemo-booster-NAME.so'
+	to 'booster-NAME.so'.
+	(maemo_booster_null_so_SOURCES): Renamed to ...
+	(booster_null_so_SOURCES): ... this.
+	(maemo_booster_null_so_CFLAGS): Renamed to ...
+	(booster_null_so_CFLAGS): ... this.
+	(maemo_booster_null_so_LDFLAGS): Renamed to ...
+	(booster_null_so_LDFLAGS): ... this.
+	(maemo_booster_gtk_so_SOURCES): Renamed to ...
+	(booster_gtk_so_SOURCES): ... this.
+	(maemo_booster_gtk_so_CFLAGS): Renamed to ...
+	(booster_gtk_so_CFLAGS): ... this.
+	(maemo_booster_gtk_so_LDFLAGS): Renamed to ...
+	(booster_gtk_so_LDFLAGS): ... this.
+	(maemo_booster_gtk_so_CPPFLAGS): Renamed to ...
+	(booster_gtk_so_CPPFLAGS): ... this.
+	(maemo_booster_gtk_so_LDADD): Renamed to ...
+	(booster_gtk_so_LDADD): ... this.
+
+2006-11-28  Guillem Jover  <guillem.jover at nokia.com>
+
 	Unbranding (first part).
 
 	* launcher/comm_dbus.h (MAEMO_LAUNCHER_PATH): Renamed to ...

Modified: projects/haf/trunk/maemo-launcher/debian/changelog
===================================================================
--- projects/haf/trunk/maemo-launcher/debian/changelog	2006-11-28 20:39:32 UTC (rev 8425)
+++ projects/haf/trunk/maemo-launcher/debian/changelog	2006-11-28 20:59:17 UTC (rev 8426)
@@ -3,6 +3,7 @@
   * New Upstream Release.
     - Link against libstdc++. (Fixes: NB#47726)
     - Initialize Xft by calling its constructors. (Fixes: NB#17937)
+  * Fix chmod instance following upstream maemo-defender to defender rename.
 
  -- Guillem Jover <guillem.jover at nokia.com>  Mon, 20 Nov 2006 15:21:39 +0200
 

Modified: projects/haf/trunk/maemo-launcher/debian/rules
===================================================================
--- projects/haf/trunk/maemo-launcher/debian/rules	2006-11-28 20:39:32 UTC (rev 8425)
+++ projects/haf/trunk/maemo-launcher/debian/rules	2006-11-28 20:59:17 UTC (rev 8426)
@@ -74,7 +74,7 @@
 	dh_strip --dbg-package=maemo-launcher
 	dh_compress -a
 	dh_fixperms -a
-	chmod u+s $(CURDIR)/debian/maemo-launcher/usr/lib/maemo-launcher/maemo-defender
+	chmod u+s $(CURDIR)/debian/maemo-launcher/usr/lib/maemo-launcher/defender
 #	dh_makeshlibs
 	dh_installdeb -a
 	dh_shlibdeps -a

Modified: projects/haf/trunk/maemo-launcher/launcher/Makefile.am
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/Makefile.am	2006-11-28 20:39:32 UTC (rev 8425)
+++ projects/haf/trunk/maemo-launcher/launcher/Makefile.am	2006-11-28 20:59:17 UTC (rev 8426)
@@ -4,31 +4,31 @@
 #
 
 helperdir = $(libdir)/maemo-launcher
-helper_PROGRAMS = maemo-defender
+helper_PROGRAMS = defender
 
-DEFENDER = "\"$(helperdir)/maemo-defender\""
+DEFENDER = "\"$(helperdir)/defender\""
 LAUNCHER = "\"$(bindir)/maemo-launcher\""
 
-maemo_defender_SOURCES = defender.c report.c report.h
-maemo_defender_CPPFLAGS = \
-	-DPROG_NAME="\"maemo-defender\"" \
+defender_SOURCES = defender.c report.c report.h
+defender_CPPFLAGS = \
+	-DPROG_NAME="\"defender\"" \
 	-DLAUNCHER=$(LAUNCHER) \
 	-DDEFENDER=$(DEFENDER)
 
 boosterdir =  $(libdir)/maemo-launcher
-booster_PROGRAMS = maemo-booster-null.so maemo-booster-gtk.so
+booster_PROGRAMS = booster-null.so booster-gtk.so
 
 BOOSTER_DIR = "\"$(boosterdir)\""
 
-maemo_booster_null_so_SOURCES = booster_null.c
-maemo_booster_null_so_CFLAGS = -fPIC
-maemo_booster_null_so_LDFLAGS = -shared -fPIC
+booster_null_so_SOURCES = booster_null.c
+booster_null_so_CFLAGS = -fPIC
+booster_null_so_LDFLAGS = -shared -fPIC
 
-maemo_booster_gtk_so_SOURCES = booster_gtk.c booster_gtk.h
-maemo_booster_gtk_so_CFLAGS = -fPIC
-maemo_booster_gtk_so_LDFLAGS = -shared -fPIC
-maemo_booster_gtk_so_CPPFLAGS = $(BOOSTER_GTK_CFLAGS)
-maemo_booster_gtk_so_LDADD = $(BOOSTER_GTK_LIBS)
+booster_gtk_so_SOURCES = booster_gtk.c booster_gtk.h
+booster_gtk_so_CFLAGS = -fPIC
+booster_gtk_so_LDFLAGS = -shared -fPIC
+booster_gtk_so_CPPFLAGS = $(BOOSTER_GTK_CFLAGS)
+booster_gtk_so_LDADD = $(BOOSTER_GTK_LIBS)
 
 bin_PROGRAMS = maemo-launcher maemo-invoker maemo-summoner
 

Modified: projects/haf/trunk/maemo-launcher/launcher/booster.c
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/booster.c	2006-11-28 20:39:32 UTC (rev 8425)
+++ projects/haf/trunk/maemo-launcher/launcher/booster.c	2006-11-28 20:59:17 UTC (rev 8426)
@@ -36,7 +36,7 @@
   char *booster_sym;
   char *error_s;
 
-  asprintf(&booster_path, BOOSTER_DIR "/maemo-booster-%s.so", booster->name);
+  asprintf(&booster_path, BOOSTER_DIR "/booster-%s.so", booster->name);
   if (!booster_path)
     die(40, "allocating booster module path\n");
 

Modified: projects/haf/trunk/maemo-launcher/launcher/comm_dbus.c
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/comm_dbus.c	2006-11-28 20:39:32 UTC (rev 8425)
+++ projects/haf/trunk/maemo-launcher/launcher/comm_dbus.c	2006-11-28 20:59:17 UTC (rev 8426)
@@ -95,7 +95,7 @@
 {
   info("testing comm-dbus layer ... ");
 
-  comm_dbus_send_app_died("/usr/bin/maemo-launcher", 1000, 150);
+  comm_dbus_send_app_died(LAUNCHER, 1000, 150);
 
   info("done.\n");
 


