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

2014-01-24 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit e4232b24ea1bdf464aa8113a115aa10a4977b82d
Author: Bas Couwenberg sebas...@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 sebas...@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 000..1762f29
--- /dev/null
+++ b/debian/patches/information-typo.diff
@@ -0,0 +1,14 @@
+Description: Fix 'informations' typo, replace with 'information'.
+Author: Bas Couwenberg sebas...@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-logPrint some informations during parsing 
 std::endl;
++  std::cout-logPrint 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

___
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] libcitygml branch, master, updated. debian/0.14+svn128-1+3p0p1+4-25-g5cb2914

2014-01-24 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit bf4735ee434cac4e8ed35245f197c4cbe363b145
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sun Jan 19 22:51:20 2014 +0100

Fix libopenscenegraph version detection.

diff --git a/debian/changelog b/debian/changelog
index e34e39a..a77683f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ libcitygml (0.14+svn128-1+3p0p1+5) UNRELEASED; urgency=low
   * Add Debian GIS Project to Uploaders.
   * Use canonical URLs for Vcs-* fields.
   * Use copyright-format 1.0 instead of dep5 URL.
+  * Fix libopenscenegraph version detection.
+(closes: #719396)
 
  -- Bas Couwenberg sebas...@xs4all.nl  Sun, 19 Jan 2014 19:43:40 +0100
 
diff --git a/debian/gencontrol b/debian/gencontrol
index e3ed091..6791d0b 100644
--- a/debian/gencontrol
+++ b/debian/gencontrol
@@ -1,9 +1,9 @@
-LIBOSG_SHARE=`dpkg --get-selections|awk '{print $1}'|grep 
libopenscenegraph[0-9]`
-LIBOSG_VERSION=`dpkg -l $LIBOSG_SHARE |grep $LIBOSG_SHARE |sed 's/-/ /' |awk 
'{print $3}'`
-TMP1=`echo $LIBOSG_VERSION|awk -F '.' '{print $1}'`
-TMP2=`echo $LIBOSG_VERSION|awk -F '.' '{print $2}'`
-TMP3=`echo $LIBOSG_VERSION|awk -F '.' '{print $3}'`
+LIBOSG_SHARE=`dpkg --get-selections | grep libopenscenegraph[0-9]*\s*install 
| awk '{print $1}'`
+LIBOSG_VERSION=`dpkg -l $LIBOSG_SHARE | grep ^ii\s*$LIBOSG_SHARE | sed 's/-/ 
/' | awk '{print $3}'`
+TMP1=`echo $LIBOSG_VERSION | awk -F '.' '{print $1}'`
+TMP2=`echo $LIBOSG_VERSION | awk -F '.' '{print $2}'`
+TMP3=`echo $LIBOSG_VERSION | awk -F '.' '{print $3}' | sed 's/~.*$//'`
 TMP3=$((TMP3+1))
-LIBOSG_VERSIONPLUS=$TMP1.$TMP2.$TMP3
+LIBOSG_VERSIONPLUS=$TMP1.$TMP2.$TMP3~
 echo $LIBOSG_VERSION
 dh_gencontrol -- -Vlibosg-share=$LIBOSG_SHARE 
-Vlibosg-static=libopenscenegraph-dev (=$LIBOSG_VERSION), 
libopenscenegraph-dev ( $LIBOSG_VERSIONPLUS)

-- 
Read and write CityGML 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] libcitygml branch, master, updated. debian/0.14+svn128-1+3p0p1+4-25-g5cb2914

2014-01-24 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 52ee93fe2a80a9468f3bff4f200c71595e9b16d6
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Jan 24 19:09:58 2014 +0100

Add patch headers for rewrite_cmake.diff.

diff --git a/debian/patches/rewrite_cmake.diff 
b/debian/patches/rewrite_cmake.diff
index ee96b41..956f6cb 100644
--- a/debian/patches/rewrite_cmake.diff
+++ b/debian/patches/rewrite_cmake.diff
@@ -1,3 +1,6 @@
+Description: Rewrite CMake build system to support pkg-config.
+Author: YunQiang Su wzss...@gmail.com
+
 Index: libcitygml/CMakeLists.txt
 ===
 --- libcitygml.orig/CMakeLists.txt 2012-06-13 03:08:22.0 +0800

-- 
Read and write CityGML 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] libcitygml branch, master, updated. debian/0.14+svn128-1+3p0p1+4-25-g5cb2914

2014-01-24 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 4ebe5af5f37fc08d81dc605d7450a4c796f44474
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sun Jan 19 19:57:45 2014 +0100

Use copyright-format 1.0 instead of dep5 URL.

diff --git a/debian/changelog b/debian/changelog
index 41e435d..e34e39a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libcitygml (0.14+svn128-1+3p0p1+5) UNRELEASED; urgency=low
   * Team upload.
   * Add Debian GIS Project to Uploaders.
   * Use canonical URLs for Vcs-* fields.
+  * Use copyright-format 1.0 instead of dep5 URL.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Sun, 19 Jan 2014 19:43:40 +0100
 
diff --git a/debian/copyright b/debian/copyright
index bd8c784..f73c768 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: libcitygml
 Source: http://code.google.com/p/libcitygml/
 
@@ -40,3 +40,4 @@ License: GPL-2+
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in /usr/share/common-licenses/GPL-2.
+

-- 
Read and write CityGML 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] libcitygml branch, master, updated. debian/0.14+svn128-1+3p0p1+4-25-g5cb2914

2014-01-24 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 4a7766a82b9951e2649332828ca328223c6a4d33
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Jan 24 18:36:16 2014 +0100

Rebuild with openscenegraph 3.2.0~rc1. (closes: #718385)

diff --git a/debian/changelog b/debian/changelog
index 43f4a62..4a17e79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libcitygml (0.14+svn128-1+3p0p1+5) UNRELEASED; urgency=low
+libcitygml (0.14+svn128-1+3p2p0) UNRELEASED; urgency=low
 
   * Team upload.
   * Add Debian GIS Project to Uploaders.
@@ -6,6 +6,8 @@ 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)
+  * Rebuild with openscenegraph 3.2.0~rc1.
+(closes: #718385)
   * Fix 'information' typo in manpage, add patch to fix the typo in the code.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Sun, 19 Jan 2014 19:43:40 +0100

-- 
Read and write CityGML 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] libcitygml branch, master, updated. debian/0.14+svn128-1+3p0p1+4-25-g5cb2914

2014-01-24 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 2c2c9bb9016bfd3ca9c88333f3db97abfe8a834e
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sun Jan 19 23:40:03 2014 +0100

Debug gencontrol.

diff --git a/debian/rules b/debian/rules
index 338b3be..882c468 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ override_dh_auto_clean:
-rm -rf obj-*-*
 
 override_dh_gencontrol:
-   sh debian/gencontrol
+   sh -x debian/gencontrol
 
 override_dh_auto_configure:
dh_auto_configure -- \

-- 
Read and write CityGML 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] libcitygml branch, master, updated. debian/0.14+svn128-1+3p0p1+4-25-g5cb2914

2014-01-24 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 4f725084220822ede771b55b3e98467a534b0780
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sun Jan 19 19:54:42 2014 +0100

Use canonical URLs for Vcs-* fields.

diff --git a/debian/changelog b/debian/changelog
index aa6c537..41e435d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libcitygml (0.14+svn128-1+3p0p1+5) UNRELEASED; urgency=low
 
   * Team upload.
   * Add Debian GIS Project to Uploaders.
