Set bugzilla information in desktop file and add it to POTFILES.in

2006-05-15  Xavier Claessens  <xclaesse@gmail.com>

	* configure.ac:
	* data/empathy.desktop.in:
	* data/Makefile.am:
	* data/empathy.desktop.in.in:
	* po/POTFILES.in: Set bugzilla information in desktop file and add it
	to POTFILES.in

svn path=/trunk/; revision=68

diff --git a/ChangeLog b/ChangeLog
index f818e2b8c914356e1ee25e7cbb4b8e47dbe6dcd1..7a3ce4ce9a0a4005bc80d81bc79c19c9eec9c4ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-05-15  Xavier Claessens  <xclaesse@gmail.com>
+
+       * configure.ac:
+       * data/empathy.desktop.in:
+       * data/Makefile.am:
+       * data/empathy.desktop.in.in:
+       * po/POTFILES.in: Set bugzilla information in desktop file and add it 
+       to POTFILES.in
+
 2006-05-15  Xavier Claessens  <xclaesse@gmail.com>
 
        * libempathy-gtk/empathy-status-icon.glade:

diff --git a/configure.ac b/configure.ac
index f301507a014b6c3e6f30c5a700d7fbd08d907355..49ca613ca18b65e1bd12e731ac1ef45e1ffc63e8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(Empathy, 0.4)
+AC_INIT(Empathy, 0.4, http://bugzilla.gnome.org/browse.cgi?product=empathy)
 AC_PREREQ(2.59)
 AC_COPYRIGHT([Copyright (C) 2003-2007 Imendio AB])
 
@@ -26,7 +26,7 @@ GTK_REQUIRED=2.10.0
 GCONF_REQUIRED=1.2.0
 LIBGLADE_REQUIRED=2.0.0
 TELEPATHY_REQUIRED=0.0.51
-MISSION_CONTROL_REQUIRED=0.21
+MISSION_CONTROL_REQUIRED=4.22
 
 IDT_COMPILE_WARNINGS
 
@@ -36,6 +36,9 @@ AC_SUBST(GLIB_GENMARSHAL)
 pluginlibdir=`$PKG_CONFIG mission-control --variable=pluginlibdir`
 AC_SUBST(pluginlibdir)
 
+BUGZILLA_COMPONENT=General
+AC_SUBST(BUGZILLA_COMPONENT)
+
 dnl -----------------------------------------------------------
 dnl Language Support
 dnl -----------------------------------------------------------
@@ -85,6 +88,7 @@ dnl -----------------------------------------------------------
 AC_OUTPUT([
   Makefile
   data/Makefile
+  data/empathy.desktop.in
   data/16x16/Makefile
   data/22x22/Makefile
   data/32x32/Makefile

diff --git a/data/Makefile.am b/data/Makefile.am
index 093565c87d2ef8c67ec8f3e76bfc6c87f070f83a..eca5bf4a2830734b8fa394ecfc6c501853b835c2 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -43,11 +43,13 @@ endif
 
 EXTRA_DIST =                           \
        $(image_DATA)                   \
-       $(autostart_DATA)               \
        $(profile_DATA)                 \
+       $(autostart_in_files)           \
+       $(autostart_DATA)               \
        $(schemas_in_files)             \
        $(schemas_DATA)
 
-DISTCLEANFILES =               \
+DISTCLEANFILES =                       \
+       $(autostart_DATA)               \
        $(schemas_DATA)
 

diff --git a/data/empathy.desktop.in b/data/empathy.desktop.in
deleted file mode 100644 (file)
index 1729f42..0000000
--- a/data/empathy.desktop.in
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-_Name=Empathy
-_Comment=Gnome Instant Messaging Client
-Icon=empathy
-Exec=empathy
-Terminal=false
-Type=Application
-Categories=GNOME;GTK;Network;InstantMessaging;
-OnlyShowIn=GNOME
-

diff --git a/data/empathy.desktop.in.in b/data/empathy.desktop.in.in
new file mode 100644 (file)
index 0000000..9dcaf0d
--- /dev/null
+++ b/data/empathy.desktop.in.in
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+_Name=Empathy Instant Messenger
+_Comment=Instant Messenger
+Exec=empathy
+Icon=empathy
+StartupNotify=false
+Terminal=false
+Type=Application
+Categories=GNOME;GTK;Network;InstantMessaging;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=empathy
+X-GNOME-Bugzilla-Component=@BUGZILLA_COMPONENT@
+X-GNOME-Bugzilla-Version=@VERSION@

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 42d79f7f3300a7a35c6291c5fe8bc6af30d700ca..7079f4cb331f0ffeb691b9ae497430db90189ef0 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,7 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 
+data/empathy.desktop.in
 data/empathy.schemas.in
 
 libempathy/gossip-contact.c