--- netbook-launcher-efl-0.3.2.orig/debian/netbook-launcher-efl.install +++ netbook-launcher-efl-0.3.2/debian/netbook-launcher-efl.install @@ -0,0 +1 @@ +debian/une-efl.desktop /usr/share/xsessions/ --- netbook-launcher-efl-0.3.2.orig/debian/control +++ netbook-launcher-efl-0.3.2/debian/control @@ -0,0 +1,32 @@ +Source: netbook-launcher-efl +Section: gnome +Priority: optional +Maintainer: Ubuntu Developers +Build-Depends: debhelper (>= 7.0.50), pkg-config, libtool, intltool, + libeina-dev (>= 0.9.9.49898), + libecore-dev (>= 0.9.9.49898), + libevas-dev (>= 0.9.9.49898), + libeet-dev (>= 1.3.2), + libedje-dev (>= 0.9.99.49898), + libelementary-dev (>= 0.7.0.49898), + libglib2.0-dev, + libgconf2-dev, + libgtk2.0-dev, + libdbus-glib-1-dev, + libgnomeui-dev, + liblauncher-dev, + libnotify-dev (>= 0.3.2), + libcanberra-dev, + libunique-dev +Standards-Version: 3.8.3 +Homepage: https://launchpad.net/launch-lite-proj + +Package: netbook-launcher-efl +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends}, libevas-svn-06-engines-x +Recommends: gnome-menus, webfav +Suggests: gnome-web-photo +Description: A lite version of netbook launcher written in EFL + This is a version of netbook-launcher using the Enlightenment Foundation + Libraries (EFL) to run fast on systems with reduced hardware functionality. + It provides a modern application launcher especially suited to small screens. --- netbook-launcher-efl-0.3.2.orig/debian/watch +++ netbook-launcher-efl-0.3.2/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://launchpad.net/launch-lite-proj/+download .*/netbook-launcher-efl-(.+)\.tar\.gz --- netbook-launcher-efl-0.3.2.orig/debian/changelog +++ netbook-launcher-efl-0.3.2/debian/changelog @@ -0,0 +1,98 @@ +netbook-launcher-efl (0.3.2-1ppa4) maverick; urgency=low + + [ Oliver Grawert ] + * fix favorites creation (LP: #628204), thanks to Christopher Michael + for the patch + * fix themeing issue which incorrectly used color3 for a RECT part, color3 + is only used for TEXT or TEXTBLOCK parts, thanks to Christopher Michael + + + [ Martin Owens (DoctorMO) ] + * Removal of netbook-launcher recommends and version bump. + + -- Martin Owens (DoctorMO) Wed, 18 May 2011 08:48:55 -0400 + +netbook-launcher-efl (0.3.2-0ubuntu3) maverick; urgency=low + + * debian/control: Fix libevas-svn-05-engines-x dependency to *-06-* to get + the package installable. + + -- Martin Pitt Wed, 04 Aug 2010 15:12:49 +0200 + +netbook-launcher-efl (0.3.2-0ubuntu2) maverick; urgency=low + + * upgrade to new efl stack + + bump various -dev package efl build depends requirements to + latest version in maverick + + use liblauncher-dev + * backout changes applied upstream + - src/launcher/win.c + - src/launcher/places_storage.c + + -- Alexander Sack Tue, 03 Aug 2010 15:12:16 +0200 + +netbook-launcher-efl (0.2.6-0ubuntu2) lucid; urgency=low + + [ Michael Terry ] + * src/launcher/win.c: + - Backported patch from trunk to fix focus for newly launched apps. + LP: #528887 + + [ Alexander Sack ] + * src/launcher/places_storage.c: + - fix LP: #558648 - netbook-launcher-efl occasionally displays cryptic + error messages; we display proper error message rather than error uuid + + -- Alexander Sack Mon, 26 Apr 2010 11:39:05 +0200 + +netbook-launcher-efl (0.2.6-0ubuntu1) lucid; urgency=low + + * New upstream release. + - Logout icon removed. (LP: #525839) + - The launcher now uses libunique. (LP: #525854) + - Increased vertial distance between icons. (LP: #516863) + - No longer use HAL to keep track of removable media. (LP: #522848) + - Now shows focus when using keyboard navigation. (LP: #520502) + + -- Steve Kowalik Fri, 26 Feb 2010 13:24:34 +1100 + +netbook-launcher-efl (0.2.2-0ubuntu3) lucid; urgency=low + + * make netbook-launcher-efl installable side by side to netbook-launcher + (thx to Didier aka didrocks for helping on this) + + drop Conflicts/Replaces: netbook-launcher from debian/control + + add patch to install autostart .desktop in /etc/xdg/xdg-une-efl/ + + add a session une-efl.desktop to /usr/share/xsesssions/ + * recomment netbook-launcher as that ensures that netbook-launcher-efl + gets started + * build depend on liblauncher-0.1-dev + + -- Alexander Sack Wed, 17 Feb 2010 19:33:15 +0100 + +netbook-launcher-efl (0.2.2-0ubuntu2) lucid; urgency=low + + * demote gnome-web-photo to Suggests (see MIR lp:512343) + + -- Alexander Sack Wed, 27 Jan 2010 18:36:45 +0100 + +netbook-launcher-efl (0.2.2-0ubuntu1) lucid; urgency=low + + [ Michael Terry ] + * New upstream release + + [ Luis Felipe Strano Moraes ] + * debian/control: Add missing libevas-svn-05-engines-x dependency + + -- Michael Terry Thu, 14 Jan 2010 15:35:46 -0500 + +netbook-launcher-efl (0.2.0.0-0ubuntu1) lucid; urgency=low + + [ Michael Terry ] + * New upstream release + * Ported to dh7 + * Used DEP-5 for copyright + + [ Jamie Bennett ] + * Initial release (LP: #490860) + + -- Michael Terry Tue, 22 Dec 2009 19:26:32 -0500 --- netbook-launcher-efl-0.3.2.orig/debian/copyright +++ netbook-launcher-efl-0.3.2/debian/copyright @@ -0,0 +1,22 @@ +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59 +Name: Netbook Launcher EFL +Maintainer: OEM Services Engineering Team +Source: https://launchpad.net/launch-lite-proj/+download + +Files: * +Copyright: 2009 Canonical Ltd. +License: GPL-3 + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License version 3, as published + by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranties of + MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR + PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program. If not, see . + + On Debian GNU/Linux systems, the complete text of the GNU General + Public License can be found in the /usr/share/common-licenses/GPL-3 file. --- netbook-launcher-efl-0.3.2.orig/debian/compat +++ netbook-launcher-efl-0.3.2/debian/compat @@ -0,0 +1 @@ +7 --- netbook-launcher-efl-0.3.2.orig/debian/rules +++ netbook-launcher-efl-0.3.2/debian/rules @@ -0,0 +1,3 @@ +#!/usr/bin/make -f +%: + dh $@ --- netbook-launcher-efl-0.3.2.orig/debian/une-efl.desktop +++ netbook-launcher-efl-0.3.2/debian/une-efl.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Ubuntu Netbook Edition 2D +Comment=This session logs you into a 2D Ubuntu Netbook Edition +Exec=gnome-session +TryExec=gnome-session +Icon= +Type=Application +X-Ubuntu-Gettext-Domain=une-session + --- netbook-launcher-efl-0.3.2.orig/src/launcher/main.c +++ netbook-launcher-efl-0.3.2/src/launcher/main.c @@ -31,6 +31,9 @@ #include #include #include +#include + +#define COMMAND_ADD_FAVORITE 1 struct prefs _nl_prefs = {NULL}; int EVENT_ICON_INFO_ENTER = 0; @@ -95,6 +98,47 @@ win_quit_show(win); } +static void +_add_favorite(const char *favorite) +{ + gchar *uid = NULL; + + if (!favorite) return; + + INF("Add Favorite: %s\n", favorite); + + if ((g_str_has_prefix(favorite, "file://")) || + (g_str_has_prefix(favorite, "http://")) || + (g_str_has_prefix(favorite, "https://"))) + { + LauncherFavorites *favs; + + favs = launcher_favorites_get_default(); + if (g_str_has_suffix(favorite, ".desktop")) + { + gchar *uri; + + uri = g_filename_from_uri(favorite, NULL, NULL); + if (uri) + { + uid = g_strdup_printf("app-%d", (gint)time(NULL)); + launcher_favorites_set_string(favs, uid, "type", "application"); + launcher_favorites_set_string(favs, uid, "desktop_file", uri); + launcher_favorites_add_favorite(favs, uid); + g_free(uri); + } + } + else + { + uid = g_strdup_printf("uri-%d", (gint)time(NULL)); + launcher_favorites_set_string(favs, uid, "type", "uri"); + launcher_favorites_set_string(favs, uid, "uri", favorite); + launcher_favorites_set_string(favs, uid, "name", favorite); + launcher_favorites_add_favorite(favs, uid); + } + } +} + static void _showing_desktop_changed(WnckScreen *screen, Evas_Object *win) { @@ -381,6 +425,7 @@ ECORE_GETOPT_CALLBACK_ARGS ('g', "geometry", "window geometry to use.", "X:Y:W:H", ecore_getopt_callback_geometry_parse, NULL), + ECORE_GETOPT_STORE_STR('a', "add-favorite", "add location to favorites"), ECORE_GETOPT_STORE_INT('d', "debug", "debug level (see -q and -v)"), ECORE_GETOPT_COUNT('q', "quiet", "print out less information"), ECORE_GETOPT_COUNT('v', "verbose", "print out more information"), @@ -401,9 +446,11 @@ Eina_Bool quit_option = 0; int debug_level = EINA_LOG_LEVEL_WARN; Eina_Rectangle geometry = {-1, -1, -1, -1}; + char *add_favorite = NULL; char *theme = NULL, realtheme[PATH_MAX]; Ecore_Getopt_Value values[] = { ECORE_GETOPT_VALUE_PTR_CAST(geometry), + ECORE_GETOPT_VALUE_STR(add_favorite), ECORE_GETOPT_VALUE_INT(debug_level), ECORE_GETOPT_VALUE_INT(debug_level), ECORE_GETOPT_VALUE_INT(debug_level), @@ -479,15 +526,23 @@ goto shutdown_sound; } - /* Make sure we're the only NLE */ - unique = unique_app_new_with_commands ("net.launchpad.launch-lite-proj", NULL, NULL, NULL); - if (unique_app_is_running (unique)) - { - ERR("already running.\n"); - /* Show other instance before we go */ - wnck_screen_toggle_showing_desktop (wnck_screen_get_default(), TRUE); - goto shutdown_gstuff; - } + /* Make sure we're the only NLE */ + unique = unique_app_new_with_commands ("net.launchpad.launch-lite-proj", NULL, NULL, NULL); + if (unique_app_is_running (unique)) + { + if (add_favorite) _add_favorite(add_favorite); + + ERR("already running.\n"); + + /* Show other instance before we go */ + wnck_screen_toggle_showing_desktop (wnck_screen_get_default(), TRUE); + + goto shutdown_gstuff; + } + else + { + if (add_favorite) _add_favorite(add_favorite); + } win = win_add(); if (!win) --- netbook-launcher-efl-0.3.2.orig/data/themes/alternative/alternative.edc +++ netbook-launcher-efl-0.3.2/data/themes/alternative/alternative.edc @@ -1703,7 +1703,6 @@ description { state: "default" 0.0; color: 255 255 255 0; - color3: 0 0 0 255; visible: 0; rel1 { relative: 0.0 0.0; @@ -3241,7 +3240,6 @@ description { state: "default" 0.0; color: 255 255 255 0; - color3: 0 0 0 255; visible: 0; rel1 { relative: 0.0 0.0; --- netbook-launcher-efl-0.3.2.orig/data/themes/default/default.edc +++ netbook-launcher-efl-0.3.2/data/themes/default/default.edc @@ -1623,7 +1623,6 @@ description { state: "default" 0.0; color: 255 255 255 0; - color3: 0 0 0 255; visible: 0; rel1 { relative: 0.0 0.0; @@ -1978,7 +1977,6 @@ description { state: "default" 0.0; color: 255 255 255 0; - color3: 0 0 0 255; visible: 0; rel1 { relative: 0.0 0.0; @@ -3125,7 +3123,6 @@ description { state: "default" 0.0; color: 255 255 255 0; - color3: 0 0 0 255; visible: 0; rel1 { relative: 0.0 0.0; --- netbook-launcher-efl-0.3.2.orig/data/desktop/Makefile.in +++ netbook-launcher-efl-0.3.2/data/desktop/Makefile.in @@ -229,7 +229,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ MAINTAINERCLEANFILES = Makefile.in -desktopdir = $(sysconfdir)/xdg/autostart +desktopdir = $(sysconfdir)/xdg/xdg-une-efl/autostart desktop_DATA = netbook-launcher-efl.desktop EXTRA_DIST = netbook-launcher-efl.desktop all: all-am --- netbook-launcher-efl-0.3.2.orig/data/desktop/Makefile.am +++ netbook-launcher-efl-0.3.2/data/desktop/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -desktopdir=$(sysconfdir)/xdg/autostart +desktopdir=$(sysconfdir)/xdg/xdg-une-efl/autostart desktop_DATA=netbook-launcher-efl.desktop EXTRA_DIST=netbook-launcher-efl.desktop