SF.net SVN: geany: [2106] trunk

[eht16 at users.sourceforge.net]

Revision: 2106
          http://geany.svn.sourceforge.net/geany/?rev=2106&view=rev
Author:   eht16
Date:     2007-12-17 09:20:55 -0800 (Mon, 17 Dec 2007)

Log Message:
-----------
Avoid full path for icon entry.
Add file HACKING and classviewer icons.
Prevent installing geany.desktop twice.   

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/Makefile.am
    trunk/geany.desktop.in.in
    trunk/geany.spec.in

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-12-17 16:58:26 UTC (rev 2105)
+++ trunk/ChangeLog	2007-12-17 17:20:55 UTC (rev 2106)
@@ -6,6 +6,9 @@
    Add VTE preference to skip the generated run script. when running
    commands in the VTE.
    Make vte_cwd() accept also paths not only filenames.
+ * geany.desktop.in.in: Avoid full path for icon entry.
+ * geany.spec.in: Add file HACKING and classviewer icons.
+ * Makefile.am: Prevent installing geany.desktop twice.
 
 
 2007-12-16  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2007-12-17 16:58:26 UTC (rev 2105)
+++ trunk/Makefile.am	2007-12-17 17:20:55 UTC (rev 2106)
@@ -93,8 +93,6 @@
 	rpmbuild -ta $(distdir).tar.gz
 
 
-Applicationsdir = $(datadir)/applications
-Applications_DATA = geany.desktop
 logodir = $(datadir)/pixmaps
 
 desktopdir = $(datadir)/applications

Modified: trunk/geany.desktop.in.in
===================================================================
--- trunk/geany.desktop.in.in	2007-12-17 16:58:26 UTC (rev 2105)
+++ trunk/geany.desktop.in.in	2007-12-17 17:20:55 UTC (rev 2106)
@@ -5,7 +5,7 @@
 _GenericName=Integrated Development Environment
 _Comment=A fast and lightweight IDE using GTK2
 Exec=geany %F
-Icon=@GEANY_PIXMAPS_DIR@/geany.png
+Icon=geany
 Terminal=false
 Categories=GTK;Development;IDE;
 MimeType=text/plain;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;text/x-java;text/x-dsrc;text/x-pascal;text/x-perl;text/x-python;application/x-php;application/x-httpd-php*;application/xml;text/html;text/css;text/x-sql;text/x-diff;

Modified: trunk/geany.spec.in
===================================================================
--- trunk/geany.spec.in	2007-12-17 16:58:26 UTC (rev 2105)
+++ trunk/geany.spec.in	2007-12-17 17:20:55 UTC (rev 2106)
@@ -42,7 +42,7 @@
 
 %files
 %defattr(-, root, root)
-%doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO THANKS
+%doc AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README TODO THANKS
 %{_bindir}/%{name}
 %{_libdir}/geany/
 %{_datadir}/%{name}
@@ -51,3 +51,4 @@
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/doc/%{name}/
 %{_datadir}/man/man1/%{name}.1.gz
+%{_datadir}/icons/hicolor/16x16/apps/classviewer-*.png


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.