The branch, master has been updated via f1c239c07c24c15f6a6842cefa2e3a06938edf3c (commit) via e20dc398f7bd25ec0c3e21b9904dfd5c63ad8695 (commit) from 28a112c7a46baf94df88afc733f9b9a30ddb3c14 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f1c239c07c24c15f6a6842cefa2e3a06938edf3c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Dec 30 15:34:02 2011 +0100 changelog fix for latest changelog line commit e20dc398f7bd25ec0c3e21b9904dfd5c63ad8695 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Dec 30 15:32:37 2011 +0100 control file: fixing Breaks/Replaces statements ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- debian/control | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ce2ef8c..bdcb347 100644 --- a/debian/changelog +++ b/debian/changelog @@ -57,7 +57,7 @@ nx-libs (2:3.5.0-2) UNRELEASED; urgency=low * X2Go Packaging Team becomes maintainer, Mike Gabriel + Reinhard Tartler become uploaders. * Make `breaks-without-version' lintian overrides needless. - * Break/conflict with nxlibs and nxlibs-dev (packages provided by + * Break/replace nxlibs and nxlibs-dev (packages provided by freenx-team on Launchpad). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 28 Dec 2011 19:06:26 +0100 diff --git a/debian/control b/debian/control index e95ef0e..66961af 100644 --- a/debian/control +++ b/debian/control @@ -13,8 +13,6 @@ Build-Depends: quilt (>= 0.46-7~), libxmltok1-dev, autoconf -Breaks: nxlibs (<=3.5.1) -Replaces: nxlibs Build-Conflicts: x11proto-core-dev, x11proto-kb-dev, @@ -32,8 +30,8 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: nxlibs-dev (<=3.5.1) -Replaces: nxlibs-dev +Breaks: nxlibs (<=3.5.1) +Replaces: nxlibs Description: nx-X11 (NoMachine) X11 libraries customized for nxagent (NoMachine). @@ -52,6 +50,8 @@ Description: nx-X11 (NoMachine) Package: libnx-x11-dev Section: libdevel Architecture: any +Breaks: nxlibs-dev (<=3.5.1) +Replaces: nxlibs-dev Depends: libnx-x11 (>= ${source:Version}), libnx-x11 (<< ${source:Version}.1~), ${misc:Depends} hooks/post-receive -- nx-libs.git (NX libraries) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX libraries).