/pidgin/main: 35d7033e1d33: Move data files into their own direc...
Elliott Sales de Andrade
qulogic at pidgin.im
Sat Nov 8 02:07:01 EST 2014
Changeset: 35d7033e1d336d264fdb8728173f5c7f6bcf1c76
Author: Elliott Sales de Andrade <qulogic at pidgin.im>
Date: 2014-11-08 01:01 -0500
Branch: default
URL: https://hg.pidgin.im/pidgin/main/rev/35d7033e1d33
Description:
Move data files into their own directory.
diffstat:
.hgignore | 6 +++---
Makefile.am | 18 ++----------------
configure.ac | 12 ++++++------
libpurple/Makefile.am | 12 ++++++------
libpurple/gconf/Makefile.am | 0
libpurple/gconf/purple.schemas.in | 0
libpurple/purple-3-uninstalled.pc.in | 0
libpurple/purple-3.pc.in | 0
pidgin/Makefile.am | 27 ++++++++++++++++++++++-----
pidgin/pidgin-3-uninstalled.pc.in | 0
pidgin/pidgin-3.pc.in | 0
pidgin.desktop.in.in | 0
po/POTFILES.in | 4 ++--
13 files changed, 41 insertions(+), 38 deletions(-)
diffs (239 lines):
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -73,7 +73,7 @@ libpurple/dbus-signals.c
libpurple/dbus-types.[ch]
libpurple/enums.[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-.*.tar.bz2
pidgin-.*.tar.gz
pidgin-[0-9a-z.-]+/
pidgin.apspec$
-pidgin.desktop$
-pidgin.desktop.in$
pidgin/.*\.html\.h$
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
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,6 @@ EXTRA_DIST = \
intltool-update.in \
package_revision.h \
pidgin.apspec.in \
- pidgin.desktop.in \
po/Makefile.mingw \
valgrind-suppressions
@@ -83,20 +82,7 @@ release: commit-check version-check dist
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)
-
-# 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
-
-endif #ENABLE_GTK
-
-endif #INSTALL_I18N
+endif
if ENABLE_GTK
GTK_DIR=pidgin
@@ -157,5 +143,5 @@ SUBDIRS = . m4macros libpurple $(GNT_DIR
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
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -3028,8 +3028,9 @@ AC_CONFIG_FILES([Makefile
m4macros/Makefile
pidgin.apspec
pidgin/Makefile
- pidgin/pidgin-3.pc
- pidgin/pidgin-3-uninstalled.pc
+ pidgin/data/pidgin.desktop.in
+ pidgin/data/pidgin-3.pc
+ pidgin/data/pidgin-3-uninstalled.pc
pidgin/pixmaps/Makefile
pidgin/pixmaps/emotes/default/24/Makefile
pidgin/pixmaps/emotes/small/16/Makefile
@@ -3047,10 +3048,10 @@ AC_CONFIG_FILES([Makefile
pidgin/themes/Makefile
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.pc
- libpurple/purple-3-uninstalled.pc
libpurple/plugins/Makefile
libpurple/plugins/keyrings/Makefile
libpurple/plugins/mono/Makefile
@@ -3092,7 +3093,6 @@ AC_CONFIG_FILES([Makefile
finch/libgnt/wms/Makefile
finch/plugins/Makefile
po/Makefile.in
- pidgin.desktop.in
])
AC_OUTPUT
diff --git a/libpurple/Makefile.am b/libpurple/Makefile.am
--- a/libpurple/Makefile.am
+++ b/libpurple/Makefile.am
@@ -12,11 +12,11 @@ EXTRA_DIST = \
purple-send-async \
purple-url-handler \
purple.h.in \
- purple-3.pc.in \
- purple-3-uninstalled.pc.in \
tag.sh \
version.h.in \
Makefile.mingw \
+ data/purple-3.pc.in \
+ data/purple-3-uninstalled.pc.in \
win32/global.mak \
win32/libc_interface.c \
win32/libc_interface.h \
@@ -30,12 +30,9 @@ EXTRA_DIST = \
win32/win32dep.h
if USE_GCONFTOOL
-GCONF_DIR=gconf
+GCONF_DIR=data/gconf
endif
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = purple-3.pc
-
SUBDIRS = $(GCONF_DIR) . plugins protocols tests example
purple_coresources = \
@@ -403,6 +400,9 @@ mediaincludedir=$(includedir)/libpurple/
mediainclude_HEADERS = \
$(addprefix $(srcdir)/media/, $(purple_mediaheaders))
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = data/purple-3.pc
+
libpurple_la_DEPENDENCIES = \
$(STATIC_LINK_LIBS) $(LIBPURPLE_WIN32RES)
diff --git a/libpurple/gconf/Makefile.am b/libpurple/data/gconf/Makefile.am
rename from libpurple/gconf/Makefile.am
rename to libpurple/data/gconf/Makefile.am
diff --git a/libpurple/gconf/purple.schemas.in b/libpurple/data/gconf/purple.schemas.in
rename from libpurple/gconf/purple.schemas.in
rename to libpurple/data/gconf/purple.schemas.in
diff --git a/libpurple/purple-3-uninstalled.pc.in b/libpurple/data/purple-3-uninstalled.pc.in
rename from libpurple/purple-3-uninstalled.pc.in
rename to libpurple/data/purple-3-uninstalled.pc.in
diff --git a/libpurple/purple-3.pc.in b/libpurple/data/purple-3.pc.in
rename from libpurple/purple-3.pc.in
rename to libpurple/data/purple-3.pc.in
diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am
--- a/pidgin/Makefile.am
+++ b/pidgin/Makefile.am
@@ -5,8 +5,9 @@ EXTRA_DIST = \
gtk3compat.h \
gtkdebug.html \
Makefile.mingw \
- pidgin-3.pc.in \
- pidgin-3-uninstalled.pc.in \
+ data/pidgin.desktop.in \
+ data/pidgin-3.pc.in \
+ data/pidgin-3-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-3.pc
-
SUBDIRS = . pixmaps plugins themes
# XXX: should this be lib_, or noinst_?
@@ -233,5 +231,24 @@ AM_CPPFLAGS = \
$(DBUS_CFLAGS) \
$(LIBXML_CFLAGS) \
$(WEBKIT_CFLAGS)
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = data/pidgin-3.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)
+
+# 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
+
+endif # INSTALL_I18N
+
+DISTCLEANFILES = $(DESKTOP_FILE)
+
endif # ENABLE_GTK
diff --git a/pidgin/pidgin-3-uninstalled.pc.in b/pidgin/data/pidgin-3-uninstalled.pc.in
rename from pidgin/pidgin-3-uninstalled.pc.in
rename to pidgin/data/pidgin-3-uninstalled.pc.in
diff --git a/pidgin/pidgin-3.pc.in b/pidgin/data/pidgin-3.pc.in
rename from pidgin/pidgin-3.pc.in
rename to pidgin/data/pidgin-3.pc.in
diff --git a/pidgin.desktop.in.in b/pidgin/data/pidgin.desktop.in.in
rename from pidgin.desktop.in.in
rename to pidgin/data/pidgin.desktop.in.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -46,11 +46,11 @@ libpurple/certificate.c
libpurple/connection.c
libpurple/conversation.c
libpurple/conversationtypes.c
+libpurple/data/gconf/purple.schemas.in
libpurple/dbus-server.c
libpurple/dbus-server.h
libpurple/desktopitem.c
libpurple/dnsquery.c
-libpurple/gconf/purple.schemas.in
libpurple/http.c
libpurple/keyring.c
libpurple/log.c
@@ -208,7 +208,7 @@ libpurple/util.c
libpurple/win32/libc_interface.c
libpurple/xfer.c
libpurple/xmlnode.c
-pidgin.desktop.in
+pidgin/data/pidgin.desktop.in
pidgin/gtkaccount.c
pidgin/gtkblist-theme.c
pidgin/gtkblist.c
More information about the Commits
mailing list