[jmapviewer] branch master updated (a86632e -> d2febe3)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository jmapviewer. from a86632e Add Breaks: freeplane (<< 1.3.15-3~) to jmapviewer package. new a79156a Imported Upstream version 1.17+dfsg new ce38822 Merge tag 'upstream/1.17+dfsg' new dd34def New upstream release. new d2febe3 Set distribution to unstable. The 4 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| 5 +++-- src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java | 3 ++- src/org/openstreetmap/gui/jmapviewer/Demo.java | 2 +- src/org/openstreetmap/gui/jmapviewer/OsmMercator.java | 2 +- src/org/openstreetmap/gui/jmapviewer/Tile.java | 4 .../openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java | 4 .../gui/jmapviewer/tilesources/TemplatedTMSTileSource.java | 6 +++--- 7 files changed, 14 insertions(+), 12 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.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
[jmapviewer] annotated tag upstream/1.17+dfsg created (now c9edcf6)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/1.17+dfsg in repository jmapviewer. at c9edcf6 (tag) tagging a79156a40ec9e61d5d07ff6af9a922a1525002a0 (commit) replaces upstream/1.16+dfsg tagged by Bas Couwenberg on Mon Jul 11 11:04:51 2016 +0200 - Log - Upstream version 1.17+dfsg Bas Couwenberg (1): Imported Upstream version 1.17+dfsg --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.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
[jmapviewer] branch pristine-tar updated (a98761d -> 63ba46e)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch pristine-tar in repository jmapviewer. from a98761d pristine-tar data for jmapviewer_1.16+dfsg.orig.tar.gz new 63ba46e pristine-tar data for jmapviewer_1.17+dfsg.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: jmapviewer_1.17+dfsg.orig.tar.gz.delta | Bin 0 -> 37632 bytes jmapviewer_1.17+dfsg.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 jmapviewer_1.17+dfsg.orig.tar.gz.delta create mode 100644 jmapviewer_1.17+dfsg.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.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
[jmapviewer] branch upstream updated (d063eea -> a79156a)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch upstream in repository jmapviewer. from d063eea Imported Upstream version 1.16+dfsg new a79156a Imported Upstream version 1.17+dfsg 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: src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java | 3 ++- src/org/openstreetmap/gui/jmapviewer/Demo.java | 2 +- src/org/openstreetmap/gui/jmapviewer/OsmMercator.java | 2 +- src/org/openstreetmap/gui/jmapviewer/Tile.java | 4 .../openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java | 4 .../gui/jmapviewer/tilesources/TemplatedTMSTileSource.java | 6 +++--- 6 files changed, 11 insertions(+), 10 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.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 jmapviewer_1.17+dfsg-1_amd64.changes
jmapviewer_1.17+dfsg-1_amd64.changes uploaded successfully to localhost along with the files: jmapviewer_1.17+dfsg-1.dsc jmapviewer_1.17+dfsg.orig.tar.gz jmapviewer_1.17+dfsg-1.debian.tar.xz jmapviewer_1.17+dfsg-1_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
[jmapviewer] 01/01: pristine-tar data for jmapviewer_1.17+dfsg.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 jmapviewer. commit 63ba46e010a837a337381b078d29b800d1fee822 Author: Bas Couwenberg Date: Mon Jul 11 11:04:51 2016 +0200 pristine-tar data for jmapviewer_1.17+dfsg.orig.tar.gz --- jmapviewer_1.17+dfsg.orig.tar.gz.delta | Bin 0 -> 37632 bytes jmapviewer_1.17+dfsg.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/jmapviewer_1.17+dfsg.orig.tar.gz.delta b/jmapviewer_1.17+dfsg.orig.tar.gz.delta new file mode 100644 index 000..ed59881 Binary files /dev/null and b/jmapviewer_1.17+dfsg.orig.tar.gz.delta differ diff --git a/jmapviewer_1.17+dfsg.orig.tar.gz.id b/jmapviewer_1.17+dfsg.orig.tar.gz.id new file mode 100644 index 000..71283de --- /dev/null +++ b/jmapviewer_1.17+dfsg.orig.tar.gz.id @@ -0,0 +1 @@ +8250aaff776a05c26a5d42853ec6bb2e8ab9974b -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.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
[jmapviewer] tag debian/1.17+dfsg-1 created (now d2febe3)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/1.17+dfsg-1 in repository jmapviewer. at d2febe3 (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/jmapviewer.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
[jmapviewer] 01/04: Imported Upstream version 1.17+dfsg
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository jmapviewer.
commit a79156a40ec9e61d5d07ff6af9a922a1525002a0
Author: Bas Couwenberg
Date: Mon Jul 11 11:04:50 2016 +0200
Imported Upstream version 1.17+dfsg
---
src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java | 3 ++-
src/org/openstreetmap/gui/jmapviewer/Demo.java | 2 +-
src/org/openstreetmap/gui/jmapviewer/OsmMercator.java | 2 +-
src/org/openstreetmap/gui/jmapviewer/Tile.java | 4
.../openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java | 4
.../gui/jmapviewer/tilesources/TemplatedTMSTileSource.java | 6 +++---
6 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java
b/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java
index 7b5e75f..9575284 100644
--- a/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java
+++ b/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java
@@ -7,6 +7,7 @@ import java.awt.event.MouseListener;
import java.awt.event.MouseMotionListener;
import java.awt.event.MouseWheelEvent;
import java.awt.event.MouseWheelListener;
+import java.util.Locale;
/**
* Default map controller which implements map moving by pressing the right
@@ -184,6 +185,6 @@ MouseWheelListener {
*/
public static boolean isPlatformOsx() {
String os = System.getProperty("os.name");
-return os != null && os.toLowerCase().startsWith("mac os x");
+return os != null && os.toLowerCase(Locale.ENGLISH).startsWith("mac os
x");
}
}
diff --git a/src/org/openstreetmap/gui/jmapviewer/Demo.java
b/src/org/openstreetmap/gui/jmapviewer/Demo.java
index f3ec77b..2f9d7b7 100644
--- a/src/org/openstreetmap/gui/jmapviewer/Demo.java
+++ b/src/org/openstreetmap/gui/jmapviewer/Demo.java
@@ -34,7 +34,7 @@ import
org.openstreetmap.gui.jmapviewer.tilesources.OsmTileSource;
* @author Jan Peter Stotz
*
*/
-public class Demo extends JFrame implements JMapViewerEventListener {
+public class Demo extends JFrame implements JMapViewerEventListener {
private static final long serialVersionUID = 1L;
diff --git a/src/org/openstreetmap/gui/jmapviewer/OsmMercator.java
b/src/org/openstreetmap/gui/jmapviewer/OsmMercator.java
index 6f89d33..631b9ca 100644
--- a/src/org/openstreetmap/gui/jmapviewer/OsmMercator.java
+++ b/src/org/openstreetmap/gui/jmapviewer/OsmMercator.java
@@ -21,7 +21,7 @@ public class OsmMercator {
/** minimum latitude (south) for mercator display */
public static final double MIN_LAT = -85.05112877980659;
/** equatorial earth radius for EPSG:3857 (Mercator) */
-public static final double EARTH_RADIUS = 6378137;
+public static final double EARTH_RADIUS = 6_378_137;
/**
* instance with tile size of 256 for easy conversions
diff --git a/src/org/openstreetmap/gui/jmapviewer/Tile.java
b/src/org/openstreetmap/gui/jmapviewer/Tile.java
index 67c8c1e..58343ac 100644
--- a/src/org/openstreetmap/gui/jmapviewer/Tile.java
+++ b/src/org/openstreetmap/gui/jmapviewer/Tile.java
@@ -361,6 +361,10 @@ public class Tile {
return error_message;
}
+public void setError(Exception e) {
+setError(e.toString());
+}
+
public void setError(String message) {
error = true;
setImage(ERROR_IMAGE);
diff --git
a/src/org/openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java
b/src/org/openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java
index e518dc4..b81fe22 100644
--- a/src/org/openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java
+++ b/src/org/openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java
@@ -23,10 +23,6 @@ public class ScanexTileSource extends TMSTileSource {
// Latitude to Y and back calculations.
-/** radius of Earth at equator, m */
-private static double RADIUS_E = 6378137;
-/** equator length, m */
-private static double EQUATOR = 40075016.68557849;
/** eccentricity of Earth's ellipsoid */
private static double E = 0.0818191908426;
diff --git
a/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java
b/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java
index e85babb..1c38453 100644
---
a/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java
+++
b/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java
@@ -28,13 +28,13 @@ import
org.openstreetmap.gui.jmapviewer.interfaces.TemplatedTileSource;
* used to specify many tile servers
* {header:(HEADER_NAME,HEADER_VALUE)} - sets the headers to be sent to tile
server
*/
-
public class TemplatedTMSTileSource extends TMSTileSource implements
TemplatedTileSource {
private Random rand;
private String[] rando
[jmapviewer] 02/04: Merge tag 'upstream/1.17+dfsg'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository jmapviewer. commit ce38822eaf61076f4bc9125476dbf793ad9710bf Merge: a86632e a79156a Author: Bas Couwenberg Date: Mon Jul 11 11:04:51 2016 +0200 Merge tag 'upstream/1.17+dfsg' Upstream version 1.17+dfsg src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java | 3 ++- src/org/openstreetmap/gui/jmapviewer/Demo.java | 2 +- src/org/openstreetmap/gui/jmapviewer/OsmMercator.java | 2 +- src/org/openstreetmap/gui/jmapviewer/Tile.java | 4 .../openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java | 4 .../gui/jmapviewer/tilesources/TemplatedTMSTileSource.java | 6 +++--- 6 files changed, 11 insertions(+), 10 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.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
[jmapviewer] 04/04: Set distribution to unstable.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository jmapviewer. commit d2febe37baf22209a7376e227108eb84d04fa5e0 Author: Bas Couwenberg Date: Mon Jul 11 16:51:01 2016 +0200 Set distribution to unstable. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4e0b243..898a4a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -jmapviewer (1.17+dfsg-1) UNRELEASED; urgency=medium +jmapviewer (1.17+dfsg-1) unstable; urgency=medium * New upstream release. * Add Breaks: freeplane (<< 1.3.15-3~) to jmapviewer package, those older versions lack support for the current JMapviewer API. - -- Bas Couwenberg Mon, 11 Jul 2016 11:21:00 +0200 + -- Bas Couwenberg Mon, 11 Jul 2016 16:50:48 +0200 jmapviewer (1.16+dfsg-1) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.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
[jmapviewer] 03/04: New upstream release.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository jmapviewer. commit dd34defd5b87db57e2fee05e3b0be314c996a779 Author: Bas Couwenberg Date: Mon Jul 11 11:21:15 2016 +0200 New upstream release. --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d1d85bb..4e0b243 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -jmapviewer (1.16+dfsg-2) UNRELEASED; urgency=medium +jmapviewer (1.17+dfsg-1) UNRELEASED; urgency=medium + * New upstream release. * Add Breaks: freeplane (<< 1.3.15-3~) to jmapviewer package, those older versions lack support for the current JMapviewer API. - -- Bas Couwenberg Sun, 19 Jun 2016 22:39:46 +0200 + -- Bas Couwenberg Mon, 11 Jul 2016 11:21:00 +0200 jmapviewer (1.16+dfsg-1) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.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
jmapviewer_1.17+dfsg-1_amd64.changes ACCEPTED into unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Mon, 11 Jul 2016 16:50:48 +0200 Source: jmapviewer Binary: jmapviewer Architecture: source all Version: 1.17+dfsg-1 Distribution: unstable Urgency: medium Maintainer: Debian GIS Project Changed-By: Bas Couwenberg Description: jmapviewer - Java OpenStreetMap Tile Viewer Changes: jmapviewer (1.17+dfsg-1) unstable; urgency=medium . * New upstream release. * Add Breaks: freeplane (<< 1.3.15-3~) to jmapviewer package, those older versions lack support for the current JMapviewer API. Checksums-Sha1: 9478ddf90c9c14e4e049b4fbb79a74837bde4bd9 2113 jmapviewer_1.17+dfsg-1.dsc e38cab73d8c9104be2fde8cb5ecb976fd2fa4a69 67514 jmapviewer_1.17+dfsg.orig.tar.gz a3466bb152f9b1ad93a235080e812c77d2f7c405 7132 jmapviewer_1.17+dfsg-1.debian.tar.xz 33723c497ed919ac62f7908c9c03e8cf53f04bcf 131816 jmapviewer_1.17+dfsg-1_all.deb Checksums-Sha256: 6d49925f2eb8b18c65a6deab7ebc74cedbb19515b4d9e30d6b11aaa218687440 2113 jmapviewer_1.17+dfsg-1.dsc 6e550b3a3b3504ed050ab6ecee74f42842ce5f7839a319e61d831c9eaf9f021e 67514 jmapviewer_1.17+dfsg.orig.tar.gz a1c41dd8103334dc9af5f2bd9fbc18233e3835c2ed2731c99d8cdc85f1586caf 7132 jmapviewer_1.17+dfsg-1.debian.tar.xz 087748251fe827c0e2bce5f31c82494db2274f82fe11e9729afad99c22ecccb5 131816 jmapviewer_1.17+dfsg-1_all.deb Files: 41852aa737d31adcfcee5b0d35dfd87b 2113 utils optional jmapviewer_1.17+dfsg-1.dsc 2f928ef2146f7933fbbaa1b5128af9ab 67514 utils optional jmapviewer_1.17+dfsg.orig.tar.gz aa5a72a999a72ab87e4a1e7627c7ce16 7132 utils optional jmapviewer_1.17+dfsg-1.debian.tar.xz b679a26fdece102c2419e32862889c71 131816 utils optional jmapviewer_1.17+dfsg-1_all.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCgAGBQJXg7RHAAoJEGdQ8QrojUrxbsYQAL8wPHQMTT2lBhKwrocILpPd 6x/HjPluysmtDDkj4vyV9GpLXlwxsbuc1OmCVAhEzESSGQH6r5dP17n71llXdYAw 3JdS0f5ia2BNDfRoGsOBtK7Gt5eJ5ga43gKuLmUkJzIeTStrjb7CCJrk4GT7tfRa ZNEMkmdp9KaJys59xiTVZPTHQ5XUUWYEA8OtOkdzH5K3iGuHTSH0bBR4efg9ddgW GVo9kqqIJp2Is1mujpwoB+8mvcneIRasH1gSzJjEfp4Z49j/1ee20OiUQMZrBNuL 165i5CH9NKDwSrFy1xk5+mnLkZw2cxTU4JfsiR6DUSgrgmWlLHKSL6nxt8BHl9bY 6x/d1R1fvJNErLztMH8xgscWxkA4QFDFFEpVMfWJI23gHloU22WlchYbBGE5veXf nhHHjfyBxBQu7fpZV+vBNyfkI0j+saG3dA+I0G3FgYAfXVDFlPd43gbBNjq/Mvv5 tuhzMHz8u3IUPVJPls2RaK9C8m4CQSoinsdikhVcCI6iPKfmh8XqbvHSj//sKgJV aI5uFQABKpDdqXqLj2YUNTTqGjSC5BzYONQlzh2vht02gkjRFx+gIbdONmjSvSNY 1MHLw6XzczTbp/ONtEiAIXEKsMsfpyKi46qn4jT5fruxY5HtVydFu+NLkl+7BvkN cfI3fVc4B9uDSUHssZbY =/l2v -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
[pycsw] 02/08: Merge tag 'upstream/2.0.0+dfsg'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pycsw. commit dc4ecab8341ac59f251bcdf2795055334c0baecb Merge: 5adb081 29f48d9 Author: Bas Couwenberg Date: Mon Jul 11 18:29:29 2016 +0200 Merge tag 'upstream/2.0.0+dfsg' Upstream version 2.0.0+dfsg VERSION.txt | 2 +- pycsw/__init__.py | 2 +- pycsw/plugins/repository/hhypermap/hhypermap.py | 22 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pycsw.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
[pycsw] 03/08: New upstream release.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pycsw. commit 7cc5f2d4f78be632fb99b2b8f0ff572cc462b13f Author: Bas Couwenberg Date: Mon Jul 11 18:29:57 2016 +0200 New upstream release. --- debian/changelog | 7 +++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index ee2b0c3..c88b11e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +pycsw (2.0.0+dfsg-1) UNRELEASED; urgency=medium + + * Team upload. + * New upstream release. + + -- Bas Couwenberg Mon, 11 Jul 2016 18:29:34 +0200 + pycsw (2.0.0~rc1+dfsg-1~exp2) experimental; urgency=medium * Team upload. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pycsw.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
[pycsw] 04/08: Update source comment to reflect excluded files.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pycsw. commit 98dcfa463977fe9be91f06deebeba5d93313e0d6 Author: Bas Couwenberg Date: Mon Jul 11 18:32:26 2016 +0200 Update source comment to reflect excluded files. --- debian/copyright | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/copyright b/debian/copyright index eb8fd21..646ea01 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,8 +1,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: pycsw Source: https://github.com/geopython/pycsw - The upstream releases are repacked to exclude pre-built documentation and - non-free licensed CITE data. + The upstream releases are repacked to exclude pre-built documentation. Files-Excluded: docs/_build Files: * -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pycsw.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
[pycsw] branch master updated (5adb081 -> 18c4858)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository pycsw. from 5adb081 Set distribution to experimental. new 29f48d9 Imported Upstream version 2.0.0+dfsg new dc4ecab Merge tag 'upstream/2.0.0+dfsg' new 7cc5f2d New upstream release. new 98dcfa4 Update source comment to reflect excluded files. new 83509e9 Update pycsw-admin manpage for upstream changes. new 1f1d3e0 Include csw.py in python-pycsw-wsgi again. Was removed in 2.0.0~rc1+dfsg-1~exp1. new 8b6c92a Reorder build dependencies. new 18c4858 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: VERSION.txt | 2 +- debian/changelog| 10 ++ debian/control | 2 +- debian/copyright| 3 +-- debian/man/pycsw-admin.md | 25 ++--- debian/python-pycsw-wsgi.install| 1 + pycsw/__init__.py | 2 +- pycsw/plugins/repository/hhypermap/hhypermap.py | 22 +++--- 8 files changed, 48 insertions(+), 19 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pycsw.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
[pycsw] 06/08: Include csw.py in python-pycsw-wsgi again. Was removed in 2.0.0~rc1+dfsg-1~exp1.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pycsw. commit 1f1d3e091a7c5548d52cd64bfd713b926cea98ac Author: Bas Couwenberg Date: Mon Jul 11 19:06:26 2016 +0200 Include csw.py in python-pycsw-wsgi again. Was removed in 2.0.0~rc1+dfsg-1~exp1. --- debian/changelog | 2 ++ debian/python-pycsw-wsgi.install | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index de2e090..705dbda 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ pycsw (2.0.0+dfsg-1) UNRELEASED; urgency=medium * Team upload. * New upstream release. * Update pycsw-admin manpage for upstream changes. + * Include csw.py in python-pycsw-wsgi again. +Was removed in 2.0.0~rc1+dfsg-1~exp1. -- Bas Couwenberg Mon, 11 Jul 2016 18:29:34 +0200 diff --git a/debian/python-pycsw-wsgi.install b/debian/python-pycsw-wsgi.install index ca18e4f..cf62b9b 100644 --- a/debian/python-pycsw-wsgi.install +++ b/debian/python-pycsw-wsgi.install @@ -3,6 +3,7 @@ etc/mappings.py /etc/pycsw bin/*/usr/share/pycsw/bin/ tests/* /usr/share/pycsw/tests/ debian/pycsw.conf/etc/apache2/sites-available/ +csw.py /usr/share/pycsw/ pycsw/wsgi.py/usr/share/pycsw/ README.txt /usr/share/pycsw/ VERSION.txt /usr/share/pycsw/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pycsw.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
[pycsw] 08/08: 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 pycsw. commit 18c4858b5f822e4020b1ed456c8040a9fd7c168b Author: Bas Couwenberg Date: Mon Jul 11 19:09:55 2016 +0200 Set distribution to experimental. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 705dbda..2c2a5f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pycsw (2.0.0+dfsg-1) UNRELEASED; urgency=medium +pycsw (2.0.0+dfsg-1~exp1) experimental; urgency=medium * Team upload. * New upstream release. @@ -6,7 +6,7 @@ pycsw (2.0.0+dfsg-1) UNRELEASED; urgency=medium * Include csw.py in python-pycsw-wsgi again. Was removed in 2.0.0~rc1+dfsg-1~exp1. - -- Bas Couwenberg Mon, 11 Jul 2016 18:29:34 +0200 + -- Bas Couwenberg Mon, 11 Jul 2016 19:09:35 +0200 pycsw (2.0.0~rc1+dfsg-1~exp2) experimental; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pycsw.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
[pycsw] branch pristine-tar updated (a840518 -> 7e4fbde)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch pristine-tar in repository pycsw. from a840518 pristine-tar data for pycsw_2.0.0~rc1+dfsg.orig.tar.gz new 7e4fbde pristine-tar data for pycsw_2.0.0+dfsg.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: pycsw_2.0.0+dfsg.orig.tar.gz.delta | Bin 0 -> 748376 bytes pycsw_2.0.0+dfsg.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 pycsw_2.0.0+dfsg.orig.tar.gz.delta create mode 100644 pycsw_2.0.0+dfsg.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pycsw.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
[pycsw] 05/08: Update pycsw-admin manpage for upstream changes.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pycsw. commit 83509e99a3802754fae9330177d2cc803aa22a06 Author: Bas Couwenberg Date: Mon Jul 11 18:45:49 2016 +0200 Update pycsw-admin manpage for upstream changes. --- debian/changelog | 1 + debian/man/pycsw-admin.md | 25 ++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index c88b11e..de2e090 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ pycsw (2.0.0+dfsg-1) UNRELEASED; urgency=medium * Team upload. * New upstream release. + * Update pycsw-admin manpage for upstream changes. -- Bas Couwenberg Mon, 11 Jul 2016 18:29:34 +0200 diff --git a/debian/man/pycsw-admin.md b/debian/man/pycsw-admin.md index fd1658f..762e4b7 100644 --- a/debian/man/pycsw-admin.md +++ b/debian/man/pycsw-admin.md @@ -1,5 +1,5 @@ pycsw-admin(1) - pycsw admin utility -= + ##SYNOPSIS `pycsw-admin` -c -f [-h] [-p /path/to/records] [-r] @@ -16,6 +16,7 @@ pycsw-admin(1) - pycsw admin utility - post_xml - get_sysprof - validate_xml + - delete_records -fFilepath to pycsw configuration @@ -23,7 +24,7 @@ pycsw-admin(1) - pycsw admin utility -opath to output file --ppath to input/output directory to read/write metadata records +-ppath to input/output directory or file to read/write metadata records -rload records from directory recursively @@ -34,13 +35,15 @@ pycsw-admin(1) - pycsw admin utility -uURL of CSW -xXML document + +-yforce confirmation ##EXAMPLE 1) setup_db: Creates repository tables and indexes pycsw-admin -c setup_db -f default.cfg -2.) load_records: Loads metadata records from directory into repository +2.) load_records: Loads metadata records from directory or file into repository pycsw-admin -c load_records -p /path/to/records -f default.cfg @@ -48,6 +51,14 @@ pycsw-admin(1) - pycsw admin utility pycsw-admin -c load_records -p /path/to/records -f default.cfg -r +Load records from directory and force updates + +pycsw-admin -c load_records -p /path/to/records -f default.cfg -y + +Load metadata record from file into repository + +pycsw-admin -c load_records -p /path/to/file.xml -f default.cfg + 3.) export_records: Dump metadata records from repository into directory pycsw-admin -c export_records -p /path/to/records -f default.cfg @@ -81,6 +92,14 @@ pycsw-admin(1) - pycsw admin utility pycsw-admin -c validate_xml -x file.xml -s file.xsd +11.) delete_records: Deletes all records from repository + +pycsw-admin -c delete_records -f default.cfg + +12.) delete_records: Deletes all records from repository without prompting + +pycsw-admin -c delete_records -f default.cfg -y + ##MORE INFORMATION More information about pycsw can be obtained from _/usr/share/doc/python-pycsw-doc_ after installing the *python-pycsw-doc* package. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pycsw.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
[pycsw] 01/08: Imported Upstream version 2.0.0+dfsg
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository pycsw.
commit 29f48d9c4cc286b44d13d6dd986e150657027296
Author: Bas Couwenberg
Date: Mon Jul 11 18:29:25 2016 +0200
Imported Upstream version 2.0.0+dfsg
---
VERSION.txt | 2 +-
pycsw/__init__.py | 2 +-
pycsw/plugins/repository/hhypermap/hhypermap.py | 22 +++---
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/VERSION.txt b/VERSION.txt
index e88e200..227cea2 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-2.0.0-rc1
+2.0.0
diff --git a/pycsw/__init__.py b/pycsw/__init__.py
index 0db361b..cfef463 100644
--- a/pycsw/__init__.py
+++ b/pycsw/__init__.py
@@ -28,4 +28,4 @@
#
# =
-__version__ = '2.0.0-rc1'
+__version__ = '2.0.0'
diff --git a/pycsw/plugins/repository/hhypermap/hhypermap.py
b/pycsw/plugins/repository/hhypermap/hhypermap.py
index f9cbf84..ac61c8f 100644
--- a/pycsw/plugins/repository/hhypermap/hhypermap.py
+++ b/pycsw/plugins/repository/hhypermap/hhypermap.py
@@ -34,7 +34,7 @@ from django.db.models import Avg, Max, Min, Count
from django.conf import settings
from pycsw.core import util
-from hypermap.aggregator.models import Layer, Resource, Service
+from hypermap.aggregator.models import Layer, Service
HYPERMAP_SERVICE_TYPES = {
# 'HHypermap enum': 'CSW enum'
@@ -88,24 +88,24 @@ class HHypermapRepository(object):
for qbl in self.queryables:
self.queryables['_all'].update(self.queryables[qbl])
self.queryables['_all'].update(self.context.md_core_model['mappings'])
-
+
if 'Harvest' in self.context.model['operations'] and 'Transaction' in
self.context.model['operations']:
self.context.model['operations']['Harvest']['parameters']['ResourceType']['values']
= HYPERMAP_SERVICE_TYPES.keys()
self.context.model['operations']['Transaction']['parameters']['TransactionSchemas']['values']
= HYPERMAP_SERVICE_TYPES.keys()
def dataset(self):
''' Stub to mock a pycsw dataset object for Transactions'''
-return type('Resource', (object,), {})
+return type('Service', (object,), {})
def query_ids(self, ids):
''' Query by list of identifiers '''
-return self._get_repo_filter(Resource.objects).filter(id__in=ids).all()
+return self._get_repo_filter(Layer.objects).filter(id__in=ids).all()
def query_domain(self, domain, typenames, domainquerytype='list',
count=False):
''' Query by property domain values '''
-objects = self._get_repo_filter(Resource.objects)
+objects = self._get_repo_filter(Layer.objects)
if domainquerytype == 'range':
return [tuple(objects.aggregate(
@@ -121,14 +121,14 @@ class HHypermapRepository(object):
''' Query to get latest (default) or earliest update to repository '''
from datetime import datetime
if direction=='min':
-return Resource.objects.aggregate(
+return Layer.objects.aggregate(
Min('last_updated'))['last_updated__min'].strftime('%Y-%m-%dT%H:%M:%SZ')
-return self._get_repo_filter(Resource.objects).aggregate(
+return self._get_repo_filter(Layer.objects).aggregate(
Max('last_updated'))['last_updated__max'].strftime('%Y-%m-%dT%H:%M:%SZ')
def query_source(self, source):
''' Query by source '''
-return self._get_repo_filter(Resource.objects).filter(url=source)
+return self._get_repo_filter(Layer.objects).filter(url=source)
def query(self, constraint, sortby=None, typenames=None,
maxrecords=10, startposition=0):
@@ -136,10 +136,10 @@ class HHypermapRepository(object):
# run the raw query and get total
if 'where' in constraint: # GetRecords with constraint
-query =
self._get_repo_filter(Resource.objects).extra(where=[constraint['where']],
params=constraint['values'])
+query =
self._get_repo_filter(Layer.objects).extra(where=[constraint['where']],
params=constraint['values'])
else: # GetRecords sans constraint
-query = self._get_repo_filter(Resource.objects)
+query = self._get_repo_filter(Layer.objects)
total = query.count()
@@ -180,7 +180,7 @@ class HHypermapRepository(object):
# return a list of ids that were inserted or updated
ids = []
-for res in Resource.objects.filter(url=source).all():
+for res in Service.objects.filter(url=source).all():
ids.append({'identifier': res.id_string, 'title': res.title})
return ids
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/pycsw.git
___
Pkg-grass-deve
[pycsw] 07/08: Reorder build dependencies.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pycsw. commit 8b6c92a804c24c5e2fe0b51032a36e764a62f8a2 Author: Bas Couwenberg Date: Mon Jul 11 19:06:40 2016 +0200 Reorder build dependencies. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 7fc7752..033f1c2 100644 --- a/debian/control +++ b/debian/control @@ -10,13 +10,13 @@ Build-Depends: apache2-dev, dh-exec, dh-python, procps, - python-setuptools, python-all, python-geolinks, python-lxml, python-owslib, python-paver, python-pyproj, + python-setuptools, python-shapely, python-six, python-sphinx, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pycsw.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
[pycsw] branch upstream updated (f4d89d1 -> 29f48d9)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch upstream in repository pycsw. from f4d89d1 Imported Upstream version 2.0.0~rc1+dfsg new 29f48d9 Imported Upstream version 2.0.0+dfsg 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: VERSION.txt | 2 +- pycsw/__init__.py | 2 +- pycsw/plugins/repository/hhypermap/hhypermap.py | 22 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pycsw.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
[pycsw] 01/01: pristine-tar data for pycsw_2.0.0+dfsg.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 pycsw. commit 7e4fbdebd650853f2aa501c4cf8561551dd5848d Author: Bas Couwenberg Date: Mon Jul 11 18:29:29 2016 +0200 pristine-tar data for pycsw_2.0.0+dfsg.orig.tar.gz --- pycsw_2.0.0+dfsg.orig.tar.gz.delta | Bin 0 -> 748376 bytes pycsw_2.0.0+dfsg.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/pycsw_2.0.0+dfsg.orig.tar.gz.delta b/pycsw_2.0.0+dfsg.orig.tar.gz.delta new file mode 100644 index 000..30308c7 Binary files /dev/null and b/pycsw_2.0.0+dfsg.orig.tar.gz.delta differ diff --git a/pycsw_2.0.0+dfsg.orig.tar.gz.id b/pycsw_2.0.0+dfsg.orig.tar.gz.id new file mode 100644 index 000..17b797a --- /dev/null +++ b/pycsw_2.0.0+dfsg.orig.tar.gz.id @@ -0,0 +1 @@ +3b2979fcd54ae58212fdad040761ef4d121cd6a1 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pycsw.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
[pycsw] annotated tag upstream/2.0.0+dfsg created (now 9cf2dc4)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to annotated tag upstream/2.0.0+dfsg in repository pycsw. at 9cf2dc4 (tag) tagging 29f48d9c4cc286b44d13d6dd986e150657027296 (commit) replaces upstream/2.0.0_rc1+dfsg tagged by Bas Couwenberg on Mon Jul 11 18:29:29 2016 +0200 - Log - Upstream version 2.0.0+dfsg Bas Couwenberg (1): Imported Upstream version 2.0.0+dfsg --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pycsw.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
[pycsw] tag debian/2.0.0+dfsg-1.exp1 created (now 18c4858)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/2.0.0+dfsg-1.exp1 in repository pycsw. at 18c4858 (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/pycsw.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 pycsw_2.0.0+dfsg-1~exp1_amd64.changes
pycsw_2.0.0+dfsg-1~exp1_amd64.changes uploaded successfully to localhost along with the files: pycsw_2.0.0+dfsg-1~exp1.dsc pycsw_2.0.0+dfsg.orig.tar.gz pycsw_2.0.0+dfsg-1~exp1.debian.tar.xz python-pycsw-doc_2.0.0+dfsg-1~exp1_all.deb python-pycsw-wsgi_2.0.0+dfsg-1~exp1_all.deb python-pycsw_2.0.0+dfsg-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
pycsw_2.0.0+dfsg-1~exp1_amd64.changes ACCEPTED into experimental
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Mon, 11 Jul 2016 19:09:35 +0200 Source: pycsw Binary: python-pycsw python-pycsw-wsgi python-pycsw-doc Architecture: source all Version: 2.0.0+dfsg-1~exp1 Distribution: experimental Urgency: medium Maintainer: Debian GIS Project Changed-By: Bas Couwenberg Description: python-pycsw - OGC compliant metadata (Catalogue service for the Web) server python-pycsw-doc - OGC compliant metadata (Catalogue Service for the Web) server python-pycsw-wsgi - WSGI Apache CSW service based on python-pycsw Changes: pycsw (2.0.0+dfsg-1~exp1) experimental; urgency=medium . * Team upload. * New upstream release. * Update pycsw-admin manpage for upstream changes. * Include csw.py in python-pycsw-wsgi again. Was removed in 2.0.0~rc1+dfsg-1~exp1. Checksums-Sha1: b5da1a9e95661dfe780fd242a89220b958bd57ac 2387 pycsw_2.0.0+dfsg-1~exp1.dsc a18aeb03ccc0591d0977f07fbb0ba15f3686c295 793559 pycsw_2.0.0+dfsg.orig.tar.gz 16a119c3fe2317fe1a6ffe00c6fab611522c425f 16288 pycsw_2.0.0+dfsg-1~exp1.debian.tar.xz b7d89b3711f9707a15c1ae36c55ef66e5a51feed 87680 python-pycsw-doc_2.0.0+dfsg-1~exp1_all.deb 08788c9f3453db04af269f1c2509246edd33f209 128092 python-pycsw-wsgi_2.0.0+dfsg-1~exp1_all.deb 15f61cb5c0d1c31601d4750bb52e90fdda1b253e 242518 python-pycsw_2.0.0+dfsg-1~exp1_all.deb Checksums-Sha256: e0c48b88fe53231ea0a65172a6d80108112922d5977394c8e957e8c6cce987d9 2387 pycsw_2.0.0+dfsg-1~exp1.dsc bd0c7d0cf5993a6398d58cf7102dc0c16172ffebe8b70adb34593db9ec06fd77 793559 pycsw_2.0.0+dfsg.orig.tar.gz fbeb221c10c96b405324afebf0b6aa5c93c8c4c34508e35439fa22607b9427d5 16288 pycsw_2.0.0+dfsg-1~exp1.debian.tar.xz 27a93124d615c6d2ca7e12a530fea7fab631463155086fa648046360220c7c29 87680 python-pycsw-doc_2.0.0+dfsg-1~exp1_all.deb f1da960ae98bbce583508a6acc5a94f7e00f7df9adad5c5d47505164b4e20752 128092 python-pycsw-wsgi_2.0.0+dfsg-1~exp1_all.deb f83021d0d4a1fd8500ebe849258193636bf36b770a097447b7af3f7a76303838 242518 python-pycsw_2.0.0+dfsg-1~exp1_all.deb Files: 9b9ac359989fbbcca3e331bbae14a240 2387 non-free/python optional pycsw_2.0.0+dfsg-1~exp1.dsc 9d091193d978ab349bd2c131d2f9ecab 793559 non-free/python optional pycsw_2.0.0+dfsg.orig.tar.gz db38a33f982a3c6695a4c5a5e71a18ae 16288 non-free/python optional pycsw_2.0.0+dfsg-1~exp1.debian.tar.xz 6e03994e2b307496f9ac0b6777c150f9 87680 non-free/doc optional python-pycsw-doc_2.0.0+dfsg-1~exp1_all.deb 881ed953de7147df719d75c2c2de2764 128092 non-free/python optional python-pycsw-wsgi_2.0.0+dfsg-1~exp1_all.deb db0e913bc415e05fddac4a46677d5cce 242518 non-free/python optional python-pycsw_2.0.0+dfsg-1~exp1_all.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCgAGBQJXg9R1AAoJEGdQ8QrojUrxKYUP/1U103TxioBHWrLugMRmu6Ub 6AJQKvfhYc78vyP08Bc1+Z5vauCS/PMrCbgTqA8SyJA1Mqj7KQdF3cAG8E2ZPKgv Wm8vn+Im0TfzvWVciML0HwMBfElE+L8YgjctFIZsYCqRWDXjlPF4ELTVFGcirQI1 nge0JuFeS0fhSWhIx9nxgVR3L3MewORQ0mJbNVwWyIycpwh1fhB9jTR5zQWf29Fb rxiRYhDJwN1Q/xMPUuUzB5Z3FTMb9Zj7okr39s5lnLfng/hrkZwCwBiIbAuUAmxx sQ7FTesqRaURcN5h8uTz325GddJJS4xnJwotw3mxeTSOGvLPM/XiPN0gm+O3nwhf iLO2v/C/V1UPCaARHigMEeRpNeoaW7bS6eAUWN1c1zCRU/3JpZmiIw+5al1dHkAS Jss3dL4WwR7gH3vuUNXJnJDVbM4Dp/5PC2bDmbYIOm4HFWZ8goWaGMLyzLbmD0ia fT2A4hQU27dYy16fakdV5NlLxvd+RciUPnk+mRPxLgEqpyJeKWa1w8aKUrsSAPfV +wQ1xU2Ad+Vg3vOKjfVcPcIcnkccv536O5lk6fd1/fE38fKBhBu2hfe5/xTrgRg+ CRhJdQohdRFRxOzlEUuOJk9WIrWvPRyTkzjwkLqQsQEoabVil7aGkMSSlMePNFKe cX3mz/I39AQnFW6lu5OS =4/Ex -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
[pycsw] 02/02: Fix use jquery.js from libjs-jquery package.
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository pycsw.
commit 9c4dad7f14bda7fd69c90c6b89b1b12930c7982b
Author: Bas Couwenberg
Date: Mon Jul 11 22:57:09 2016 +0200
Fix use jquery.js from libjs-jquery package.
---
debian/changelog | 1 +
debian/control | 1 +
debian/patches/0002-Remove-externally-linked-files.patch | 2 +-
debian/python-pycsw-wsgi.links | 1 +
4 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 49f1fac..9b1b2d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ pycsw (2.0.0+dfsg-1~exp2) UNRELEASED; urgency=medium
* Team upload.
* Add patch to support overriding PYCSW_ROOT via environment variable.
Fixes path to config files for tests installed by wsgi package.
+ * Fix use jquery.js from libjs-jquery package.
-- Bas Couwenberg Mon, 11 Jul 2016 21:39:09 +0200
diff --git a/debian/control b/debian/control
index 033f1c2..2c6d720 100644
--- a/debian/control
+++ b/debian/control
@@ -62,6 +62,7 @@ Description: OGC compliant metadata (Catalogue service for
the Web) server
Package: python-pycsw-wsgi
Architecture: all
Depends: libapache2-mod-wsgi,
+ libjs-jquery,
python,
python-pycsw (= ${binary:Version}),
python-sqlalchemy,
diff --git a/debian/patches/0002-Remove-externally-linked-files.patch
b/debian/patches/0002-Remove-externally-linked-files.patch
index c15757e..3c7da3c 100644
--- a/debian/patches/0002-Remove-externally-linked-files.patch
+++ b/debian/patches/0002-Remove-externally-linked-files.patch
@@ -14,7 +14,7 @@ W3C and jquery
}
-http://code.jquery.com/jquery-1.9.0.min.js";>
-+
++
[pycsw] 01/02: Add patch to support overriding PYCSW_ROOT via environment variable.
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository pycsw.
commit 47139693197aad23db3d7f5eaaee5eb2ece6903b
Author: Bas Couwenberg
Date: Mon Jul 11 21:42:18 2016 +0200
Add patch to support overriding PYCSW_ROOT via environment variable.
Fixes path to config files for tests installed by wsgi package.
---
debian/changelog| 8
debian/patches/pycsw-root.patch | 33 +
debian/patches/series | 1 +
debian/pycsw.conf | 1 +
4 files changed, 43 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 2c2a5f9..49f1fac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pycsw (2.0.0+dfsg-1~exp2) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Add patch to support overriding PYCSW_ROOT via environment variable.
+Fixes path to config files for tests installed by wsgi package.
+
+ -- Bas Couwenberg Mon, 11 Jul 2016 21:39:09 +0200
+
pycsw (2.0.0+dfsg-1~exp1) experimental; urgency=medium
* Team upload.
diff --git a/debian/patches/pycsw-root.patch b/debian/patches/pycsw-root.patch
new file mode 100644
index 000..f1e6523
--- /dev/null
+++ b/debian/patches/pycsw-root.patch
@@ -0,0 +1,33 @@
+Description: Support overriding PYCSW_ROOT via environment variable.
+ Relative paths from wsgi.py to tests are different between build and
+ installation environment. The defaults work for the build environment only.
+Author: Bas Couwenberg
+
+--- a/pycsw/wsgi.py
b/pycsw/wsgi.py
+@@ -70,18 +70,23 @@ def application(env, start_response):
+ if 'PYCSW_CONFIG' in env:
+ config = env['PYCSW_CONFIG']
+
++root = PYCSW_ROOT
++
++if 'PYCSW_ROOT' in env:
++root = env['PYCSW_ROOT']
++
+ if env['QUERY_STRING'].lower().find('config') != -1:
+ for kvp in env['QUERY_STRING'].split('&'):
+ if kvp.lower().find('config') != -1:
+ config = unquote(kvp.split('=')[1])
+
+ if not os.path.isabs(config):
+-config = os.path.join(PYCSW_ROOT, config)
++config = os.path.join(root, config)
+
+ if 'HTTP_HOST' in env and ':' in env['HTTP_HOST']:
+ env['HTTP_HOST'] = env['HTTP_HOST'].split(':')[0]
+
+-env['local.app_root'] = PYCSW_ROOT
++env['local.app_root'] = root
+
+ csw = server.Csw(config, env)
+
diff --git a/debian/patches/series b/debian/patches/series
index 6c39d05..e9bdbc2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
0006-Don-t-include-external-references-to-images.patch
pavement.patch
offline-tests.patch
+pycsw-root.patch
diff --git a/debian/pycsw.conf b/debian/pycsw.conf
index 4d037f2..2f706d2 100644
--- a/debian/pycsw.conf
+++ b/debian/pycsw.conf
@@ -4,5 +4,6 @@ Alias /pycsw/tests /usr/share/pycsw/tests
Options +FollowSymLinks
Require all granted
+ SetEnv PYCSW_ROOT /usr/share/pycsw
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/pycsw.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
[pycsw] branch master updated (18c4858 -> 9c4dad7)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository pycsw. from 18c4858 Set distribution to experimental. new 4713969 Add patch to support overriding PYCSW_ROOT via environment variable. new 9c4dad7 Fix use jquery.js from libjs-jquery package. 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: debian/changelog | 9 ++ debian/control | 1 + .../0002-Remove-externally-linked-files.patch | 2 +- debian/patches/pycsw-root.patch| 33 ++ debian/patches/series | 1 + debian/pycsw.conf | 1 + debian/python-pycsw-wsgi.links | 1 + 7 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 debian/patches/pycsw-root.patch create mode 100644 debian/python-pycsw-wsgi.links -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pycsw.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
[pycsw] 02/03: Mark offline-tests.patch & pavement.patch as Forwarded: not-needed.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pycsw. commit ee93505892ad22ad4dd6c610d27852f5d5d86640 Author: Bas Couwenberg Date: Tue Jul 12 00:54:55 2016 +0200 Mark offline-tests.patch & pavement.patch as Forwarded: not-needed. --- debian/patches/offline-tests.patch | 1 + debian/patches/pavement.patch | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/patches/offline-tests.patch b/debian/patches/offline-tests.patch index 5dcb33f..f8fe24b 100644 --- a/debian/patches/offline-tests.patch +++ b/debian/patches/offline-tests.patch @@ -1,5 +1,6 @@ Description: Disable GetRecords-distributedsearch test, requires network. Author: Bas Couwenberg +Forwarded: not-needed --- /dev/null +++ b/tests/suites/default/post/GetRecords-distributedsearch.disabled diff --git a/debian/patches/pavement.patch b/debian/patches/pavement.patch index 72fb1b7..791c515 100644 --- a/debian/patches/pavement.patch +++ b/debian/patches/pavement.patch @@ -1,5 +1,6 @@ Description: Don't rely on pycsw-admin.py in $PATH for paver tests. Author: Bas Couwenberg +Forwarded: not-needed --- a/pavement.py +++ b/pavement.py -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pycsw.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
[pycsw] branch master updated (9c4dad7 -> adb43f6)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository pycsw. from 9c4dad7 Fix use jquery.js from libjs-jquery package. new a0e0984 Mark pycsw-root.patch as Forwarded. new ee93505 Mark offline-tests.patch & pavement.patch as Forwarded: not-needed. new adb43f6 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 | 4 ++-- debian/patches/offline-tests.patch | 1 + debian/patches/pavement.patch | 1 + debian/patches/pycsw-root.patch| 1 + 4 files changed, 5 insertions(+), 2 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pycsw.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
[pycsw] 01/03: Mark pycsw-root.patch as Forwarded.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pycsw. commit a0e0984f27f7a1b4cc1d008c3173f474142370a3 Author: Bas Couwenberg Date: Tue Jul 12 00:54:10 2016 +0200 Mark pycsw-root.patch as Forwarded. --- debian/patches/pycsw-root.patch | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/patches/pycsw-root.patch b/debian/patches/pycsw-root.patch index f1e6523..b469dc1 100644 --- a/debian/patches/pycsw-root.patch +++ b/debian/patches/pycsw-root.patch @@ -2,6 +2,7 @@ Description: Support overriding PYCSW_ROOT via environment variable. Relative paths from wsgi.py to tests are different between build and installation environment. The defaults work for the build environment only. Author: Bas Couwenberg +Forwarded: https://github.com/geopython/pycsw/pull/449 --- a/pycsw/wsgi.py +++ b/pycsw/wsgi.py -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pycsw.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
[pycsw] 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 pycsw. commit adb43f6bc14bbd3c1e10ff3b012625efb721c994 Author: Bas Couwenberg Date: Tue Jul 12 01:01:47 2016 +0200 Set distribution to experimental. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9b1b2d9..4782fcf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -pycsw (2.0.0+dfsg-1~exp2) UNRELEASED; urgency=medium +pycsw (2.0.0+dfsg-1~exp2) experimental; urgency=medium * Team upload. * Add patch to support overriding PYCSW_ROOT via environment variable. Fixes path to config files for tests installed by wsgi package. * Fix use jquery.js from libjs-jquery package. - -- Bas Couwenberg Mon, 11 Jul 2016 21:39:09 +0200 + -- Bas Couwenberg Tue, 12 Jul 2016 01:01:32 +0200 pycsw (2.0.0+dfsg-1~exp1) experimental; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pycsw.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 pycsw_2.0.0+dfsg-1~exp2_amd64.changes
pycsw_2.0.0+dfsg-1~exp2_amd64.changes uploaded successfully to localhost along with the files: pycsw_2.0.0+dfsg-1~exp2.dsc pycsw_2.0.0+dfsg-1~exp2.debian.tar.xz python-pycsw-doc_2.0.0+dfsg-1~exp2_all.deb python-pycsw-wsgi_2.0.0+dfsg-1~exp2_all.deb python-pycsw_2.0.0+dfsg-1~exp2_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
[pycsw] tag debian/2.0.0+dfsg-1.exp2 created (now adb43f6)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/2.0.0+dfsg-1.exp2 in repository pycsw. at adb43f6 (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/pycsw.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
pycsw_2.0.0+dfsg-1~exp2_amd64.changes ACCEPTED into experimental
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Tue, 12 Jul 2016 01:01:32 +0200 Source: pycsw Binary: python-pycsw python-pycsw-wsgi python-pycsw-doc Architecture: source all Version: 2.0.0+dfsg-1~exp2 Distribution: experimental Urgency: medium Maintainer: Debian GIS Project Changed-By: Bas Couwenberg Description: python-pycsw - OGC compliant metadata (Catalogue service for the Web) server python-pycsw-doc - OGC compliant metadata (Catalogue Service for the Web) server python-pycsw-wsgi - WSGI Apache CSW service based on python-pycsw Changes: pycsw (2.0.0+dfsg-1~exp2) experimental; urgency=medium . * Team upload. * Add patch to support overriding PYCSW_ROOT via environment variable. Fixes path to config files for tests installed by wsgi package. * Fix use jquery.js from libjs-jquery package. Checksums-Sha1: 6e4ad46422bafdde05bd5914e3eccfe448b6b249 2387 pycsw_2.0.0+dfsg-1~exp2.dsc a8beeb7475087aedf899ebd33ef58f70c321 16732 pycsw_2.0.0+dfsg-1~exp2.debian.tar.xz 379e8db8e61ed3c5cd7b014b565076cd5ff53cbf 87822 python-pycsw-doc_2.0.0+dfsg-1~exp2_all.deb ae4ac74e2ff23d7409348a669e4ca269c7f6bff9 128354 python-pycsw-wsgi_2.0.0+dfsg-1~exp2_all.deb 0ec2a8ac7f36dc40be0a8df1f474d2c4e6c3ffc2 242620 python-pycsw_2.0.0+dfsg-1~exp2_all.deb Checksums-Sha256: 1247b086f74ba910dcb74bfae80f8a7b2f957739439f63fdeddcec8907c99d2e 2387 pycsw_2.0.0+dfsg-1~exp2.dsc ea528ecc77ac1ebd65c365d190dc00e7296dac746403584fa039e16dd8a7098b 16732 pycsw_2.0.0+dfsg-1~exp2.debian.tar.xz 4f228e11308554fb80c95b0b356b22605e155c547149d0f77c52b7cc9608388f 87822 python-pycsw-doc_2.0.0+dfsg-1~exp2_all.deb 238988a9f4ad6996eb2c8eb50700cbedeb0434029499078b2c9dd2645474e6a3 128354 python-pycsw-wsgi_2.0.0+dfsg-1~exp2_all.deb faffea13bbcfbd31b150972c23e60f8128700a9fdcc177e15f563c24a8f30534 242620 python-pycsw_2.0.0+dfsg-1~exp2_all.deb Files: a9a969ae6573e0013a710c599a882ddb 2387 non-free/python optional pycsw_2.0.0+dfsg-1~exp2.dsc 869fac5effb67ae233c43850f27b40c7 16732 non-free/python optional pycsw_2.0.0+dfsg-1~exp2.debian.tar.xz 95e6cbe5b0b849dbf902250bfb61a589 87822 non-free/doc optional python-pycsw-doc_2.0.0+dfsg-1~exp2_all.deb 7c48f392e4f7dae6ec48dca93a964066 128354 non-free/python optional python-pycsw-wsgi_2.0.0+dfsg-1~exp2_all.deb a57660ec92dba6630f6958dbfb98fb6e 242620 non-free/python optional python-pycsw_2.0.0+dfsg-1~exp2_all.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCgAGBQJXhCc9AAoJEGdQ8QrojUrxB7UQAMi3bDgYfeTs/ZffF/MeE96a Efa3lYoK8mlryvdq9DRMjMUiTlamkDIoohO82PClp8C2jx8On594ad7LI4vzeaQi 3P1E12Fu7A0OKlbTh1F02aRLxi/WoOqxa10jGPaP1oOCu8t9cWkF5+QqAjAhEOb9 S13KJXXDUANXFy7CJuNKxrBXnm9qYO/d98XB8suXQ05SHSIIHokYZutUUVSsVrPo PUasXtxqcxqzKgSGEm8YntRTat1yewRkVJK4Mq5J8277dpdORhAbNfWtZbFIrBVn TopJeSO/RbjuDD0tAupiX2uzJT6obeONnGc02dIEUSCl2o4qUF88M3jwHEUIYVUr zEr1W5OyxxaJhYtbogaterxUXNjanBCj+DCh6At94mE3+OznTF3lnGCpDwcW8Nqu m/IEVgyFuu4FuztwX6RrEuGOo23j21MOXUpGzlDgmqLeCpbFMyzAXeOGFuuwVA7D ne+TIG9suga8ykB6/hOrgrr3R2hbWufgQ/4AM6/4EPoeYBcAAKajz+/d9YvBGv4K hffQlku5Za8C+Eb3UYWvQ2kxxCuZuPjJI4xWhpZ4aGFX+ElX3isB3aTFunfWPQj6 VLPUE7rPWvkwVf0UyOsCi/KfibB5AW2my0xIB7OKx9SuTPrNvBxmLRVI+tR7vqt0 cW2dHUm8jDpnrRlAEEhn =4Kmb -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
postgis is marked for autoremoval from testing
postgis 2.2.2+dfsg-4 is marked for autoremoval from testing on 2016-08-13 It (build-)depends on packages with these RC bugs: 829088: ccache: ccache may silently miscompile symlinked source files ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
pyosmium is marked for autoremoval from testing
pyosmium 2.7.1-3 is marked for autoremoval from testing on 2016-07-28 It is affected by these RC bugs: 828979: pyosmium: FTBFS in testing (FAIL: test_location_tuple) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
ossim is marked for autoremoval from testing
ossim 1.8.20.3+ds-5 is marked for autoremoval from testing on 2016-08-13 It (build-)depends on packages with these RC bugs: 829088: ccache: ccache may silently miscompile symlinked source files ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
