Move data files into their own directory.

18 files changed, 45 insertions, 40 deletions

diff --git a/.hgignore b/.hgignore
index d0c77eadfe..d25ee4bbb9 100644
--- a/.hgignore
+++ b/.hgignore
@@ -56,7 +56,7 @@ libpurple/dbus-signals.c
 libpurple/dbus-types.c
 libpurple/dbus-types.h
 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$
@@ -87,10 +87,10 @@ pidgin-.*.tar.bz2
 pidgin-.*.tar.gz
 pidgin-[0-9a-z.-]+/
 pidgin.apspec$
-pidgin.desktop$
-pidgin.desktop.in$
 pidgin.spec$
 pidgin/pidgin$
+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
diff --git a/Makefile.am b/Makefile.am
index f0e5c6f063..cba9df2192 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,6 @@ EXTRA_DIST = \
 		package_revision.h \
 		pidgin.apspec.in \
 		pidgin.spec.in \
-		pidgin.desktop.in \
 		po/Makefile.mingw \
 		valgrind-suppressions
 
@@ -65,16 +64,7 @@ release: commit-check version-check distcheck sign-packages
 
 if INSTALL_I18N
 PO_DIR=po
-DESKTOP_FILE=pidgin.desktop
-
-if ENABLE_GTK
-appsdir = $(datadir)/applications
-apps_in_files = pidgin.desktop.in
-apps_DATA = $(apps_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
-endif #ENABLE_GTK
-
-endif #INSTALL_I18N
+endif
 
 if ENABLE_GTK
 GTK_DIR=pidgin
@@ -149,5 +139,5 @@ endif
 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 \
-			intltool-merge intltool-update package_revision_raw.txt
+DISTCLEANFILES= intltool-extract intltool-merge intltool-update \
+			package_revision_raw.txt
diff --git a/configure.ac b/configure.ac
index 5204423991..8dbf155915 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2525,10 +2525,11 @@ AC_CONFIG_FILES([Makefile
 		   m4macros/Makefile
 		   pidgin.apspec
 		   pidgin/Makefile
-		   pidgin/pidgin.pc
-		   pidgin/pidgin-uninstalled.pc
-		   pidgin/pidgin-2.pc
-		   pidgin/pidgin-2-uninstalled.pc
+		   pidgin/data/pidgin.desktop.in
+		   pidgin/data/pidgin.pc
+		   pidgin/data/pidgin-uninstalled.pc
+		   pidgin/data/pidgin-2.pc
+		   pidgin/data/pidgin-2-uninstalled.pc
 		   pidgin/pixmaps/Makefile
 		   pidgin/pixmaps/emotes/default/24/Makefile
 		   pidgin/pixmaps/emotes/none/Makefile
@@ -2542,13 +2543,13 @@ AC_CONFIG_FILES([Makefile
 		   pidgin/plugins/perl/Makefile
 		   pidgin/plugins/perl/common/Makefile.PL
 		   pidgin/plugins/ticker/Makefile
+		   libpurple/data/gconf/Makefile
+		   libpurple/data/purple.pc
+		   libpurple/data/purple-uninstalled.pc
+		   libpurple/data/purple-2.pc
+		   libpurple/data/purple-2-uninstalled.pc
 		   libpurple/ciphers/Makefile
 		   libpurple/example/Makefile
-		   libpurple/gconf/Makefile
-		   libpurple/purple.pc
-		   libpurple/purple-uninstalled.pc
-		   libpurple/purple-2.pc
-		   libpurple/purple-2-uninstalled.pc
 		   libpurple/plugins/Makefile
 		   libpurple/plugins/mono/Makefile
 		   libpurple/plugins/mono/api/Makefile
@@ -2587,7 +2588,6 @@ AC_CONFIG_FILES([Makefile
 		   finch/libgnt/wms/Makefile
 		   finch/plugins/Makefile
 		   po/Makefile.in
-		   pidgin.desktop.in
 		   pidgin.spec
 		  ])
 AC_OUTPUT
diff --git a/libpurple/Makefile.am b/libpurple/Makefile.am
index 1447d5c052..e8b6d2d702 100644
--- a/libpurple/Makefile.am
+++ b/libpurple/Makefile.am
@@ -9,10 +9,10 @@ EXTRA_DIST = \
 		purple-send-async \
 		purple-url-handler \
 		purple.h.in \
-		purple.pc.in \
-		purple-uninstalled.pc.in \
 		version.h.in \
 		Makefile.mingw \
+		data/purple.pc.in \
+		data/purple-uninstalled.pc.in \
 		win32/global.mak \
 		win32/libc_interface.c \
 		win32/libc_interface.h \
@@ -26,12 +26,9 @@ EXTRA_DIST = \
 		win32/win32dep.h
 
 if USE_GCONFTOOL
-GCONF_DIR=gconf
+GCONF_DIR=data/gconf
 endif
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = purple.pc
-
 SUBDIRS = $(GCONF_DIR) plugins protocols ciphers . tests example
 
 purple_coresources = \
@@ -297,6 +294,9 @@ mediaincludedir=$(includedir)/libpurple/media
 mediainclude_HEADERS = \
 	$(addprefix $(srcdir)/media/, $(purple_mediaheaders))
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = data/purple.pc
+
 libpurple_la_DEPENDENCIES = $(STATIC_LINK_LIBS)
 libpurple_la_LDFLAGS = -export-dynamic -version-info $(PURPLE_LT_VERSION_INFO) -no-undefined
 libpurple_la_LIBADD = \
diff --git a/libpurple/gconf/Makefile.am b/libpurple/data/gconf/Makefile.am
index 0e913aa80a..4de4b894f0 100644
--- a/libpurple/gconf/Makefile.am
+++ b/libpurple/data/gconf/Makefile.am
@@ -15,4 +15,6 @@ else
 install-data-local:
 endif #GCONF_SCHEMAS_INSTALL
 
+DISTCLEANFILES= purple.schemas
+
 endif #INSTALL_I18N
diff --git a/libpurple/gconf/purple.schemas.in b/libpurple/data/gconf/purple.schemas.in
index e4fe0e4302..e4fe0e4302 100644
--- a/libpurple/gconf/purple.schemas.in
+++ b/libpurple/data/gconf/purple.schemas.in
diff --git a/libpurple/purple-2-uninstalled.pc.in b/libpurple/data/purple-2-uninstalled.pc.in
index 90e0275cee..90e0275cee 100644
--- a/libpurple/purple-2-uninstalled.pc.in
+++ b/libpurple/data/purple-2-uninstalled.pc.in
diff --git a/libpurple/purple-2.pc.in b/libpurple/data/purple-2.pc.in
index 9506b6f5be..9506b6f5be 100644
--- a/libpurple/purple-2.pc.in
+++ b/libpurple/data/purple-2.pc.in
diff --git a/libpurple/purple-uninstalled.pc.in b/libpurple/data/purple-uninstalled.pc.in
index 11d4da8a0c..11d4da8a0c 100644
--- a/libpurple/purple-uninstalled.pc.in
+++ b/libpurple/data/purple-uninstalled.pc.in
diff --git a/libpurple/purple.pc.in b/libpurple/data/purple.pc.in
index c776f6f26f..c776f6f26f 100644
--- a/libpurple/purple.pc.in
+++ b/libpurple/data/purple.pc.in
diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am
index bfe43f2b7b..d0c2d69cd5 100644
--- a/pidgin/Makefile.am
+++ b/pidgin/Makefile.am
@@ -3,8 +3,9 @@ EXTRA_DIST = \
 		getopt.h \
 		getopt1.c \
 		Makefile.mingw \
-		pidgin.pc.in \
-		pidgin-uninstalled.pc.in \
+		data/pidgin.desktop.in \
+		data/pidgin.pc.in \
+		data/pidgin-uninstalled.pc.in \
 		win32/MinimizeToTray.h \
 		win32/MinimizeToTray.c \
 		win32/pidgin_dll_rc.rc.in \
@@ -31,9 +32,6 @@ EXTRA_DIST = \
 
 if ENABLE_GTK
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = pidgin.pc
-
 SUBDIRS = pixmaps plugins
 
 bin_PROGRAMS = pidgin
@@ -177,4 +175,19 @@ AM_CPPFLAGS = \
 	$(GTKSPELL_CFLAGS) \
 	$(LIBXML_CFLAGS) \
 	$(INTGG_CFLAGS)
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = data/pidgin.pc
+
+if INSTALL_I18N
+DESKTOP_FILE=data/pidgin.desktop
+
+appsdir = $(datadir)/applications
+apps_in_files = data/pidgin.desktop.in
+apps_DATA = $(apps_in_files:.desktop.in=.desktop)
+@INTLTOOL_DESKTOP_RULE@
+endif # INSTALL_I18N
+
+DISTCLEANFILES = $(DESKTOP_FILE)
+
 endif  # ENABLE_GTK
diff --git a/pidgin/pidgin-2-uninstalled.pc.in b/pidgin/data/pidgin-2-uninstalled.pc.in
index a2e4fd9da3..a2e4fd9da3 100644
--- a/pidgin/pidgin-2-uninstalled.pc.in
+++ b/pidgin/data/pidgin-2-uninstalled.pc.in
diff --git a/pidgin/pidgin-2.pc.in b/pidgin/data/pidgin-2.pc.in
index 30c930ae22..30c930ae22 100644
--- a/pidgin/pidgin-2.pc.in
+++ b/pidgin/data/pidgin-2.pc.in
diff --git a/pidgin/pidgin-uninstalled.pc.in b/pidgin/data/pidgin-uninstalled.pc.in
index ba2205ad3f..ba2205ad3f 100644
--- a/pidgin/pidgin-uninstalled.pc.in
+++ b/pidgin/data/pidgin-uninstalled.pc.in
diff --git a/pidgin.desktop.in.in b/pidgin/data/pidgin.desktop.in.in
index 1da3912ed4..1da3912ed4 100644
--- a/pidgin.desktop.in.in
+++ b/pidgin/data/pidgin.desktop.in.in
diff --git a/pidgin/pidgin.pc.in b/pidgin/data/pidgin.pc.in
index 53e1b88702..53e1b88702 100644
--- a/pidgin/pidgin.pc.in
+++ b/pidgin/data/pidgin.pc.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b2d94be399..fc923f5885 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -43,12 +43,12 @@ libpurple/blist.c
 libpurple/certificate.c
 libpurple/connection.c
 libpurple/conversation.c
+libpurple/data/gconf/purple.schemas.in
 libpurple/dbus-server.c
 libpurple/dbus-server.h
 libpurple/desktopitem.c
 libpurple/dnsquery.c
 libpurple/ft.c
-libpurple/gconf/purple.schemas.in
 libpurple/log.c
 libpurple/media/backend-fs2.c
 libpurple/plugin.c
@@ -193,7 +193,7 @@ libpurple/status.c
 libpurple/util.c
 libpurple/win32/libc_interface.c
 libpurple/xmlnode.c
-pidgin.desktop.in
+pidgin/data/pidgin.desktop.in
 pidgin/gtkaccount.c
 pidgin/gtkblist-theme.c
 pidgin/gtkblist.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 2a9ea38f41..4d888628c4 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -37,7 +37,7 @@ libpurple/plugins/perl/common/Util.c
 libpurple/plugins/perl/common/Whiteboard.c
 libpurple/plugins/perl/common/XMLNode.c
 libpurple/protocols/null/nullprpl.c
-pidgin.desktop.in.in
+pidgin/data/pidgin.desktop.in.in
 pidgin/plugins/crazychat/cc_pidgin_plugin.c
 pidgin/plugins/perl/common/GtkAccount.c
 pidgin/plugins/perl/common/GtkBlist.c