[X2Go-Commits] nx-libs.git - build-main (branch) updated: redist-client/3.5.0.10-20-g01e97f0
X2Go dev team
git-admin at x2go.org
Fri Aug 30 16:23:24 CEST 2013
The branch, build-main has been updated
via 01e97f0f829b90411a15c70b082a7823a26ae61f (commit)
from c621c22f820ec22fe7daabf37b7b577a41a3298f (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 | 2 ++
...gs.diff => 030_nx-X11_configure-args.full.diff} | 0
...ake.diff => 031_nx-X11_parallel-make.full.diff} | 0
debian/patches/series | 4 ++--
4 files changed, 4 insertions(+), 2 deletions(-)
rename debian/patches/{030_nx-X11_configure-args.diff => 030_nx-X11_configure-args.full.diff} (100%)
rename debian/patches/{031_nx-X11_parallel-make.diff => 031_nx-X11_parallel-make.full.diff} (100%)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index d10cc08..c1658fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low
* Enable parallel build for Debian package.
* Merge honor-ac-dirs.patch from Jan Engelhardt (OpenSUSE) with already existing
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.
[ Jan Engelhardt ]
* Update patch: 001_add-main-makefile.full+lite.patch, allow passing of
diff --git a/debian/patches/030_nx-X11_configure-args.diff b/debian/patches/030_nx-X11_configure-args.full.diff
similarity index 100%
rename from debian/patches/030_nx-X11_configure-args.diff
rename to debian/patches/030_nx-X11_configure-args.full.diff
diff --git a/debian/patches/031_nx-X11_parallel-make.diff b/debian/patches/031_nx-X11_parallel-make.full.diff
similarity index 100%
rename from debian/patches/031_nx-X11_parallel-make.diff
rename to debian/patches/031_nx-X11_parallel-make.full.diff
diff --git a/debian/patches/series b/debian/patches/series
index 48c2945..7f6e801 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,8 +23,8 @@
021_add-nxauth-wrapper.full.patch
022_add-nxproxy-wrapper.full+lite.patch
023_add-x2goagent-wrapper.full.patch
-030_nx-X11_configure-args.diff
-031_nx-X11_parallel-make.diff
+030_nx-X11_configure-args.full.diff
+031_nx-X11_parallel-make.full.diff
101_nxagent_set-rgb-path.full.patch
102_xserver-xext_set-securitypolicy-path.full.patch
102_xserver-xext_set-securitypolicy-path.debian.patch
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