The following commit has been merged in the debian branch: commit 553457c22900283dd3e82d72a4f4a6b0ccaf6bbb Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Thu Sep 26 23:00:32 2013 +0200
Merge NMU changes. diff --git a/debian/changelog b/debian/changelog index c4b2c95..96a3d08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +qgis (1.7.4+1.7.5~20120320-1.1) unstable; urgency=high + + * Non-maintainer upload. + * Fix FTBFS with gcc 4.7 due to uncoordinated gcc-defaults switch, patch + by Steven Chamberlain, thanks! (Closes: #673567) + - 10_fix_gcc4.7_build.patch + * Set urgency to “high” for the RC bug fix, needed for the gdal + transition. + + -- Cyril Brulebois <k...@debian.org> Tue, 22 May 2012 02:34:43 +0200 + qgis (1.7.4+1.7.5~20120320-1) unstable; urgency=low The "Sometimes they come back" release. diff --git a/debian/control b/debian/control index 7eb7e50..c0fd299 100644 --- a/debian/control +++ b/debian/control @@ -108,7 +108,7 @@ Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, - grass641 + grass642 Description: GRASS plugin for Quantum GIS Quantum GIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. diff --git a/debian/patches/10_fix_gcc4.7_build.patch b/debian/patches/10_fix_gcc4.7_build.patch new file mode 100644 index 0000000..bfd69ba --- /dev/null +++ b/debian/patches/10_fix_gcc4.7_build.patch @@ -0,0 +1,28 @@ +Description: fix to build with GCC 4.7 + Must include <unistd.h> where needed, because GCC 4.7 has stopped including + it throughout much of the standard library. + . + See http://gcc.gnu.org/gcc-4.7/porting_to.html +Author: Steven Chamberlain <ste...@pyro.eu.org> +Bug-Debian: http://bugs.debian.org/673567 + +--- qgis-1.7.4+1.7.5~20120320.orig/src/core/spatialindex/tools/TemporaryFile.cc 2012-05-19 21:42:30.010157000 +0100 ++++ qgis-1.7.4+1.7.5~20120320/src/core/spatialindex/tools/TemporaryFile.cc 2012-05-19 21:42:34.797198134 +0100 +@@ -20,6 +20,7 @@ + // mha...@gmail.com + + #include <stdio.h> ++#include <unistd.h> + + #include <Tools.h> + +--- qgis-1.7.4+1.7.5~20120320.orig/src/core/spatialindex/storagemanager/DiskStorageManager.cc 2012-03-17 13:48:08.000000000 +0000 ++++ qgis-1.7.4+1.7.5~20120320/src/core/spatialindex/storagemanager/DiskStorageManager.cc 2012-05-19 21:43:14.837512956 +0100 +@@ -25,6 +25,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <stdio.h> ++#include <unistd.h> + #include <cstring> + + #ifdef WIN32 diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..7e4182d --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +10_fix_gcc4.7_build.patch -- The Quantum GIS in Debian project _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel