The branch, backport-lenny has been updated via 50a436a8e4694857153d9822afdc7ef773866773 (commit) via c08bf7e514526312435c4832e385680b5ffdd1cf (commit) via f3e25430d56e43faca2fee403148455d37bd19f8 (commit) from 90a992ab2ddd69a9ef107ee6b2311038bbf9a0f1 (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 50a436a8e4694857153d9822afdc7ef773866773 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Mar 16 21:15:46 2012 +0100 Use dh_link to symlink X11 directories into /etc/x2go. commit c08bf7e514526312435c4832e385680b5ffdd1cf Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Mar 16 21:07:58 2012 +0100 changelog cleanup commit f3e25430d56e43faca2fee403148455d37bd19f8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Mar 16 21:07:37 2012 +0100 Revert "Fix dh_install error during build: x2goserver-xsession missing files (x2goserver-xsession/etc/*), aborting." This reverts commit a5580df85f6a7ae6b4e4d366cbc877933d7fd121. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +-- 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(+), 6 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 cc6ad6d..94f21fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,6 @@ x2goserver (3.1.1.0-0~x2go+bpo+lenny1) UNRELEASED; urgency=low * Backport current status of x2goserver (unreleased 3.1.1.0) to Debian lenny. - * Fix dh_install error during build: x2goserver-xsession missing files - (x2goserver-xsession/etc/*), aborting. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 01 Feb 2012 13:40:31 +0100 @@ -36,6 +34,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 bba9513..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).