[X2Go-Commits] nx-libs.git - build-baikal (branch) updated: redist-client/3.5.0.10-22-g6a96ae4
X2Go dev team
git-admin at x2go.org
Fri Aug 30 16:25:07 CEST 2013
The branch, build-baikal has been updated
via 6a96ae450fb469bec1f23ebe727f6f318bfe80db (commit)
from 8d6d0a921889498601cef9176202a456af881a9e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
debian/patches/030_nx-X11_configure-args.full.diff | 11 +++++------
debian/patches/031_nx-X11_parallel-make.full.diff | 13 +++++++------
3 files changed, 13 insertions(+), 12 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index b27e298..31384cf 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 3bc9100..8304ca7 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 at 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 at 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 849ca72..9f754d7 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 at 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 at medozas.de>
+Last-Update: 2012-01-26 22:29:13.993994227 +0100
---
nx-X11/Makefile | 64 +++++++++++++++++-----------------
hooks/post-receive
--
nx-libs.git (NX (redistributed))
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX (redistributed)).
More information about the x2go-commits
mailing list