[libkml] 06/18: Update patches for upstream changes.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Fri Mar 13 00:59:34 UTC 2015


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository libkml.

commit bc6fab9f27c9e9206bf604ba82f19380cda872f8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Mar 13 01:04:40 2015 +0100

    Update patches for upstream changes.
---
 debian/changelog                            |   1 +
 debian/patches/automake-subdir-objects.diff |   6 +-
 debian/patches/automake.diff                | 162 ++++++++++++++--------------
 debian/patches/fix-ftbfs-gcc4.7.diff        |   2 +-
 debian/patches/hurd.diff                    |  28 ++---
 debian/patches/kfreebsd.diff                |   2 +-
 debian/patches/series                       |  10 +-
 7 files changed, 106 insertions(+), 105 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 38f0fc8..bf5ef9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ libkml (1.3.0~r864+git20131113-9b50572+dfsg-1) UNRELEASED; urgency=medium
     - Group Boost copyright statements by license
     - Group zlib copyright statments by license
     - Use GPL-{2,3}+ instead of SPDX short name with .0.
+  * Update patches for upstream changes.
 
  -- Bas Couwenberg <sebastic at debian.org>  Thu, 12 Mar 2015 23:16:55 +0100
 
diff --git a/debian/patches/automake-subdir-objects.diff b/debian/patches/automake-subdir-objects.diff
index 518551d..c6c9383 100644
--- a/debian/patches/automake-subdir-objects.diff
+++ b/debian/patches/automake-subdir-objects.diff
@@ -6,6 +6,6 @@ Last-Update: 2013-10-07
 @@ -1,3 +1,5 @@
 +AUTOMAKE_OPTIONS = subdir-objects
 +
- AM_CPPFLAGS = -I$(top_srcdir)/third_party/zlib-1.2.3/contrib \
- 	      -I$(top_srcdir)/third_party/googletest-r108 \
- 	      -I$(top_srcdir)/third_party/googletest-r108/include
+ # As of automake 1.14 it's not possible to use variable references
+ # in AM_CPPFLAGS -- the combination of -I$(top_srcdir) and $(foo) generates
+ # directories with the literal unexpanded $(foo) name. It looks like a real
diff --git a/debian/patches/automake.diff b/debian/patches/automake.diff
index 9e5c59b..fe715da 100644
--- a/debian/patches/automake.diff
+++ b/debian/patches/automake.diff
@@ -7,8 +7,8 @@ Last-Update: 2013-10-07
  	      -I$(top_srcdir)/third_party/boost_1_34_1
  
  if GCC
--AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
-+AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti
+-AM_CXXFLAGS = -Wall -Werror -pedantic -Wno-long-long -fno-rtti
++AM_CXXFLAGS = -Wall -pedantic -Wno-long-long -fno-rtti
  endif
  
  noinst_PROGRAMS = \
@@ -18,8 +18,8 @@ Last-Update: 2013-10-07
  	      -I$(top_srcdir)/third_party/boost_1_34_1
  
  if GCC
--AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
-+AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti
+-AM_CXXFLAGS = -Wall -Werror -pedantic -Wno-long-long -fno-rtti
++AM_CXXFLAGS = -Wall -pedantic -Wno-long-long -fno-rtti
  endif
  
  noinst_PROGRAMS = gpxtracktokml
@@ -29,8 +29,8 @@ Last-Update: 2013-10-07
  	      -I$(top_srcdir)/third_party/boost_1_34_1
  
  if GCC
--AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
-+AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti
+-AM_CXXFLAGS = -Wall -Werror -pedantic -Wno-long-long -fno-rtti
++AM_CXXFLAGS = -Wall -pedantic -Wno-long-long -fno-rtti
  endif
  
  noinst_PROGRAMS = \
@@ -40,8 +40,8 @@ Last-Update: 2013-10-07
  	      -I$(top_srcdir)/third_party/boost_1_34_1
  
  if GCC
--AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
-+AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti
+-AM_CXXFLAGS = -Wall -Werror -pedantic -Wno-long-long -fno-rtti
++AM_CXXFLAGS = -Wall -pedantic -Wno-long-long -fno-rtti
  endif
  
  noinst_PROGRAMS = csvurl2gmap getgmapkml getgsheetcsv getgsheetkml \
@@ -51,8 +51,8 @@ Last-Update: 2013-10-07
  
  
  if GCC
--AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
-+AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti
+-AM_CXXFLAGS = -Wall -Werror -pedantic -Wno-long-long -fno-rtti
++AM_CXXFLAGS = -Wall -pedantic -Wno-long-long -fno-rtti
  endif
  
  noinst_LTLIBRARIES = libhelloutil.la
@@ -62,8 +62,8 @@ Last-Update: 2013-10-07
                -I$(top_srcdir)/third_party/zlib-1.2.3/contrib
  
  if GCC
--AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
-+AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti
+-AM_CXXFLAGS = -Wall -Werror -pedantic -Wno-long-long -fno-rtti
++AM_CXXFLAGS = -Wall -pedantic -Wno-long-long -fno-rtti
  endif
  
  noinst_PROGRAMS = csvregionator kmlregionator
@@ -73,8 +73,8 @@ Last-Update: 2013-10-07
  	      -I$(top_srcdir)/third_party/boost_1_34_1
  
  if GCC
--AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
-+AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti
+-AM_CXXFLAGS = -Wall -Werror -pedantic -Wno-long-long -fno-rtti
++AM_CXXFLAGS = -Wall -pedantic -Wno-long-long -fno-rtti
  endif
  
  noinst_PROGRAMS = xsdchildren xsdcoverage xsdelements xsdenums xsdfind xsdtypes
@@ -83,15 +83,15 @@ Last-Update: 2013-10-07
 @@ -1,15 +1,14 @@
  AM_CPPFLAGS = -I$(top_srcdir)/src \
                -I$(top_srcdir)/third_party/boost_1_34_1 \
-               -I$(top_srcdir)/third_party/googletest-r108/include \
+               -I$(top_srcdir)/third_party/gtest-1.7.0/include \
 -              -I$(top_srcdir)/third_party/uriparser-0.7.5/include \
                -I$(top_srcdir)/third_party/zlib-1.2.3/contrib
  
  if GCC
--AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -pedantic -fno-rtti
--AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -fno-rtti -DGTEST_HAS_RTTI=0
-+AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -pedantic -fno-rtti
-+AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -fno-rtti -DGTEST_HAS_RTTI=0
+-AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -pedantic -fno-rtti
+-AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -fno-rtti -DGTEST_HAS_RTTI=0
++AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -pedantic -fno-rtti
++AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -fno-rtti -DGTEST_HAS_RTTI=0
  endif
  
 -libkmlbase_la_LDFLAGS = -lexpat
@@ -132,39 +132,39 @@ Last-Update: 2013-10-07
 --- 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
+               -I$(top_srcdir)/third_party/gtest-1.7.0/include
  
  if GCC
--AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -pedantic -fno-rtti
--AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -fno-rtti -DGTEST_HAS_RTTI=0
-+AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -pedantic -fno-rtti
-+AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -fno-rtti -DGTEST_HAS_RTTI=0
+-AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -pedantic -Wno-long-long -fno-rtti
+-AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -fno-rtti -DGTEST_HAS_RTTI=0
++AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -pedantic -Wno-long-long -fno-rtti
++AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -fno-rtti -DGTEST_HAS_RTTI=0
  endif
  
  # These header files are added to the distribution such that it can be built,
 --- 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
+ 	     -I$(top_srcdir)/third_party/gtest-1.7.0/include
  
  if GCC
--AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -pedantic -fno-rtti
--AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -fno-rtti -DGTEST_HAS_RTTI=0
-+AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -pedantic -fno-rtti
-+AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -fno-rtti -DGTEST_HAS_RTTI=0
+-AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -pedantic -Wno-long-long -fno-rtti
+-AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -fno-rtti -DGTEST_HAS_RTTI=0
++AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -pedantic -Wno-long-long -fno-rtti
++AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -fno-rtti -DGTEST_HAS_RTTI=0
  endif
  
  lib_LTLIBRARIES = libkmldom.la
 --- 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
+ 	     -I$(top_srcdir)/third_party/gtest-1.7.0/include
  
  if GCC
--AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -pedantic -fno-rtti
--AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -fno-rtti -DGTEST_HAS_RTTI=0
-+AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -pedantic -fno-rtti
-+AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -fno-rtti -DGTEST_HAS_RTTI=0
+-AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -pedantic -Wno-long-long -fno-rtti
+-AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -fno-rtti -DGTEST_HAS_RTTI=0
++AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -pedantic -Wno-long-long -fno-rtti
++AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -fno-rtti -DGTEST_HAS_RTTI=0
  endif
  
  lib_LTLIBRARIES = libkmlengine.la
@@ -184,23 +184,23 @@ Last-Update: 2013-10-07
  
  
  if GCC
--AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -pedantic -fno-rtti
--AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -fno-rtti -DGTEST_HAS_RTTI=0
-+AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -pedantic -fno-rtti
-+AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -fno-rtti -DGTEST_HAS_RTTI=0
+-AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -pedantic -Wno-long-long -fno-rtti
+-AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -fno-rtti -DGTEST_HAS_RTTI=0
++AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -pedantic -Wno-long-long -fno-rtti
++AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -fno-rtti -DGTEST_HAS_RTTI=0
  endif
  
  lib_LTLIBRARIES = libkmlregionator.la
 --- 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
+ 	      -I$(top_srcdir)/third_party/gtest-1.7.0/include
  
  if GCC
--AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -pedantic -fno-rtti
--AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -fno-rtti -DGTEST_HAS_RTTI=0
-+AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -pedantic -fno-rtti
-+AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -fno-rtti -DGTEST_HAS_RTTI=0
+-AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -pedantic -Wno-long-long -fno-rtti
+-AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -fno-rtti -DGTEST_HAS_RTTI=0
++AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -pedantic -Wno-long-long -fno-rtti
++AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -fno-rtti -DGTEST_HAS_RTTI=0
  endif
  
  lib_LTLIBRARIES = libkmlxsd.la
@@ -218,60 +218,60 @@ Last-Update: 2013-10-07
               $(top_builddir)/src/kml/dom/libkmldom.la \
 --- a/third_party/Makefile.am
 +++ b/third_party/Makefile.am
-@@ -1,11 +1,8 @@
--uriparser = uriparser-0.7.5
--
+@@ -7,11 +7,10 @@
+ #googletest = gtest-1.7.0
+ 
  AM_CPPFLAGS = -I$(top_srcdir)/third_party/zlib-1.2.3/contrib \
--	      -I$(top_srcdir)/third_party/$(uriparser)/include \
- 	      -I$(top_srcdir)/third_party/googletest-r108 \
- 	      -I$(top_srcdir)/third_party/googletest-r108/include
+-	      -I$(top_srcdir)/third_party/uriparser-0.7.5/include \
+ 	      -I$(top_srcdir)/third_party/gtest-1.7.0 \
+ 	      -I$(top_srcdir)/third_party/gtest-1.7.0/include
  
 -lib_LTLIBRARIES = libminizip.la liburiparser.la
 +lib_LTLIBRARIES = libminizip.la
  noinst_LTLIBRARIES = libgtest.la libgtest_main.la
  
  libminizip_la_SOURCES = \
-@@ -15,27 +12,6 @@ libminizip_la_SOURCES = \
+@@ -21,27 +20,6 @@ libminizip_la_SOURCES = \
  	zlib-1.2.3/contrib/minizip/zip.c
  libminizip_la_LDFLAGS = -lz
  
 -liburiparser_la_SOURCES = \
