aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/0610_nxcompext_use-MAKEDEPEND-in-path.full.patch (renamed from debian/patches/0610_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch)0
-rw-r--r--debian/patches/0611_nxcompshad_use-MAKEDEPEND-in-path.full.patch (renamed from debian/patches/0611_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch)0
-rw-r--r--debian/patches/0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full.patch (renamed from debian/patches/0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch)0
-rw-r--r--debian/patches/0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full.patch (renamed from debian/patches/0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch)0
-rw-r--r--debian/patches/0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full.patch (renamed from debian/patches/0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch)0
-rw-r--r--debian/patches/series10
7 files changed, 7 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 9779b57e1..9591915dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,6 +43,8 @@ nx-libs (2:3.5.0.31-0x2go1) unstable; urgency=low
- Versioned libXcomp* should obsolete unversioned libXcomp*, not
libNX_Xcomp*.
- Add overlooked Obsolete: statement to libNX_Xfixes3.
+ * Mid-release fixup:
+ - Rename *nxcomp{ext,shad}*.full+lite* to *nxcomp{ext,shad}*.full.
-- X2Go Release Manager <git-admin@x2go.org> Tue, 17 Mar 2015 18:48:06 +0100
diff --git a/debian/patches/0610_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch b/debian/patches/0610_nxcompext_use-MAKEDEPEND-in-path.full.patch
index da7924f81..da7924f81 100644
--- a/debian/patches/0610_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch
+++ b/debian/patches/0610_nxcompext_use-MAKEDEPEND-in-path.full.patch
diff --git a/debian/patches/0611_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch b/debian/patches/0611_nxcompshad_use-MAKEDEPEND-in-path.full.patch
index 329a48937..329a48937 100644
--- a/debian/patches/0611_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch
+++ b/debian/patches/0611_nxcompshad_use-MAKEDEPEND-in-path.full.patch
diff --git a/debian/patches/0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch b/debian/patches/0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full.patch
index a75424511..a75424511 100644
--- a/debian/patches/0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch
+++ b/debian/patches/0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full.patch
diff --git a/debian/patches/0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch b/debian/patches/0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full.patch
index 0db573f21..0db573f21 100644
--- a/debian/patches/0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
+++ b/debian/patches/0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full.patch
diff --git a/debian/patches/0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch b/debian/patches/0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full.patch
index 3099698c9..3099698c9 100644
--- a/debian/patches/0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
+++ b/debian/patches/0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full.patch
diff --git a/debian/patches/series b/debian/patches/series
index 69fca5bd4..4ad233cc4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -70,13 +70,13 @@
0605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch
0606_nx-X11_build-on-aarch64.full.patch
0607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch
-0610_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch
-0611_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch
+0610_nxcompext_use-MAKEDEPEND-in-path.full.patch
+0611_nxcompshad_use-MAKEDEPEND-in-path.full.patch
0612_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch
0613_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch
-0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch
-0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
-0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full+lite.patch
+0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full.patch
+0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full.patch
+0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full.patch
0990_fix-DEBUG-and-TEST-builds.full.patch
0991_fix-hr-typos.full+lite.patch
0991_fix-hr-typos.full.patch