diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-10-19 00:19:38 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-10-19 00:19:38 +0200 |
| commit | 429dbe70872b050453d41d8f09733a4deb1ed804 (patch) | |
| tree | 8c74873f4e243780ed215bdf8b8fd874a3873323 | |
| parent | b0727a02ff417b3983b10e02dbc1eb9a4878b2ac (diff) | |
| download | nx-libs-429dbe70872b050453d41d8f09733a4deb1ed804.tar.gz nx-libs-429dbe70872b050453d41d8f09733a4deb1ed804.tar.bz2 nx-libs-429dbe70872b050453d41d8f09733a4deb1ed804.zip | |
Rename 605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full.patch to 605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch. It is an nxcomp patch that needs to be applied in the nx-libs-lite _and_ the nx-libs-full tarball release.
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch (renamed from debian/patches/605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full.patch) | 0 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index f90efa2c3..69fc02d81 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,10 @@ nx-libs (2:3.5.0.28-0x2go1) UNRELEASED; urgency=medium (Description: and Author: field). * Add 607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch. Fix check for launchd socket path in $DISPLAY on recent Mac OS X systems. + * Rename 605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full.patch to + 605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch. It is + an nxcomp patch that needs to be applied in the nx-libs-lite _and_ the + nx-libs-full tarball release. * debian/libnx-x11.postinst: + Don't use dpkg-architecture (bin:package dpkg-dev) in postinst script. Instead prep a libnx-x11.postinst script at build time. (Fixes: diff --git a/debian/patches/605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full.patch b/debian/patches/605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch index 60f33ce3f..60f33ce3f 100644 --- a/debian/patches/605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full.patch +++ b/debian/patches/605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch diff --git a/debian/patches/series b/debian/patches/series index 806cb3d29..cf6eaf30d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -66,7 +66,7 @@ 602_nx-X11_initgroups.full.patch 603_nx-X11_compilation_warnings.full.patch 604_nx-X11_recent-freetype-API.full.patch -605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full.patch +605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch 606_nx-X11_build-on-aarch64.full.patch 607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch 990_fix-DEBUG-and-TEST-builds.full.patch |