+  * Use canonical URLs for Vcs-* fields.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Sun, 19 Jan 2014 19:43:40 +0100
 
diff --git a/debian/control b/debian/control
index e664856..6a0cc4b 100644
--- a/debian/control
+++ b/debian/control
@@ -8,8 +8,8 @@ Build-Depends: debhelper (= 9), cmake (= 2.6.3), libxml2-dev,
 Standards-Version: 3.9.3
 Section: libs
 Homepage: http://code.google.com/p/libcitygml
-Vcs-Git: git://git.debian.org/pkg-grass/libcitygml.git
-Vcs-Browser: http://git.debian.org/?p=pkg-grass/libcitygml.git
+Vcs-Git: git://anonscm.debian.org/pkg-grass/libcitygml.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/libcitygml.git
 
 Package: libcitygml0
 Architecture: any

-- 
Read and write CityGML 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] libcitygml branch, master, updated. debian/0.14+svn128-1+3p0p1+4-25-g5cb2914

2014-01-24 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 21a7cc6b50a96379fbf1032c89fb9c6e38b422b9
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sun Jan 19 19:52:48 2014 +0100

Add Debian GIS Project to Uploaders.

diff --git a/debian/changelog b/debian/changelog
index 9c86f32..aa6c537 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libcitygml (0.14+svn128-1+3p0p1+5) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Add Debian GIS Project to Uploaders.
+
+ -- Bas Couwenberg sebas...@xs4all.nl  Sun, 19 Jan 2014 19:43:40 +0100
+
 libcitygml (0.14+svn128-1+3p0p1+4) unstable; urgency=low
 
   [Sebastian Ramacher]
diff --git a/debian/control b/debian/control
index afa49e8..e664856 100644
--- a/debian/control
+++ b/debian/control
@@ -2,6 +2,7 @@ Source: libcitygml
 Priority: optional
 Maintainer: YunQiang Su wzss...@gmail.com
 DM-Upload-Allowed: yes
+Uploaders: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
 Build-Depends: debhelper (= 9), cmake (= 2.6.3), libxml2-dev, 
libgdal-dev, libopenscenegraph-dev (= 3.0.1-4~)
 Standards-Version: 3.9.3

-- 
Read and write CityGML 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] libcitygml branch, master, updated. debian/0.14+svn128-1+3p0p1+4-25-g5cb2914

2014-01-24 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit a86285b8c9a189f28847121613ae8735ff560c20
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Jan 24 19:10:21 2014 +0100

Refresh patches.

diff --git a/debian/patches/pkgconfig-support.diff 
b/debian/patches/pkgconfig-support.diff
index 1983833..91e3828 100644
--- a/debian/patches/pkgconfig-support.diff
+++ b/debian/patches/pkgconfig-support.diff
@@ -1,10 +1,8 @@
 Description: add pkg-config support for libcitygml
 Author: YunQiang Su wzss...@gmail.com
 Last-Update: 2011-06-13
-Index: libcitygml/src/citygml.pc.cmake
-===
 /dev/null  1970-01-01 00:00:00.0 +
-+++ libcitygml/src/citygml.pc.cmake2011-04-19 04:01:38.0 +0800
+--- /dev/null
 b/src/citygml.pc.cmake
 @@ -0,0 +1,11 @@
 +prefix=${CMAKE_INSTALL_PREFIX}
 +exec_prefix=${BIN_INSTALL_DIR}
diff --git a/debian/patches/rewrite_cmake.diff 
b/debian/patches/rewrite_cmake.diff
index 956f6cb..204054a 100644
--- a/debian/patches/rewrite_cmake.diff
+++ b/debian/patches/rewrite_cmake.diff
@@ -1,10 +1,8 @@
 Description: Rewrite CMake build system to support pkg-config.
 Author: YunQiang Su wzss...@gmail.com
 
-Index: libcitygml/CMakeLists.txt
-===
 libcitygml.orig/CMakeLists.txt 2012-06-13 03:08:22.0 +0800
-+++ libcitygml/CMakeLists.txt  2012-06-13 03:15:56.508756353 +0800
+--- a/CMakeLists.txt
 b/CMakeLists.txt
 @@ -1,143 +1,163 @@
 +project ( libcitygml )
 +cmake_minimum_required(VERSION 2.6.3)

-- 
Read and write CityGML 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] libcitygml branch, master, updated. debian/0.14+svn128-1+3p0p1+4-25-g5cb2914

2014-01-24 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 47b48b15118464ee7b82e09463a8fa0338978058
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Jan 24 19:40:32 2014 +0100

Drop obsolete DM-Upload-Allowed, permissions are granted in dak.

Make Debian GIS Project Maintainer and YunQiang Su Uploader.
Drop obsolete DM-Upload-Allowed, permissions are granted in dak.

diff --git a/debian/changelog b/debian/changelog
index 4a17e79..9ccc976 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 libcitygml (0.14+svn128-1+3p2p0) UNRELEASED; urgency=low
 
   * Team upload.
-  * Add Debian GIS Project to Uploaders.
+  * Make Debian GIS Project Maintainer and YunQiang Su Uploader.
+  * Drop obsolete DM-Upload-Allowed, permissions are granted in dak.
   * Use canonical URLs for Vcs-* fields.
   * Use copyright-format 1.0 instead of dep5 URL.
   * Fix libopenscenegraph version detection.
diff --git a/debian/control b/debian/control
index 6a0cc4b..5412638 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,7 @@
 Source: libcitygml
 Priority: optional
-Maintainer: YunQiang Su wzss...@gmail.com
-DM-Upload-Allowed: yes
-Uploaders: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
+Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
+Uploaders: YunQiang Su wzss...@gmail.com
 Build-Depends: debhelper (= 9), cmake (= 2.6.3), libxml2-dev, 
libgdal-dev, libopenscenegraph-dev (= 3.0.1-4~)
 Standards-Version: 3.9.3

-- 
Read and write CityGML 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] libcitygml branch, master, updated. debian/0.14+svn128-1+3p0p1+4-25-g5cb2914

2014-01-24 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit d1907b244e5ad3cb5f78ac29e07691143ae0c872
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Jan 24 20:50:20 2014 +0100

Update to latest upstream Subversion revision.

diff --git a/debian/changelog b/debian/changelog
index f8d5992..dc59a65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libcitygml (0.14+svn128-1+3p2p0) UNRELEASED; urgency=low
+libcitygml (0.14+svn134-1+3p2p0) UNRELEASED; urgency=low
 
   * Team upload.
   * Make Debian GIS Project Maintainer and YunQiang Su Uploader.
@@ -11,6 +11,7 @@ libcitygml (0.14+svn128-1+3p2p0) UNRELEASED; urgency=low
 (closes: #718385)
   * Fix 'information' typo in manpage, add patch to fix the typo in the code.
   * Update watch file for Subversion revisions.
+  * Update to latest upstream Subversion revision.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Sun, 19 Jan 2014 19:43:40 +0100
 

-- 
Read and write CityGML 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] libcitygml branch, master, updated. debian/0.14+svn128-1+3p0p1+4-25-g5cb2914

2014-01-24 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit a4bca4c955d608047102b44d48dbf0ae1da18fed
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Jan 24 20:30:04 2014 +0100

Update watch file for Subversion revisions.

