Surgical Products
Dear Sirs, How are you?This is Jessica from Kangli Medical Equipment Technology Co.,Ltd in China. We are the vendor of surgical products.Our products are surgical gowns, pack, drapes,mask etc. Our factory can offer you the the best service within current market.We welcome the inquiry from you and hope we could have a chance to establish the bussiness relationship in the near future.For further informations on Kangli medical supplies market , please don’t hesitate to contact us. Yours faithfully, Jessica TEL:+86-183-6919-1960 E-mail:kanglimedical0...@126.com Skype:lh-Jessica Wei Kangli Medical Equipment Technology Co.,Ltd.___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mapserver] 05/08: Add whitespace for more readable variables.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental in repository mapserver. commit 69cab50f426045c1378bbc8d13860b33b5f27680 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 11:43:37 2015 +0200 Add whitespace for more readable variables. --- debian/rules | 25 + 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/debian/rules b/debian/rules index 103afe7..27759bd 100755 --- a/debian/rules +++ b/debian/rules @@ -12,23 +12,24 @@ export DH_OPTIONS # pie: causes build failure export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie -DEB_HOST_MULTIARCH?=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) -CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) -LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) +CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS) +CFLAGS := $(shell dpkg-buildflags --get CFLAGS) +LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -CFLAGS+=$(CPPFLAGS) -CFLAGS+=$(LDFLAGS) +CFLAGS += $(CPPFLAGS) +CFLAGS += $(LDFLAGS) -RUBYVERSIONS=$(shell dh_ruby --print-supported) -PHP5API=$(shell php-config5 --phpapi) -MANPAGES:=$(wildcard debian/man/*.*.xml) +RUBYVERSIONS := $(shell dh_ruby --print-supported) +PHP5API := $(shell php-config5 --phpapi) -MS_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://') -BUILD_DATE=$(shell dpkg-parsechangelog | sed -ne 's/^Date: //p' | LC_ALL=C date -u +%d %B %Y -f -) +MANPAGES := $(wildcard debian/man/*.*.xml) -CMAKE_OPTS:= \ +MS_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://') +BUILD_DATE := $(shell dpkg-parsechangelog | sed -ne 's/^Date: //p' | LC_ALL=C date -u +%d %B %Y -f -) + +CMAKE_OPTS := \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_EXE_LINKER_FLAGS=$(LDFLAGS) \ -DCMAKE_MODULE_LINKER_FLAGS=$(LDFLAGS) \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mapserver] 02/08: Merge tag 'upstream/7.0.0' into experimental
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental in repository mapserver. commit ea504bc3bbc279e1f404a841846fedd4a3d1b9a8 Merge: bb7c2c4 2644109 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 11:25:42 2015 +0200 Merge tag 'upstream/7.0.0' into experimental Upstream version 7.0.0 .gitmodules | 3 - .travis.yml | 2 +- CMakeLists.txt | 8 +- HISTORY.TXT | 12 +- Makefile| 4 +- fontcache.c | 4 +- install-msautotest.sh | 14 + mapcairo.c | 3 +- mapcluster.c| 2 +- mapcontext.c| 7 +- mapdebug.c | 4 +- mapdraw.c | 1 + maperror.c | 16 +- maperror.h | 4 +- mapfile.c | 17 +- mapgdal.c | 2 +- mapgeos.c | 4 +- mapgml.c| 1 + mapio.c | 10 +- mapkmlrenderer.cpp | 4 +- maplexer.c | 782 maplexer.l | 2 + mapmssql2008.c | 45 +- mapobject.c | 1 + mapogcfilter.c | 3 +- mapogcfiltercommon.c| 1 + mapogcsld.c | 5 +- mapogcsos.c | 1 + mapogr.cpp | 1 + mapogroutput.c | 5 + maporaclespatial.c | 10 +- mapoutput.c | 1 + mapows.c| 1 + mapows.h| 13 +- mapparser.c | 192 mapparser.h | 4 +- mappool.c | 2 +- mappostgis.c| 4 +- mapquery.c | 6 +- maprendering.c | 3 +- mapscript/php/color.c | 98 +++- mapscript/php/image.c | 15 +- mapscript/php/label.c | 2 - mapscript/php/line.c| 4 - mapscript/php/mapscript_i.c | 22 +- mapscript/php/owsrequest.c | 7 +- mapscript/php/php_mapscript.c | 4 +- mapscript/php/php_mapscript.h | 1 + mapscript/php/php_mapscript_util.c | 4 + mapscript/php/result.c | 4 - mapscript/php/shapefile.c | 4 - mapscript/swiginc/color.i | 38 +- mapscript/swiginc/layer.i | 5 + mapscript/swiginc/mapzoom.i | 3 - mapscript/swiginc/rect.i| 5 +- mapscript/swiginc/symbol.i | 18 +- mapserv.c | 6 +- mapserver.h | 10 +- mapservutil.c | 1 + mapshape.c | 1 + mapsymbol.c | 1 + maptemplate.c | 21 +- mapthread.c | 8 +- mapthread.h | 2 +- maputil.c | 6 +- mapwcs.c| 1 + mapwcs11.c | 1 + mapwcs20.c | 1 + mapwfs.c| 41 +- mapwms.c| 11 +- mapwmslayer.c | 1 + renderers/agg/src/agg_font_freetype.cpp | 6 +- scripts/vagrant/mapserver.sh| 2 +- shp2img.c | 14 +- 74 files changed, 884 insertions(+), 688 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mapserver] 06/08: Update symbols for other architectures, drop missing symbols.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental in repository mapserver. commit e1294e3db09461b0ed5bce5edc3ff6b5b0510b22 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 12:16:48 2015 +0200 Update symbols for other architectures, drop missing symbols. --- debian/libmapserver2.symbols | 238 +++ 1 file changed, 14 insertions(+), 224 deletions(-) diff --git a/debian/libmapserver2.symbols b/debian/libmapserver2.symbols index 0812c95..54dd686 100644 --- a/debian/libmapserver2.symbols +++ b/debian/libmapserver2.symbols @@ -1,10 +1,9 @@ -# SymbolsHelper-Confirmed: 7.0.0~beta2 amd64 +# SymbolsHelper-Confirmed: 7.0.0~beta2 amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mipsel powerpc ppc64el s390x libmapserver.so.2 #PACKAGE# #MINVER# BuildExpressionTree@Base 6.2.1 CleanVSIDir@Base 6.2.1 CompareEllipseRegion@Base 6.2.1 CompareRectangleRegion@Base 6.2.1 -#MISSING: 7.0.0~beta2# DBFIsValueNULL@Base 6.2.1 DefineAxis@Base 6.2.1 FLTApplyExpressionToLayer@Base 6.2.1 FLTApplyFilterToLayer@Base 6.2.1 @@ -18,7 +17,6 @@ libmapserver.so.2 #PACKAGE# #MINVER# FLTCreateFilterEncodingNode@Base 6.2.1 FLTDoAxisSwappingIfNecessary@Base 7.0.0~beta2 FLTFreeFilterEncodingNode@Base 6.2.1 -#MISSING: 7.0.0~beta2# FLTGML2Shape_XMLNode@Base 6.2.1 FLTGetBBOX@Base 6.2.1 FLTGetBinaryComparisonCommonExpression@Base 6.2.1 FLTGetBinaryComparisonExpresssion@Base 6.2.1 @@ -64,13 +62,10 @@ libmapserver.so.2 #PACKAGE# #MINVER# FLTLayerApplyCondSQLFilterToLayer@Base 6.2.1 FLTLayerApplyPlainFilterToLayer@Base 6.2.1 FLTNumberOfFilterType@Base 6.2.1 -#MISSING: 7.0.0~beta2# FLTParseEpsgString@Base 6.2.1 FLTParseFilterEncoding@Base 6.2.1 FLTParseGMLBox@Base 6.2.1 FLTParseGMLEnvelope@Base 6.2.1 -#MISSING: 7.0.0~beta2# FLTPreParseFilterForAlias@Base 6.2.1 FLTPreParseFilterForAliasAndGroup@Base 7.0.0~beta2 -#MISSING: 7.0.0~beta2# FLTShapeFromGMLTree@Base 6.2.1 FLTSimplify@Base 7.0.0~beta2 FLTValidFilterNode@Base 6.2.1 FLTValidForBBoxFilter@Base 6.2.1 @@ -105,7 +100,6 @@ libmapserver.so.2 #PACKAGE# #MINVER# _SLDApplyRuleValues@Base 6.2.1 _Z10addToTableP15UTFGridRendererP8shapeObj@Base 7.0.0~beta2 _Z11agg2CleanupPv@Base 6.2.1 -#MISSING: 7.0.0~beta2# _Z11aggLoadFontP16aggRendererCachePcd@Base 6.4.1 _Z13agg2FreeImageP8imageObj@Base 6.2.1 _Z13agg2InitCachePPv@Base 6.2.1 _Z13agg2SaveImageP8imageObjP6mapObjP8_IO_FILEP15outputFormatObj@Base 6.2.1 @@ -116,7 +110,6 @@ libmapserver.so.2 #PACKAGE# #MINVER# _Z15agg2CreateImageiiP15outputFormatObjP8colorObj@Base 6.2.1 _Z15utfgridEndLayerP8imageObjP6mapObjP8layerObj@Base 7.0.0~beta2 _Z15utfgridEndShapeP8imageObjP8shapeObj@Base 7.0.0~beta2 -#MISSING: 7.0.0~beta2# _Z16agg2RenderGlyphsP8imageObjddP13labelStyleObjPc@Base 6.2.1 _Z16utfgridCleanDataP8imageObj@Base 7.0.0~beta2 _Z16utfgridFreeImageP8imageObj@Base 7.0.0~beta2 _Z16utfgridSaveImageP8imageObjP6mapObjP8_IO_FILEP15outputFormatObj@Base 7.0.0~beta2 @@ -133,26 +126,19 @@ libmapserver.so.2 #PACKAGE# #MINVER# _Z18encodeForRenderingj@Base 7.0.0~beta2 _Z18utfgridCreateImageiiP15outputFormatObjP8colorObj@Base 7.0.0~beta2 _Z19agg2RenderLineTiledP8imageObjP8shapeObjS0_@Base 6.2.1 -#MISSING: 7.0.0~beta2# _Z19msOGREscapeSQLParamP8layerObjPKc@Base 6.2.1 _Z19utfgridRenderGlyphsP8imageObjP11textPathObjP8colorObjS4_i@Base 7.0.0~beta2 -#MISSING: 7.0.0~beta2# _Z20agg2RenderGlyphsLineP8imageObjP12labelPathObjP13labelStyleObjPc@Base 6.2.1 _Z20agg2RenderGlyphsPathP8imageObjP11textPathObjP8colorObjS4_i@Base 7.0.0~beta2 (optional=templinst)_Z20decompose_ft_outlineIN9mapserver9path_baseINS0_20vertex_block_storageIdLj8ELj256EEbRK11FT_Outline_bRKNS0_12trans_affineERT_@Base 7.0.0~beta2 (optional=templinst)_Z20renderPolygonHatchesIN9mapserver12conv_clipperI15polygon_adaptorNS0_11conv_strokeINS0_9conv_dashINS0_9path_baseINS0_20vertex_block_storageIdLj8ELj256ENS0_12null_markersEEES9_EiP8imageObjRT_P8colorObj@Base 7.0.0~beta2 -#MISSING: 7.0.0~beta2# (optional=templinst)_Z20renderPolygonHatchesIN9mapserver12conv_clipperI15polygon_adaptorNS0_11conv_strokeINS0_9conv_dashINS0_9path_baseINS0_20vertex_block_storageIdLj8ELj256ENS0_12null_markersEEES9_EvP8imageObjRT_P8colorObj@Base 6.2.1 (optional=templinst)_Z20renderPolygonHatchesIN9mapserver12conv_clipperI15polygon_adaptorNS0_11conv_strokeINS0_9path_baseINS0_20vertex_block_storageIdLj8ELj256ENS0_12null_markersEEiP8imageObjRT_P8colorObj@Base 7.0.0~beta2 -#MISSING: 7.0.0~beta2# (optional=templinst)_Z20renderPolygonHatchesIN9mapserver12conv_clipperI15polygon_adaptorNS0_11conv_strokeINS0_9path_baseINS0_20vertex_block_storageIdLj8ELj256ENS0_12null_markersEEvP8imageObjRT_P8colorObj@Base 6.2.1 _Z20utfgridRenderPolygonP8imageObjP8shapeObjP8colorObj@Base 7.0.0~beta2 _Z21agg2MergeRasterBufferP8imageObjP15rasterBufferObjdii@Base 6.2.1 -#MISSING: 7.0.0~beta2#
[mapserver] 03/08: New upstream release.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental in repository mapserver. commit 4729ea7b1de66cd8e54e94ace022215dda5c047f Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 11:31:52 2015 +0200 New upstream release. --- debian/changelog | 6 ++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index e68b8c9..0b397d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mapserver (7.0.0-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Bas Couwenberg sebas...@debian.org Fri, 24 Jul 2015 11:26:03 +0200 + mapserver (7.0.0~beta2-1~exp1) experimental; urgency=medium * Update watch file to use GitHub releases instead of download.osgeo.org. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mapserver] 04/08: Drop patches applied upstream.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental in repository mapserver. commit 7e1e31ac47cc954797983be7d95b5d1b08761a31 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 11:35:14 2015 +0200 Drop patches applied upstream. --- debian/changelog | 1 + ...ing-header-files-inside-an-extern-c-block.patch | 297 - debian/patches/consistent-typo.patch | 27 -- debian/patches/series | 4 - debian/patches/soversion.patch | 25 -- debian/patches/unknown-typo.patch | 16 -- 6 files changed, 1 insertion(+), 369 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0b397d2..fdcc5c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ mapserver (7.0.0-1) UNRELEASED; urgency=medium * New upstream release. + * Drop patches applied upstream. -- Bas Couwenberg sebas...@debian.org Fri, 24 Jul 2015 11:26:03 +0200 diff --git a/debian/patches/avoid-including-header-files-inside-an-extern-c-block.patch b/debian/patches/avoid-including-header-files-inside-an-extern-c-block.patch deleted file mode 100644 index 563395c..000 --- a/debian/patches/avoid-including-header-files-inside-an-extern-c-block.patch +++ /dev/null @@ -1,297 +0,0 @@ -From c67a74b5f11747aab1a251ef601ced72e55107f8 Mon Sep 17 00:00:00 2001 -From: Thomas Bonfort thomas.bonf...@gmail.com -Date: Thu, 9 Jul 2015 15:13:42 +0200 -Subject: [PATCH 1/2] Avoid including header files inside an extern C block - (#5117) - - mapgml.c | 1 + - mapobject.c| 1 + - mapogcfilter.c | 1 + - mapogcsld.c| 1 + - mapogcsos.c| 1 + - mapogr.cpp | 1 + - mapogroutput.c | 1 + - mapows.c | 1 + - mapows.h | 13 - - mapserver.h| 6 -- - mapwcs.c | 1 + - mapwcs11.c | 1 + - mapwcs20.c | 1 + - mapwfs.c | 1 + - mapwms.c | 1 + - mapwmslayer.c | 1 + - 16 files changed, 26 insertions(+), 7 deletions(-) - -diff --git a/mapgml.c b/mapgml.c -index 3e07119..52a6587 100644 a/mapgml.c -+++ b/mapgml.c -@@ -29,6 +29,7 @@ - - #include mapserver.h - #include maperror.h -+#include mapows.h - #include mapgml.h - #include maptime.h - -diff --git a/mapobject.c b/mapobject.c -index 255b47c..8c5cdb5 100644 a/mapobject.c -+++ b/mapobject.c -@@ -29,6 +29,7 @@ - / - - #include mapserver.h -+#include mapows.h - - #ifdef USE_GDAL - # include gdal.h -diff --git a/mapogcfilter.c b/mapogcfilter.c -index 3d4bab8..50e7381 100644 a/mapogcfilter.c -+++ b/mapogcfilter.c -@@ -39,6 +39,7 @@ - #include mapserver.h - #include mapowscommon.h - #include maptime.h -+#include mapows.h - - static int FLTHasUniqueTopLevelDuringFilter(FilterEncodingNode *psFilterNode); - -diff --git a/mapogcsld.c b/mapogcsld.c -index af0cb76..b3372ff 100644 a/mapogcsld.c -+++ b/mapogcsld.c -@@ -29,6 +29,7 @@ - #include mapogcsld.h - #include mapogcfilter.h - #include mapserver.h -+#include mapows.h - - #ifdef USE_OGR - #include cpl_string.h -diff --git a/mapogcsos.c b/mapogcsos.c -index df09261..f709c48 100644 a/mapogcsos.c -+++ b/mapogcsos.c -@@ -30,6 +30,7 @@ - #define _GNU_SOURCE - - #include mapserver.h -+#include mapows.h - - #if defined(USE_SOS_SVR) defined(USE_LIBXML2) - -diff --git a/mapogr.cpp b/mapogr.cpp -index 1f21b29..1708d1c 100644 a/mapogr.cpp -+++ b/mapogr.cpp -@@ -32,6 +32,7 @@ - #include mapserver.h - #include mapproject.h - #include mapthread.h -+#include mapows.h - - #if defined(USE_OGR) || defined(USE_GDAL) - # include gdal_version.h -diff --git a/mapogroutput.c b/mapogroutput.c -index 3fac96f..ed12736 100644 a/mapogroutput.c -+++ b/mapogroutput.c -@@ -31,6 +31,7 @@ - #include mapserver.h - #include mapproject.h - #include mapthread.h -+#include mapows.h - - #if defined(USE_OGR) - # define __USE_LARGEFILE64 1 -diff --git a/mapows.c b/mapows.c -index 617abc3..dd2d856 100644 a/mapows.c -+++ b/mapows.c -@@ -30,6 +30,7 @@ - #include mapserver.h - #include maptime.h - #include maptemplate.h -+#include mapows.h - - #if defined(USE_LIBXML2) - #include maplibxml2.h -diff --git a/mapows.h b/mapows.h -index 4d7f41f..b8be8cc 100644 a/mapows.h -+++ b/mapows.h -@@ -40,6 +40,15 @@ - */ - #define OWS_DEFAULT_SCHEMAS_LOCATION http://schemas.opengis.net; - -+#if defined USE_LIBXML2 defined USE_WFS_SVR -+#includelibxml/tree.h -+#endif -+ -+#ifdef __cplusplus -+extern C { -+#endif -+ -+ - /* - * mapows.c - **/ -@@ -474,7 +483,6 @@ int msWFSException11(mapObj *map, const char *locator, - int msWFSGetCapabilities11(mapObj *map, wfsParamsObj *wfsparams, -cgiRequestObj *req,
[mapserver] 08/08: Set distribution to experimental.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental in repository mapserver. commit 3edcd2630e6defda452c7326a81eb6b05307bf51 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 11:45:02 2015 +0200 Set distribution to experimental. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d1e3fd7..d8d036c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -mapserver (7.0.0-1) UNRELEASED; urgency=medium +mapserver (7.0.0-1~exp1) experimental; urgency=medium * New upstream release. * Drop patches applied upstream. * Update symbols for amd64. - -- Bas Couwenberg sebas...@debian.org Fri, 24 Jul 2015 11:26:03 +0200 + -- Bas Couwenberg sebas...@debian.org Fri, 24 Jul 2015 11:44:28 +0200 mapserver (7.0.0~beta2-1~exp1) experimental; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mapserver] branch pristine-tar updated (d4fe75f - 563bdd2)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch pristine-tar in repository mapserver. from d4fe75f pristine-tar data for mapserver_7.0.0~beta2.orig.tar.gz new 563bdd2 pristine-tar data for mapserver_7.0.0.orig.tar.gz The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: mapserver_7.0.0.orig.tar.gz.delta | Bin 0 - 22774 bytes mapserver_7.0.0.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 mapserver_7.0.0.orig.tar.gz.delta create mode 100644 mapserver_7.0.0.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mapserver] 07/08: Update symbols for amd64.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental in repository mapserver. commit 677157a0bdd0cacb7d2156839c840eabb86046bb Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 12:45:08 2015 +0200 Update symbols for amd64. --- debian/changelog | 1 + debian/libmapserver2.symbols | 454 +-- 2 files changed, 228 insertions(+), 227 deletions(-) diff --git a/debian/changelog b/debian/changelog index fdcc5c7..d1e3fd7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ mapserver (7.0.0-1) UNRELEASED; urgency=medium * New upstream release. * Drop patches applied upstream. + * Update symbols for amd64. -- Bas Couwenberg sebas...@debian.org Fri, 24 Jul 2015 11:26:03 +0200 diff --git a/debian/libmapserver2.symbols b/debian/libmapserver2.symbols index 54dd686..76209ef 100644 --- a/debian/libmapserver2.symbols +++ b/debian/libmapserver2.symbols @@ -1,4 +1,4 @@ -# SymbolsHelper-Confirmed: 7.0.0~beta2 amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mipsel powerpc ppc64el s390x +# SymbolsHelper-Confirmed: 7.0.0 amd64 libmapserver.so.2 #PACKAGE# #MINVER# BuildExpressionTree@Base 6.2.1 CleanVSIDir@Base 6.2.1 @@ -9,13 +9,13 @@ libmapserver.so.2 #PACKAGE# #MINVER# FLTApplyFilterToLayer@Base 6.2.1 FLTApplyFilterToLayerCommonExpression@Base 6.2.1 FLTApplySimpleSQLFilter@Base 6.2.1 - FLTCheckFeatureIdFilters@Base 7.0.0~beta2 - FLTCheckInvalidOperand@Base 7.0.0~beta2 - FLTCheckInvalidProperty@Base 7.0.0~beta2 + FLTCheckFeatureIdFilters@Base 7.0.0 + FLTCheckInvalidOperand@Base 7.0.0 + FLTCheckInvalidProperty@Base 7.0.0 FLTCreateBinaryCompFilterEncodingNode@Base 6.2.1 FLTCreateFeatureIdFilterEncoding@Base 6.2.1 FLTCreateFilterEncodingNode@Base 6.2.1 - FLTDoAxisSwappingIfNecessary@Base 7.0.0~beta2 + FLTDoAxisSwappingIfNecessary@Base 7.0.0 FLTFreeFilterEncodingNode@Base 6.2.1 FLTGetBBOX@Base 6.2.1 FLTGetBinaryComparisonCommonExpression@Base 6.2.1 @@ -23,7 +23,7 @@ libmapserver.so.2 #PACKAGE# #MINVER# FLTGetBinaryComparisonSQLExpresssion@Base 6.2.1 FLTGetCapabilities@Base 6.2.1 FLTGetCommonExpression@Base 6.2.1 - FLTGetDuring@Base 7.0.0~beta2 + FLTGetDuring@Base 7.0.0 FLTGetExpressionForValuesRanges@Base 6.2.1 FLTGetFeatureIdCommonExpression@Base 6.2.1 FLTGetGeosOperator@Base 6.2.1 @@ -41,7 +41,7 @@ libmapserver.so.2 #PACKAGE# #MINVER# FLTGetSQLExpression@Base 6.2.1 FLTGetShape@Base 6.2.1 FLTGetSpatialComparisonCommonExpression@Base 6.2.1 - FLTGetTimeExpression@Base 7.0.0~beta2 + FLTGetTimeExpression@Base 7.0.0 FLTHasSpatialFilter@Base 6.2.1 FLTInsertElementInNode@Base 6.2.1 FLTIsBBoxFilter@Base 6.2.1 @@ -58,15 +58,15 @@ libmapserver.so.2 #PACKAGE# #MINVER# FLTIsSimpleFilterNoSpatial@Base 6.2.1 FLTIsSpatialFilterType@Base 6.2.1 FLTIsSupportedFilterType@Base 6.2.1 - FLTIsTemporalFilterType@Base 7.0.0~beta2 + FLTIsTemporalFilterType@Base 7.0.0 FLTLayerApplyCondSQLFilterToLayer@Base 6.2.1 FLTLayerApplyPlainFilterToLayer@Base 6.2.1 FLTNumberOfFilterType@Base 6.2.1 FLTParseFilterEncoding@Base 6.2.1 FLTParseGMLBox@Base 6.2.1 FLTParseGMLEnvelope@Base 6.2.1 - FLTPreParseFilterForAliasAndGroup@Base 7.0.0~beta2 - FLTSimplify@Base 7.0.0~beta2 + FLTPreParseFilterForAliasAndGroup@Base 7.0.0 + FLTSimplify@Base 7.0.0 FLTValidFilterNode@Base 6.2.1 FLTValidForBBoxFilter@Base 6.2.1 FLTogrConvertGeometry@Base 6.2.1 @@ -90,7 +90,7 @@ libmapserver.so.2 #PACKAGE# #MINVER# LayerDefaultNextShape@Base 6.2.1 LayerDefaultOpen@Base 6.2.1 LayerDefaultSupportsCommonFilters@Base 6.2.1 - LayerDefaultTranslateFilter@Base 7.0.0~beta2 + LayerDefaultTranslateFilter@Base 7.0.0 LayerDefaultWhichShapes@Base 6.2.1 ParseTextLinePlacement@Base 6.2.1 ParseTextPointPlacement@Base 6.2.1 @@ -98,7 +98,7 @@ libmapserver.so.2 #PACKAGE# #MINVER# Pix2LayerGeoref@Base 6.2.1 RebuildClusters@Base 6.2.1 _SLDApplyRuleValues@Base 6.2.1 - _Z10addToTableP15UTFGridRendererP8shapeObj@Base 7.0.0~beta2 + _Z10addToTableP15UTFGridRendererP8shapeObj@Base 7.0.0 _Z11agg2CleanupPv@Base 6.2.1 _Z13agg2FreeImageP8imageObj@Base 6.2.1 _Z13agg2InitCachePPv@Base 6.2.1 @@ -106,32 +106,32 @@ libmapserver.so.2 #PACKAGE# #MINVER# _Z14agg2FreeSymbolP9symbolObj@Base 6.2.1 _Z14agg2RenderLineP8imageObjP8shapeObjP14strokeStyleObj@Base 6.2.1 _Z14agg2RenderTileP8imageObjS0_dd@Base 6.2.1 - _Z14decodeRenderedj@Base 7.0.0~beta2 + _Z14decodeRenderedj@Base 7.0.0 _Z15agg2CreateImageiiP15outputFormatObjP8colorObj@Base 6.2.1 - _Z15utfgridEndLayerP8imageObjP6mapObjP8layerObj@Base 7.0.0~beta2 - _Z15utfgridEndShapeP8imageObjP8shapeObj@Base 7.0.0~beta2 - _Z16utfgridCleanDataP8imageObj@Base 7.0.0~beta2 - _Z16utfgridFreeImageP8imageObj@Base 7.0.0~beta2 - _Z16utfgridSaveImageP8imageObjP6mapObjP8_IO_FILEP15outputFormatObj@Base 7.0.0~beta2 + _Z15utfgridEndLayerP8imageObjP6mapObjP8layerObj@Base 7.0.0 + _Z15utfgridEndShapeP8imageObjP8shapeObj@Base
Processing of mapserver_7.0.0-1~exp1_amd64.changes
mapserver_7.0.0-1~exp1_amd64.changes uploaded successfully to localhost along with the files: mapserver_7.0.0-1~exp1.dsc mapserver_7.0.0.orig.tar.gz mapserver_7.0.0-1~exp1.debian.tar.xz cgi-mapserver_7.0.0-1~exp1_amd64.deb libmapscript-java_7.0.0-1~exp1_amd64.deb libmapscript-perl_7.0.0-1~exp1_amd64.deb libmapserver-dbg_7.0.0-1~exp1_amd64.deb libmapserver-dev_7.0.0-1~exp1_amd64.deb libmapserver2_7.0.0-1~exp1_amd64.deb mapserver-bin_7.0.0-1~exp1_amd64.deb mapserver-doc_7.0.0-1~exp1_all.deb php5-mapscript_7.0.0-1~exp1_amd64.deb python-mapscript_7.0.0-1~exp1_amd64.deb ruby-mapscript_7.0.0-1~exp1_amd64.deb Greetings, Your Debian queue daemon (running on host franck.debian.org) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mapserver] branch experimental updated (3edcd26 - 4070962)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch experimental in repository mapserver. from 3edcd26 Set distribution to experimental. new 4070962 Reorder build dependencies. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/control | 38 +++--- 1 file changed, 19 insertions(+), 19 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mapserver] 01/01: Reorder build dependencies.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental in repository mapserver. commit 40709629ddaa919632b58753aca8dda9628b24b1 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 13:32:53 2015 +0200 Reorder build dependencies. --- debian/control | 38 +++--- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/debian/control b/debian/control index 012e5de..def8cb3 100644 --- a/debian/control +++ b/debian/control @@ -7,38 +7,38 @@ Section: devel Priority: optional Build-Depends: debhelper (= 9), dpkg-dev (= 1.16.1.1), + cmake (= 2.8.12.1-1.2), + chrpath, + default-jdk, + ant, + libcairo2-dev, libcurl4-gnutls-dev | libcurl-ssl-dev, - libpng-dev, - libjpeg-dev, - zlib1g-dev (= 1.1.4), + libfcgi-dev, libfreetype6-dev (= 2.0.9), + libfribidi-dev, libgdal-dev (= 1.10.1-0~), - libproj-dev, libgeos-dev (= 3.3.1-1~), - libfribidi-dev, - libharfbuzz-dev, - libcairo2-dev, libgif-dev, - librsvg2-dev, + libharfbuzz-dev, + libjpeg-dev, + libperl-dev, libpixman-1-dev, + libpng-dev, libpq-dev, + libproj-dev, + librsvg2-dev, + libxml2-dev, + libxslt1-dev, + zlib1g-dev (= 1.1.4), php5-dev, - swig, - libperl-dev, + pkg-config, + pkg-kde-tools, python-all (= 2.6.6-3~), python-all-dev (= 2.6.6-3~), ruby, ruby-all-dev, gem2deb, - default-jdk, - ant, - libfcgi-dev, - libxml2-dev, - libxslt1-dev, - pkg-kde-tools, - chrpath, - cmake (= 2.8.12.1-1.2), - pkg-config, + swig, docbook2x, docbook-xsl, docbook-xml, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
python-mapnik_0.0~20150708-c005502-2_amd64.changes ACCEPTED into unstable, unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Thu, 23 Jul 2015 21:54:21 +0200 Source: python-mapnik Binary: python-mapnik python3-mapnik Architecture: source amd64 Version: 1:0.0~20150708-c005502-2 Distribution: unstable Urgency: medium Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Changed-By: Bas Couwenberg sebas...@debian.org Description: python-mapnik - Python 2 interface to the mapnik library python3-mapnik - Python 3 interface to the mapnik library Changes: python-mapnik (1:0.0~20150708-c005502-2) unstable; urgency=medium . * Also build bindings for Python 3. Checksums-Sha1: 0979da354e6b05e98b8283c107d96f8bdda8a227 2286 python-mapnik_0.0~20150708-c005502-2.dsc b17c4dbfe5b030af4e3de81b856e3024ae2e5e15 4504 python-mapnik_0.0~20150708-c005502-2.debian.tar.xz 00f6904fda47fd690e35da344ffb414a2d1cfdf3 783112 python-mapnik_0.0~20150708-c005502-2_amd64.deb fa7caa47ce2b0345d94559fc4630613a26295b29 784508 python3-mapnik_0.0~20150708-c005502-2_amd64.deb Checksums-Sha256: a5ba52175b4d4e0002b12af90d62145b154f03391ddca973aff787a464d8ce9c 2286 python-mapnik_0.0~20150708-c005502-2.dsc c86ea5e7e497fa4ecae5f6d3e2c553ed334a600f09213242baaf5055ed354e5a 4504 python-mapnik_0.0~20150708-c005502-2.debian.tar.xz e53e2c6bb173bd9618908da46c05ec30eb8fdb47f57bba05374170c7ee5430aa 783112 python-mapnik_0.0~20150708-c005502-2_amd64.deb f2e25b7e2117f7804f81d7ad384622efbc6d4771c861ec6f8ccdec9646b34b99 784508 python3-mapnik_0.0~20150708-c005502-2_amd64.deb Files: 421ed3b01c4e4592042689b255049408 2286 python optional python-mapnik_0.0~20150708-c005502-2.dsc 763bff991efcb2934e69edb659511b5d 4504 python optional python-mapnik_0.0~20150708-c005502-2.debian.tar.xz 24a4ab5638684ea9c74466ee723d9a0e 783112 python optional python-mapnik_0.0~20150708-c005502-2_amd64.deb 8b9312c4634cbf7bbf8f27699118ab76 784508 python optional python3-mapnik_0.0~20150708-c005502-2_amd64.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCgAGBQJVsU0lAAoJEGdQ8QrojUrxnw8P/RNbPV2VR4IqYMgU6PJjZ/w1 TuHC61pcthnCCCie3i5QbbkCA3/S67uRb7Y83fhIckQLwAOp+i1/60MUbxW5PnMb oHF3yzzn3JVDWLEBDK2YtsE4kfqYKFUtJA2/Wrr2veSu9ABzQ3aNriUY5/AzLnJQ 8AC6lygxig7HNV0PYqxJM5dK0d0RU6ronMx9pbnqlTFzU+tfbHlO43eO67k5Sebd RLDf6vgI+62WbaWCXE5xPv9OzJb5a2HAkziXxiFpA+bLcSZ0ljRTHnv0MKBwl+iN zc7O1LDuKgAoWyxXli1RSgOoekzciACl7WDKgMPT/gA4GZPZT5dwKD5iwvSl5C9T kN7c6ZYPa9HJPs7KbiPPJHe2lSFNR1Cea80hbh0ua6+gDVBMLssAhM+/h0j1x4M5 5y1j/MNOj9Bcgon7UrwJc8rszuIOHXYQ0sxKsWqztEDLyo38P4o5RSEbjHXuxXs/ dkQsTSEVCqTPRUK1o77+12tVC/GNXPLT+Bl20+ZkpS4H6jVdYLQNQNPLkJcC322V CQgJVS+f1E0uU6E3xj6JeMSNLG5V9qneRYhKjBoHn1CuBUllmiv7QsU31Pxyj8+1 bCYPyumcg7qfDq0u7qhttVTZPjb5GcqLuGvIiPaZYnmyWlN8UJaeQicHLyDNfGnP X837miTERIXiiSwD/H7A =fkjF -END PGP SIGNATURE- Thank you for your contribution to Debian. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mapserver] branch upstream updated (b22943a - 2644109)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch upstream in repository mapserver. from b22943a Imported Upstream version 7.0.0~beta2 new 2644109 Imported Upstream version 7.0.0 The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: .gitmodules | 3 - .travis.yml | 2 +- CMakeLists.txt | 8 +- HISTORY.TXT | 12 +- Makefile| 4 +- fontcache.c | 4 +- install-msautotest.sh | 14 + mapcairo.c | 3 +- mapcluster.c| 2 +- mapcontext.c| 7 +- mapdebug.c | 4 +- mapdraw.c | 1 + maperror.c | 16 +- maperror.h | 4 +- mapfile.c | 17 +- mapgdal.c | 2 +- mapgeos.c | 4 +- mapgml.c| 1 + mapio.c | 10 +- mapkmlrenderer.cpp | 4 +- maplexer.c | 782 maplexer.l | 2 + mapmssql2008.c | 45 +- mapobject.c | 1 + mapogcfilter.c | 3 +- mapogcfiltercommon.c| 1 + mapogcsld.c | 5 +- mapogcsos.c | 1 + mapogr.cpp | 1 + mapogroutput.c | 5 + maporaclespatial.c | 10 +- mapoutput.c | 1 + mapows.c| 1 + mapows.h| 13 +- mapparser.c | 192 mapparser.h | 4 +- mappool.c | 2 +- mappostgis.c| 4 +- mapquery.c | 6 +- maprendering.c | 3 +- mapscript/php/color.c | 98 +++- mapscript/php/image.c | 15 +- mapscript/php/label.c | 2 - mapscript/php/line.c| 4 - mapscript/php/mapscript_i.c | 22 +- mapscript/php/owsrequest.c | 7 +- mapscript/php/php_mapscript.c | 4 +- mapscript/php/php_mapscript.h | 1 + mapscript/php/php_mapscript_util.c | 4 + mapscript/php/result.c | 4 - mapscript/php/shapefile.c | 4 - mapscript/swiginc/color.i | 38 +- mapscript/swiginc/layer.i | 5 + mapscript/swiginc/mapzoom.i | 3 - mapscript/swiginc/rect.i| 5 +- mapscript/swiginc/symbol.i | 18 +- mapserv.c | 6 +- mapserver.h | 10 +- mapservutil.c | 1 + mapshape.c | 1 + mapsymbol.c | 1 + maptemplate.c | 21 +- mapthread.c | 8 +- mapthread.h | 2 +- maputil.c | 6 +- mapwcs.c| 1 + mapwcs11.c | 1 + mapwcs20.c | 1 + mapwfs.c| 41 +- mapwms.c| 11 +- mapwmslayer.c | 1 + renderers/agg/src/agg_font_freetype.cpp | 6 +- scripts/vagrant/mapserver.sh| 2 +- shp2img.c | 14 +- 74 files changed, 884 insertions(+), 688 deletions(-) create mode 100755 install-msautotest.sh -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mapserver] 01/01: pristine-tar data for mapserver_7.0.0.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository mapserver. commit 563bdd27fc4e201925e00e65280aa2025f365a42 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 11:25:39 2015 +0200 pristine-tar data for mapserver_7.0.0.orig.tar.gz --- mapserver_7.0.0.orig.tar.gz.delta | Bin 0 - 22774 bytes mapserver_7.0.0.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/mapserver_7.0.0.orig.tar.gz.delta b/mapserver_7.0.0.orig.tar.gz.delta new file mode 100644 index 000..c35fd7f Binary files /dev/null and b/mapserver_7.0.0.orig.tar.gz.delta differ diff --git a/mapserver_7.0.0.orig.tar.gz.id b/mapserver_7.0.0.orig.tar.gz.id new file mode 100644 index 000..f812593 --- /dev/null +++ b/mapserver_7.0.0.orig.tar.gz.id @@ -0,0 +1 @@ +772cab589bfdaeffc5d4605d6e54411dc8a67625 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mapserver] branch experimental updated (bb7c2c4 - 3edcd26)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch experimental in repository mapserver. from bb7c2c4 Mark soversion.patch as Applied-Upstream. new 2644109 Imported Upstream version 7.0.0 new ea504bc Merge tag 'upstream/7.0.0' into experimental new 4729ea7 New upstream release. new 7e1e31a Drop patches applied upstream. new 69cab50 Add whitespace for more readable variables. new e1294e3 Update symbols for other architectures, drop missing symbols. new 677157a Update symbols for amd64. new 3edcd26 Set distribution to experimental. The 8 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: .gitmodules| 3 - .travis.yml| 2 +- CMakeLists.txt | 8 +- HISTORY.TXT| 12 +- Makefile | 4 +- debian/changelog | 8 + debian/libmapserver2.symbols | 670 ++ ...ing-header-files-inside-an-extern-c-block.patch | 297 debian/patches/consistent-typo.patch | 27 - debian/patches/series | 4 - debian/patches/soversion.patch | 25 - debian/patches/unknown-typo.patch | 16 - debian/rules | 25 +- fontcache.c| 4 +- install-msautotest.sh | 14 + mapcairo.c | 3 +- mapcluster.c | 2 +- mapcontext.c | 7 +- mapdebug.c | 4 +- mapdraw.c | 1 + maperror.c | 16 +- maperror.h | 4 +- mapfile.c | 17 +- mapgdal.c | 2 +- mapgeos.c | 4 +- mapgml.c | 1 + mapio.c| 10 +- mapkmlrenderer.cpp | 4 +- maplexer.c | 782 ++--- maplexer.l | 2 + mapmssql2008.c | 45 +- mapobject.c| 1 + mapogcfilter.c | 3 +- mapogcfiltercommon.c | 1 + mapogcsld.c| 5 +- mapogcsos.c| 1 + mapogr.cpp | 1 + mapogroutput.c | 5 + maporaclespatial.c | 10 +- mapoutput.c| 1 + mapows.c | 1 + mapows.h | 13 +- mapparser.c| 192 ++--- mapparser.h| 4 +- mappool.c | 2 +- mappostgis.c | 4 +- mapquery.c | 6 +- maprendering.c | 3 +- mapscript/php/color.c | 98 ++- mapscript/php/image.c | 15 +- mapscript/php/label.c | 2 - mapscript/php/line.c | 4 - mapscript/php/mapscript_i.c| 22 +- mapscript/php/owsrequest.c | 7 +- mapscript/php/php_mapscript.c | 4 +- mapscript/php/php_mapscript.h | 1 + mapscript/php/php_mapscript_util.c | 4 + mapscript/php/result.c | 4 - mapscript/php/shapefile.c | 4 - mapscript/swiginc/color.i | 38 +- mapscript/swiginc/layer.i | 5 + mapscript/swiginc/mapzoom.i| 3 - mapscript/swiginc/rect.i | 5 +- mapscript/swiginc/symbol.i | 18 +- mapserv.c | 6 +- mapserver.h| 10 +- mapservutil.c
[mapserver] annotated tag upstream/7.0.0 created (now 6043190)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/7.0.0 in repository mapserver. at 6043190 (tag) tagging 26441092e14b79d5088465d0a28df373b196ab05 (commit) replaces upstream/7.0.0_beta2 tagged by Bas Couwenberg on Fri Jul 24 11:25:39 2015 +0200 - Log - Upstream version 7.0.0 Bas Couwenberg (1): Imported Upstream version 7.0.0 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mapserver] tag debian/7.0.0-1.exp1 created (now 3edcd26)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/7.0.0-1.exp1 in repository mapserver. at 3edcd26 (commit) No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
mapserver_7.0.0-1~exp1_amd64.changes ACCEPTED into experimental
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Fri, 24 Jul 2015 11:44:28 +0200 Source: mapserver Binary: libmapserver2 libmapserver-dbg libmapserver-dev cgi-mapserver mapserver-bin mapserver-doc php5-mapscript libmapscript-perl python-mapscript ruby-mapscript libmapscript-java Architecture: source amd64 all Version: 7.0.0-1~exp1 Distribution: experimental Urgency: medium Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Changed-By: Bas Couwenberg sebas...@debian.org Description: cgi-mapserver - CGI executable for MapServer libmapscript-java - Java library for MapServer libmapscript-perl - Perl MapServer module libmapserver-dbg - Debugging symbols for libmapserver libmapserver-dev - Shared library development files for MapServer libmapserver2 - Shared library for MapServer mapserver-bin - MapServer utilities mapserver-doc - documentation for MapServer php5-mapscript - php5-cgi module for MapServer python-mapscript - Python library for MapServer ruby-mapscript - MapServer library for Ruby Changes: mapserver (7.0.0-1~exp1) experimental; urgency=medium . * New upstream release. * Drop patches applied upstream. * Update symbols for amd64. Checksums-Sha1: 7399e0936417211bedde6543aaafb0540d96b05e 3294 mapserver_7.0.0-1~exp1.dsc d88110d6159ded120092da49e7927a93f678090f 2627534 mapserver_7.0.0.orig.tar.gz 41c8cf68a9ddbf948202591fde7e04c52d65a4ad 48512 mapserver_7.0.0-1~exp1.debian.tar.xz 8b515c7c1796a28218a6425f3a16123269db9452 80524 cgi-mapserver_7.0.0-1~exp1_amd64.deb 602809e9a7c5397ee3d79744aff15502af7241ab 406002 libmapscript-java_7.0.0-1~exp1_amd64.deb a8c30dd1d759a8cc9daa7626dfe77c9f51852ecd 282124 libmapscript-perl_7.0.0-1~exp1_amd64.deb 5b3972c83f89e879510a5d42f89a475793093856 5893240 libmapserver-dbg_7.0.0-1~exp1_amd64.deb 02162e43f5a6df799542e89b1666477c6e21a805 448628 libmapserver-dev_7.0.0-1~exp1_amd64.deb f52b5a1d34c51857c510f52eff1710e2800dca23 1078196 libmapserver2_7.0.0-1~exp1_amd64.deb ea0ab0a0f7825f7ba8a70a78468f5dbf6eb57cab 107084 mapserver-bin_7.0.0-1~exp1_amd64.deb 084d33dc90bb08b6694c310dfc8a8f1a113abcc0 90098 mapserver-doc_7.0.0-1~exp1_all.deb 789d7d15222bc459dd8dbc3b0f833806906d40be 166728 php5-mapscript_7.0.0-1~exp1_amd64.deb 64ea875887e4a74b080101401d795d992c64d582 212552 python-mapscript_7.0.0-1~exp1_amd64.deb a7f1df4423cbb593e76ffedc688e11ea852b01d6 220908 ruby-mapscript_7.0.0-1~exp1_amd64.deb Checksums-Sha256: c0fa5e5c4220d0e1e1d9c64c8408398f7b350afae589bf4bf3bdf9f0f31df409 3294 mapserver_7.0.0-1~exp1.dsc b31226e7612fc6d5fcafe0d00dc98ccfdf4e904ce55432702b329412186f6b86 2627534 mapserver_7.0.0.orig.tar.gz 45a456bc0bc32c6412028941bca4c6545076a55693d1625ea8806b5e60973f64 48512 mapserver_7.0.0-1~exp1.debian.tar.xz 597c9f47a04d166389de26bf71f68146d359e4b06c0071e328277f7abd225b4a 80524 cgi-mapserver_7.0.0-1~exp1_amd64.deb ee102b3f9b51eba3b315090abfb868198251acf37fdd23ca09d3ce9bd3947153 406002 libmapscript-java_7.0.0-1~exp1_amd64.deb 39d194a41cb78a9cbb8636f6407403895472f6649de92459a6bf3812f8dcb628 282124 libmapscript-perl_7.0.0-1~exp1_amd64.deb 3fa449ac24ad3733626db36de5f21f166a1e5b5946d95ac3bc03133737b8c26a 5893240 libmapserver-dbg_7.0.0-1~exp1_amd64.deb 732453bcb7e986b8ae74a08eaa1e1d08510443c3acf6de6b57b29bc42bccbb02 448628 libmapserver-dev_7.0.0-1~exp1_amd64.deb 12ff15261892a44b6d5c3ac2e82d152b25ded501c19e5224846e0948fc3535a5 1078196 libmapserver2_7.0.0-1~exp1_amd64.deb 681bb8188783d110e0c9c077f438ae3c8622fb71ade24f8c16723ca95a1841bb 107084 mapserver-bin_7.0.0-1~exp1_amd64.deb 431a58644e223e4173166fb311467159c23862259d024bdb9fd0994fa0f141b8 90098 mapserver-doc_7.0.0-1~exp1_all.deb f81d8072352e8356bd5bacb068353c8d58f954bd2f76c92b9a601fc5c27db135 166728 php5-mapscript_7.0.0-1~exp1_amd64.deb 318d6ffb9dcada3c07383625b27416de6d71295e6148296f9b9843a11dab31fe 212552 python-mapscript_7.0.0-1~exp1_amd64.deb e415323f6da9fc330b831588ee130340d2f590a9349b62663a8c7fb008bc5f34 220908 ruby-mapscript_7.0.0-1~exp1_amd64.deb Files: eac6357c2b38904a4b37a1d55a6b0862 3294 devel optional mapserver_7.0.0-1~exp1.dsc 791b907b0122df618cc0325d99ac7dde 2627534 devel optional mapserver_7.0.0.orig.tar.gz 0ddd2561b786a05c41504ad68b38cfd9 48512 devel optional mapserver_7.0.0-1~exp1.debian.tar.xz 18858e883513e5806a58a158ca49e76e 80524 web optional cgi-mapserver_7.0.0-1~exp1_amd64.deb c9e0da7e580b16043e5b14ab20243f32 406002 java optional libmapscript-java_7.0.0-1~exp1_amd64.deb e24a733db03ffcb3f57396f3fc6ce1be 282124 perl optional libmapscript-perl_7.0.0-1~exp1_amd64.deb b974a9f81585899a28bd472e090a51c1 5893240 debug extra libmapserver-dbg_7.0.0-1~exp1_amd64.deb 9e647cb9c3f7362394483a139f468c75 448628 libdevel optional libmapserver-dev_7.0.0-1~exp1_amd64.deb 644ac59e969d26d3e7a0417b851d184f 1078196 libs optional libmapserver2_7.0.0-1~exp1_amd64.deb 3fd54908025ce27132c524b504c98aed 107084 misc optional mapserver-bin_7.0.0-1~exp1_amd64.deb 927bef0fc9397c2fa5758f57292deefc
Bug#791105: libcitygml: library transition may be needed when GCC 5 is the default
On 03-07-15 15:11, Matthias Klose wrote: - If there are no reverse dependencies, it should be the package maintainers decision if a transition is needed. However this might break software which is not in the Debian archive, and built against these packages. - If a library transition is needed, please prepare for the change. Rename the library package, append v5 to the name of the package (e.g. libfoo2 - libfoo2v5). Such a change can be avoided, if you have a soversion bump and you upload this version instead of the renamed package. Prepare a patch and attach it to this issue (mark this issue with patch), so that it is possible to NMU such a package. We'll probably have more than hundred transitions triggered. Then reassign the issue to release.debian.org and properly tag it as a transition issue, by sending an email to cont...@bugs.debian.org: user release.debian@packages.debian.org usertag this issue + transition block this issue by 790756 reassign this issue release.debian.org libcitygml has no reverse dependencies, so a transition won't be required. I've uploaded a the latest upstream release from the renew development on GitHub to experimental. It includes as SONAME bump, and has been built with GCC 5.2 from experimental. The symbols on the other architectures need to be updated after the builds become available. Kind Regards, Bas -- GPG Key ID: 4096R/6750F10AE88D4AF1 Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
libcitygml_1.4.3-1~exp1_amd64.changes is NEW
binary:libcitygml-bin is NEW. binary:libcitygml-dev is NEW. binary:libcitygml1 is NEW. Your package has been put into the NEW queue, which requires manual action from the ftpteam to process. The upload was otherwise valid (it had a good OpenPGP signature and file hashes are valid), so please be patient. Packages are routinely processed through to the archive, and do feel free to browse the NEW queue[1]. If there is an issue with the upload, you will recieve an email from a member of the ftpteam. If you have any questions, you may reply to this email. [1]: https://ftp-master.debian.org/new.html ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] 09/35: Imported Upstream version 1.4.0
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libcitygml. commit 21abc1fa88c923d5fdfed2fe8706f90aad6e987a Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 16:29:28 2015 +0200 Imported Upstream version 1.4.0 --- CMakeLists.txt | 2 +- TODO.md| 18 ++-- sources/CMakeLists.txt | 4 + sources/include/citygml/citygmlfactory.h | 4 +- sources/include/citygml/geometry.h | 10 +- sources/include/citygml/linestring.h | 40 +++ sources/include/parser/attributes.h| 4 + sources/include/parser/cityobjectelementparser.h | 1 + .../include/parser/delayedchoiceelementparser.h| 7 ++ sources/include/parser/geocoordinatetransformer.h | 1 + sources/include/parser/linestringelementparser.h | 36 +++ sources/include/parser/nodetypes.h | 9 +- sources/src/citygml/citygmlfactory.cpp | 35 ++- sources/src/citygml/geometry.cpp | 22 +++- sources/src/citygml/linestring.cpp | 63 +++ sources/src/citygml/object.cpp | 12 +-- sources/src/parser/attributes.cpp | 10 +- sources/src/parser/cityobjectelementparser.cpp | 68 sources/src/parser/geocoordinatetransformer.cpp| 28 + sources/src/parser/geometryelementparser.cpp | 25 + .../src/parser/implicitgeometryelementparser.cpp | 24 - sources/src/parser/linestringelementparser.cpp | 116 + sources/src/parser/nodetypes.cpp | 17 ++- sources/src/parser/sequenceparser.cpp | 3 + 24 files changed, 485 insertions(+), 74 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 73e3255..281c887 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.2 FATAL_ERROR) PROJECT ( libcitygml ) set(META_VERSION_MAJOR 1) -set(META_VERSION_MINOR 3) +set(META_VERSION_MINOR 4) set(META_VERSION_PATCH 0) set(META_VERSION ${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH}) diff --git a/TODO.md b/TODO.md index b3c0d88..bc7613e 100644 --- a/TODO.md +++ b/TODO.md @@ -5,27 +5,27 @@ ... if not one should think about removing the tesselation from libcitygml * Check if OrientableSurfaces are supported properly... may be the vertices must be reverted if the orientation is '-' * Check if Appearance assignment is correct for shared polygons -* Check if non implicit geoemtries can be shared * Ensure that polygons that are children of shared geometries are not also children of non shared geometries (otherwise a coordinate transformation might be applied on the vertices which is not allowed for shared geometries) * The namespace of the different modules may differ from the recommended one... make a namespace mapping based on the uri * Currently different city object types are grouped under the same enum type (CityObjectType) e.g. WaterSurface, WaterGroundSurface, WaterClosureSurface and WaterBody are of type COT_WaterBody. The reason for this is that every enum type is identified by an individual bit... however there are only 32 bits. Check if the bitmask is actually used... if not remove that constraint and define an individual enum type for every CityObject type * Some polygon types (PolygonSurface, Polygon, Triangle etc.) have an implicit (planar) or explicit gml:SurfaceInterpolationType attribute... currently its ignored # Completness -* Implement parsing of CityObject generalizesTo member (contains a cityobject or references one that is the generalization of the current one) = requires cityobject sharing -* Implement parsing of CityObject externalReference member -* Implement complete address parsing: Currently the address attributes (street, postalcode, etc.) are stored as indivdual address attributes. However a address can be assigned zero or more 2D or 3D point geometries (one gml:MultiPoint geometry) locating the entrance. This requires parsing of the Address as an individual element -* Implement parsing of ImplicitGeometry libraryObject member +* Implement parsing of CityObject `generalizesTo` member (contains a cityobject or references one that is the generalization of the current one) =` requires cityobject sharing +* Implement parsing of CityObject `externalReference` member +* Implement complete address parsing: Currently the address attributes (street, postalcode, etc.) are stored as indivdual address attributes. However a address can be assigned zero or more 2D or 3D point geometries (one gml:MultiPoint geometry) locating the entrance. This requires parsing of the `Address` as an individual element +* Implement parsing of ImplicitGeometry
[libcitygml] 18/35: Refresh information-typo.diff patch.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libcitygml. commit a1415dc82e6d1802d6ce5860e7fab81cc2b445a4 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 16:57:32 2015 +0200 Refresh information-typo.diff patch. --- debian/changelog | 1 + debian/patches/information-typo.diff | 16 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index e4c302c..56192d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ libcitygml (1.4.3-1) UNRELEASED; urgency=medium * Update Vcs-Browser URL to use cgit instead of gitweb. * Update Homepage Source URLs for move to GitHub. * Update copyright file, use Comment instead of extended Copyright. + * Refresh information-typo.diff patch. -- Bas Couwenberg sebas...@debian.org Fri, 24 Jul 2015 16:31:57 +0200 diff --git a/debian/patches/information-typo.diff b/debian/patches/information-typo.diff index 1762f29..481c558 100644 --- a/debian/patches/information-typo.diff +++ b/debian/patches/information-typo.diff @@ -3,12 +3,12 @@ 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() +@@ -28,7 +28,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 + 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 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] 15/35: Update Homepage Source URLs for move to GitHub.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libcitygml. commit 380e3ca180fe8581e2e5cd6d9b124fadb8aac5d5 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 16:35:46 2015 +0200 Update Homepage Source URLs for move to GitHub. --- debian/changelog | 1 + debian/control | 2 +- debian/copyright | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9c235a8..a9e8e4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ libcitygml (1.4.3-1) UNRELEASED; urgency=medium * Add gbp.conf to use pristine-tar by default. * New upstream release. * Update Vcs-Browser URL to use cgit instead of gitweb. + * Update Homepage Source URLs for move to GitHub. -- Bas Couwenberg sebas...@debian.org Fri, 24 Jul 2015 16:31:57 +0200 diff --git a/debian/control b/debian/control index db5540b..d01428f 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: debhelper (= 9), Standards-Version: 3.9.5 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/libcitygml.git Vcs-Git: git://anonscm.debian.org/pkg-grass/libcitygml.git -Homepage: http://code.google.com/p/libcitygml +Homepage: https://github.com/jklimke/libcitygml Package: libcitygml0 Architecture: any diff --git a/debian/copyright b/debian/copyright index f73c768..c4bdec1 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: libcitygml -Source: http://code.google.com/p/libcitygml/ +Source: https://github.com/jklimke/libcitygml Files: * Copyright: 2010 Joachim Pouderoux jpouder...@gmail.com, BRGM -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] 14/35: Update Vcs-Browser URL to use cgit instead of gitweb.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libcitygml. commit 47cec9b6ff655bd6cb0626644d17663c983c0dd8 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 16:33:59 2015 +0200 Update Vcs-Browser URL to use cgit instead of gitweb. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1477d2c..9c235a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ libcitygml (1.4.3-1) UNRELEASED; urgency=medium * Update watch file for GitHub releases. * Add gbp.conf to use pristine-tar by default. * New upstream release. + * Update Vcs-Browser URL to use cgit instead of gitweb. -- Bas Couwenberg sebas...@debian.org Fri, 24 Jul 2015 16:31:57 +0200 diff --git a/debian/control b/debian/control index c0005b9..db5540b 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: debhelper (= 9), libopenscenegraph-dev (= 3.0.1-4~), pkg-kde-tools Standards-Version: 3.9.5 -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/libcitygml.git +Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/libcitygml.git Vcs-Git: git://anonscm.debian.org/pkg-grass/libcitygml.git Homepage: http://code.google.com/p/libcitygml -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] 19/35: Override dh_install to use --list-missing.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libcitygml. commit 97d68c3352d9f202f60fa0960b88ea1ece67a1e8 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 17:02:58 2015 +0200 Override dh_install to use --list-missing. --- debian/changelog | 1 + debian/rules | 3 +++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 56192d0..97fc575 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ libcitygml (1.4.3-1) UNRELEASED; urgency=medium * Update Homepage Source URLs for move to GitHub. * Update copyright file, use Comment instead of extended Copyright. * Refresh information-typo.diff patch. + * Override dh_install to use --list-missing. -- Bas Couwenberg sebas...@debian.org Fri, 24 Jul 2015 16:31:57 +0200 diff --git a/debian/rules b/debian/rules index 12d..d142875 100755 --- a/debian/rules +++ b/debian/rules @@ -13,6 +13,9 @@ override_dh_auto_clean: dh_auto_clean -rm -rf obj-*-* +override_dh_install: + dh_install --list-missing + override_dh_gencontrol: sh debian/gencontrol -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] 11/35: Imported Upstream version 1.4.3
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libcitygml. commit 9288a1e6adac1e54cc0687516649eb2d5241c726 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 16:29:29 2015 +0200 Imported Upstream version 1.4.3 --- CMakeLists.txt | 3 +- sources/CMakeLists.txt | 4 + sources/include/citygml/address.h | 36 sources/include/citygml/cityobject.h | 8 +- sources/include/parser/addressparser.h | 31 +++ sources/include/parser/nodetypes.h | 39 ++--- sources/src/citygml/address.cpp| 50 +++ sources/src/citygml/cityobject.cpp | 11 +++ sources/src/parser/addressparser.cpp | 114 + sources/src/parser/cityobjectelementparser.cpp | 32 +++ sources/src/parser/nodetypes.cpp | 38 - 11 files changed, 314 insertions(+), 52 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 281c887..d0ca992 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,8 @@ PROJECT ( libcitygml ) set(META_VERSION_MAJOR 1) set(META_VERSION_MINOR 4) -set(META_VERSION_PATCH 0) +set(META_VERSION_PATCH 3) + set(META_VERSION ${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH}) SET( CMAKE_MODULE_PATH ${libcitygml_SOURCE_DIR}/CMakeModules/;${CMAKE_MODULE_PATH} ) diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index d03f0a6..fc404af 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -41,6 +41,7 @@ SET(SOURCES src/citygml/polygonmanager.cpp src/citygml/geometrymanager.cpp src/citygml/linestring.cpp + src/citygml/address.cpp src/parser/nodetypes.cpp src/parser/attributes.cpp @@ -70,6 +71,7 @@ SET(SOURCES src/parser/linestringelementparser.cpp src/parser/linearringelementparser.cpp src/parser/implicitgeometryelementparser.cpp + src/parser/addressparser.cpp ) SET(PUBLIC_HEADER @@ -99,6 +101,7 @@ SET(PUBLIC_HEADER include/citygml/appearancetarget.h include/citygml/citygmlfactory.h include/citygml/linestring.h + include/citygml/address.h ) SET(HEADERS @@ -141,6 +144,7 @@ SET(HEADERS include/parser/linestringelementparser.h include/parser/linearringelementparser.h include/parser/implicitgeometryelementparser.h + include/parser/addressparser.h ) ADD_LIBRARY( ${target} ${LIBCITYGML_USER_DEFINED_DYNAMIC_OR_STATIC} ${SOURCES} ${HEADERS} ) diff --git a/sources/include/citygml/address.h b/sources/include/citygml/address.h new file mode 100644 index 000..df717d4 --- /dev/null +++ b/sources/include/citygml/address.h @@ -0,0 +1,36 @@ +#pragma once + +#include citygml/citygml_api.h +#include citygml/object.h + +namespace citygml { + +class LIBCITYGML_EXPORT Address: public Object +{ +public: +Address(const std::string id); + +const std::string country() const; +void setCountry(const std::string country); + +const std::string locality() const; +void setLocality(const std::string locality); + +const std::string postalCode() const; +void setPostalCode(const std::string postalCode); + +const std::string thoroughfareName() const; +void setThoroughfareName(const std::string thoroughfareName); + +const std::string thoroughfareNumber() const; +void setThoroughfareNumber(const std::string thoroughfareNumber); + +protected: +std::string m_country; +std::string m_locality; +std::string m_thoroughfareName; +std::string m_thoroughfareNumber; +std::string m_postalCode; +}; + +} /* namespace citygml */ diff --git a/sources/include/citygml/cityobject.h b/sources/include/citygml/cityobject.h index 9de0a66..00f19b0 100644 --- a/sources/include/citygml/cityobject.h +++ b/sources/include/citygml/cityobject.h @@ -16,6 +16,7 @@ namespace citygml { class Composite; class CityGMLLogger; class AppearanceManager; +class Address; class LIBCITYGML_EXPORT CityObject : public FeatureObject { @@ -88,13 +89,15 @@ namespace citygml { // Access the children unsigned int getChildCityObjectsCount() const; - const CityObject getChildCityObject( unsigned int i ) const; - CityObject getChildCityObject( unsigned int i ); void addChildCityObject(CityObject* cityObj); +// Access address +const Address* address() const; +void setAddress(std::unique_ptrAddress address); + void finish(Tesselator tesselator, bool optimize, std::shared_ptrcitygml::CityGMLLogger logger); virtual ~CityObject(); @@ -105,6 +108,7 @@ namespace citygml { std::vectorstd::unique_ptrGeometry m_geometries; std::vectorstd::unique_ptrImplicitGeometry m_implicitGeometries;
[libcitygml] 05/35: Imported Upstream version 1.2.1
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libcitygml. commit c62bd2ae8b86a93f8beb91f96950c780c87d455b Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 16:29:25 2015 +0200 Imported Upstream version 1.2.1 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] 10/35: Merge tag 'upstream/1.4.0'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libcitygml. commit 8983d510f093c88ceb24cc729f532ec529b61abd Merge: 9188509 21abc1f Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 16:29:28 2015 +0200 Merge tag 'upstream/1.4.0' Upstream version 1.4.0 CMakeLists.txt | 2 +- TODO.md| 18 ++-- sources/CMakeLists.txt | 4 + sources/include/citygml/citygmlfactory.h | 4 +- sources/include/citygml/geometry.h | 10 +- sources/include/citygml/linestring.h | 40 +++ sources/include/parser/attributes.h| 4 + sources/include/parser/cityobjectelementparser.h | 1 + .../include/parser/delayedchoiceelementparser.h| 7 ++ sources/include/parser/geocoordinatetransformer.h | 1 + sources/include/parser/linestringelementparser.h | 36 +++ sources/include/parser/nodetypes.h | 9 +- sources/src/citygml/citygmlfactory.cpp | 35 ++- sources/src/citygml/geometry.cpp | 22 +++- sources/src/citygml/linestring.cpp | 63 +++ sources/src/citygml/object.cpp | 12 +-- sources/src/parser/attributes.cpp | 10 +- sources/src/parser/cityobjectelementparser.cpp | 68 sources/src/parser/geocoordinatetransformer.cpp| 28 + sources/src/parser/geometryelementparser.cpp | 25 + .../src/parser/implicitgeometryelementparser.cpp | 24 - sources/src/parser/linestringelementparser.cpp | 116 + sources/src/parser/nodetypes.cpp | 17 ++- sources/src/parser/sequenceparser.cpp | 3 + 24 files changed, 485 insertions(+), 74 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] 02/35: Add gbp.conf to use pristine-tar by default.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libcitygml. commit 833b10226c3c118a628936c3d9ce83d994d12cfa Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 16:28:32 2015 +0200 Add gbp.conf to use pristine-tar by default. --- debian/changelog | 1 + debian/gbp.conf | 16 2 files changed, 17 insertions(+) diff --git a/debian/changelog b/debian/changelog index 47eb4f5..f9fe8b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ libcitygml (0.14+svn134-2+3p2p2) UNRELEASED; urgency=medium * Team upload. * Update watch file for GitHub releases. + * Add gbp.conf to use pristine-tar by default. -- Bas Couwenberg sebas...@debian.org Fri, 24 Jul 2015 16:27:50 +0200 diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 000..21d0417 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,16 @@ +[DEFAULT] + +# The default name for the upstream branch is upstream. +# Change it if the name is different (for instance, master). +upstream-branch = upstream + +# The default name for the Debian branch is master. +# Change it if the name is different (for instance, debian/unstable). +debian-branch = master + +# git-import-orig uses the following names for the upstream tags. +# Change the value if you are not using git-import-orig +upstream-tag = upstream/%(version)s + +# Always use pristine-tar. +pristine-tar = True -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] 04/35: Merge tag 'upstream/1.0'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libcitygml. commit edd4670dcc112113622274fd5e3f0516954ba395 Merge: 833b102 674a92f Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 16:29:24 2015 +0200 Merge tag 'upstream/1.0' Upstream version 1.0 .gitignore | 20 + .travis.yml| 14 + CMakeLists.txt | 157 +- CMakeModules/FindCityGML.cmake |2 +- CMakeModules/FindIconv.cmake | 54 - CMakeModules/FindXerces.cmake | 18 +- CMakeModules/ModuleInstall.cmake | 35 - CMakeModules/cmake_uninstall.cmake.in |2 +- README |5 - README.md | 13 + TODO.md| 22 + citygml_to_libcitygml_mapping.graphml | 1702 debian_scripts/postinst|1 + include/citygml.h | 749 - include/vecs.h | 331 libcitygml_classdiagram.graphml| 722 + osgplugin/CMakeLists.txt | 45 + osgplugin/CitygmlOsgViewer.cpp | 46 + {test/osgplugin = osgplugin}/README |0 osgplugin/ReaderWriterCityGML.cpp | 506 ++ sources/CMakeLists.txt | 142 ++ sources/include/citygml/appearance.h | 49 + sources/include/citygml/appearancemanager.h| 68 + sources/include/citygml/appearancetarget.h | 54 + .../include/citygml/appearancetargetdefinition.h | 46 + sources/include/citygml/citygml.h | 89 + sources/include/citygml/citygml_api.h.in | 20 + sources/include/citygml/citygmlfactory.h | 73 + sources/include/citygml/citygmllogger.h| 49 + sources/include/citygml/citymodel.h| 65 + sources/include/citygml/cityobject.h | 109 ++ sources/include/citygml/envelope.h | 45 + sources/include/citygml/featureobject.h| 25 + sources/include/citygml/geometry.h | 87 + sources/include/citygml/geometrymanager.h | 42 + sources/include/citygml/georeferencedtexture.h | 31 + sources/include/citygml/implictgeometry.h | 45 + sources/include/citygml/linearring.h | 42 + sources/include/citygml/material.h | 49 + sources/include/citygml/materialtargetdefinition.h | 20 + sources/include/citygml/object.h | 41 + sources/include/citygml/polygon.h | 121 ++ sources/include/citygml/polygonmanager.h | 42 + sources/include/citygml/tesselator.h | 86 + sources/include/citygml/texture.h | 61 + sources/include/citygml/texturecoordinates.h | 34 + sources/include/citygml/texturetargetdefinition.h | 52 + sources/include/citygml/transformmatrix.h | 26 + {src = sources/include/citygml}/utils.h | 143 +- sources/include/citygml/vecs.hpp | 338 sources/include/parser/appearanceelementparser.h | 34 + sources/include/parser/attributes.h| 36 + sources/include/parser/citygmldocumentparser.h | 86 + sources/include/parser/citygmlelementparser.h | 87 + sources/include/parser/citymodelelementparser.h| 35 + sources/include/parser/cityobjectelementparser.h | 53 + .../include/parser/delayedchoiceelementparser.h| 30 + sources/include/parser/documentlocation.h | 35 + sources/include/parser/elementparser.h | 56 + sources/include/parser/geocoordinatetransformer.h | 38 + sources/include/parser/geometryelementparser.h | 36 + .../parser/georeferencedtextureelementparser.h | 31 + .../include/parser/gmlfeaturecollectionparser.h| 28 + .../include/parser/implicitgeometryelementparser.h | 36 + sources/include/parser/linearringelementparser.h | 31 + sources/include/parser/materialelementparser.h | 34 + sources/include/parser/nodetypes.h | 290 sources/include/parser/parserutils.hpp | 92 ++ sources/include/parser/polygonelementparser.h | 33 + sources/include/parser/textureelementparser.h | 37 + sources/src/citygml/appearance.cpp | 77 + sources/src/citygml/appearancemanager.cpp | 100 ++ sources/src/citygml/appearancetarget.cpp | 123 ++ sources/src/citygml/citygmlfactory.cpp | 142 ++ sources/src/citygml/citymodel.cpp | 141 ++
[libcitygml] 08/35: Merge tag 'upstream/1.3.0'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libcitygml. commit 9188509318e0c2bd594695c68fc52880f0468d4a Merge: 1bd3865 17e4451 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 16:29:27 2015 +0200 Merge tag 'upstream/1.3.0' Upstream version 1.3.0 CMakeLists.txt | 4 +- SpecsToCheck.md| 24 ++ TODO.md| 22 +- osgplugin/CitygmlOsgViewer.cpp | 86 ++- osgplugin/ReaderWriterCityGML.cpp | 46 ++-- sources/CMakeLists.txt | 39 ++- sources/include/citygml/cityobject.h | 7 +- sources/include/citygml/material.h | 10 +- sources/include/parser/appearanceelementparser.h | 8 +- .../include/parser/delayedchoiceelementparser.h| 2 +- sources/include/parser/elementparser.h | 11 +- sources/include/parser/geometryelementparser.h | 7 +- .../include/parser/gmlfeaturecollectionparser.h| 9 +- ...featurecollectionparser.h = gmlobjectparser.h} | 16 +- .../include/parser/implicitgeometryelementparser.h | 7 +- sources/include/parser/linearringelementparser.h | 7 +- sources/include/parser/materialelementparser.h | 6 +- sources/include/parser/nodetypes.h | 120 - sources/include/parser/polygonelementparser.h | 7 +- sources/include/parser/sequenceparser.h| 43 sources/include/parser/skipelementparser.h | 35 +++ sources/include/parser/textureelementparser.h | 7 +- sources/src/citygml/appearancemanager.cpp | 2 +- sources/src/citygml/cityobject.cpp | 9 +- sources/src/citygml/material.cpp | 24 +- sources/src/parser/appearanceelementparser.cpp | 17 +- sources/src/parser/cityobjectelementparser.cpp | 146 +-- sources/src/parser/geometryelementparser.cpp | 57 +++-- .../parser/georeferencedtextureelementparser.cpp | 14 +- sources/src/parser/gmlfeaturecollectionparser.cpp | 31 +-- sources/src/parser/gmlobjectparser.cpp | 50 .../src/parser/implicitgeometryelementparser.cpp | 26 +- sources/src/parser/linearringelementparser.cpp | 11 +- sources/src/parser/materialelementparser.cpp | 28 ++- sources/src/parser/nodetypes.cpp | 277 ++--- sources/src/parser/polygonelementparser.cpp| 28 ++- sources/src/parser/sequenceparser.cpp | 55 sources/src/parser/skipelementparser.cpp | 56 + sources/src/parser/textureelementparser.cpp| 21 +- 39 files changed, 1150 insertions(+), 225 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] 06/35: Merge tag 'upstream/1.2.1'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libcitygml. commit 1bd386526ad22aa9c985221f31734a2aa59db92b Merge: edd4670 c62bd2a Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 16:29:26 2015 +0200 Merge tag 'upstream/1.2.1' Upstream version 1.2.1 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] branch master updated (2054188 - fcdfb77)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository libcitygml. from 2054188 Fix upstream version extraction from changelog. new 503e359 Update watch file for GitHub releases. new 833b102 Add gbp.conf to use pristine-tar by default. new 674a92f Imported Upstream version 1.0 new edd4670 Merge tag 'upstream/1.0' new c62bd2a Imported Upstream version 1.2.1 new 1bd3865 Merge tag 'upstream/1.2.1' new 17e4451 Imported Upstream version 1.3.0 new 9188509 Merge tag 'upstream/1.3.0' new 21abc1f Imported Upstream version 1.4.0 new 8983d51 Merge tag 'upstream/1.4.0' new 9288a1e Imported Upstream version 1.4.3 new 1fe65d6 Merge tag 'upstream/1.4.3' new 702acb8 New upstream release. new 47cec9b Update Vcs-Browser URL to use cgit instead of gitweb. new 380e3ca Update Homepage Source URLs for move to GitHub. new 9932f0c Update copyright file, use Comment instead of extended Copyright. new 89509e9 Disable remote_cmake.diff patch. new a1415dc Refresh information-typo.diff patch. new 97d68c3 Override dh_install to use --list-missing. new 97ff362 Split rewrite_cmake.diff into separate patches. new d9c865c Add upstream metadata. new 08cf69d Drop citygml2vrml, no longer included upstream. new b8a01c2 Drop SOVERSION from -dev -bin package name. new ef52a34 Rename library package for SONAME bump. new c8cc09e Don't install static library, no longer built. new cdc27a3 Drop openscenegraph plugin packages, FTBFS disabled by default. new 45d686f Add OpenGL build dependencies no longer pulled in by libopenscenegraph-dev. new 2a6a4a8 Install all *.md files in docs. new 7dde323 Drop libcitygml-symbols.sh, only needed for initial symbols file creation. new f6f52a5 Update symbols for amd64. new 5ae79af Bump Standards-Version to 3.9.6, no changes. new b0f4773 Update symbols for amd64 with GCC 5. new 40923cd Add explicit build dependencies on GCC 5.2. new e077203 Mark patches as Forwarded. new fcdfb77 Set distribution to experimental. The 35 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: .gitignore | 20 + .travis.yml| 14 + CMakeLists.txt | 158 +- CMakeModules/FindCityGML.cmake |2 +- CMakeModules/FindIconv.cmake | 54 - CMakeModules/FindXerces.cmake | 18 +- CMakeModules/ModuleInstall.cmake | 35 - CMakeModules/cmake_uninstall.cmake.in |2 +- README |5 - README.md | 13 + SpecsToCheck.md| 24 + TODO.md| 40 + citygml_to_libcitygml_mapping.graphml | 1702 ++ debian/README.source | 21 +- debian/changelog | 29 + debian/citygml2vrml.1 | 46 - debian/control | 77 +- debian/copyright | 15 +- debian/docs|4 +- debian/gbp.conf| 16 + debian/gencontrol |9 - ...citygml0-bin.install = libcitygml-bin.install} |0 ...tygml0-bin.manpages = libcitygml-bin.manpages} |0 ...citygml0-dev.install = libcitygml-dev.install} |1 - debian/libcitygml-symbols.sh | 37 - debian/libcitygml0.symbols | 666 -- .../{libcitygml0.install = libcitygml1.install} |0 debian/libcitygml1.symbols | 2482 .../openscenegraph-plugin-citygml-shared.install |1 - .../openscenegraph-plugin-citygml-static.install |1 - debian/patches/information-typo.diff | 19 +- debian/patches/install-citygmltest.diff| 13 + debian/patches/install-paths.diff | 55 + debian/patches/pkgconfig-support.diff | 16 +- debian/patches/rewrite_cmake.diff | 312 --- debian/patches/series |4 +- debian/patches/soversion.diff | 18 + debian/rules |4 +-
[libcitygml] 17/35: Disable remote_cmake.diff patch.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libcitygml. commit 89509e92046c3e206e10dbbba5e8fcce6afcbdaa Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 16:57:14 2015 +0200 Disable remote_cmake.diff patch. --- debian/patches/series | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/series b/debian/patches/series index 6554924..2f5c1b2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,3 @@ -rewrite_cmake.diff +#rewrite_cmake.diff pkgconfig-support.diff information-typo.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] 16/35: Update copyright file, use Comment instead of extended Copyright.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libcitygml. commit 9932f0c181d8c01b37e7c9b9003c353951a4a060 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 16:42:40 2015 +0200 Update copyright file, use Comment instead of extended Copyright. --- debian/changelog | 1 + debian/copyright | 13 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index a9e8e4d..e4c302c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ libcitygml (1.4.3-1) UNRELEASED; urgency=medium * New upstream release. * Update Vcs-Browser URL to use cgit instead of gitweb. * Update Homepage Source URLs for move to GitHub. + * Update copyright file, use Comment instead of extended Copyright. -- Bas Couwenberg sebas...@debian.org Fri, 24 Jul 2015 16:31:57 +0200 diff --git a/debian/copyright b/debian/copyright index c4bdec1..2b10a81 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,11 +3,12 @@ Upstream-Name: libcitygml Source: https://github.com/jklimke/libcitygml Files: * -Copyright: 2010 Joachim Pouderoux jpouder...@gmail.com, BRGM - libcitygml is developed by the 3D team of BRGM (the French leading public - institution involved in the Earth Science field for the sustainable management - of natural resources and surface and subsurface risks) for the research project - DeepCity3D. +Copyright: 2010, Joachim Pouderoux jpouder...@gmail.com, BRGM +Comment: libcitygml was initally developed by the 3D team of BRGM (the French + leading public institution involved in the Earth Science field for the + sustainable management of natural resources and surface and subsurface risks) + for the research project DeepCity3D. It is now conducted as a Github open + source project. License: LGPL-2.1+ libcitygml is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -23,7 +24,7 @@ License: LGPL-2.1+ /usr/share/common-licenses/LGPL-2.1. Files: debian/* -Copyright: 2011 YunQiang Su wzss...@gmail.com +Copyright: 2011, YunQiang Su wzss...@gmail.com License: GPL-2+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] 13/35: New upstream release.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libcitygml. commit 702acb859d6d59dc9f2599a2e02d57fd63beb9cb Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 16:32:24 2015 +0200 New upstream release. --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f9fe8b0..1477d2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ -libcitygml (0.14+svn134-2+3p2p2) UNRELEASED; urgency=medium +libcitygml (1.4.3-1) UNRELEASED; urgency=medium * Team upload. * Update watch file for GitHub releases. * Add gbp.conf to use pristine-tar by default. + * New upstream release. - -- Bas Couwenberg sebas...@debian.org Fri, 24 Jul 2015 16:27:50 +0200 + -- Bas Couwenberg sebas...@debian.org Fri, 24 Jul 2015 16:31:57 +0200 libcitygml (0.14+svn134-2+3p2p1) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] annotated tag upstream/1.2.1 created (now a79f429)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/1.2.1 in repository libcitygml. at a79f429 (tag) tagging c62bd2ae8b86a93f8beb91f96950c780c87d455b (commit) replaces upstream/1.0 tagged by Bas Couwenberg on Fri Jul 24 16:29:26 2015 +0200 - Log - Upstream version 1.2.1 Bas Couwenberg (1): Imported Upstream version 1.2.1 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] tag debian/1.4.3-1.exp1 created (now fcdfb77)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/1.4.3-1.exp1 in repository libcitygml. at fcdfb77 (commit) No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] 35/35: Set distribution to experimental.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libcitygml. commit fcdfb774a60bfb24e58489ffb770078d9518d689 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Jul 25 01:21:39 2015 +0200 Set distribution to experimental. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0c91094..ce4faa3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libcitygml (1.4.3-1) UNRELEASED; urgency=medium +libcitygml (1.4.3-1~exp1) experimental; urgency=medium * Team upload. * Update watch file for GitHub releases. @@ -25,7 +25,7 @@ libcitygml (1.4.3-1) UNRELEASED; urgency=medium * Bump Standards-Version to 3.9.6, no changes. * Add explicit build dependencies on GCC 5.2. - -- Bas Couwenberg sebas...@debian.org Fri, 24 Jul 2015 16:31:57 +0200 + -- Bas Couwenberg sebas...@debian.org Sat, 25 Jul 2015 01:21:25 +0200 libcitygml (0.14+svn134-2+3p2p1) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] 32/35: Update symbols for amd64 with GCC 5.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libcitygml. commit b0f477363b49138ef6d423f4b69a8768dc9cfb41 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Jul 25 01:06:20 2015 +0200 Update symbols for amd64 with GCC 5. --- debian/changelog | 2 +- debian/libcitygml1.symbols | 358 ++--- 2 files changed, 336 insertions(+), 24 deletions(-) diff --git a/debian/changelog b/debian/changelog index a6741f5..e505d1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,7 +21,7 @@ libcitygml (1.4.3-1) UNRELEASED; urgency=medium * Install all *.md files in docs. * Drop libcitygml-symbols.sh, only needed for initial symbols file creation. - * Update symbols for amd64. + * Update symbols for amd64 with GCC 5. * Bump Standards-Version to 3.9.6, no changes. -- Bas Couwenberg sebas...@debian.org Fri, 24 Jul 2015 16:31:57 +0200 diff --git a/debian/libcitygml1.symbols b/debian/libcitygml1.symbols index 1b22641..4705051 100644 --- a/debian/libcitygml1.symbols +++ b/debian/libcitygml1.symbols @@ -4,13 +4,16 @@ libcitygml.so.1 libcitygml1 #MINVER# #MISSING: 1.4.3# (optional=templinst)_Z10parseValueI5TVec3IdEEvRSt18basic_stringstreamIcSt11char_traitsIcESaIcEERT_P12GeoTransformRKS1_@Base 0.14 #MISSING: 1.4.3# (optional=templinst)_Z10parseValueIbEvRSt18basic_stringstreamIcSt11char_traitsIcESaIcEERT_@Base 0.14 #MISSING: 1.4.3# _Z10trim_rightRKSsS0_@Base 0.14 + _Z11toStdStringB5cxx11PKt@Base 1.4.3 _Z11toStdStringPKt@Base 1.4.3 #MISSING: 1.4.3# (optional=templinst)_Z12parseVecListI5TVec2IfEEvRSt18basic_stringstreamIcSt11char_traitsIcESaIcEERSt6vectorIT_SaIS9_EE@Base 0.14 #MISSING: 1.4.3# (optional=templinst)_Z12parseVecListI5TVec3IdEEvRSt18basic_stringstreamIcSt11char_traitsIcESaIcEERSt6vectorIT_SaIS9_EEP12GeoTransformRKS1_@Base 0.14 #MISSING: 1.4.3# (optional=templinst)_Z12parseVecListIfEvRSt18basic_stringstreamIcSt11char_traitsIcESaIcEERSt6vectorIT_SaIS7_EE@Base 0.14 + _Z14toXercesStringRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 1.4.3 _Z14toXercesStringRKSs@Base 1.4.3 #MISSING: 1.4.3# _Z17ci_string_compareRKSsS0_@Base 0.14 #MISSING: 1.4.3# _Z4trimRKSsS0_@Base 0.14 + _Z7toLowerRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 1.4.3 _Z7toLowerRKSs@Base 1.4.3 #MISSING: 1.4.3# _Z8tokenizeRKSsS0_@Base 0.14 #MISSING: 1.4.3# _Z9trim_leftRKSsS0_@Base 0.14 @@ -70,6 +73,7 @@ libcitygml.so.1 libcitygml1 #MINVER# _ZN11xercesc_3_114DefaultHandlerD0Ev@Base 1.4.3 _ZN11xercesc_3_114DefaultHandlerD1Ev@Base 1.4.3 _ZN11xercesc_3_114DefaultHandlerD2Ev@Base 1.4.3 + _ZN12GeoTransform12setSourceSRSERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 1.4.3 #MISSING: 1.4.3# _ZN12GeoTransform13getProjectionERKSs@Base 0.14 #MISSING: 1.4.3# _ZN12GeoTransformC1ERKSsS1_@Base 0.14 #MISSING: 1.4.3# _ZN12GeoTransformC2ERKSsS1_@Base 0.14 @@ -92,16 +96,20 @@ libcitygml.so.1 libcitygml1 #MINVER# _ZN20CityGMLHandlerXercesD1Ev@Base 1.4.3 _ZN20CityGMLHandlerXercesD2Ev@Base 1.4.3 #MISSING: 1.4.3# _ZN21CityGMLHandlerLibXml212getAttributeEPvRKSsS2_@Base 0.14 + _ZN7citygml10Appearance10addToThemeENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 1.4.3 _ZN7citygml10Appearance10addToThemeESs@Base 1.4.3 _ZN7citygml10Appearance10asMaterialEv@Base 1.4.3 _ZN7citygml10Appearance10setIsFrontEb@Base 1.4.3 _ZN7citygml10Appearance22asGeoreferencedTextureEv@Base 1.4.3 _ZN7citygml10Appearance9asTextureEv@Base 1.4.3 + _ZN7citygml10AppearanceC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_@Base 1.4.3 _ZN7citygml10AppearanceC1ERKSsS2_@Base 1.4.3 + _ZN7citygml10AppearanceC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_@Base 1.4.3 _ZN7citygml10AppearanceC2ERKSsS2_@Base 1.4.3 _ZN7citygml10AppearanceD0Ev@Base 0.14 _ZN7citygml10AppearanceD1Ev@Base 0.14 _ZN7citygml10AppearanceD2Ev@Base 0.14 + _ZN7citygml10Attributes13getXLinkValueB5cxx11Ev@Base 1.4.3 _ZN7citygml10Attributes13getXLinkValueEv@Base 1.4.3 _ZN7citygml10AttributesC1ESt10shared_ptrINS_13CityGMLLoggerEE@Base 1.4.3 _ZN7citygml10AttributesC2ESt10shared_ptrINS_13CityGMLLoggerEE@Base 1.4.3 @@ -119,8 +127,10 @@ libcitygml.so.1 libcitygml1 #MINVER# _ZN7citygml10CityObject19getImplicitGeometryEj@Base 1.4.3 _ZN7citygml10CityObject6finishER10TesselatorbSt10shared_ptrINS_13CityGMLLoggerEE@Base 1.4.3 #MISSING: 1.4.3# _ZN7citygml10CityObject6finishERNS_17AppearanceManagerERKNS_12ParserParamsE@Base 0.14 + _ZN7citygml10CityObjectC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS0_15CityObjectsTypeE@Base 1.4.3 _ZN7citygml10CityObjectC1ERKSsNS0_15CityObjectsTypeE@Base 1.4.3 #MISSING: 1.4.3# (arch=amd64 i386)_ZN7citygml10CityObjectC1ERKSsNS_15CityObjectsTypeE@Base 0.14 + _ZN7citygml10CityObjectC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS0_15CityObjectsTypeE@Base 1.4.3
[libcitygml] 01/05: pristine-tar data for libcitygml_1.0.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository libcitygml. commit a8530c180bd76b342028c596fe2628eeff3c3801 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 16:29:24 2015 +0200 pristine-tar data for libcitygml_1.0.orig.tar.gz --- libcitygml_1.0.orig.tar.gz.delta | Bin 0 - 5359 bytes libcitygml_1.0.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/libcitygml_1.0.orig.tar.gz.delta b/libcitygml_1.0.orig.tar.gz.delta new file mode 100644 index 000..34abe32 Binary files /dev/null and b/libcitygml_1.0.orig.tar.gz.delta differ diff --git a/libcitygml_1.0.orig.tar.gz.id b/libcitygml_1.0.orig.tar.gz.id new file mode 100644 index 000..44e73f3 --- /dev/null +++ b/libcitygml_1.0.orig.tar.gz.id @@ -0,0 +1 @@ +4c6c6723d6cb44d12f32a01fb3cf9b0d1994ea91 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] 03/05: pristine-tar data for libcitygml_1.3.0.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository libcitygml. commit eb9689608af72879c0f48381d6e9d28df4519b7b Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 16:29:27 2015 +0200 pristine-tar data for libcitygml_1.3.0.orig.tar.gz --- libcitygml_1.3.0.orig.tar.gz.delta | Bin 0 - 5791 bytes libcitygml_1.3.0.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/libcitygml_1.3.0.orig.tar.gz.delta b/libcitygml_1.3.0.orig.tar.gz.delta new file mode 100644 index 000..988bd48 Binary files /dev/null and b/libcitygml_1.3.0.orig.tar.gz.delta differ diff --git a/libcitygml_1.3.0.orig.tar.gz.id b/libcitygml_1.3.0.orig.tar.gz.id new file mode 100644 index 000..050ce89 --- /dev/null +++ b/libcitygml_1.3.0.orig.tar.gz.id @@ -0,0 +1 @@ +0a6b830fc588331fee6aa3a55b8a98ad8c922fea -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] 05/05: pristine-tar data for libcitygml_1.4.3.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository libcitygml. commit 6daab6330c7d2ff02b1d1ff6806954f6f945a239 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 16:29:30 2015 +0200 pristine-tar data for libcitygml_1.4.3.orig.tar.gz --- libcitygml_1.4.3.orig.tar.gz.delta | Bin 0 - 6335 bytes libcitygml_1.4.3.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/libcitygml_1.4.3.orig.tar.gz.delta b/libcitygml_1.4.3.orig.tar.gz.delta new file mode 100644 index 000..9afebfd Binary files /dev/null and b/libcitygml_1.4.3.orig.tar.gz.delta differ diff --git a/libcitygml_1.4.3.orig.tar.gz.id b/libcitygml_1.4.3.orig.tar.gz.id new file mode 100644 index 000..3355ce9 --- /dev/null +++ b/libcitygml_1.4.3.orig.tar.gz.id @@ -0,0 +1 @@ +730631d3e154daf38d8e0922f92651bbe54b57c6 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] branch upstream updated (79034d7 - 9288a1e)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch upstream in repository libcitygml. from 79034d7 Imported Upstream version 0.14+svn134 new 674a92f Imported Upstream version 1.0 new c62bd2a Imported Upstream version 1.2.1 new 17e4451 Imported Upstream version 1.3.0 new 21abc1f Imported Upstream version 1.4.0 new 9288a1e Imported Upstream version 1.4.3 The 5 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: .gitignore | 20 + .travis.yml| 14 + CMakeLists.txt | 158 +- CMakeModules/FindCityGML.cmake |2 +- CMakeModules/FindIconv.cmake | 54 - CMakeModules/FindXerces.cmake | 18 +- CMakeModules/ModuleInstall.cmake | 35 - CMakeModules/cmake_uninstall.cmake.in |2 +- README |5 - README.md | 13 + SpecsToCheck.md| 24 + TODO.md| 40 + citygml_to_libcitygml_mapping.graphml | 1702 debian_scripts/postinst|1 + include/citygml.h | 749 - include/vecs.h | 331 libcitygml_classdiagram.graphml| 722 + osgplugin/CMakeLists.txt | 45 + osgplugin/CitygmlOsgViewer.cpp | 128 ++ {test/osgplugin = osgplugin}/README |0 osgplugin/ReaderWriterCityGML.cpp | 508 ++ sources/CMakeLists.txt | 165 ++ sources/include/citygml/address.h | 36 + sources/include/citygml/appearance.h | 49 + sources/include/citygml/appearancemanager.h| 68 + sources/include/citygml/appearancetarget.h | 54 + .../include/citygml/appearancetargetdefinition.h | 46 + sources/include/citygml/citygml.h | 89 + sources/include/citygml/citygml_api.h.in | 20 + sources/include/citygml/citygmlfactory.h | 75 + sources/include/citygml/citygmllogger.h| 49 + sources/include/citygml/citymodel.h| 65 + sources/include/citygml/cityobject.h | 118 ++ sources/include/citygml/envelope.h | 45 + sources/include/citygml/featureobject.h| 25 + sources/include/citygml/geometry.h | 91 ++ sources/include/citygml/geometrymanager.h | 42 + sources/include/citygml/georeferencedtexture.h | 31 + sources/include/citygml/implictgeometry.h | 45 + sources/include/citygml/linearring.h | 42 + sources/include/citygml/linestring.h | 40 + sources/include/citygml/material.h | 57 + sources/include/citygml/materialtargetdefinition.h | 20 + sources/include/citygml/object.h | 41 + sources/include/citygml/polygon.h | 121 ++ sources/include/citygml/polygonmanager.h | 42 + sources/include/citygml/tesselator.h | 86 + sources/include/citygml/texture.h | 61 + sources/include/citygml/texturecoordinates.h | 34 + sources/include/citygml/texturetargetdefinition.h | 52 + sources/include/citygml/transformmatrix.h | 26 + {src = sources/include/citygml}/utils.h | 143 +- sources/include/citygml/vecs.hpp | 338 sources/include/parser/addressparser.h | 31 + sources/include/parser/appearanceelementparser.h | 38 + sources/include/parser/attributes.h| 40 + sources/include/parser/citygmldocumentparser.h | 86 + sources/include/parser/citygmlelementparser.h | 87 + sources/include/parser/citymodelelementparser.h| 35 + sources/include/parser/cityobjectelementparser.h | 54 + .../include/parser/delayedchoiceelementparser.h| 37 + sources/include/parser/documentlocation.h | 35 + sources/include/parser/elementparser.h | 65 + sources/include/parser/geocoordinatetransformer.h | 39 + sources/include/parser/geometryelementparser.h | 39 + .../parser/georeferencedtextureelementparser.h | 31 + .../include/parser/gmlfeaturecollectionparser.h| 33 + sources/include/parser/gmlobjectparser.h | 28 + .../include/parser/implicitgeometryelementparser.h | 39 +
[libcitygml] 20/35: Split rewrite_cmake.diff into separate patches.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libcitygml. commit 97ff362f772d6d7f70ce6e0f05584e1a6ea63fc5 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 18:37:53 2015 +0200 Split rewrite_cmake.diff into separate patches. --- debian/changelog| 1 + debian/patches/install-citygmltest.diff | 12 ++ debian/patches/install-paths.diff | 54 ++ debian/patches/pkgconfig-support.diff | 13 +- debian/patches/rewrite_cmake.diff | 312 debian/patches/series | 4 +- debian/patches/soversion.diff | 17 ++ 7 files changed, 98 insertions(+), 315 deletions(-) diff --git a/debian/changelog b/debian/changelog index 97fc575..ed132b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ libcitygml (1.4.3-1) UNRELEASED; urgency=medium * Update copyright file, use Comment instead of extended Copyright. * Refresh information-typo.diff patch. * Override dh_install to use --list-missing. + * Split rewrite_cmake.diff into separate patches. -- Bas Couwenberg sebas...@debian.org Fri, 24 Jul 2015 16:31:57 +0200 diff --git a/debian/patches/install-citygmltest.diff b/debian/patches/install-citygmltest.diff new file mode 100644 index 000..553720a --- /dev/null +++ b/debian/patches/install-citygmltest.diff @@ -0,0 +1,12 @@ +Description: Install citygmltest utility. +Author: YunQiang Su wzss...@gmail.com + +--- a/test/CMakeLists.txt b/test/CMakeLists.txt +@@ -41,3 +41,6 @@ ADD_EXECUTABLE( citygmltest ${PRG_SRCS} + # ENDIF( MSVC_IDE ) + + TARGET_LINK_LIBRARIES( citygmltest citygml ${XERCESC_LIBRARY} ${OPENGL_LIBRARIES} ) ++ ++install(TARGETS citygmltest RUNTIME DESTINATION ${BIN_INSTALL_DIR}) ++ diff --git a/debian/patches/install-paths.diff b/debian/patches/install-paths.diff new file mode 100644 index 000..3e578f2 --- /dev/null +++ b/debian/patches/install-paths.diff @@ -0,0 +1,54 @@ +Description: Add user customizable install paths. +Author: YunQiang Su wzss...@gmail.com + +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -97,6 +97,28 @@ SET(OUTPUT_LIBDIR ${PROJECT_BINARY_DIR}/ + MAKE_DIRECTORY(${OUTPUT_LIBDIR}) + SET(LIBRARY_OUTPUT_PATH ${OUTPUT_LIBDIR}) + ++if(NOT DEFINED BIN_INSTALL_DIR) ++set(BIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin) ++endif(NOT DEFINED BIN_INSTALL_DIR) ++if(NOT DEFINED LIB_INSTALL_DIR) ++set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib) ++endif(NOT DEFINED LIB_INSTALL_DIR) ++if(NOT DEFINED DATA_INSTALL_DIR) ++set(DATA_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share) ++endif(NOT DEFINED DATA_INSTALL_DIR) ++if(NOT DEFINED INCLUDE_INSTALL_DIR) ++set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/citygml) ++endif(NOT DEFINED INCLUDE_INSTALL_DIR) ++if(NOT DEFINED MAN_INSTALL_DIR) ++set(MAN_INSTALL_DIR ${DATA_INSTALL_DIR}/man) ++endif(NOT DEFINED MAN_INSTALL_DIR) ++if(NOT DEFINED RESOURCE_INSTALL_DIR) ++set(RESOURCE_INSTALL_DIR ${DATA_INSTALL_DIR}/libcitygml${META_VERSION_MAJOR}/resource/) ++endif(NOT DEFINED RESOURCE_INSTALL_DIR) ++if(NOT DEFINED LOCALE_INSTALL_DIR) ++set(LOCALE_INSTALL_DIR ${DATA_INSTALL_DIR}/locale/) ++endif(NOT DEFINED LOCALE_INSTALL_DIR) ++ + # IF( DEBUG_BUILD ) + # SET( CMAKE_BUILD_TYPE Debug ) + # ELSE( DEBUG_BUILD ) +--- a/sources/CMakeLists.txt b/sources/CMakeLists.txt +@@ -153,13 +153,13 @@ TARGET_LINK_LIBRARIES( ${target} ${XERCE + + INSTALL( + TARGETS ${target} +-RUNTIME DESTINATION bin +-LIBRARY DESTINATION lib +-ARCHIVE DESTINATION lib ++RUNTIME DESTINATION ${BIN_INSTALL_DIR} ++LIBRARY DESTINATION ${LIB_INSTALL_DIR} ++ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + ) + # FIXME: Do not run for OS X framework + INSTALL( + FILES${PUBLIC_HEADER} +-DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${target} ++DESTINATION ${INCLUDE_INSTALL_DIR} + ) + diff --git a/debian/patches/pkgconfig-support.diff b/debian/patches/pkgconfig-support.diff index 91e3828..efc490b 100644 --- a/debian/patches/pkgconfig-support.diff +++ b/debian/patches/pkgconfig-support.diff @@ -2,7 +2,7 @@ Description: add pkg-config support for libcitygml Author: YunQiang Su wzss...@gmail.com Last-Update: 2011-06-13 --- /dev/null -+++ b/src/citygml.pc.cmake b/sources/citygml.pc.cmake @@ -0,0 +1,11 @@ +prefix=${CMAKE_INSTALL_PREFIX} +exec_prefix=${BIN_INSTALL_DIR} @@ -12,6 +12,15 @@ Last-Update: 2011-06-13 +Name: citygml +Description: Read and Write CityGML files +Requires: libxml-2.0 glu -+Version: ${PACKAGE_VERSION} ++Version: ${META_VERSION} +Libs: -L${LIB_INSTALL_DIR} -lcitygml +Cflags: -I${INCLUDE_INSTALL_DIR} +--- a/sources/CMakeLists.txt b/sources/CMakeLists.txt +@@ -163,3 +163,6 @@ INSTALL( + DESTINATION ${INCLUDE_INSTALL_DIR} + ) + ++configure_file(citygml.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/citygml.pc) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/citygml.pc
[libcitygml] 28/35: Install all *.md files in docs.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libcitygml. commit 2a6a4a8879e58861d71884b1c9f09c9ad635ee56 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Jul 25 00:18:51 2015 +0200 Install all *.md files in docs. --- debian/changelog | 1 + debian/docs | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8337da8..3e5920b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ libcitygml (1.4.3-1) UNRELEASED; urgency=medium * Drop openscenegraph plugin packages, FTBFS disabled by default. * Add OpenGL build dependencies no longer pulled in by libopenscenegraph-dev. + * Install all *.md files in docs. -- Bas Couwenberg sebas...@debian.org Fri, 24 Jul 2015 16:31:57 +0200 diff --git a/debian/docs b/debian/docs index e845566..e759032 100644 --- a/debian/docs +++ b/debian/docs @@ -1 +1,3 @@ -README +README.md +SpecsToCheck.md +TODO.md -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] 27/35: Add OpenGL build dependencies no longer pulled in by libopenscenegraph-dev.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libcitygml. commit 45d686f7e8ccf5e662af213a998c38b464ee46ae Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Jul 25 00:06:10 2015 +0200 Add OpenGL build dependencies no longer pulled in by libopenscenegraph-dev. --- debian/changelog | 2 ++ debian/control | 2 ++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 88c05be..8337da8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ libcitygml (1.4.3-1) UNRELEASED; urgency=medium * Rename library package for SONAME bump. * Don't install static library, no longer built. * Drop openscenegraph plugin packages, FTBFS disabled by default. + * Add OpenGL build dependencies no longer pulled in by +libopenscenegraph-dev. -- Bas Couwenberg sebas...@debian.org Fri, 24 Jul 2015 16:31:57 +0200 diff --git a/debian/control b/debian/control index ff8565f..0aa1a0e 100644 --- a/debian/control +++ b/debian/control @@ -7,6 +7,8 @@ Build-Depends: debhelper (= 9), cmake, libxml2-dev, libgdal-dev, + libgl1-mesa-dev | libgl-dev, + libglu-dev, pkg-kde-tools Standards-Version: 3.9.5 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/libcitygml.git -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] 22/35: Drop citygml2vrml, no longer included upstream.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libcitygml. commit 08cf69d770929849ea81f604c05d77ffc0fac961 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 21:34:58 2015 +0200 Drop citygml2vrml, no longer included upstream. --- debian/changelog | 1 + debian/citygml2vrml.1 | 46 -- debian/control| 4 ++-- 3 files changed, 3 insertions(+), 48 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9d5e79a..daf9783 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ libcitygml (1.4.3-1) UNRELEASED; urgency=medium * Override dh_install to use --list-missing. * Split rewrite_cmake.diff into separate patches. * Add upstream metadata. + * Drop citygml2vrml, no longer included upstream. -- Bas Couwenberg sebas...@debian.org Fri, 24 Jul 2015 16:31:57 +0200 diff --git a/debian/citygml2vrml.1 b/debian/citygml2vrml.1 deleted file mode 100644 index 35495ae..000 --- a/debian/citygml2vrml.1 +++ /dev/null @@ -1,46 +0,0 @@ -.\ DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.2. -.TH CITYGML2VRML 1 June 2011 citygml2vrml v.0.1.4 (c) 2010 Joachim Pouderoux, BRGM User Commands -.SH NAME -citygml2vrml \- Convert citygml files to vrml -.SH DESCRIPTION -citygml2vrml v.0.1.4 (c) 2010 Joachim Pouderoux, BRGM -.PP -This program converts CityGML files to a VRML97 representation -More info updates on http://code.google.com/p/libcitygml -Version built on Jun 13 2011 at 19:28:08 with libcitygml v.0.1.4 -.IP -Usage: citygml2vrml [\-options...] input.gml [output.wrl] -Options: -.TP -\fB\-optimize\fR -Merge geometries polygons with similar properties to -reduce file scene size (recommended) -.TP -\fB\-comments\fR -Add comments about the object ids to the VRML file -.TP -\fB\-center\fR -Center the model around the first encountered point -(may be used to reduce z\-fighting artifacts) -.TP -\fB\-filter\fR mask -CityGML objects to parse (default:All) -The mask is composed of: -.IP -GenericCityObject, Building, Room, -BuildingInstallation, BuildingFurniture, Door, Window, -CityFurniture, Track, Road, Railway, Square, PlantCover, -SolitaryVegetationObject, WaterBody, TINRelief, LandUse, -Tunnel, Bridge, BridgeConstructionElement, -BridgeInstallation, BridgePart, All -.IP -and seperators |,,~. -Examples: -All~Track~Room to parse everything but tracks rooms -RoadRailway to parse only roads railways -.HP -\fB\-minLOD\fR level Minimum LOD level to parse (default:0) -.HP -\fB\-maxLOD\fR level Maximum LOD level to parse (default:4) -.HP -\fB\-destSRS\fR srs Destination SRS (default: no transform) diff --git a/debian/control b/debian/control index d01428f..280f5ee 100644 --- a/debian/control +++ b/debian/control @@ -61,7 +61,7 @@ Section: utils Depends: ${shlibs:Depends}, ${misc:Depends}, libcitygml0 (= ${binary:Version}) -Description: Utils of libcitygml - citygml2vrml and citygmltest +Description: Utils of libcitygml - citygmltest libcitygml is a small and easy to use open source C++ library for parsing CityGML files in such a way that data can be easily exploited by 3D rendering applications (geometry data are tesselated and optimized for @@ -73,7 +73,7 @@ Description: Utils of libcitygml - citygml2vrml and citygmltest modelling and exchange of georeferenced 3D city and landscape models that is quickly being adopted on an international level. . - This package contains citygml2vrml and citygmltest. + This package contains the citygmltest utility. Package: openscenegraph-plugin-citygml-shared Architecture: any -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] 21/35: Add upstream metadata.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libcitygml. commit d9c865c8332eb051fb37106397981c74ac203d6a Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 21:30:45 2015 +0200 Add upstream metadata. --- debian/changelog | 1 + debian/upstream/metadata | 6 ++ 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index ed132b8..9d5e79a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ libcitygml (1.4.3-1) UNRELEASED; urgency=medium * Refresh information-typo.diff patch. * Override dh_install to use --list-missing. * Split rewrite_cmake.diff into separate patches. + * Add upstream metadata. -- Bas Couwenberg sebas...@debian.org Fri, 24 Jul 2015 16:31:57 +0200 diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 000..2d35d53 --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,6 @@ +--- +Bug-Database: https://github.com/jklimke/libcitygml/issues +Bug-Submit: https://github.com/jklimke/libcitygml/issues/new +Name: libcitygml +Repository: https://github.com/jklimke/libcitygml.git +Repository-Browse: https://github.com/jklimke/libcitygml -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] 31/35: Bump Standards-Version to 3.9.6, no changes.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libcitygml. commit 5ae79aff2e1308e79a6f6bcf29c892b75a6d8a01 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Jul 25 00:51:40 2015 +0200 Bump Standards-Version to 3.9.6, no changes. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8522998..a6741f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ libcitygml (1.4.3-1) UNRELEASED; urgency=medium * Drop libcitygml-symbols.sh, only needed for initial symbols file creation. * Update symbols for amd64. + * Bump Standards-Version to 3.9.6, no changes. -- Bas Couwenberg sebas...@debian.org Fri, 24 Jul 2015 16:31:57 +0200 diff --git a/debian/control b/debian/control index 0aa1a0e..8948ec1 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: debhelper (= 9), libgl1-mesa-dev | libgl-dev, libglu-dev, pkg-kde-tools -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/libcitygml.git Vcs-Git: git://anonscm.debian.org/pkg-grass/libcitygml.git Homepage: https://github.com/jklimke/libcitygml -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] 29/35: Drop libcitygml-symbols.sh, only needed for initial symbols file creation.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libcitygml. commit 7dde323cae88bab5545acb5d7a2250442546500b Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Jul 25 00:20:05 2015 +0200 Drop libcitygml-symbols.sh, only needed for initial symbols file creation. --- debian/README.source | 10 ++ debian/changelog | 2 ++ debian/libcitygml-symbols.sh | 37 - 3 files changed, 4 insertions(+), 45 deletions(-) diff --git a/debian/README.source b/debian/README.source index 08c515c..7cc4ccc 100644 --- a/debian/README.source +++ b/debian/README.source @@ -1,15 +1,9 @@ Symbols --- -The symbols file is maintained using pkgkde-symbols helper and the binary -packages from snapshot.debian.org. +The symbols file is maintained using pkgkde-symbols helper. -The libcitygml-symbols.sh script automates the symbols update process. -To update the symbols file for a specific binary package version, run: - -$ bash debian/libcitygml-symbols.sh VERSION - -For general information on maintain symbols files using the pkg-kde-tools, see: +For general information on maintaining symbols files using the pkg-kde-tools, see: http://pkg-kde.alioth.debian.org/symbolfiles.html diff --git a/debian/changelog b/debian/changelog index 3e5920b..8388994 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ libcitygml (1.4.3-1) UNRELEASED; urgency=medium * Add OpenGL build dependencies no longer pulled in by libopenscenegraph-dev. * Install all *.md files in docs. + * Drop libcitygml-symbols.sh, only needed for initial symbols file +creation. -- Bas Couwenberg sebas...@debian.org Fri, 24 Jul 2015 16:31:57 +0200 diff --git a/debian/libcitygml-symbols.sh b/debian/libcitygml-symbols.sh deleted file mode 100644 index 4abc6ab..000 --- a/debian/libcitygml-symbols.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -PKG=libcitygml0 -VERSION=$1 -if [ -z ${VERSION} ]; then - echo Usage: $0 VERSION - exit 1 -fi - -SYMBOLS=debian/${PKG}.symbols -ABI=$(echo $VERSION | sed 's/[\+\~].*$//') - -# Remove old architecture symbols files -rm -f symbols.* - -# Download binary packages from snapshot.debian.org -debsnap --binary ${PKG} -f - -for DEB in binary-${PKG}/${PKG}_${VERSION}_*.deb -do - export DIR=$(echo $DEB | sed 's/.deb$//') - - # Unpack binary package - dpkg-deb -R $DEB $DIR - - export VERSION=$(dpkg-deb -f $DEB Version) - - export ARCH=$(dpkg-deb -f $DEB Architecture) - export LIB=$(find $DIR -type l -name *.so.?) - - # Generate symbols for the architecture - pkgkde-gensymbols -p${PKG} -v${ABI} -Osymbols.${ARCH} -e${LIB} -done - -# Create symbols file for all architectures -pkgkde-symbolshelper create -o ${SYMBOLS} -v ${ABI} symbols.* - -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] 25/35: Don't install static library, no longer built.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libcitygml. commit c8cc09efb5dc905e077054b0773a4fb96a0adafe Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 22:01:17 2015 +0200 Don't install static library, no longer built. --- debian/changelog | 1 + debian/libcitygml-dev.install | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d0109b3..97a4c0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ libcitygml (1.4.3-1) UNRELEASED; urgency=medium * Drop citygml2vrml, no longer included upstream. * Drop SOVERSION from -dev -bin package name. * Rename library package for SONAME bump. + * Don't install static library, no longer built. -- Bas Couwenberg sebas...@debian.org Fri, 24 Jul 2015 16:31:57 +0200 diff --git a/debian/libcitygml-dev.install b/debian/libcitygml-dev.install index 76f28fa..7df81cd 100644 --- a/debian/libcitygml-dev.install +++ b/debian/libcitygml-dev.install @@ -1,4 +1,3 @@ usr/include/* -usr/lib/*/lib*.a usr/lib/*/lib*.so usr/lib/*/pkgconfig/* -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] 26/35: Drop openscenegraph plugin packages, FTBFS disabled by default.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libcitygml. commit cdc27a3bc8bf84c9494a76a26a960f36b857fb47 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 23:41:51 2015 +0200 Drop openscenegraph plugin packages, FTBFS disabled by default. --- debian/README.source | 11 -- debian/changelog | 1 + debian/control | 43 -- debian/gencontrol | 9 - .../openscenegraph-plugin-citygml-shared.install | 1 - .../openscenegraph-plugin-citygml-static.install | 1 - debian/rules | 3 -- 7 files changed, 1 insertion(+), 68 deletions(-) diff --git a/debian/README.source b/debian/README.source index 5912450..08c515c 100644 --- a/debian/README.source +++ b/debian/README.source @@ -1,14 +1,3 @@ -Version Policy: - ${UpstreamVersion}+r${SVN_Revision}-${Debian_Revision}+${OSG_Major}p${OSG_Minor}p${OSG_Patch} - ie: 0.1.3+r114-1+3p0p0 - It means : the it after the Upstream release 0.1.3 and before 0.1.4. - and the SVN revision is r114. - -1 is Debian Revision, it means the first revision of all Debian Things. - +3p0p0 means it is build for work with OSG 3.0: - as lintian Warning: maintainer-upload-has-incorrect-version-number, - dot is divert to `p'. - - Symbols --- diff --git a/debian/changelog b/debian/changelog index 97a4c0d..88c05be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ libcitygml (1.4.3-1) UNRELEASED; urgency=medium * Drop SOVERSION from -dev -bin package name. * Rename library package for SONAME bump. * Don't install static library, no longer built. + * Drop openscenegraph plugin packages, FTBFS disabled by default. -- Bas Couwenberg sebas...@debian.org Fri, 24 Jul 2015 16:31:57 +0200 diff --git a/debian/control b/debian/control index b2de67a..ff8565f 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,6 @@ Build-Depends: debhelper (= 9), cmake, libxml2-dev, libgdal-dev, - libopenscenegraph-dev (= 3.0.1-4~), pkg-kde-tools Standards-Version: 3.9.5 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/libcitygml.git @@ -79,45 +78,3 @@ Description: Utils of libcitygml - citygmltest . This package contains the citygmltest utility. -Package: openscenegraph-plugin-citygml-shared -Architecture: any -Section: devel -Depends: libcitygml1 (= ${binary:Version}), - ${shlibs:Depends}, - ${misc:Depends}, - ${libosg-share} -Description: libcitygml OpenSceneGraph plugin (shared version) - libcitygml is a small and easy to use open source C++ library for parsing - CityGML files in such a way that data can be easily exploited by 3D - rendering applications (geometry data are tesselated and optimized for - rendering during parsing). For instance, it can be used to develop readers - of CityGML files in many 3D based applications (OpenGL, OpenSceneGraph, ...) - Most metadata are not lost, they are available through a per-node hashmap. - . - CityGML (City Geography Markup Language) is an XML-based schema for the - modelling and exchange of georeferenced 3D city and landscape models that - is quickly being adopted on an international level. - . - This package contains OpenSceneGraph plugin (.so version). - -Package: openscenegraph-plugin-citygml-static -Architecture: any -Section: devel -Depends: libcitygml1 (= ${binary:Version}), - ${shlibs:Depends}, - ${misc:Depends}, - ${libosg-static} -Description: libcitygml OpenSceneGraph plugin (static version) - libcitygml is a small and easy to use open source C++ library for parsing - CityGML files in such a way that data can be easily exploited by 3D - rendering applications (geometry data are tesselated and optimized for - rendering during parsing). For instance, it can be used to develop readers - of CityGML files in many 3D based applications (OpenGL, OpenSceneGraph, ...) - Most metadata are not lost, they are available through a per-node hashmap. - . - CityGML (City Geography Markup Language) is an XML-based schema for the - modelling and exchange of georeferenced 3D city and landscape models that - is quickly being adopted on an international level. - . - This package contains OpenSceneGraph plugin (.a version). - diff --git a/debian/gencontrol b/debian/gencontrol deleted file mode 100644 index 5ae3182..000 --- a/debian/gencontrol +++ /dev/null @@ -1,9 +0,0 @@ -LIBOSG_SHARE=`dpkg --get-selections | grep libopenscenegraph[0-9]*:.*\s*install | awk '{print $1}' | awk -F: '{print $1}'` -LIBOSG_VERSION=`dpkg -l $LIBOSG_SHARE | grep
[libcitygml] 24/35: Rename library package for SONAME bump.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libcitygml. commit ef52a341c2b87d3f37e66d117adfc2b179e344c5 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 21:41:33 2015 +0200 Rename library package for SONAME bump. --- debian/changelog| 1 + debian/control | 10 +- debian/{libcitygml0.install = libcitygml1.install} | 0 debian/{libcitygml0.symbols = libcitygml1.symbols} | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3c132d2..d0109b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ libcitygml (1.4.3-1) UNRELEASED; urgency=medium * Add upstream metadata. * Drop citygml2vrml, no longer included upstream. * Drop SOVERSION from -dev -bin package name. + * Rename library package for SONAME bump. -- Bas Couwenberg sebas...@debian.org Fri, 24 Jul 2015 16:31:57 +0200 diff --git a/debian/control b/debian/control index 3323534..b2de67a 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/libcitygml.git Vcs-Git: git://anonscm.debian.org/pkg-grass/libcitygml.git Homepage: https://github.com/jklimke/libcitygml -Package: libcitygml0 +Package: libcitygml1 Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, @@ -38,7 +38,7 @@ Package: libcitygml-dev Architecture: any Multi-Arch: same Section: libdevel -Depends: libcitygml0 (= ${binary:Version}), +Depends: libcitygml1 (= ${binary:Version}), ${misc:Depends}, Pre-Depends: ${misc:Pre-Depends} Breaks: libcitygml0-dev ( 1.4.3-1) @@ -60,7 +60,7 @@ Description: Static and header files of libcitygml Package: libcitygml-bin Architecture: any Section: utils -Depends: libcitygml0 (= ${binary:Version}), +Depends: libcitygml1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Breaks: libcitygml0-bin ( 1.4.3-1) @@ -82,7 +82,7 @@ Description: Utils of libcitygml - citygmltest Package: openscenegraph-plugin-citygml-shared Architecture: any Section: devel -Depends: libcitygml0 (= ${binary:Version}), +Depends: libcitygml1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, ${libosg-share} @@ -103,7 +103,7 @@ Description: libcitygml OpenSceneGraph plugin (shared version) Package: openscenegraph-plugin-citygml-static Architecture: any Section: devel -Depends: libcitygml0 (= ${binary:Version}), +Depends: libcitygml1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, ${libosg-static} diff --git a/debian/libcitygml0.install b/debian/libcitygml1.install similarity index 100% rename from debian/libcitygml0.install rename to debian/libcitygml1.install diff --git a/debian/libcitygml0.symbols b/debian/libcitygml1.symbols similarity index 99% rename from debian/libcitygml0.symbols rename to debian/libcitygml1.symbols index 739dcc4..9342b8e 100644 --- a/debian/libcitygml0.symbols +++ b/debian/libcitygml1.symbols @@ -1,5 +1,5 @@ # 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# +libcitygml.so.1 libcitygml1 #MINVER# _Z10fatalErrorPvPKcz@Base 0.14 (optional=templinst)_Z10parseValueI5TVec3IdEEvRSt18basic_stringstreamIcSt11char_traitsIcESaIcEERT_P12GeoTransformRKS1_@Base 0.14 (optional=templinst)_Z10parseValueIbEvRSt18basic_stringstreamIcSt11char_traitsIcESaIcEERT_@Base 0.14 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] annotated tag upstream/1.0 created (now 0861269)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/1.0 in repository libcitygml. at 0861269 (tag) tagging 674a92fc0b10d4a30c5f9d39cf3e94f76fe06f25 (commit) replaces upstream/0.14+svn134 tagged by Bas Couwenberg on Fri Jul 24 16:29:24 2015 +0200 - Log - Upstream version 1.0 Bas Couwenberg (1): Imported Upstream version 1.0 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] 04/05: pristine-tar data for libcitygml_1.4.0.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository libcitygml. commit f8bbdf61d8d7653764ba52a32bf7722a4ea0e7c0 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 16:29:28 2015 +0200 pristine-tar data for libcitygml_1.4.0.orig.tar.gz --- libcitygml_1.4.0.orig.tar.gz.delta | Bin 0 - 6118 bytes libcitygml_1.4.0.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/libcitygml_1.4.0.orig.tar.gz.delta b/libcitygml_1.4.0.orig.tar.gz.delta new file mode 100644 index 000..c84da86 Binary files /dev/null and b/libcitygml_1.4.0.orig.tar.gz.delta differ diff --git a/libcitygml_1.4.0.orig.tar.gz.id b/libcitygml_1.4.0.orig.tar.gz.id new file mode 100644 index 000..6123cc5 --- /dev/null +++ b/libcitygml_1.4.0.orig.tar.gz.id @@ -0,0 +1 @@ +b19fbfbb364b9a509798e4e1ba6affbc2961190e -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] 02/05: pristine-tar data for libcitygml_1.2.1.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository libcitygml. commit 02d0919292db6ecc03be14e22de1e72c899b32fc Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 16:29:26 2015 +0200 pristine-tar data for libcitygml_1.2.1.orig.tar.gz --- libcitygml_1.2.1.orig.tar.gz.delta | Bin 0 - 5377 bytes libcitygml_1.2.1.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/libcitygml_1.2.1.orig.tar.gz.delta b/libcitygml_1.2.1.orig.tar.gz.delta new file mode 100644 index 000..ec6f037 Binary files /dev/null and b/libcitygml_1.2.1.orig.tar.gz.delta differ diff --git a/libcitygml_1.2.1.orig.tar.gz.id b/libcitygml_1.2.1.orig.tar.gz.id new file mode 100644 index 000..44e73f3 --- /dev/null +++ b/libcitygml_1.2.1.orig.tar.gz.id @@ -0,0 +1 @@ +4c6c6723d6cb44d12f32a01fb3cf9b0d1994ea91 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] branch pristine-tar updated (95e1da8 - 6daab63)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch pristine-tar in repository libcitygml. from 95e1da8 pristine-tar data for libcitygml_0.14+svn134.orig.tar.xz new a8530c1 pristine-tar data for libcitygml_1.0.orig.tar.gz new 02d0919 pristine-tar data for libcitygml_1.2.1.orig.tar.gz new eb96896 pristine-tar data for libcitygml_1.3.0.orig.tar.gz new f8bbdf6 pristine-tar data for libcitygml_1.4.0.orig.tar.gz new 6daab63 pristine-tar data for libcitygml_1.4.3.orig.tar.gz The 5 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: libcitygml_1.0.orig.tar.gz.delta | Bin 0 - 5359 bytes libcitygml_1.0.orig.tar.gz.id | 1 + libcitygml_1.2.1.orig.tar.gz.delta | Bin 0 - 5377 bytes libcitygml_1.2.1.orig.tar.gz.id| 1 + libcitygml_1.3.0.orig.tar.gz.delta | Bin 0 - 5791 bytes libcitygml_1.3.0.orig.tar.gz.id| 1 + libcitygml_1.4.0.orig.tar.gz.delta | Bin 0 - 6118 bytes libcitygml_1.4.0.orig.tar.gz.id| 1 + libcitygml_1.4.3.orig.tar.gz.delta | Bin 0 - 6335 bytes libcitygml_1.4.3.orig.tar.gz.id| 1 + 10 files changed, 5 insertions(+) create mode 100644 libcitygml_1.0.orig.tar.gz.delta create mode 100644 libcitygml_1.0.orig.tar.gz.id create mode 100644 libcitygml_1.2.1.orig.tar.gz.delta create mode 100644 libcitygml_1.2.1.orig.tar.gz.id create mode 100644 libcitygml_1.3.0.orig.tar.gz.delta create mode 100644 libcitygml_1.3.0.orig.tar.gz.id create mode 100644 libcitygml_1.4.0.orig.tar.gz.delta create mode 100644 libcitygml_1.4.0.orig.tar.gz.id create mode 100644 libcitygml_1.4.3.orig.tar.gz.delta create mode 100644 libcitygml_1.4.3.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] annotated tag upstream/1.4.3 created (now 3855484)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/1.4.3 in repository libcitygml. at 3855484 (tag) tagging 9288a1e6adac1e54cc0687516649eb2d5241c726 (commit) replaces upstream/1.4.0 tagged by Bas Couwenberg on Fri Jul 24 16:29:30 2015 +0200 - Log - Upstream version 1.4.3 Bas Couwenberg (1): Imported Upstream version 1.4.3 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] 23/35: Drop SOVERSION from -dev -bin package name.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libcitygml. commit b8a01c2a6d255d17304f862a5c45edc1cc197eb3 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 21:37:54 2015 +0200 Drop SOVERSION from -dev -bin package name. --- debian/changelog | 1 + debian/control | 26 +- ...citygml0-bin.install = libcitygml-bin.install} | 0 ...tygml0-bin.manpages = libcitygml-bin.manpages} | 0 ...citygml0-dev.install = libcitygml-dev.install} | 0 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index daf9783..3c132d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ libcitygml (1.4.3-1) UNRELEASED; urgency=medium * Split rewrite_cmake.diff into separate patches. * Add upstream metadata. * Drop citygml2vrml, no longer included upstream. + * Drop SOVERSION from -dev -bin package name. -- Bas Couwenberg sebas...@debian.org Fri, 24 Jul 2015 16:31:57 +0200 diff --git a/debian/control b/debian/control index 280f5ee..3323534 100644 --- a/debian/control +++ b/debian/control @@ -34,13 +34,15 @@ Description: Open source C++ library for parsing CityGML files . This package contains share library. -Package: libcitygml0-dev +Package: libcitygml-dev Architecture: any Multi-Arch: same Section: libdevel -Depends: ${misc:Depends}, - libcitygml0 (= ${binary:Version}) +Depends: libcitygml0 (= ${binary:Version}), + ${misc:Depends}, Pre-Depends: ${misc:Pre-Depends} +Breaks: libcitygml0-dev ( 1.4.3-1) +Replaces: libcitygml0-dev ( 1.4.3-1) Description: Static and header files of libcitygml libcitygml is a small and easy to use open source C++ library for parsing CityGML files in such a way that data can be easily exploited by 3D @@ -55,12 +57,14 @@ Description: Static and header files of libcitygml . This package contains develop files: static and header files of libcitygml. -Package: libcitygml0-bin +Package: libcitygml-bin Architecture: any Section: utils -Depends: ${shlibs:Depends}, - ${misc:Depends}, - libcitygml0 (= ${binary:Version}) +Depends: libcitygml0 (= ${binary:Version}), + ${shlibs:Depends}, + ${misc:Depends} +Breaks: libcitygml0-bin ( 1.4.3-1) +Replaces: libcitygml0-bin ( 1.4.3-1) Description: Utils of libcitygml - citygmltest libcitygml is a small and easy to use open source C++ library for parsing CityGML files in such a way that data can be easily exploited by 3D @@ -78,9 +82,9 @@ Description: Utils of libcitygml - citygmltest Package: openscenegraph-plugin-citygml-shared Architecture: any Section: devel -Depends: ${shlibs:Depends}, +Depends: libcitygml0 (= ${binary:Version}), + ${shlibs:Depends}, ${misc:Depends}, - libcitygml0 (= ${binary:Version}), ${libosg-share} Description: libcitygml OpenSceneGraph plugin (shared version) libcitygml is a small and easy to use open source C++ library for parsing @@ -99,9 +103,9 @@ Description: libcitygml OpenSceneGraph plugin (shared version) Package: openscenegraph-plugin-citygml-static Architecture: any Section: devel -Depends: ${shlibs:Depends}, +Depends: libcitygml0 (= ${binary:Version}), + ${shlibs:Depends}, ${misc:Depends}, - libcitygml0 (= ${binary:Version}), ${libosg-static} Description: libcitygml OpenSceneGraph plugin (static version) libcitygml is a small and easy to use open source C++ library for parsing diff --git a/debian/libcitygml0-bin.install b/debian/libcitygml-bin.install similarity index 100% rename from debian/libcitygml0-bin.install rename to debian/libcitygml-bin.install diff --git a/debian/libcitygml0-bin.manpages b/debian/libcitygml-bin.manpages similarity index 100% rename from debian/libcitygml0-bin.manpages rename to debian/libcitygml-bin.manpages diff --git a/debian/libcitygml0-dev.install b/debian/libcitygml-dev.install similarity index 100% rename from debian/libcitygml0-dev.install rename to debian/libcitygml-dev.install -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] 12/35: Merge tag 'upstream/1.4.3'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libcitygml. commit 1fe65d6dcfe161467079697130e276ea6a194c8a Merge: 8983d51 9288a1e Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 16:29:30 2015 +0200 Merge tag 'upstream/1.4.3' Upstream version 1.4.3 CMakeLists.txt | 3 +- sources/CMakeLists.txt | 4 + sources/include/citygml/address.h | 36 sources/include/citygml/cityobject.h | 8 +- sources/include/parser/addressparser.h | 31 +++ sources/include/parser/nodetypes.h | 39 ++--- sources/src/citygml/address.cpp| 50 +++ sources/src/citygml/cityobject.cpp | 11 +++ sources/src/parser/addressparser.cpp | 114 + sources/src/parser/cityobjectelementparser.cpp | 32 +++ sources/src/parser/nodetypes.cpp | 38 - 11 files changed, 314 insertions(+), 52 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Processing of libcitygml_1.4.3-1~exp1_amd64.changes
libcitygml_1.4.3-1~exp1_amd64.changes uploaded successfully to localhost along with the files: libcitygml_1.4.3-1~exp1.dsc libcitygml_1.4.3.orig.tar.gz libcitygml_1.4.3-1~exp1.debian.tar.xz libcitygml-bin_1.4.3-1~exp1_amd64.deb libcitygml-dev_1.4.3-1~exp1_amd64.deb libcitygml1_1.4.3-1~exp1_amd64.deb Greetings, Your Debian queue daemon (running on host franck.debian.org) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] annotated tag upstream/1.4.0 created (now a914ee2)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/1.4.0 in repository libcitygml. at a914ee2 (tag) tagging 21abc1fa88c923d5fdfed2fe8706f90aad6e987a (commit) replaces upstream/1.3.0 tagged by Bas Couwenberg on Fri Jul 24 16:29:28 2015 +0200 - Log - Upstream version 1.4.0 Bas Couwenberg (1): Imported Upstream version 1.4.0 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] annotated tag upstream/1.3.0 created (now 9a57bf7)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/1.3.0 in repository libcitygml. at 9a57bf7 (tag) tagging 17e4451636773b7a766f44faf8e006ccb5dc40e7 (commit) replaces upstream/1.2.1 tagged by Bas Couwenberg on Fri Jul 24 16:29:27 2015 +0200 - Log - Upstream version 1.3.0 Bas Couwenberg (1): Imported Upstream version 1.3.0 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libcitygml] 34/35: Mark patches as Forwarded.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libcitygml. commit e077203c37ebfd4d5d905ffcf30e2bf26706038d Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Jul 25 01:19:49 2015 +0200 Mark patches as Forwarded. --- debian/patches/information-typo.diff| 3 ++- debian/patches/install-citygmltest.diff | 1 + debian/patches/install-paths.diff | 1 + debian/patches/pkgconfig-support.diff | 3 ++- debian/patches/soversion.diff | 1 + 5 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/patches/information-typo.diff b/debian/patches/information-typo.diff index 481c558..13e670f 100644 --- a/debian/patches/information-typo.diff +++ b/debian/patches/information-typo.diff @@ -1,6 +1,7 @@ Description: Fix 'informations' typo, replace with 'information'. Author: Bas Couwenberg sebas...@xs4all.nl -Last-Update: 2014-01-24 +Forwarded: https://github.com/jklimke/libcitygml/pull/15 + --- a/test/citygmltest.cpp +++ b/test/citygmltest.cpp @@ -28,7 +28,7 @@ void usage() diff --git a/debian/patches/install-citygmltest.diff b/debian/patches/install-citygmltest.diff index 553720a..37df099 100644 --- a/debian/patches/install-citygmltest.diff +++ b/debian/patches/install-citygmltest.diff @@ -1,5 +1,6 @@ Description: Install citygmltest utility. Author: YunQiang Su wzss...@gmail.com +Forwarded: https://github.com/jklimke/libcitygml/pull/15 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt diff --git a/debian/patches/install-paths.diff b/debian/patches/install-paths.diff index 3e578f2..7bbc309 100644 --- a/debian/patches/install-paths.diff +++ b/debian/patches/install-paths.diff @@ -1,5 +1,6 @@ Description: Add user customizable install paths. Author: YunQiang Su wzss...@gmail.com +Forwarded: https://github.com/jklimke/libcitygml/pull/15 --- a/CMakeLists.txt +++ b/CMakeLists.txt diff --git a/debian/patches/pkgconfig-support.diff b/debian/patches/pkgconfig-support.diff index efc490b..07ab4c8 100644 --- a/debian/patches/pkgconfig-support.diff +++ b/debian/patches/pkgconfig-support.diff @@ -1,6 +1,7 @@ Description: add pkg-config support for libcitygml Author: YunQiang Su wzss...@gmail.com -Last-Update: 2011-06-13 +Forwarded: https://github.com/jklimke/libcitygml/pull/15 + --- /dev/null +++ b/sources/citygml.pc.cmake @@ -0,0 +1,11 @@ diff --git a/debian/patches/soversion.diff b/debian/patches/soversion.diff index 0e14b12..7fe61cb 100644 --- a/debian/patches/soversion.diff +++ b/debian/patches/soversion.diff @@ -1,5 +1,6 @@ Description: Set library VERSION SOVERSION. Author: Bas Couwenberg sebas...@debian.org +Forwarded: https://github.com/jklimke/libcitygml/pull/15 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 09/09: Set distribution to experimental.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository netcdf. commit 0c11cd21ce16c8f6513f7d6ec072c1ddd817af29 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Jul 25 02:12:39 2015 +0200 Set distribution to experimental. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a86f1e6..ecd1de2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -netcdf (1:4.4.0~rc2-1) UNRELEASED; urgency=medium +netcdf (1:4.4.0~rc2-1~exp1) experimental; urgency=medium * Add libcurl-ssl-dev as alternative for libcurl-gnutls-dev build dependency. * New upstream release candidate. @@ -7,7 +7,7 @@ netcdf (1:4.4.0~rc2-1) UNRELEASED; urgency=medium * Drop Files-Excluded from copyright repacksuffix from watch file, autom4te.cache/ no longer included. - -- Bas Couwenberg sebas...@debian.org Sat, 25 Jul 2015 01:51:31 +0200 + -- Bas Couwenberg sebas...@debian.org Sat, 25 Jul 2015 02:12:24 +0200 netcdf (1:4.3.3.1+ds-1~exp2) experimental; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 02/02: pristine-tar data for netcdf_4.4.0~rc2.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository netcdf. commit d199e7bb1eb312febd77adc49bb6d60262367e88 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Jul 25 01:51:07 2015 +0200 pristine-tar data for netcdf_4.4.0~rc2.orig.tar.gz --- netcdf_4.4.0~rc2.orig.tar.gz.delta | Bin 0 - 53738 bytes netcdf_4.4.0~rc2.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/netcdf_4.4.0~rc2.orig.tar.gz.delta b/netcdf_4.4.0~rc2.orig.tar.gz.delta new file mode 100644 index 000..9486173 Binary files /dev/null and b/netcdf_4.4.0~rc2.orig.tar.gz.delta differ diff --git a/netcdf_4.4.0~rc2.orig.tar.gz.id b/netcdf_4.4.0~rc2.orig.tar.gz.id new file mode 100644 index 000..c11f804 --- /dev/null +++ b/netcdf_4.4.0~rc2.orig.tar.gz.id @@ -0,0 +1 @@ +95bc9d141beccebe818bec7350ea1396b89731f8 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 01/02: pristine-tar data for netcdf_4.4.0~rc1.orig.tar.gz
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch pristine-tar in repository netcdf. commit 32063e89364b6c00034765678e42af8c6721679b Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Jul 25 01:50:50 2015 +0200 pristine-tar data for netcdf_4.4.0~rc1.orig.tar.gz --- netcdf_4.4.0~rc1.orig.tar.gz.delta | Bin 0 - 53441 bytes netcdf_4.4.0~rc1.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/netcdf_4.4.0~rc1.orig.tar.gz.delta b/netcdf_4.4.0~rc1.orig.tar.gz.delta new file mode 100644 index 000..f043e7a Binary files /dev/null and b/netcdf_4.4.0~rc1.orig.tar.gz.delta differ diff --git a/netcdf_4.4.0~rc1.orig.tar.gz.id b/netcdf_4.4.0~rc1.orig.tar.gz.id new file mode 100644 index 000..b893f90 --- /dev/null +++ b/netcdf_4.4.0~rc1.orig.tar.gz.id @@ -0,0 +1 @@ +0b59f49833fadbe156b097871ab43e262a7b96e6 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] annotated tag debian/1%4.1.1-5 created (now c09e58e)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag debian/1%4.1.1-5 in repository netcdf. at c09e58e (tag) tagging df8a321d976a52901061c08fd2dd52a7ad07561d (commit) replaces debian/1%3A4.1.1-5 tagged by Bas Couwenberg on Fri Jul 3 18:36:24 2015 +0200 - Log - Debian release 1:4.1.1-5 Francesco Paolo Lovergine (3): initial upstream branch Imported Upstream version 4.1.1 Imported Debian patch 1:4.1.1-5 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 04/09: Merge tag 'upstream/4.4.0_rc2'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository netcdf. commit 745ecb6be9dfbde469ca26156fe13e40e1138908 Merge: 29cdec2 2167e1a Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Jul 25 01:51:08 2015 +0200 Merge tag 'upstream/4.4.0_rc2' Upstream version 4.4.0~rc2 CMakeLists.txt | 21 +-- Doxyfile.developer | 6 +- README.md| 28 ++-- RELEASE_NOTES.md | 66 cf | 203 +++ cf.cmake | 14 ++ configure| 38 ++--- configure.ac | 14 +- docs/FAQ.md | 36 ++--- docs/footer.html | 20 +-- docs/old/netcdf.texi | 2 +- docs/software.md | 17 +- docs/windows-binaries.md | 26 +-- libdap2/env | 2 +- libdap2/nccommon.h | 1 - libsrc/CMakeLists.txt| 6 +- libsrc/attr.c| 339 --- libsrc5/nc5dispatch.c| 8 - ljna | 33 mclean | 10 ++ nc-config.in | 2 +- ncdap_test/test_vara.c | 2 +- ncdap_test/testdata3/Makefile.am | 7 +- ncdap_test/testdata3/Makefile.in | 6 +- ncdap_test/testdata3/synth9.dds | 2 +- ncdap_test/testdata3/synth9.dods | 2 +- ncdap_test/tst_ncdap.sh | 8 +- ncdap_test/tst_ncdap_shared.sh | 6 +- ncgen/generate.c | 9 +- ncgen/ncgen.y| 91 ++- ncgen/ncgentab.c | 83 +- oc2/occurlflags.c| 34 ++-- oc2/occurlfunctions.c| 2 +- wjna | 43 + 34 files changed, 595 insertions(+), 592 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 03/09: Imported Upstream version 4.4.0~rc2
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository netcdf. commit 2167e1ab81ed478087ce14ef4bc3ead8d537d829 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Jul 25 01:50:56 2015 +0200 Imported Upstream version 4.4.0~rc2 --- CMakeLists.txt | 21 +-- Doxyfile.developer | 6 +- README.md| 28 ++-- RELEASE_NOTES.md | 66 cf | 203 +++ cf.cmake | 14 ++ configure| 38 ++--- configure.ac | 14 +- docs/FAQ.md | 36 ++--- docs/footer.html | 20 +-- docs/old/netcdf.texi | 2 +- docs/software.md | 17 +- docs/windows-binaries.md | 26 +-- libdap2/env | 2 +- libdap2/nccommon.h | 1 - libsrc/CMakeLists.txt| 6 +- libsrc/attr.c| 339 --- libsrc5/nc5dispatch.c| 8 - ljna | 33 mclean | 10 ++ nc-config.in | 2 +- ncdap_test/test_vara.c | 2 +- ncdap_test/testdata3/Makefile.am | 7 +- ncdap_test/testdata3/Makefile.in | 6 +- ncdap_test/testdata3/synth9.dds | 2 +- ncdap_test/testdata3/synth9.dods | 2 +- ncdap_test/tst_ncdap.sh | 8 +- ncdap_test/tst_ncdap_shared.sh | 6 +- ncgen/generate.c | 9 +- ncgen/ncgen.y| 91 ++- ncgen/ncgentab.c | 83 +- oc2/occurlflags.c| 34 ++-- oc2/occurlfunctions.c| 2 +- wjna | 43 + 34 files changed, 595 insertions(+), 592 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 02cc3a0..fa5bebc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,7 +26,7 @@ set(PACKAGE netCDF CACHE STRING ) SET(NC_VERSION_MAJOR 4) SET(NC_VERSION_MINOR 4) SET(NC_VERSION_PATCH 0) -SET(NC_VERSION_NOTE -rc1) +SET(NC_VERSION_NOTE -rc2) SET(netCDF_VERSION ${NC_VERSION_MAJOR}.${NC_VERSION_MINOR}.${NC_VERSION_PATCH}${NC_VERSION_NOTE}) SET(VERSION ${netCDF_VERSION}) SET(NC_VERSION ${netCDF_VERSION}) @@ -678,7 +678,7 @@ ELSE() ENDIF() # Enable some developer-only tests -OPTION(ENABLE_EXTRA_TESTS Enable Extra tests. Some may not work because of known issues. Developers only. OFF) +OPTION(ENABLE_EXTRA_TESTS Enable Extra tests. Some may not work because of known issues. Developers only. ON) IF(ENABLE_EXTRA_TESTS) SET(EXTRA_TESTS ON) ENDIF() @@ -1055,22 +1055,25 @@ ENDMACRO() # A basic script used to convert m4 files FIND_PROGRAM(NC_M4 NAMES m4) -IF(NOT MSVC) - IF(NOT NC_M4) -MESSAGE(FATAL Cannot find 'm4' utility. Install m4 and try again.) - ENDIF(NOT NC_M4) -ENDIF(NOT MSVC) +IF(NC_M4) +SET(HAVE_M4 TRUE) +ENDIF() +#IF(NOT MSVC) + #IF(NOT NC_M4) + # MESSAGE(FATAL Cannot find 'm4' utility. Install m4 and try again.) + # ENDIF(NOT NC_M4) +#ENDIF(NOT MSVC) MACRO(GEN_m4 filename) # IF(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${filename}.c) -IF(NC_M4) +IF(HAVE_M4) ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/${filename}.c COMMAND ${NC_M4} ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${filename}.m4 ${CMAKE_CURRENT_SOURCE_DIR}/${filename}.c VERBATIM ) -ENDIF(NC_M4) +ENDIF(HAVE_M4) ENDMACRO(GEN_m4) # Binary tests, but ones which depend on value of 'TEMP_LARGE' being defined. diff --git a/Doxyfile.developer b/Doxyfile.developer index 47dcecb..c403316 100755 --- a/Doxyfile.developer +++ b/Doxyfile.developer @@ -38,7 +38,7 @@ PROJECT_NAME = netCDF-C # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 4.4.0-rc1 +PROJECT_NUMBER = 4.4.0-rc2 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a @@ -2264,7 +2264,7 @@ DIRECTORY_GRAPH= YES # The default value is: png. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_IMAGE_FORMAT = svg +DOT_IMAGE_FORMAT = png # If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to # enable generation of interactive SVG images that allow zooming and panning. @@ -2276,7 +2276,7 @@ DOT_IMAGE_FORMAT = svg # The default value is: NO. # This tag requires that the tag HAVE_DOT is set to YES. -INTERACTIVE_SVG= YES +INTERACTIVE_SVG= NO # The DOT_PATH tag can be used to specify the path where the dot tool can be # found. If left blank, it is assumed the dot tool can be found in the path. diff --git a/README.md b/README.md index 48f713c..273287b 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,10 @@
[netcdf] annotated tag upstream/4.4.0_rc2 created (now 3805efa)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/4.4.0_rc2 in repository netcdf. at 3805efa (tag) tagging 2167e1ab81ed478087ce14ef4bc3ead8d537d829 (commit) replaces upstream/4.4.0_rc1 tagged by Bas Couwenberg on Sat Jul 25 01:51:08 2015 +0200 - Log - Upstream version 4.4.0~rc2 Bas Couwenberg (1): Imported Upstream version 4.4.0~rc2 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] branch pristine-tar updated (95c148e - d199e7b)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch pristine-tar in repository netcdf. from 95c148e pristine-tar data for netcdf_4.3.3.1+ds.orig.tar.gz new 32063e8 pristine-tar data for netcdf_4.4.0~rc1.orig.tar.gz new d199e7b pristine-tar data for netcdf_4.4.0~rc2.orig.tar.gz The 2 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: netcdf_4.4.0~rc1.orig.tar.gz.delta | Bin 0 - 53441 bytes netcdf_4.4.0~rc1.orig.tar.gz.id| 1 + netcdf_4.4.0~rc2.orig.tar.gz.delta | Bin 0 - 53738 bytes netcdf_4.4.0~rc2.orig.tar.gz.id| 1 + 4 files changed, 2 insertions(+) create mode 100644 netcdf_4.4.0~rc1.orig.tar.gz.delta create mode 100644 netcdf_4.4.0~rc1.orig.tar.gz.id create mode 100644 netcdf_4.4.0~rc2.orig.tar.gz.delta create mode 100644 netcdf_4.4.0~rc2.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] annotated tag upstream/4.4.0_rc1 created (now 80cd48f)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/4.4.0_rc1 in repository netcdf. at 80cd48f (tag) tagging bb9683b0b7f3ba155e08562686472be0b2e8372d (commit) replaces upstream/4.3.3.1+ds tagged by Bas Couwenberg on Sat Jul 25 01:50:50 2015 +0200 - Log - Upstream version 4.4.0~rc1 Bas Couwenberg (1): Imported Upstream version 4.4.0~rc1 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] tag debian/4.4.0.rc2-1.exp1 created (now 0c11cd2)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/4.4.0.rc2-1.exp1 in repository netcdf. at 0c11cd2 (commit) No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] annotated tag debian/1%4.1.3-6 created (now 9a4f578)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag debian/1%4.1.3-6 in repository netcdf. at 9a4f578 (tag) tagging 54a830a14b1920ba40b4be0c776e3766dc02761c (commit) replaces upstream/4.1.3 tagged by Bas Couwenberg on Fri Jul 3 18:34:27 2015 +0200 - Log - Debian release 1:4.1.3-6 Francesco Paolo Lovergine (55): [svn-inject] Installing original source of netcdf [svn-inject] Forking netcdf source to Trunk [svn-inject] Applying Debian modifications to trunk Removing auto-generated files. commit f89c3d6d8a7a1c78e4731af296e4415d2098ed8a Essential changes. Cleaned patch set Minor changes Released 3.6.3-1 Updated to 4.0.1 Minor fixes Ready to upload commit 01a68c23a88ca8d7b3cdb32243a71c39752a6f5e commit 711268f0ee855b6be56968500b33571e28fd6845 Moving to 4.x series the trunk. Moved to git Merge branch 'upstream' Merge commit 'upstream/4.1.1' Moved to 4.1.1-6 with a ton of fixed issues. Merge commit 'upstream/4.1.3' Moving to new upstream release. Moved to source format 3.0 NetCDF 4.1.3 depends on a 1.8.6+ HDF5 library. Changed b-d and moved to experimental for pre-releasing. Defining SRC_TREE Now using CURDIR for source tree. Moved netcdf6 - netcdf7 Missing .dirs file. Removes the netcdf.pc erroneously installed under /usr/lib Splitted libcf and libnetcdf for a better support of different APIs. Adjusting minor problems with files installation. Fixed #656103 Removed obsolete patches and updated to split Fortran library Merged changes and fixed changelog. Starting re-syncing with sid branch. Updated changelog for merge. Merged debian/rules from sid. Added required dirs files. Annotating bug closing. Fixed typo. Another typo in debian/rules fixed. The linetcdfc7 package installed too many libraries. Again fixed package name mismatch in debian/rules. Still minor fix for new package names. Fixed path for release note. Promoted to sid. Fixed #661553 and an oversight in copying files. Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/netcdf Fixed #661717 Disabling DAP remote tests. Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/netcdf Updating changelog. Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/netcdf Moved to libnetcdfc++4 (wrong SONAME considered) and adds proper Replaces. Imported Debian patch 1:4.1.3-6 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] annotated tag debian/1%4.1.3-7.2 created (now 567051f)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag debian/1%4.1.3-7.2 in repository netcdf. at 567051f (tag) tagging f77f47050f5cd763bea130188917d970750beee2 (commit) replaces debian/1%4.1.3-7.1 tagged by Bas Couwenberg on Fri Jul 3 18:44:11 2015 +0200 - Log - Debian release 1:4.1.3-7.2 Steve McIntyre (1): Imported Debian patch 1:4.1.3-7.2 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
netcdf_4.4.0~rc2-1~exp1_amd64.changes ACCEPTED into experimental
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Sat, 25 Jul 2015 02:12:24 +0200 Source: netcdf Binary: netcdf-doc libnetcdf7 libnetcdf-dev netcdf-dbg netcdf-bin Architecture: source amd64 all Version: 1:4.4.0~rc2-1~exp1 Distribution: experimental Urgency: medium Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Changed-By: Bas Couwenberg sebas...@debian.org Description: libnetcdf-dev - creation, access, and sharing of scientific data libnetcdf7 - Interface for scientific data access to large binary data netcdf-bin - Programs for reading and writing NetCDF files netcdf-dbg - debugging symbols for NetCDF netcdf-doc - Documentation for NetCDF Changes: netcdf (1:4.4.0~rc2-1~exp1) experimental; urgency=medium . * Add libcurl-ssl-dev as alternative for libcurl-gnutls-dev build dependency. * New upstream release candidate. * Refresh patches. * Update symbols for 4.4.0~rc2. * Drop Files-Excluded from copyright repacksuffix from watch file, autom4te.cache/ no longer included. Checksums-Sha1: 802c0676ff8688446ee6839e77753ff34599096a 2375 netcdf_4.4.0~rc2-1~exp1.dsc 06a3b23973d0039f687154260c9179a777d34a0d 17342885 netcdf_4.4.0~rc2.orig.tar.gz 262abd0475d017180357e462e914cb3fd858a3a2 20548 netcdf_4.4.0~rc2-1~exp1.debian.tar.xz 967079d4119bdacccfad9598f4fcb48b0a20881f 71684 libnetcdf-dev_4.4.0~rc2-1~exp1_amd64.deb 78cab73db46f476ca253bc5ed24313fea2493bf2 313734 libnetcdf7_4.4.0~rc2-1~exp1_amd64.deb f796a3917b92102e6254904e9b79f98ecd2522b0 226412 netcdf-bin_4.4.0~rc2-1~exp1_amd64.deb 96e80e67cda24b878b3938a5e8949cc49ba8c744 1177196 netcdf-dbg_4.4.0~rc2-1~exp1_amd64.deb c8002ba1e28805a3c57e62dbf31ab1dd27569276 1844084 netcdf-doc_4.4.0~rc2-1~exp1_all.deb Checksums-Sha256: af17743434f93c7cb5ecdb1d82da4a102ab59a294de8c3e27938f447d16eecdb 2375 netcdf_4.4.0~rc2-1~exp1.dsc 48566e7317ff14d54a06b7a72321b95f178af7a45d57a91083c1d049891a89cf 17342885 netcdf_4.4.0~rc2.orig.tar.gz d0e7f1819b0ffb34bc73a7c7650f1fd0a371d46e371ac490f4d27a72ffdd4f90 20548 netcdf_4.4.0~rc2-1~exp1.debian.tar.xz 3fd89b561a46e6ad0206eb878037874bb6a714151d99e49fd2f7b520c4ab0711 71684 libnetcdf-dev_4.4.0~rc2-1~exp1_amd64.deb 0ae7f7ebc09c4404649f325bebef17bc07bd24ea40c5cf6fc86ab32b503f216e 313734 libnetcdf7_4.4.0~rc2-1~exp1_amd64.deb 0dda9749566d25fd9fcdcef8671f341678ae0babf31eecd256cc94b40ae486fd 226412 netcdf-bin_4.4.0~rc2-1~exp1_amd64.deb 767c37f1346b4e9bae187677514c96b84a9e8309c4e533deddd27597ff6b9815 1177196 netcdf-dbg_4.4.0~rc2-1~exp1_amd64.deb 92335eeef04850d8ef3981f44cb7ba0e1349e369e46f72c31e8d499f94629980 1844084 netcdf-doc_4.4.0~rc2-1~exp1_all.deb Files: 853c250527c3bf397664f945be1364ee 2375 science optional netcdf_4.4.0~rc2-1~exp1.dsc db1eacecc33fb763953a443043540cc6 17342885 science optional netcdf_4.4.0~rc2.orig.tar.gz 236fd3d14d0e0be8de7e270e6fd07b79 20548 science optional netcdf_4.4.0~rc2-1~exp1.debian.tar.xz 94d540a1b7ccbb8d0773a587a4d06315 71684 libdevel optional libnetcdf-dev_4.4.0~rc2-1~exp1_amd64.deb cc1482574dbfe7192acf039b7ad168c9 313734 libs optional libnetcdf7_4.4.0~rc2-1~exp1_amd64.deb 2e98b6b9315328698f48d2ff2c3c171c 226412 science optional netcdf-bin_4.4.0~rc2-1~exp1_amd64.deb da7cb10f092cafc1711c7538316044d0 1177196 debug extra netcdf-dbg_4.4.0~rc2-1~exp1_amd64.deb 7342840d4e8a13db5ffd9e1247ad106d 1844084 doc optional netcdf-doc_4.4.0~rc2-1~exp1_all.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCgAGBQJVstYrAAoJEGdQ8QrojUrxnlwQALuo0PrmSs1fGT1n53YPkGd+ NvqXDVhEz8pBFwNBHh/bcFf0QZf+IN6NwN89udm/XDJZjtGWGXa3yqbLC9PMGqzG 8QJAweAiTlnrxOGSqU1fg0pHG1f1usG1+d3JsROcvxy0QA+9WbW+TcXE3MA1SmfC YMOJybyBSp6Pw1y69CVy4Shw/nummlj9zh7hM+kxxOdqsQn6WhNx+OTIm2Eu5Qg8 mmONjDzRMi06wfvdBzLketzmp5soGEIu8HhOf7DHU34RNRwlWqXeJ2rQd/r9BjHN m3HZtFKWQTWZs6ppMIWYTYQQZQggvyfIuiSf1B4jeUxeRYpXSxswenGGZC9wnaj6 j0d7G6JujFMjt/GkRkg6WKgWm8Cbor4H6cqYzEpKlIk50dm44NNzPYF0kPKG/7uK Txj4T+zfC96qKL+Gu5hNtRxmeJHv48JsEtY8gwoFYld+VIgDU+O7nLpbU3LxQ0UW yhZOPF7TofooGcSZuZj+64Srzgz5pnXk0DCp9yLwBOxRZlGDArV3KIfxti7BXrH3 YlwZ1+HuYchkxGxFd6k9eNPKVKT3a9It79SU/AY6bE683Ibmaez9Y8XXejVi+NYp WUl7DXZV4nSuE6utVBT3rOdK9miiM5QVs8PWMfVVh6NbZ0eO3vVp28NF+ry9QTI/ jDxkEn16pRKLRM2y0IRB =Fdro -END PGP SIGNATURE- Thank you for your contribution to Debian. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Processing of netcdf_4.4.0~rc2-1~exp1_amd64.changes
netcdf_4.4.0~rc2-1~exp1_amd64.changes uploaded successfully to localhost along with the files: netcdf_4.4.0~rc2-1~exp1.dsc netcdf_4.4.0~rc2.orig.tar.gz netcdf_4.4.0~rc2-1~exp1.debian.tar.xz libnetcdf-dev_4.4.0~rc2-1~exp1_amd64.deb libnetcdf7_4.4.0~rc2-1~exp1_amd64.deb netcdf-bin_4.4.0~rc2-1~exp1_amd64.deb netcdf-dbg_4.4.0~rc2-1~exp1_amd64.deb netcdf-doc_4.4.0~rc2-1~exp1_all.deb Greetings, Your Debian queue daemon (running on host franck.debian.org) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 07/09: Update symbols for 4.4.0~rc2.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository netcdf. commit 59f9b2644af8fd511705a52143e1aac7e8a88ad5 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Jul 25 02:10:40 2015 +0200 Update symbols for 4.4.0~rc2. --- debian/changelog | 1 + debian/libnetcdf7.symbols | 5 + 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3a013d3..d05a3a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ netcdf (1:4.4.0~rc2-1) UNRELEASED; urgency=medium * Add libcurl-ssl-dev as alternative for libcurl-gnutls-dev build dependency. * New upstream release candidate. * Refresh patches. + * Update symbols for 4.4.0~rc2. -- Bas Couwenberg sebas...@debian.org Sat, 25 Jul 2015 01:51:31 +0200 diff --git a/debian/libnetcdf7.symbols b/debian/libnetcdf7.symbols index be59e94..cd3a04e 100644 --- a/debian/libnetcdf7.symbols +++ b/debian/libnetcdf7.symbols @@ -137,6 +137,7 @@ libnetcdf.so.7 libnetcdf7 #MINVER# NC_get_vara@Base 4.1.3 NC_getshape@Base 4.3.3 NC_initialize@Base 4.1.3 + NC_inq_recvar@Base 4.4.0~rc2 NC_is_recvar@Base 4.3.3 NC_lookupvar@Base 3.6.1 NC_open@Base 4.1.3 @@ -431,6 +432,7 @@ libnetcdf.so.7 libnetcdf7 #MINVER# nc_delete@Base 3.6.1 nc_delete_mp@Base 3.6.1 nc_enddef@Base 3.6.1 + nc_exit@Base 4.4.0~rc2 nc_free_string@Base 4.0.1 nc_free_vlen@Base 4.0.1 nc_free_vlens@Base 4.1.3 @@ -602,6 +604,7 @@ libnetcdf.so.7 libnetcdf7 #MINVER# nc_insert_compound@Base 4.0.1 nc_insert_enum@Base 4.0.1 nc_open@Base 3.6.1 + nc_open_mem@Base 4.4.0~rc2 nc_open_par@Base 4.0.1 nc_open_par_fortran@Base 4.1.3 nc_ptrdiffvector1@Base 4.3.3 @@ -1058,6 +1061,8 @@ libnetcdf.so.7 libnetcdf7 #MINVER# new_x_NC_dim@Base 3.6.1 new_x_NC_var@Base 3.6.1 nodematch@Base 4.3.3 + num_plists@Base 4.4.0~rc2 + num_spaces@Base 4.4.0~rc2 oc_clientparam_get@Base 4.1.3 oc_close@Base 4.1.3 oc_curl_debug@Base 4.3.3 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 08/09: Drop Files-Excluded from copyright repacksuffix from watch file, autom4te.cache/ no longer included.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository netcdf. commit bdb0fe2254fa3df1067cb2b4c76707328d432992 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Jul 25 02:12:19 2015 +0200 Drop Files-Excluded from copyright repacksuffix from watch file, autom4te.cache/ no longer included. --- debian/changelog | 2 ++ debian/copyright | 1 - debian/watch | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index d05a3a2..a86f1e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ netcdf (1:4.4.0~rc2-1) UNRELEASED; urgency=medium * New upstream release candidate. * Refresh patches. * Update symbols for 4.4.0~rc2. + * Drop Files-Excluded from copyright repacksuffix from watch file, +autom4te.cache/ no longer included. -- Bas Couwenberg sebas...@debian.org Sat, 25 Jul 2015 01:51:31 +0200 diff --git a/debian/copyright b/debian/copyright index 3286fdf..d94801d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,7 +2,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: NetCDF-C Upstream-Contact: University Corporation for Atmospheric Research/Unidata Source: https://github.com/Unidata/netcdf-c/releases -Files-Excluded: autom4te.cache/* Files: * Copyright: 1993-2014, University Corporation for Atmospheric Research/Unidata diff --git a/debian/watch b/debian/watch index e394998..7f65b6e 100644 --- a/debian/watch +++ b/debian/watch @@ -2,7 +2,6 @@ version=3 opts=\ dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\ uversionmangle=s/_/./g;s/(\d)[_\.\-\+]?((RC|rc|pre|dev|gamma|beta|alpha|b|a)[\-\.]?(\d*))$/$1~$3$4/,\ -filenamemangle=s/(?:.*?)?[vr]?(\d[\d\.\-\w]*)\.tar\.gz/netcdf-c-$1.tar.gz/,\ -repacksuffix=+ds \ +filenamemangle=s/(?:.*?)?[vr]?(\d[\d\.\-\w]*)\.tar\.gz/netcdf-c-$1.tar.gz/ \ https://github.com/Unidata/netcdf-c/releases \ (?:.*/)*(?:rel|v|r|netcdf-c|)[\-\_]?(\d[\d\-\.\w]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 05/09: New upstream release candidate.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository netcdf. commit 203c8982ac89cc11a0a4565309912f22bedf4887 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Jul 25 01:55:00 2015 +0200 New upstream release candidate. --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7f3e474..08bcc4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -netcdf (1:4.3.3.1+ds-1~exp3) UNRELEASED; urgency=medium +netcdf (1:4.4.0~rc2-1) UNRELEASED; urgency=medium * Add libcurl-ssl-dev as alternative for libcurl-gnutls-dev build dependency. + * New upstream release candidate. - -- Bas Couwenberg sebas...@debian.org Thu, 25 Jun 2015 20:57:26 +0200 + -- Bas Couwenberg sebas...@debian.org Sat, 25 Jul 2015 01:51:31 +0200 netcdf (1:4.3.3.1+ds-1~exp2) experimental; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 02/09: Merge tag 'upstream/4.4.0_rc1'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository netcdf. commit 29cdec291d33352655247aa60384ac208a690d77 Merge: 59b932d bb9683b Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Jul 25 01:50:51 2015 +0200 Merge tag 'upstream/4.4.0_rc1' Upstream version 4.4.0~rc1 .gitignore |1 + .travis.yml | 26 +- CMakeLists.txt | 140 +- Doxyfile.developer |2 +- INSTALL | 259 - INSTALL.cmake | 161 - docs/install.dox = INSTALL.md | 313 +- Makefile.am |2 +- Makefile.in | 54 +- RELEASE_NOTES.md| 28 + aclocal.m4 | 181 +- cf | 203 - cf.cmake| 14 - compile |2 +- config.guess| 201 +- config.h.cmake.in |1 + config.h.in | 14 +- config.sub | 40 +- configure | 2306 + configure.ac| 37 +- depcomp |2 +- docs/.gitignore |1 + docs/CMakeLists.txt | 26 +- docs/Doxyfile.in| 11 +- docs/FAQ.md | 23 +- docs/Makefile.am| 13 +- docs/Makefile.in| 41 +- docs/OPeNDAP.dox| 692 +++ docs/architecture.dox |6 +- docs/attribute_conventions.md | 128 + docs/auth.md| 489 ++ docs/auth.md.in | 14 + docs/file_format_specifications.md | 744 +++ docs/guide.dox | 1700 +-- docs/images/Makefile.in | 27 +- docs/install-fortran.md | 237 +- docs/install.md | 428 +- docs/mainpage.dox | 12 +- docs/{notes.dox = notes.md}| 42 +- docs/ocauth.md | 475 ++ docs/software.md| 2719 ++ docs/tutorial.dox |2 +- docs/windows-binaries.md| 51 +- examples/C/Makefile.in | 31 +- examples/CDL/Makefile.in| 30 +- examples/Makefile.in| 27 +- h5_test/CMakeLists.txt |2 - h5_test/Makefile.am | 11 +- h5_test/Makefile.in | 38 +- h5_test/tst_h_endian_float.c| 83 + h5_test/tst_h_vars.c| 86 +- include/Makefile.am |4 + include/Makefile.in | 41 +- include/ncdispatch.h| 15 +- include/netcdf.h|7 +- include/netcdf_mem.h| 82 + install-sh | 366 +- libdap2/Makefile.in | 31 +- libdap2/dapcvt.c| 32 +- libdap2/dapdebug.h |1 - libdap2/env |6 +- libdap2/ncd2dispatch.c | 31 +- libdispatch/Makefile.in | 31 +- libdispatch/dfile.c | 281 +- libdispatch/dgroup.c|3 + libdispatch/dvar.c | 64 + libdispatch/dvarinq.c | 122 +- libdispatch/dvarput.c | 15 +- liblib/CMakeLists.txt |2 +- liblib/Makefile.am | 14 +- liblib/Makefile.in | 37 +- libnetcdf.settings.in |1 + libsrc/CMakeLists.txt | 12 +- libsrc/Makefile.in | 31 +- libsrc/attr.c | 343 +- libsrc/attr.m4 |4 +- libsrc/ffio.c |2 + libsrc/memio.c | 184 +- libsrc/mmapio.c |2 + libsrc/nc3internal.c| 254 +- libsrc/ncio.c | 34 +- libsrc/ncio.h |4 +- libsrc/ncx.c| 5955 -- libsrc/posixio.c|4 +-
[netcdf] 06/09: Refresh patches.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository netcdf. commit 603881dd4625dcad55d3db67fd9d685b2fc937f2 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Jul 25 02:03:44 2015 +0200 Refresh patches. --- debian/changelog | 1 + debian/patches/privacy-breach-logo.patch | 17 + 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 08bcc4f..3a013d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ netcdf (1:4.4.0~rc2-1) UNRELEASED; urgency=medium * Add libcurl-ssl-dev as alternative for libcurl-gnutls-dev build dependency. * New upstream release candidate. + * Refresh patches. -- Bas Couwenberg sebas...@debian.org Sat, 25 Jul 2015 01:51:31 +0200 diff --git a/debian/patches/privacy-breach-logo.patch b/debian/patches/privacy-breach-logo.patch index eb575f5..8dd2dcf 100644 --- a/debian/patches/privacy-breach-logo.patch +++ b/debian/patches/privacy-breach-logo.patch @@ -1,14 +1,15 @@ Description: Use local logo image to fix privacy-breach-logo lintian error. Author: Bas Couwenberg sebas...@xs4all.nl +Forwarded: not-needed --- a/docs/footer.html +++ b/docs/footer.html @@ -1,7 +1,7 @@ - hr size=2/ - address style=text-align: center; - a href=http://www.unidata.ucar.edu/software/netcdf/;Return to the Main Unidata NetCDF page./abr --img src=http://www.unidata.ucar.edu/img/v3/logos/uniLogo.png; -+img src=unidata_logo_cmyk.png - - address style=text-align: right;small - Generated on $datetime for $projectname. NetCDF is + hr size=2/ + address style=text-align: center; + a href=http://www.unidata.ucar.edu/software/netcdf/;Return to the Main Unidata NetCDF page./abr +-img src=http://www.unidata.ucar.edu/images/logos/uniLogo.png; ++img src=unidata_logo_cmyk.png + + address style=text-align: right;small + Generated on $datetime for $projectname. NetCDF is -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] branch master updated (59b932d - 0c11cd2)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository netcdf. from 59b932d Add libcurl-ssl-dev as alternative for libcurl-gnutls-dev build dependency. new bb9683b Imported Upstream version 4.4.0~rc1 new 29cdec2 Merge tag 'upstream/4.4.0_rc1' new 2167e1a Imported Upstream version 4.4.0~rc2 new 745ecb6 Merge tag 'upstream/4.4.0_rc2' new 203c898 New upstream release candidate. new 603881d Refresh patches. new 59f9b26 Update symbols for 4.4.0~rc2. new bdb0fe2 Drop Files-Excluded from copyright repacksuffix from watch file, autom4te.cache/ no longer included. new 0c11cd2 Set distribution to experimental. The 9 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: .gitignore |1 + .travis.yml | 26 +- CMakeLists.txt | 157 +- Doxyfile.developer |6 +- INSTALL | 259 - INSTALL.cmake | 161 - docs/install.dox = INSTALL.md | 313 +- Makefile.am |2 +- Makefile.in | 54 +- README.md | 28 +- RELEASE_NOTES.md| 94 +- aclocal.m4 | 181 +- cf |2 +- compile |2 +- config.guess| 201 +- config.h.cmake.in |1 + config.h.in | 14 +- config.sub | 40 +- configure | 2344 + configure.ac| 51 +- debian/changelog|9 +- debian/copyright|1 - debian/libnetcdf7.symbols |5 + debian/patches/privacy-breach-logo.patch| 17 +- debian/watch|3 +- depcomp |2 +- docs/.gitignore |1 + docs/CMakeLists.txt | 26 +- docs/Doxyfile.in| 11 +- docs/FAQ.md | 55 +- docs/Makefile.am| 13 +- docs/Makefile.in| 41 +- docs/OPeNDAP.dox| 692 +++ docs/architecture.dox |6 +- docs/attribute_conventions.md | 128 + docs/auth.md| 489 ++ docs/auth.md.in | 14 + docs/file_format_specifications.md | 744 +++ docs/footer.html| 20 +- docs/guide.dox | 1700 +-- docs/images/Makefile.in | 27 +- docs/install-fortran.md | 237 +- docs/install.md | 428 +- docs/mainpage.dox | 12 +- docs/{notes.dox = notes.md}| 42 +- docs/ocauth.md | 475 ++ docs/old/netcdf.texi|2 +- docs/software.md| 2732 ++ docs/tutorial.dox |2 +- docs/windows-binaries.md| 51 +- examples/C/Makefile.in | 31 +- examples/CDL/Makefile.in| 30 +- examples/Makefile.in| 27 +- h5_test/CMakeLists.txt |2 - h5_test/Makefile.am | 11 +- h5_test/Makefile.in | 38 +- h5_test/tst_h_endian_float.c| 83 + h5_test/tst_h_vars.c| 86 +- include/Makefile.am |4 + include/Makefile.in | 41 +- include/ncdispatch.h| 15 +- include/netcdf.h|7 +- include/netcdf_mem.h| 82 + install-sh | 366 +- libdap2/Makefile.in | 31 +- libdap2/dapcvt.c| 32 +- libdap2/dapdebug.h |1 - libdap2/env |6 +- libdap2/nccommon.h |1 - libdap2/ncd2dispatch.c | 31 +- libdispatch/Makefile.in | 31 +- libdispatch/dfile.c | 281 +-
mapcache_1.2.1-4~exp1_amd64.changes ACCEPTED into experimental
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Fri, 24 Jul 2015 13:45:27 +0200 Source: mapcache Binary: libmapcache1 libmapcache1-dev mapcache-cgi mapcache-tools libapache2-mod-mapcache Architecture: source amd64 Version: 1.2.1-4~exp1 Distribution: experimental Urgency: medium Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Changed-By: Bas Couwenberg sebas...@debian.org Description: libapache2-mod-mapcache - tile caching server - Apache module libmapcache1 - tile caching server - shared library libmapcache1-dev - tile caching server - shared library development files mapcache-cgi - tile caching server - CGI binary mapcache-tools - tile caching server - tools Changes: mapcache (1.2.1-4~exp1) experimental; urgency=medium . * Add libcurl-ssl-dev as alternative for libcurl-gnutls-dev build dependency. * Use multi-line uscan options without quotes. * Update mapserver build dependencies for MapServer 7.0.0. * Reorder build dependencies, add libharfbuzz-dev. Checksums-Sha1: 91a604dbf020e77af7b1242cf26b29bca141e088 2735 mapcache_1.2.1-4~exp1.dsc 5d0a9b6298839ebc324f4199380b1c068a2e20cd 11528 mapcache_1.2.1-4~exp1.debian.tar.xz 7d888257ef2fc77b7fc6534b9d6aa6bf1052ade6 22098 libapache2-mod-mapcache_1.2.1-4~exp1_amd64.deb 43883c4357e67787733db0849a883edaa92d266e 18520 libmapcache1-dev_1.2.1-4~exp1_amd64.deb 1145fbcdd5147273c4c492cce4addbe1dbbbff2a 100912 libmapcache1_1.2.1-4~exp1_amd64.deb 3c78773c4d3ebdd39ab3719c84d9d19bc858d0d3 10008 mapcache-cgi_1.2.1-4~exp1_amd64.deb 6c029240d9d51b9f0ea8293749c1c21eeb738ecf 20166 mapcache-tools_1.2.1-4~exp1_amd64.deb Checksums-Sha256: 6776752ac6e8a4f9138f02b44216764ec2464b451e38267d3d601e4157b93403 2735 mapcache_1.2.1-4~exp1.dsc 1b976ebe5fd18549824efcb28e071c55ff268a92c0b16449a60518cf7cc1f9ae 11528 mapcache_1.2.1-4~exp1.debian.tar.xz b708502d4de503b90a03ac6950cee12906e879d1d55affafc63de7f513e3bec6 22098 libapache2-mod-mapcache_1.2.1-4~exp1_amd64.deb 32a678d4ceb20f1be2a0ddde697a70a5ec252cb3210dd46df5994ff1a755c79a 18520 libmapcache1-dev_1.2.1-4~exp1_amd64.deb 3d9ae4864c65554e5f66da18c31f6ab2357895e181c35e697f95b92eab0d7a3b 100912 libmapcache1_1.2.1-4~exp1_amd64.deb 9fa8f12bd4c3b75d535b8991a1f5332ed149c568c137fd5f055374abc21d55b5 10008 mapcache-cgi_1.2.1-4~exp1_amd64.deb 280a018919a59bc0c82bfccdf939a49f7a4bbaed2fd169e2a4455b4f4868c119 20166 mapcache-tools_1.2.1-4~exp1_amd64.deb Files: a1c2babdf33ba74489d45ce6abf304d6 2735 devel optional mapcache_1.2.1-4~exp1.dsc 8d705d9fa2b0e12308c1eec5e24a143c 11528 devel optional mapcache_1.2.1-4~exp1.debian.tar.xz fe2965a267a8a56f0828ece306d510b2 22098 web optional libapache2-mod-mapcache_1.2.1-4~exp1_amd64.deb 423e47aff26795d111803f011a93cd09 18520 libdevel optional libmapcache1-dev_1.2.1-4~exp1_amd64.deb 468d3d5a9d044507b3200fcd3b9afb30 100912 libs optional libmapcache1_1.2.1-4~exp1_amd64.deb 43bcb1235f36c48937378326c047a797 10008 web optional mapcache-cgi_1.2.1-4~exp1_amd64.deb d245deba773689e7cca7103200eed4a4 20166 misc optional mapcache-tools_1.2.1-4~exp1_amd64.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCgAGBQJVsiiiAAoJEGdQ8QrojUrx3LQP/3FWr00MtT4uJjhX9pBc8zPg f+6YMyydyRlzlogu+G1LpSNf8oHUt3xAl3hSLhlon3ciaDTbYLooviw5YzkxoKLU GgevpOSzyfs+dqqT42SWTAHG4c43fXGd++ELifjjiMFA6ohneeYsUOHJdu1Z9a5J lTjMcBoOpUOtz3tJqJDWG+mSuxgJAA7AFj0pCWXkGuvPL0IUfEhH82VNMxq+3obn zmo/cjlT8vCrq2oM5913yVBIcVVlD/f8gsiMEPo3chWBj92ouo0ur8OPcmtIlulM yQOqeUSmVn+UF7Gdnm/ryEJinXErtCxiv6/QRXlZ24a8t1m4hfb17imheH2hznv2 twrXAqJ4rl2uKxtHkzA2rZ5qnw7jh1kOsKEIg2Lj1RWk+cZQggm2B2oDpFRvKuNj yUZG32AWG3pzDOgW1ggLYKl2l8BBEur2SbQxL3t0B7Y93FLjd3Bqp5+SBKUqUlen lUqqzKVuHCGii5D5i7w76hJIz3KBQB5gkZRCQ6O0ihTBrEQ6tKZbMb1x3yDihA7M yKvibDVpV5NqM3TW07GMpnamB+xdSB8WXV9C25cTQSiOZd+n//i/yXy5R6WpxHjd tUiJzw98U8eJ34oMkWO6jRrGqTfz/+o3pPvqvbkJnf7Wc+bUfMMZUutNQ31Qg/OO OLeTk3HYleELGWw3av7X =TFny -END PGP SIGNATURE- Thank you for your contribution to Debian. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mapcache] 01/03: Update mapserver build dependencies for MapServer 7.0.0.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository mapcache. commit 3d5032c05326f4fccb2ce9375ff0d7a256ff25ae Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 11:51:41 2015 +0200 Update mapserver build dependencies for MapServer 7.0.0. --- debian/changelog | 1 + debian/control | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 54c4403..c700be1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ mapcache (1.2.1-4) UNRELEASED; urgency=medium * Add libcurl-ssl-dev as alternative for libcurl-gnutls-dev build dependency. * Use multi-line uscan options without quotes. + * Update mapserver build dependencies for MapServer 7.0.0. -- Bas Couwenberg sebas...@debian.org Thu, 25 Jun 2015 20:59:52 +0200 diff --git a/debian/control b/debian/control index 170310c..a148f51 100644 --- a/debian/control +++ b/debian/control @@ -26,8 +26,7 @@ Build-Depends: debhelper (= 9), libpixman-1-dev, libsqlite3-dev, libtiff-dev, - libmapserver1 (= 6.4.0-2), - libmapserver1-dev (= 6.4.0-2), + libmapserver-dev, chrpath, cmake, pkg-config, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapcache.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mapcache] 02/03: Reorder build dependencies, add libharfbuzz-dev.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository mapcache. commit 068268fbd38b31fdbfdbffd93c32756ba25af5e4 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 13:37:24 2015 +0200 Reorder build dependencies, add libharfbuzz-dev. --- debian/changelog | 1 + debian/control | 29 +++-- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index c700be1..032911c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ mapcache (1.2.1-4) UNRELEASED; urgency=medium * Add libcurl-ssl-dev as alternative for libcurl-gnutls-dev build dependency. * Use multi-line uscan options without quotes. * Update mapserver build dependencies for MapServer 7.0.0. + * Reorder build dependencies, add libharfbuzz-dev. -- Bas Couwenberg sebas...@debian.org Thu, 25 Jun 2015 20:59:52 +0200 diff --git a/debian/control b/debian/control index a148f51..5c8a223 100644 --- a/debian/control +++ b/debian/control @@ -7,28 +7,29 @@ Section: devel Priority: optional Build-Depends: debhelper (= 9), dpkg-dev (= 1.16.1.1), + dh-apache2, + apache2-dev, + chrpath, + cmake, + libcairo2-dev, libcurl4-gnutls-dev | libcurl-ssl-dev, - libpng-dev, - libjpeg-dev, - zlib1g-dev, - libgd-dev, + libfcgi-dev, libfreetype6-dev, + libfribidi-dev, + libgd-dev, libgdal-dev (= 1.10.0-0~), - libproj-dev, libgeos-dev (= 3.3.1-1~), - libfribidi-dev, - libcairo2-dev, - librsvg2-dev, - apache2-dev, - dh-apache2, - libfcgi-dev, + libharfbuzz-dev, + libjpeg-dev, + libmapserver-dev, libpcre3-dev, libpixman-1-dev, + libpng-dev, + libproj-dev, + librsvg2-dev, libsqlite3-dev, libtiff-dev, - libmapserver-dev, - chrpath, - cmake, + zlib1g-dev, pkg-config, pkg-kde-tools, docbook2x, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapcache.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mapcache] 03/03: Set distribution to experimental.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository mapcache. commit 84c2cdee7b4618dbcf8338e4293927326952070c Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jul 24 13:45:45 2015 +0200 Set distribution to experimental. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 032911c..66b1e02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -mapcache (1.2.1-4) UNRELEASED; urgency=medium +mapcache (1.2.1-4~exp1) experimental; urgency=medium * Add libcurl-ssl-dev as alternative for libcurl-gnutls-dev build dependency. * Use multi-line uscan options without quotes. * Update mapserver build dependencies for MapServer 7.0.0. * Reorder build dependencies, add libharfbuzz-dev. - -- Bas Couwenberg sebas...@debian.org Thu, 25 Jun 2015 20:59:52 +0200 + -- Bas Couwenberg sebas...@debian.org Fri, 24 Jul 2015 13:45:27 +0200 mapcache (1.2.1-3) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapcache.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mapcache] branch master updated (3f8ef72 - 84c2cde)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository mapcache. from 3f8ef72 Use multi-line uscan options without quotes. new 3d5032c Update mapserver build dependencies for MapServer 7.0.0. new 068268f Reorder build dependencies, add libharfbuzz-dev. new 84c2cde Set distribution to experimental. The 3 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 6 -- debian/control | 30 +++--- 2 files changed, 19 insertions(+), 17 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapcache.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mapcache] tag debian/1.2.1-4.exp1 created (now 84c2cde)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/1.2.1-4.exp1 in repository mapcache. at 84c2cde (commit) No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapcache.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel