summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaromil <jaromil@dyne.org>2011-01-31 11:21:51 (GMT)
committer Jaromil <jaromil@dyne.org>2011-01-31 11:34:36 (GMT)
commitf99fbe97adb4fb4a3bf3dc2c4c2486f4281c2d8e (patch)
treeabc091f2f555e852c915516b0f052a6d47b7ceca
parent0e70a04624325a881fcf0cb01fc9cd5e8742f62d (diff)
desktop integration
-rw-r--r--.gitignore3
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac3
-rw-r--r--share/Makefile.am16
-rw-r--r--share/hasciicam2
-rw-r--r--share/hasciicam.desktop11
-rw-r--r--share/hasciicam.pngbin0 -> 10015 bytes
7 files changed, 33 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 1f0aab2..80ee5cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-hasciicam
+src/hasciicam
*.[oa]
*.so
*.la
@@ -8,7 +8,6 @@ hasciicam
.libs
Makefile
Makefile.in
-hasciicam
autom4te.cache
config.h
config.log
diff --git a/Makefile.am b/Makefile.am
index 3920780..3c7ffad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1 @@
-SUBDIRS = src doc
+SUBDIRS = src doc share
diff --git a/configure.ac b/configure.ac
index 5aa7ce2..1e4c28f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,7 +48,8 @@ AC_C_CONST
AC_CONFIG_FILES([
Makefile
src/Makefile
-doc/Makefile
+doc/Makefile
+share/Makefile
])
AC_OUTPUT
diff --git a/share/Makefile.am b/share/Makefile.am
new file mode 100644
index 0000000..85d0b5d
--- /dev/null
+++ b/share/Makefile.am
@@ -0,0 +1,16 @@
+Applicationsdir = $(datadir)/applications
+Applications_DATA = hasciicam.desktop
+# $(datadir)/app-install/desktop
+
+Menudir = $(datadir)/menu
+Menu_DATA = hasciicam
+
+Iconsdir = $(datadir)/icons
+Icons_DATA = hasciicam.png
+# $(datadir)/app-install/icons
+
+install-data-hook:
+ xdg-icon-resource install --size 64 hasciicam.png dyne-hasciicam
+ update-desktop-database
+ update-menus
+
diff --git a/share/hasciicam b/share/hasciicam
new file mode 100644
index 0000000..fa83284
--- /dev/null
+++ b/share/hasciicam
@@ -0,0 +1,2 @@
+?package(hasciicam):command="hasciicam" icon="/usr/share/icons/hasciicam.xpm" needs="X11" \
+ section="Applications/Video" title="HasciiCam" hints="Live video in text"
diff --git a/share/hasciicam.desktop b/share/hasciicam.desktop
new file mode 100644
index 0000000..f43df4c
--- /dev/null
+++ b/share/hasciicam.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=HasciiCam
+Type=Application
+GenericName=HasciiCam
+Comment=(h)ascii for the masses!
+Exec=hasciicam %U
+TryExec=hasciicam
+Icon=hasciicam.png
+Terminal=false
+Categories=AudioVideo;
+X-AppInstall-Package=hasciicam
diff --git a/share/hasciicam.png b/share/hasciicam.png
new file mode 100644
index 0000000..a102657
--- /dev/null
+++ b/share/hasciicam.png
Binary files differ