[SCM] libcitygml branch, master, updated. debian/0.14+svn128-1+3p0p1+4-25-g5cb2914

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit e4232b24ea1bdf464aa8113a115aa10a4977b82d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jan 24 11:31:07 2014 +0100

    Fix 'information' typo in manpage, add patch to fix the typo in the code.

diff --git a/debian/changelog b/debian/changelog
index a77683f..43f4a62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ libcitygml (0.14+svn128-1+3p0p1+5) UNRELEASED; urgency=low
   * Use copyright-format 1.0 instead of dep5 URL.
   * Fix libopenscenegraph version detection.
     (closes: #719396)
+  * Fix 'information' typo in manpage, add patch to fix the typo in the code.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sun, 19 Jan 2014 19:43:40 +0100
 
diff --git a/debian/citygmltest.1 b/debian/citygmltest.1
index 5f38520..1e013f9 100644
--- a/debian/citygmltest.1
+++ b/debian/citygmltest.1
@@ -9,7 +9,7 @@ Parsing \- Parsing CityGML file
 Options:
 .TP
 \fB\-log\fR
-Print some informations during parsing
+Print some information during parsing
 .TP
 \fB\-filter\fR <mask>
 CityGML objects to parse (default:All)
diff --git a/debian/patches/information-typo.diff b/debian/patches/information-typo.diff
new file mode 100644
index 0000000..1762f29
--- /dev/null
+++ b/debian/patches/information-typo.diff
@@ -0,0 +1,14 @@
+Description: Fix 'informations' typo, replace with 'information'.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Last-Update: 2014-01-24
+--- a/test/citygmltest.cpp
++++ b/test/citygmltest.cpp
+@@ -26,7 +26,7 @@ void usage()
+ {
+ 	std::cout << "Usage: citygmltest [-options...] <filename>" << std::endl;
+ 	std::cout << " Options:" << std::endl;
+-	std::cout << "  -log            Print some informations during parsing" << std::endl;
++	std::cout << "  -log            Print some information during parsing" << std::endl;
+ 	std::cout << "  -filter <mask>  CityGML objects to parse (default:All)" << std::endl
+ 		<< "                  The mask is composed of:" << std::endl
+ 		<< "                   GenericCityObject, Building, Room," << std::endl
diff --git a/debian/patches/series b/debian/patches/series
index 0ff4741..6554924 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 rewrite_cmake.diff
 pkgconfig-support.diff
+information-typo.diff

-- 
Read and write CityGML files