diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/030_nx-X11_configure-args.full.diff | 11 | ||||
| -rw-r--r-- | debian/patches/031_nx-X11_parallel-make.full.diff | 13 |
3 files changed, 13 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog index b27e29899..31384cf28 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low Makefile patches (012_nxcomp..., 013_nxcompext_..., 014_nxcompshad_...). * Rename patches 030_nx-X11_... and 031_nx-X11_..., the tarball roll script currently requires ,,full'' or ,,full+lite'' in the file name. + * Make patch headers DEP5 compliant (030_nx-X11_... and 031_nx-X11_...). [ Jan Engelhardt ] * Update patch: 001_add-main-makefile.full+lite.patch, allow passing of diff --git a/debian/patches/030_nx-X11_configure-args.full.diff b/debian/patches/030_nx-X11_configure-args.full.diff index 3bc910003..8304ca795 100644 --- a/debian/patches/030_nx-X11_configure-args.full.diff +++ b/debian/patches/030_nx-X11_configure-args.full.diff @@ -1,9 +1,8 @@ -From: Jan Engelhardt <jengelh@medozas.de> -Date: 2012-01-26 23:30:37.605560191 +0100 -Upstream: pending - -Allow to pass in configure args. - +Description: Allow to pass in configure args. + Allow to pass in configure args. +Forward: pending +Author: Jan Engelhardt <jengelh@medozas.de> +Last-Update: 2012-02-14 --- nx-X11/lib/X11/Imakefile | 6 ++++-- nx-X11/programs/Xserver/Imakefile | 4 +++- diff --git a/debian/patches/031_nx-X11_parallel-make.full.diff b/debian/patches/031_nx-X11_parallel-make.full.diff index 849ca726c..9f754d767 100644 --- a/debian/patches/031_nx-X11_parallel-make.full.diff +++ b/debian/patches/031_nx-X11_parallel-make.full.diff @@ -1,9 +1,10 @@ -From: Jan Engelhardt <jengelh@medozas.de> -Date: 2012-01-26 22:29:13.993994227 +0100 - -Restore ability to build things in parallel. -(${MAKE} must always appear in the rule directly, and not be -hidden through expansions of other variables to get this to work.) +Description: Enable parallel make + Restore ability to build things in parallel. + (${MAKE} must always appear in the rule directly, and not be + hidden through expansions of other variables to get this to work.) +Forward: pending +Author: Jan Engelhardt <jengelh@medozas.de> +Last-Update: 2012-01-26 22:29:13.993994227 +0100 --- nx-X11/Makefile | 64 +++++++++++++++++----------------- |