This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 03112e112b5fbbe09e86a69c6f5f94dbf2213744 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Apr 1 10:42:35 2014 +0200 Several style and dependency fixes. Use Conflicts: instead of Breaks: for unversioned package conflicts. --- debian/changelog | 2 ++ debian/control | 28 ++++++++++++++-------------- debian/x2goserver.lintian-overrides | 1 - 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index 02a32a8..9378aca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -55,6 +55,8 @@ x2goserver (4.1.0.0-0x2go1) UNRELEASED; urgency=low + Add Reinhard Tartler to Uploaders. + Add libcatpure-tiny-perl to Depends: field of libx2go-server-perl. + Move x2gosql config to x2goserver-common. + + Several style and dependency fixes. Use Conflicts: instead of Breaks: + for unversioned package conflicts. * debian/x2goserver.postinst, debian/libx2go-server-db-perl: + Handle X2Go session DB creation in x2goserver _and_ perl-X2Go-Server-DB on postinst. diff --git a/debian/control b/debian/control index 53f6053..606547f 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Uploaders: Reinhard Tartler <siretart@tauware.de>, Build-Depends: debhelper (>= 7.0.50~), - man2html-base | man2html + man2html-base | man2html, Standards-Version: 3.9.4 Homepage: http://code.x2go.org/releases/source/x2goserver Vcs-Git: git://code.x2go.org/x2goserver.git @@ -17,11 +17,11 @@ Vcs-Browser: http://code.x2go.org/gitweb?p=x2goserver.git;a=summary Package: x2goserver Architecture: any Depends: - x2goserver-common (>= 4.1.0.0-0~), + x2goserver-common (>= ${source:Version}), x2goserver-common (<< ${source:Version}.1~), ${misc:Depends}, libfile-basedir-perl, libfile-readbackwards-perl, - libx2go-server-perl (>= ${source:Version}), libx2go-server-db-perl (<< ${source:Version}.1~), + libx2go-server-perl (>= ${source:Version}), libx2go-server-perl (<< ${source:Version}.1~), x2goagent (>= 2:3.5.0.15-0~), lsof, bc, @@ -49,7 +49,7 @@ Recommends: Suggests: rdesktop, pulseaudio-utils -Breaks: +Conflicts: x2goserver-one, x2goserver-home, x2goserver-compat, @@ -93,7 +93,7 @@ Description: X2Go Server (common files) and the X2Go::Server Perl API. Package: libx2go-server-perl -Architecture: any +Architecture: all Section: perl Depends: ${perl:Depends}, @@ -142,7 +142,7 @@ Description: Perl X2Go::Server:DB package This package contains the X2Go::Server::DB Perl package. Package: libx2go-log-perl -Architecture: any +Architecture: all Section: perl Depends: ${perl:Depends}, @@ -164,13 +164,13 @@ Architecture: all Depends: ${misc:Depends}, x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~), - adduser -Breaks: - x2goprint + adduser, +Conflicts: + x2goprint, Replaces: - x2goprint + x2goprint, Suggests: - cups-x2go + cups-x2go, Description: X2Go server (printing support) X2Go is a server based computing environment with - session resuming @@ -198,7 +198,7 @@ Architecture: all Depends: ${misc:Depends}, x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~), - x11-xkb-utils + x11-xkb-utils, Description: X2Go Server (extension support) X2Go is a server based computing environment with - session resuming @@ -220,7 +220,7 @@ Architecture: all Depends: ${misc:Depends}, x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~), - x11-common + x11-common, Description: X2Go Server (Xsession runner) X2Go is a server based computing environment with - session resuming @@ -244,7 +244,7 @@ Depends: ${misc:Depends}, x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~), desktop-file-utils, - xdg-utils + xdg-utils, Description: X2Go Server (file manager bindings) X2Go is a server based computing environment with - session resuming diff --git a/debian/x2goserver.lintian-overrides b/debian/x2goserver.lintian-overrides deleted file mode 100644 index 637b7db..0000000 --- a/debian/x2goserver.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -x2goserver: breaks-without-version -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git