aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog4
-rw-r--r--debian/control4
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 295c475a2..bab83c8c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ nx-libs (2:3.5.0.33-0x2go1) UNRELEASED; urgency=low
- Uploaders: add myself. Also, force a rebuild due to the changed
versioning.
- Add Breaks statement on pre-4.1.0.0 x2goserver to x2goagent package.
+ - Change Breaks statement to pre-4.0.1.21 x2goserver and add a Replaces:
+ x2goserver << 4.0.1.21 section to x2goagent package. We'll do the
+ /etc/x2go/x2goagent.options file move for x2goserver 4.0.1.21 and
+ nx-libs 3.5.0.33 already.
* nx-libs.spec:
- Add xkeyboard-config to nxagent's Requires. Should be a weak dependency,
but RPM doesn't support that too well yet.
diff --git a/debian/control b/debian/control
index 5dcab7797..5633c09b9 100644
--- a/debian/control
+++ b/debian/control
@@ -1059,7 +1059,9 @@ Depends:
nxagent (>= ${source:Version}), nxagent (<< ${source:Version}.1),
${misc:Depends},
Breaks:
- x2goserver (<< 4.1.0.0-0~)
+ x2goserver (<< 4.0.1.21-0~)
+Replaces:
+ x2goserver (<< 4.0.1.21-0~)
Suggests:
x2goserver
Description: X2Go agent