This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository nx-libs. from d017d21 nx-libs.spec: pass CDEBUGSFLAGS and friends directly to the make command in %build. new b5230d3 debian/control: change Breaks statement to pre-4.0.1.21 x2goserver and add a Replaces: x2goserver << 4.0.1.21 section to x2goagent package. new 288cc6f nx-libs.spec: let x2goagent conflict with pre-4.0.1.21 x2goserver versions. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 6 ++++++ debian/control | 4 +++- nx-libs.spec | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) -- Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit b5230d3719fd46a7d7632315a40adce19dbbab2f Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Nov 2 07:16:36 2017 +0100 debian/control: 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. --- debian/changelog | 4 ++++ debian/control | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 295c475..bab83c8 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 5dcab77..5633c09 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 -- Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 288cc6fec0826234fd6de145ab6cb284bdd2280b Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Nov 2 07:18:27 2017 +0100 nx-libs.spec: let x2goagent conflict with pre-4.0.1.21 x2goserver versions. Needed for x2goagent.options file move. --- debian/changelog | 2 ++ nx-libs.spec | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index bab83c8..e2f7db4 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 cdf362d..e72e01f 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 -- Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
-
git-admin＠x2go.org