diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | nx-libs.spec | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index bab83c8c9..e2f7db4c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,8 @@ nx-libs (2:3.5.0.33-0x2go1) UNRELEASED; urgency=low v2: backport to nx-libs 3.5.0.x (Mihai Moldovan) - Drop ugly sed hack to push optflags to build system. - Pass CDEBUGSFLAGS and friends directly to the make command in %build. + - Let x2goagent conflict with pre-4.0.1.21 x2goserver versions. Needed for + x2goagent.options file move. * debian/: - Add x2goagent.options file for compatibility with x2goserver nightly. * debian/roll-tarballs.sh: diff --git a/nx-libs.spec b/nx-libs.spec index cdf362da1..e72e01f1a 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -675,6 +675,7 @@ Group: Applications/System Summary: X2Go Agent Requires: nxagent Provides: x2goagent-virtual +Conflicts: x2goserver < 4.0.1.21 %description -n x2goagent X2Go Agent functionality has been completely incorporated into |