diff --git a/debian/changelog b/debian/changelog
index 9ccc976..f8d5992 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ libcitygml (0.14+svn128-1+3p2p0) UNRELEASED; urgency=low
   * Rebuild with openscenegraph 3.2.0~rc1.
 (closes: #718385)
   * Fix 'information' typo in manpage, add patch to fix the typo in the code.
+  * Update watch file for Subversion revisions.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Sun, 19 Jan 2014 19:43:40 +0100
 
diff --git a/debian/watch b/debian/watch
index d9c4d7e..63e9879 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,14 @@
 version=3
-http://googlecode.debian.net/p/libcitygml/libcitygml\.([0-9]\.[0-9]\.[0-9])\.zip
+
+# official zipfile 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/libcitygml/downloads/list?can=1 \
+#.*/libcitygml\.(\d[\d\.]+)\.(?:zip|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+$/0.14+svn$/
 \
+https://code.google.com/p/libcitygml/source/list \
+(?:.*/)?detail\?r=(\d+)
+

-- 
Read and write CityGML 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] libcitygml branch, master, updated. debian/0.14+svn128-1+3p0p1+4-25-g5cb2914

2014-01-24 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 80a12ce74a3e7268ef092711c407c42b2ae0fc3c
Merge: a4bca4c955d608047102b44d48dbf0ae1da18fed 
79034d7147a8dcb78e2058a35dc02559e49ad80e
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Jan 24 20:47:45 2014 +0100

Merge tag 'upstream/0.14+svn134'

Upstream version 0.14+svn134


-- 
Read and write CityGML 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] libcitygml branch, master, updated. debian/0.14+svn128-1+3p0p1+4-25-g5cb2914

2014-01-24 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 51d7402f78d691cf7f495b65d06ba7b6155d39b9
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Jan 24 22:47:18 2014 +0100

Add symbols file for version 0.1.3+r114-1.

diff --git a/debian/libcitygml0.symbols b/debian/libcitygml0.symbols
new file mode 100644
index 000..c652598
--- /dev/null
+++ b/debian/libcitygml0.symbols
@@ -0,0 +1,381 @@
+# SymbolsHelper-Confirmed: 0.1.3 amd64 armel i386 ia64 kfreebsd-amd64 
kfreebsd-i386 mips mipsel powerpc s390 sh4 sparc sparc64
+libcitygml.so.0 libcitygml0 #MINVER#
+ _Z10fatalErrorPvPKcz@Base 0.1.3
+ 
(optional=templinst)_Z10parseValueI5TVec3IdEEvRSt18basic_stringstreamIcSt11char_traitsIcESaIcEERT_P12GeoTransform@Base
 0.1.3
+ (optional=templinst|arch=!ia64 !sh4 !sparc 
!sparc64)_Z12parseVecListI5TVec2IfEEvRSt18basic_stringstreamIcSt11char_traitsIcESaIcEERSt6vectorIT_SaIS9_EE@Base
 0.1.3
+ 
(optional=templinst)_Z12parseVecListI5TVec3IdEEvRSt18basic_stringstreamIcSt11char_traitsIcESaIcEERSt6vectorIT_SaIS9_EEP12GeoTransform@Base
 0.1.3
+ _Z17ci_string_compareRKSsS0_@Base 0.1.3
+ (arch=armel)_Z4trimRKSsS0_@Base 0.1.3
+ (arch=!ia64 !sh4 !sparc !sparc64)_Z8tokenizeRKSsS0_@Base 0.1.3
+ _ZN10Tesselator10addContourERKSt6vectorI5TVec3IdESaIS2_EE@Base 0.1.3
+ _ZN10Tesselator11endCallbackEPv@Base 0.1.3
+ _ZN10Tesselator13beginCallbackEjPv@Base 0.1.3
+ _ZN10Tesselator13errorCallbackEjPv@Base 0.1.3
+ _ZN10Tesselator14vertexCallbackEPvS0_@Base 0.1.3
+ _ZN10Tesselator15combineCallbackEPdPPvPfS2_S1_@Base 0.1.3
+ _ZN10Tesselator4initEjRK5TVec3IdEj@Base 0.1.3
+ _ZN10Tesselator7computeEv@Base 0.1.3
+ _ZN10Tesselator9_instanceE@Base 0.1.3
+ _ZN10TesselatorC1Ev@Base 0.1.3
+ _ZN10TesselatorC2Ev@Base 0.1.3
+ _ZN10TesselatorD1Ev@Base 0.1.3
+ _ZN10TesselatorD2Ev@Base 0.1.3
+ _ZN21CityGMLHandlerLibXml212getAttributeEPvRKSsS2_@Base 0.1.3
+ (arch=ia64 sh4 sparc sparc64)_ZN7citygml10AppearanceC2ERKSsS2_@Base 0.1.3
+ _ZN7citygml10AppearanceD0Ev@Base 0.1.3
+ _ZN7citygml10AppearanceD1Ev@Base 0.1.3
+ _ZN7citygml10AppearanceD2Ev@Base 0.1.3
+ _ZN7citygml10BridgePartD0Ev@Base 0.1.3
+ _ZN7citygml10BridgePartD1Ev@Base 0.1.3
+ (arch=!ia64 !sh4 !sparc !sparc64)_ZN7citygml10BridgePartD2Ev@Base 0.1.3
+ _ZN7citygml10CityObject6finishERNS_17AppearanceManagerEb@Base 0.1.3
+ (arch=ia64 sh4 sparc 
sparc64)_ZN7citygml10CityObjectC2ERKSsNS_15CityObjectsTypeE@Base 0.1.3
+ _ZN7citygml10CityObjectD0Ev@Base 0.1.3
+ _ZN7citygml10CityObjectD1Ev@Base 0.1.3
+ _ZN7citygml10CityObjectD2Ev@Base 0.1.3
+ _ZN7citygml10LinearRing6finishEv@Base 0.1.3
+ _ZN7citygml10LinearRingD0Ev@Base 0.1.3
+ _ZN7citygml10LinearRingD1Ev@Base 0.1.3
+ (arch=!ia64 !sh4 !sparc !sparc64)_ZN7citygml10LinearRingD2Ev@Base 0.1.3
+ _ZN7citygml10PlantCoverD0Ev@Base 0.1.3
+ _ZN7citygml10PlantCoverD1Ev@Base 0.1.3
+ (arch=!ia64 !sh4 !sparc !sparc64)_ZN7citygml10PlantCoverD2Ev@Base 0.1.3
+ _ZN7citygml12BuildingPartD0Ev@Base 0.1.3
+ _ZN7citygml12BuildingPartD1Ev@Base 0.1.3
+ (arch=!ia64 !sh4 !sparc !sparc64)_ZN7citygml12BuildingPartD2Ev@Base 0.1.3
+ (arch=ia64 sh4 sparc sparc64)_ZN7citygml12ParserParamsD1Ev@Base 0.1.3
+ _ZN7citygml13CityFurnitureD0Ev@Base 0.1.3
+ _ZN7citygml13CityFurnitureD1Ev@Base 0.1.3
+ (arch=!ia64 !sh4 !sparc !sparc64)_ZN7citygml13CityFurnitureD2Ev@Base 0.1.3
+ _ZN7citygml14CityGMLHandler10endElementERKSs@Base 0.1.3
+ _ZN7citygml14CityGMLHandler10fatalErrorERKSs@Base 0.1.3
+ _ZN7citygml14CityGMLHandler11endDocumentEv@Base 0.1.3
+ _ZN7citygml14CityGMLHandler11getNodeNameERKSs@Base 0.1.3
+ _ZN7citygml14CityGMLHandler12startElementERKSsPv@Base 0.1.3
+ _ZN7citygml14CityGMLHandler13startDocumentEv@Base 0.1.3
+ _ZN7citygml14CityGMLHandler14pushCityObjectEPNS_10CityObjectE@Base 0.1.3
+ _ZN7citygml14CityGMLHandler16s_knownNamespaceE@Base 0.1.3
+ _ZN7citygml14CityGMLHandler17getGmlIdAttributeEPv@Base 0.1.3
+ _ZN7citygml14CityGMLHandler18createGeoTransformESs@Base 0.1.3
+ _ZN7citygml14CityGMLHandler19getNodeTypeFromNameERKSs@Base 0.1.3
+ _ZN7citygml14CityGMLHandler20s_cityGMLNodeTypeMapE@Base 0.1.3
+ _ZN7citygml14CityGMLHandler9initNodesEv@Base 0.1.3
+ _ZN7citygml14CityGMLHandlerC1ERKNS_12ParserParamsE@Base 0.1.3
+ _ZN7citygml14CityGMLHandlerC2ERKNS_12ParserParamsE@Base 0.1.3
+ _ZN7citygml14CityGMLHandlerD1Ev@Base 0.1.3
+ _ZN7citygml14CityGMLHandlerD2Ev@Base 0.1.3
+ _ZN7citygml17AppearanceManager10assignNodeERKSs@Base 0.1.3
+ _ZN7citygml17AppearanceManager13addAppearanceEPNS_10AppearanceE@Base 0.1.3
+ 
_ZN7citygml17AppearanceManager15assignTexCoordsEPSt6vectorI5TVec2IfESaIS3_EE@Base
 0.1.3
