[pkg-remote-commits] [x2goserver] 07/15: debian/{control, x2goserver.install}: Don't ship x2goagent.options in x2goserver bin:package anymore. Older upstream packages did this, in Debian, we install a fresh x2goagent.options file via x2goserver-x2goagent.options, ignore previous settings on purpose.

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository x2goserver.

commit 3b1e610a64a29f1db87324efe761e161a49a8e03
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Dec 26 23:26:40 2016 +0100

    debian/{control,x2goserver.install}: Don't ship x2goagent.options in x2goserver bin:package anymore. Older upstream packages did this, in Debian, we install a fresh x2goagent.options file via x2goserver-x2goagent.options, ignore previous settings on purpose.
---
 debian/control            | 2 ++
 debian/x2goserver.install | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 91ac823..174f96e 100644
--- a/debian/control
+++ b/debian/control
@@ -172,8 +172,10 @@ Depends:
  ${misc:Depends},
 Breaks:
  x2goagent (<< 3.5.99.2),
+ x2goserver (<< 4.0.1.20-1~),
 Replaces:
  x2goagent (<< 3.5.99.2),
+ x2goserver (<< 4.0.1.20-1~),
 Description: X2Go server wrapper around NXv3 agent (aka x2goagent)
  X2Go is a server based computing environment with
     - session resuming
diff --git a/debian/x2goserver.install b/debian/x2goserver.install
index ed5ef61..2faad2c 100644
--- a/debian/x2goserver.install
+++ b/debian/x2goserver.install
@@ -2,7 +2,10 @@ x2goserver/VERSION.x2goserver           /usr/share/x2go/versions/
 x2goserver/bin/x2go*                    /usr/bin/
 x2goserver/etc/logcheck/ignore.d.server/x2goserver /etc/logcheck/ignore.d.server/
 x2goserver/etc/sudoers.d/x2goserver     /etc/sudoers.d
-x2goserver/etc/x2go*                    /etc/x2go/
+x2goserver/etc/x2goserver.conf          /etc/x2go/
+x2goserver/etc/x2gosql/                 /etc/x2go/
+x2goserver/etc/x2go_logout.d            /etc/x2go/
+x2goserver/etc/x2go_logout              /etc/x2go/
 x2goserver/lib/x2go*                    /usr/lib/x2go/
 x2goserver/sbin/x2go*                   /usr/sbin/
 x2goserver/share/x2gofeature.d          /usr/share/x2go/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-remote/x2goserver.git