[X2Go-Commits] x2goserver.git - build-main (branch) updated: 3.1.1.2-2-g44cbc50
X2Go dev team
git-admin at x2go.org
Wed Dec 4 06:18:21 CET 2013
The branch, build-main has been updated
via 44cbc5037875d6f5755abfd39271ab1c41347228 (commit)
from f1f73d203353f5d5f29c156a0298a2de927602a4 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 4 +++-
x2goserver-xsession/Makefile | 1 -
2 files changed, 3 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 6d36b6a..0d53fe4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
x2goserver (3.1.1.3-0~x2go1) UNRELEASED; urgency=low
- * Continue development...
+ [ Jan Engelhardt ]
+ * New upstream version (3.1.1.3):
+ - Do not block /etc/X11/Xresources with a directory (in Makefile).
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Fri, 29 Jun 2012 17:49:04 +0200
diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile
index 7a56c87..40e7bf7 100755
--- a/x2goserver-xsession/Makefile
+++ b/x2goserver-xsession/Makefile
@@ -64,7 +64,6 @@ install_scripts:
install_config:
$(INSTALL_DIR) $(DESTDIR)$(ETCDIR)
# provide target dirs for X11 related symlinks
- mkdir -p $(DESTDIR)/etc/X11/Xresources
mkdir -p $(DESTDIR)/etc/X11/Xsession.d
touch $(DESTDIR)/etc/X11/Xsession.options
$(INSTALL_FILE) etc/Xsession $(DESTDIR)$(ETCDIR)/
hooks/post-receive
--
x2goserver.git (X2Go Server)
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 "x2goserver.git" (X2Go Server).
More information about the x2go-commits
mailing list