--	$(uriparser)/lib/UriCommon.c \
--	$(uriparser)/lib/UriCommon.h \
--	$(uriparser)/lib/UriCompare.c \
--	$(uriparser)/lib/UriEscape.c \
--	$(uriparser)/lib/UriFile.c \
--	$(uriparser)/lib/UriIp4.c \
--	$(uriparser)/lib/UriIp4Base.c \
--	$(uriparser)/lib/UriIp4Base.h \
--	$(uriparser)/lib/UriNormalize.c \
--	$(uriparser)/lib/UriNormalizeBase.c \
--	$(uriparser)/lib/UriNormalizeBase.h \
--	$(uriparser)/lib/UriParse.c \
--	$(uriparser)/lib/UriParseBase.c \
--	$(uriparser)/lib/UriParseBase.h \
--	$(uriparser)/lib/UriQuery.c \
--	$(uriparser)/lib/UriRecompose.c \
--	$(uriparser)/lib/UriResolve.c \
--	$(uriparser)/lib/UriShorten.c
+-	uriparser-0.7.5/lib/UriCommon.c \
+-	uriparser-0.7.5/lib/UriCommon.h \
+-	uriparser-0.7.5/lib/UriCompare.c \
+-	uriparser-0.7.5/lib/UriEscape.c \
+-	uriparser-0.7.5/lib/UriFile.c \
+-	uriparser-0.7.5/lib/UriIp4.c \
+-	uriparser-0.7.5/lib/UriIp4Base.c \
+-	uriparser-0.7.5/lib/UriIp4Base.h \
+-	uriparser-0.7.5/lib/UriNormalize.c \
+-	uriparser-0.7.5/lib/UriNormalizeBase.c \
+-	uriparser-0.7.5/lib/UriNormalizeBase.h \
+-	uriparser-0.7.5/lib/UriParse.c \
+-	uriparser-0.7.5/lib/UriParseBase.c \
+-	uriparser-0.7.5/lib/UriParseBase.h \
+-	uriparser-0.7.5/lib/UriQuery.c \
+-	uriparser-0.7.5/lib/UriRecompose.c \
+-	uriparser-0.7.5/lib/UriResolve.c \
+-	uriparser-0.7.5/lib/UriShorten.c
 -liburiparser_la_LDFLAGS = -version-info 1:5:0
 -
  boost_root = boost_1_34_1
  boost = $(boost_root)/boost
  boostinc = $(includedir)/kml/third_party/$(boost)
-@@ -162,15 +138,6 @@ EXTRA_DIST = \
- 	$(googletest)/include/gtest/internal/gtest-port.h \
- 	$(googletest)/include/gtest/internal/gtest-string.h \
- 	$(googletest)/include/gtest/internal/gtest-type-util.h \
--	$(uriparser)/COPYING \
--	$(uriparser).win32/debug/uriparser.lib \
--	$(uriparser).win32/release/uriparser.lib \
--	$(uriparser)/include/uriparser/Uri.h \
--	$(uriparser)/include/uriparser/UriBase.h \
--	$(uriparser)/include/uriparser/UriDefsAnsi.h \
--	$(uriparser)/include/uriparser/UriDefsConfig.h \
--	$(uriparser)/include/uriparser/UriDefsUnicode.h \
--	$(uriparser)/include/uriparser/UriIp4.h \
+@@ -181,15 +159,6 @@ EXTRA_DIST = \
+ 	gtest-1.7.0/src/gtest-test-part.cc \
+ 	gtest-1.7.0/src/gtest-typed-test.cc \
+ 	gtest-1.7.0/src/gtest.cc \
+-	uriparser-0.7.5/COPYING \
+-	uriparser-0.7.5.win32/debug/uriparser.lib \
+-	uriparser-0.7.5.win32/release/uriparser.lib \
+-	uriparser-0.7.5/include/uriparser/Uri.h \
+-	uriparser-0.7.5/include/uriparser/UriBase.h \
+-	uriparser-0.7.5/include/uriparser/UriDefsAnsi.h \
+-	uriparser-0.7.5/include/uriparser/UriDefsConfig.h \
+-	uriparser-0.7.5/include/uriparser/UriDefsUnicode.h \
+-	uriparser-0.7.5/include/uriparser/UriIp4.h \
  	zlib-1.2.3/zconf.h \
  	zlib-1.2.3/zlib.h \
  	zlib-1.2.3/contrib/minizip/crypt.h \
