This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository tinyows.
commit 06cec23dcc145ac70d9f6e0a6920bb50983867d7 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Tue Jul 7 20:25:16 2015 +0200 Drop patches applied upstream, refresh remaining patches. --- debian/changelog | 1 + ...quence-attribute-in-addition-to-pkey-to-l.patch | 83 --- ...-for-postgis-version-2.1-in-demo-installe.patch | 23 - debian/patches/0001-Fix-76.patch | 23 - ...Fix-feature-ids-in-JSON-GetFeature-output.patch | 23 - ...ct-inversion-of-axis-order-for-projected-.patch | 33 -- debian/patches/0001-Fix-wrong-comment.patch | 30 - ...orce-to-be-upper-case-in-service-response.patch | 27 - ...ey-and-pkey_sequence-attrs-in-layer_flush.patch | 30 - .../0001-Unable-to-deal-with-NS-prefix.patch | 32 -- ...ess-and-errorfull-ASCII-char-for-XML-outp.patch | 22 - debian/patches/0001-fix-68.patch | 22 - .../0001-fix-forgottent-copy-on-id_column.patch | 21 - ...fix-wrong-ows-ServiceTypeVersion-sequence.patch | 29 - debian/patches/drop-config.log.patch | 617 --------------------- debian/patches/series | 14 - 16 files changed, 1 insertion(+), 1029 deletions(-) diff --git a/debian/changelog b/debian/changelog index 140cc3d..21a5e0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ tinyows (1.1.1-1) UNRELEASED; urgency=medium * Use multi-line uscan options without quotes. * Update watch file for GitHub releases. * New upstream release. + * Drop patches applied upstream, refresh remaining patches. -- Bas Couwenberg <sebas...@debian.org> Tue, 07 Jul 2015 20:10:12 +0200 diff --git a/debian/patches/0001-Add-pkey_sequence-attribute-in-addition-to-pkey-to-l.patch b/debian/patches/0001-Add-pkey_sequence-attribute-in-addition-to-pkey-to-l.patch deleted file mode 100644 index e390e84..0000000 --- a/debian/patches/0001-Add-pkey_sequence-attribute-in-addition-to-pkey-to-l.patch +++ /dev/null @@ -1,83 +0,0 @@ -From c23f99093304c92a261fca266eb0457c6100a779 Mon Sep 17 00:00:00 2001 -From: Timur Sufiev <t.suf...@acti.ru> -Date: Mon, 19 Nov 2012 16:12:48 +0400 -Subject: Add "pkey_sequence" attribute (in addition to "pkey") to layer - config. -Origin: https://github.com/mapserver/tinyows/commit/c23f99093304c92a261fca266eb0457c6100a779 - -In order to insert new feature into layer based on PostgreSQL view, -"pkey" attribute is not enough: one should be able to deduce sequence -name using pg_get_serial_sequence() function, which returns empty row -for views. Fix this by adding "pkey_sequence" attribute. ---- - src/ows/ows_config.c | 10 ++++++++++ - src/ows/ows_layer.c | 2 ++ - src/ows/ows_storage.c | 8 ++++++-- - src/ows_struct.h | 1 + - 4 files changed, 19 insertions(+), 2 deletions(-) - ---- a/src/ows/ows_config.c -+++ b/src/ows/ows_config.c -@@ -567,6 +567,16 @@ static void ows_parse_config_layer(ows * - buffer_copy(layer->pkey, layer->parent->pkey); - } - -+ a = xmlTextReaderGetAttribute(r, (xmlChar *) "pkey_sequence"); -+ if (a) { -+ layer->pkey_sequence = buffer_init(); -+ buffer_add_str(layer->pkey_sequence, (char *) a); -+ xmlFree(a); -+ } else if (layer->parent && layer->parent->pkey_sequence) { -+ layer->pkey_sequence = buffer_init(); -+ buffer_copy(layer->pkey_sequence, layer->parent->pkey_sequence); -+ } -+ - if (layer->name && layer->ns_uri) { - buffer_add_head(layer->name, ':'); - buffer_add_head_str(layer->name, layer->ns_uri->buf); ---- a/src/ows/ows_layer.c -+++ b/src/ows/ows_layer.c -@@ -534,6 +534,7 @@ ows_layer *ows_layer_init() - l->exclude_items = NULL; - l->include_items = NULL; - l->pkey = NULL; -+ l->pkey_sequence = NULL; - l->ns_prefix = buffer_init(); - l->ns_uri = buffer_init(); - l->storage = ows_layer_storage_init(); -@@ -564,6 +565,7 @@ void ows_layer_free(ows_layer * l) - if (l->exclude_items) list_free(l->exclude_items); - if (l->include_items) list_free(l->include_items); - if (l->pkey) buffer_free(l->pkey); -+ if (l->pkey_sequence) buffer_free(l->pkey_sequence); - - free(l); - l = NULL; ---- a/src/ows/ows_storage.c -+++ b/src/ows/ows_storage.c -@@ -268,9 +268,13 @@ static void ows_storage_fill_pkey(ows * - /* Even if no sequence found, this function return an empty row - * so we must check that result string returned > 0 char - */ -- if (PQntuples(res) == 1 && strlen((char *) PQgetvalue(res, 0, 0)) > 0) { -+ if ( l->pkey_sequence || -+ (PQntuples(res) == 1 && strlen((char *) PQgetvalue(res, 0, 0)) > 0) ) { - l->storage->pkey_sequence = buffer_init(); -- buffer_add_str(l->storage->pkey_sequence, PQgetvalue(res, 0, 0)); -+ if ( l->pkey_sequence ) -+ buffer_copy(l->storage->pkey_sequence, l->pkey_sequence); -+ else -+ buffer_add_str(l->storage->pkey_sequence, PQgetvalue(res, 0, 0)); - } - - buffer_empty(sql); ---- a/src/ows_struct.h -+++ b/src/ows_struct.h -@@ -179,6 +179,7 @@ typedef struct Ows_layer { - list * exclude_items; - list * include_items; - buffer * pkey; -+ buffer * pkey_sequence; - list * gml_ns; - buffer * ns_prefix; - buffer * ns_uri; diff --git a/debian/patches/0001-Add-support-for-postgis-version-2.1-in-demo-installe.patch b/debian/patches/0001-Add-support-for-postgis-version-2.1-in-demo-installe.patch deleted file mode 100644 index b901742..0000000 --- a/debian/patches/0001-Add-support-for-postgis-version-2.1-in-demo-installe.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 8dda8ee852bd3da5d2b8830a655b653630ba571d Mon Sep 17 00:00:00 2001 -From: Bas Couwenberg <sebas...@xs4all.nl> -Date: Sun, 7 Sep 2014 16:57:22 +0200 -Subject: Add support for postgis version 2.1 in demo installer. -Origin: https://github.com/mapserver/tinyows/commit/8dda8ee852bd3da5d2b8830a655b653630ba571d - ---- - demo/install.sh.in | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- a/demo/install.sh.in -+++ b/demo/install.sh.in -@@ -9,7 +9,9 @@ PGUSER=postgres - SHP2PGSQL=@SHP2PGSQL@ - DB=tinyows_demo - --if [ -d @POSTGIS_SHARE@/contrib/postgis-2.0 ]; then -+if [ -d @POSTGIS_SHARE@/contrib/postgis-2.1 ]; then -+ PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.1 -+elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.0 ]; then - PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0 - elif [ -d @POSTGIS_SHARE@/contrib/postgis-1.5 ]; then - PGSHARE=@POSTGIS_SHARE@/contrib/postgis-1.5 diff --git a/debian/patches/0001-Fix-76.patch b/debian/patches/0001-Fix-76.patch deleted file mode 100644 index 586b7a6..0000000 --- a/debian/patches/0001-Fix-76.patch +++ /dev/null @@ -1,23 +0,0 @@ -From f593a4355fb627e1b86bb46fac30c104badbac28 Mon Sep 17 00:00:00 2001 -From: Olivier Courtin <olivier.cour...@oslandia.com> -Date: Thu, 9 Apr 2015 23:41:11 +0200 -Subject: Fix #76 -Origin: https://github.com/mapserver/tinyows/commit/f593a4355fb627e1b86bb46fac30c104badbac28 -Bug: https://github.com/mapserver/tinyows/issues/76 - ---- - src/wfs/wfs_get_feature.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/src/wfs/wfs_get_feature.c -+++ b/src/wfs/wfs_get_feature.c -@@ -806,7 +806,8 @@ static void wfs_geojson_display_results( - - prop_table = ows_psql_describe_table(o, ll->value); - first_row = true; -- buffer_copy(id_name, ows_psql_id_column(o, ll->value)); -+ if(ows_psql_id_column(o, ll->value)) /* CAUTION: pkey could be NULL ! */ -+ buffer_copy(id_name, ows_psql_id_column(o, ll->value)); - number = -1; - if (id_name && id_name->use) - number = PQfnumber(res, id_name->buf); diff --git a/debian/patches/0001-Fix-feature-ids-in-JSON-GetFeature-output.patch b/debian/patches/0001-Fix-feature-ids-in-JSON-GetFeature-output.patch deleted file mode 100644 index e45420b..0000000 --- a/debian/patches/0001-Fix-feature-ids-in-JSON-GetFeature-output.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 14d75ad64a5988007fc4d747aba06ad15833a9ec Mon Sep 17 00:00:00 2001 -From: Timur Sufiev <t.suf...@acti.ru> -Date: Tue, 20 Nov 2012 16:04:42 +0400 -Subject: Fix feature ids in JSON GetFeature output. -Origin: https://github.com/mapserver/tinyows/commit/14d75ad64a5988007fc4d747aba06ad15833a9ec - -Produce '<layer_name>.<object_integer_id>' as feature ids -instead of '<namespace-uri>:<layer_name>.<object_integer_id>'. ---- - src/wfs/wfs_get_feature.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/src/wfs/wfs_get_feature.c -+++ b/src/wfs/wfs_get_feature.c -@@ -822,7 +822,7 @@ static void wfs_geojson_display_results( - - if ( number >= 0 ) { - buffer_add_str(id_name, "\"id\": \""); -- buffer_copy(id_name, ll->value); -+ buffer_copy(id_name, ows_layer_no_uri(o->layers, ll->value)); - buffer_add_str(id_name, "."); - buffer_add_str(id_name, PQgetvalue(res, i, number)); - buffer_add_str(id_name, "\", "); diff --git a/debian/patches/0001-Fix-incorrect-inversion-of-axis-order-for-projected-.patch b/debian/patches/0001-Fix-incorrect-inversion-of-axis-order-for-projected-.patch deleted file mode 100644 index 34c85f2..0000000 --- a/debian/patches/0001-Fix-incorrect-inversion-of-axis-order-for-projected-.patch +++ /dev/null @@ -1,33 +0,0 @@ -From eb56faef4c7de10afd4f202ddd528642b7e82721 Mon Sep 17 00:00:00 2001 -From: Even Rouault <even.roua...@mines-paris.org> -Date: Sat, 28 Jun 2014 23:11:51 +0200 -Subject: Fix incorrect inversion of axis order for projected SRS -Origin: https://github.com/mapserver/tinyows/commit/eb56faef4c7de10afd4f202ddd528642b7e82721 - -This fixes https://github.com/rouault/tinyows/commit/0bf86230a4f9485231bf3a7fedb038b57b8714a7 - -Projected SRS with easting-northing order always end up with AXIS["something",NORTH]] ---- - src/ows/ows_srs.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/src/ows/ows_srs.c -+++ b/src/ows/ows_srs.c -@@ -134,7 +134,7 @@ bool ows_srs_set(ows * o, ows_srs * c, c - - sql = buffer_init(); - buffer_add_str(sql, "SELECT srid, position('+units=m ' in proj4text)"); -- buffer_add_str(sql, ", (position('AXIS[\"X\",NORTH]]' in srtext) + position('AXIS[\"Easting\",EAST]]' in srtext))"); -+ buffer_add_str(sql, ", (position('AXIS[\"X\",NORTH]]' in srtext) + position('AXIS[\"Northing\",NORTH]]' in srtext))"); - buffer_add_str(sql, " FROM spatial_ref_sys WHERE auth_name='"); - buffer_copy(sql, auth_name); - buffer_add_str(sql, "' AND auth_srid="); -@@ -216,7 +216,7 @@ bool ows_srs_set_from_srid(ows * o, ows_ - sql = buffer_init(); - buffer_add_str(sql, "SELECT auth_name, auth_srid, "); - buffer_add_str(sql, "position('+units=m ' in proj4text), "); -- buffer_add_str(sql, "(position('AXIS[\"X\",NORTH]]' in srtext) + position('AXIS[\"Easting\",EAST]]' in srtext)) "); -+ buffer_add_str(sql, "(position('AXIS[\"X\",NORTH]]' in srtext) + position('AXIS[\"Northing\",NORTH]]' in srtext)) "); - buffer_add_str(sql, "FROM spatial_ref_sys WHERE srid = '"); - buffer_add_int(sql, srid); - buffer_add_str(sql, "'"); diff --git a/debian/patches/0001-Fix-wrong-comment.patch b/debian/patches/0001-Fix-wrong-comment.patch deleted file mode 100644 index 795f348..0000000 --- a/debian/patches/0001-Fix-wrong-comment.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ce068ffb644348b83b9e64f5b9b9e851efab6451 Mon Sep 17 00:00:00 2001 -From: Even Rouault <even.roua...@mines-paris.org> -Date: Sat, 28 Jun 2014 23:20:40 +0200 -Subject: Fix wrong comment -Origin: https://github.com/mapserver/tinyows/commit/ce068ffb644348b83b9e64f5b9b9e851efab6451 - ---- - src/ows/ows_srs.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/src/ows/ows_srs.c -+++ b/src/ows/ows_srs.c -@@ -161,7 +161,7 @@ bool ows_srs_set(ows * o, ows_srs * c, c - else - c->is_degree = false; - -- /* Is northing-easting SRID ? */ -+ /* Is easting-northing SRID ? */ - if (atoi(PQgetvalue(res, 0, 2)) != 0) - c->is_eastern_axis = true; - -@@ -240,7 +240,7 @@ bool ows_srs_set_from_srid(ows * o, ows_ - else - s->is_degree = false; - -- /* Is northing-easting SRID ? */ -+ /* Is easting-northing SRID ? */ - if (atoi(PQgetvalue(res, 0, 3)) != 0) - s->is_eastern_axis = true; - diff --git a/debian/patches/0001-Force-to-be-upper-case-in-service-response.patch b/debian/patches/0001-Force-to-be-upper-case-in-service-response.patch deleted file mode 100644 index c40ac99..0000000 --- a/debian/patches/0001-Force-to-be-upper-case-in-service-response.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 52e3662c198e94cac6a7ab1319a48cedde769c91 Mon Sep 17 00:00:00 2001 -From: root <root@NEW-PERRINE-001.(none)> -Date: Mon, 29 Sep 2014 20:02:01 +0200 -Subject: Force to be upper case in service response -Origin: https://github.com/mapserver/tinyows/commit/52e3662c198e94cac6a7ab1319a48cedde769c91 - ---- - src/ows/ows_metadata.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/src/ows/ows_metadata.c -+++ b/src/ows/ows_metadata.c -@@ -158,10 +158,14 @@ void ows_metadata_fill(ows * o, array * - /* Initialize supported versions from service type */ - if (o->metadata->type) { - if (buffer_case_cmp(o->metadata->type, "WFS")) { -+ buffer_free(o->metadata->type); -+ o->metadata->type = buffer_from_str("WFS"); - o->metadata->versions = list_init(); - list_add_str(o->metadata->versions, "1.0.0"); - list_add_str(o->metadata->versions, "1.1.0"); - } else if (buffer_case_cmp(o->metadata->type, "WMS")) { -+ buffer_free(o->metadata->type); -+ o->metadata->type = buffer_from_str("WMS"); - o->metadata->versions = list_init(); - list_add_str(o->metadata->versions, "1.1.0"); - list_add_str(o->metadata->versions, "1.3.0"); diff --git a/debian/patches/0001-Support-pkey-and-pkey_sequence-attrs-in-layer_flush.patch b/debian/patches/0001-Support-pkey-and-pkey_sequence-attrs-in-layer_flush.patch deleted file mode 100644 index 17f7923..0000000 --- a/debian/patches/0001-Support-pkey-and-pkey_sequence-attrs-in-layer_flush.patch +++ /dev/null @@ -1,30 +0,0 @@ -From dc1a8198860a8f1bc7afbed71c967dc36cfa5d00 Mon Sep 17 00:00:00 2001 -From: Timur Sufiev <t.suf...@acti.ru> -Date: Tue, 20 Nov 2012 17:02:18 +0400 -Subject: Support pkey and pkey_sequence attrs in layer_flush. -Origin: https://github.com/mapserver/tinyows/commit/dc1a8198860a8f1bc7afbed71c967dc36cfa5d00 - ---- - src/ows/ows_layer.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - ---- a/src/ows/ows_layer.c -+++ b/src/ows/ows_layer.c -@@ -669,5 +669,17 @@ void ows_layer_flush(ows_layer * l, FILE - list_flush(l->include_items, output); - fprintf(output, "\n"); - } -+ -+ if(l->pkey) { -+ fprintf(output, "pkey: "); -+ list_flush(l->pkey, output); -+ fprintf(output, "\n"); -+ } -+ -+ if(l->pkey_sequence) { -+ fprintf(output, "pkey_sequence: "); -+ list_flush(l->pkey_sequence, output); -+ fprintf(output, "\n"); -+ } - } - #endif diff --git a/debian/patches/0001-Unable-to-deal-with-NS-prefix.patch b/debian/patches/0001-Unable-to-deal-with-NS-prefix.patch deleted file mode 100644 index 0f9956a..0000000 --- a/debian/patches/0001-Unable-to-deal-with-NS-prefix.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 11ab43ea3cd9323241ce0044a3833c55d303de93 Mon Sep 17 00:00:00 2001 -From: Olivier Courtin <olivier.cour...@oslandia.com> -Date: Mon, 1 Sep 2014 14:36:58 +0200 -Subject: Unable to deal with NS prefix -Origin: https://github.com/mapserver/tinyows/commit/11ab43ea3cd9323241ce0044a3833c55d303de93 - ---- - src/wfs/wfs_request.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - ---- a/src/wfs/wfs_request.c -+++ b/src/wfs/wfs_request.c -@@ -253,7 +253,7 @@ static list *wfs_request_check_typename( - */ - static list *wfs_request_check_fid(ows * o, wfs_request * wr, list * layer_name) - { -- list *fe; -+ list *fe, *ff; - mlist *f; - buffer *b, *layer; - list_node *ln, *ln_tpn; -@@ -302,7 +302,9 @@ static list *wfs_request_check_fid(ows * - return NULL; - } - -- layer = ows_layer_no_uri_to_uri(o->layers, fe->last->value); -+ ff = list_split(':', fe->last->value, false); -+ layer = ows_layer_no_uri_to_uri(o->layers, ff->last->value); -+ list_free(ff); - - /* If typename is NULL, fill the layer name list */ - if (!wr->typename && !in_list(layer_name, layer)) diff --git a/debian/patches/0001-filter-useless-and-errorfull-ASCII-char-for-XML-outp.patch b/debian/patches/0001-filter-useless-and-errorfull-ASCII-char-for-XML-outp.patch deleted file mode 100644 index 5f5c7a6..0000000 --- a/debian/patches/0001-filter-useless-and-errorfull-ASCII-char-for-XML-outp.patch +++ /dev/null @@ -1,22 +0,0 @@ -From fe7599dbf5d6dd952adf261cd0d4753969f1a5db Mon Sep 17 00:00:00 2001 -From: Olivier Courtin <olivier.cour...@oslandia.com> -Date: Wed, 12 Nov 2014 09:34:41 +0000 -Subject: filter useless (and errorfull) ASCII char for XML output -Origin: https://github.com/mapserver/tinyows/commit/fe7599dbf5d6dd952adf261cd0d4753969f1a5db - ---- - src/struct/buffer.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/src/struct/buffer.c -+++ b/src/struct/buffer.c -@@ -502,6 +502,9 @@ buffer *buffer_encode_xml_entities_str(c - buf = buffer_init(); - - for( /* empty */ ; *str ; str++) { -+ -+ if ((int) *str < 32 && (*str != '\n' && *str != '\r' && *str != ' ')) break; -+ - switch(*str) { - case '&': - buffer_add_str(buf, "&"); diff --git a/debian/patches/0001-fix-68.patch b/debian/patches/0001-fix-68.patch deleted file mode 100644 index dad4c22..0000000 --- a/debian/patches/0001-fix-68.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 8c7dc7206b50346c36e28048dc3d3800c45ad916 Mon Sep 17 00:00:00 2001 -From: Peter Hopfgartner <peter.hopfgart...@r3-gis.com> -Date: Thu, 13 Nov 2014 13:32:01 +0100 -Subject: fix #68 -Origin: https://github.com/mapserver/tinyows/commit/8c7dc7206b50346c36e28048dc3d3800c45ad916 -Bug: https://github.com/mapserver/tinyows/issues/68 - ---- - src/ows/ows_storage.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/src/ows/ows_storage.c -+++ b/src/ows/ows_storage.c -@@ -192,7 +192,7 @@ static void ows_storage_fill_pkey(ows * - sql = buffer_init(); - - buffer_add_str(sql, "SELECT c.column_name FROM information_schema.constraint_column_usage c, pg_namespace n "); -- buffer_add_str(sql, "WHERE n.nspname = '"); -+ buffer_add_str(sql, "WHERE c.table_schema=n.nspname AND n.nspname = '"); - buffer_copy(sql, l->storage->schema); - buffer_add_str(sql, "' AND c.table_name = '"); - buffer_copy(sql, l->storage->table); diff --git a/debian/patches/0001-fix-forgottent-copy-on-id_column.patch b/debian/patches/0001-fix-forgottent-copy-on-id_column.patch deleted file mode 100644 index f718ad8..0000000 --- a/debian/patches/0001-fix-forgottent-copy-on-id_column.patch +++ /dev/null @@ -1,21 +0,0 @@ -From e5cca8943f44d50e2295d7a3b48265a657689797 Mon Sep 17 00:00:00 2001 -From: Olivier Courtin <olivier.cour...@oslandia.com> -Date: Tue, 9 Sep 2014 06:03:23 +0200 -Subject: fix forgottent copy on id_column -Origin: https://github.com/mapserver/tinyows/commit/e5cca8943f44d50e2295d7a3b48265a657689797 - ---- - src/wfs/wfs_get_feature.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/src/wfs/wfs_get_feature.c -+++ b/src/wfs/wfs_get_feature.c -@@ -806,7 +806,7 @@ static void wfs_geojson_display_results( - - prop_table = ows_psql_describe_table(o, ll->value); - first_row = true; -- id_name = ows_psql_id_column(o, ll->value); -+ buffer_copy(id_name, ows_psql_id_column(o, ll->value)); - number = -1; - if (id_name && id_name->use) - number = PQfnumber(res, id_name->buf); diff --git a/debian/patches/0001-fix-wrong-ows-ServiceTypeVersion-sequence.patch b/debian/patches/0001-fix-wrong-ows-ServiceTypeVersion-sequence.patch deleted file mode 100644 index dc40c05..0000000 --- a/debian/patches/0001-fix-wrong-ows-ServiceTypeVersion-sequence.patch +++ /dev/null @@ -1,29 +0,0 @@ -From fb7fc0cc7c97fec9854851f55e946164cd213fa4 Mon Sep 17 00:00:00 2001 -From: root <root@new-perrine.(none)> -Date: Wed, 6 Aug 2014 23:51:32 +0200 -Subject: fix wrong ows:ServiceTypeVersion sequence -Origin: https://github.com/mapserver/tinyows/commit/fb7fc0cc7c97fec9854851f55e946164cd213fa4 - ---- - src/ows/ows_get_capabilities.c | 9 ++------- - 1 file changed, 2 insertions(+), 7 deletions(-) - ---- a/src/ows/ows_get_capabilities.c -+++ b/src/ows/ows_get_capabilities.c -@@ -131,14 +131,9 @@ void ows_service_identification(const ow - } - - fprintf(o->output, " <ows:ServiceType>%s</ows:ServiceType>\n", o->metadata->type->buf); -- fprintf(o->output, " <ows:ServiceTypeVersion>"); -+ for (ln = o->metadata->versions->first ; ln ; ln = ln->next) -+ fprintf(o->output, " <ows:ServiceTypeVersion>%s</ows:ServiceTypeVersion>\n", ln->value->buf); - -- for (ln = o->metadata->versions->first ; ln ; ln = ln->next) { -- fprintf(o->output, "%s", ln->value->buf); -- if (ln->next) fprintf(o->output, ","); -- } -- -- fprintf(o->output, "</ows:ServiceTypeVersion>\n"); - - if (o->metadata->fees) - fprintf(o->output, " <ows:Fees>%s</ows:Fees>\n", o->metadata->fees->buf); diff --git a/debian/patches/drop-config.log.patch b/debian/patches/drop-config.log.patch deleted file mode 100644 index acff163..0000000 --- a/debian/patches/drop-config.log.patch +++ /dev/null @@ -1,617 +0,0 @@ -Description: Remove the config.log included in the upstream source. - This file is not very useful because of dh-autoreconf is used to - retool the buildsystem. Its removal also fixes the lintian warning - configure-generated-file-in-source for config.log. -Author: Bas Couwenberg <sebas...@debian.org> ---- a/config.log -+++ /dev/null -@@ -1,609 +0,0 @@ --This file contains any messages produced by compilers while --running configure, to aid debugging if configure makes a mistake. -- --It was created by configure, which was --generated by GNU Autoconf 2.67. Invocation command line was -- -- $ ./configure -- --## --------- ## --## Platform. ## --## --------- ## -- --hostname = ks35059.kimsufi.com --uname -m = x86_64 --uname -r = 2.6.38.2-grsec-xxxx-grs-ipv6-64 --uname -s = Linux --uname -v = #2 SMP Thu Aug 25 16:40:22 UTC 2011 -- --/usr/bin/uname -p = unknown --/bin/uname -X = unknown -- --/bin/arch = unknown --/usr/bin/arch -k = unknown --/usr/convex/getsysinfo = unknown --/usr/bin/hostinfo = unknown --/bin/machine = unknown --/usr/bin/oslevel = unknown --/bin/universe = unknown -- --PATH: /usr/local/sbin --PATH: /usr/local/bin --PATH: /usr/sbin --PATH: /usr/bin --PATH: /sbin --PATH: /bin -- -- --## ----------- ## --## Core tests. ## --## ----------- ## -- --configure:2135: checking for gcc --configure:2151: found /usr/bin/gcc --configure:2162: result: gcc --configure:2391: checking for C compiler version --configure:2400: gcc --version >&5 --gcc (Debian 4.4.5-8) 4.4.5 --Copyright (C) 2010 Free Software Foundation, Inc. --This is free software; see the source for copying conditions. There is NO --warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -- --configure:2411: $? = 0 --configure:2400: gcc -v >&5 --Using built-in specs. --Target: x86_64-linux-gnu --Configured with: ../src/configure -v --with-pkgversion='Debian 4.4.5-8' --with-bugurl=file:///usr/share/doc/gcc-4.4/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-4.4 --enable-shared --enable-multiarch --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.4 --libdir=/usr/lib --enable-nls --enable-clocale=gnu --enable-libstdcxx-debug --enable- [...] --Thread model: posix --gcc version 4.4.5 (Debian 4.4.5-8) --configure:2411: $? = 0 --configure:2400: gcc -V >&5 --gcc: '-V' option must have argument --configure:2411: $? = 1 --configure:2400: gcc -qversion >&5 --gcc: unrecognized option '-qversion' --gcc: no input files --configure:2411: $? = 1 --configure:2431: checking whether the C compiler works --configure:2453: gcc conftest.c >&5 --configure:2457: $? = 0 --configure:2505: result: yes --configure:2508: checking for C compiler default output file name --configure:2510: result: a.out --configure:2516: checking for suffix of executables --configure:2523: gcc -o conftest conftest.c >&5 --configure:2527: $? = 0 --configure:2549: result: --configure:2571: checking whether we are cross compiling --configure:2579: gcc -o conftest conftest.c >&5 --configure:2583: $? = 0 --configure:2590: ./conftest --configure:2594: $? = 0 --configure:2609: result: no --configure:2614: checking for suffix of object files --configure:2636: gcc -c conftest.c >&5 --configure:2640: $? = 0 --configure:2661: result: o --configure:2665: checking whether we are using the GNU C compiler --configure:2684: gcc -c conftest.c >&5 --configure:2684: $? = 0 --configure:2693: result: yes --configure:2702: checking whether gcc accepts -g --configure:2722: gcc -c -g conftest.c >&5 --configure:2722: $? = 0 --configure:2763: result: yes --configure:2780: checking for gcc option to accept ISO C89 --configure:2844: gcc -c -g -O2 conftest.c >&5 --configure:2844: $? = 0 --configure:2857: result: none needed --configure:2881: checking for X --configure:2881: gcc -o conftest -g -O2 conftest.c >&5 --/tmp/cck4drVJ.o: In function `main': --/var/www/tinyows.org/release/tinyows-1.1.0/conftest.c:43: undefined reference to `X' --collect2: ld returned 1 exit status --configure:2881: $? = 1 --configure: failed program was: --| /* confdefs.h */ --| #define PACKAGE_NAME "" --| #define PACKAGE_TARNAME "" --| #define PACKAGE_VERSION "" --| #define PACKAGE_STRING "" --| #define PACKAGE_BUGREPORT "" --| #define PACKAGE_URL "" --| /* end confdefs.h. */ --| /* Define X to an innocuous variant, in case <limits.h> declares X. --| For example, HP-UX 11i <limits.h> declares gettimeofday. */ --| #define X innocuous_X --| --| /* System header to define __stub macros and hopefully few prototypes, --| which can conflict with char X (); below. --| Prefer <limits.h> to <assert.h> if __STDC__ is defined, since --| <limits.h> exists even on freestanding compilers. */ --| --| #ifdef __STDC__ --| # include <limits.h> --| #else --| # include <assert.h> --| #endif --| --| #undef X --| --| /* Override any GCC internal prototype to avoid an error. --| Use char because int might match the return type of a GCC --| builtin and then its argument prototype would still apply. */ --| #ifdef __cplusplus --| extern "C" --| #endif --| char X (); --| /* The GNU C library defines this for functions which it implements --| to always fail with ENOSYS. Some functions are actually named --| something starting with __ and the normal name is an alias. */ --| #if defined __stub_X || defined __stub___X --| choke me --| #endif --| --| int --| main () --| { --| return X (); --| ; --| return 0; --| } --configure:2881: result: no --configure:2881: checking for $CC --configure:2881: gcc -o conftest -g -O2 conftest.c >&5 --/tmp/ccOoZQCR.s: Assembler messages: --/tmp/ccOoZQCR.s:23: Error: suffix or operands invalid for `call' --configure:2881: $? = 1 --configure: failed program was: --| /* confdefs.h */ --| #define PACKAGE_NAME "" --| #define PACKAGE_TARNAME "" --| #define PACKAGE_VERSION "" --| #define PACKAGE_STRING "" --| #define PACKAGE_BUGREPORT "" --| #define PACKAGE_URL "" --| /* end confdefs.h. */ --| /* Define $CC to an innocuous variant, in case <limits.h> declares $CC. --| For example, HP-UX 11i <limits.h> declares gettimeofday. */ --| #define $CC innocuous_$CC --| --| /* System header to define __stub macros and hopefully few prototypes, --| which can conflict with char $CC (); below. --| Prefer <limits.h> to <assert.h> if __STDC__ is defined, since --| <limits.h> exists even on freestanding compilers. */ --| --| #ifdef __STDC__ --| # include <limits.h> --| #else --| # include <assert.h> --| #endif --| --| #undef $CC --| --| /* Override any GCC internal prototype to avoid an error. --| Use char because int might match the return type of a GCC --| builtin and then its argument prototype would still apply. */ --| #ifdef __cplusplus --| extern "C" --| #endif --| char $CC (); --| /* The GNU C library defines this for functions which it implements --| to always fail with ENOSYS. Some functions are actually named --| something starting with __ and the normal name is an alias. */ --| #if defined __stub_$CC || defined __stub___$CC --| choke me --| #endif --| --| int --| main () --| { --| return $CC (); --| ; --| return 0; --| } --configure:2881: result: no --configure:2881: checking for -c --configure:2881: gcc -o conftest -g -O2 conftest.c >&5 --conftest.c:11:9: error: macro names must be identifiers --conftest.c:24:8: error: macro names must be identifiers --conftest.c:24:9: warning: extra tokens at end of #undef directive --conftest.c:32: error: expected identifier or '(' before '-' token --configure:2881: $? = 1 --configure: failed program was: --| /* confdefs.h */ --| #define PACKAGE_NAME "" --| #define PACKAGE_TARNAME "" --| #define PACKAGE_VERSION "" --| #define PACKAGE_STRING "" --| #define PACKAGE_BUGREPORT "" --| #define PACKAGE_URL "" --| /* end confdefs.h. */ --| /* Define -c to an innocuous variant, in case <limits.h> declares -c. --| For example, HP-UX 11i <limits.h> declares gettimeofday. */ --| #define -c innocuous_-c --| --| /* System header to define __stub macros and hopefully few prototypes, --| which can conflict with char -c (); below. --| Prefer <limits.h> to <assert.h> if __STDC__ is defined, since --| <limits.h> exists even on freestanding compilers. */ --| --| #ifdef __STDC__ --| # include <limits.h> --| #else --| # include <assert.h> --| #endif --| --| #undef -c --| --| /* Override any GCC internal prototype to avoid an error. --| Use char because int might match the return type of a GCC --| builtin and then its argument prototype would still apply. */ --| #ifdef __cplusplus --| extern "C" --| #endif --| char -c (); --| /* The GNU C library defines this for functions which it implements --| to always fail with ENOSYS. Some functions are actually named --| something starting with __ and the normal name is an alias. */ --| #if defined __stub_-c || defined __stub___-c --| choke me --| #endif --| --| int --| main () --| { --| return -c (); --| ; --| return 0; --| } --configure:2881: result: no --configure:2881: checking for $CFLAGS --configure:2881: gcc -o conftest -g -O2 conftest.c >&5 --/tmp/ccDpcFM3.s: Assembler messages: --/tmp/ccDpcFM3.s:23: Error: suffix or operands invalid for `call' --configure:2881: $? = 1 --configure: failed program was: --| /* confdefs.h */ --| #define PACKAGE_NAME "" --| #define PACKAGE_TARNAME "" --| #define PACKAGE_VERSION "" --| #define PACKAGE_STRING "" --| #define PACKAGE_BUGREPORT "" --| #define PACKAGE_URL "" --| /* end confdefs.h. */ --| /* Define $CFLAGS to an innocuous variant, in case <limits.h> declares $CFLAGS. --| For example, HP-UX 11i <limits.h> declares gettimeofday. */ --| #define $CFLAGS innocuous_$CFLAGS --| --| /* System header to define __stub macros and hopefully few prototypes, --| which can conflict with char $CFLAGS (); below. --| Prefer <limits.h> to <assert.h> if __STDC__ is defined, since --| <limits.h> exists even on freestanding compilers. */ --| --| #ifdef __STDC__ --| # include <limits.h> --| #else --| # include <assert.h> --| #endif --| --| #undef $CFLAGS --| --| /* Override any GCC internal prototype to avoid an error. --| Use char because int might match the return type of a GCC --| builtin and then its argument prototype would still apply. */ --| #ifdef __cplusplus --| extern "C" --| #endif --| char $CFLAGS (); --| /* The GNU C library defines this for functions which it implements --| to always fail with ENOSYS. Some functions are actually named --| something starting with __ and the normal name is an alias. */ --| #if defined __stub_$CFLAGS || defined __stub___$CFLAGS --| choke me --| #endif --| --| int --| main () --| { --| return $CFLAGS (); --| ; --| return 0; --| } --configure:2881: result: no --configure:2881: checking for $CPPFLAGS --configure:2881: gcc -o conftest -g -O2 conftest.c >&5 --/tmp/cc3QZ76d.s: Assembler messages: --/tmp/cc3QZ76d.s:23: Error: suffix or operands invalid for `call' --configure:2881: $? = 1 --configure: failed program was: --| /* confdefs.h */ --| #define PACKAGE_NAME "" --| #define PACKAGE_TARNAME "" --| #define PACKAGE_VERSION "" --| #define PACKAGE_STRING "" --| #define PACKAGE_BUGREPORT "" --| #define PACKAGE_URL "" --| /* end confdefs.h. */ --| /* Define $CPPFLAGS to an innocuous variant, in case <limits.h> declares $CPPFLAGS. --| For example, HP-UX 11i <limits.h> declares gettimeofday. */ --| #define $CPPFLAGS innocuous_$CPPFLAGS --| --| /* System header to define __stub macros and hopefully few prototypes, --| which can conflict with char $CPPFLAGS (); below. --| Prefer <limits.h> to <assert.h> if __STDC__ is defined, since --| <limits.h> exists even on freestanding compilers. */ --| --| #ifdef __STDC__ --| # include <limits.h> --| #else --| # include <assert.h> --| #endif --| --| #undef $CPPFLAGS --| --| /* Override any GCC internal prototype to avoid an error. --| Use char because int might match the return type of a GCC --| builtin and then its argument prototype would still apply. */ --| #ifdef __cplusplus --| extern "C" --| #endif --| char $CPPFLAGS (); --| /* The GNU C library defines this for functions which it implements --| to always fail with ENOSYS. Some functions are actually named --| something starting with __ and the normal name is an alias. */ --| #if defined __stub_$CPPFLAGS || defined __stub___$CPPFLAGS --| choke me --| #endif --| --| int --| main () --| { --| return $CPPFLAGS (); --| ; --| return 0; --| } --configure:2881: result: no --configure:2881: checking for conftest.$ac_ext --configure:2881: gcc -o conftest -g -O2 conftest.c >&5 --conftest.c:11:17: warning: missing whitespace after the macro name --conftest.c:24:16: warning: extra tokens at end of #undef directive --conftest.c:32: error: expected '=', ',', ';', 'asm' or '__attribute__' before '.' token --conftest.c:36:28: error: token "." is not valid in preprocessor expressions --conftest.c: In function 'main': --conftest.c:43: error: 'conftest' undeclared (first use in this function) --conftest.c:43: error: (Each undeclared identifier is reported only once --conftest.c:43: error: for each function it appears in.) --configure:2881: $? = 1 --configure: failed program was: --| /* confdefs.h */ --| #define PACKAGE_NAME "" --| #define PACKAGE_TARNAME "" --| #define PACKAGE_VERSION "" --| #define PACKAGE_STRING "" --| #define PACKAGE_BUGREPORT "" --| #define PACKAGE_URL "" --| /* end confdefs.h. */ --| /* Define conftest.$ac_ext to an innocuous variant, in case <limits.h> declares conftest.$ac_ext. --| For example, HP-UX 11i <limits.h> declares gettimeofday. */ --| #define conftest.$ac_ext innocuous_conftest.$ac_ext --| --| /* System header to define __stub macros and hopefully few prototypes, --| which can conflict with char conftest.$ac_ext (); below. --| Prefer <limits.h> to <assert.h> if __STDC__ is defined, since --| <limits.h> exists even on freestanding compilers. */ --| --| #ifdef __STDC__ --| # include <limits.h> --| #else --| # include <assert.h> --| #endif --| --| #undef conftest.$ac_ext --| --| /* Override any GCC internal prototype to avoid an error. --| Use char because int might match the return type of a GCC --| builtin and then its argument prototype would still apply. */ --| #ifdef __cplusplus --| extern "C" --| #endif --| char conftest.$ac_ext (); --| /* The GNU C library defines this for functions which it implements --| to always fail with ENOSYS. Some functions are actually named --| something starting with __ and the normal name is an alias. */ --| #if defined __stub_conftest.$ac_ext || defined __stub___conftest.$ac_ext --| choke me --| #endif --| --| int --| main () --| { --| return conftest.$ac_ext (); --| ; --| return 0; --| } --configure:2881: result: no --configure:2881: checking for >&5 --configure:2881: gcc -o conftest -g -O2 conftest.c >&5 --conftest.c:11:9: error: macro names must be identifiers --conftest.c:24:8: error: macro names must be identifiers --conftest.c:24:9: warning: extra tokens at end of #undef directive --conftest.c:32: error: expected identifier or '(' before '>' token --conftest.c:36:21: error: operator '>' has no right operand --conftest.c: In function 'main': --conftest.c:43: error: expected expression before '>' token --configure:2881: $? = 1 --configure: failed program was: --| /* confdefs.h */ --| #define PACKAGE_NAME "" --| #define PACKAGE_TARNAME "" --| #define PACKAGE_VERSION "" --| #define PACKAGE_STRING "" --| #define PACKAGE_BUGREPORT "" --| #define PACKAGE_URL "" --| /* end confdefs.h. */ --| /* Define >&5 to an innocuous variant, in case <limits.h> declares >&5. --| For example, HP-UX 11i <limits.h> declares gettimeofday. */ --| #define >&5 innocuous_>&5 --| --| /* System header to define __stub macros and hopefully few prototypes, --| which can conflict with char >&5 (); below. --| Prefer <limits.h> to <assert.h> if __STDC__ is defined, since --| <limits.h> exists even on freestanding compilers. */ --| --| #ifdef __STDC__ --| # include <limits.h> --| #else --| # include <assert.h> --| #endif --| --| #undef >&5 --| --| /* Override any GCC internal prototype to avoid an error. --| Use char because int might match the return type of a GCC --| builtin and then its argument prototype would still apply. */ --| #ifdef __cplusplus --| extern "C" --| #endif --| char >&5 (); --| /* The GNU C library defines this for functions which it implements --| to always fail with ENOSYS. Some functions are actually named --| something starting with __ and the normal name is an alias. */ --| #if defined __stub_>&5 || defined __stub___>&5 --| choke me --| #endif --| --| int --| main () --| { --| return >&5 (); --| ; --| return 0; --| } --configure:2881: result: no --configure:2911: checking for xml2-config --configure:2942: result: no --configure:2953: error: couldn't find xml2-config, try using --with-xml2-config=PATH -- --## ---------------- ## --## Cache variables. ## --## ---------------- ## -- --ac_cv_c_compiler_gnu=yes --ac_cv_env_CC_set= --ac_cv_env_CC_value= --ac_cv_env_CFLAGS_set= --ac_cv_env_CFLAGS_value= --ac_cv_env_CPPFLAGS_set= --ac_cv_env_CPPFLAGS_value= --ac_cv_env_CPP_set= --ac_cv_env_CPP_value= --ac_cv_env_LDFLAGS_set= --ac_cv_env_LDFLAGS_value= --ac_cv_env_LIBS_set= --ac_cv_env_LIBS_value= --ac_cv_env_build_alias_set= --ac_cv_env_build_alias_value= --ac_cv_env_host_alias_set= --ac_cv_env_host_alias_value= --ac_cv_env_target_alias_set= --ac_cv_env_target_alias_value= --ac_cv_func_X=no --ac_cv_func__CC=no --ac_cv_func__CFLAGS=no --ac_cv_func__CPPFLAGS=no --ac_cv_func___5=no --ac_cv_func__c=no --ac_cv_func_conftest__ac_ext=no --ac_cv_objext=o --ac_cv_path_LIBXML2_CONFIG=no --ac_cv_prog_ac_ct_CC=gcc --ac_cv_prog_cc_c89= --ac_cv_prog_cc_g=yes -- --## ----------------- ## --## Output variables. ## --## ----------------- ## -- --CC='gcc' --CFLAGS='-g -O2' --CPP='' --CPPFLAGS='' --DEFS='' --ECHO_C='' --ECHO_N='-n' --ECHO_T='' --EGREP='' --EXEEXT='' --FCGI_INC='' --FCGI_LIB='' --GIT_FLAGS='' --GREP='' --LDFLAGS='' --LEX='' --LEXLIB='' --LEX_OUTPUT_ROOT='' --LIBOBJS='' --LIBS='' --LIBXML2_CONFIG='no' --LTLIBOBJS='' --OBJEXT='o' --PACKAGE_BUGREPORT='' --PACKAGE_NAME='' --PACKAGE_STRING='' --PACKAGE_TARNAME='' --PACKAGE_URL='' --PACKAGE_VERSION='' --PATH_SEPARATOR=':' --PG_CONFIG='' --POSTGIS_BIN='' --POSTGIS_INC='' --POSTGIS_LIB='' --POSTGIS_SHARE='' --SHELL='/bin/sh' --SHP2PGSQL='' --TINYOWS_DEBUG='' --USE_FCGI='' --XML2_INC='' --XML2_LIB='' --ac_ct_CC='gcc' --bindir='${exec_prefix}/bin' --build_alias='' --datadir='${datarootdir}' --datarootdir='${prefix}/share' --docdir='${datarootdir}/doc/${PACKAGE}' --dvidir='${docdir}' --exec_prefix='NONE' --git='' --host_alias='' --htmldir='${docdir}' --includedir='${prefix}/include' --infodir='${datarootdir}/info' --libdir='${exec_prefix}/lib' --libexecdir='${exec_prefix}/libexec' --localedir='${datarootdir}/locale' --localstatedir='${prefix}/var' --mandir='${datarootdir}/man' --oldincludedir='/usr/include' --pdfdir='${docdir}' --prefix='NONE' --program_transform_name='s,x,x,' --psdir='${docdir}' --sbindir='${exec_prefix}/sbin' --sharedstatedir='${prefix}/com' --sysconfdir='${prefix}/etc' --target_alias='' -- --## ----------- ## --## confdefs.h. ## --## ----------- ## -- --/* confdefs.h */ --#define PACKAGE_NAME "" --#define PACKAGE_TARNAME "" --#define PACKAGE_VERSION "" --#define PACKAGE_STRING "" --#define PACKAGE_BUGREPORT "" --#define PACKAGE_URL "" -- --configure: exit 1 diff --git a/debian/patches/series b/debian/patches/series index 7ea74fb..ac9508b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,16 +1,2 @@ -drop-config.log.patch buffer_copy.patch liborder.patch -0001-Fix-feature-ids-in-JSON-GetFeature-output.patch -0001-Add-pkey_sequence-attribute-in-addition-to-pkey-to-l.patch -0001-Support-pkey-and-pkey_sequence-attrs-in-layer_flush.patch -0001-Fix-incorrect-inversion-of-axis-order-for-projected-.patch -0001-Fix-wrong-comment.patch -0001-fix-wrong-ows-ServiceTypeVersion-sequence.patch -0001-Unable-to-deal-with-NS-prefix.patch -0001-Add-support-for-postgis-version-2.1-in-demo-installe.patch -0001-fix-forgottent-copy-on-id_column.patch -0001-Force-to-be-upper-case-in-service-response.patch -0001-filter-useless-and-errorfull-ASCII-char-for-XML-outp.patch -0001-fix-68.patch -0001-Fix-76.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/tinyows.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