+ _ZN7citygml17AppearanceManagerD1Ev@Base 0.1.3
+ _ZN7citygml17AppearanceManagerD2Ev@Base 0.1.3
+ _ZN7citygml17BuildingFurnitureD0Ev@Base 0.1.3
+ _ZN7citygml17BuildingFurnitureD1Ev@Base 0.1.3
+ (arch=!ia64 !sh4 !sparc !sparc64)_ZN7citygml17BuildingFurnitureD2Ev@Base 0.1.3
+ _ZN7citygml17GenericCityObjectD0Ev@Base 0.1.3
+ _ZN7citygml17GenericCityObjectD1Ev@Base 0.1.3
+ (arch=!ia64 !sh4 !sparc !sparc64)_ZN7citygml17GenericCityObjectD2Ev@Base 0.1.3
+ _ZN7citygml18BridgeInstallationD0Ev@Base 0.1.3
+ 

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

2014-01-24 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 5f903b5db5408b76e26b17039da4f124169ea97f
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Jan 24 22:48:19 2014 +0100

Update symbols file for version 0.1.3+r114-2+3p0p0.

diff --git a/debian/libcitygml0.symbols b/debian/libcitygml0.symbols
index c652598..a73a484 100644
--- a/debian/libcitygml0.symbols
+++ b/debian/libcitygml0.symbols
@@ -1,12 +1,12 @@
-# SymbolsHelper-Confirmed: 0.1.3 amd64 armel i386 ia64 kfreebsd-amd64 
kfreebsd-i386 mips mipsel powerpc s390 sh4 sparc sparc64
+# SymbolsHelper-Confirmed: 0.1.3 alpha amd64 armel i386 ia64 kfreebsd-amd64 
kfreebsd-i386 mips mipsel powerpc s390 s390x sh4 sparc sparc64
 libcitygml.so.0 libcitygml0 #MINVER#
  _Z10fatalErrorPvPKcz@Base 0.1.3
  
(optional=templinst)_Z10parseValueI5TVec3IdEEvRSt18basic_stringstreamIcSt11char_traitsIcESaIcEERT_P12GeoTransform@Base
 0.1.3
- (optional=templinst|arch=!ia64 !sh4 !sparc 
!sparc64)_Z12parseVecListI5TVec2IfEEvRSt18basic_stringstreamIcSt11char_traitsIcESaIcEERSt6vectorIT_SaIS9_EE@Base
 0.1.3
+ 
(optional=templinst)_Z12parseVecListI5TVec2IfEEvRSt18basic_stringstreamIcSt11char_traitsIcESaIcEERSt6vectorIT_SaIS9_EE@Base
 0.1.3
  
(optional=templinst)_Z12parseVecListI5TVec3IdEEvRSt18basic_stringstreamIcSt11char_traitsIcESaIcEERSt6vectorIT_SaIS9_EEP12GeoTransform@Base
 0.1.3
  _Z17ci_string_compareRKSsS0_@Base 0.1.3
  (arch=armel)_Z4trimRKSsS0_@Base 0.1.3
- (arch=!ia64 !sh4 !sparc !sparc64)_Z8tokenizeRKSsS0_@Base 0.1.3
+ _Z8tokenizeRKSsS0_@Base 0.1.3
  _ZN10Tesselator10addContourERKSt6vectorI5TVec3IdESaIS2_EE@Base 0.1.3
  _ZN10Tesselator11endCallbackEPv@Base 0.1.3
  _ZN10Tesselator13beginCallbackEjPv@Base 0.1.3
@@ -21,32 +21,32 @@ libcitygml.so.0 libcitygml0 #MINVER#
  _ZN10TesselatorD1Ev@Base 0.1.3
  _ZN10TesselatorD2Ev@Base 0.1.3
  _ZN21CityGMLHandlerLibXml212getAttributeEPvRKSsS2_@Base 0.1.3
- (arch=ia64 sh4 sparc sparc64)_ZN7citygml10AppearanceC2ERKSsS2_@Base 0.1.3
+ (arch=alpha ia64 sh4 sparc sparc64)_ZN7citygml10AppearanceC2ERKSsS2_@Base 
0.1.3
  _ZN7citygml10AppearanceD0Ev@Base 0.1.3
  _ZN7citygml10AppearanceD1Ev@Base 0.1.3
  _ZN7citygml10AppearanceD2Ev@Base 0.1.3
  _ZN7citygml10BridgePartD0Ev@Base 0.1.3
  _ZN7citygml10BridgePartD1Ev@Base 0.1.3
- (arch=!ia64 !sh4 !sparc !sparc64)_ZN7citygml10BridgePartD2Ev@Base 0.1.3
+ _ZN7citygml10BridgePartD2Ev@Base 0.1.3
  _ZN7citygml10CityObject6finishERNS_17AppearanceManagerEb@Base 0.1.3
- (arch=ia64 sh4 sparc 
sparc64)_ZN7citygml10CityObjectC2ERKSsNS_15CityObjectsTypeE@Base 0.1.3
+ (arch=alpha ia64 sh4 sparc 
sparc64)_ZN7citygml10CityObjectC2ERKSsNS_15CityObjectsTypeE@Base 0.1.3
  _ZN7citygml10CityObjectD0Ev@Base 0.1.3
  _ZN7citygml10CityObjectD1Ev@Base 0.1.3
  _ZN7citygml10CityObjectD2Ev@Base 0.1.3
  _ZN7citygml10LinearRing6finishEv@Base 0.1.3
  _ZN7citygml10LinearRingD0Ev@Base 0.1.3
  _ZN7citygml10LinearRingD1Ev@Base 0.1.3
