This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 9b9427b6982a5c31d3b93359529359fbb2643320 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Feb 18 23:16:44 2018 +0100 debian/*: Process with wrap-and-sort -a -s -t. --- debian/changelog | 1 + debian/control | 113 +++++++++++++++++++--------------- debian/copyright.in | 1 - debian/libx2go-log-perl.install | 2 +- debian/libx2go-server-db-perl.install | 6 +- debian/libx2go-server-perl.install | 14 ++--- debian/x2goserver-common.install | 4 +- debian/x2goserver-common.manpages | 2 +- debian/x2goserver-extensions.install | 4 +- debian/x2goserver-extensions.manpages | 2 +- debian/x2goserver-fmbindings.install | 2 +- debian/x2goserver-fmbindings.manpages | 2 +- debian/x2goserver-printing.install | 4 +- debian/x2goserver-printing.manpages | 2 +- debian/x2goserver-x2goagent.install | 10 +-- debian/x2goserver-xsession.docs | 2 +- debian/x2goserver-xsession.install | 2 +- debian/x2goserver.dirs | 2 +- debian/x2goserver.docs | 2 +- debian/x2goserver.install | 10 +-- debian/x2goserver.manpages | 2 +- 21 files changed, 103 insertions(+), 86 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9e8b1d9..1bc8048 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium packaging. * debian/copyright: + Update copyright.in reference template. + * debian/*: Process with wrap-and-sort -a -s -t. -- X2Go Release Manager <git-admin@x2go.org> Thu, 15 Feb 2018 23:14:28 +0100 diff --git a/debian/control b/debian/control index 66a2635..24acfcd 100644 --- a/debian/control +++ b/debian/control @@ -8,8 +8,8 @@ Uploaders: Reinhard Tartler <siretart@tauware.de>, Mihai Moldovan <ionic@ionic.de>, Build-Depends: - dh-systemd | hello, debhelper (>= 7.0.50~), + dh-systemd | hello, man2html-base | man2html, Standards-Version: 3.9.6 Homepage: http://code.x2go.org/releases/source/x2goserver @@ -19,26 +19,30 @@ Vcs-Browser: http://code.x2go.org/gitweb?p=x2goserver.git;a=summary Package: x2goserver Architecture: any Depends: - x2goserver-common (>= ${source:Version}), x2goserver-common (<< ${source:Version}.1~), - ${misc:Depends}, + bash, + bc, libfile-basedir-perl, libfile-which-perl, - libtry-tiny-perl, libswitch-perl, - libx2go-server-perl (>= ${source:Version}), libx2go-server-perl (<< ${source:Version}.1~), - x2goserver-x2goagent (>= ${source:Version}), x2goserver-x2goagent (<< ${source:Version}.1~), - bash, + libtry-tiny-perl, + libx2go-server-perl (<< ${source:Version}.1~), + libx2go-server-perl (>= ${source:Version}), lsof, - bc, + net-tools, openssh-client, openssh-server, + psmisc, pwgen, + x2goserver-common (<< ${source:Version}.1~), + x2goserver-common (>= ${source:Version}), + x2goserver-x2goagent (<< ${source:Version}.1~), + x2goserver-x2goagent (>= ${source:Version}), xauth, - psmisc, - net-tools, xfonts-base, xkb-data, + ${misc:Depends}, Recommends: + fontconfig, sshfs, x11-apps, x11-session-utils, @@ -46,25 +50,28 @@ Recommends: x11-xfs-utils, x11-xkb-utils, x11-xserver-utils, - fontconfig, + x2goserver-extensions (<< ${source:Version}.1~), + x2goserver-extensions (>= ${source:Version}), + x2goserver-fmbindings (<< ${source:Version}.1~), + x2goserver-fmbindings (>= ${source:Version}), + x2goserver-printing (<< ${source:Version}.1~), + x2goserver-printing (>= ${source:Version}), + x2goserver-xsession (<< ${source:Version}.1~), + x2goserver-xsession (>= ${source:Version}), xinit, - x2goserver-extensions (>= ${source:Version}), x2goserver-extensions (<< ${source:Version}.1~), - x2goserver-xsession (>= ${source:Version}), x2goserver-xsession (<< ${source:Version}.1~), - x2goserver-fmbindings (>= ${source:Version}), x2goserver-fmbindings (<< ${source:Version}.1~), - x2goserver-printing (>= ${source:Version}), x2goserver-printing (<< ${source:Version}.1~), Suggests: + pulseaudio-utils, rdesktop, - pulseaudio-utils Conflicts: - x2goserver-one, - x2goserver-home, + x2godesktopsharing (<< 3.1.1.2-0~), x2goserver-compat, + x2goserver-home, + x2goserver-one, x2goserver-pyhoca, - x2godesktopsharing (<< 3.1.1.2-0~), Replaces: - x2goserver-one, - x2goserver-home, x2goserver-compat, + x2goserver-home, + x2goserver-one, x2goserver-pyhoca, Description: X2Go server daemon scripts X2Go is a server based computing environment with @@ -81,8 +88,8 @@ Description: X2Go server daemon scripts Package: x2goserver-common Architecture: any Depends: - ${misc:Depends}, adduser, + ${misc:Depends}, Breaks: x2goserver (<< 4.1.0.0-0~), Replaces: @@ -103,13 +110,16 @@ Package: libx2go-server-perl Architecture: all Section: perl Depends: - ${perl:Depends}, - ${misc:Depends}, - libconfig-simple-perl, libcapture-tiny-perl, - libx2go-log-perl (>= ${source:Version}), libx2go-log-perl (<< ${source:Version}.1~), - libx2go-server-db-perl (>= ${source:Version}), libx2go-server-db-perl (<< ${source:Version}.1~), - x2goserver-common (>= ${source:Version}), x2goserver-common (<< ${source:Version}.1~), + libconfig-simple-perl, + libx2go-log-perl (<< ${source:Version}.1~), + libx2go-log-perl (>= ${source:Version}), + libx2go-server-db-perl (<< ${source:Version}.1~), + libx2go-server-db-perl (>= ${source:Version}), + x2goserver-common (<< ${source:Version}.1~), + x2goserver-common (>= ${source:Version}), + ${misc:Depends}, + ${perl:Depends}, Description: Perl X2Go::Server package X2Go is a server based computing environment with - session resuming @@ -125,14 +135,16 @@ Package: libx2go-server-db-perl Architecture: any Section: perl Depends: - ${perl:Depends}, - ${misc:Depends}, - ${shlibs:Depends}, libconfig-simple-perl, libdbd-pg-perl [!armhf], libdbd-sqlite3-perl, - libx2go-log-perl (>= ${source:Version}), libx2go-log-perl (<< ${source:Version}.1~), - x2goserver-common (>= ${source:Version}), x2goserver-common (<< ${source:Version}.1~), + libx2go-log-perl (<< ${source:Version}.1~), + libx2go-log-perl (>= ${source:Version}), + x2goserver-common (<< ${source:Version}.1~), + x2goserver-common (>= ${source:Version}), + ${misc:Depends}, + ${perl:Depends}, + ${shlibs:Depends}, Breaks: x2goserver (<< 4.1.0.0-0~), Replaces: @@ -152,9 +164,10 @@ Package: libx2go-log-perl Architecture: all Section: perl Depends: - ${perl:Depends}, + x2goserver-common (<< ${source:Version}.1~), + x2goserver-common (>= ${source:Version}), ${misc:Depends}, - x2goserver-common (>= ${source:Version}), x2goserver-common (<< ${source:Version}.1~), + ${perl:Depends}, Description: Perl X2Go::Log package X2Go is a server based computing environment with - session resuming @@ -172,13 +185,13 @@ Depends: nxagent (>= 2:3.5.99.3~), ${misc:Depends}, Suggests: - x2goserver + x2goserver, Breaks: - x2goserver (<< 4.0.1.20~), x2goagent (<< 2:3.5.99.2~), -Replaces: x2goserver (<< 4.0.1.20~), +Replaces: x2goagent (<< 2:3.5.99.2~), + x2goserver (<< 4.0.1.20~), Description: X2Go Server's X2Go Agent X2Go is a software suite that uses NX technology for remote desktop computing. @@ -197,9 +210,10 @@ Description: X2Go Server's X2Go Agent Package: x2goserver-printing Architecture: all Depends: - ${misc:Depends}, - x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~), adduser, + x2goserver (<< ${source:Version}.1~), + x2goserver (>= ${source:Version}), + ${misc:Depends}, Conflicts: x2goprint, Replaces: @@ -231,9 +245,10 @@ Description: X2Go server (printing support) Package: x2goserver-extensions Architecture: all Depends: - ${misc:Depends}, - x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~), x11-xkb-utils, + x2goserver (<< ${source:Version}.1~), + x2goserver (>= ${source:Version}), + ${misc:Depends}, Description: X2Go Server (extension support) X2Go is a server based computing environment with - session resuming @@ -253,11 +268,12 @@ Description: X2Go Server (extension support) Package: x2goserver-xsession Architecture: all Depends: - ${misc:Depends}, - x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~), - x11-common, + dbus, perl, - dbus + x11-common, + x2goserver (<< ${source:Version}.1~), + x2goserver (>= ${source:Version}), + ${misc:Depends}, Description: X2Go Server (Xsession runner) X2Go is a server based computing environment with - session resuming @@ -278,10 +294,11 @@ Description: X2Go Server (Xsession runner) Package: x2goserver-fmbindings Architecture: all Depends: - ${misc:Depends}, - x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~), desktop-file-utils, + x2goserver (<< ${source:Version}.1~), + x2goserver (>= ${source:Version}), xdg-utils, + ${misc:Depends}, Description: X2Go Server (file manager bindings) X2Go is a server based computing environment with - session resuming diff --git a/debian/copyright.in b/debian/copyright.in index de0ab6f..e83ea1c 100644 --- a/debian/copyright.in +++ b/debian/copyright.in @@ -301,4 +301,3 @@ Files: debian/copyright Copyright: -format/1.0/ License: UNKNOWN FIXME - diff --git a/debian/libx2go-log-perl.install b/debian/libx2go-log-perl.install index 295238a..35362cf 100644 --- a/debian/libx2go-log-perl.install +++ b/debian/libx2go-log-perl.install @@ -1,2 +1,2 @@ +usr/share/man/man3/X2Go::Log.* usr/share/perl5/X2Go/Log.pm -usr/share/man/man3/X2Go::Log.* \ No newline at end of file diff --git a/debian/libx2go-server-db-perl.install b/debian/libx2go-server-db-perl.install index 18d0fd0..69c5095 100644 --- a/debian/libx2go-server-db-perl.install +++ b/debian/libx2go-server-db-perl.install @@ -1,5 +1,5 @@ -usr/share/perl5/X2Go/Server/DB* -usr/share/man/man3/X2Go::Server::DB.* -usr/share/man/man3/X2Go::Server::DB::* libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper /usr/lib/x2go/ libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl /usr/lib/x2go/ +usr/share/man/man3/X2Go::Server::DB.* +usr/share/man/man3/X2Go::Server::DB::* +usr/share/perl5/X2Go/Server/DB* diff --git a/debian/libx2go-server-perl.install b/debian/libx2go-server-perl.install index 2ba83aa..b75c5da 100644 --- a/debian/libx2go-server-perl.install +++ b/debian/libx2go-server-perl.install @@ -1,12 +1,12 @@ +usr/share/man/man3/X2Go::Config.* +usr/share/man/man3/X2Go::Server.* +usr/share/man/man3/X2Go::Server::Agent.* +usr/share/man/man3/X2Go::Server::Agent::* +usr/share/man/man3/X2Go::SupeReNicer.* +usr/share/man/man3/X2Go::Utils.* usr/share/perl5/X2Go/Config.pm usr/share/perl5/X2Go/Server.pm +usr/share/perl5/X2Go/Server/Agent* usr/share/perl5/X2Go/SupeReNicer.pm usr/share/perl5/X2Go/Utils.pm -usr/share/perl5/X2Go/Server/Agent* usr/share/perl5/X2Go/Utils.pm -usr/share/man/man3/X2Go::Config.* -usr/share/man/man3/X2Go::Server.* -usr/share/man/man3/X2Go::SupeReNicer.* -usr/share/man/man3/X2Go::Utils.* -usr/share/man/man3/X2Go::Server::Agent.* -usr/share/man/man3/X2Go::Server::Agent::* diff --git a/debian/x2goserver-common.install b/debian/x2goserver-common.install index 21c30fe..8bde211 100644 --- a/debian/x2goserver-common.install +++ b/debian/x2goserver-common.install @@ -1,3 +1,3 @@ -x2goserver-common/etc/x2go* /etc/x2go/ -x2goserver-common/etc/tmpfiles.d/x2go* /etc/tmpfiles.d/ x2goserver-common/VERSION.x2goserver-common /usr/share/x2go/versions/ +x2goserver-common/etc/tmpfiles.d/x2go* /etc/tmpfiles.d/ +x2goserver-common/etc/x2go* /etc/x2go/ diff --git a/debian/x2goserver-common.manpages b/debian/x2goserver-common.manpages index 18d0d48..6d246c3 100644 --- a/debian/x2goserver-common.manpages +++ b/debian/x2goserver-common.manpages @@ -1 +1 @@ -x2goserver/man/man5/* \ No newline at end of file +x2goserver/man/man5/* diff --git a/debian/x2goserver-extensions.install b/debian/x2goserver-extensions.install index 30d64d3..218869b 100644 --- a/debian/x2goserver-extensions.install +++ b/debian/x2goserver-extensions.install @@ -1,4 +1,4 @@ -x2goserver-extensions/bin/x2go* /usr/bin/ x2goserver-extensions/VERSION.x2goserver-extensions /usr/share/x2go/versions/ +x2goserver-extensions/bin/x2go* /usr/bin/ +x2goserver-extensions/lib/* /usr/lib/x2go/ x2goserver-extensions/share/x2gofeature.d/* /usr/share/x2go/x2gofeature.d/ -x2goserver-extensions/lib/* /usr/lib/x2go/ \ No newline at end of file diff --git a/debian/x2goserver-extensions.manpages b/debian/x2goserver-extensions.manpages index 1dec58d..d37b382 100644 --- a/debian/x2goserver-extensions.manpages +++ b/debian/x2goserver-extensions.manpages @@ -1 +1 @@ -x2goserver-extensions/man/man8/* \ No newline at end of file +x2goserver-extensions/man/man8/* diff --git a/debian/x2goserver-fmbindings.install b/debian/x2goserver-fmbindings.install index aeb426e..e1b701d 100644 --- a/debian/x2goserver-fmbindings.install +++ b/debian/x2goserver-fmbindings.install @@ -1,3 +1,3 @@ x2goserver-fmbindings/VERSION.x2goserver-fmbindings usr/share/x2go/versions/ -x2goserver-fmbindings/share/* usr/share/ x2goserver-fmbindings/bin/* usr/bin/ +x2goserver-fmbindings/share/* usr/share/ diff --git a/debian/x2goserver-fmbindings.manpages b/debian/x2goserver-fmbindings.manpages index ec148a6..9b5e477 100644 --- a/debian/x2goserver-fmbindings.manpages +++ b/debian/x2goserver-fmbindings.manpages @@ -1 +1 @@ -x2goserver-fmbindings/man/man8/* \ No newline at end of file +x2goserver-fmbindings/man/man8/* diff --git a/debian/x2goserver-printing.install b/debian/x2goserver-printing.install index c37db3c..c3d87e7 100644 --- a/debian/x2goserver-printing.install +++ b/debian/x2goserver-printing.install @@ -1,3 +1,3 @@ -x2goserver-printing/bin/x2go* /usr/bin/ x2goserver-printing/VERSION.x2goserver-printing /usr/share/x2go/versions/ -x2goserver-printing/share/x2gofeature.d/* /usr/share/x2go/x2gofeature.d/ \ No newline at end of file +x2goserver-printing/bin/x2go* /usr/bin/ +x2goserver-printing/share/x2gofeature.d/* /usr/share/x2go/x2gofeature.d/ diff --git a/debian/x2goserver-printing.manpages b/debian/x2goserver-printing.manpages index 9b5b500..be68e26 100644 --- a/debian/x2goserver-printing.manpages +++ b/debian/x2goserver-printing.manpages @@ -1 +1 @@ -x2goserver-printing/man/man8/* \ No newline at end of file +x2goserver-printing/man/man8/* diff --git a/debian/x2goserver-x2goagent.install b/debian/x2goserver-x2goagent.install index 0b5754f..7afca09 100644 --- a/debian/x2goserver-x2goagent.install +++ b/debian/x2goserver-x2goagent.install @@ -1,11 +1,11 @@ +etc/x2go/keystrokes.cfg +etc/x2go/rgb +etc/x2go/x2goagent.keyboard +etc/x2go/x2goagent.options usr/bin/x2goagent usr/lib/*/nx/bin/x2goagent +usr/share/man/man1/x2goagent.1* usr/share/pixmaps/x2go.xpm usr/share/x2go/rgb -usr/share/man/man1/x2goagent.1* -etc/x2go/rgb usr/share/x2go/versions/VERSION.x2goserver-x2goagent usr/share/x2go/x2gofeature.d/x2goserver-x2goagent.* -etc/x2go/keystrokes.cfg -etc/x2go/x2goagent.keyboard -etc/x2go/x2goagent.options diff --git a/debian/x2goserver-xsession.docs b/debian/x2goserver-xsession.docs index 093650e..9b51864 100644 --- a/debian/x2goserver-xsession.docs +++ b/debian/x2goserver-xsession.docs @@ -1 +1 @@ -x2goserver-xsession/doc \ No newline at end of file +x2goserver-xsession/doc diff --git a/debian/x2goserver-xsession.install b/debian/x2goserver-xsession.install index d80b6d5..6b16eeb 100644 --- a/debian/x2goserver-xsession.install +++ b/debian/x2goserver-xsession.install @@ -1,3 +1,3 @@ -x2goserver-xsession/etc/Xsession /etc/x2go/ x2goserver-xsession/VERSION.x2goserver-xsession /usr/share/x2go/versions/ +x2goserver-xsession/etc/Xsession /etc/x2go/ x2goserver-xsession/share/x2gofeature.d/* /usr/share/x2go/x2gofeature.d/ diff --git a/debian/x2goserver.dirs b/debian/x2goserver.dirs index 8699a0c..6c48114 100644 --- a/debian/x2goserver.dirs +++ b/debian/x2goserver.dirs @@ -2,8 +2,8 @@ etc/x2go etc/x2go/x2gosql etc/x2go/x2gosql/passwords usr/bin -usr/sbin usr/lib/x2go +usr/sbin usr/share/x2go usr/share/x2go/versions var/lib/x2go diff --git a/debian/x2goserver.docs b/debian/x2goserver.docs index 1e6b27a..31dfbe3 100644 --- a/debian/x2goserver.docs +++ b/debian/x2goserver.docs @@ -1,3 +1,3 @@ +README.i18n x2goserver/.build_man2html/html x2goserver/doc/* -README.i18n diff --git a/debian/x2goserver.install b/debian/x2goserver.install index f6fd4c3..b880fe6 100644 --- a/debian/x2goserver.install +++ b/debian/x2goserver.install @@ -1,8 +1,8 @@ +x2goserver/VERSION.x2goserver /usr/share/x2go/versions/ x2goserver/bin/x2go* /usr/bin/ -x2goserver/sbin/x2go* /usr/sbin/ -x2goserver/lib/x2go* /usr/lib/x2go/ -x2goserver/etc/x2go_logout* /etc/x2go/ -x2goserver/etc/sudoers.d/x2goserver /etc/sudoers.d/ x2goserver/etc/logcheck/ignore.d.server/x2goserver /etc/logcheck/ignore.d.server/ -x2goserver/VERSION.x2goserver /usr/share/x2go/versions/ +x2goserver/etc/sudoers.d/x2goserver /etc/sudoers.d/ +x2goserver/etc/x2go_logout* /etc/x2go/ +x2goserver/lib/x2go* /usr/lib/x2go/ +x2goserver/sbin/x2go* /usr/sbin/ x2goserver/share/x2gofeature.d /usr/share/x2go/ diff --git a/debian/x2goserver.manpages b/debian/x2goserver.manpages index 88720a8..d769eef 100644 --- a/debian/x2goserver.manpages +++ b/debian/x2goserver.manpages @@ -1 +1 @@ -x2goserver/man/man8/* \ No newline at end of file +x2goserver/man/man8/* -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git