Merge branch 'sunweaver-pr/debian-packaging-updates' into 3.6.x

debian/changelog

-nx-libs (2:3.5.99.0-0) UNRELEASED; urgency=medium
+nx-libs (2:3.5.99.0-0.1) UNRELEASED; urgency=medium
 
   * Version bump, continuing NX 3.x development..
     Targeting NX 3.6.x.y some time.

debian/compat

-7
+9

debian/libxcompext3.symbols

+libXcompext.so.3 libxcompext3 #MINVER#
+ AlphaCompressData@Base 3.5.0.29
+ BitmapCompressData@Base 3.5.0.29
+ CleanXYImage@Base 3.5.0.29
+ CleanZImage@Base 3.5.0.29
+ ColormapCompressData@Base 3.5.0.29
+ CopyAndCleanImage@Base 3.5.0.29
+ FindLSB@Base 3.5.0.29
+ JpegCompressData@Base 3.5.0.29
+ MaskImage@Base 3.5.0.29
+ MaskInPlaceImage@Base 3.5.0.29
+ NXAbortSplit@Base 3.5.0.29
+ NXAllocColors@Base 3.5.0.29
+ NXAllocSplit@Base 3.5.0.29
+ NXAllocUnpack@Base 3.5.0.29
+ NXCacheAddImage@Base 3.5.0.29
+ NXCacheFindImage@Base 3.5.0.29
+ NXCleanImage@Base 3.5.0.29
+ NXCollectGrabPointer@Base 3.5.0.29
+ NXCollectImage@Base 3.5.0.29
+ NXCollectInputFocus@Base 3.5.0.29
+ NXCollectProperty@Base 3.5.0.29
+ NXCommitSplit@Base 3.5.0.29
+ NXCreatePackedImage@Base 3.5.0.29
+ NXCreatePalette16@Base 3.5.0.29
+ NXCreatePalette32@Base 3.5.0.29
+ NXDestroyPackedImage@Base 3.5.0.29
+ NXDisplayCongestion@Base 3.5.0.29
+ NXDisplayError@Base 3.5.0.29
+ NXDisplayFlushable@Base 3.5.0.29
+ NXDisplayReadable@Base 3.5.0.29
+ NXEncodeAlpha@Base 3.5.0.29
+ NXEncodeBitmap@Base 3.5.0.29
+ NXEncodeColormap@Base 3.5.0.29
+ NXEncodeColors@Base 3.5.0.29
+ NXEncodeJpeg@Base 3.5.0.29
+ NXEncodePng@Base 3.5.0.29
+ NXEncodeRgb@Base 3.5.0.29
+ NXEncodeRle@Base 3.5.0.29
+ NXEndSplit@Base 3.5.0.29
+ NXFinishSplit@Base 3.5.0.29
+ NXFlushDisplay@Base 3.5.0.29
+ NXForceDisplayError@Base 3.5.0.29
+ NXFreeCache@Base 3.5.0.29
+ NXFreeSplit@Base 3.5.0.29
+ NXFreeUnpack@Base 3.5.0.29
+ NXGetCollectGrabPointerResource@Base 3.5.0.29
+ NXGetCollectImageResource@Base 3.5.0.29
+ NXGetCollectInputFocusResource@Base 3.5.0.29
+ NXGetCollectPropertyResource@Base 3.5.0.29
+ NXGetCollectedGrabPointer@Base 3.5.0.29
+ NXGetCollectedImage@Base 3.5.0.29
+ NXGetCollectedInputFocus@Base 3.5.0.29
+ NXGetCollectedProperty@Base 3.5.0.29
+ NXGetControlParameters@Base 3.5.0.29
+ NXGetFontParameters@Base 3.5.0.29
+ NXGetShmemParameters@Base 3.5.0.29
+ NXGetUnpackParameters@Base 3.5.0.29
+ NXHandleDisplayError@Base 3.5.0.29
+ NXImageCache@Base 3.5.0.29
+ NXImageCacheHits@Base 3.5.0.29
+ NXImageCacheOps@Base 3.5.0.29
+ NXImageCacheSize@Base 3.5.0.29
+ NXInPlacePackImage@Base 3.5.0.29
+ NXInitCache@Base 3.5.0.29
+ NXInitDisplay@Base 3.5.0.29
+ NXMaskImage@Base 3.5.0.29
+ NXPackImage@Base 3.5.0.29
+ NXPutPackedImage@Base 3.5.0.29
+ NXResetDisplay@Base 3.5.0.29
+ NXSetCacheParameters@Base 3.5.0.29
+ NXSetDisplayBlockHandler@Base 3.5.0.29
+ NXSetDisplayBuffer@Base 3.5.0.29
+ NXSetDisplayErrorPredicate@Base 3.5.0.29
+ NXSetDisplayFlushHandler@Base 3.5.0.29
+ NXSetDisplayPolicy@Base 3.5.0.29
+ NXSetDisplayStatisticsHandler@Base 3.5.0.29
+ NXSetDisplayWriteHandler@Base 3.5.0.29
+ NXSetExposeParameters@Base 3.5.0.29
+ NXSetLostSequenceHandler@Base 3.5.0.29
+ NXSetUnpackAlpha@Base 3.5.0.29
+ NXSetUnpackAlphaCompat@Base 3.5.0.29
+ NXSetUnpackColormap@Base 3.5.0.29
+ NXSetUnpackColormapCompat@Base 3.5.0.29
+ NXSetUnpackGeometry@Base 3.5.0.29
+ NXStartSplit@Base 3.5.0.29
+ NXUnsetLibraryPath@Base 3.5.0.29
+ PackImage@Base 3.5.0.29
+ PngCompareColorTable@Base 3.5.0.29
+ PngCompressData@Base 3.5.0.29
+ RgbCompressData@Base 3.5.0.29
+ RleCompressData@Base 3.5.0.29
+ ZCompressData@Base 3.5.0.29
+ ZInitEncoder@Base 3.5.0.29
+ ZResetEncoder@Base 3.5.0.29
+ _NXInternalInitEncoders@Base 3.5.0.29
+ _NXInternalInitResources@Base 3.5.0.29
+ _NXInternalResetEncoders@Base 3.5.0.29
+ _NXInternalResetResources@Base 3.5.0.29
+ color_type@Base 3.5.0.29
+ info_ptr@Base 3.5.0.29
+ palette@Base 3.5.0.29
+ png_ptr@Base 3.5.0.29