- (arch=!ia64 !sh4 !sparc !sparc64)_ZN7citygml10LinearRingD2Ev@Base 0.1.3
+ _ZN7citygml10LinearRingD2Ev@Base 0.1.3
  _ZN7citygml10PlantCoverD0Ev@Base 0.1.3
  _ZN7citygml10PlantCoverD1Ev@Base 0.1.3
- (arch=!ia64 !sh4 !sparc !sparc64)_ZN7citygml10PlantCoverD2Ev@Base 0.1.3
+ _ZN7citygml10PlantCoverD2Ev@Base 0.1.3
  _ZN7citygml12BuildingPartD0Ev@Base 0.1.3
  _ZN7citygml12BuildingPartD1Ev@Base 0.1.3
- (arch=!ia64 !sh4 !sparc !sparc64)_ZN7citygml12BuildingPartD2Ev@Base 0.1.3
- (arch=ia64 sh4 sparc sparc64)_ZN7citygml12ParserParamsD1Ev@Base 0.1.3
+ _ZN7citygml12BuildingPartD2Ev@Base 0.1.3
+ (arch=alpha ia64 sh4 sparc sparc64)_ZN7citygml12ParserParamsD1Ev@Base 0.1.3
  _ZN7citygml13CityFurnitureD0Ev@Base 0.1.3
  _ZN7citygml13CityFurnitureD1Ev@Base 0.1.3
- (arch=!ia64 !sh4 !sparc !sparc64)_ZN7citygml13CityFurnitureD2Ev@Base 0.1.3
+ _ZN7citygml13CityFurnitureD2Ev@Base 0.1.3
  _ZN7citygml14CityGMLHandler10endElementERKSs@Base 0.1.3
  _ZN7citygml14CityGMLHandler10fatalErrorERKSs@Base 0.1.3
  _ZN7citygml14CityGMLHandler11endDocumentEv@Base 0.1.3
@@ -71,59 +71,59 @@ libcitygml.so.0 libcitygml0 #MINVER#
  _ZN7citygml17AppearanceManagerD2Ev@Base 0.1.3
  _ZN7citygml17BuildingFurnitureD0Ev@Base 0.1.3
  _ZN7citygml17BuildingFurnitureD1Ev@Base 0.1.3
- (arch=!ia64 !sh4 !sparc !sparc64)_ZN7citygml17BuildingFurnitureD2Ev@Base 0.1.3
+ _ZN7citygml17BuildingFurnitureD2Ev@Base 0.1.3
  _ZN7citygml17GenericCityObjectD0Ev@Base 0.1.3
  _ZN7citygml17GenericCityObjectD1Ev@Base 0.1.3
- (arch=!ia64 !sh4 !sparc !sparc64)_ZN7citygml17GenericCityObjectD2Ev@Base 0.1.3
+ _ZN7citygml17GenericCityObjectD2Ev@Base 0.1.3
  _ZN7citygml18BridgeInstallationD0Ev@Base 0.1.3
  _ZN7citygml18BridgeInstallationD1Ev@Base 0.1.3
- (arch=!ia64 !sh4 !sparc !sparc64)_ZN7citygml18BridgeInstallationD2Ev@Base 
0.1.3
+ _ZN7citygml18BridgeInstallationD2Ev@Base 0.1.3
  _ZN7citygml20BuildingInstallationD0Ev@Base 0.1.3
  _ZN7citygml20BuildingInstallationD1Ev@Base 0.1.3
- (arch=!ia64 !sh4 !sparc !sparc64)_ZN7citygml20BuildingInstallationD2Ev@Base 
0.1.3
+ _ZN7citygml20BuildingInstallationD2Ev@Base 0.1.3
  _ZN7citygml23getCityObjectsClassNameEj@Base 0.1.3
 

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

2014-01-24 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 589780ef5bc2f42bfe8ca1a59c134404465b661d
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Jan 24 23:42:34 2014 +0100

Bump Standards-Version to 3.9.5.

diff --git a/debian/changelog b/debian/changelog
index 1f4d1cc..cd6e42d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ libcitygml (0.14+svn134-1+3p2p0) UNRELEASED; urgency=low
   * Update watch file for Subversion revisions.
   * Update to latest upstream Subversion revision.
   * Add symbols file using pkgkde-symbolshelper.
+  * Bump Standards-Version to 3.9.5, changes: DM-Upload-Allowed, Vcs-* fields,
+copyright format, symbols file.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Sun, 19 Jan 2014 19:43:40 +0100
 
diff --git a/debian/control b/debian/control
index 970634c..b0c5a07 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Maintainer: Debian GIS Project 
pkg-grass-devel@lists.alioth.debian.org
 Uploaders: YunQiang Su wzss...@gmail.com
 Build-Depends: debhelper (= 9), cmake (= 2.6.3), libxml2-dev, 
libgdal-dev, libopenscenegraph-dev (= 3.0.1-4~), pkg-kde-tools
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
 Section: libs
 Homepage: http://code.google.com/p/libcitygml
 Vcs-Git: git://anonscm.debian.org/pkg-grass/libcitygml.git

-- 
Read and write CityGML 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] libcitygml branch, master, updated. debian/0.14+svn128-1+3p0p1+4-25-g5cb2914

2014-01-24 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 1128406d9df036419fdc1355ec544d38865de19b
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Jan 24 23:53:10 2014 +0100

Update symbols for 0.14+svn134-1+3p2p0 on i386.

diff --git a/debian/libcitygml0.symbols b/debian/libcitygml0.symbols
index 6846066..8c48779 100644
--- a/debian/libcitygml0.symbols
+++ b/debian/libcitygml0.symbols
@@ -38,8 +38,8 @@ libcitygml.so.0 libcitygml0 #MINVER#
  _ZN7citygml10BridgePartD1Ev@Base 0.14
  _ZN7citygml10BridgePartD2Ev@Base 0.14
  
_ZN7citygml10CityObject6finishERNS_17AppearanceManagerERKNS_12ParserParamsE@Base
 0.14
- (arch=amd64)_ZN7citygml10CityObjectC1ERKSsNS_15CityObjectsTypeE@Base 0.14
- (arch=amd64)_ZN7citygml10CityObjectC2ERKSsNS_15CityObjectsTypeE@Base 0.14
+ (arch=amd64 i386)_ZN7citygml10CityObjectC1ERKSsNS_15CityObjectsTypeE@Base 0.14
+ (arch=amd64 i386)_ZN7citygml10CityObjectC2ERKSsNS_15CityObjectsTypeE@Base 0.14
  _ZN7citygml10CityObjectD0Ev@Base 0.14
  _ZN7citygml10CityObjectD1Ev@Base 0.14
  _ZN7citygml10CityObjectD2Ev@Base 0.14
@@ -290,9 +290,9 @@ libcitygml.so.0 libcitygml0 #MINVER#
  _ZNK7citygml14CityGMLHandler11getFullPathEv@Base 0.14
  _ZNK7citygml14ClosureSurface15getDefaultColorEv@Base 0.14
  
_ZNK7citygml17AppearanceManager12getTexCoordsERKSsRSt6vectorI5TVec2IfESaIS5_EE@Base
 0.14
- 
(optional=templinst|arch=amd64)_ZNK7citygml17AppearanceManager13getAppearanceIPNS_10AppearanceEEET_RKSsNS0_7ForSideE@Base
 0.14
- 
(optional=templinst|arch=amd64)_ZNK7citygml17AppearanceManager13getAppearanceIPNS_7TextureEEET_RKSsNS0_7ForSideE@Base
 0.14
- 
(optional=templinst|arch=amd64)_ZNK7citygml17AppearanceManager13getAppearanceIPNS_8MaterialEEET_RKSsNS0_7ForSideE@Base
 0.14
+ (optional=templinst|arch=amd64 
i386)_ZNK7citygml17AppearanceManager13getAppearanceIPNS_10AppearanceEEET_RKSsNS0_7ForSideE@Base
 0.14
+ (optional=templinst|arch=amd64 
i386)_ZNK7citygml17AppearanceManager13getAppearanceIPNS_7TextureEEET_RKSsNS0_7ForSideE@Base
 0.14
+ (optional=templinst|arch=amd64 
i386)_ZNK7citygml17AppearanceManager13getAppearanceIPNS_8MaterialEEET_RKSsNS0_7ForSideE@Base
 0.14
  _ZNK7citygml17BuildingFurniture15getDefaultColorEv@Base 0.14
  _ZNK7citygml17GenericCityObject15getDefaultColorEv@Base 0.14
  _ZNK7citygml18BridgeInstallation15getDefaultColorEv@Base 0.14
@@ -340,8 +340,8 @@ libcitygml.so.0 libcitygml0 #MINVER#
  (optional=templinst)_ZNKSt6vectorIjSaIjEE12_M_check_lenEmPKc@Base 0.14
  
(optional=templinst)_ZNKSt8_Rb_treeISsSt4pairIKSsPN7citygml10AppearanceEESt10_Select1stIS5_ESt4lessISsESaIS5_EE4findERS1_@Base
 0.14
  
(optional=templinst)_ZNKSt8_Rb_treeISsSt4pairIKSsPSt6vectorI5TVec2IfESaIS4_EEESt10_Select1stIS8_ESt4lessISsESaIS8_EE4findERS1_@Base
 0.14
- 
(optional=templinst|arch=amd64)_ZNKSt8_Rb_treeISsSt4pairIKSsSt6vectorIPN7citygml10AppearanceESaIS5_EEESt10_Select1stIS8_ESt4lessISsESaIS8_EE4findERS1_@Base
 0.14
- 
(optional=templinst|arch=amd64)_ZNSs12_S_constructIPcEES0_T_S1_RKSaIcESt20forward_iterator_tag@Base
 0.14
+ (optional=templinst|arch=amd64 
i386)_ZNKSt8_Rb_treeISsSt4pairIKSsSt6vectorIPN7citygml10AppearanceESaIS5_EEESt10_Select1stIS8_ESt4lessISsESaIS8_EE4findERS1_@Base
 0.14
+ (optional=templinst|arch=amd64 
i386)_ZNSs12_S_constructIPcEES0_T_S1_RKSaIcESt20forward_iterator_tag@Base 0.14
  (optional=templinst|arch=!amd64 !i386 !kfreebsd-amd64 
!kfreebsd-i386)_ZNSsC1IPcEET_S1_RKSaIcE@Base 0.14
  (optional=templinst|arch=!amd64 !i386 !kfreebsd-amd64 
!kfreebsd-i386)_ZNSsC2IPcEET_S1_RKSaIcE@Base 0.14
  (optional=templinst|arch=!alpha !amd64 !ia64 !kfreebsd-amd64 !ppc64 !s390 
!s390x)_ZNSt11_Deque_baseIPN7citygml10CityObjectESaIS2_EE17_M_initialize_mapEj@Base
 0.14
@@ -360,9 +360,9 @@ libcitygml.so.0 libcitygml0 #MINVER#
  
(optional=templinst)_ZNSt11__copy_moveILb0ELb1ESt26random_access_iterator_tagE8__copy_mIPSt6vectorI5TVec2IfESaIS5_PT_PKS9_SC_SA_@Base
 0.14
  
(optional=templinst)_ZNSt11__copy_moveILb0ELb1ESt26random_access_iterator_tagE8__copy_mIjEEPT_PKS3_S6_S4_@Base
 0.14
  (optional=templinst)_ZNSt12_Destroy_auxILb0EE9__destroyIPSsEEvT_S3_@Base 0.14
- 
(optional=templinst|arch=amd64)_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEED0Ev@Base
 0.14
- 
(optional=templinst|arch=amd64)_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEED1Ev@Base
 0.14
- 
(optional=templinst|arch=amd64)_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEED2Ev@Base
 0.14
+ (optional=templinst|arch=amd64 
i386)_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEED0Ev@Base 0.14
+ (optional=templinst|arch=amd64 
i386)_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEED1Ev@Base 0.14
+ (optional=templinst|arch=amd64 
i386)_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEED2Ev@Base 0.14
  (optional=templinst|arch=i386 
kfreebsd-i386)_ZNSt20__copy_move_backwardILb0ELb0ESt26random_access_iterator_tagE13__copy_move_bIP5TVec3IdES5_EET0_T_S7_S6_@Base
 0.14
  
(optional=templinst)_ZNSt20__copy_move_backwardILb0ELb0ESt26random_access_iterator_tagE13__copy_move_bIPSsS3_EET0_T_S5_S4_@Base
 0.14
  (optional=templinst|arch=i386 

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

2014-01-24 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 5cb29140656fe7b5bdfaf1fe00759bd49801e009
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Jan 24 23:54:59 2014 +0100

Set distribution to unstable.

diff --git a/debian/changelog b/debian/changelog
index cd6e42d..387a147 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libcitygml (0.14+svn134-1+3p2p0) UNRELEASED; urgency=low
+libcitygml (0.14+svn134-1+3p2p0) unstable; urgency=low
 
   * Team upload.
   * Make Debian GIS Project Maintainer and YunQiang Su Uploader.
@@ -16,7 +16,7 @@ libcitygml (0.14+svn134-1+3p2p0) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.9.5, changes: DM-Upload-Allowed, Vcs-* fields,
 copyright format, symbols file.
 
- -- Bas Couwenberg sebas...@xs4all.nl  Sun, 19 Jan 2014 19:43:40 +0100
+ -- Bas Couwenberg sebas...@xs4all.nl  Fri, 24 Jan 2014 23:54:36 +0100
 
 libcitygml (0.14+svn128-1+3p0p1+4) unstable; urgency=low
 

-- 
Read and write CityGML 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] libcitygml branch, master, updated. debian/0.14+svn128-1+3p0p1+4-25-g5cb2914

2014-01-24 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit a3bf3cff30a9336a17e795ff2afd8b06c4eee9bd
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Jan 24 22:52:06 2014 +0100

Update symbols file for version 0.14+svn128-1+3p0p1+4.

diff --git a/debian/libcitygml0.symbols b/debian/libcitygml0.symbols
index 7898f26..77d7999 100644
--- a/debian/libcitygml0.symbols
+++ b/debian/libcitygml0.symbols
@@ -1,16 +1,16 @@
-# SymbolsHelper-Confirmed: 0.14 alpha amd64 armel armhf i386 ia64 
kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 s390 s390x sparc
+# SymbolsHelper-Confirmed: 0.14 alpha amd64 armel armhf i386 ia64 
kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x 
sparc
 libcitygml.so.0 libcitygml0 #MINVER#
  _Z10fatalErrorPvPKcz@Base 0.14
  
(optional=templinst)_Z10parseValueI5TVec3IdEEvRSt18basic_stringstreamIcSt11char_traitsIcESaIcEERT_P12GeoTransformRKS1_@Base
 0.14
  
