aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-02-14 22:42:48 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-02-14 22:42:48 +0100
commit01e97f0f829b90411a15c70b082a7823a26ae61f (patch)
tree7bfe16fd2eb3246b483709fdb13446a70e880fdb
parentc621c22f820ec22fe7daabf37b7b577a41a3298f (diff)
downloadnx-libs-01e97f0f829b90411a15c70b082a7823a26ae61f.tar.gz
nx-libs-01e97f0f829b90411a15c70b082a7823a26ae61f.tar.bz2
nx-libs-01e97f0f829b90411a15c70b082a7823a26ae61f.zip
Rename patches 030_nx-X11_... and 031_nx-X11_..., the tarball roll script currently requires ,,full'' or ,,full+lite'' in the file name.
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/030_nx-X11_configure-args.full.diff (renamed from debian/patches/030_nx-X11_configure-args.diff)0
-rw-r--r--debian/patches/031_nx-X11_parallel-make.full.diff (renamed from debian/patches/031_nx-X11_parallel-make.diff)0
-rw-r--r--debian/patches/series4
4 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index d10cc08f0..c1658fb43 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
index 3bc910003..3bc910003 100644
--- a/debian/patches/030_nx-X11_configure-args.diff
+++ b/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
index 849ca726c..849ca726c 100644
--- a/debian/patches/031_nx-X11_parallel-make.diff
+++ b/debian/patches/031_nx-X11_parallel-make.full.diff
diff --git a/debian/patches/series b/debian/patches/series
index 48c294540..7f6e801f0 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