From e595613879bc4c4f2ebdd13150fc18303611cda7 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Thu, 30 Apr 2015 14:43:04 +0200 Subject: debian/changelog: correctly sync with 3.5.0.x branch. Add latest entries. --- debian/changelog | 107 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 57 insertions(+), 50 deletions(-) diff --git a/debian/changelog b/debian/changelog index dda68a4cd..016ee357a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,56 +29,6 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low * nx-X11: add more NULL guards to TEST and DEBUG sections of Render.c. Affects: - 0990_fix-DEBUG-and-TEST-builds.full.patch - - -- X2Go Release Manager Tue, 17 Mar 2015 19:19:32 +0100 - -nx-libs (2:3.5.0.31-0x2go1) unstable; urgency=low - - [ Clemens Lang ] - * Use path discovery for finding makedepend. Remove old cruft. Adds: - - 0070_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch - - 0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch - - 0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch - - 0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch - * Fix dynamic library linking on OS X. Use -dynamiclib instead of -bundle. - Adds: - - 0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch - - 0075_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch - * Use the correct library naming scheme on OS X. It differs from other - UNIX-based systems. - Adds: - - 0410_nxcomp_use-correct-library-naming-scheme-on-OS-X.full+lite.patch - - 0610_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch - - 0611_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch - - [ Mihai Moldovan ] - * nx{comp{,ext,shad},proxy}: try really hard to find makedepend. Do not fail - if it is not available. - * Rename: - - 0070_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch => - 0410_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch - - 0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch => - 0610_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch - - 0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch => - 0611_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch - - 0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch => - 0612_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch - - 0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch => - 0613_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch - - 0075_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch => - 0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch - - 0610_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch - => - 0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch - - 0611_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch - => - 0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch - * nx-libs.spec: - - Versioned libXcomp* should obsolete unversioned libXcomp*, not - libNX_Xcomp*. - - Add overlooked Obsolete: statement to libNX_Xfixes3. - * Mid-release fixup: - - Rename *nxcomp{ext,shad}*.full+lite* to *nxcomp{ext,shad}*.full. * CVE patches were previously not included in release tarballs. Rename: - 1001-LZW-decompress-fix-for-CVE-2011-2895-From-xorg-lib-X.patch => @@ -195,6 +145,13 @@ nx-libs (2:3.5.0.31-0x2go1) unstable; urgency=low - Remove accidentally copied Dokuwiki syntax. * debian/keystrokes.cfg: fix whitespace errors. Backported from Arctica GH 3.6.x branch. + * debian/libnx-xinerama1.*: also create libXinerama symlink in + libnx-xinerama1.postinst.postinst (and remove in + libnx-xinerama1.postinst.prerm.) + Backported from Arctica GH 3.6.x branch. + * debian/libnx-xinerama1.*: move Xinerama dir back to nx-x11-common. Only + delete known files. Fixes RPM build failures. + Backported from Arctica GH 3.6.x branch. [ Bernard Cafarelli ] * nx-X11: link to libdl to fix undefined references to 'dlopen' and 'dlsym'. @@ -214,6 +171,56 @@ nx-libs (2:3.5.0.31-0x2go1) unstable; urgency=low Adds: - 0650_nxcompshad_link-to-NX_Xext.full.patch + -- X2Go Release Manager Tue, 17 Mar 2015 19:19:32 +0100 + +nx-libs (2:3.5.0.31-0x2go1) unstable; urgency=low + + [ Clemens Lang ] + * Use path discovery for finding makedepend. Remove old cruft. Adds: + - 0070_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch + - 0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch + - 0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch + - 0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch + * Fix dynamic library linking on OS X. Use -dynamiclib instead of -bundle. + Adds: + - 0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch + - 0075_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch + * Use the correct library naming scheme on OS X. It differs from other + UNIX-based systems. + Adds: + - 0410_nxcomp_use-correct-library-naming-scheme-on-OS-X.full+lite.patch + - 0610_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch + - 0611_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch + + [ Mihai Moldovan ] + * nx{comp{,ext,shad},proxy}: try really hard to find makedepend. Do not fail + if it is not available. + * Rename: + - 0070_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch => + 0410_nxcomp_use-MAKEDEPEND-in-path.full+lite.patch + - 0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch => + 0610_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch + - 0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch => + 0611_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch + - 0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch => + 0612_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch + - 0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch => + 0613_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch + - 0075_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch => + 0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch + - 0610_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch + => + 0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch + - 0611_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch + => + 0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch + * nx-libs.spec: + - Versioned libXcomp* should obsolete unversioned libXcomp*, not + libNX_Xcomp*. + - Add overlooked Obsolete: statement to libNX_Xfixes3. + * Mid-release fixup: + - Rename *nxcomp{ext,shad}*.full+lite* to *nxcomp{ext,shad}*.full. + -- X2Go Release Manager Tue, 17 Mar 2015 18:48:06 +0100 nx-libs (2:3.5.0.30-0x2go1) unstable; urgency=low -- cgit v1.2.3