aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2013-12-06 13:54:42 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2013-12-06 13:54:42 +0100
commitb413799fb9ca297d7697b1e9ddb88b1fafd209d8 (patch)
tree5b6f6eb1860d2318d5af48575c2c9d6271fd1292
parent08312e2e16fe5fe97b0c887353ac77457b4f5a0f (diff)
downloadnx-libs-b413799fb9ca297d7697b1e9ddb88b1fafd209d8.tar.gz
nx-libs-b413799fb9ca297d7697b1e9ddb88b1fafd209d8.tar.bz2
nx-libs-b413799fb9ca297d7697b1e9ddb88b1fafd209d8.zip
Refresh patch: 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch.
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch2
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 78ce45e73..4765224ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ nx-libs (2:3.5.0.22-0x2go1) UNRELEASED; urgency=low
+ Switch to format 1.0.
* debian/control:
+ Add libfreetype6-dev to Build-Depends: field.
+ * Refresh patch: 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch.
[ Clemens Lang ]
* Add patch 605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full.patch. Fix
diff --git a/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch b/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch
index eba1708bb..4e6607e60 100644
--- a/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch
+++ b/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch
@@ -1340,7 +1340,7 @@ Last-Update: 2012-02-15
#define IncSubSubdir SM
--- a/nx-X11/lib/X11/Imakefile
+++ b/nx-X11/lib/X11/Imakefile
-@@ -83,7 +83,7 @@
+@@ -82,7 +82,7 @@
#define DoExtraLib SharedLibX11
#define DoDebugLib DebugLibX11
#define DoProfileLib ProfileLibX11