The following commit has been merged in the master branch: commit e6b52db64bfd9d98ed268ca7cff7b44661ebb270 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sat Oct 5 22:01:29 2013 +0200
Refresh patches. diff --git a/debian/changelog b/debian/changelog index 7bbd537..224f565 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ libkml (1.3.0~r863-5) UNRELEASED; urgency=low * Add hurd.diff to fix FTBFS on hurd-i386. Thanks Pino Toscano for the patch. (closes: #671894) + * Refresh patches. -- Bas Couwenberg <sebas...@xs4all.nl> Sat, 05 Oct 2013 21:15:09 +0200 diff --git a/debian/patches/automake.diff b/debian/patches/automake.diff index eb92cf2..dbf4fbd 100644 --- a/debian/patches/automake.diff +++ b/debian/patches/automake.diff @@ -1,8 +1,6 @@ -Index: git/examples/engine/Makefile.am -=================================================================== ---- git.orig/examples/engine/Makefile.am 2011-03-29 14:50:08.000000000 +0200 -+++ git/examples/engine/Makefile.am 2011-03-29 14:52:15.000000000 +0200 -@@ -2,7 +2,7 @@ +--- a/examples/engine/Makefile.am ++++ b/examples/engine/Makefile.am +@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/third_party/boost_1_34_1 if GCC @@ -11,11 +9,9 @@ Index: git/examples/engine/Makefile.am endif noinst_PROGRAMS = \ -Index: git/examples/gpx/Makefile.am -=================================================================== ---- git.orig/examples/gpx/Makefile.am 2011-03-29 14:50:08.000000000 +0200 -+++ git/examples/gpx/Makefile.am 2011-03-29 14:52:15.000000000 +0200 -@@ -2,7 +2,7 @@ +--- a/examples/gpx/Makefile.am ++++ b/examples/gpx/Makefile.am +@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/third_party/boost_1_34_1 if GCC @@ -24,11 +20,9 @@ Index: git/examples/gpx/Makefile.am endif noinst_PROGRAMS = gpxtracktokml -Index: git/examples/gx/Makefile.am -=================================================================== ---- git.orig/examples/gx/Makefile.am 2011-03-29 14:50:08.000000000 +0200 -+++ git/examples/gx/Makefile.am 2011-03-29 14:52:15.000000000 +0200 -@@ -2,7 +2,7 @@ +--- a/examples/gx/Makefile.am ++++ b/examples/gx/Makefile.am +@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/third_party/boost_1_34_1 if GCC @@ -37,11 +31,9 @@ Index: git/examples/gx/Makefile.am endif noinst_PROGRAMS = \ -Index: git/examples/hellonet/Makefile.am -=================================================================== ---- git.orig/examples/hellonet/Makefile.am 2011-03-29 14:50:08.000000000 +0200 -+++ git/examples/hellonet/Makefile.am 2011-03-29 14:52:15.000000000 +0200 -@@ -4,7 +4,7 @@ +--- a/examples/hellonet/Makefile.am ++++ b/examples/hellonet/Makefile.am +@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/third_party/boost_1_34_1 if GCC @@ -50,11 +42,9 @@ Index: git/examples/hellonet/Makefile.am endif noinst_PROGRAMS = csvurl2gmap getgmapkml getgsheetcsv getgsheetkml \ -Index: git/examples/helloworld/Makefile.am -=================================================================== ---- git.orig/examples/helloworld/Makefile.am 2011-03-29 14:50:08.000000000 +0200 -+++ git/examples/helloworld/Makefile.am 2011-03-29 14:52:15.000000000 +0200 -@@ -4,7 +4,7 @@ +--- a/examples/helloworld/Makefile.am ++++ b/examples/helloworld/Makefile.am +@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ if GCC @@ -63,11 +53,9 @@ Index: git/examples/helloworld/Makefile.am endif noinst_LTLIBRARIES = libhelloutil.la -Index: git/examples/regionator/Makefile.am -=================================================================== ---- git.orig/examples/regionator/Makefile.am 2011-03-29 14:50:08.000000000 +0200 -+++ git/examples/regionator/Makefile.am 2011-03-29 14:52:15.000000000 +0200 -@@ -3,7 +3,7 @@ +--- a/examples/regionator/Makefile.am ++++ b/examples/regionator/Makefile.am +@@ -3,7 +3,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/third_party/zlib-1.2.3/contrib if GCC @@ -76,11 +64,9 @@ Index: git/examples/regionator/Makefile.am endif noinst_PROGRAMS = csvregionator kmlregionator -Index: git/examples/xsd/Makefile.am -=================================================================== ---- git.orig/examples/xsd/Makefile.am 2011-03-29 14:50:08.000000000 +0200 -+++ git/examples/xsd/Makefile.am 2011-03-29 14:52:15.000000000 +0200 -@@ -3,7 +3,7 @@ +--- a/examples/xsd/Makefile.am ++++ b/examples/xsd/Makefile.am +@@ -3,7 +3,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/third_party/boost_1_34_1 if GCC @@ -89,10 +75,8 @@ Index: git/examples/xsd/Makefile.am endif noinst_PROGRAMS = xsdchildren xsdcoverage xsdelements xsdenums xsdfind xsdtypes -Index: git/src/kml/base/Makefile.am -=================================================================== ---- git.orig/src/kml/base/Makefile.am 2011-03-29 14:50:08.000000000 +0200 -+++ git/src/kml/base/Makefile.am 2011-03-29 14:52:15.000000000 +0200 +--- a/src/kml/base/Makefile.am ++++ b/src/kml/base/Makefile.am @@ -1,15 +1,14 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/third_party/boost_1_34_1 \ @@ -112,7 +96,7 @@ Index: git/src/kml/base/Makefile.am lib_LTLIBRARIES = libkmlbase.la libkmlbase_la_SOURCES = \ -@@ -31,8 +30,7 @@ +@@ -31,8 +30,7 @@ libkmlbase_la_SOURCES = \ zip_file.cc libkmlbase_la_LIBADD = \ @@ -122,7 +106,7 @@ Index: git/src/kml/base/Makefile.am # These header files will be installed in $(includedir)/kml/base libkmlbaseincludedir = $(includedir)/kml/base -@@ -137,8 +135,7 @@ +@@ -137,8 +135,7 @@ math_util_test_LDADD = libkmlbase.la \ net_cache_test_SOURCES = net_cache_test.cc net_cache_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) @@ -132,7 +116,7 @@ Index: git/src/kml/base/Makefile.am $(top_builddir)/third_party/libgtest_main.la referent_test_SOURCES = referent_test.cc -@@ -163,8 +160,7 @@ +@@ -163,8 +160,7 @@ time_util_test_LDADD= libkmlbase.la \ uri_parser_test_SOURCES = uri_parser_test.cc uri_parser_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) @@ -142,11 +126,9 @@ Index: git/src/kml/base/Makefile.am $(top_builddir)/third_party/libgtest_main.la util_test_SOURCES = util_test.cc -Index: git/src/kml/convenience/Makefile.am -=================================================================== ---- git.orig/src/kml/convenience/Makefile.am 2011-03-29 14:50:08.000000000 +0200 -+++ git/src/kml/convenience/Makefile.am 2011-03-29 14:52:15.000000000 +0200 -@@ -3,8 +3,8 @@ +--- a/src/kml/convenience/Makefile.am ++++ b/src/kml/convenience/Makefile.am +@@ -3,8 +3,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/third_party/googletest-r108/include if GCC @@ -157,11 +139,9 @@ Index: git/src/kml/convenience/Makefile.am endif # These header files are added to the distribution such that it can be built, -Index: git/src/kml/dom/Makefile.am -=================================================================== ---- git.orig/src/kml/dom/Makefile.am 2011-03-29 14:50:08.000000000 +0200 -+++ git/src/kml/dom/Makefile.am 2011-03-29 14:52:15.000000000 +0200 -@@ -3,8 +3,8 @@ +--- a/src/kml/dom/Makefile.am ++++ b/src/kml/dom/Makefile.am +@@ -3,8 +3,8 @@ AM_CPPFLAGS= -I$(top_srcdir)/src \ -I$(top_srcdir)/third_party/googletest-r108/include if GCC @@ -172,11 +152,9 @@ Index: git/src/kml/dom/Makefile.am endif lib_LTLIBRARIES = libkmldom.la -Index: git/src/kml/engine/Makefile.am -=================================================================== ---- git.orig/src/kml/engine/Makefile.am 2011-03-29 14:50:08.000000000 +0200 -+++ git/src/kml/engine/Makefile.am 2011-03-29 14:52:15.000000000 +0200 -@@ -3,8 +3,8 @@ +--- a/src/kml/engine/Makefile.am ++++ b/src/kml/engine/Makefile.am +@@ -3,8 +3,8 @@ AM_CPPFLAGS= -I$(top_srcdir)/src \ -I$(top_srcdir)/third_party/googletest-r108/include if GCC @@ -187,7 +165,7 @@ Index: git/src/kml/engine/Makefile.am endif lib_LTLIBRARIES = libkmlengine.la -@@ -303,8 +303,7 @@ +@@ -303,8 +303,7 @@ style_inliner_test_SOURCES = style_inlin style_inliner_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) style_inliner_test_LDADD= libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ @@ -197,11 +175,9 @@ Index: git/src/kml/engine/Makefile.am $(top_builddir)/third_party/libgtest_main.la style_merger_test_SOURCES = style_merger_test.cc -Index: git/src/kml/regionator/Makefile.am -=================================================================== ---- git.orig/src/kml/regionator/Makefile.am 2011-03-29 14:50:08.000000000 +0200 -+++ git/src/kml/regionator/Makefile.am 2011-03-29 14:52:15.000000000 +0200 -@@ -4,8 +4,8 @@ +--- a/src/kml/regionator/Makefile.am ++++ b/src/kml/regionator/Makefile.am +@@ -4,8 +4,8 @@ AM_CPPFLAGS= -I$(top_srcdir)/src \ if GCC @@ -212,11 +188,9 @@ Index: git/src/kml/regionator/Makefile.am endif lib_LTLIBRARIES = libkmlregionator.la -Index: git/src/kml/xsd/Makefile.am -=================================================================== ---- git.orig/src/kml/xsd/Makefile.am 2011-03-29 14:50:08.000000000 +0200 -+++ git/src/kml/xsd/Makefile.am 2011-03-29 14:52:15.000000000 +0200 -@@ -3,8 +3,8 @@ +--- a/src/kml/xsd/Makefile.am ++++ b/src/kml/xsd/Makefile.am +@@ -3,8 +3,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/third_party/googletest-r108/include if GCC @@ -227,10 +201,8 @@ Index: git/src/kml/xsd/Makefile.am endif lib_LTLIBRARIES = libkmlxsd.la -Index: git/src/swig/Makefile.am -=================================================================== ---- git.orig/src/swig/Makefile.am 2011-03-29 14:50:08.000000000 +0200 -+++ git/src/swig/Makefile.am 2011-03-29 14:52:15.000000000 +0200 +--- a/src/swig/Makefile.am ++++ b/src/swig/Makefile.am @@ -1,8 +1,7 @@ SUBDIRS = java python @@ -241,10 +213,8 @@ Index: git/src/swig/Makefile.am COMMONLIBS = $(top_builddir)/src/kml/engine/libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ -Index: git/third_party/Makefile.am -=================================================================== ---- git.orig/third_party/Makefile.am 2011-03-29 14:50:08.000000000 +0200 -+++ git/third_party/Makefile.am 2011-03-29 14:52:15.000000000 +0200 +--- a/third_party/Makefile.am ++++ b/third_party/Makefile.am @@ -1,11 +1,10 @@ uriparser = uriparser-0.7.5 @@ -254,11 +224,11 @@ Index: git/third_party/Makefile.am -I$(top_srcdir)/third_party/googletest-r108/include -lib_LTLIBRARIES = libminizip.la liburiparser.la -+lib_LTLIBRARIES = libminizip.la ++lib_LTLIBRARIES = libminizip.la noinst_LTLIBRARIES = libgtest.la libgtest_main.la libminizip_la_SOURCES = \ -@@ -15,27 +14,6 @@ +@@ -15,27 +14,6 @@ libminizip_la_SOURCES = \ zlib-1.2.3/contrib/minizip/zip.c libminizip_la_LDFLAGS = -lz diff --git a/debian/patches/clone.diff b/debian/patches/clone.diff index fc342c0..4916bf7 100644 --- a/debian/patches/clone.diff +++ b/debian/patches/clone.diff @@ -1,8 +1,6 @@ -Index: libkml-1.0.1/third_party/googletest-r108/src/gtest-death-test.cc -=================================================================== ---- libkml-1.0.1.orig/third_party/googletest-r108/src/gtest-death-test.cc 2009-10-27 17:23:16.000000000 +0100 -+++ libkml-1.0.1/third_party/googletest-r108/src/gtest-death-test.cc 2009-10-27 20:23:45.000000000 +0100 -@@ -594,6 +594,13 @@ +--- a/third_party/googletest-r108/src/gtest-death-test.cc ++++ b/third_party/googletest-r108/src/gtest-death-test.cc +@@ -594,6 +594,13 @@ static bool StackGrowsDown() { // A threadsafe implementation of fork(2) for threadsafe-style death tests // that uses clone(2). It dies with an error message if anything goes // wrong. @@ -16,7 +14,7 @@ Index: libkml-1.0.1/third_party/googletest-r108/src/gtest-death-test.cc static pid_t ExecDeathTestFork(char* const* argv, int close_fd) { static const bool stack_grows_down = StackGrowsDown(); const size_t stack_size = getpagesize(); -@@ -603,8 +610,13 @@ +@@ -603,8 +610,13 @@ static pid_t ExecDeathTestFork(char* con void* const stack_top = static_cast<char*>(stack) + (stack_grows_down ? stack_size : 0); ExecDeathTestArgs args = { argv, close_fd }; diff --git a/debian/patches/feature_view_test.diff b/debian/patches/feature_view_test.diff index b1a7926..4f6c932 100644 --- a/debian/patches/feature_view_test.diff +++ b/debian/patches/feature_view_test.diff @@ -1,7 +1,5 @@ -Index: git/src/kml/engine/feature_view_test.cc -=================================================================== ---- git.orig/src/kml/engine/feature_view_test.cc 2011-03-29 16:41:05.000000000 +0200 -+++ git/src/kml/engine/feature_view_test.cc 2011-03-29 16:41:22.000000000 +0200 +--- a/src/kml/engine/feature_view_test.cc ++++ b/src/kml/engine/feature_view_test.cc @@ -27,7 +27,6 @@ #include "kml/engine/feature_view.h" @@ -10,7 +8,7 @@ Index: git/src/kml/engine/feature_view_test.cc #include "kml/engine/kml_file.h" using kmldom::CoordinatesPtr; -@@ -137,18 +136,4 @@ +@@ -137,18 +136,4 @@ TEST(FeatureViewTest, TestComputeFeature ASSERT_NEAR(1494183.4444, lookat->get_range(), 0.0001); } diff --git a/debian/patches/fix-ftbfs-gcc4.7.diff b/debian/patches/fix-ftbfs-gcc4.7.diff index 481c806..480ff90 100644 --- a/debian/patches/fix-ftbfs-gcc4.7.diff +++ b/debian/patches/fix-ftbfs-gcc4.7.diff @@ -1,7 +1,5 @@ -Index: libkml-1.3.0~r863/src/kml/base/file_posix.cc -=================================================================== ---- libkml-1.3.0~r863.orig/src/kml/base/file_posix.cc 2011-03-16 12:06:27.000000000 +0000 -+++ libkml-1.3.0~r863/src/kml/base/file_posix.cc 2012-04-17 06:00:11.011953461 +0000 +--- a/src/kml/base/file_posix.cc ++++ b/src/kml/base/file_posix.cc @@ -29,6 +29,7 @@ #include "kml/base/file.h" #include <stdlib.h> diff --git a/debian/patches/geometry_test.diff b/debian/patches/geometry_test.diff index 2f5e8fa..d4aaaf7 100644 --- a/debian/patches/geometry_test.diff +++ b/debian/patches/geometry_test.diff @@ -1,8 +1,6 @@ -Index: git/src/kml/dom/geometry_test.cc -=================================================================== ---- git.orig/src/kml/dom/geometry_test.cc 2011-06-08 11:18:01.000000000 +0200 -+++ git/src/kml/dom/geometry_test.cc 2011-06-08 12:33:30.000000000 +0200 -@@ -356,30 +356,6 @@ +--- a/src/kml/dom/geometry_test.cc ++++ b/src/kml/dom/geometry_test.cc +@@ -356,30 +356,6 @@ TEST_F(CoordinatesTest, TestSerializeOne ASSERT_EQ(vec3.get_altitude(), vec3_vector[0].get_altitude()); } diff --git a/debian/patches/kfreebsd.diff b/debian/patches/kfreebsd.diff index 113f6d5..8f1381c 100644 --- a/debian/patches/kfreebsd.diff +++ b/debian/patches/kfreebsd.diff @@ -1,8 +1,6 @@ -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac 2011-03-29 14:50:08.000000000 +0200 -+++ git/configure.ac 2011-03-29 14:52:04.000000000 +0200 -@@ -27,7 +27,7 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -27,7 +27,7 @@ dnl Which platform are we building on? PLATFORM= SHLIBSUFFIX= case "`uname -s`" in diff --git a/debian/patches/ld-as-needed.diff b/debian/patches/ld-as-needed.diff index ffd06ee..743ddee 100644 --- a/debian/patches/ld-as-needed.diff +++ b/debian/patches/ld-as-needed.diff @@ -1,6 +1,6 @@ --- a/examples/helloworld/Makefile.am +++ b/examples/helloworld/Makefile.am -@@ -26,8 +26,8 @@ +@@ -26,8 +26,8 @@ circlegen_SOURCES = circlegen.cc circlegen_LDADD = \ $(top_builddir)/src/kml/base/libkmlbase.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ @@ -11,7 +11,7 @@ checklinks_SOURCES = checklinks.cc checklinks_LDADD = \ -@@ -75,8 +75,8 @@ +@@ -75,8 +75,8 @@ hellohref_LDADD = \ hellokmz_SOURCES = hellokmz.cc hellokmz_LDADD = \ @@ -21,7 +21,7 @@ $(top_builddir)/src/kml/base/libkmlbase.la helloregion_SOURCES = helloregion.cc -@@ -102,8 +102,8 @@ +@@ -102,8 +102,8 @@ parsens_LDADD = \ prettykml_SOURCES = prettykml.cc prettykml_LDADD = \ @@ -33,7 +33,7 @@ printgeometry_SOURCES = printgeometry.cc --- a/examples/regionator/Makefile.in +++ b/examples/regionator/Makefile.in -@@ -52,11 +52,11 @@ +@@ -52,11 +52,11 @@ PROGRAMS = $(noinst_PROGRAMS) am_csvregionator_OBJECTS = csvregionator.$(OBJEXT) csvregionator_OBJECTS = $(am_csvregionator_OBJECTS) csvregionator_DEPENDENCIES = \ @@ -47,7 +47,7 @@ am_kmlregionator_OBJECTS = kmlregionator.$(OBJEXT) kmlregionator_OBJECTS = $(am_kmlregionator_OBJECTS) kmlregionator_DEPENDENCIES = \ -@@ -232,9 +232,9 @@ +@@ -232,9 +232,9 @@ kmlregionator_SOURCES = kmlregionator.cc kmlregionator_LDADD = \ $(top_builddir)/src/kml/base/libkmlbase.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ @@ -61,7 +61,7 @@ --- a/examples/regionator/Makefile.am +++ b/examples/regionator/Makefile.am -@@ -10,17 +10,17 @@ +@@ -10,17 +10,17 @@ noinst_PROGRAMS = csvregionator kmlregio csvregionator_SOURCES = csvregionator.cc csvregionator_LDADD = \ @@ -85,7 +85,7 @@ --- a/examples/helloworld/Makefile.in +++ b/examples/helloworld/Makefile.in -@@ -345,8 +345,8 @@ +@@ -345,8 +345,8 @@ circlegen_SOURCES = circlegen.cc circlegen_LDADD = \ $(top_builddir)/src/kml/base/libkmlbase.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ @@ -96,7 +96,7 @@ checklinks_SOURCES = checklinks.cc checklinks_LDADD = \ -@@ -394,8 +394,8 @@ +@@ -394,8 +394,8 @@ hellohref_LDADD = \ hellokmz_SOURCES = hellokmz.cc hellokmz_LDADD = \ @@ -106,7 +106,7 @@ $(top_builddir)/src/kml/base/libkmlbase.la helloregion_SOURCES = helloregion.cc -@@ -421,8 +421,8 @@ +@@ -421,8 +421,8 @@ parsens_LDADD = \ prettykml_SOURCES = prettykml.cc prettykml_LDADD = \ diff --git a/debian/patches/reautoconfiscated.diff b/debian/patches/reautoconfiscated.diff index 0e74eb6..5b93d23 100644 --- a/debian/patches/reautoconfiscated.diff +++ b/debian/patches/reautoconfiscated.diff @@ -1,8 +1,6 @@ -Index: git/configure -=================================================================== ---- git.orig/configure 2011-03-29 14:50:08.000000000 +0200 -+++ git/configure 2011-03-29 14:52:31.000000000 +0200 -@@ -14847,7 +14847,7 @@ +--- a/configure ++++ b/configure +@@ -14847,7 +14847,7 @@ fi PLATFORM= SHLIBSUFFIX= case "`uname -s`" in @@ -11,11 +9,9 @@ Index: git/configure SHLIBSUFFIX="so" ;; Darwin) PLATFORM=darwin -Index: git/examples/engine/Makefile.in -=================================================================== ---- git.orig/examples/engine/Makefile.in 2011-03-29 14:50:08.000000000 +0200 -+++ git/examples/engine/Makefile.in 2011-03-29 14:52:31.000000000 +0200 -@@ -308,7 +308,7 @@ +--- a/examples/engine/Makefile.in ++++ b/examples/engine/Makefile.in +@@ -308,7 +308,7 @@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/third_party/boost_1_34_1 @@ -24,11 +20,9 @@ Index: git/examples/engine/Makefile.in balloonwalker_SOURCES = balloonwalker.cc balloonwalker_LDADD = \ $(top_builddir)/src/kml/engine/libkmlengine.la \ -Index: git/examples/gpx/Makefile.in -=================================================================== ---- git.orig/examples/gpx/Makefile.in 2011-03-29 14:50:08.000000000 +0200 -+++ git/examples/gpx/Makefile.in 2011-03-29 14:52:31.000000000 +0200 -@@ -209,7 +209,7 @@ +--- a/examples/gpx/Makefile.in ++++ b/examples/gpx/Makefile.in +@@ -209,7 +209,7 @@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/third_party/boost_1_34_1 @@ -37,11 +31,9 @@ Index: git/examples/gpx/Makefile.in gpxtracktokml_SOURCES = gpxtracktokml.cc gpxtracktokml_LDADD = \ $(top_builddir)/src/kml/convenience/libkmlconvenience.la \ -Index: git/examples/gx/Makefile.in -=================================================================== ---- git.orig/examples/gx/Makefile.in 2011-03-29 14:50:08.000000000 +0200 -+++ git/examples/gx/Makefile.in 2011-03-29 14:52:31.000000000 +0200 -@@ -216,7 +216,7 @@ +--- a/examples/gx/Makefile.in ++++ b/examples/gx/Makefile.in +@@ -216,7 +216,7 @@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/third_party/boost_1_34_1 @@ -50,11 +42,9 @@ Index: git/examples/gx/Makefile.in gpxfly_SOURCES = gpxfly.cc gpxfly_LDADD = \ $(top_builddir)/src/kml/convenience/libkmlconvenience.la \ -Index: git/examples/hellonet/Makefile.in -=================================================================== ---- git.orig/examples/hellonet/Makefile.in 2011-03-29 14:50:08.000000000 +0200 -+++ git/examples/hellonet/Makefile.in 2011-03-29 14:52:31.000000000 +0200 -@@ -384,7 +384,7 @@ +--- a/examples/hellonet/Makefile.in ++++ b/examples/hellonet/Makefile.in +@@ -384,7 +384,7 @@ top_srcdir = @top_srcdir@ @HAVE_CURL_TRUE@ -I$(top_srcdir)/examples/hellonet \ @HAVE_CURL_TRUE@ -I$(top_srcdir)/third_party/boost_1_34_1 @@ -63,11 +53,9 @@ Index: git/examples/hellonet/Makefile.in @HAVE_CURL_TRUE@noinst_LTLIBRARIES = libcurlfetch.la @HAVE_CURL_TRUE@libcurlfetch_la_SOURCES = curlfetch.cc @HAVE_CURL_TRUE@libcurlfetch_la_LIBADD = -lcurl -Index: git/examples/helloworld/Makefile.in -=================================================================== ---- git.orig/examples/helloworld/Makefile.in 2011-03-29 14:50:08.000000000 +0200 -+++ git/examples/helloworld/Makefile.in 2011-03-29 14:52:31.000000000 +0200 -@@ -332,7 +332,7 @@ +--- a/examples/helloworld/Makefile.in ++++ b/examples/helloworld/Makefile.in +@@ -332,7 +332,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/examples/helloworld \ -I$(top_srcdir)/third_party/boost_1_34_1 @@ -76,11 +64,9 @@ Index: git/examples/helloworld/Makefile.in noinst_LTLIBRARIES = libhelloutil.la libhelloutil_la_SOURCES = print.cc libhelloutil_la_LIBADD = $(top_builddir)/third_party/libminizip.la -Index: git/examples/regionator/Makefile.in -=================================================================== ---- git.orig/examples/regionator/Makefile.in 2011-03-29 14:50:08.000000000 +0200 -+++ git/examples/regionator/Makefile.in 2011-03-29 14:52:31.000000000 +0200 -@@ -219,7 +219,7 @@ +--- a/examples/regionator/Makefile.in ++++ b/examples/regionator/Makefile.in +@@ -219,7 +219,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/third_party/boost_1_34_1 \ -I$(top_srcdir)/third_party/zlib-1.2.3/contrib @@ -89,11 +75,9 @@ Index: git/examples/regionator/Makefile.in csvregionator_SOURCES = csvregionator.cc csvregionator_LDADD = \ $(top_builddir)/src/kml/base/libkmlbase.la \ -Index: git/examples/xsd/Makefile.in -=================================================================== ---- git.orig/examples/xsd/Makefile.in 2011-03-29 14:50:08.000000000 +0200 -+++ git/examples/xsd/Makefile.in 2011-03-29 14:52:31.000000000 +0200 -@@ -241,7 +241,7 @@ +--- a/examples/xsd/Makefile.in ++++ b/examples/xsd/Makefile.in +@@ -241,7 +241,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/examples/xsd \ -I$(top_srcdir)/third_party/boost_1_34_1 @@ -102,11 +86,9 @@ Index: git/examples/xsd/Makefile.in xsdchildren_SOURCES = xsdchildren.cc xsdchildren_LDADD = \ $(top_builddir)/src/kml/xsd/libkmlxsd.la \ -Index: git/src/kml/base/Makefile.in -=================================================================== ---- git.orig/src/kml/base/Makefile.in 2011-03-29 14:50:08.000000000 +0200 -+++ git/src/kml/base/Makefile.in 2011-03-29 14:52:31.000000000 +0200 -@@ -86,8 +86,7 @@ +--- a/src/kml/base/Makefile.in ++++ b/src/kml/base/Makefile.in +@@ -86,8 +86,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libkmlbaseincludedir)" LTLIBRARIES = $(lib_LTLIBRARIES) libkmlbase_la_DEPENDENCIES = \ @@ -116,7 +98,7 @@ Index: git/src/kml/base/Makefile.in am_libkmlbase_la_OBJECTS = attributes.lo csv_splitter.lo date_time.lo \ expat_handler_ns.lo expat_parser.lo file.lo file_posix.lo \ math_util.lo mimetypes.lo referent.lo string_util.lo \ -@@ -177,7 +176,6 @@ +@@ -177,7 +176,6 @@ math_util_test_LINK = $(LIBTOOL) --tag=C am_net_cache_test_OBJECTS = net_cache_test-net_cache_test.$(OBJEXT) net_cache_test_OBJECTS = $(am_net_cache_test_OBJECTS) net_cache_test_DEPENDENCIES = libkmlbase.la \ @@ -124,7 +106,7 @@ Index: git/src/kml/base/Makefile.in $(top_builddir)/third_party/libgtest_main.la net_cache_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ -@@ -218,7 +216,6 @@ +@@ -218,7 +216,6 @@ am_uri_parser_test_OBJECTS = \ uri_parser_test-uri_parser_test.$(OBJEXT) uri_parser_test_OBJECTS = $(am_uri_parser_test_OBJECTS) uri_parser_test_DEPENDENCIES = libkmlbase.la \ @@ -132,7 +114,7 @@ Index: git/src/kml/base/Makefile.in $(top_builddir)/third_party/libgtest_main.la uri_parser_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ -@@ -463,12 +460,11 @@ +@@ -463,12 +460,11 @@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/third_party/boost_1_34_1 \ -I$(top_srcdir)/third_party/googletest-r108/include \ @@ -148,7 +130,7 @@ Index: git/src/kml/base/Makefile.in lib_LTLIBRARIES = libkmlbase.la libkmlbase_la_SOURCES = \ attributes.cc \ -@@ -489,8 +485,7 @@ +@@ -489,8 +485,7 @@ libkmlbase_la_SOURCES = \ zip_file.cc libkmlbase_la_LIBADD = \ @@ -158,7 +140,7 @@ Index: git/src/kml/base/Makefile.in # These header files will be installed in $(includedir)/kml/base -@@ -570,8 +565,7 @@ +@@ -570,8 +565,7 @@ math_util_test_LDADD = libkmlbase.la \ net_cache_test_SOURCES = net_cache_test.cc net_cache_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) @@ -168,7 +150,7 @@ Index: git/src/kml/base/Makefile.in $(top_builddir)/third_party/libgtest_main.la referent_test_SOURCES = referent_test.cc -@@ -596,8 +590,7 @@ +@@ -596,8 +590,7 @@ time_util_test_LDADD = libkmlbase.la \ uri_parser_test_SOURCES = uri_parser_test.cc uri_parser_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) @@ -178,11 +160,9 @@ Index: git/src/kml/base/Makefile.in $(top_builddir)/third_party/libgtest_main.la util_test_SOURCES = util_test.cc -Index: git/src/kml/convenience/Makefile.in -=================================================================== ---- git.orig/src/kml/convenience/Makefile.in 2011-03-29 14:50:08.000000000 +0200 -+++ git/src/kml/convenience/Makefile.in 2011-03-29 14:52:31.000000000 +0200 -@@ -439,8 +439,8 @@ +--- a/src/kml/convenience/Makefile.in ++++ b/src/kml/convenience/Makefile.in +@@ -439,8 +439,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/third_party/boost_1_34_1 \ -I$(top_srcdir)/third_party/googletest-r108/include @@ -193,11 +173,9 @@ Index: git/src/kml/convenience/Makefile.in # These header files are added to the distribution such that it can be built, # but these header files should not be used in application code. -Index: git/src/kml/dom/Makefile.in -=================================================================== ---- git.orig/src/kml/dom/Makefile.in 2011-03-29 14:50:08.000000000 +0200 -+++ git/src/kml/dom/Makefile.in 2011-03-29 14:52:31.000000000 +0200 -@@ -797,8 +797,8 @@ +--- a/src/kml/dom/Makefile.in ++++ b/src/kml/dom/Makefile.in +@@ -797,8 +797,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/third_party/boost_1_34_1 \ -I$(top_srcdir)/third_party/googletest-r108/include @@ -208,11 +186,9 @@ Index: git/src/kml/dom/Makefile.in lib_LTLIBRARIES = libkmldom.la libkmldom_la_SOURCES = \ abstractlatlonbox.cc \ -Index: git/src/kml/engine/Makefile.in -=================================================================== ---- git.orig/src/kml/engine/Makefile.in 2011-03-29 14:50:08.000000000 +0200 -+++ git/src/kml/engine/Makefile.in 2011-03-29 14:52:31.000000000 +0200 -@@ -393,7 +393,6 @@ +--- a/src/kml/engine/Makefile.in ++++ b/src/kml/engine/Makefile.in +@@ -393,7 +393,6 @@ style_inliner_test_OBJECTS = $(am_style_ style_inliner_test_DEPENDENCIES = libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ $(top_builddir)/src/kml/base/libkmlbase.la \ @@ -220,7 +196,7 @@ Index: git/src/kml/engine/Makefile.in $(top_builddir)/third_party/libgtest_main.la style_inliner_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ -@@ -647,8 +646,8 @@ +@@ -647,8 +646,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/third_party/boost_1_34_1 \ -I$(top_srcdir)/third_party/googletest-r108/include @@ -231,7 +207,7 @@ Index: git/src/kml/engine/Makefile.in lib_LTLIBRARIES = libkmlengine.la libkmlengine_la_SOURCES = \ clone.cc \ -@@ -913,8 +912,7 @@ +@@ -913,8 +912,7 @@ style_inliner_test_SOURCES = style_inlin style_inliner_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS) style_inliner_test_LDADD = libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ @@ -241,11 +217,9 @@ Index: git/src/kml/engine/Makefile.in $(top_builddir)/third_party/libgtest_main.la style_merger_test_SOURCES = style_merger_test.cc -Index: git/src/kml/regionator/Makefile.in -=================================================================== ---- git.orig/src/kml/regionator/Makefile.in 2011-03-29 14:50:08.000000000 +0200 -+++ git/src/kml/regionator/Makefile.in 2011-03-29 14:52:31.000000000 +0200 -@@ -299,8 +299,8 @@ +--- a/src/kml/regionator/Makefile.in ++++ b/src/kml/regionator/Makefile.in +@@ -299,8 +299,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/third_party/boost_1_34_1 \ -I$(top_srcdir)/third_party/googletest-r108/include @@ -256,11 +230,9 @@ Index: git/src/kml/regionator/Makefile.in lib_LTLIBRARIES = libkmlregionator.la libkmlregionator_la_SOURCES = \ feature_list_region_handler.cc \ -Index: git/src/kml/xsd/Makefile.in -=================================================================== ---- git.orig/src/kml/xsd/Makefile.in 2011-03-29 14:50:08.000000000 +0200 -+++ git/src/kml/xsd/Makefile.in 2011-03-29 14:52:31.000000000 +0200 -@@ -342,8 +342,8 @@ +--- a/src/kml/xsd/Makefile.in ++++ b/src/kml/xsd/Makefile.in +@@ -342,8 +342,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/third_party/boost_1_34_1 \ -I$(top_srcdir)/third_party/googletest-r108/include @@ -271,11 +243,9 @@ Index: git/src/kml/xsd/Makefile.in lib_LTLIBRARIES = libkmlxsd.la libkmlxsd_la_SOURCES = \ xsd_complex_type.cc \ -Index: git/src/swig/Makefile.in -=================================================================== ---- git.orig/src/swig/Makefile.in 2011-03-29 14:50:08.000000000 +0200 -+++ git/src/swig/Makefile.in 2011-03-29 14:52:31.000000000 +0200 -@@ -334,8 +334,7 @@ +--- a/src/swig/Makefile.in ++++ b/src/swig/Makefile.in +@@ -334,8 +334,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = java python AM_CPPFLAGS = -I$(top_srcdir)/src \ @@ -285,11 +255,9 @@ Index: git/src/swig/Makefile.in COMMONLIBS = $(top_builddir)/src/kml/engine/libkmlengine.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ -Index: git/third_party/Makefile.in -=================================================================== ---- git.orig/third_party/Makefile.in 2011-03-29 14:50:08.000000000 +0200 -+++ git/third_party/Makefile.in 2011-03-29 14:52:31.000000000 +0200 -@@ -98,15 +98,6 @@ +--- a/third_party/Makefile.in ++++ b/third_party/Makefile.in +@@ -98,15 +98,6 @@ libminizip_la_OBJECTS = $(am_libminizip_ libminizip_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libminizip_la_LDFLAGS) $(LDFLAGS) -o $@ @@ -305,7 +273,7 @@ Index: git/third_party/Makefile.in DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles -@@ -130,9 +121,9 @@ +@@ -130,9 +121,9 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBT --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(libgtest_la_SOURCES) $(libgtest_main_la_SOURCES) \ @@ -317,7 +285,7 @@ Index: git/third_party/Makefile.in HEADERS = $(libboostconfigcompilerinclude_HEADERS) \ $(libboostconfiginclude_HEADERS) \ $(libboostconfigno_tr1include_HEADERS) \ -@@ -276,11 +267,10 @@ +@@ -276,11 +267,10 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ uriparser = uriparser-0.7.5 AM_CPPFLAGS = -I$(top_srcdir)/third_party/zlib-1.2.3/contrib \ @@ -326,11 +294,11 @@ Index: git/third_party/Makefile.in -I$(top_srcdir)/third_party/googletest-r108/include -lib_LTLIBRARIES = libminizip.la liburiparser.la -+lib_LTLIBRARIES = libminizip.la ++lib_LTLIBRARIES = libminizip.la noinst_LTLIBRARIES = libgtest.la libgtest_main.la libminizip_la_SOURCES = \ zlib-1.2.3/contrib/minizip/unzip.c \ -@@ -289,27 +279,6 @@ +@@ -289,27 +279,6 @@ libminizip_la_SOURCES = \ zlib-1.2.3/contrib/minizip/zip.c libminizip_la_LDFLAGS = -lz @@ -358,7 +326,7 @@ Index: git/third_party/Makefile.in boost_root = boost_1_34_1 boost = $(boost_root)/boost boostinc = $(includedir)/kml/third_party/$(boost) -@@ -542,8 +511,6 @@ +@@ -542,8 +511,6 @@ libgtest_main.la: $(libgtest_main_la_OBJ $(CXXLINK) $(libgtest_main_la_OBJECTS) $(libgtest_main_la_LIBADD) $(LIBS) libminizip.la: $(libminizip_la_OBJECTS) $(libminizip_la_DEPENDENCIES) $(libminizip_la_LINK) -rpath $(libdir) $(libminizip_la_OBJECTS) $(libminizip_la_LIBADD) $(LIBS) @@ -367,7 +335,7 @@ Index: git/third_party/Makefile.in mostlyclean-compile: -rm -f *.$(OBJEXT) -@@ -551,20 +518,6 @@ +@@ -551,20 +518,6 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -388,7 +356,7 @@ Index: git/third_party/Makefile.in @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtest-death-test.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtest-filepath.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtest-port.Plo@am__quote@ -@@ -626,104 +579,6 @@ +@@ -626,104 +579,6 @@ zip.lo: zlib-1.2.3/contrib/minizip/zip.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zip.lo `test -f 'zlib-1.2.3/contrib/minizip/zip.c' || echo '$(srcdir)/'`zlib-1.2.3/contrib/minizip/zip.c diff --git a/debian/patches/swig.diff b/debian/patches/swig.diff index c8ec790..a87de13 100644 --- a/debian/patches/swig.diff +++ b/debian/patches/swig.diff @@ -1,8 +1,6 @@ -Index: git/configure -=================================================================== ---- git.orig/configure 2011-07-26 11:04:20.000000000 +0200 -+++ git/configure 2011-07-26 11:07:16.000000000 +0200 -@@ -15039,14 +15039,14 @@ +--- a/configure ++++ b/configure +@@ -15039,14 +15039,14 @@ $as_echo "no" >&6; } fi @@ -25,11 +23,9 @@ Index: git/configure fi if test "x$SWIG" != x; then WITH_SWIG_TRUE= -Index: libkml-1.2.0/configure.ac -=================================================================== ---- libkml-1.2.0.orig/configure.ac 2012-02-22 16:52:15.057284078 +0100 -+++ libkml-1.2.0/configure.ac 2012-02-22 16:52:16.553284076 +0100 -@@ -86,13 +86,13 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -86,13 +86,13 @@ AC_ARG_ENABLE(swig, [do not generate any SWIG language bindings])]) if test "x$enable_swig" != xno; then AC_CHECK_PROG(SWIG, swig, swig) -- A library to manipulate KML 2.2 OGC standard files _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel