Updating branch refs/heads/master
to ba5147119f834afd6b3262a583241e27b856871c (commit)
from f20587154546be0830ca06e02fe8dce70c1ec284 (commit)
commit ba5147119f834afd6b3262a583241e27b856871c
Author: Mike Massonnet <[email protected]>
Date: Sun Mar 4 10:56:55 2012 +0100
daemon: Rename directory daemon to x11-clipboard-manager
Makefile.am | 2 +-
configure.ac.in | 2 +-
panel-plugin/Makefile.am | 4 ++--
panel-plugin/plugin.h | 2 +-
{daemon => x11-clipboard-manager}/Makefile.am | 0
{daemon => x11-clipboard-manager}/daemon.h | 0
.../gsd-clipboard-manager.c | 0
.../gsd-clipboard-manager.h | 0
8 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 082226f..1d82c6b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ NULL =
SUBDIRS = \
icons \
- daemon \
+ x11-clipboard-manager \
panel-plugin \
tests \
po \
diff --git a/configure.ac.in b/configure.ac.in
index 6965f4c..21ed79f 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -131,7 +131,7 @@ icons/22x22/Makefile
icons/24x24/Makefile
icons/32x32/Makefile
icons/scalable/Makefile
-daemon/Makefile
+x11-clipboard-manager/Makefile
panel-plugin/Makefile
tests/Makefile
po/Makefile.in
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 78e4527..d3c1259 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -105,7 +105,7 @@ xfce4_clipman_CFLAGS =
\
$(NULL)
xfce4_clipman_LDADD = \
- $(top_builddir)/daemon/libdaemon.la \
+ $(top_builddir)/x11-clipboard-manager/libdaemon.la \
@GIO_LIBS@ \
@EXO_LIBS@ \
@LIBX11_LIBS@ \
@@ -158,7 +158,7 @@ libclipman_la_LDFLAGS =
\
$(NULL)
libclipman_la_LIBADD = \
- $(top_builddir)/daemon/libdaemon.la \
+ $(top_builddir)/x11-clipboard-manager/libdaemon.la \
@GIO_LIBS@ \
@EXO_LIBS@ \
@LIBX11_LIBS@ \
diff --git a/panel-plugin/plugin.h b/panel-plugin/plugin.h
index 84e8ea9..b11c676 100644
--- a/panel-plugin/plugin.h
+++ b/panel-plugin/plugin.h
@@ -30,7 +30,7 @@
#include <libxfce4panel/libxfce4panel.h>
#endif
-#include <daemon/daemon.h>
+#include <x11-clipboard-manager/daemon.h>
#include "actions.h"
#include "collector.h"
#include "history.h"
diff --git a/daemon/Makefile.am b/x11-clipboard-manager/Makefile.am
similarity index 100%
rename from daemon/Makefile.am
rename to x11-clipboard-manager/Makefile.am
diff --git a/daemon/daemon.h b/x11-clipboard-manager/daemon.h
similarity index 100%
rename from daemon/daemon.h
rename to x11-clipboard-manager/daemon.h
diff --git a/daemon/gsd-clipboard-manager.c
b/x11-clipboard-manager/gsd-clipboard-manager.c
similarity index 100%
rename from daemon/gsd-clipboard-manager.c
rename to x11-clipboard-manager/gsd-clipboard-manager.c
diff --git a/daemon/gsd-clipboard-manager.h
b/x11-clipboard-manager/gsd-clipboard-manager.h
similarity index 100%
rename from daemon/gsd-clipboard-manager.h
rename to x11-clipboard-manager/gsd-clipboard-manager.h
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
