From a96f677fa6ff22e2194e7d1ce797e4de627cc507 Mon Sep 17 00:00:00 2001 From: jait Date: Mon, 18 Dec 2006 07:41:52 +0000 Subject: [PATCH] move icons and desktop files under data, fix 'make dist' git-svn-id: svn+ssh://garage/svnroot/maemo-recorder/trunk@19 2441f5eb-5316-0410-9386-a49b32a51a4a --- Makefile.am | 22 +++------------------- configure.ac | 5 +++-- data/Makefile.am | 17 +++++++++++++++++ data/maemo_recorder.desktop | 15 +++++++++++++++ data/maemo_recorder.png | Bin 0 -> 2816 bytes data/maemo_recorder.service | 4 ++++ maemo_recorder.desktop | 15 --------------- maemo_recorder.png | Bin 2816 -> 0 bytes maemo_recorder.service | 4 ---- src/Makefile.am | 2 +- 10 files changed, 43 insertions(+), 41 deletions(-) create mode 100644 data/Makefile.am create mode 100644 data/maemo_recorder.desktop create mode 100644 data/maemo_recorder.png create mode 100644 data/maemo_recorder.service delete mode 100644 maemo_recorder.desktop delete mode 100644 maemo_recorder.png delete mode 100644 maemo_recorder.service diff --git a/Makefile.am b/Makefile.am index 205b81f..71af7c6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,20 +1,8 @@ # The subdirs SUBDIRS = src \ - mime + mime \ + data -desktopdir = $(datadir)/applications/hildon -desktop_DATA = maemo_recorder.desktop - -servicedir = /usr/share/dbus-1/services -service_DATA = maemo_recorder.service - -pixmapdir = /usr/share/pixmaps -pixmap_DATA = maemo_recorder.png - -gstplugindir = /usr/lib/gstreamer-0.10 -gstplugin_DATA = data/libgstwavenc.so - -# The backup/restore configuration EXTRA_DIST = \ README \ @@ -24,11 +12,7 @@ EXTRA_DIST = \ debian/compat \ debian/copyright \ debian/control \ - debian/rules \ - debian/hello-world-app.links \ - maemo_recorder.desktop \ - maemo_recorder.service \ - maemo_recorder.png + debian/rules deb: dist -mkdir $(top_builddir)/debian-build diff --git a/configure.ac b/configure.ac index 1befd9d..e66da5e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_INIT(Makefile.am) -AM_INIT_AUTOMAKE(maemo_recorder, 0.0.18) +AM_INIT_AUTOMAKE(maemo-recorder, 0.0.18) AC_PROG_CPP AC_PROG_INSTALL @@ -82,5 +82,6 @@ AC_SUBST(OSSO_UPDATE_MIME) AC_OUTPUT([ Makefile \ src/Makefile \ - mime/Makefile ]) + mime/Makefile \ + data/Makefile ]) diff --git a/data/Makefile.am b/data/Makefile.am new file mode 100644 index 0000000..009044c --- /dev/null +++ b/data/Makefile.am @@ -0,0 +1,17 @@ +desktopdir = $(datadir)/applications/hildon +desktop_DATA = maemo_recorder.desktop + +servicedir = /usr/share/dbus-1/services +service_DATA = maemo_recorder.service + +pixmapdir = $(datadir)/pixmaps +pixmap_DATA = maemo_recorder.png + +gstplugindir = /usr/lib/gstreamer-0.10 +gstplugin_DATA = libgstwavenc.so + +EXTRA_DIST = \ + maemo_recorder.desktop \ + maemo_recorder.service \ + maemo_recorder.png \ + libgstwavenc.so diff --git a/data/maemo_recorder.desktop b/data/maemo_recorder.desktop new file mode 100644 index 0000000..d5fb059 --- /dev/null +++ b/data/maemo_recorder.desktop @@ -0,0 +1,15 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Type=Application +Name=Maemo Recorder +Exec=/usr/bin/maemo_recorder +Icon=maemo_recorder +X-Window-Icon=maemo_recorder +X-Window-Icon-Dimmed=maemo_recorder +X-Icon-path=/usr/share/pixmaps/ +X-HildonDesk-ShowInToolbar=true +X-Osso-Service=com.nokia.maemo_recorder +X-Osso-Type=application/x-executable +MimeType=audio/basic;audio/x-raw-ilbc;audio/x-mp3;audio/x-wav +StartupWMClass=maemo_recorder diff --git a/data/maemo_recorder.png b/data/maemo_recorder.png new file mode 100644 index 0000000000000000000000000000000000000000..01d66be18c7312440c68fc883dfc5bfd0ef6a6db GIT binary patch literal 2816 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 SLr5C{0000ASqIkV})W#jwXId)s$2D2lB)G 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 SLr5C{0000