aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-10-16 07:18:32 +0200
committerMihai Moldovan <ionic@ionic.de>2017-10-16 07:18:32 +0200
commitdf3944d4614ca5aea595631ca4158a3baad2a257 (patch)
tree443c11419bf821227b63fa4dcc38f8d869627b97
parente73464e4f1dcef8025226c7df47cc8b579c16f28 (diff)
downloadnx-libs-df3944d4614ca5aea595631ca4158a3baad2a257.tar.gz
nx-libs-df3944d4614ca5aea595631ca4158a3baad2a257.tar.bz2
nx-libs-df3944d4614ca5aea595631ca4158a3baad2a257.zip
debian/patches: fixup series file to include previous patch.
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/series1
2 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 820dacd6a..d03536355 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,7 @@ nx-libs (2:3.5.0.33-0x2go1) UNRELEASED; urgency=low
* debian/patches:
- Refresh all patches. Removes some fuzziness and adds the -p diff option
to show the C function name in hunk headers.
+ - Fixup series file to include previous patch.
[ Mike Gabriel ]
* debian/libxinerama1.postinst.in:
diff --git a/debian/patches/series b/debian/patches/series
index c475dc72f..8756cc4cc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -149,6 +149,7 @@
1260_nx-X11_xserver-Avoid-sending-uninitialized-padd.full.patch
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
9900-dxpc-license-history.full+lite.patch
0016_nx-X11_install-location.debian.patch