[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.0.1-31-gd11ed3f
X2Go dev team
git-admin at x2go.org
Fri Mar 16 21:16:03 CET 2012
The branch, master has been updated
via d11ed3f11aa6c1b4264f8b4bcf7eedf7e9d3bada (commit)
from e0dec6f1eb0e84ff19b5c59899758d85e6bb7ccc (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 d11ed3f11aa6c1b4264f8b4bcf7eedf7e9d3bada
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Mar 16 21:15:46 2012 +0100
Use dh_link to symlink X11 directories into /etc/x2go.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
debian/x2goserver-xsession.install | 2 +-
debian/x2goserver-xsession.links | 3 +++
x2goserver-xsession/etc/Xresources | 1 -
x2goserver-xsession/etc/Xsession.d | 1 -
x2goserver-xsession/etc/Xsession.options | 1 -
6 files changed, 5 insertions(+), 4 deletions(-)
create mode 100644 debian/x2goserver-xsession.links
delete mode 120000 x2goserver-xsession/etc/Xresources
delete mode 120000 x2goserver-xsession/etc/Xsession.d
delete mode 120000 x2goserver-xsession/etc/Xsession.options
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 1eecc11..2e277d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ x2goserver (3.1.1.0-0~x2go1) UNRELEASED; urgency=low
symlink, keep it, if it is a directory. Remove /etc/x2go
(if empty after purge) on package purge.
* Bump Debian packaging standards version to 3.9.3.
+ * Use dh_link to symlink X11 directories into /etc/x2go.
[ Oleksandr Shneyder ]
* New upstream version (3.1.1.0):
diff --git a/debian/x2goserver-xsession.install b/debian/x2goserver-xsession.install
index 31531bb..d80b6d5 100644
--- a/debian/x2goserver-xsession.install
+++ b/debian/x2goserver-xsession.install
@@ -1,3 +1,3 @@
-x2goserver-xsession/etc/* /etc/x2go/
+x2goserver-xsession/etc/Xsession /etc/x2go/
x2goserver-xsession/VERSION.x2goserver-xsession /usr/share/x2go/versions/
x2goserver-xsession/share/x2gofeature.d/* /usr/share/x2go/x2gofeature.d/
diff --git a/debian/x2goserver-xsession.links b/debian/x2goserver-xsession.links
new file mode 100644
index 0000000..937529e
--- /dev/null
+++ b/debian/x2goserver-xsession.links
@@ -0,0 +1,3 @@
+etc/X11/Xresources etc/x2go/Xresources
+etc/X11/Xsession.d etc/x2go/Xsession.d
+etc/X11/Xsession.options etc/x2go/Xsession.options
diff --git a/x2goserver-xsession/etc/Xresources b/x2goserver-xsession/etc/Xresources
deleted file mode 120000
index 484aa45..0000000
--- a/x2goserver-xsession/etc/Xresources
+++ /dev/null
@@ -1 +0,0 @@
-/etc/X11/Xresources
\ No newline at end of file
diff --git a/x2goserver-xsession/etc/Xsession.d b/x2goserver-xsession/etc/Xsession.d
deleted file mode 120000
index f64317e..0000000
--- a/x2goserver-xsession/etc/Xsession.d
+++ /dev/null
@@ -1 +0,0 @@
-/etc/X11/Xsession.d
\ No newline at end of file
diff --git a/x2goserver-xsession/etc/Xsession.options b/x2goserver-xsession/etc/Xsession.options
deleted file mode 120000
index 72929e1..0000000
--- a/x2goserver-xsession/etc/Xsession.options
+++ /dev/null
@@ -1 +0,0 @@
-/etc/X11/Xsession.options
\ No newline at end of file
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