Author: zecke
Date: 2007-09-18 13:19:48 +0200 (Tue, 18 Sep 2007)
New Revision: 3005
Added:
trunk/src/target/OM-2007.2/applications/openmoko-browser2/data/
trunk/src/target/OM-2007.2/applications/openmoko-browser2/data/.gitignore
trunk/src/target/OM-2007.2/applications/openmoko-browser2/data/Makefile.am
trunk/src/target/OM-2007.2/applications/openmoko-browser2/data/openmoko-browser2.desktop
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-browser2/Makefile.am
trunk/src/target/OM-2007.2/applications/openmoko-browser2/configure.ac
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/.gitignore
trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/Makefile.am
Log:
2007-09-18 Holger Hans Peter Freyther <zecke at selfish.org>
Add a .desktop file for the browser and append the '2'
to the binary and at other places.
* Makefile.am:
* configure.ac:
* data/.gitignore: Added.
* data/Makefile.am: Added.
* data/openmoko-browser2.desktop: Added.
* src/.gitignore:
* src/Makefile.am:
Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog 2007-09-18 01:41:02 UTC (rev 3004)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog 2007-09-18 11:19:48 UTC (rev 3005)
@@ -1,3 +1,16 @@
+2007-09-18 Holger Hans Peter Freyther <zecke at selfish.org>
+
+ Add a .desktop file for the browser and append the '2'
+ to the binary and at other places.
+
+ * Makefile.am:
+ * configure.ac:
+ * data/.gitignore: Added.
+ * data/Makefile.am: Added.
+ * data/openmoko-browser2.desktop: Added.
+ * src/.gitignore:
+ * src/Makefile.am:
+
2007-09-17 Holger Hans Peter Freyther <zecke at selfish.org>
Abuse the progress signal to update the Back, Go
Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/Makefile.am 2007-09-18 01:41:02 UTC (rev 3004)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/Makefile.am 2007-09-18 11:19:48 UTC (rev 3005)
@@ -1,2 +1,2 @@
-SUBDIRS = src po
+SUBDIRS = src data po
Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/configure.ac 2007-09-18 01:41:02 UTC (rev 3004)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/configure.ac 2007-09-18 11:19:48 UTC (rev 3005)
@@ -50,5 +50,6 @@
AC_OUTPUT([
Makefile
src/Makefile
+data/Makefile
po/Makefile.in
])
Copied: trunk/src/target/OM-2007.2/applications/openmoko-browser2/data/.gitignore (from rev 3004, trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/.gitignore)
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/.gitignore 2007-09-18 01:41:02 UTC (rev 3004)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/data/.gitignore 2007-09-18 11:19:48 UTC (rev 3005)
@@ -0,0 +1,14 @@
+stamp*
+intl*
+config.*
+configure
+*.swp
+aclocal.m4
+autom4te.cache
+*.*~
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+mkinstalldirs
Added: trunk/src/target/OM-2007.2/applications/openmoko-browser2/data/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/data/Makefile.am 2007-09-18 01:41:02 UTC (rev 3004)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/data/Makefile.am 2007-09-18 11:19:48 UTC (rev 3005)
@@ -0,0 +1,6 @@
+#
+# desktop integration: .desktop file
+#
+desktopdir = $(datadir)/applications
+dist_desktop_DATA = openmoko-browser2.desktop
+
Added: trunk/src/target/OM-2007.2/applications/openmoko-browser2/data/openmoko-browser2.desktop
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/data/openmoko-browser2.desktop 2007-09-18 01:41:02 UTC (rev 3004)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/data/openmoko-browser2.desktop 2007-09-18 11:19:48 UTC (rev 3005)
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Web Browser
+Comment=Conquer the net
+Exec=openmoko-browser2
+Icon=openmoko-browser2
+Terminal=false
+Type=Application
+Categories=GTK;Application;Office
+MimeType=text/x-vcard;
+SingleInstance=true
+StartupNotify=true
Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/.gitignore
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/.gitignore 2007-09-18 01:41:02 UTC (rev 3004)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/.gitignore 2007-09-18 11:19:48 UTC (rev 3005)
@@ -16,4 +16,4 @@
.deps
*.o
.libs
-openmoko-browser
+openmoko-browser2
Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/Makefile.am 2007-09-18 01:41:02 UTC (rev 3004)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/Makefile.am 2007-09-18 11:19:48 UTC (rev 3005)
@@ -5,11 +5,11 @@
AM_CFLAGS = -Wall -Werror -std=c99 @OPENMOKO_CFLAGS@ @WEBKITGTK_CFLAGS@ @GTHREAD_CFLAGS@
-bin_PROGRAMS = openmoko-browser
+bin_PROGRAMS = openmoko-browser2
EXTRA_DIST = browser-data.h current-page.h go-page.h open-pages-page.h
-openmoko_browser_SOURCES = main.c current-page.c go-page.c open-pages-page.c
-openmoko_browser_LDADD = @OPENMOKO_LIBS@ @WEBKITGTK_LIBS@ @GTHREAD_LIBS@
+openmoko_browser2_SOURCES = main.c current-page.c go-page.c open-pages-page.c
+openmoko_browser2_LDADD = @OPENMOKO_LIBS@ @WEBKITGTK_LIBS@ @GTHREAD_LIBS@
CLEANFILES = $(stamp_files)
DISTCLEANFILES = $(stamp_files)