SF.net SVN: geany: [2653] trunk

[eht16 at users.sourceforge.net]

Revision: 2653
          http://geany.svn.sourceforge.net/geany/?rev=2653&view=rev
Author:   eht16
Date:     2008-06-06 07:27:08 -0700 (Fri, 06 Jun 2008)

Log Message:
-----------
Rename geany.desktop.in.in in geany.desktop.in as we need to process it only once.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/Makefile.am
    trunk/configure.in

Added Paths:
-----------
    trunk/geany.desktop.in

Removed Paths:
-------------
    trunk/geany.desktop.in.in

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-06-06 14:17:16 UTC (rev 2652)
+++ trunk/ChangeLog	2008-06-06 14:27:08 UTC (rev 2653)
@@ -3,6 +3,9 @@
  * src/ui_utils.c:
    Display current file position in the status bar when compiled
    with GEANY_DEBUG.
+ * configure.in, Makefile.am, geany.desktop.in.in, geany.desktop.in:
+   Rename geany.desktop.in.in in geany.desktop.in as we need to
+   process it only once.
 
 
 2008-06-06  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2008-06-06 14:17:16 UTC (rev 2652)
+++ trunk/Makefile.am	2008-06-06 14:27:08 UTC (rev 2653)
@@ -104,6 +104,6 @@
 pkgconfigdir = $(libdir)/pkgconfig
 
 desktopdir = $(datadir)/applications
-desktop_in_files = geany.desktop.in
+desktop_in_files = geany.desktop
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2008-06-06 14:17:16 UTC (rev 2652)
+++ trunk/configure.in	2008-06-06 14:27:08 UTC (rev 2653)
@@ -255,7 +255,6 @@
 doc/Makefile
 doc/geany.1
 geany.spec
-geany.desktop.in
 geany.pc
 doc/Doxyfile
 ])

Copied: trunk/geany.desktop.in (from rev 2649, trunk/geany.desktop.in.in)
===================================================================
--- trunk/geany.desktop.in	                        (rev 0)
+++ trunk/geany.desktop.in	2008-06-06 14:27:08 UTC (rev 2653)
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+_Name=Geany
+_GenericName=Integrated Development Environment
+_Comment=A fast and lightweight IDE using GTK2
+Exec=geany %F
+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;
+StartupNotify=true

Deleted: trunk/geany.desktop.in.in
===================================================================
--- trunk/geany.desktop.in.in	2008-06-06 14:17:16 UTC (rev 2652)
+++ trunk/geany.desktop.in.in	2008-06-06 14:27:08 UTC (rev 2653)
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-_Name=Geany
-_GenericName=Integrated Development Environment
-_Comment=A fast and lightweight IDE using GTK2
-Exec=geany %F
-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;
-StartupNotify=true


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