Move data files into their own directory.
--- a/.hgignore Fri Nov 07 14:27:34 2014 -0500
+++ b/.hgignore Sat Nov 08 01:01:06 2014 -0500
@@ -73,7 +73,7 @@
libpurple/dbus-types.[ch]
libpurple/example/nullclient
-libpurple/gconf/purple.schemas$+libpurple/data/gconf/purple.schemas$ libpurple/marshallers.[ch]
libpurple/plugins/dbus-example-bindings.c
libpurple/plugins/perl/common/Makefile.PL$
@@ -111,10 +111,10 @@
+pidgin/data/pidgin.desktop$ +pidgin/data/pidgin.desktop.in$ pidgin/pixmaps/emotes/default/24/theme
pidgin/pixmaps/emotes/none/theme
pidgin/pixmaps/emotes/small/16/theme
--- a/Makefile.am Fri Nov 07 14:27:34 2014 -0500
+++ b/Makefile.am Sat Nov 08 01:01:06 2014 -0500
@@ -13,7 +13,6 @@
@@ -83,20 +82,7 @@
-DESKTOP_FILE=pidgin.desktop-appsdir = $(datadir)/applications-apps_in_files = pidgin.desktop.in-apps_DATA = $(apps_in_files:.desktop.in=.desktop)-# silenced INTLTOOL_DESKTOP_RULE-%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po)- $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ > /dev/null@@ -157,5 +143,5 @@
distuninstallcheck_listfiles = \
find . -type f -print | grep -v perl | grep -v Purple.3pm | grep -v Pidgin.3pm
-DISTCLEANFILES= $(DESKTOP_FILE) libpurple/gconf/purple.schemas intltool-extract \+DISTCLEANFILES= libpurple/gconf/purple.schemas intltool-extract \ intltool-merge intltool-update package_revision_raw.txt
--- a/configure.ac Fri Nov 07 14:27:34 2014 -0500
+++ b/configure.ac Sat Nov 08 01:01:06 2014 -0500
@@ -3028,8 +3028,9 @@
- pidgin/pidgin-3-uninstalled.pc+ pidgin/data/pidgin.desktop.in + pidgin/data/pidgin-3.pc + pidgin/data/pidgin-3-uninstalled.pc pidgin/pixmaps/emotes/default/24/Makefile
pidgin/pixmaps/emotes/small/16/Makefile
@@ -3047,10 +3048,10 @@
pidgin/win32/pidgin_dll_rc.rc
pidgin/win32/pidgin_exe_rc.rc
+ libpurple/data/gconf/Makefile + libpurple/data/purple-3.pc + libpurple/data/purple-3-uninstalled.pc libpurple/example/Makefile
- libpurple/gconf/Makefile- libpurple/purple-3-uninstalled.pc libpurple/plugins/Makefile
libpurple/plugins/keyrings/Makefile
libpurple/plugins/mono/Makefile
@@ -3092,7 +3093,6 @@
finch/libgnt/wms/Makefile
--- a/libpurple/Makefile.am Fri Nov 07 14:27:34 2014 -0500
+++ b/libpurple/Makefile.am Sat Nov 08 01:01:06 2014 -0500
@@ -12,11 +12,11 @@
- purple-3-uninstalled.pc.in \+ data/purple-3-uninstalled.pc.in \ @@ -30,12 +30,9 @@
-pkgconfigdir = $(libdir)/pkgconfig-pkgconfig_DATA = purple-3.pc SUBDIRS = $(GCONF_DIR) . plugins protocols tests example
@@ -403,6 +400,9 @@
$(addprefix $(srcdir)/media/, $(purple_mediaheaders))
+pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = data/purple-3.pc libpurple_la_DEPENDENCIES = \
$(STATIC_LINK_LIBS) $(LIBPURPLE_WIN32RES)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/data/gconf/Makefile.am Sat Nov 08 01:01:06 2014 -0500
@@ -0,0 +1,21 @@
+schemadir = @GCONF_SCHEMA_FILE_DIR@ +EXTRA_DIST = purple.schemas.in +schema_in_files = purple.schemas.in +schema_DATA = $(schema_in_files:.schemas.in=.schemas) +# silenced INTLTOOL_SCHEMAS_RULE +%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) + $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ > /dev/null +if GCONF_SCHEMAS_INSTALL + LANG=en GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 2>&1 | \ + grep -v "^WARNING: failed to install schema" | grep -v "^Attached schema" 1>&2 || true +endif #GCONF_SCHEMAS_INSTALL --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/data/gconf/purple.schemas.in Sat Nov 08 01:01:06 2014 -0500
@@ -0,0 +1,276 @@
+ <key>/schemas/desktop/gnome/url-handlers/aim/enabled</key> + <applyto>/desktop/gnome/url-handlers/aim/enabled</applyto> + <default>true</default> + <short>Whether the specified command should handle "aim" URLs</short> + <long>True if the command specified in the "command" key should handle "aim" URLs.</long> + <key>/schemas/desktop/gnome/url-handlers/aim/command</key> + <applyto>/desktop/gnome/url-handlers/aim/command</applyto> + <default>purple-url-handler "%s"</default> + <short>The handler for "aim" URLs</short> + <long>The command used to handle "aim" URLs, if enabled.</long> + <key>/schemas/desktop/gnome/url-handlers/aim/needs_terminal</key> + <applyto>/desktop/gnome/url-handlers/aim/needs_terminal</applyto> + <default>false</default> + <short>Run the command in a terminal</short> + <long>True if the command used to handle this type of URL should be run in a terminal.</long> + <key>/schemas/desktop/gnome/url-handlers/gg/enabled</key> + <applyto>/desktop/gnome/url-handlers/gg/enabled</applyto> + <default>true</default> + <short>Whether the specified command should handle "gg" URLs</short> + <long>True if the command specified in the "command" key should handle "gg" URLs.</long> + <key>/schemas/desktop/gnome/url-handlers/gg/command</key> + <applyto>/desktop/gnome/url-handlers/gg/command</applyto> + <default>purple-url-handler "%s"</default> + <short>The handler for "gg" URLs</short> + <long>The command used to handle "gg" URLs, if enabled.</long> + <key>/schemas/desktop/gnome/url-handlers/gg/needs_terminal</key> + <applyto>/desktop/gnome/url-handlers/gg/needs_terminal</applyto> + <default>false</default> + <short>Run the command in a terminal</short> + <long>True if the command used to handle this type of URL should be run in a terminal.</long> + <key>/schemas/desktop/gnome/url-handlers/icq/enabled</key> + <applyto>/desktop/gnome/url-handlers/icq/enabled</applyto> + <default>true</default> + <short>Whether the specified command should handle "icq" URLs</short> + <long>True if the command specified in the "command" key should handle "icq" URLs.</long> + <key>/schemas/desktop/gnome/url-handlers/icq/command</key> + <applyto>/desktop/gnome/url-handlers/icq/command</applyto> + <default>purple-url-handler "%s"</default> + <short>The handler for "icq" URLs</short> + <long>The command used to handle "icq" URLs, if enabled.</long> + <key>/schemas/desktop/gnome/url-handlers/icq/needs_terminal</key> + <applyto>/desktop/gnome/url-handlers/icq/needs_terminal</applyto> + <default>false</default> + <short>Run the command in a terminal</short> + <long>True if the command used to handle this type of URL should be run in a terminal.</long> + <key>/schemas/desktop/gnome/url-handlers/irc/enabled</key> + <applyto>/desktop/gnome/url-handlers/irc/enabled</applyto> + <default>true</default> + <short>Whether the specified command should handle "irc" URLs</short> + <long>True if the command specified in the "command" key should handle "irc" URLs.</long> + <key>/schemas/desktop/gnome/url-handlers/irc/command</key> + <applyto>/desktop/gnome/url-handlers/irc/command</applyto> + <default>purple-url-handler "%s"</default> + <short>The handler for "irc" URLs</short> + <long>The command used to handle "irc" URLs, if enabled.</long> + <key>/schemas/desktop/gnome/url-handlers/irc/needs_terminal</key> + <applyto>/desktop/gnome/url-handlers/irc/needs_terminal</applyto> + <default>false</default> + <short>Run the command in a terminal</short> + <long>True if the command used to handle this type of URL should be run in a terminal.</long> + <key>/schemas/desktop/gnome/url-handlers/msnim/enabled</key> + <applyto>/desktop/gnome/url-handlers/msnim/enabled</applyto> + <default>true</default> + <short>Whether the specified command should handle "msnim" URLs</short> + <long>True if the command specified in the "command" key should handle "msnim" URLs.</long> + <key>/schemas/desktop/gnome/url-handlers/msnim/command</key> + <applyto>/desktop/gnome/url-handlers/msnim/command</applyto> + <default>purple-url-handler "%s"</default> + <short>The handler for "msnim" URLs</short> + <long>The command used to handle "msnim" URLs, if enabled.</long> + <key>/schemas/desktop/gnome/url-handlers/msnim/needs_terminal</key> + <applyto>/desktop/gnome/url-handlers/msnim/needs_terminal</applyto> + <default>false</default> + <short>Run the command in a terminal</short> + <long>True if the command used to handle this type of URL should be run in a terminal.</long> + <key>/schemas/desktop/gnome/url-handlers/sip/enabled</key> + <applyto>/desktop/gnome/url-handlers/sip/enabled</applyto> + <default>true</default> + <short>Whether the specified command should handle "sip" URLs</short> + <long>True if the command specified in the "command" key should handle "sip" URLs.</long> + <key>/schemas/desktop/gnome/url-handlers/sip/command</key> + <applyto>/desktop/gnome/url-handlers/sip/command</applyto> + <default>purple-url-handler "%s"</default> + <short>The handler for "sip" URLs</short> + <long>The command used to handle "sip" URLs, if enabled.</long> + <key>/schemas/desktop/gnome/url-handlers/sip/needs_terminal</key> + <applyto>/desktop/gnome/url-handlers/sip/needs_terminal</applyto> + <default>false</default> + <short>Run the command in a terminal</short> + <long>True if the command used to handle this type of URL should be run in a terminal.</long> + <key>/schemas/desktop/gnome/url-handlers/xmpp/enabled</key> + <applyto>/desktop/gnome/url-handlers/xmpp/enabled</applyto> + <default>true</default> + <short>Whether the specified command should handle "xmpp" URLs</short> + <long>True if the command specified in the "command" key should handle "xmpp" URLs.</long> + <key>/schemas/desktop/gnome/url-handlers/xmpp/command</key> + <applyto>/desktop/gnome/url-handlers/xmpp/command</applyto> + <default>purple-url-handler "%s"</default> + <short>The handler for "xmpp" URLs</short> + <long>The command used to handle "xmpp" URLs, if enabled.</long> + <key>/schemas/desktop/gnome/url-handlers/xmpp/needs_terminal</key> + <applyto>/desktop/gnome/url-handlers/xmpp/needs_terminal</applyto> + <default>false</default> + <short>Run the command in a terminal</short> + <long>True if the command used to handle this type of URL should be run in a terminal.</long> + <key>/schemas/desktop/gnome/url-handlers/ymsgr/enabled</key> + <applyto>/desktop/gnome/url-handlers/ymsgr/enabled</applyto> + <default>true</default> + <short>Whether the specified command should handle "ymsgr" URLs</short> + <long>True if the command specified in the "command" key should handle "ymsgr" URLs.</long> + <key>/schemas/desktop/gnome/url-handlers/ymsgr/command</key> + <applyto>/desktop/gnome/url-handlers/ymsgr/command</applyto> + <default>purple-url-handler "%s"</default> + <short>The handler for "ymsgr" URLs</short> + <long>The command used to handle "ymsgr" URLs, if enabled.</long> + <key>/schemas/desktop/gnome/url-handlers/ymsgr/needs_terminal</key> + <applyto>/desktop/gnome/url-handlers/ymsgr/needs_terminal</applyto> + <default>false</default> + <short>Run the command in a terminal</short> + <long>True if the command used to handle this type of URL should be run in a terminal.</long> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/data/purple-3-uninstalled.pc.in Sat Nov 08 01:01:06 2014 -0500
@@ -0,0 +1,22 @@
+exec_prefix=@exec_prefix@ +datarootdir=@datarootdir@ +abs_builddir=@abs_builddir@ +abs_top_srcdir=@abs_top_srcdir@ +abs_top_builddir=@abs_top_builddir@ +plugindir=${libdir}/purple-@PURPLE_MAJOR_VERSION@ +Description: libpurple is a GLib-based instant messenger library. +Cflags: -I${abs_top_srcdir} -I${abs_top_builddir} +Libs: ${abs_builddir}/libpurple.la --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/data/purple-3.pc.in Sat Nov 08 01:01:06 2014 -0500
@@ -0,0 +1,16 @@
+exec_prefix=@exec_prefix@ +includedir=@includedir@/libpurple +datarootdir=@datarootdir@ +plugindir=${libdir}/purple-@PURPLE_MAJOR_VERSION@ +Description: libpurple is a GLib-based instant messenger library. +Libs: -L${libdir} -lpurple --- a/libpurple/gconf/Makefile.am Fri Nov 07 14:27:34 2014 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-schemadir = @GCONF_SCHEMA_FILE_DIR@-EXTRA_DIST = purple.schemas.in-schema_in_files = purple.schemas.in-schema_DATA = $(schema_in_files:.schemas.in=.schemas)-# silenced INTLTOOL_SCHEMAS_RULE-%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po)- $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ > /dev/null-if GCONF_SCHEMAS_INSTALL- LANG=en GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 2>&1 | \- grep -v "^WARNING: failed to install schema" | grep -v "^Attached schema" 1>&2 || true-endif #GCONF_SCHEMAS_INSTALL--- a/libpurple/gconf/purple.schemas.in Fri Nov 07 14:27:34 2014 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,276 +0,0 @@
- <key>/schemas/desktop/gnome/url-handlers/aim/enabled</key>- <applyto>/desktop/gnome/url-handlers/aim/enabled</applyto>- <default>true</default>- <short>Whether the specified command should handle "aim" URLs</short>- <long>True if the command specified in the "command" key should handle "aim" URLs.</long>- <key>/schemas/desktop/gnome/url-handlers/aim/command</key>- <applyto>/desktop/gnome/url-handlers/aim/command</applyto>- <default>purple-url-handler "%s"</default>- <short>The handler for "aim" URLs</short>- <long>The command used to handle "aim" URLs, if enabled.</long>- <key>/schemas/desktop/gnome/url-handlers/aim/needs_terminal</key>- <applyto>/desktop/gnome/url-handlers/aim/needs_terminal</applyto>- <default>false</default>- <short>Run the command in a terminal</short>- <long>True if the command used to handle this type of URL should be run in a terminal.</long>- <key>/schemas/desktop/gnome/url-handlers/gg/enabled</key>- <applyto>/desktop/gnome/url-handlers/gg/enabled</applyto>- <default>true</default>- <short>Whether the specified command should handle "gg" URLs</short>- <long>True if the command specified in the "command" key should handle "gg" URLs.</long>- <key>/schemas/desktop/gnome/url-handlers/gg/command</key>- <applyto>/desktop/gnome/url-handlers/gg/command</applyto>- <default>purple-url-handler "%s"</default>- <short>The handler for "gg" URLs</short>- <long>The command used to handle "gg" URLs, if enabled.</long>- <key>/schemas/desktop/gnome/url-handlers/gg/needs_terminal</key>- <applyto>/desktop/gnome/url-handlers/gg/needs_terminal</applyto>- <default>false</default>- <short>Run the command in a terminal</short>- <long>True if the command used to handle this type of URL should be run in a terminal.</long>- <key>/schemas/desktop/gnome/url-handlers/icq/enabled</key>- <applyto>/desktop/gnome/url-handlers/icq/enabled</applyto>- <default>true</default>- <short>Whether the specified command should handle "icq" URLs</short>- <long>True if the command specified in the "command" key should handle "icq" URLs.</long>- <key>/schemas/desktop/gnome/url-handlers/icq/command</key>- <applyto>/desktop/gnome/url-handlers/icq/command</applyto>- <default>purple-url-handler "%s"</default>- <short>The handler for "icq" URLs</short>- <long>The command used to handle "icq" URLs, if enabled.</long>- <key>/schemas/desktop/gnome/url-handlers/icq/needs_terminal</key>- <applyto>/desktop/gnome/url-handlers/icq/needs_terminal</applyto>- <default>false</default>- <short>Run the command in a terminal</short>- <long>True if the command used to handle this type of URL should be run in a terminal.</long>- <key>/schemas/desktop/gnome/url-handlers/irc/enabled</key>- <applyto>/desktop/gnome/url-handlers/irc/enabled</applyto>- <default>true</default>- <short>Whether the specified command should handle "irc" URLs</short>- <long>True if the command specified in the "command" key should handle "irc" URLs.</long>- <key>/schemas/desktop/gnome/url-handlers/irc/command</key>- <applyto>/desktop/gnome/url-handlers/irc/command</applyto>- <default>purple-url-handler "%s"</default>- <short>The handler for "irc" URLs</short>- <long>The command used to handle "irc" URLs, if enabled.</long>- <key>/schemas/desktop/gnome/url-handlers/irc/needs_terminal</key>- <applyto>/desktop/gnome/url-handlers/irc/needs_terminal</applyto>- <default>false</default>- <short>Run the command in a terminal</short>- <long>True if the command used to handle this type of URL should be run in a terminal.</long>- <key>/schemas/desktop/gnome/url-handlers/msnim/enabled</key>- <applyto>/desktop/gnome/url-handlers/msnim/enabled</applyto>- <default>true</default>- <short>Whether the specified command should handle "msnim" URLs</short>- <long>True if the command specified in the "command" key should handle "msnim" URLs.</long>- <key>/schemas/desktop/gnome/url-handlers/msnim/command</key>- <applyto>/desktop/gnome/url-handlers/msnim/command</applyto>- <default>purple-url-handler "%s"</default>- <short>The handler for "msnim" URLs</short>- <long>The command used to handle "msnim" URLs, if enabled.</long>- <key>/schemas/desktop/gnome/url-handlers/msnim/needs_terminal</key>- <applyto>/desktop/gnome/url-handlers/msnim/needs_terminal</applyto>- <default>false</default>- <short>Run the command in a terminal</short>- <long>True if the command used to handle this type of URL should be run in a terminal.</long>- <key>/schemas/desktop/gnome/url-handlers/sip/enabled</key>- <applyto>/desktop/gnome/url-handlers/sip/enabled</applyto>- <default>true</default>- <short>Whether the specified command should handle "sip" URLs</short>- <long>True if the command specified in the "command" key should handle "sip" URLs.</long>- <key>/schemas/desktop/gnome/url-handlers/sip/command</key>- <applyto>/desktop/gnome/url-handlers/sip/command</applyto>- <default>purple-url-handler "%s"</default>- <short>The handler for "sip" URLs</short>- <long>The command used to handle "sip" URLs, if enabled.</long>- <key>/schemas/desktop/gnome/url-handlers/sip/needs_terminal</key>- <applyto>/desktop/gnome/url-handlers/sip/needs_terminal</applyto>- <default>false</default>- <short>Run the command in a terminal</short>- <long>True if the command used to handle this type of URL should be run in a terminal.</long>- <key>/schemas/desktop/gnome/url-handlers/xmpp/enabled</key>- <applyto>/desktop/gnome/url-handlers/xmpp/enabled</applyto>- <default>true</default>- <short>Whether the specified command should handle "xmpp" URLs</short>- <long>True if the command specified in the "command" key should handle "xmpp" URLs.</long>- <key>/schemas/desktop/gnome/url-handlers/xmpp/command</key>- <applyto>/desktop/gnome/url-handlers/xmpp/command</applyto>- <default>purple-url-handler "%s"</default>- <short>The handler for "xmpp" URLs</short>- <long>The command used to handle "xmpp" URLs, if enabled.</long>- <key>/schemas/desktop/gnome/url-handlers/xmpp/needs_terminal</key>- <applyto>/desktop/gnome/url-handlers/xmpp/needs_terminal</applyto>- <default>false</default>- <short>Run the command in a terminal</short>- <long>True if the command used to handle this type of URL should be run in a terminal.</long>- <key>/schemas/desktop/gnome/url-handlers/ymsgr/enabled</key>- <applyto>/desktop/gnome/url-handlers/ymsgr/enabled</applyto>- <default>true</default>- <short>Whether the specified command should handle "ymsgr" URLs</short>- <long>True if the command specified in the "command" key should handle "ymsgr" URLs.</long>- <key>/schemas/desktop/gnome/url-handlers/ymsgr/command</key>- <applyto>/desktop/gnome/url-handlers/ymsgr/command</applyto>- <default>purple-url-handler "%s"</default>- <short>The handler for "ymsgr" URLs</short>- <long>The command used to handle "ymsgr" URLs, if enabled.</long>- <key>/schemas/desktop/gnome/url-handlers/ymsgr/needs_terminal</key>- <applyto>/desktop/gnome/url-handlers/ymsgr/needs_terminal</applyto>- <default>false</default>- <short>Run the command in a terminal</short>- <long>True if the command used to handle this type of URL should be run in a terminal.</long>--- a/libpurple/purple-3-uninstalled.pc.in Fri Nov 07 14:27:34 2014 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-exec_prefix=@exec_prefix@-datarootdir=@datarootdir@-abs_builddir=@abs_builddir@-abs_top_srcdir=@abs_top_srcdir@-abs_top_builddir=@abs_top_builddir@-plugindir=${libdir}/purple-@PURPLE_MAJOR_VERSION@-Description: libpurple is a GLib-based instant messenger library.-Cflags: -I${abs_top_srcdir} -I${abs_top_builddir}-Libs: ${abs_builddir}/libpurple.la--- a/libpurple/purple-3.pc.in Fri Nov 07 14:27:34 2014 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-exec_prefix=@exec_prefix@-includedir=@includedir@/libpurple-datarootdir=@datarootdir@-plugindir=${libdir}/purple-@PURPLE_MAJOR_VERSION@-Description: libpurple is a GLib-based instant messenger library.-Libs: -L${libdir} -lpurple--- a/pidgin.desktop.in.in Fri Nov 07 14:27:34 2014 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-_Name=Pidgin Internet Messenger-_GenericName=Internet Messenger-_Comment=Chat over IM. Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more-Categories=Network;InstantMessaging;--- a/pidgin/Makefile.am Fri Nov 07 14:27:34 2014 -0500
+++ b/pidgin/Makefile.am Sat Nov 08 01:01:06 2014 -0500
@@ -5,8 +5,9 @@
- pidgin-3-uninstalled.pc.in \+ data/pidgin.desktop.in \ + data/pidgin-3-uninstalled.pc.in \ win32/pidgin_dll_rc.rc.in \
@@ -31,9 +32,6 @@
-pkgconfigdir = $(libdir)/pkgconfig-pkgconfig_DATA = pidgin-3.pc SUBDIRS = . pixmaps plugins themes
# XXX: should this be lib_, or noinst_?
@@ -233,5 +231,24 @@
+pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = data/pidgin-3.pc +DESKTOP_FILE=data/pidgin.desktop +appsdir = $(datadir)/applications +apps_in_files = data/pidgin.desktop.in +apps_DATA = $(apps_in_files:.desktop.in=.desktop) +# silenced INTLTOOL_DESKTOP_RULE +%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) + $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ > /dev/null +DISTCLEANFILES = $(DESKTOP_FILE) --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/data/pidgin-3-uninstalled.pc.in Sat Nov 08 01:01:06 2014 -0500
@@ -0,0 +1,21 @@
+exec_prefix=@exec_prefix@ +datarootdir=@datarootdir@ +abs_builddir=@abs_builddir@ +abs_top_srcdir=@abs_top_srcdir@ +abs_top_builddir=@abs_top_builddir@ +plugindir=${libdir}/pidgin +Description: Pidgin is a GTK2-based instant messenger application. +Requires: gtk+-2.0 purple-3 +Cflags: -I${abs_top_srcdir} --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/data/pidgin-3.pc.in Sat Nov 08 01:01:06 2014 -0500
@@ -0,0 +1,16 @@
+exec_prefix=@exec_prefix@ +includedir=@includedir@/pidgin +datarootdir=@datarootdir@ +plugindir=${libdir}/pidgin +Description: Pidgin is a GTK2-based instant messenger application. +Requires: @GTK_PC_MODULE@ @WEBKIT_PC_MODULE@ purple-3 +Libs: -L${libdir} -lpidgin --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/data/pidgin.desktop.in.in Sat Nov 08 01:01:06 2014 -0500
@@ -0,0 +1,11 @@
+_Name=Pidgin Internet Messenger +_GenericName=Internet Messenger +_Comment=Chat over IM. Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more +Categories=Network;InstantMessaging; --- a/pidgin/pidgin-3-uninstalled.pc.in Fri Nov 07 14:27:34 2014 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-exec_prefix=@exec_prefix@-datarootdir=@datarootdir@-abs_builddir=@abs_builddir@-abs_top_srcdir=@abs_top_srcdir@-abs_top_builddir=@abs_top_builddir@-plugindir=${libdir}/pidgin-Description: Pidgin is a GTK2-based instant messenger application.-Requires: gtk+-2.0 purple-3-Cflags: -I${abs_top_srcdir}--- a/pidgin/pidgin-3.pc.in Fri Nov 07 14:27:34 2014 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-exec_prefix=@exec_prefix@-includedir=@includedir@/pidgin-datarootdir=@datarootdir@-plugindir=${libdir}/pidgin-Description: Pidgin is a GTK2-based instant messenger application.-Requires: @GTK_PC_MODULE@ @WEBKIT_PC_MODULE@ purple-3-Libs: -L${libdir} -lpidgin--- a/po/POTFILES.in Fri Nov 07 14:27:34 2014 -0500
+++ b/po/POTFILES.in Sat Nov 08 01:01:06 2014 -0500
@@ -46,11 +46,11 @@
libpurple/conversationtypes.c
+libpurple/data/gconf/purple.schemas.in -libpurple/gconf/purple.schemas.in@@ -208,7 +208,7 @@
libpurple/win32/libc_interface.c
+pidgin/data/pidgin.desktop.in
