This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch debian/master in repository libterralib.
commit 8cc28c396d4c776e2f51d8d6286b8bc6d0f8197a Author: Alastair McKinstry <[email protected]> Date: Mon Dec 12 10:17:48 2016 +0000 Include accidentally dropped patches --- debian/changelog | 14 ++++++++++++++ debian/control | 3 +-- debian/patches/g++-6-fixes.patch | 9 ++++++--- debian/rules | 4 ++-- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 53b73a5..b475844 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +libterralib (4.3.0+dfsg.2-9) unstable; urgency=medium + + * Patch from Set C locale when archiving object files to get a deterministic order. + Thanks to Eduard Sanou. Closes: #831093. + + -- Alastair McKinstry <[email protected]> Tue, 02 Aug 2016 11:04:35 +0100 + +libterralib (4.3.0+dfsg.2-8) unstable; urgency=medium + + * Fix for ::isnan change for G++ 5.4, 6.1. Closes: #830463 + * Drop Petter Reinholsen as uploader. Closes: #830910. + + -- Alastair McKinstry <[email protected]> Thu, 14 Jul 2016 17:36:39 +0100 + libterralib (4.3.0+dfsg.2-7) unstable; urgency=medium * Add patch for g++6 (-std11) changes. diff --git a/debian/control b/debian/control index 9e4ad62..2e7955e 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,6 @@ Source: libterralib Maintainer: Debian GIS Team <[email protected]> -Uploaders: Petter Reinholdtsen <[email protected]>, - Alastair McKinstry <[email protected]> +Uploaders: Alastair McKinstry <[email protected]> Section: libs Priority: optional Build-Depends: debhelper (>= 9), diff --git a/debian/patches/g++-6-fixes.patch b/debian/patches/g++-6-fixes.patch index 6abced6..228f1a8 100644 --- a/debian/patches/g++-6-fixes.patch +++ b/debian/patches/g++-6-fixes.patch @@ -7,12 +7,15 @@ Index: libterralib-4.3.0+dfsg.2/src/terralib/kernel/TeDefines.h =================================================================== --- libterralib-4.3.0+dfsg.2.orig/src/terralib/kernel/TeDefines.h +++ libterralib-4.3.0+dfsg.2/src/terralib/kernel/TeDefines.h -@@ -205,7 +205,7 @@ const std::string TeDBVERSION = "4.0.0"; +@@ -204,8 +204,9 @@ const std::string TeDBVERSION = "4.0.0"; + #include <float.h> #define TeISNAN( x ) _isnan( x ) #elif TePLATFORM == TePLATFORMCODE_LINUX || TePLATFORM == TePLATFORMCODE_AIX - #include <math.h> +- #include <math.h> - #define TeISNAN( x ) isnan( x ) -+#define TeISNAN( x ) std::isnan( x ) ++ #include <cmath> ++using std::isnan; ++#define TeISNAN( x ) ::isnan( x ) #else #error "ERROR: Unsupported platform" #endif diff --git a/debian/rules b/debian/rules index 75ccaec..cc899ad 100755 --- a/debian/rules +++ b/debian/rules @@ -17,7 +17,7 @@ DEB_BUILD_MAINT_OPTIONS:= hardening=+all DEB_CFLAGS_MAINT_APPEND:= -Wall -pedantic export DEB_BUILD_MAINT_OPTIONS export DEB_CFLAGS_MAINT_APPEND -CXXFLAGS:= $(shell dpkg-buildflags --get CXXFLAGS) -std11 +CXXFLAGS:= $(shell dpkg-buildflags --get CXXFLAGS) -std=c++11 CXXFLAGS:= '$(CXXFLAGS) -fpermissive -I/usr/include/geotiff -I/usr/include/dxflib -I/usr/include/qwt' override_dh_auto_build: @@ -33,7 +33,7 @@ override_dh_auto_build: # ( cd build/qt/$$d && qmake QMAKE_CXXFLAGS=$(CXXFLAGS) $$d.pro && $(MAKE) ) ; \ # done for d in terralib te_functions te_utils terralibpdi shapelib te_shapelib te_mysql te_postgresql te_dxf stat ; do \ - ar rcs Release/lib$$d.a Release/linux-g++/obj/$$d/*.o ;\ + ar rcs Release/lib$$d.a `LC_ALL=C ls Release/linux-g++/obj/$$d/*.o` ;\ done override_dh_clean: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
