aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog5
-rw-r--r--debian/patches/1400_nx-X11_Render.c-Improve-situation-fo.full.patch (renamed from debian/patches/1400_nx-X11_Render.c-Improve-situation-fo.full+lite.patch)0
-rw-r--r--debian/patches/series2
3 files changed, 6 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index f435db4fb..910f53828 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -69,6 +69,11 @@ nx-libs (2:3.5.0.33-0x2go1) unstable; urgency=low
v2: backport to nx-libs 3.5.0.x (Mihai Moldovan)
Adds:
- debian/patches/1610_nxcomp-harcode-some-UNIX-socket-path.full+lite.patch
+ * Mid-release fixup:
+ - Rename
+ debian/patches/1400_nx-X11_Render.c-Improve-situation-fo.full+lite.patch
+ to
+ debian/patches/1400_nx-X11_Render.c-Improve-situation-fo.full.patch.
[ Mike Gabriel ]
* debian/libxinerama1.postinst.in:
diff --git a/debian/patches/1400_nx-X11_Render.c-Improve-situation-fo.full+lite.patch b/debian/patches/1400_nx-X11_Render.c-Improve-situation-fo.full.patch
index ca875f3cf..ca875f3cf 100644
--- a/debian/patches/1400_nx-X11_Render.c-Improve-situation-fo.full+lite.patch
+++ b/debian/patches/1400_nx-X11_Render.c-Improve-situation-fo.full.patch
diff --git a/debian/patches/series b/debian/patches/series
index ac1450ad5..30745a644 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -150,7 +150,7 @@
1270_nx-X11_CVE-2017-2624-Use-timingsafe_memcmp-to-c.full.patch
1300_nxcomp_Set-TokenSize-to-1536-for-lin.full+lite.patch
1301_nxcomp_Reduce-TokenSize-slightly-for.full+lite.patch
-1400_nx-X11_Render.c-Improve-situation-fo.full+lite.patch
+1400_nx-X11_Render.c-Improve-situation-fo.full.patch
1500_all_propagate-optflags-to-subcompone.full+lite.patch
1600_nxcomp-handle-launchd-socket-in-Auth.full+lite.patch
1610_nxcomp-harcode-some-UNIX-socket-path.full+lite.patch