The branch, master has been updated via 74e810a31fa18845cd760551b2bd604ead16428d (commit) via d6fa23c86ada56266981b3e873aa7da5e064cdff (commit) via 290fdeddfa7e1ac8e8c291122f74a4c248feed3a (commit) from f9177685ace06b2ae790261f512582076cfffd14 (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 74e810a31fa18845cd760551b2bd604ead16428d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Dec 30 15:29:01 2011 +0100 changelog fix: wrap long line commit d6fa23c86ada56266981b3e873aa7da5e064cdff Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Dec 30 15:28:23 2011 +0100 Break/conflict with nxlibs and nxlibs-dev (packages provided by freenx-team on Launchpad). commit 290fdeddfa7e1ac8e8c291122f74a4c248feed3a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Dec 30 15:25:30 2011 +0100 Make `breaks-without-version' lintian overrides needless. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 +++++- debian/control | 16 ++++++++++------ debian/libxcomp-dev.lintian-overrides | 1 - debian/libxcomp3.lintian-overrides | 1 - debian/libxcompext-dev.lintian-overrides | 1 - debian/libxcompext3.lintian-overrides | 1 - debian/libxcompshad-dev.lintian-overrides | 1 - debian/libxcompshad3.lintian-overrides | 1 - 8 files changed, 15 insertions(+), 13 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 915b039..ce2ef8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -54,7 +54,11 @@ nx-libs (2:3.5.0-2) UNRELEASED; urgency=low * Add patch: 019_nx-x11_expat-build-against-system-libxmltok.patch, fixes lintian error: embedded-library: expat. Build-depend on libxmltok1-dev. * Fix LD_LIBRARY_PATH export in wrapper scripts/patches. - * X2Go Packaging Team becomes maintainer, Mike Gabriel + Reinhard Tartler become uploaders. + * 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 + 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 77ff254..9389b55 100644 --- a/debian/control +++ b/debian/control @@ -13,6 +13,8 @@ Build-Depends: quilt (>= 0.46-7~), libxmltok1-dev, autoconf +Breaks: nxlibs (<=3.5.1) +Replaces: nxlibs Build-Conflicts: x11proto-core-dev, x11proto-kb-dev, @@ -30,6 +32,8 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Breaks: nxlibs-dev (<=3.5.1) +Replaces: nxlibs-dev Description: nx-X11 (NoMachine) X11 libraries customized for nxagent (NoMachine). @@ -166,7 +170,7 @@ Depends: libnx-x11 (>= ${source:Version}), libnx-x11 (<< ${source:Version}.1~), ${shlibs:Depends}, ${misc:Depends} -Breaks: nxcomp +Breaks: nxcomp (<=3.5.1) Replaces: nxcomp Description: NX X compression library NX provides a differential X compression library for X11. @@ -192,7 +196,7 @@ Depends: libnx-x11 (>= ${source:Version}), libnx-x11 (<< ${source:Version}.1~), libxcomp3 (= ${binary:Version}), ${misc:Depends} -Breaks: nxcomp-dev +Breaks: nxcomp-dev (<=3.5.1) Replaces: nxcomp-dev Description: NX X compression library headers NX provides a differential X compression library for X11. @@ -205,7 +209,7 @@ Depends: libnx-x11 (>= ${source:Version}), libnx-x11 (<< ${source:Version}.1~), ${shlibs:Depends}, ${misc:Depends} -Breaks: nxcompext +Breaks: nxcompext (<=3.5.1) Replaces: nxcompext Description: NX X11 protocol compression extensions library NX is a software suite from NoMachine which implements very efficient @@ -237,7 +241,7 @@ Depends: libxcompext3 (=${binary:Version}), ${misc:Depends}, libxcomp-dev, -Breaks: nxcompext-dev +Breaks: nxcompext-dev (<=3.5.1) Replaces: nxcompext-dev Description: NX X11 protocol compression extensions library headers NX is a software suite from NoMachine which implements very efficient @@ -255,7 +259,7 @@ Depends: libnx-x11 (>= ${source:Version}), libnx-x11 (<< ${source:Version}.1~), ${shlibs:Depends}, ${misc:Depends} -Breaks: nxcompshad +Breaks: nxcompshad (<=3.5.1) Replaces: nxcompshad Description: NX shadowing library NX is a software suite from NoMachine which implements very efficient @@ -283,7 +287,7 @@ Architecture: any Depends: libxcompshad3 (=${binary:Version}), ${misc:Depends} -Breaks: nxcompshad-dev +Breaks: nxcompshad-dev (<=3.5.1) Replaces: nxcompshad-dev Description: NX shadowing library headers NX is a software suite from NoMachine which implements very efficient diff --git a/debian/libxcomp-dev.lintian-overrides b/debian/libxcomp-dev.lintian-overrides index 7f1ec05..e49d5c6 100644 --- a/debian/libxcomp-dev.lintian-overrides +++ b/debian/libxcomp-dev.lintian-overrides @@ -1,3 +1,2 @@ -libxcomp-dev: breaks-without-version libxcomp-dev: possible-new-upstream-release-without-new-version diff --git a/debian/libxcomp3.lintian-overrides b/debian/libxcomp3.lintian-overrides index 95bd441..6cf797d 100644 --- a/debian/libxcomp3.lintian-overrides +++ b/debian/libxcomp3.lintian-overrides @@ -1,2 +1 @@ -libxcomp3: breaks-without-version libxcomp3: possible-new-upstream-release-without-new-version diff --git a/debian/libxcompext-dev.lintian-overrides b/debian/libxcompext-dev.lintian-overrides index 98e270f..78e8d39 100644 --- a/debian/libxcompext-dev.lintian-overrides +++ b/debian/libxcompext-dev.lintian-overrides @@ -1,3 +1,2 @@ -libxcompext-dev: breaks-without-version libxcompext-dev: possible-new-upstream-release-without-new-version diff --git a/debian/libxcompext3.lintian-overrides b/debian/libxcompext3.lintian-overrides index bc2dabc..8015a70 100644 --- a/debian/libxcompext3.lintian-overrides +++ b/debian/libxcompext3.lintian-overrides @@ -1,2 +1 @@ -libxcompext3: breaks-without-version libxcompext3: possible-new-upstream-release-without-new-version \ No newline at end of file diff --git a/debian/libxcompshad-dev.lintian-overrides b/debian/libxcompshad-dev.lintian-overrides index 1d6ef6b..ee4ac5b 100644 --- a/debian/libxcompshad-dev.lintian-overrides +++ b/debian/libxcompshad-dev.lintian-overrides @@ -1,3 +1,2 @@ -libxcompshad-dev: breaks-without-version libxcompshad-dev: possible-new-upstream-release-without-new-version diff --git a/debian/libxcompshad3.lintian-overrides b/debian/libxcompshad3.lintian-overrides index 04af55a..f35d410 100644 --- a/debian/libxcompshad3.lintian-overrides +++ b/debian/libxcompshad3.lintian-overrides @@ -1,2 +1 @@ -libxcompshad3: breaks-without-version libxcompshad3: possible-new-upstream-release-without-new-version \ No newline at end of file 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).