The branch, master has been updated
via d397971d2d55d2f9bd959e95c4b1fa05fdf5fd04 (commit)
from bd42ae66c927db6f8bc2ef276aa4f23c70a22c2d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d397971d2d55d2f9bd959e95c4b1fa05fdf5fd04
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Wed Dec 11 00:42:20 2013 +0100
Rework x2goadmincenter/Makefile.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
x2goadmincenter/Makefile | 46 +++++++++++++++++++++++++++++++++++-----------
2 files changed, 36 insertions(+), 11 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 69d0430..564683c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ x2goadmincenter (0.0.0.1-0x2go1) UNRELEASED; urgency=low
- Provide PNG icon set for X2Go Admin Center (using X2Go Client icon for
now).
- Build our .qm files on the fly. Don't store them in Git.
+ - Rework x2goadmincenter/Makefile.
* debian/control:
+ Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>.
+ Reduce build dependencies to a minimal set of packages.
diff --git a/x2goadmincenter/Makefile b/x2goadmincenter/Makefile
index 8876f17..dca53c3 100755
--- a/x2goadmincenter/Makefile
+++ b/x2goadmincenter/Makefile
@@ -1,10 +1,9 @@
#!/usr/bin/make -f
-SRC_DIR=$(CURDIR)
-BUILD_DIR=$(SRC_DIR)/.build
-BUILD_BINARY=$(CLIENT_DIR)/x2goadmincenter
+BUILD_DIR=.build
+BUILD_BINARY=$(BUILD_DIR)/x2goadmincenter
-PLUGINS_DIR=$(SRC_DIR)/plugins
+PLUGINS_DIR=plugins
SHELL=/bin/bash
@@ -52,7 +51,7 @@ clean: clean_admincenter clean_plugins clean_man
rm -f x2goadmincenter.tag
clean_admincenter:
- rm -fr $(CLIENT_DIR)
+ rm -fr $(BUILD_DIR)
clean_plugins:
rm -fr $(PLUGINS_DIR)/*
@@ -64,22 +63,30 @@ install: install_admincenter install_plugins install_man
install_admincenter:
$(INSTALL_DIR) $(DESTDIR)$(BINDIR)/
- $(INSTALL_FILE) $(SRC_DIR)/desktop/x2goadmincenter.destop $(DESTDIR)$(SHAREDIR)/applications/x2goadmincenter.desktop
- $(INSTALL_FILE) $(SRC_DIR)/icons/x2goadmincenter.xpm $(DESTDIR)$(SHAREDIR)/x2goadmincenter/icons/x2goadmincenter.xpm
+ $(INSTALL_PROGRAM) $(BUILD_BINARY) $(DESTDIR)$(BINDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/applications/
+ $(INSTALL_FILE) desktop/x2goadmincenter.destop $(DESTDIR)$(SHAREDIR)/applications/x2goadmincenter.desktop
+ $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2goadmincenter/icons/
+ $(INSTALL_FILE) icons/x2goadmincenter.xpm $(DESTDIR)$(SHAREDIR)/x2goadmincenter/icons/x2goadmincenter.xpm
+ $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/icons/hicolor/128x128/apps/
$(INSTALL_FILE) icons/128x128/x2goadmincenter.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/128x128/apps/x2goadmincenter.png
+ $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/icons/hicolor/16x16/apps/
$(INSTALL_FILE) icons/16x16/x2goadmincenter.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/16x16/apps/x2goadmincenter.png
+ $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/icons/hicolor/32x32/apps/
$(INSTALL_FILE) icons/32x32/x2goadmincenter.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/32x32/apps/x2goadmincenter.png
+ $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/icons/hicolor/48x48/apps/
$(INSTALL_FILE) icons/48x48/x2goadmincenter.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/48x48/apps/x2goadmincenter.png
+ $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/icons/hicolor/64x64/apps/
$(INSTALL_FILE) icons/64x64/x2goadmincenter.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/64x64/apps/x2goadmincenter.png
install_plugins:
- $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/
- $(INSTALL_FILE) $(PLUGINS_DIR)/* $(LIBDIR)/plugins/
+ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/plugins/
+ $(INSTALL_FILE) $(PLUGINS_DIR)/* $(DESTDIR)$(LIBDIR)/plugins/
install_man:
$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/
$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8
- $(INSTALL_FILE) $(SRC_DIR)/man/man8/x2goadmincenter.8 $(DESTDIR)$(MANDIR)/man1/x2goadmincenter.8
+ $(INSTALL_FILE) man/man8/x2goadmincenter.8 $(DESTDIR)$(MANDIR)/man1/x2goadmincenter.8
gzip -f $(DESTDIR)$(MANDIR)/man8/x2goadmincenter.8
uninstall: uninstall_admincenter uninstall_plugins uninstall_man
@@ -88,7 +95,24 @@ uninstall_admincenter:
$(RM_FILE) $(BINDIR)/x2goadmincenter
$(RM_FILE) $(SHAREDIR)/applications/x2goadmincenter.desktop
$(RM_FILE) $(SHAREDIR)/x2goadmincenter/icons/x2goadmincenter.xpm
- $(RM_DIR) $(SHAREDIR)/x2goadmincenter/icons
+ $(RM_DIR) $(SHAREDIR)/x2goadmincenter/icons
+ $(RM_FILE) $(SHAREDIR)/icons/hicolor/128x128/apps/x2goadmincenter.png
+ $(RM_DIR) $(SHAREDIR)/icons/hicolor/128x128/apps/
+ $(RM_DIR) $(SHAREDIR)/icons/hicolor/128x128/
+ $(RM_FILE) $(SHAREDIR)/icons/hicolor/16x16/apps/x2goadmincenter.png
+ $(RM_DIR) $(SHAREDIR)/icons/hicolor/16x16/apps/
+ $(RM_DIR) $(SHAREDIR)/icons/hicolor/16x16/
+ $(RM_FILE) $(SHAREDIR)/icons/hicolor/32x32/apps/x2goadmincenter.png
+ $(RM_DIR) $(SHAREDIR)/icons/hicolor/32x32/apps/
+ $(RM_DIR) $(SHAREDIR)/icons/hicolor/32x32/
+ $(RM_FILE) $(SHAREDIR)/icons/hicolor/48x48/apps/x2goadmincenter.png
+ $(RM_DIR) $(SHAREDIR)/icons/hicolor/48x48/apps/
+ $(RM_DIR) $(SHAREDIR)/icons/hicolor/48x48/
+ $(RM_FILE) $(SHAREDIR)/icons/hicolor/64x64/apps/x2goadmincenter.png
+ $(RM_DIR) $(SHAREDIR)/icons/hicolor/64x64/apps/
+ $(RM_DIR) $(SHAREDIR)/icons/hicolor/64x64/
+ $(RM_DIR) $(SHAREDIR)/icons/hicolor/
+ $(RM_DIR) $(SHAREDIR)/icons/
uninstall_plugins:
$(RM_FILE) $(LIBDIR)/plugins/*
hooks/post-receive
--
x2goadmincenter.git (X2Go Administration Center)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goadmincenter.git" (X2Go Administration Center).