debian/nxagent.dirs

-usr/bin
-usr/lib/nx/bin
-usr/share/nx
\ No newline at end of file

debian/nxproxy.dirs

-usr/bin
-usr/lib/nx/bin

debian/rules

@@ -2,10 +2,9 @@
 
 NULL =
 
-export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
-export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
-export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
-export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
 
 export LIBDIR = "/usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)"
 export INCLUDEDIR = "/usr/include/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)"
@@ -19,23 +18,10 @@ override_dh_auto_clean:
 
 override_dh_clean:
 	rm -f nx*/configure
-	. ./replace.sh; set -x; ls debian/*.install.in | while read file; do rm -f $$(string_rep $$file .install.in .install); done
-	rm -fR .preserve/
 	dh_clean
 
 override_dh_install:
 
-	# handle builds for Debian squeeze (non multi-arch)
-	. ./replace.sh; set -x; if [ -z "$(DEB_BUILD_MULTIARCH)" ]; then \
-	    find debian/*.install.in | while read file; do \
-	        cat $$file | sed -e 's#/\*/#/#g' > $$(string_rep $$file .install.in .install); \
-	    done; \
-	else \
-	    find debian/*.install.in | while read file; do \
-	        cat $$file > $$(string_rep $$file .install.in .install); \
-	    done; \
-	fi
-
 	# remove static libs
 	rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcomp.a
 	rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcompshad.a

nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c

@@ -97,8 +97,8 @@
  *
  *    Cosmetic Stuff
  *    -----------------------------------------------------
- * 	- remove any leftover unused grammer.c stuff (dict_ ?)
- * 	- fix grammer.c error handling so its not static
+ * 	- remove any leftover unused grammar.c stuff (dict_ ?)
+ * 	- fix grammar.c error handling so its not static
  * 	- #ifdef around stuff pertaining to extentions
  *
  *    Outstanding Questions:
@@ -3979,7 +3979,7 @@ _mesa_parse_arb_program (GLcontext * ctx, const GLubyte * str, GLsizei len,
       grammar_get_last_error ((GLubyte *) error_msg, 300, &error_pos);
       _mesa_set_program_error (ctx, error_pos, error_msg);
       _mesa_error (ctx, GL_INVALID_OPERATION,
-                   "Error loading grammer rule set");
+                   "Error loading grammar rule set");
       return GL_FALSE;
    }
 

debian/roll-tarballs.sh → roll-tarballs.sh

 #!/bin/bash
 
-# Copyright (C) 2011 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+# Copyright (C) 2011-2016 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 # Copyright (C) 2012 by Reinhard Tartler <siretart@tauware.de>
 #
 # This is free software; you can redistribute it and/or modify
@@ -106,6 +106,7 @@ else
     rm -Rf "nx-X11"*
     rm -Rf "etc"*
     rm -Rf "doc/nx-X11_vs_XOrg69_patches"*
+    rm -Rf "doc/X11-symbols"*
     rm -f  "README.keystrokes"
     cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+(_|-).*\.full\+lite\.patch)" | while read file
     do