[X2Go-Commits] [x2goserver] 02/03: x2goserver.spec: let x2goserver-x2goagent conflict with the former x2goagent package.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2goserver.

commit 387ac16e3530172c5feeaece42a72818e83f204c
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Dec 18 12:38:45 2017 +0100

    x2goserver.spec: let x2goserver-x2goagent conflict with the former x2goagent package.
---
 debian/changelog | 1 +
 x2goserver.spec  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3ca98a0..cdbeb7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -234,6 +234,7 @@ x2goserver (4.1.0.0-0x2go1.2) UNRELEASED; urgency=low
     - Actually add logcheck Requires.
     - Give the x2goagent-virtual package a specific version, derived from the
       x2goserver version.
+    - Let x2goserver-x2goagent conflict with the former x2goagent package.
   * debian/control:
     - Maintainer change in package: X2Go Developers <x2go-dev at lists.x2go.org>.
     - Depend upon newer x2goagent package that now provides the
diff --git a/x2goserver.spec b/x2goserver.spec
index 214dd25..d99586d 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -307,6 +307,7 @@ Group:          Applications/System
 Summary:        X2Go Server's X2Go Agent
 Requires:       nxagent >= 3.5.99.3
 Provides:       x2goagent-virtual = %{version}-%{release}
+Conflicts:      x2goagent < 3.5.99.0
 
 %description x2goagent
 X2Go is a server based computing environment with

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git