Rev 10: Install metadata, add checks for validity. in file:///home/jelmer/bzr.samba-gtk/trunk/

Jelmer Vernooij jelmer at samba.org
Mon Feb 26 16:09:02 GMT 2007


At file:///home/jelmer/bzr.samba-gtk/trunk/

------------------------------------------------------------
revno: 10
revision-id: jelmer at samba.org-20070226160858-3jx787k7aboadwi2
parent: jelmer at samba.org-20070226155744-rod0t0uhegjyvo8q
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Mon 2007-02-26 17:08:58 +0100
message:
  Install metadata, add checks for validity.
modified:
  Makefile                       makefile-20070212012504-sw14j7mksqsaqr1p-1
  Makefile.settings.in           makefile.settings.in-20070212012504-sw14j7mksqsaqr1p-2
  configure.ac                   config.m4-20070212012142-xd81qmuy498gj3wa-3
  meta/gepdump.desktop           gepdump.desktop-20070212012142-xd81qmuy498gj3wa-27
  meta/gregedit.desktop          gregedit.desktop-20070212012142-xd81qmuy498gj3wa-28
  meta/gwcrontab.desktop         gwcrontab.desktop-20070212012142-xd81qmuy498gj3wa-29
=== modified file 'Makefile'
--- a/Makefile	2007-02-26 15:57:44 +0000
+++ b/Makefile	2007-02-26 16:08:58 +0000
@@ -19,6 +19,8 @@
 	$(INSTALL) -m 0755 $(BINS) $(bindir)
 	$(INSTALL) -m 0755 $(LIB) $(libdir)
 	$(INSTALL) -m 0644 gtksamba.pc $(pcdir)
+	$(INSTALL) -d $(appdir)
+	$(INSTALL) -m 0644 meta/* $(appdir)
 
 install-doc::
 	$(INSTALL) -m 0644 $(MANPAGES) $(man1dir)
@@ -27,8 +29,12 @@
 	aclocal
 	autoconf -f
 
-test::
-	# No tests yet, sorry
+check:: test
+
+%.desktop-validate: %.desktop
+	$(DESKTOP_VALIDATE) $<
+
+test:: $(patsubst %.desktop,%.desktop-validate,$(wildcard meta/*.desktop))
 
 Makefile.settings: configure
 	./configure

=== modified file 'Makefile.settings.in'
--- a/Makefile.settings.in	2007-02-26 15:57:44 +0000
+++ b/Makefile.settings.in	2007-02-26 16:08:58 +0000
@@ -37,5 +37,8 @@
 datarootdir = @datarootdir@
 mandir = @mandir@
 man1dir = $(mandir)/man1
+appdir = $(datarootdir)/applications
 
 INSTALL = @INSTALL@
+
+DESKTOP_VALIDATE = @DESKTOP_VALIDATE@

=== modified file 'configure.ac'
--- a/configure.ac	2007-02-26 15:43:33 +0000
+++ b/configure.ac	2007-02-26 16:08:58 +0000
@@ -2,6 +2,7 @@
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PATH_PROG(XSLTPROC, xsltproc)
+AC_PATH_PROG(DESKTOP_VALIDATE, desktop-file-validate)
 
 PKG_CHECK_MODULES(GTK, [glib-2.0 gtk+-2.0 >= 2.4])
 PKG_CHECK_MODULES(TALLOC, [talloc])

=== modified file 'meta/gepdump.desktop'
--- a/meta/gepdump.desktop	2007-02-12 01:52:48 +0000
+++ b/meta/gepdump.desktop	2007-02-26 16:08:58 +0000
@@ -4,7 +4,7 @@
 Comment=Show DCE/RPC endpoint mapper
 Exec=gepdump
 #Icon=media-player-48.png
+Type=Application
 Terminal=false
-Type=Application
-Categories=GNOME;GTK;Application;DCE/RPC;Endpoint;Samba;
+Categories=GNOME;GTK;RemoteAccess;Profiling;
 StartupNotify=true

=== modified file 'meta/gregedit.desktop'
--- a/meta/gregedit.desktop	2007-02-12 01:52:48 +0000
+++ b/meta/gregedit.desktop	2007-02-26 16:08:58 +0000
@@ -6,5 +6,5 @@
 #Icon=media-player-48.png
 Terminal=false
 Type=Application
-Categories=GNOME;GTK;Application;Registry;Samba;
+Categories=GNOME;GTK;RemoteAccess;
 StartupNotify=true

=== modified file 'meta/gwcrontab.desktop'
--- a/meta/gwcrontab.desktop	2007-02-12 01:52:48 +0000
+++ b/meta/gwcrontab.desktop	2007-02-26 16:08:58 +0000
@@ -1,10 +1,9 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Windows Job Scheduler
-Comment=Windows Job Scheduler
+Comment=View and plan jobs on remote Windows hosts
 Exec=gwcrontab
-#Icon=media-player-48.png
 Terminal=false
 Type=Application
-Categories=GNOME;GTK;Application;Crontab;At;Samba;
+Categories=GNOME;GTK;RemoteAccess;
 StartupNotify=true



More information about the samba-cvs mailing list