diff --git a/debian/patches/fix-ftbfs-gcc4.7.diff b/debian/patches/fix-ftbfs-gcc4.7.diff
index 935e3aa..23855ce 100644
--- a/debian/patches/fix-ftbfs-gcc4.7.diff
+++ b/debian/patches/fix-ftbfs-gcc4.7.diff
@@ -11,4 +11,4 @@ Last-Update: 2013-10-07
 +#include <unistd.h>
  #include <sys/types.h>
  #include <sys/stat.h>
- 
+ #include <unistd.h>  // For unlink, close.
diff --git a/debian/patches/hurd.diff b/debian/patches/hurd.diff
index 0ad18d3..22afad6 100644
--- a/debian/patches/hurd.diff
+++ b/debian/patches/hurd.diff
@@ -2,22 +2,9 @@ Description: Support building on hurd-i386
 Author: Pino Toscano <pino at debian.org>
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=671894
 Last-Update: 2013-10-07
---- a/third_party/googletest-r108/src/gtest-filepath.cc
-+++ b/third_party/googletest-r108/src/gtest-filepath.cc
-@@ -52,6 +52,10 @@
- 
- #include <gtest/internal/gtest-string.h>
- 
-+#ifndef PATH_MAX
-+# define PATH_MAX 4096
-+#endif
-+
- namespace testing {
- namespace internal {
- 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -27,7 +27,7 @@ dnl Which platform are we building on?
+@@ -29,7 +29,7 @@ dnl Which platform are we building on?
  PLATFORM=
  SHLIBSUFFIX=
  case "`uname -s`" in
@@ -26,3 +13,16 @@ Last-Update: 2013-10-07
  		SHLIBSUFFIX="so"
  	;;
  	Darwin)	PLATFORM=darwin
+--- a/third_party/gtest-1.7.0/src/gtest-filepath.cc
++++ b/third_party/gtest-1.7.0/src/gtest-filepath.cc
+@@ -60,6 +60,10 @@
+ 
+ #include "gtest/internal/gtest-string.h"
+ 
++#ifndef PATH_MAX
++# define PATH_MAX 4096
++#endif
++
+ namespace testing {
+ namespace internal {
+ 
diff --git a/debian/patches/kfreebsd.diff b/debian/patches/kfreebsd.diff
index 08a6971..56d7fce 100644
--- a/debian/patches/kfreebsd.diff
+++ b/debian/patches/kfreebsd.diff
@@ -4,7 +4,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=558208
 Last-Update: 2013-10-07
 --- a/configure.ac
 +++ b/configure.ac
-@@ -27,7 +27,7 @@ dnl Which platform are we building on?
+@@ -29,7 +29,7 @@ dnl Which platform are we building on?
  PLATFORM=
  SHLIBSUFFIX=
  case "`uname -s`" in
diff --git a/debian/patches/series b/debian/patches/series
index ba363d0..9a11222 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,13 +1,13 @@
 kfreebsd.diff
 hurd.diff
 automake.diff
-clone.diff
-ld-as-needed.diff
+#clone.diff
+#ld-as-needed.diff
 feature_view_test.diff
 geometry_test.diff
-swig.diff
-fix-ftbfs-gcc4.7.diff
+#swig.diff
+#fix-ftbfs-gcc4.7.diff
 java-run-sh-shebang.diff
 automake-subdir-objects.diff
-libtool-archiver.diff
+#libtool-archiver.diff
 dont-build-all.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libkml.git



More information about the Pkg-grass-devel mailing list