[SCM] libkml branch, master, updated. upstream/1.3.0_r863-45-g4a2fc89
The following commit has been merged in the master branch: commit 806a065dfbef9c1db5b83639853e7868761626e5 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Oct 5 21:46:44 2013 +0200 Update ld-as-needed.diff to fix FTBFS with --as-needed. diff --git a/debian/changelog b/debian/changelog index de48a97..2eb2dd8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ libkml (1.3.0~r863-5) UNRELEASED; urgency=low * Add myself to Uploaders. * Update swig.diff to also disable the SWIG version check in configure.ac. Thanks Ilya Barygin for the patch. + * Update ld-as-needed.diff to fix FTBFS with --as-needed. +Thanks Ilya Barygin for the patch. +(closes: #692055) -- Bas Couwenberg sebas...@xs4all.nl Sat, 05 Oct 2013 21:15:09 +0200 diff --git a/debian/patches/ld-as-needed.diff b/debian/patches/ld-as-needed.diff index df065d2..ffd06ee 100644 --- a/debian/patches/ld-as-needed.diff +++ b/debian/patches/ld-as-needed.diff @@ -1,7 +1,5 @@ -Index: git/examples/helloworld/Makefile.am -=== git.orig/examples/helloworld/Makefile.am 2011-03-29 14:49:48.0 +0200 -+++ git/examples/helloworld/Makefile.am2011-03-29 14:49:48.0 +0200 +--- a/examples/helloworld/Makefile.am b/examples/helloworld/Makefile.am @@ -26,8 +26,8 @@ circlegen_LDADD = \ $(top_builddir)/src/kml/base/libkmlbase.la \ @@ -33,10 +31,22 @@ Index: git/examples/helloworld/Makefile.am $(top_builddir)/src/kml/base/libkmlbase.la printgeometry_SOURCES = printgeometry.cc -Index: git/examples/regionator/Makefile.in -=== git.orig/examples/regionator/Makefile.in 2011-03-29 14:49:48.0 +0200 -+++ git/examples/regionator/Makefile.in2011-03-29 14:49:48.0 +0200 +--- a/examples/regionator/Makefile.in b/examples/regionator/Makefile.in +@@ -52,11 +52,11 @@ + am_csvregionator_OBJECTS = csvregionator.$(OBJEXT) + csvregionator_OBJECTS = $(am_csvregionator_OBJECTS) + csvregionator_DEPENDENCIES = \ ++ $(top_builddir)/src/kml/convenience/libkmlconvenience.la \ + $(top_builddir)/src/kml/base/libkmlbase.la \ + $(top_builddir)/src/kml/dom/libkmldom.la \ + $(top_builddir)/src/kml/engine/libkmlengine.la \ +- $(top_builddir)/src/kml/regionator/libkmlregionator.la \ +- $(top_builddir)/src/kml/convenience/libkmlconvenience.la ++ $(top_builddir)/src/kml/regionator/libkmlregionator.la + am_kmlregionator_OBJECTS = kmlregionator.$(OBJEXT) + kmlregionator_OBJECTS = $(am_kmlregionator_OBJECTS) + kmlregionator_DEPENDENCIES = \ @@ -232,9 +232,9 @@ kmlregionator_LDADD = \ $(top_builddir)/src/kml/base/libkmlbase.la \ @@ -49,11 +59,21 @@ Index: git/examples/regionator/Makefile.in all: all-am -Index: git/examples/regionator/Makefile.am -=== git.orig/examples/regionator/Makefile.am 2011-03-29 14:49:48.0 +0200 -+++ git/examples/regionator/Makefile.am2011-03-29 14:49:48.0 +0200 -@@ -20,7 +20,7 @@ +--- a/examples/regionator/Makefile.am b/examples/regionator/Makefile.am +@@ -10,17 +10,17 @@ + + csvregionator_SOURCES = csvregionator.cc + csvregionator_LDADD = \ ++ $(top_builddir)/src/kml/convenience/libkmlconvenience.la \ + $(top_builddir)/src/kml/base/libkmlbase.la \ + $(top_builddir)/src/kml/dom/libkmldom.la \ + $(top_builddir)/src/kml/engine/libkmlengine.la \ +- $(top_builddir)/src/kml/regionator/libkmlregionator.la \ +- $(top_builddir)/src/kml/convenience/libkmlconvenience.la ++ $(top_builddir)/src/kml/regionator/libkmlregionator.la + + kmlregionator_SOURCES = kmlregionator.cc kmlregionator_LDADD = \ $(top_builddir)/src/kml/base/libkmlbase.la \ $(top_builddir)/src/kml/dom/libkmldom.la \ @@ -63,10 +83,8 @@ Index: git/examples/regionator/Makefile.am + $(top_builddir)/src/kml/convenience/libkmlconvenience.la \ + $(top_builddir)/src/kml/engine/libkmlengine.la -Index: git/examples/helloworld/Makefile.in -=== git.orig/examples/helloworld/Makefile.in 2011-03-29 14:49:48.0 +0200 -+++ git/examples/helloworld/Makefile.in2011-03-29 14:49:48.0 +0200 +--- a/examples/helloworld/Makefile.in b/examples/helloworld/Makefile.in @@ -345,8 +345,8 @@ circlegen_LDADD = \ $(top_builddir)/src/kml/base/libkmlbase.la \ -- 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
[SCM] libkml branch, master, updated. upstream/1.3.0_r863-45-g4a2fc89
The following commit has been merged in the master branch:
commit fafd7dc566980ce81d27e68d223043afe5d8dc19
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Sat Oct 5 21:37:20 2013 +0200
Update swig.diff to also disable the SWIG version check in configure.ac.
diff --git a/debian/changelog b/debian/changelog
index 950518f..de48a97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
libkml (1.3.0~r863-5) UNRELEASED; urgency=low
* Add myself to Uploaders.
+ * Update swig.diff to also disable the SWIG version check in configure.ac.
+Thanks Ilya Barygin for the patch.
-- Bas Couwenberg sebas...@xs4all.nl Sat, 05 Oct 2013 21:15:09 +0200
diff --git a/debian/patches/swig.diff b/debian/patches/swig.diff
index 06ab0c6..c8ec790 100644
--- a/debian/patches/swig.diff
+++ b/debian/patches/swig.diff
@@ -25,3 +25,28 @@ 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 @@
+ [do not generate any SWIG language bindings])])
+ if test x$enable_swig != xno; then
+ AC_CHECK_PROG(SWIG, swig, swig)
+- if test x$SWIG != x; then
+- SWIG_VERSION=`swig -version 21|grep Version|cut -d -f3`
+- if test ${SWIG_VERSION:4} -lt 35; then
+- AC_MSG_WARN([You have SWIG $SWIG_VERSION installed, but
libkml requires at least SWIG 1.3.35. The bindings will not be built.])
+- SWIG=
+- fi
+- fi
++# if test x$SWIG != x; then
++# SWIG_VERSION=`swig -version 21|grep Version|cut -d -f3`
++# if test ${SWIG_VERSION:4} -lt 35; then
++# AC_MSG_WARN([You have SWIG $SWIG_VERSION installed, but
libkml requires at least SWIG 1.3.35. The bindings will not be built.])
++# SWIG=
++# fi
++# fi
+ fi
+ AM_CONDITIONAL(WITH_SWIG, [test x$SWIG != x])
+
--
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
[SCM] libkml branch, master, updated. upstream/1.3.0_r863-45-g4a2fc89
The following commit has been merged in the master branch:
commit c4f7b39d606a57670f2e126f885fc350dd77487f
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Sat Oct 5 21:56:42 2013 +0200
Add hurd.diff to fix FTBFS on hurd-i386.
diff --git a/debian/changelog b/debian/changelog
index 2eb2dd8..7bbd537 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ libkml (1.3.0~r863-5) UNRELEASED; urgency=low
* Update ld-as-needed.diff to fix FTBFS with --as-needed.
Thanks Ilya Barygin for the patch.
(closes: #692055)
+ * Add hurd.diff to fix FTBFS on hurd-i386.
+Thanks Pino Toscano for the patch.
+(closes: #671894)
-- Bas Couwenberg sebas...@xs4all.nl Sat, 05 Oct 2013 21:15:09 +0200
diff --git a/debian/patches/hurd.diff b/debian/patches/hurd.diff
new file mode 100644
index 000..933c8b1
--- /dev/null
+++ b/debian/patches/hurd.diff
@@ -0,0 +1,24 @@
+--- 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?
+ PLATFORM=
+ SHLIBSUFFIX=
+ case `uname -s` in
+- Linux|GNU/kFreeBSD) PLATFORM=linux
++ Linux|GNU/kFreeBSD|GNU) PLATFORM=linux
+ SHLIBSUFFIX=so
+ ;;
+ Darwin) PLATFORM=darwin
diff --git a/debian/patches/reautoconfiscated.diff
b/debian/patches/reautoconfiscated.diff
index ae03793..0e74eb6 100644
--- a/debian/patches/reautoconfiscated.diff
+++ b/debian/patches/reautoconfiscated.diff
@@ -7,7 +7,7 @@ Index: git/configure
SHLIBSUFFIX=
case `uname -s` in
- Linux) PLATFORM=linux
-+ Linux|GNU/kFreeBSD) PLATFORM=linux
++ Linux|GNU/kFreeBSD|GNU) PLATFORM=linux
SHLIBSUFFIX=so
;;
Darwin) PLATFORM=darwin
diff --git a/debian/patches/series b/debian/patches/series
index a2d4b95..f6451b4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
kfreebsd.diff
+hurd.diff
automake.diff
reautoconfiscated.diff
clone.diff
--
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
[SCM] libkml branch, master, updated. upstream/1.3.0_r863-45-g4a2fc89
The following commit has been merged in the master branch: commit 7558fae2451ee428b5cd2ea0dd4f869832da3912 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Oct 6 04:19:22 2013 +0200 Add a watch file. diff --git a/debian/changelog b/debian/changelog index a063d57..454d49c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ libkml (1.3.0~r864-1) UNRELEASED; urgency=low * Use canonical URLs for Vcs-* fields. * Don't start short description with an article. * Drop XB-Python-Version from control file. + * Add a watch file. -- Bas Couwenberg sebas...@xs4all.nl Sat, 05 Oct 2013 21:15:09 +0200 diff --git a/debian/watch b/debian/watch new file mode 100644 index 000..f866043 --- /dev/null +++ b/debian/watch @@ -0,0 +1,13 @@ +version=3 + +# official tarball releases +# +#opts=dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/ \ +#https://code.google.com/p/libkml/downloads/list?can=1 \ +#(?:.*/)?(?:rel|v|libkml)[\-\_](\d[\d\-\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) + +# subversion revisions +# +opts=dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/^\d+$/1.3.0~r$/ \ +https://code.google.com/p/libkml/source/list \ +(?:.*/)?detail\?r=(\d+) -- 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
[SCM] libkml branch, master, updated. upstream/1.3.0_r863-45-g4a2fc89
The following commit has been merged in the master branch: commit 5593d0ebffd71210205c541f18fff0d9a10c53e5 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Oct 5 21:15:18 2013 +0200 Add myself to Uploaders. diff --git a/debian/changelog b/debian/changelog index 9d772e7..950518f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libkml (1.3.0~r863-5) UNRELEASED; urgency=low + + * Add myself to Uploaders. + + -- Bas Couwenberg sebas...@xs4all.nl Sat, 05 Oct 2013 21:15:09 +0200 + libkml (1.3.0~r863-4.1) unstable; urgency=low * Non maintainer upload. diff --git a/debian/control b/debian/control index f2c4430..7eaebd3 100644 --- a/debian/control +++ b/debian/control @@ -3,6 +3,7 @@ Section: science Priority: extra Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: Francesco Paolo Lovergine fran...@debian.org + , Bas Couwenberg sebas...@xs4all.nl Build-Depends: cdbs (= 0.4.90~), debhelper (= 9), autotools-dev, libexpat1-dev, zlib1g-dev, default-jdk, python-dev (= 2.6.6-3~), python-all-dev (= 2.6.6-3~), liburiparser-dev (= 0.7.1), chrpath, libcurl4-openssl-dev, 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
[SCM] libkml branch, master, updated. upstream/1.3.0_r863-45-g4a2fc89
The following commit has been merged in the master branch: commit 69e4cd7f545bd62edb06b94e43a862cb23768d03 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Oct 5 22:36:15 2013 +0200 Use canonical URLs for Vcs-* fields. diff --git a/debian/changelog b/debian/changelog index 224f565..198cc6e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ libkml (1.3.0~r863-5) UNRELEASED; urgency=low Thanks Pino Toscano for the patch. (closes: #671894) * Refresh patches. + * Use canonical URLs for Vcs-* fields. -- Bas Couwenberg sebas...@xs4all.nl Sat, 05 Oct 2013 21:15:09 +0200 diff --git a/debian/control b/debian/control index 7eaebd3..0b1461f 100644 --- a/debian/control +++ b/debian/control @@ -10,8 +10,8 @@ Build-Depends: cdbs (= 0.4.90~), debhelper (= 9), autotools-dev, libexpat1-dev X-Python-Version: = 2.5 Standards-Version: 3.9.3 Homepage: http://code.google.com/p/libkml/ -Vcs-Git: git://git.debian.org/git/pkg-grass/libkml.git -Vcs-Browser: http://git.debian.org/?p=pkg-grass/libkml.git +Vcs-Git: git://anonscm.debian.org/pkg-grass/libkml.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/libkml.git Package: libkml0 Architecture: any -- 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
[SCM] libkml branch, master, updated. upstream/1.3.0_r863-45-g4a2fc89
The following commit has been merged in the master branch: commit a9916c20c97496735488f294cfdc456beb852d40 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Oct 6 04:43:14 2013 +0200 Add patch to fix executable-not-elf-or-script for java run.sh example. diff --git a/debian/changelog b/debian/changelog index 454d49c..d09ab5d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ libkml (1.3.0~r864-1) UNRELEASED; urgency=low * Don't start short description with an article. * Drop XB-Python-Version from control file. * Add a watch file. + * Add patch to fix executable-not-elf-or-script for java run.sh example. -- Bas Couwenberg sebas...@xs4all.nl Sat, 05 Oct 2013 21:15:09 +0200 diff --git a/debian/patches/java-run-sh-shebang.diff b/debian/patches/java-run-sh-shebang.diff new file mode 100644 index 000..57c2e77 --- /dev/null +++ b/debian/patches/java-run-sh-shebang.diff @@ -0,0 +1,8 @@ +--- a/examples/java/run.sh b/examples/java/run.sh +@@ -1,3 +1,5 @@ ++#!/bin/sh ++ + # The relative path to the directory that holds the build shared libraries. + BUILT_LIB_DIR=../../build/src/swig/.libs + echo === setting shared library path to built libraries dir: $BUILT_LIB_DIR diff --git a/debian/patches/series b/debian/patches/series index f6451b4..67efa04 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,4 @@ feature_view_test.diff geometry_test.diff swig.diff fix-ftbfs-gcc4.7.diff +java-run-sh-shebang.diff -- 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
[SCM] libkml branch, master, updated. upstream/1.3.0_r863-45-g4a2fc89
The following commit has been merged in the master branch: commit b6a1b254c650b31206d2d01a3e535f717200fbd0 Merge: 8a8bb5a5bb2ba2a3b4ae3d6cf5260b996ffe774f 9f6caaea01c8f781cffb7771b86164dcdd2d8d01 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Oct 6 15:26:42 2013 +0200 Merge branch 'upstream' -- 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
[SCM] libkml branch, master, updated. upstream/1.3.0_r863-45-g4a2fc89
The following commit has been merged in the master branch:
commit 54523fa8026d93f1769cc7282b06899d9974857e
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Sun Oct 6 16:43:24 2013 +0200
Move .so symlinks from java packages to libkml-dev.
diff --git a/debian/changelog b/debian/changelog
index 8d1c447..0d7a15b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ libkml (1.3.0~r864-1) UNRELEASED; urgency=low
* Add patch to fix executable-not-elf-or-script for java run.sh example.
* Add lintian override for no fortify functions false positive.
* Drop needless dependency on default-jre for libkml-java.
+ * Move .so symlinks from java packages to libkml-dev.
-- Bas Couwenberg sebas...@xs4all.nl Sat, 05 Oct 2013 21:15:09 +0200
diff --git a/debian/control b/debian/control
index 90195db..0207d36 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,8 @@ Description: Library to manipulate KML 2.2 OGC standard files
Package: libkml-dev
Architecture: any
Section: libdevel
-Depends: libkml0 (= ${binary:Version}), liburiparser-dev (= 0.7.1),
${shlibs:Depends}, ${misc:Depends}
+Depends: libkml0 (= ${binary:Version}), libkml-java (= ${binary:Version}),
liburiparser-dev (= 0.7.1),
+ ${shlibs:Depends}, ${misc:Depends}
Description: Library to manipulate KML 2.2 OGC standard files - development
files
This is a library for use with applications that want to parse,
generate and operate on KML, a geo-data XML variant. It is an
diff --git a/debian/libkml-dev.install b/debian/libkml-dev.install
index 793afaf..180a86d 100644
--- a/debian/libkml-dev.install
+++ b/debian/libkml-dev.install
@@ -1,3 +1,4 @@
usr/include/
usr/lib/lib*.so
usr/lib/lib*.a
+usr/lib/libkml/*.so usr/lib
diff --git a/debian/libkml-java.install b/debian/libkml-java.install
index 732aca0..86e806e 100644
--- a/debian/libkml-java.install
+++ b/debian/libkml-java.install
@@ -1,2 +1,2 @@
usr/share/java
-usr/lib/libkml/libkml*_swig_java*.so* usr/lib
+usr/lib/libkml/libkml*_swig_java*.so.* usr/lib
--
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
[SCM] libkml branch, master, updated. upstream/1.3.0_r863-45-g4a2fc89
The following commit has been merged in the master branch:
commit 8a8bb5a5bb2ba2a3b4ae3d6cf5260b996ffe774f
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Sun Oct 6 02:29:12 2013 +0200
Don't start short description with an article.
* Don't start short description with an article.
* Drop XB-Python-Version from control file.
diff --git a/debian/changelog b/debian/changelog
index 198cc6e..59e40f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ libkml (1.3.0~r863-5) UNRELEASED; urgency=low
(closes: #671894)
* Refresh patches.
* Use canonical URLs for Vcs-* fields.
+ * Don't start short description with an article.
+ * Drop XB-Python-Version from control file.
-- Bas Couwenberg sebas...@xs4all.nl Sat, 05 Oct 2013 21:15:09 +0200
diff --git a/debian/control b/debian/control
index 0b1461f..ebc743a 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Package: libkml0
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: A library to manipulate KML 2.2 OGC standard files
+Description: Library to manipulate KML 2.2 OGC standard files
This is a library for use with applications that want to parse,
generate and operate on KML, a geo-data XML variant. It is an
implementation of the OGC KML 2.2 standard. It is written in C++ and
@@ -30,7 +30,7 @@ Package: libkml-dev
Architecture: any
Section: libdevel
Depends: libkml0 (= ${binary:Version}), liburiparser-dev (= 0.7.1),
${shlibs:Depends}, ${misc:Depends}
-Description: A library to manipulate KML 2.2 OGC standard files - development
files
+Description: Library to manipulate KML 2.2 OGC standard files - development
files
This is a library for use with applications that want to parse,
generate and operate on KML, a geo-data XML variant. It is an
implementation of the OGC KML 2.2 standard. It is written in C++ and
@@ -43,7 +43,7 @@ Package: libkml-java
Architecture: any
Section: java
Depends: libkml0 (= ${binary:Version}), default-jre, ${shlibs:Depends},
${misc:Depends}
-Description: A library to manipulate KML 2.2 OGC standard files - Java package
+Description: Library to manipulate KML 2.2 OGC standard files - Java package
This is a library for use with applications that want to parse,
generate and operate on KML, a geo-data XML variant. It is an
implementation of the OGC KML 2.2 standard. It is written in C++ and
@@ -56,8 +56,7 @@ Architecture: any
Section: python
Depends: libkml0 (= ${binary:Version}), ${python:Depends}, ${shlibs:Depends},
${misc:Depends}
Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
-Description: A library to manipulate KML 2.2 OGC standard files - Python
extension
+Description: Library to manipulate KML 2.2 OGC standard files - Python
extension
This is a library for use with applications that want to parse,
generate and operate on KML, a geo-data XML variant. It is an
implementation of the OGC KML 2.2 standard. It is written in C++ and
--
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
[SCM] libkml branch, master, updated. upstream/1.3.0_r863-45-g4a2fc89
The following commit has been merged in the master branch:
commit bf6baa7039afc4a76f55fc43f67a6c978e607d01
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Sun Oct 6 19:22:17 2013 +0200
Use minimal dh rules, handle Multi-Arch paths.
diff --git a/debian/README.source b/debian/README.source
index 68e7739..37f6c8c 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -22,7 +22,3 @@ and create a couple of suitable patches. The
reautoconfiscated.diff
patch can be obtained by running 'autoreconf --install --force --verbose'
after applying the automake.diff one.
-But for that, the package largely predates gnome-menus for managing
-multiple builds of the python extension with cdbs. Kudos to Sebastien
-Bacher for the original hack.
-
diff --git a/debian/changelog b/debian/changelog
index b3e05f3..e638e1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ libkml (1.3.0~r864-1) UNRELEASED; urgency=low
* Move .so symlinks from java packages to libkml-dev.
* Update copyright file using copyright-format 1.0.
* Add lintian override for source-contains-prebuilt-windows-binary.
+ * Use minimal dh rules, handle Multi-Arch paths.
-- Bas Couwenberg sebas...@xs4all.nl Sat, 05 Oct 2013 21:15:09 +0200
diff --git a/debian/control b/debian/control
index 0207d36..4befdc5 100644
--- a/debian/control
+++ b/debian/control
@@ -4,10 +4,10 @@ Priority: extra
Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
Uploaders: Francesco Paolo Lovergine fran...@debian.org
, Bas Couwenberg sebas...@xs4all.nl
-Build-Depends: cdbs (= 0.4.90~), debhelper (= 9), autotools-dev,
libexpat1-dev, zlib1g-dev, default-jdk,
+Build-Depends: debhelper (= 9), autotools-dev, libexpat1-dev, zlib1g-dev,
default-jdk,
python-dev (= 2.6.6-3~), python-all-dev (= 2.6.6-3~), liburiparser-dev (=
0.7.1), chrpath,
libcurl4-openssl-dev, swig
-X-Python-Version: = 2.5
+X-Python-Version: 2.7
Standards-Version: 3.9.3
Homepage: http://code.google.com/p/libkml/
Vcs-Git: git://anonscm.debian.org/pkg-grass/libkml.git
@@ -15,6 +15,7 @@ Vcs-Browser:
http://anonscm.debian.org/gitweb/?p=pkg-grass/libkml.git
Package: libkml0
Architecture: any
+Multi-Arch: same
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Library to manipulate KML 2.2 OGC standard files
@@ -28,6 +29,7 @@ Description: Library to manipulate KML 2.2 OGC standard files
Package: libkml-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
Depends: libkml0 (= ${binary:Version}), libkml-java (= ${binary:Version}),
liburiparser-dev (= 0.7.1),
${shlibs:Depends}, ${misc:Depends}
@@ -42,6 +44,7 @@ Description: Library to manipulate KML 2.2 OGC standard files
- development file
Package: libkml-java
Architecture: any
+Multi-Arch: same
Section: java
Depends: libkml0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: Library to manipulate KML 2.2 OGC standard files - Java package
@@ -64,3 +67,4 @@ Description: Library to manipulate KML 2.2 OGC standard files
- Python extension
bindings are available via SWIG to Java and Python.
.
This package contains required extensions for Python applications.
+
diff --git a/debian/libkml-dev.install b/debian/libkml-dev.install
index 180a86d..25e62ce 100644
--- a/debian/libkml-dev.install
+++ b/debian/libkml-dev.install
@@ -1,4 +1,3 @@
usr/include/
-usr/lib/lib*.so
-usr/lib/lib*.a
-usr/lib/libkml/*.so usr/lib
+usr/lib/*/lib*.so
+usr/lib/*/lib*.a
diff --git a/debian/libkml-java.install b/debian/libkml-java.install
index 86e806e..cf75aaf 100644
--- a/debian/libkml-java.install
+++ b/debian/libkml-java.install
@@ -1,2 +1,4 @@
usr/share/java
-usr/lib/libkml/libkml*_swig_java*.so.* usr/lib
+usr/lib/*/libkmlbase_swig_java.so.*
+usr/lib/*/libkmldom_swig_java.so.*
+usr/lib/*/libkmlengine_swig_java.so.*
diff --git a/debian/libkml0.install b/debian/libkml0.install
index d0dbfd1..3b92661 100644
--- a/debian/libkml0.install
+++ b/debian/libkml0.install
@@ -1 +1,7 @@
-usr/lib/lib*.so.*
+usr/lib/*/libkmlbase.so.*
+usr/lib/*/libkmlconvenience.so.*
+usr/lib/*/libkmldom.so.*
+usr/lib/*/libkmlengine.so.*
+usr/lib/*/libkmlregionator.so.*
+usr/lib/*/libkmlxsd.so.*
+usr/lib/*/libminizip.so.*
diff --git a/debian/libkml0.lintian-overrides b/debian/libkml0.lintian-overrides
index b86e2fd..a144e2e 100644
--- a/debian/libkml0.lintian-overrides
+++ b/debian/libkml0.lintian-overrides
@@ -2,4 +2,4 @@
# Fortify Source functions: no, only unprotected functions found!
# unprotected: memcpy
# unprotected: fread
-libkml0: hardening-no-fortify-functions usr/lib/libminizip.so.0.0.0
+libkml0: hardening-no-fortify-functions usr/lib/*/libminizip.so.0.0.0
diff --git a/debian/rules b/debian/rules
index 5335b57..5278bf3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,62 +1,41 @@
#!/usr/bin/make -f
-PY_VERSIONS = $(shell pyversions --requested debian/control)
-
JAVA_HOME = /usr/lib/jvm/default-java
-include
[SCM] libkml branch, master, updated. upstream/1.3.0_r863-45-g4a2fc89
The following commit has been merged in the master branch: commit fc4d7f981bd8b817a43ef59c33f07414216bed99 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Oct 6 04:45:29 2013 +0200 Add lintian override for no fortify functions false positive. diff --git a/debian/changelog b/debian/changelog index d09ab5d..00efdff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ libkml (1.3.0~r864-1) UNRELEASED; urgency=low * Drop XB-Python-Version from control file. * Add a watch file. * Add patch to fix executable-not-elf-or-script for java run.sh example. + * Add lintian override for no fortify functions false positive. -- Bas Couwenberg sebas...@xs4all.nl Sat, 05 Oct 2013 21:15:09 +0200 diff --git a/debian/libkml0.lintian-overrides b/debian/libkml0.lintian-overrides new file mode 100644 index 000..b86e2fd --- /dev/null +++ b/debian/libkml0.lintian-overrides @@ -0,0 +1,5 @@ +# -D_FORTIFY_SOURCE=2 is used during build, but hardening-check reports: +# Fortify Source functions: no, only unprotected functions found! +# unprotected: memcpy +# unprotected: fread +libkml0: hardening-no-fortify-functions usr/lib/libminizip.so.0.0.0 -- 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
[SCM] libkml branch, master, updated. upstream/1.3.0_r863-45-g4a2fc89
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.0 +0200 -+++ git/examples/engine/Makefile.am2011-03-29 14:52:15.0 +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.0 +0200 -+++ git/examples/gpx/Makefile.am 2011-03-29 14:52:15.0 +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.0 +0200 -+++ git/examples/gx/Makefile.am2011-03-29 14:52:15.0 +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.0 +0200 -+++ git/examples/hellonet/Makefile.am 2011-03-29 14:52:15.0 +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.0 +0200 -+++ git/examples/helloworld/Makefile.am2011-03-29 14:52:15.0 +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.0 +0200 -+++ git/examples/regionator/Makefile.am2011-03-29 14:52:15.0 +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.0 +0200 -+++ git/examples/xsd/Makefile.am 2011-03-29 14:52:15.0 +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 -===
[SCM] libkml branch, master, updated. upstream/1.3.0_r863-45-g4a2fc89
The following commit has been merged in the master branch: commit ceb5eaf9788cf000dbeece40e9b2fa3c975ea177 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Oct 6 03:50:08 2013 +0200 New upstream revision. diff --git a/debian/changelog b/debian/changelog index 59e40f2..a063d57 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ -libkml (1.3.0~r863-5) UNRELEASED; urgency=low +libkml (1.3.0~r864-1) UNRELEASED; urgency=low + * Merge upstream commit r864: +Allow colors to have leading whitespace, with or without '#'. * Add myself to Uploaders. * Update swig.diff to also disable the SWIG version check in configure.ac. Thanks Ilya Barygin for the patch. -- 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
[SCM] libkml branch, master, updated. upstream/1.3.0_r863-45-g4a2fc89
The following commit has been merged in the master branch: commit 3f7a20be6db649285f606f4d20e6f948cfc17b1e Author: Bas Couwenberg sebas...@xs4all.nl Date: Mon Oct 7 00:51:25 2013 +0200 Use dh-autoreconf for retooling. Use dh-autoreconf for retooling. Drop reautoconfiscated.diff, no longer required. diff --git a/debian/README.source b/debian/README.source index 37f6c8c..0dd3f9f 100644 --- a/debian/README.source +++ b/debian/README.source @@ -17,8 +17,6 @@ the system provided. The Boost library is currently so oldi (and weak) that it is better using the internal one (which is not exposed). This is done by changing the Makefile.am automake set of scripts -and autoreconfiguring. Quilt is used to do that in two steps -and create a couple of suitable patches. The reautoconfiscated.diff -patch can be obtained by running 'autoreconf --install --force --verbose' -after applying the automake.diff one. +and autoreconfiguring. Quilt is used to patch the build system and +dh-autoreconf to reconfigure it. diff --git a/debian/changelog b/debian/changelog index e638e1c..fddc9cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ libkml (1.3.0~r864-1) UNRELEASED; urgency=low * Update copyright file using copyright-format 1.0. * Add lintian override for source-contains-prebuilt-windows-binary. * Use minimal dh rules, handle Multi-Arch paths. + * Use dh-autoreconf for retooling. -- Bas Couwenberg sebas...@xs4all.nl Sat, 05 Oct 2013 21:15:09 +0200 diff --git a/debian/control b/debian/control index 4befdc5..da5cc7e 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Francesco Paolo Lovergine fran...@debian.org , Bas Couwenberg sebas...@xs4all.nl Build-Depends: debhelper (= 9), autotools-dev, libexpat1-dev, zlib1g-dev, default-jdk, python-dev (= 2.6.6-3~), python-all-dev (= 2.6.6-3~), liburiparser-dev (= 0.7.1), chrpath, - libcurl4-openssl-dev, swig + libcurl4-openssl-dev, swig, dh-autoreconf X-Python-Version: 2.7 Standards-Version: 3.9.3 Homepage: http://code.google.com/p/libkml/ diff --git a/debian/patches/automake.diff b/debian/patches/automake.diff index dbf4fbd..d02510e 100644 --- a/debian/patches/automake.diff +++ b/debian/patches/automake.diff @@ -215,9 +215,9 @@ $(top_builddir)/src/kml/dom/libkmldom.la \ --- a/third_party/Makefile.am +++ b/third_party/Makefile.am -@@ -1,11 +1,10 @@ - uriparser = uriparser-0.7.5 - +@@ -1,11 +1,8 @@ +-uriparser = uriparser-0.7.5 +- 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 \ @@ -228,7 +228,7 @@ noinst_LTLIBRARIES = libgtest.la libgtest_main.la libminizip_la_SOURCES = \ -@@ -15,27 +14,6 @@ libminizip_la_SOURCES = \ +@@ -15,27 +12,6 @@ libminizip_la_SOURCES = \ zlib-1.2.3/contrib/minizip/zip.c libminizip_la_LDFLAGS = -lz @@ -256,3 +256,19 @@ 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 \ + 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/ld-as-needed.diff b/debian/patches/ld-as-needed.diff index 743ddee..f6a726c 100644 --- a/debian/patches/ld-as-needed.diff +++ b/debian/patches/ld-as-needed.diff @@ -31,34 +31,6 @@ $(top_builddir)/src/kml/base/libkmlbase.la printgeometry_SOURCES = printgeometry.cc a/examples/regionator/Makefile.in -+++ b/examples/regionator/Makefile.in -@@ -52,11 +52,11 @@ PROGRAMS = $(noinst_PROGRAMS) - am_csvregionator_OBJECTS = csvregionator.$(OBJEXT) - csvregionator_OBJECTS = $(am_csvregionator_OBJECTS) - csvregionator_DEPENDENCIES = \ -+ $(top_builddir)/src/kml/convenience/libkmlconvenience.la \ - $(top_builddir)/src/kml/base/libkmlbase.la \ - $(top_builddir)/src/kml/dom/libkmldom.la \ - $(top_builddir)/src/kml/engine/libkmlengine.la \ -- $(top_builddir)/src/kml/regionator/libkmlregionator.la \ -- $(top_builddir)/src/kml/convenience/libkmlconvenience.la -+ $(top_builddir)/src/kml/regionator/libkmlregionator.la - am_kmlregionator_OBJECTS = kmlregionator.$(OBJEXT) - kmlregionator_OBJECTS = $(am_kmlregionator_OBJECTS) -
[SCM] libkml branch, master, updated. upstream/1.3.0_r863-45-g4a2fc89
The following commit has been merged in the master branch:
commit 59528dc8e66cb636f738fe0c46ce997c22674ec9
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Mon Oct 7 20:17:10 2013 +0200
Add patch headers for all patches.
diff --git a/debian/changelog b/debian/changelog
index 4693dd4..44b8046 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ libkml (1.3.0~r864-1) UNRELEASED; urgency=low
* Add patch to fix linking libtool libraries using a non-POSIX archiver.
* Add patch to not build examples, msvc and xcode subprojects.
* Add lintian override for incompatible-java-bytecode-format.
+ * Add patch headers for all patches.
-- Bas Couwenberg sebas...@xs4all.nl Sat, 05 Oct 2013 21:15:09 +0200
diff --git a/debian/patches/automake-subdir-objects.diff
b/debian/patches/automake-subdir-objects.diff
index cadc4b8..518551d 100644
--- a/debian/patches/automake-subdir-objects.diff
+++ b/debian/patches/automake-subdir-objects.diff
@@ -1,3 +1,6 @@
+Description: Remain forward compatible with automake using subdir-objects.
+Author: Bas Couwenberg sebas...@xs4all.nl
+Last-Update: 2013-10-07
--- a/third_party/Makefile.am
+++ b/third_party/Makefile.am
@@ -1,3 +1,5 @@
diff --git a/debian/patches/automake.diff b/debian/patches/automake.diff
index d02510e..9e5c59b 100644
--- a/debian/patches/automake.diff
+++ b/debian/patches/automake.diff
@@ -1,3 +1,6 @@
+Description: Don't fail build on warnings, don't use embedded liburiparser.
+Author: Francesco Paolo Lovergine fran...@debian.org
+Last-Update: 2013-10-07
--- a/examples/engine/Makefile.am
+++ b/examples/engine/Makefile.am
@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
diff --git a/debian/patches/clone.diff b/debian/patches/clone.diff
index 4916bf7..168a602 100644
--- a/debian/patches/clone.diff
+++ b/debian/patches/clone.diff
@@ -1,3 +1,6 @@
+Description: Support ia64 __clone2().
+Author: Francesco Paolo Lovergine fran...@debian.org
+Last-Update: 2013-10-07
--- 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() {
diff --git a/debian/patches/dont-build-all.diff
b/debian/patches/dont-build-all.diff
index cfe2d81..21d9640 100644
--- a/debian/patches/dont-build-all.diff
+++ b/debian/patches/dont-build-all.diff
@@ -1,3 +1,6 @@
+Description: Don't build unneeded subprojects
+Author: Bas Couwenberg sebas...@xs4all.nl
+Last-Update: 2013-10-07
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
diff --git a/debian/patches/feature_view_test.diff
b/debian/patches/feature_view_test.diff
index 4f6c932..81a6fd0 100644
--- a/debian/patches/feature_view_test.diff
+++ b/debian/patches/feature_view_test.diff
@@ -1,3 +1,6 @@
+Description: Remove failing test.
+Author: Francesco Paolo Lovergine fran...@debian.org
+Last-Update: 2013-10-07
--- a/src/kml/engine/feature_view_test.cc
+++ b/src/kml/engine/feature_view_test.cc
@@ -27,7 +27,6 @@
diff --git a/debian/patches/fix-ftbfs-gcc4.7.diff
b/debian/patches/fix-ftbfs-gcc4.7.diff
index 480ff90..935e3aa 100644
--- a/debian/patches/fix-ftbfs-gcc4.7.diff
+++ b/debian/patches/fix-ftbfs-gcc4.7.diff
@@ -1,3 +1,7 @@
+Description: Fix building with GCC 4.7
+Author: Matthias Klose d...@debian.org
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667247
+Last-Update: 2013-10-07
--- a/src/kml/base/file_posix.cc
+++ b/src/kml/base/file_posix.cc
@@ -29,6 +29,7 @@
diff --git a/debian/patches/geometry_test.diff
b/debian/patches/geometry_test.diff
index d4aaaf7..5c82eee 100644
--- a/debian/patches/geometry_test.diff
+++ b/debian/patches/geometry_test.diff
@@ -1,3 +1,7 @@
+Description: Remove failing test.
+Author: Francesco Paolo Lovergine fran...@debian.org
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626259
+Last-Update: 2013-10-07
--- a/src/kml/dom/geometry_test.cc
+++ b/src/kml/dom/geometry_test.cc
@@ -356,30 +356,6 @@ TEST_F(CoordinatesTest, TestSerializeOne
diff --git a/debian/patches/hurd.diff b/debian/patches/hurd.diff
index 933c8b1..0ad18d3 100644
--- a/debian/patches/hurd.diff
+++ b/debian/patches/hurd.diff
@@ -1,3 +1,7 @@
+Description: Support building on hurd-i386
+Author: Pino Toscano p...@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 @@
diff --git a/debian/patches/java-run-sh-shebang.diff
b/debian/patches/java-run-sh-shebang.diff
index 57c2e77..4a226e0 100644
--- a/debian/patches/java-run-sh-shebang.diff
+++ b/debian/patches/java-run-sh-shebang.diff
@@ -1,3 +1,6 @@
+Description: Add shebang to java run example to fix lintian issue.
+Author: Bas Couwenberg sebas...@xs4al.nl
+Last-Update: 2013-10-07
--- a/examples/java/run.sh
+++ b/examples/java/run.sh
@@ -1,3 +1,5 @@
diff --git a/debian/patches/kfreebsd.diff b/debian/patches/kfreebsd.diff
index
[SCM] libkml branch, master, updated. upstream/1.3.0_r863-45-g4a2fc89
The following commit has been merged in the master branch:
commit 83e4e7be3fe46fc8ddf3cd11e8b61127a4accdb5
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Sun Oct 6 15:18:22 2013 +0200
Drop needless dependency on default-jre for libkml-java.
diff --git a/debian/changelog b/debian/changelog
index 00efdff..8d1c447 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ libkml (1.3.0~r864-1) UNRELEASED; urgency=low
* Add a watch file.
* Add patch to fix executable-not-elf-or-script for java run.sh example.
* Add lintian override for no fortify functions false positive.
+ * Drop needless dependency on default-jre for libkml-java.
-- Bas Couwenberg sebas...@xs4all.nl Sat, 05 Oct 2013 21:15:09 +0200
diff --git a/debian/control b/debian/control
index ebc743a..90195db 100644
--- a/debian/control
+++ b/debian/control
@@ -42,7 +42,7 @@ Description: Library to manipulate KML 2.2 OGC standard files
- development file
Package: libkml-java
Architecture: any
Section: java
-Depends: libkml0 (= ${binary:Version}), default-jre, ${shlibs:Depends},
${misc:Depends}
+Depends: libkml0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: Library to manipulate KML 2.2 OGC standard files - Java package
This is a library for use with applications that want to parse,
generate and operate on KML, a geo-data XML variant. It is an
--
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
[SCM] libkml branch, master, updated. upstream/1.3.0_r863-45-g4a2fc89
The following commit has been merged in the master branch: commit c3b5831daeec9452bf2034123e30a4bf1fc8f5b3 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Oct 6 18:05:10 2013 +0200 Update copyright file using copyright-format 1.0. diff --git a/debian/changelog b/debian/changelog index 0d7a15b..ef2fd3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ libkml (1.3.0~r864-1) UNRELEASED; urgency=low * Add lintian override for no fortify functions false positive. * Drop needless dependency on default-jre for libkml-java. * Move .so symlinks from java packages to libkml-dev. + * Update copyright file using copyright-format 1.0. -- Bas Couwenberg sebas...@xs4all.nl Sat, 05 Oct 2013 21:15:09 +0200 diff --git a/debian/copyright b/debian/copyright index 6a075ef..b89a6d7 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,201 +1,573 @@ -This work was packaged for Debian by: - -Francesco Paolo Lovergine fran...@debian.org on Tue, 29 Sep 2009 11:15:17 +0200 - -It was downloaded from http://code.google.com/p/libkml/ - -Upstream Author: - - Google Inc. opensou...@gmail.com - -Copyrights: - -Copyright (C) 2005-2009 Google Inc. - - Third parties libraries included in the original sources: - - Zlib: - Copyright (C) 1998-2005 Gilles Vollant - Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler - Copyright (c) 1990-2000 Info-ZIP - - Uriparser: - Copyright (C) 2007, Weijia Song songwei...@gmail.com - Copyright (C) 2007, Sebastian Pipping webmas...@hartwork.org - - Boost: - Copyright (C) Greg Colvin and Beman Dawes 1998, 1999. - Copyright (C) 2001, 2002 Peter Dimov and Multi Media Ltd. - Copyright (C) John Maddock 2001 - 2005. - Copyright (C) Darin Adler 2001. - Copyright (C) Bill Kempf 2002. - Copyright (C) Jens Maurer 2001 - 2003. - Copyright (C) David Abrahams 2002 - 2003. - Copyright (C) Gennaro Prota 2003. - Copyright (C) Eric Friedman 2003. - Copyright (C) Aleksey Gurtovoy 2002. - Copyright Toon Knapen 2001 - 2003. - (C) Copyright Lie-Quan Lee 2001. - (C) Copyright Markus Schöpflin 2002 - 2003. - Copyright (C) Christof Meerwald 2003 - Copyright (C) Dan Watkins 2003 - Copyright (C) Douglas Gregor 2002. - Copyright (C) Synge Todo 2003. - (C) Copyright Boris Gubenko 2006. - (C) Copyright Douglas Gregor 2001. - (C) Copyright Guillaume Melquiond 2002 - 2003. - (C) Copyright Martin Wille 2003. - (C) Copyright Stefan Slapeta 2004. - (C) Copyright Rene Rivera 2005. - (C) Copyright Jim Douglas 2005. - Copyright (c) 2003 Daniel Frey - Copyright (c) 2003 Howard Hinnant - -License: - -Redistribution and use in source and binary forms, with or without -modification, are permitted under the terms of the BSD License. - -THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. - -On Debian systems, the complete text of the BSD License can be -found in `/usr/share/common-licenses/BSD'. - -The Debian packaging is: - -Copyright (C) 2009 Francesco Paolo Lovergine fran...@debian.org - -and is licensed under GPL-3. -On Debian systems, the complete text of the GPL License can be -found in `/usr/share/common-licenses/GPL-3'. - - -This package includes a series of third-parties libraries, here summarized: - -* A copy of Boost version 1.34.1 -* A copy of Zlib 1.2.3 -* A copy of Uriparser 0.7.1 -* A copy of Googletest (snapshot r108) - -All them are distributed under the same BSD license. Whenever possible -the corresponding system library has been preferred to the embedded -copies. - -Extracts of third parties licenses: - - -*** Zlib 1.2.3: - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising
[SCM] libkml branch, master, updated. upstream/1.3.0_r863-45-g4a2fc89
The following commit has been merged in the master branch: commit 688d4264bda55530cb4332f3a89c057db021ba01 Author: Bas Couwenberg sebas...@xs4all.nl Date: Tue Oct 8 22:00:08 2013 +0200 No symbols control file, using shlibs for C++ library. diff --git a/debian/libkml-java.lintian-overrides b/debian/libkml-java.lintian-overrides new file mode 100644 index 000..259bfca --- /dev/null +++ b/debian/libkml-java.lintian-overrides @@ -0,0 +1,2 @@ +# Using shlibs for C++ library +libkml-java: no-symbols-control-file diff --git a/debian/libkml0.lintian-overrides b/debian/libkml0.lintian-overrides index a144e2e..d9e159e 100644 --- a/debian/libkml0.lintian-overrides +++ b/debian/libkml0.lintian-overrides @@ -1,3 +1,6 @@ +# Using shlibs for C++ library +libkml0: no-symbols-control-file + # -D_FORTIFY_SOURCE=2 is used during build, but hardening-check reports: # Fortify Source functions: no, only unprotected functions found! # unprotected: memcpy -- 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
[SCM] libkml branch, master, updated. upstream/1.3.0_r863-45-g4a2fc89
The following commit has been merged in the master branch: commit 652be7dc626db86c19d3511cd188d91158d68808 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Oct 6 19:24:21 2013 +0200 Add lintian override for source-contains-prebuilt-windows-binary. diff --git a/debian/changelog b/debian/changelog index ef2fd3d..b3e05f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ libkml (1.3.0~r864-1) UNRELEASED; urgency=low * Drop needless dependency on default-jre for libkml-java. * Move .so symlinks from java packages to libkml-dev. * Update copyright file using copyright-format 1.0. + * Add lintian override for source-contains-prebuilt-windows-binary. -- Bas Couwenberg sebas...@xs4all.nl Sat, 05 Oct 2013 21:15:09 +0200 diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides new file mode 100644 index 000..646dafd --- /dev/null +++ b/debian/source.lintian-overrides @@ -0,0 +1,5 @@ +# Upstream provides no tarballs without windows DLLs +libkml source: source-contains-prebuilt-windows-binary third_party/expat.win32/libexpat.dll +libkml source: source-contains-prebuilt-windows-binary third_party/expat.win32/libexpatw.dll +libkml source: source-contains-prebuilt-windows-binary third_party/zlib-1.2.3.win32/bin/minizip.dll +libkml source: source-contains-prebuilt-windows-binary third_party/zlib-1.2.3.win32/bin/zlib1.dll -- 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
[SCM] libkml branch, master, updated. upstream/1.3.0_r863-45-g4a2fc89
The following commit has been merged in the master branch: commit 61a84400566cc419ee3b34f14bc016479bcc0443 Author: Bas Couwenberg sebas...@xs4all.nl Date: Mon Oct 7 01:18:43 2013 +0200 Add patch to fix linking libtool libraries using a non-POSIX archiver. diff --git a/debian/changelog b/debian/changelog index 9eb00b2..49ac692 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,7 @@ libkml (1.3.0~r864-1) UNRELEASED; urgency=low * Use minimal dh rules, handle Multi-Arch paths. * Use dh-autoreconf for retooling. * Add patch to set subdir-objects automake option for forward compatibility. + * Add patch to fix linking libtool libraries using a non-POSIX archiver. -- Bas Couwenberg sebas...@xs4all.nl Sat, 05 Oct 2013 21:15:09 +0200 diff --git a/debian/patches/libtool-archiver.diff b/debian/patches/libtool-archiver.diff new file mode 100644 index 000..9847b2b --- /dev/null +++ b/debian/patches/libtool-archiver.diff @@ -0,0 +1,10 @@ +--- a/configure.ac b/configure.ac +@@ -7,6 +7,7 @@ AC_INIT(libkml, 1.3.0, http://code.googl + AC_CONFIG_SRCDIR(README) + AC_CONFIG_AUX_DIR(config) + AM_INIT_AUTOMAKE(-Wall -Werror) ++m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) + + AC_PROG_CPP + AC_PROG_CXX diff --git a/debian/patches/series b/debian/patches/series index f29ddde..5a24cd9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,3 +9,4 @@ swig.diff fix-ftbfs-gcc4.7.diff java-run-sh-shebang.diff automake-subdir-objects.diff +libtool-archiver.diff -- 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
[SCM] libkml tag, upstream/1.3.0_r864, created. upstream/1.3.0_r863-1-g9f6caae
The tag, upstream/1.3.0_r864 has been created at 9f6caaea01c8f781cffb7771b86164dcdd2d8d01 (commit) - Shortlog commit 9f6caaea01c8f781cffb7771b86164dcdd2d8d01 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Oct 6 03:46:11 2013 +0200 Merge upstream commit r864: Allow colors to have leading whitespace, with or without '#'. --- -- 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
[SCM] libkml branch, master, updated. upstream/1.3.0_r863-45-g4a2fc89
The following commit has been merged in the master branch: commit 61b50f86b6d3cbdc18c68a670eb4fdc67a3f65fa Author: Bas Couwenberg sebas...@xs4all.nl Date: Mon Oct 7 19:45:20 2013 +0200 Add lintian override for incompatible-java-bytecode-format. diff --git a/debian/changelog b/debian/changelog index 8591217..4693dd4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,7 @@ libkml (1.3.0~r864-1) UNRELEASED; urgency=low * Add patch to set subdir-objects automake option for forward compatibility. * Add patch to fix linking libtool libraries using a non-POSIX archiver. * Add patch to not build examples, msvc and xcode subprojects. + * Add lintian override for incompatible-java-bytecode-format. -- Bas Couwenberg sebas...@xs4all.nl Sat, 05 Oct 2013 21:15:09 +0200 diff --git a/debian/libkml-java.lintian-overrides b/debian/libkml-java.lintian-overrides index 7376f01..863e0ed 100644 --- a/debian/libkml-java.lintian-overrides +++ b/debian/libkml-java.lintian-overrides @@ -3,3 +3,6 @@ libkml-java: package-name-doesnt-match-sonames libkmlbase-swig-java0 libkmldom-s # Using shlibs for C++ library libkml-java: no-symbols-control-file + +# swig only generates bindings for the default JRE +libkml-java: incompatible-java-bytecode-format Java7 version (Class format: 51) -- 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
[SCM] libkml branch, master, updated. upstream/1.3.0_r863-45-g4a2fc89
The following commit has been merged in the master branch: commit 14675b2df28367d41b0eb0cc5907cf330adcf85a Author: Bas Couwenberg sebas...@xs4all.nl Date: Tue Oct 8 17:25:36 2013 +0200 Bump Standards-Version to 3.9.4. diff --git a/debian/changelog b/debian/changelog index 44b8046..c681082 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,8 @@ libkml (1.3.0~r864-1) UNRELEASED; urgency=low * Add patch to not build examples, msvc and xcode subprojects. * Add lintian override for incompatible-java-bytecode-format. * Add patch headers for all patches. + * Bump Standards-Version to 3.9.4, changes: Vcs-* fields, copyright, +minimal dh rules. -- Bas Couwenberg sebas...@xs4all.nl Sat, 05 Oct 2013 21:15:09 +0200 diff --git a/debian/control b/debian/control index 5e9edd6..87842b0 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: debhelper (= 9), libcurl4-openssl-dev, swig, dh-autoreconf -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/libkml.git Vcs-Git: git://anonscm.debian.org/pkg-grass/libkml.git Homepage: http://code.google.com/p/libkml/ -- 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
[SCM] libkml branch, master, updated. upstream/1.3.0_r863-45-g4a2fc89
The following commit has been merged in the master branch: commit d9f79fd68c43641d2b48f10b023c7389afbf8acd Author: Bas Couwenberg sebas...@xs4all.nl Date: Tue Oct 8 23:02:17 2013 +0200 Build depend on libcurl4-gnutls-dev instead of libcurl4-openssl-dev. diff --git a/debian/changelog b/debian/changelog index c681082..527387a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,7 @@ libkml (1.3.0~r864-1) UNRELEASED; urgency=low * Add patch headers for all patches. * Bump Standards-Version to 3.9.4, changes: Vcs-* fields, copyright, minimal dh rules. + * Build depend on libcurl4-gnutls-dev instead of libcurl4-openssl-dev. -- Bas Couwenberg sebas...@xs4all.nl Sat, 05 Oct 2013 21:15:09 +0200 diff --git a/debian/control b/debian/control index 87842b0..e7b358f 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: debhelper (= 9), python-all-dev (= 2.6.6-3~), liburiparser-dev (= 0.7.1), chrpath, - libcurl4-openssl-dev, + libcurl4-gnutls-dev, swig, dh-autoreconf Standards-Version: 3.9.4 -- 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
[SCM] libkml tag, debian/1.3.0_r863-4, created. upstream/1.3.0_r863-14-gddce51b
The tag, debian/1.3.0_r863-4 has been created at ddce51bd4aea0e6bda15ebc44cb6d185239e2477 (commit) - Shortlog commit ddce51bd4aea0e6bda15ebc44cb6d185239e2477 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Oct 5 21:09:17 2013 +0200 Import changes from 1.3.0~r863-4. --- -- 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
Bug#725831: RFS: libkml/1.3.0~r864-1
Package: sponsorship-requests Severity: normal Dear mentors, I am looking for a sponsor for my package libkml Package name: libkml Version : 1.3.0~r864-1 Upstream Author : Google Inc. opensou...@google.com URL : https://code.google.com/p/libkml/ License : BSD-3-Clause Section : science It builds those binary packages: libkml-dev - Library to manipulate KML 2.2 OGC standard files - development fi libkml-java - Library to manipulate KML 2.2 OGC standard files - Java package libkml0- Library to manipulate KML 2.2 OGC standard files python-kml - Library to manipulate KML 2.2 OGC standard files - Python extensi To access further information about this package, please visit the following URL: http://mentors.debian.net/package/libkml Alternatively, one can download the package with dget using this command: dget -x http://mentors.debian.net/debian/pool/main/libk/libkml/libkml_1.3.0~r864-1.dsc More information about libkml can be obtained from https://code.google.com/p/libkml/. Changes since the last upload: * Merge upstream commit r864: Allow colors to have leading whitespace, with or without '#'. * Add myself to Uploaders. * Update swig.diff to also disable the SWIG version check in configure.ac. Thanks Ilya Barygin for the patch. * Update ld-as-needed.diff to fix FTBFS with --as-needed. Thanks Ilya Barygin for the patch. (closes: #692055) * Add hurd.diff to fix FTBFS on hurd-i386. Thanks Pino Toscano for the patch. (closes: #671894) * Refresh patches. * Use canonical URLs for Vcs-* fields. * Don't start short description with an article. * Drop XB-Python-Version from control file. * Add a watch file. * Add patch to fix executable-not-elf-or-script for java run.sh example. * Add lintian override for no fortify functions false positive. * Drop needless dependency on default-jre for libkml-java. * Move .so symlinks from java packages to libkml-dev. * Update copyright file using copyright-format 1.0. * Add lintian override for source-contains-prebuilt-windows-binary. * Use minimal dh rules, handle Multi-Arch paths. * Use dh-autoreconf for retooling. * Add patch to set subdir-objects automake option for forward compatibility. * Add patch to fix linking libtool libraries using a non-POSIX archiver. * Add patch to not build examples, msvc and xcode subprojects. * Add lintian override for incompatible-java-bytecode-format. * Add patch headers for all patches. * Bump Standards-Version to 3.9.4, changes: Vcs-* fields, copyright, minimal dh rules. * Build depend on libcurl4-gnutls-dev instead of libcurl4-openssl-dev. Regards, Sebastiaan Couwenberg ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Processed: libkml: FTBFS with ld --as-needed
Processing control commands: fixed -1 1.3.0~r864-1 Bug #692055 [libkml] libkml: FTBFS with ld --as-needed There is no source info for the package 'libkml' at version '1.3.0~r864-1' with architecture '' Unable to make a source version for version '1.3.0~r864-1' Marked as fixed in versions 1.3.0~r864-1. tags -1 pending Bug #692055 [libkml] libkml: FTBFS with ld --as-needed Added tag(s) pending. -- 692055: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=692055 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#671894: libkml: FTBFS on hurd-i386
Control: fixed -1 1.3.0~r864-1 Control: tags -1 pending Hi Pino, Thanks for the patch! I've included it in the new libkml package. The package has been uploaded to mentors, and is awaiting sponsorship (#725831). Kind Regards, Bas ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#692055: libkml: FTBFS with ld --as-needed
Control: fixed -1 1.3.0~r864-1 Control: tags -1 pending Hi Ilya, Thanks for the patches! I've included them in the new libkml package. The package has been uploaded to mentors, and is awaiting sponsorship (#725831). Kind Regards, Bas ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] osgearth branch, master, updated. debian/2.4-5-7-g2c48f7d
The following commit has been merged in the master branch: commit 492423dbf0d24c533b72b8f26e2c767a4fe4e830 Author: Bas Couwenberg sebas...@xs4all.nl Date: Wed Oct 9 01:42:31 2013 +0200 Add header for thread ID patch. diff --git a/debian/patches/kfreebsd-getCurrentThreadId.patch b/debian/patches/fallback-getCurrentThreadId.patch similarity index 61% rename from debian/patches/kfreebsd-getCurrentThreadId.patch rename to debian/patches/fallback-getCurrentThreadId.patch index 00e559c..711d05e 100644 --- a/debian/patches/kfreebsd-getCurrentThreadId.patch +++ b/debian/patches/fallback-getCurrentThreadId.patch @@ -1,7 +1,9 @@ -Index: osgearth-2.4.0+dfsg/src/osgEarth/ThreadingUtils.cpp -=== osgearth-2.4.0+dfsg.orig/src/osgEarth/ThreadingUtils.cpp 2013-04-11 19:07:39.0 +0100 -+++ osgearth-2.4.0+dfsg/src/osgEarth/ThreadingUtils.cpp2013-10-04 22:04:38.898332000 +0100 +Description: Fallback to pthread_self() for thread ID on non-Linux kernels. +Author: Steven Chamberlain ste...@pyro.eu.org +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=725383 +Last-Update: 2013-10-04 +--- a/src/osgEarth/ThreadingUtils.cpp b/src/osgEarth/ThreadingUtils.cpp @@ -20,9 +20,11 @@ #ifdef _WIN32 @@ -15,7 +17,7 @@ Index: osgearth-2.4.0+dfsg/src/osgEarth/ThreadingUtils.cpp #endif using namespace osgEarth::Threading; -@@ -38,7 +40,10 @@ +@@ -38,7 +40,10 @@ unsigned osgEarth::Threading::getCurrent return (unsigned)::GetCurrentThreadId(); #elif __APPLE__ return ::syscall(SYS_thread_selfid); diff --git a/debian/patches/series b/debian/patches/series index 5fb7e42..213f5c1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ soversion.patch MPGeometry-OpenSceneGraph-3.1.8.patch becuase-typo.patch -kfreebsd-getCurrentThreadId.patch +fallback-getCurrentThreadId.patch -- osgEarth terrain rendering toolkit ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] osgearth branch, jessie, updated. debian/2.4-5-7-g2c48f7d
The following commit has been merged in the jessie branch: commit 2c48f7d78bb7a5ad52b6f0190b2715c42ef4748c Author: Bas Couwenberg sebas...@xs4all.nl Date: Wed Oct 9 01:36:40 2013 +0200 Add patch to use thr_self syscall on kFreeBSD. diff --git a/debian/changelog b/debian/changelog index 44e18f4..bfe70a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ osgearth (2.4.0+dfsg-6) unstable; urgency=low * Add patch to fix FTBFS on kfreebsd-*, use pthread_self instead of gettid. Thanks Steven Chamberlain for the patch. (closes: #725383) + * Add patch to use thr_self syscall on kFreeBSD. +Thanks Petr Salinger, Robert Millan and Ed Maste for the advice. -- Bas Couwenberg sebas...@xs4all.nl Tue, 24 Sep 2013 16:59:37 +0200 diff --git a/debian/patches/kfreebsd-getCurrentThreadId.patch b/debian/patches/kfreebsd-getCurrentThreadId.patch new file mode 100644 index 000..c4eacab --- /dev/null +++ b/debian/patches/kfreebsd-getCurrentThreadId.patch @@ -0,0 +1,25 @@ +Description: Use thr_self syscall on kFreeBSD. +Author: Bas Couwenberg sebas...@xs4all.nl +Last-Update: 2013-10-09 +--- a/src/osgEarth/ThreadingUtils.cpp b/src/osgEarth/ThreadingUtils.cpp +@@ -20,7 +20,7 @@ + + #ifdef _WIN32 + extern C unsigned long __stdcall GetCurrentThreadId(); +-#elif defined(__APPLE__) || defined(__LINUX__) ++#elif defined(__APPLE__) || defined(__LINUX__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + # include unistd.h + # include sys/syscall.h + #else +@@ -42,6 +42,10 @@ unsigned osgEarth::Threading::getCurrent + return ::syscall(SYS_thread_selfid); + #elif __LINUX__ + return (unsigned)::syscall(SYS_gettid); ++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ++ long tid; ++ syscall(SYS_thr_self, tid); ++ return (unsigned)tid; + #else + /* :XXX: this truncates to 32 bits, but better than nothing */ + return (unsigned)pthread_self(); diff --git a/debian/patches/series b/debian/patches/series index 213f5c1..2779e52 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ soversion.patch MPGeometry-OpenSceneGraph-3.1.8.patch becuase-typo.patch fallback-getCurrentThreadId.patch +kfreebsd-getCurrentThreadId.patch -- osgEarth terrain rendering toolkit ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] osgearth branch, jessie, updated. debian/2.4-5-7-g2c48f7d
The following commit has been merged in the jessie branch: commit 492423dbf0d24c533b72b8f26e2c767a4fe4e830 Author: Bas Couwenberg sebas...@xs4all.nl Date: Wed Oct 9 01:42:31 2013 +0200 Add header for thread ID patch. diff --git a/debian/patches/kfreebsd-getCurrentThreadId.patch b/debian/patches/fallback-getCurrentThreadId.patch similarity index 61% rename from debian/patches/kfreebsd-getCurrentThreadId.patch rename to debian/patches/fallback-getCurrentThreadId.patch index 00e559c..711d05e 100644 --- a/debian/patches/kfreebsd-getCurrentThreadId.patch +++ b/debian/patches/fallback-getCurrentThreadId.patch @@ -1,7 +1,9 @@ -Index: osgearth-2.4.0+dfsg/src/osgEarth/ThreadingUtils.cpp -=== osgearth-2.4.0+dfsg.orig/src/osgEarth/ThreadingUtils.cpp 2013-04-11 19:07:39.0 +0100 -+++ osgearth-2.4.0+dfsg/src/osgEarth/ThreadingUtils.cpp2013-10-04 22:04:38.898332000 +0100 +Description: Fallback to pthread_self() for thread ID on non-Linux kernels. +Author: Steven Chamberlain ste...@pyro.eu.org +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=725383 +Last-Update: 2013-10-04 +--- a/src/osgEarth/ThreadingUtils.cpp b/src/osgEarth/ThreadingUtils.cpp @@ -20,9 +20,11 @@ #ifdef _WIN32 @@ -15,7 +17,7 @@ Index: osgearth-2.4.0+dfsg/src/osgEarth/ThreadingUtils.cpp #endif using namespace osgEarth::Threading; -@@ -38,7 +40,10 @@ +@@ -38,7 +40,10 @@ unsigned osgEarth::Threading::getCurrent return (unsigned)::GetCurrentThreadId(); #elif __APPLE__ return ::syscall(SYS_thread_selfid); diff --git a/debian/patches/series b/debian/patches/series index 5fb7e42..213f5c1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ soversion.patch MPGeometry-OpenSceneGraph-3.1.8.patch becuase-typo.patch -kfreebsd-getCurrentThreadId.patch +fallback-getCurrentThreadId.patch -- osgEarth terrain rendering toolkit ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] libkml branch, master, updated. upstream/1.3.0_r863-46-g977fc73
The following commit has been merged in the master branch: commit 977fc73c45d270c273f875ebadcff3a1b1b86162 Author: Bas Couwenberg sebas...@xs4all.nl Date: Wed Oct 9 02:33:50 2013 +0200 Also install libminizip headers. diff --git a/debian/changelog b/debian/changelog index 6e0e2a9..5223c29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,7 @@ libkml (1.3.0~r864-1) unstable; urgency=low * Bump Standards-Version to 3.9.4, changes: Vcs-* fields, copyright, minimal dh rules. * Build depend on libcurl4-gnutls-dev instead of libcurl4-openssl-dev. + * Also install libminizip headers. -- Bas Couwenberg sebas...@xs4all.nl Sat, 05 Oct 2013 21:15:09 +0200 diff --git a/debian/rules b/debian/rules index 94242dc..a295754 100755 --- a/debian/rules +++ b/debian/rules @@ -30,6 +30,10 @@ override_dh_auto_install: # Move libraries from libkml subdirectory mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libkml/* $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/ + # libminizip headers + install -m755 -d $(CURDIR)/debian/tmp/usr/include/minizip + install -m644 $(CURDIR)/third_party/zlib-*/contrib/minizip/*h $(CURDIR)/debian/tmp/usr/include/minizip/ + override_dh_install: dh_install --autodest --list-missing -- 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
[SCM] mapcache branch, jessie, updated. upstream/1.2.0-97-gec88fd6
The following commit has been merged in the jessie branch: commit ec88fd63a514052451498a57fce3382127834b78 Author: Bas Couwenberg sebas...@xs4all.nl Date: Wed Oct 9 04:42:48 2013 +0200 SONAME patch applied upstream. diff --git a/debian/patches/soname.patch b/debian/patches/soname.patch index d53328a..f594f89 100644 --- a/debian/patches/soname.patch +++ b/debian/patches/soname.patch @@ -1,6 +1,7 @@ Description: Use versioned SONAME for libmapcache. Author: Bas Couwenberg sebas...@xs4all.nl Bug: https://github.com/mapserver/mapcache/pull/84 +Applied-Upstream: 1.2.1, https://github.com/mapserver/mapcache/commit/6b7c8d067a83075021b2f183ba683895d7659046 Last-Update: 2013-09-18 --- a/CMakeLists.txt +++ b/CMakeLists.txt -- Packaging for MapCache ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapcache branch, master, updated. upstream/1.2.0-97-gec88fd6
The following commit has been merged in the master branch: commit ec88fd63a514052451498a57fce3382127834b78 Author: Bas Couwenberg sebas...@xs4all.nl Date: Wed Oct 9 04:42:48 2013 +0200 SONAME patch applied upstream. diff --git a/debian/patches/soname.patch b/debian/patches/soname.patch index d53328a..f594f89 100644 --- a/debian/patches/soname.patch +++ b/debian/patches/soname.patch @@ -1,6 +1,7 @@ Description: Use versioned SONAME for libmapcache. Author: Bas Couwenberg sebas...@xs4all.nl Bug: https://github.com/mapserver/mapcache/pull/84 +Applied-Upstream: 1.2.1, https://github.com/mapserver/mapcache/commit/6b7c8d067a83075021b2f183ba683895d7659046 Last-Update: 2013-09-18 --- a/CMakeLists.txt +++ b/CMakeLists.txt -- Packaging for MapCache ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] osgearth branch, master, updated. debian/2.4-5-8-gc9136c4
The following commit has been merged in the master branch:
commit c9136c449cb627cfebfb46dadd538da5eac1700c
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Wed Oct 9 03:11:06 2013 +0200
Add patch to support libminizip as installed by the libkml package.
diff --git a/debian/changelog b/debian/changelog
index bfe70a8..0536781 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ osgearth (2.4.0+dfsg-6) unstable; urgency=low
(closes: #725383)
* Add patch to use thr_self syscall on kFreeBSD.
Thanks Petr Salinger, Robert Millan and Ed Maste for the advice.
+ * Add patch to support libminizip as installed by the libkml package, but
+don't include KMZ support yet.
-- Bas Couwenberg sebas...@xs4all.nl Tue, 24 Sep 2013 16:59:37 +0200
diff --git a/debian/control b/debian/control
index 933e037..31c8314 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,8 @@ Build-Depends: debhelper (= 9),
libgeos-dev,
libexpat1-dev,
libcurl4-gnutls-dev,
- libzip-dev,
+ zlib1g-dev,
+ libkml-dev (= 1.3.0~r864-1),
libsqlite3-dev,
libqt4-dev,
libqt4-opengl-dev,
diff --git a/debian/patches/cmake-FindMiniZip.patch
b/debian/patches/cmake-FindMiniZip.patch
new file mode 100644
index 000..a195fc2
--- /dev/null
+++ b/debian/patches/cmake-FindMiniZip.patch
@@ -0,0 +1,146 @@
+Description: Support libminizip path as used by the libkml-dev package.
+Author: Bas Couwenberg sebas...@xs4all.nl
+Last-Update: 2013-10-09
+--- a/CMakeModules/FindMiniZip.cmake
b/CMakeModules/FindMiniZip.cmake
+@@ -15,6 +15,7 @@ FIND_PATH(MINIZIP_INCLUDE_DIR zip.h
+ ~/Library/Frameworks
+ /Library/Frameworks
+ /usr/local/include
++/usr/include/minizip
+ /usr/include
+ /sw/include # Fink
+ /opt/local/include # DarwinPorts
+@@ -36,6 +37,7 @@ FIND_LIBRARY(MINIZIP_LIBRARY
+ ~/Library/Frameworks
+ /Library/Frameworks
+ /usr/local/lib
++/usr/lib/${DEB_HOST_MULTIARCH}
+ /usr/lib
+ /sw/lib
+ /opt/local/lib
+@@ -51,4 +53,7 @@ IF(MINIZIP_LIBRARY AND MINIZIP_INCLUDE_D
+ ADD_DEFINITIONS(-DOSGEARTH_HAVE_MINIZIP)
+ ENDIF(MINIZIP_LIBRARY AND MINIZIP_INCLUDE_DIR)
+
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(MiniZip DEFAULT_MSG MINIZIP_LIBRARY
MINIZIP_INCLUDE_DIR)
++MARK_AS_ADVANCED(MINIZIP_LIBRARY MINIZIP_INCLUDE_DIR)
+
+--- a/src/osgEarthDrivers/kml/KMZArchive
b/src/osgEarthDrivers/kml/KMZArchive
+@@ -27,7 +27,7 @@
+
+ #include osgDB/Archive
+ #include osgEarth/URI
+-#include unzip.h // minizip
++#include minizip/unzip.h // minizip
+
+ using namespace osgEarth;
+
+--- a/src/osgEarthDrivers/kml/KMZArchive.cpp
b/src/osgEarthDrivers/kml/KMZArchive.cpp
+@@ -83,7 +83,7 @@ _bufsize( 1024000 )
+ localURI = downloadToCache( archiveURI );
+ }
+
+-_uf = unzOpen( localURI.full().c_str() );
++_uf = libkml_unzOpen( localURI.full().c_str() );
+ _buf = (void*)new char[_bufsize];
+ }
+
+@@ -169,9 +169,9 @@ KMZArchive::readToBuffer( const std::str
+ {
+ // special case; first try the master file (doc.kml), then failing
that, look
+ // for the first KML file in the archive.
+-if ( unzLocateFile( _uf, doc.kml, 0 ) != 0 )
++if ( libkml_unzLocateFile( _uf, doc.kml, 0 ) != 0 )
+ {
+-if ( unzGoToFirstFile( _uf ) != UNZ_OK )
++if ( libkml_unzGoToFirstFile( _uf ) != UNZ_OK )
+ {
+ OE_WARN LC Archive is empty std::endl;
+ return false;
+@@ -179,7 +179,7 @@ KMZArchive::readToBuffer( const std::str
+
+ while( err == UNZ_OK )
+ {
+-if ( unzGetCurrentFileInfo( _uf, file_info, filename_inzip,
sizeof(filename_inzip), 0L, 0, 0L, 0) )
++if ( libkml_unzGetCurrentFileInfo( _uf, file_info,
filename_inzip, sizeof(filename_inzip), 0L, 0, 0L, 0) )
+ {
+ OE_WARN LC Error with zipfile
_archiveURI.base() std::endl;
+ return false;
+@@ -192,7 +192,7 @@ KMZArchive::readToBuffer( const std::str
+ break;
+ }
+
+-err = unzGoToNextFile( _uf );
++err = libkml_unzGoToNextFile( _uf );
+ }
+
+ if ( err != UNZ_OK )
+@@ -203,7 +203,7 @@ KMZArchive::readToBuffer( const std::str
+ }
+ }
+
+-else if ( unzLocateFile( _uf, fileInZip.c_str(), 0 ) )
++else if ( libkml_unzLocateFile( _uf, fileInZip.c_str(), 0 ) )
+ {
+ OE_WARN LC Failed to locate ' fileInZip ' in '
_archiveURI.base() ' std::endl;
+ return false;
+@@ -211,26 +211,26 @@ KMZArchive::readToBuffer( const std::str
+
+ if ( !got_file_info )
+ {
+-if ( unzGetCurrentFileInfo( _uf, file_info, filename_inzip,
sizeof(filename_inzip), 0L, 0, 0L, 0) )
++if (
Bug#725383: FTBFS on kfreebsd-*: SYS_gettid is Linux-specific
Control: fixed -1 2.4.0+dfsg-6 Control: tags -1 pending Thanks for the advice. I've included both Stevens pthread patch, and an adaptation of my thr_self patch incorporating the feedback. Updated packaging is available in the Debian GIS git. Building an updated package is complicated by the fact that osgearth fails to build with pbuilder at the moment due to the libav9 transition [1] which caused libopenscenegraph99 to become uninstallable (#722674, #720816). http://release.debian.org/transitions/html/libav9.html Kind Regards, Bas -- GnuPG: 0xE88D4AF1 (new) / 0x77A975AD (old) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Processed: FTBFS on kfreebsd-*: SYS_gettid is Linux-specific
Processing control commands: fixed -1 2.4.0+dfsg-6 Bug #725383 [src:osgearth] osgearth: FTBFS on kfreebsd-*: SYS_gettid Linux-specific The source 'osgearth' and version '2.4.0+dfsg-6' do not appear to match any binary packages Marked as fixed in versions osgearth/2.4.0+dfsg-6. tags -1 pending Bug #725383 [src:osgearth] osgearth: FTBFS on kfreebsd-*: SYS_gettid Linux-specific Added tag(s) pending. -- 725383: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=725383 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
