summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2004-07-22 16:05:12 +0000
committerBastien Nocera <hadess@src.gnome.org>2004-07-22 16:05:12 +0000
commitc61afe76fec8aacdf1c147847e25ade4a6973f43 (patch)
treefb2f20206689c7759e547ee58556fb4c6c83f308
parent6f50dc22a21e95dc5049552049ca5b7892775994 (diff)
downloadtotem-c61afe76fec8aacdf1c147847e25ade4a6973f43.tar.gz
I'm the first kid on my block to add MimeType= to my .desktop files, I
2004-07-22 Bastien Nocera <hadess@hadess.net> * data/Makefile.am: * data/totem.desktop.in: * data/totem.desktop.in.in: I'm the first kid on my block to add MimeType= to my .desktop files, I rock
-rw-r--r--ChangeLog7
-rw-r--r--data/Makefile.am11
-rw-r--r--data/totem.desktop.in.in (renamed from data/totem.desktop.in)0
3 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ea4ed16fd..e8af66368 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-07-22 Bastien Nocera <hadess@hadess.net>
+
+ * data/Makefile.am:
+ * data/totem.desktop.in:
+ * data/totem.desktop.in.in: I'm the first kid on my block to add
+ MimeType= to my .desktop files, I rock
+
2004-07-19 Bastien Nocera <hadess@hadess.net>
* src/totem-stock-icons.c: (totem_named_icons_init): Use g_str_hash
diff --git a/data/Makefile.am b/data/Makefile.am
index 90c2cece5..1163a5f58 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -30,7 +30,7 @@ stuff_DATA = \
pixmapdir = $(datadir)/pixmaps
pixmap_DATA = media-player-48.png vanity.png
-desktop_in_files_all = totem.desktop.in vanity.desktop.in
+desktop_in_files_all = totem.desktop.in.in vanity.desktop.in
if TOTEM_VANITY
desktop_in_files = totem.desktop.in vanity.desktop.in
else
@@ -47,10 +47,15 @@ keysdir = $(datadir)/mime-info/
app_DATA = totem.applications
appdir = $(datadir)/application-registry
+totem.desktop.in: totem.desktop.in.in totem.keys desktop.sh
+ cat $(srcdir)/totem.desktop.in.in > totem.desktop.in &&\
+ $(srcdir)/desktop.sh $(srcdir)/totem.keys \
+ >> totem.desktop.in
+
serverdir = $(libdir)/bonobo/servers
server_DATA = Totem_properties.server
server_in_files = Totem_properties.server.in.in._1 Totem_properties.server.in.in._3 servers.sh
-Totem_properties.server.in.in._2: $(server_in_files) servers.sh totem.keys
+Totem_properties.server.in.in._2: $(server_in_files) totem.keys
$(srcdir)/servers.sh $(srcdir)/totem.keys \
> Totem_properties.server.in.in._2
Totem_properties.server.in.in: $(server_in_files) Totem_properties.server.in.in._2
@@ -87,7 +92,7 @@ else
install-data-local:
endif
-EXTRA_DIST = $(stuff_DATA) $(desktop_in_files_all) $(keys_DATA) $(app_DATA) $(server_in_files) totem.schemas.in lirc_example schemas.sh $(man_MANS)
+EXTRA_DIST = $(stuff_DATA) $(desktop_in_files_all) $(keys_DATA) $(app_DATA) $(server_in_files) totem.schemas.in lirc_example schemas.sh desktop.sh $(man_MANS)
CLEANFILES = *.bak *.gladep core* *.orig *~ $(desktop_DATA) $(schema_DATA)
diff --git a/data/totem.desktop.in b/data/totem.desktop.in.in
index e18000a0a..e18000a0a 100644
--- a/data/totem.desktop.in
+++ b/data/totem.desktop.in.in