(optional=templinst)_Z10parseValueIbEvRSt18basic_stringstreamIcSt11char_traitsIcESaIcEERT_@Base
 0.14
- (arch=amd64 i386 kfreebsd-amd64 kfreebsd-i386)_Z10trim_rightRKSsS0_@Base 0.14
+ _Z10trim_rightRKSsS0_@Base 0.14
  
(optional=templinst)_Z12parseVecListI5TVec2IfEEvRSt18basic_stringstreamIcSt11char_traitsIcESaIcEERSt6vectorIT_SaIS9_EE@Base
 0.14
  
(optional=templinst)_Z12parseVecListI5TVec3IdEEvRSt18basic_stringstreamIcSt11char_traitsIcESaIcEERSt6vectorIT_SaIS9_EEP12GeoTransformRKS1_@Base
 0.14
  
(optional=templinst)_Z12parseVecListIfEvRSt18basic_stringstreamIcSt11char_traitsIcESaIcEERSt6vectorIT_SaIS7_EE@Base
 0.14
  _Z17ci_string_compareRKSsS0_@Base 0.14
- (arch=amd64 kfreebsd-amd64)_Z4trimRKSsS0_@Base 0.14
+ _Z4trimRKSsS0_@Base 0.14
  _Z8tokenizeRKSsS0_@Base 0.14
- (arch=amd64 i386 kfreebsd-amd64 kfreebsd-i386)_Z9trim_leftRKSsS0_@Base 0.14
+ _Z9trim_leftRKSsS0_@Base 0.14
  
_ZN10Tesselator10addContourERKSt6vectorI5TVec3IdESaIS2_EERKS0_I5TVec2IfESaIS8_EE@Base
 0.14
  _ZN10Tesselator11endCallbackEPv@Base 0.14
  _ZN10Tesselator13beginCallbackEjPv@Base 0.14
@@ -23,11 +23,11 @@ libcitygml.so.0 libcitygml0 #MINVER#
  _ZN10TesselatorC2Ev@Base 0.14
  _ZN10TesselatorD1Ev@Base 0.14
  _ZN10TesselatorD2Ev@Base 0.14
- (arch=amd64 i386 kfreebsd-amd64 
kfreebsd-i386)_ZN12GeoTransform13getProjectionERKSs@Base 0.14
- (arch=amd64 i386 kfreebsd-amd64 
kfreebsd-i386)_ZN12GeoTransformC1ERKSsS1_@Base 0.14
- (arch=amd64 i386 kfreebsd-amd64 
kfreebsd-i386)_ZN12GeoTransformC2ERKSsS1_@Base 0.14
- (arch=amd64 i386 kfreebsd-amd64 kfreebsd-i386)_ZN12GeoTransformD1Ev@Base 0.14
- (arch=amd64 i386 kfreebsd-amd64 kfreebsd-i386)_ZN12GeoTransformD2Ev@Base 0.14
+ _ZN12GeoTransform13getProjectionERKSs@Base 0.14
+ _ZN12GeoTransformC1ERKSsS1_@Base 0.14
+ _ZN12GeoTransformC2ERKSsS1_@Base 0.14
+ _ZN12GeoTransformD1Ev@Base 0.14
+ _ZN12GeoTransformD2Ev@Base 0.14
  _ZN21CityGMLHandlerLibXml212getAttributeEPvRKSsS2_@Base 0.14
  _ZN7citygml10AppearanceD0Ev@Base 0.14
  _ZN7citygml10AppearanceD1Ev@Base 0.14
@@ -50,8 +50,8 @@ libcitygml.so.0 libcitygml0 #MINVER#
  _ZN7citygml10PlantCoverD0Ev@Base 0.14
  _ZN7citygml10PlantCoverD1Ev@Base 0.14
  _ZN7citygml10PlantCoverD2Ev@Base 0.14
- (arch=amd64 i386 kfreebsd-amd64 
kfreebsd-i386)_ZN7citygml11RoofSurfaceC1ERKSs@Base 0.14
- (arch=amd64 i386 kfreebsd-amd64 
kfreebsd-i386)_ZN7citygml11RoofSurfaceC2ERKSs@Base 0.14
+ _ZN7citygml11RoofSurfaceC1ERKSs@Base 0.14
+ _ZN7citygml11RoofSurfaceC2ERKSs@Base 0.14
  _ZN7citygml11RoofSurfaceD0Ev@Base 0.14
  _ZN7citygml11RoofSurfaceD1Ev@Base 0.14
  _ZN7citygml11RoofSurfaceD2Ev@Base 0.14
@@ -70,8 +70,8 @@ libcitygml.so.0 libcitygml0 #MINVER#
  _ZN7citygml12FloorSurfaceD0Ev@Base 0.14
  _ZN7citygml12FloorSurfaceD1Ev@Base 0.14
  _ZN7citygml12FloorSurfaceD2Ev@Base 0.14
- (arch=amd64 i386 kfreebsd-amd64 
kfreebsd-i386)_ZN7citygml12ParserParamsD1Ev@Base 0.14
- (arch=amd64 i386 kfreebsd-amd64 
kfreebsd-i386)_ZN7citygml12ParserParamsD2Ev@Base 0.14
+ _ZN7citygml12ParserParamsD1Ev@Base 0.14
+ _ZN7citygml12ParserParamsD2Ev@Base 0.14
  (arch=i386 kfreebsd-i386)_ZN7citygml13CityFurnitureC1ERKSs@Base 0.14
  (arch=i386 kfreebsd-i386)_ZN7citygml13CityFurnitureC2ERKSs@Base 0.14
  _ZN7citygml13CityFurnitureD0Ev@Base 0.14
@@ -82,19 +82,19 @@ libcitygml.so.0 libcitygml0 #MINVER#
  _ZN7citygml13GroundSurfaceD0Ev@Base 0.14
  _ZN7citygml13GroundSurfaceD1Ev@Base 0.14
  _ZN7citygml13GroundSurfaceD2Ev@Base 0.14
- (arch=amd64 i386 kfreebsd-amd64 
kfreebsd-i386)_ZN7citygml14CeilingSurfaceC1ERKSs@Base 0.14
- (arch=amd64 i386 kfreebsd-amd64 
kfreebsd-i386)_ZN7citygml14CeilingSurfaceC2ERKSs@Base 0.14
+ _ZN7citygml14CeilingSurfaceC1ERKSs@Base 0.14
+ _ZN7citygml14CeilingSurfaceC2ERKSs@Base 0.14
  _ZN7citygml14CeilingSurfaceD0Ev@Base 0.14
  _ZN7citygml14CeilingSurfaceD1Ev@Base 0.14
  _ZN7citygml14CeilingSurfaceD2Ev@Base 0.14
  _ZN7citygml14CityGMLHandler10endElementERKSs@Base 0.14
  _ZN7citygml14CityGMLHandler10fatalErrorERKSs@Base 0.14
  _ZN7citygml14CityGMLHandler10pushObjectEPNS_6ObjectE@Base 0.14
