The following commit has been merged in the master branch: commit 03fcae8dfb6c6082003240b4c266b9d8189bab04 Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Wed Jun 8 11:20:13 2011 +0200
Fixed #626259 diff --git a/debian/changelog b/debian/changelog index 68a81b9..66fa3e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libkml (1.3.0~r863-2) unstable; urgency=low + + * New patch geometry_test.diff to remove another failing test. + (closes: #626259) + * Policy bumped to 3.9.2, no changes needed. + + -- Francesco Paolo Lovergine <fran...@debian.org> Wed, 08 Jun 2011 11:19:48 +0200 + libkml (1.3.0~r863-1) unstable; urgency=low * New upstream snapshot for 1.3 series, as taken from svn. diff --git a/debian/control b/debian/control index f858633..265de85 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: cdbs, debhelper (>= 8), autotools-dev, libexpat1-dev, zlib1g-dev, python-dev, python-all-dev, liburiparser-dev (>= 0.7.1), chrpath, libcurl4-openssl-dev, swig, python-central XS-Python-Version: >= 2.5 -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 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 diff --git a/debian/patches/geometry_test.diff b/debian/patches/geometry_test.diff new file mode 100644 index 0000000..8bd9c51 --- /dev/null +++ b/debian/patches/geometry_test.diff @@ -0,0 +1,21 @@ +Index: git/src/kml/dom/geometry_test.cc +=================================================================== +--- git.orig/src/kml/dom/geometry_test.cc 2011-06-08 11:17:31.000000000 +0200 ++++ git/src/kml/dom/geometry_test.cc 2011-06-08 11:17:50.000000000 +0200 +@@ -330,16 +330,6 @@ + int element_count_; + }; + +-// Test serialization of <coordinates/> +-TEST_F(CoordinatesTest, TestSerializeNone) { +- Vec3Vector vec3_vector; +- MockCoordinatesSerializer mock(&vec3_vector); +- // This calls Coordinates::Serialize(). +- mock.SaveElement(coordinates_); +- ASSERT_TRUE(vec3_vector.empty()); +- ASSERT_EQ(0, mock.get_element_count()); +-} +- + // Test serialization of <coordinates>1.1,2.2,3.3</coordinates>. + TEST_F(CoordinatesTest, TestSerializeOne) { + Vec3 vec3(1.1, 2.2, 3.3); diff --git a/debian/patches/series b/debian/patches/series index 9b5e2ed..f0c5fa5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ reautoconfiscated.diff clone.diff ld-as-needed.diff feature_view_test.diff +geometry_test.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