- (arch=amd64 i386 kfreebsd-amd64 

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

2014-01-24 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 516e47697895e874df7dc67979d20781ef961d7f
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Jan 24 23:45:00 2014 +0100

Update symbols for 0.14+svn134-1+3p2p0 on amd64.

diff --git a/debian/libcitygml0.symbols b/debian/libcitygml0.symbols
index 77d7999..6846066 100644
--- a/debian/libcitygml0.symbols
+++ b/debian/libcitygml0.symbols
@@ -38,6 +38,8 @@ libcitygml.so.0 libcitygml0 #MINVER#
  _ZN7citygml10BridgePartD1Ev@Base 0.14
  _ZN7citygml10BridgePartD2Ev@Base 0.14
  
_ZN7citygml10CityObject6finishERNS_17AppearanceManagerERKNS_12ParserParamsE@Base
 0.14
+ (arch=amd64)_ZN7citygml10CityObjectC1ERKSsNS_15CityObjectsTypeE@Base 0.14
+ (arch=amd64)_ZN7citygml10CityObjectC2ERKSsNS_15CityObjectsTypeE@Base 0.14
  _ZN7citygml10CityObjectD0Ev@Base 0.14
  _ZN7citygml10CityObjectD1Ev@Base 0.14
  _ZN7citygml10CityObjectD2Ev@Base 0.14
@@ -288,6 +290,9 @@ libcitygml.so.0 libcitygml0 #MINVER#
  _ZNK7citygml14CityGMLHandler11getFullPathEv@Base 0.14
  _ZNK7citygml14ClosureSurface15getDefaultColorEv@Base 0.14
  
_ZNK7citygml17AppearanceManager12getTexCoordsERKSsRSt6vectorI5TVec2IfESaIS5_EE@Base
 0.14
+ 
(optional=templinst|arch=amd64)_ZNK7citygml17AppearanceManager13getAppearanceIPNS_10AppearanceEEET_RKSsNS0_7ForSideE@Base
 0.14
+ 
(optional=templinst|arch=amd64)_ZNK7citygml17AppearanceManager13getAppearanceIPNS_7TextureEEET_RKSsNS0_7ForSideE@Base
 0.14
+ 
(optional=templinst|arch=amd64)_ZNK7citygml17AppearanceManager13getAppearanceIPNS_8MaterialEEET_RKSsNS0_7ForSideE@Base
 0.14
  _ZNK7citygml17BuildingFurniture15getDefaultColorEv@Base 0.14
  _ZNK7citygml17GenericCityObject15getDefaultColorEv@Base 0.14
  _ZNK7citygml18BridgeInstallation15getDefaultColorEv@Base 0.14
@@ -335,6 +340,8 @@ libcitygml.so.0 libcitygml0 #MINVER#
  (optional=templinst)_ZNKSt6vectorIjSaIjEE12_M_check_lenEmPKc@Base 0.14
  
(optional=templinst)_ZNKSt8_Rb_treeISsSt4pairIKSsPN7citygml10AppearanceEESt10_Select1stIS5_ESt4lessISsESaIS5_EE4findERS1_@Base
 0.14
  
(optional=templinst)_ZNKSt8_Rb_treeISsSt4pairIKSsPSt6vectorI5TVec2IfESaIS4_EEESt10_Select1stIS8_ESt4lessISsESaIS8_EE4findERS1_@Base
 0.14
+ 
(optional=templinst|arch=amd64)_ZNKSt8_Rb_treeISsSt4pairIKSsSt6vectorIPN7citygml10AppearanceESaIS5_EEESt10_Select1stIS8_ESt4lessISsESaIS8_EE4findERS1_@Base
 0.14
+ 
(optional=templinst|arch=amd64)_ZNSs12_S_constructIPcEES0_T_S1_RKSaIcESt20forward_iterator_tag@Base
 0.14
  (optional=templinst|arch=!amd64 !i386 !kfreebsd-amd64 
!kfreebsd-i386)_ZNSsC1IPcEET_S1_RKSaIcE@Base 0.14
  (optional=templinst|arch=!amd64 !i386 !kfreebsd-amd64 
!kfreebsd-i386)_ZNSsC2IPcEET_S1_RKSaIcE@Base 0.14
  (optional=templinst|arch=!alpha !amd64 !ia64 !kfreebsd-amd64 !ppc64 !s390 
!s390x)_ZNSt11_Deque_baseIPN7citygml10CityObjectESaIS2_EE17_M_initialize_mapEj@Base
 0.14
@@ -353,6 +360,9 @@ libcitygml.so.0 libcitygml0 #MINVER#
  
(optional=templinst)_ZNSt11__copy_moveILb0ELb1ESt26random_access_iterator_tagE8__copy_mIPSt6vectorI5TVec2IfESaIS5_PT_PKS9_SC_SA_@Base
 0.14
  
(optional=templinst)_ZNSt11__copy_moveILb0ELb1ESt26random_access_iterator_tagE8__copy_mIjEEPT_PKS3_S6_S4_@Base
 0.14
  (optional=templinst)_ZNSt12_Destroy_auxILb0EE9__destroyIPSsEEvT_S3_@Base 0.14
+ 
(optional=templinst|arch=amd64)_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEED0Ev@Base
 0.14
+ 
(optional=templinst|arch=amd64)_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEED1Ev@Base
 0.14
+ 
(optional=templinst|arch=amd64)_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEED2Ev@Base
 0.14
  (optional=templinst|arch=i386 
kfreebsd-i386)_ZNSt20__copy_move_backwardILb0ELb0ESt26random_access_iterator_tagE13__copy_move_bIP5TVec3IdES5_EET0_T_S7_S6_@Base
 0.14
  
(optional=templinst)_ZNSt20__copy_move_backwardILb0ELb0ESt26random_access_iterator_tagE13__copy_move_bIPSsS3_EET0_T_S5_S4_@Base
 0.14
  (optional=templinst|arch=i386 
kfreebsd-i386)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIP5TVec3IdES4_EET0_T_S6_S5_@Base
 0.14
@@ -365,6 +375,7 @@ libcitygml.so.0 libcitygml0 #MINVER#
  
(optional=templinst)_ZNSt3mapISsPN7citygml10AppearanceESt4lessISsESaISt4pairIKSsS2_EEEixERS6_@Base
 0.14
  
(optional=templinst)_ZNSt3mapISsPSt6vectorI5TVec2IfESaIS2_EESt4lessISsESaISt4pairIKSsS5_EEEixERS9_@Base
 0.14
  (optional=templinst)_ZNSt3mapISsSsSt4lessISsESaISt4pairIKSsSsEEEixERS3_@Base 
0.14
+ 
(optional=templinst|arch=amd64)_ZNSt3mapISsSt6vectorIPN7citygml10AppearanceESaIS3_EESt4lessISsESaISt4pairIKSsS5_EEEixERS9_@Base
 0.14
  
(optional=templinst)_ZNSt3setIPN7citygml8GeometryESt4lessIS2_ESaIS2_EE5eraseERKS2_@Base
 0.14
  
(optional=templinst)_ZNSt4pairIKN7citygml15CityObjectsTypeESt6vectorIPNS0_10CityObjectESaIS5_EEED1Ev@Base
 0.14
  
(optional=templinst)_ZNSt4pairIKN7citygml15CityObjectsTypeESt6vectorIPNS0_10CityObjectESaIS5_EEED2Ev@Base
 0.14
@@ -376,6 +387,8 @@ libcitygml.so.0 libcitygml0 #MINVER#
  (optional=templinst)_ZNSt4pairIKSsPSt6vectorI5TVec2IfESaIS3_EEED2Ev@Base 0.14
  (optional=templinst)_ZNSt4pairIKSsSsED1Ev@Base 0.14