[otb] 01/01: OTB developer team is a closed group :-(
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository otb. commit b1246df068ca68966638eeb982e5f615f0e254d0 Author: Andreas Tille Date: Thu Jul 10 16:08:31 2014 +0200 OTB developer team is a closed group :-( --- debian/copyright | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/copyright b/debian/copyright index 6903346..68f665e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Orfeo Toolbox -Upstream-Contact: OTB developers +Upstream-Contact: OTB Team + OTB developers (closed group needing subscription) Source: http://sourceforge.net/projects/orfeo-toolbox/files/OTB/ hg clone -r http://hg.orfeo-toolbox.org/OTB -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/otb.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
[otb] branch master updated (0de6fd8 -> b1246df)
This is an automated email from the git hooks/post-receive script. tille pushed a change to branch master in repository otb. from 0de6fd8 Use developer list as contact point new b1246df OTB developer team is a closed group :-( The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/copyright | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/otb.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
[gis] 02/02: Just noticed that otb was included under the name orfeo ... put everything together
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository gis. commit 31d1992850562ce5fcf91a93ea458df1e826408d Author: Andreas Tille Date: Thu Jul 10 16:14:17 2014 +0200 Just noticed that otb was included under the name orfeo ... put everything together --- tasks/remotesensing | 39 +-- 1 file changed, 5 insertions(+), 34 deletions(-) diff --git a/tasks/remotesensing b/tasks/remotesensing index 12181de..b302460 100644 --- a/tasks/remotesensing +++ b/tasks/remotesensing @@ -17,7 +17,11 @@ Depends: dans-gdal-scripts X-Mark: Packages in Vcs - Information about these is queried from UDD -Depends: otb-bin, otb-bin-qt +Depends: otb-bin +Pkg-URL: https://launchpad.net/~otb/+archive/ubuntu/orfeotoolbox-staging-stable-ubuntugis + +Depends: otb-bin-qt +Pkg-URL: https://launchpad.net/~otb/+archive/ubuntu/orfeotoolbox-staging-stable-ubuntugis Depends: polsarpro Language: C, Tcl/Tk @@ -126,39 +130,6 @@ Pkg-Description: Repeat Orbit Interferometry PACkage interferograms, phase images measured as principal value and continuously "unwrapped," DEMs, and error estimates. -Depends: orfeo -Homepage: http://www.orfeo-toolbox.org -License: CeCILL (similar to GPL) -Language: C++ -Pkg-URL: https://launchpad.net/~ubuntugis/+archive/ppa -Pkg-Description: Orfeo Tool Box - In the frame of the Methodological Part of the ORFEO Accompaniment - Program to prepare, accompany and promote the use and the exploitation - of the images derived from Pleiades (PHR) and Cosmo-Skymed (CSK) - systems, the French Space Agency (CNES) decided to develop the Orfeo - Toolbox (OTB): a set of algorithmic components which allow to - capitalize the methodological know how, and therefore use an - incremental approach to take profit of the results of the - methodological research. - . - ORFEO Toolbox (OTB) is distributed as an open source library of image - processing algorithms. OTB is based on the medical image processing - library ITK and offers particular functionalities for remote sensing - image processing in general and for high spatial resolution images in - particular. The library is intensively tested on several platforms as - Linux, Unix and Windows. Most functionalities are also adapted to - process huge images using streaming and multi-threading as often as - possible. - . - Among other, OTB provides a number of heavily documented - functionalities as: - * image access: optimized read/write access for most of remote - sensing image formats, meta-data access, visualization; - * filtering: blurring, de-noising, enhancement; - * feature extraction: interest points, alignments, lines; - * image segmentation: region growing, watershed, level sets; - * classification: K-means, SVM, Markov random fields; - * change detection. Depends: eolisa Homepage: http://earth.esa.int/EOLi/EOLi.html -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/blends/projects/gis.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
[osrm] branch master created (now 2b2e882)
This is an automated email from the git hooks/post-receive script. tille pushed a change to branch master in repository osrm. at 2b2e882 Inject debian/ dir as created byChristopher Baines Thu, 04 Jul 2013 15:03:15 +0100 This branch includes the following new commits: new 733f53b Imported Upstream version 0.3.4 new 2b2e882 Inject debian/ dir as created byChristopher Baines Thu, 04 Jul 2013 15:03:15 +0100 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. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osrm.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
[osrm] branch upstream created (now 733f53b)
This is an automated email from the git hooks/post-receive script. tille pushed a change to branch upstream in repository osrm. at 733f53b Imported Upstream version 0.3.4 This branch includes the following new commits: new 733f53b Imported Upstream version 0.3.4 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. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osrm.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
[osrm] annotated tag upstream/0.3.4 created (now 47d55c4)
This is an automated email from the git hooks/post-receive script. tille pushed a change to annotated tag upstream/0.3.4 in repository osrm. at 47d55c4 (tag) tagging 733f53b86ddbebd14c1686da8aa49b4b4a0a9dc7 (commit) tagged by Andreas Tille on Thu Jul 10 16:34:57 2014 +0200 - Log - Upstream version 0.3.4 Andreas Tille (1): Imported Upstream version 0.3.4 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osrm.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
[osrm] 01/01: pristine-tar data for osrm_0.3.4.orig.tar.gz
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch pristine-tar in repository osrm. commit 7f4ec243c04e93eebfa44f42be5b493ea62240fe Author: Andreas Tille Date: Thu Jul 10 16:34:57 2014 +0200 pristine-tar data for osrm_0.3.4.orig.tar.gz --- osrm_0.3.4.orig.tar.gz.delta | Bin 0 -> 7499 bytes osrm_0.3.4.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/osrm_0.3.4.orig.tar.gz.delta b/osrm_0.3.4.orig.tar.gz.delta new file mode 100644 index 000..9c7769e Binary files /dev/null and b/osrm_0.3.4.orig.tar.gz.delta differ diff --git a/osrm_0.3.4.orig.tar.gz.id b/osrm_0.3.4.orig.tar.gz.id new file mode 100644 index 000..959c1f7 --- /dev/null +++ b/osrm_0.3.4.orig.tar.gz.id @@ -0,0 +1 @@ +cb466d15fdc0f2c983b08e5e5e7e592a0244fda2 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osrm.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
[osrm] 02/02: Inject debian/ dir as created by Christopher Baines Thu, 04 Jul 2013 15:03:15 +0100
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository osrm. commit 2b2e882ab74b91664847b2775f775ec834e70c5f Author: Andreas Tille Date: Thu Jul 10 16:35:27 2014 +0200 Inject debian/ dir as created by Christopher Baines Thu, 04 Jul 2013 15:03:15 +0100 --- debian/README.source | 9 + debian/changelog | 5 + debian/compat| 1 + debian/conffiles/access.lua | 13 ++ debian/conffiles/bicycle.lua | 353 +++ debian/conffiles/car.lua | 219 debian/conffiles/contractor.ini | 1 + debian/conffiles/extractor.ini | 2 + debian/conffiles/foot.lua| 193 + debian/conffiles/server.ini | 10 ++ debian/conffiles/testbot.lua | 107 debian/conffiles/turnbot.lua | 8 + debian/control | 35 debian/copyright | 65 +++ debian/docs | 2 + debian/osrm-components.1 | 14 ++ debian/osrm-extract.1| 22 +++ debian/osrm-prepare.1| 14 ++ debian/osrm-routed.1 | 56 +++ debian/osrm-tools.install| 1 + debian/osrm-tools.manpages | 1 + debian/osrm.7| 67 debian/osrm.default | 2 + debian/osrm.init | 98 +++ debian/osrm.install | 12 ++ debian/osrm.manpages | 4 + debian/osrm.postinst | 50 ++ debian/osrm.postrm | 50 ++ debian/patches/add-cmake-install | 38 + debian/patches/series| 1 + debian/rules | 9 + debian/source/format | 1 + debian/source/include-binaries | 22 +++ 33 files changed, 1485 insertions(+) diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 000..fa1a5a0 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,9 @@ +osrm for Debian +--- + + + + + + diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 000..1c0430a --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +osrm (0.3.4-1) unstable; urgency=low + + * Initial release (Closes: #701506) + + -- Christopher Baines Thu, 04 Jul 2013 15:03:15 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/conffiles/access.lua b/debian/conffiles/access.lua new file mode 100644 index 000..094db62 --- /dev/null +++ b/debian/conffiles/access.lua @@ -0,0 +1,13 @@ +local ipairs = ipairs + +module "Access" + +function find_access_tag(source,access_tags_hierachy) +for i,v in ipairs(access_tags_hierachy) do +local tag = source.tags:Find(v) +if tag ~= '' then +return tag +end +end +return nil +end \ No newline at end of file diff --git a/debian/conffiles/bicycle.lua b/debian/conffiles/bicycle.lua new file mode 100644 index 000..98d03c8 --- /dev/null +++ b/debian/conffiles/bicycle.lua @@ -0,0 +1,353 @@ +require("lib/access") + +-- Begin of globals +barrier_whitelist = { [""] = true, ["cycle_barrier"] = true, ["bollard"] = true, ["entrance"] = true, ["cattle_grid"] = true, ["border_control"] = true, ["toll_booth"] = true, ["sally_port"] = true, ["gate"] = true, ["no"] = true} +access_tag_whitelist = { ["yes"] = true, ["permissive"] = true, ["designated"] = true } +access_tag_blacklist = { ["no"] = true, ["private"] = true, ["agricultural"] = true, ["forestery"] = true } +access_tag_restricted = { ["destination"] = true, ["delivery"] = true } +access_tags_hierachy = { "bicycle", "vehicle", "access" } +cycleway_tags = {["track"]=true,["lane"]=true,["opposite"]=true,["opposite_lane"]=true,["opposite_track"]=true,["share_busway"]=true,["sharrow"]=true,["shared"]=true } +service_tag_restricted = { ["parking_aisle"] = true } +restriction_exception_tags = { "bicycle", "vehicle", "access" } + +default_speed = 15 + +walking_speed = 6 + +bicycle_speeds = { + ["cycleway"] = default_speed, + ["primary"] = default_speed, + ["primary_link"] = default_speed, + ["secondary"] = default_speed, + ["secondary_link"] = default_speed, + ["tertiary"] = default_speed, + ["tertiary_link"] = default_speed, + ["residential"] = default_speed, + ["unclassified"] = d
[osrm] 01/05: Add watch file
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository osrm. commit 80e6fd6896117fc2209f8c1493e297ae9410a529 Author: Andreas Tille Date: Thu Jul 10 16:43:04 2014 +0200 Add watch file --- debian/watch | 6 ++ 1 file changed, 6 insertions(+) diff --git a/debian/watch b/debian/watch new file mode 100644 index 000..e21aec5 --- /dev/null +++ b/debian/watch @@ -0,0 +1,6 @@ +version=3 + +https://github.com/DennisOSRM/Project-OSRM/releases .*/archive/v(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz) +# - when using tags +# https://github.com/#GITHUBUSER#/#PACKAGE#/tags .*/#PREFIX#(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) +# Remark: frequently you can do s/#PREFIX#/v?/ since 'v' or nothing is quite common but there are other prefixes possible -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osrm.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
[osrm] 03/05: Merge tag 'upstream/0.4.2'
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository osrm. commit 89f35d7bb755ed110710b649bd9a302515f4fcfb Merge: 80e6fd6 4afb219 Author: Andreas Tille Date: Thu Jul 10 16:43:58 2014 +0200 Merge tag 'upstream/0.4.2' Upstream version 0.4.2 .clang-format | 54 + .gitignore | 12 +- .travis.yml| 54 + AUTHORS.TXT| 11 - Algorithms/BFSComponentExplorer.h | 148 ++ Algorithms/Bresenham.h | 49 - Algorithms/CRC32.cpp | 85 -- Algorithms/CRC32.h | 45 - Algorithms/DouglasPeucker.cpp | 183 +++ Algorithms/DouglasPeucker.h| 149 +- Algorithms/ExtractRouteNames.h | 169 +++ Algorithms/IteratorBasedCRC32.h| 185 ++- Algorithms/ObjectToBase64.h| 100 +- Algorithms/PolylineCompressor.cpp | 118 ++ Algorithms/PolylineCompressor.h| 151 +- Algorithms/StronglyConnectedComponents.h | 628 CMakeLists.txt | 344 - Contractor/ContractionCleanup.h| 261 Contractor/Contractor.h| 1313 ++--- Contractor/EdgeBasedGraphFactory.cpp | 1049 - Contractor/EdgeBasedGraphFactory.h | 234 ++- Contractor/GeometryCompressor.cpp | 227 +++ Contractor/GeometryCompressor.h| 65 + Contractor/TemporaryStorage.cpp| 226 +-- Contractor/TemporaryStorage.h | 165 +-- DataStructures/BinaryHeap.h| 340 +++-- DataStructures/ConcurrentQueue.h | 120 +- DataStructures/Coordinate.cpp | 446 ++ DataStructures/Coordinate.h| 108 -- DataStructures/DeallocatingVector.h| 487 +++--- DataStructures/DynamicGraph.h | 443 +++--- DataStructures/EdgeBasedNode.h | 90 ++ DataStructures/GridEdge.h | 82 -- DataStructures/HashTable.h | 125 +- DataStructures/HilbertValue.cpp| 100 ++ DataStructures/HilbertValue.h | 104 +- DataStructures/ImportEdge.cpp | 107 ++ DataStructures/ImportEdge.h| 218 ++- DataStructures/ImportNode.cpp | 64 + DataStructures/ImportNode.h| 71 +- DataStructures/InputReaderFactory.h| 127 +- DataStructures/JSONContainer.h | 237 +++ DataStructures/LRUCache.h | 87 +- DataStructures/MercatorUtil.h | 38 - DataStructures/NNGrid.h| 602 DataStructures/NodeBasedGraph.h| 166 +++ DataStructures/NodeCoords.h| 69 - DataStructures/NodeInformationHelpDesk.h | 159 -- DataStructures/OriginalEdgeData.h | 60 + DataStructures/Percent.h | 127 +- DataStructures/PhantomNodes.h | 225 ++- DataStructures/QueryEdge.h | 94 +- DataStructures/QueryNode.h | 85 ++ DataStructures/RangeTable.h| 231 +++ DataStructures/RawRouteData.h | 80 + DataStructures/Restriction.h | 155 +- DataStructures/RestrictionMap.cpp | 224 +++ DataStructures/RestrictionMap.h| 126 ++ DataStructures/RouteParameters.cpp | 89 ++ DataStructures/SearchEngine.cpp| 89 -- DataStructures/SearchEngine.h | 96 +- DataStructures/SearchEngineData.cpp| 105 +- DataStructures/SearchEngineData.h | 79 +- DataStructures/SegmentInformation.h| 92 +- DataStructures/SharedMemoryFactory.h | 370 + DataStructures/SharedMemoryVectorWrapper.h | 156 ++ DataStructures/SimpleStack.h | 71 - DataStructures/StaticGraph.h | 279 ++-- DataStructures/StaticKDTree.h | 245 +-- DataStructures/StaticRTree.h | 1557 +++- DataStructures/TimingUtil.h| 50 - DataStructures/TurnInstructions.h | 132 +- DataStructures/XORFastHash.h | 84 +- DataStructures/XORFastHashStorage.h
[osrm] 04/05: Inject latest upstream version
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository osrm. commit fa5dd3d167c18d52b8721ec3edbe57e2bd461f53 Author: Andreas Tille Date: Thu Jul 10 16:44:57 2014 +0200 Inject latest upstream version --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1c0430a..7e03936 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -osrm (0.3.4-1) unstable; urgency=low +osrm (0.4.2-1) UNRELEASED; urgency=medium * Initial release (Closes: #701506) - -- Christopher Baines Thu, 04 Jul 2013 15:03:15 +0100 + -- Andreas Tille Thu, 10 Jul 2014 16:44:14 +0200 + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osrm.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
[osrm] branch pristine-tar updated (7f4ec24 -> 4345d57)
This is an automated email from the git hooks/post-receive script. tille pushed a change to branch pristine-tar in repository osrm. from 7f4ec24 pristine-tar data for osrm_0.3.4.orig.tar.gz new 4345d57 pristine-tar data for osrm_0.4.2.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: osrm_0.4.2.orig.tar.gz.delta | Bin 0 -> 9931 bytes osrm_0.4.2.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 osrm_0.4.2.orig.tar.gz.delta create mode 100644 osrm_0.4.2.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osrm.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
[osrm] 01/01: pristine-tar data for osrm_0.4.2.orig.tar.gz
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch pristine-tar in repository osrm. commit 4345d577b309e3886616e3f727c6e39ecf4114ac Author: Andreas Tille Date: Thu Jul 10 16:43:58 2014 +0200 pristine-tar data for osrm_0.4.2.orig.tar.gz --- osrm_0.4.2.orig.tar.gz.delta | Bin 0 -> 9931 bytes osrm_0.4.2.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/osrm_0.4.2.orig.tar.gz.delta b/osrm_0.4.2.orig.tar.gz.delta new file mode 100644 index 000..ad234a5 Binary files /dev/null and b/osrm_0.4.2.orig.tar.gz.delta differ diff --git a/osrm_0.4.2.orig.tar.gz.id b/osrm_0.4.2.orig.tar.gz.id new file mode 100644 index 000..adc73e9 --- /dev/null +++ b/osrm_0.4.2.orig.tar.gz.id @@ -0,0 +1 @@ +3a24b62d619f2c02e53a9cc8f9e1ebaf06eba461 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osrm.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
[osrm] branch upstream updated (733f53b -> 4afb219)
This is an automated email from the git hooks/post-receive script. tille pushed a change to branch upstream in repository osrm. from 733f53b Imported Upstream version 0.3.4 new 4afb219 Imported Upstream version 0.4.2 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: .clang-format | 54 + .gitignore | 12 +- .travis.yml| 54 + AUTHORS.TXT| 11 - Algorithms/BFSComponentExplorer.h | 148 ++ Algorithms/Bresenham.h | 49 - Algorithms/CRC32.cpp | 85 -- Algorithms/CRC32.h | 45 - Algorithms/DouglasPeucker.cpp | 183 +++ Algorithms/DouglasPeucker.h| 149 +- Algorithms/ExtractRouteNames.h | 169 +++ Algorithms/IteratorBasedCRC32.h| 185 ++- Algorithms/ObjectToBase64.h| 100 +- Algorithms/PolylineCompressor.cpp | 118 ++ Algorithms/PolylineCompressor.h| 151 +- Algorithms/StronglyConnectedComponents.h | 628 CMakeLists.txt | 344 - Contractor/ContractionCleanup.h| 261 Contractor/Contractor.h| 1313 ++--- Contractor/EdgeBasedGraphFactory.cpp | 1049 - Contractor/EdgeBasedGraphFactory.h | 234 ++- Contractor/GeometryCompressor.cpp | 227 +++ Contractor/GeometryCompressor.h| 65 + Contractor/TemporaryStorage.cpp| 226 +-- Contractor/TemporaryStorage.h | 165 +-- DataStructures/BinaryHeap.h| 340 +++-- DataStructures/ConcurrentQueue.h | 120 +- DataStructures/Coordinate.cpp | 446 ++ DataStructures/Coordinate.h| 108 -- DataStructures/DeallocatingVector.h| 487 +++--- DataStructures/DynamicGraph.h | 443 +++--- DataStructures/EdgeBasedNode.h | 90 ++ DataStructures/GridEdge.h | 82 -- DataStructures/HashTable.h | 125 +- DataStructures/HilbertValue.cpp| 100 ++ DataStructures/HilbertValue.h | 104 +- DataStructures/ImportEdge.cpp | 107 ++ DataStructures/ImportEdge.h| 218 ++- DataStructures/ImportNode.cpp | 64 + DataStructures/ImportNode.h| 71 +- DataStructures/InputReaderFactory.h| 127 +- DataStructures/JSONContainer.h | 237 +++ DataStructures/LRUCache.h | 87 +- DataStructures/MercatorUtil.h | 38 - DataStructures/NNGrid.h| 602 DataStructures/NodeBasedGraph.h| 166 +++ DataStructures/NodeCoords.h| 69 - DataStructures/NodeInformationHelpDesk.h | 159 -- DataStructures/OriginalEdgeData.h | 60 + DataStructures/Percent.h | 127 +- DataStructures/PhantomNodes.h | 225 ++- DataStructures/QueryEdge.h | 94 +- DataStructures/QueryNode.h | 85 ++ DataStructures/RangeTable.h| 231 +++ DataStructures/RawRouteData.h | 80 + DataStructures/Restriction.h | 155 +- DataStructures/RestrictionMap.cpp | 224 +++ DataStructures/RestrictionMap.h| 126 ++ DataStructures/RouteParameters.cpp | 89 ++ DataStructures/SearchEngine.cpp| 89 -- DataStructures/SearchEngine.h | 96 +- DataStructures/SearchEngineData.cpp| 105 +- DataStructures/SearchEngineData.h | 79 +- DataStructures/SegmentInformation.h| 92 +- DataStructures/SharedMemoryFactory.h | 370 + DataStructures/SharedMemoryVectorWrapper.h | 156 ++ DataStructures/SimpleStack.h | 71 - DataStructures/StaticGraph.h | 279 ++-- DataStructures/StaticKDTree.h | 245 +-- DataStructures/StaticRTree.h | 1557 +++- DataStructures/TimingUtil.h|
[osrm] 02/03: Priority optional
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository osrm. commit 1d7c3976c6f063c84ca3356af70352cdf92c1bd5 Author: Andreas Tille Date: Thu Jul 10 16:51:46 2014 +0200 Priority optional --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 7831148..7d12bd7 100644 --- a/debian/control +++ b/debian/control @@ -1,6 +1,6 @@ Source: osrm Section: misc -Priority: extra +Priority: optional Maintainer: Debian GIS Project Uploaders: Christopher Baines , Andreas Tille -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osrm.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
[osrm] 01/03: Drop pkg-osm from uploaders and add myself
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository osrm. commit d5a6fb92d74fd844a3a49123abd0532db70bccd3 Author: Andreas Tille Date: Thu Jul 10 16:51:26 2014 +0200 Drop pkg-osm from uploaders and add myself --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 515c81c..7831148 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: osrm Section: misc Priority: extra Maintainer: Debian GIS Project -Uploaders: Debian OpenStreetMap Team , - Christopher Baines +Uploaders: Christopher Baines , + Andreas Tille Build-Depends: debhelper (>= 9.0.0), cmake, libboost-dev, libboost-filesystem-dev, libboost-thread-dev, libboost-system-dev, libboost-regex-dev, libstxxl-dev, libxml2-dev, libsparsehash-dev, libbz2-dev, zlib1g-dev, libzip-dev, libgomp1, libpng-dev, libprotoc7, libprotobuf-dev, protobuf-compiler, liblua5.1-0-dev, libluabind-dev, pkg-config, libosmpbf-dev, libgdal-dev Standards-Version: 3.9.4 Homepage: http://project-osrm.org/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osrm.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
[gis] 01/01: osrm moved to Git, it also creates the binary osrm-tools
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository gis. commit 7ac690603da9d0a53a33b92f4ecef016d7f86823 Author: Andreas Tille Date: Thu Jul 10 16:54:47 2014 +0200 osrm moved to Git, it also creates the binary osrm-tools --- tasks/osm | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tasks/osm b/tasks/osm index 056cbda..6d5582d 100644 --- a/tasks/osm +++ b/tasks/osm @@ -11,11 +11,7 @@ Depends: viking Depends: josm -Depends: osrm -WNPP: 701506 -Comment: RFS: #715543 - http://mentors.debian.net/debian/pool/main/o/osrm/osrm_0.3.4-1.dsc - but missing in Git +Depends: osrm, osrm-tools Suggests:josm-plugins X-Comment: Sometimes conflicts with josm package, no point in recommending it -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/blends/projects/gis.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
[osrm] 01/01: Get Build-Depends correct to build the package
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository osrm. commit d93384be1a1fdcce09b49c1158af3dd2abc67a0f Author: Andreas Tille Date: Thu Jul 10 17:30:20 2014 +0200 Get Build-Depends correct to build the package --- debian/control | 5 - debian/patches/fix-boost-version-requirements.patch | 18 ++ debian/patches/series | 1 + 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 411f0e9..593625e 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,8 @@ Build-Depends: debhelper (>= 9.0.0), libboost-thread-dev, libboost-system-dev, libboost-regex-dev, + libboost-iostreams-dev, + libboost-program-options-dev, libstxxl-dev, libxml2-dev, libsparsehash-dev, @@ -26,7 +28,8 @@ Build-Depends: debhelper (>= 9.0.0), libluabind-dev, pkg-config, libosmpbf-dev, - libgdal-dev + libgdal-dev, + libtbb-dev Standards-Version: 3.9.5 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/osrm.git Vcs-Git: git://anonscm.debian.org/pkg-grass/osrm.git diff --git a/debian/patches/fix-boost-version-requirements.patch b/debian/patches/fix-boost-version-requirements.patch new file mode 100644 index 000..00645ea --- /dev/null +++ b/debian/patches/fix-boost-version-requirements.patch @@ -0,0 +1,18 @@ +Author: Andreas Tille +Last-Update: Thu, 10 Jul 2014 16:44:14 +0200 +Description: This is a hack which seemed to be necessary + due to a probably broken check to verify the needed libboost + version which failed without this hack. It is probably that + the patch can be droped in future versions. + +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -170,7 +170,7 @@ if(UNIX AND NOT APPLE) + endif() + + #Check Boost +-set(BOOST_MIN_VERSION "1.49.0") ++set(BOOST_MIN_VERSION "1.55.0") + find_package(Boost ${BOOST_MIN_VERSION} COMPONENTS ${BOOST_COMPONENTS} REQUIRED) + if(NOT Boost_FOUND) + message(FATAL_ERROR "Fatal error: Boost (version >= 1.49.0) required.\n") diff --git a/debian/patches/series b/debian/patches/series index 7bc5115..972354d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ add-cmake-install.patch +fix-boost-version-requirements.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osrm.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
[osrm] branch master updated (aa5d0d3 -> d93384b)
This is an automated email from the git hooks/post-receive script. tille pushed a change to branch master in repository osrm. from aa5d0d3 Fix Build-Depends new d93384b Get Build-Depends correct to build the package The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/control | 5 - debian/patches/fix-boost-version-requirements.patch | 18 ++ debian/patches/series | 1 + 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 debian/patches/fix-boost-version-requirements.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osrm.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
[osrm] branch master updated (d93384b -> 1b12ade)
This is an automated email from the git hooks/post-receive script. tille pushed a change to branch master in repository osrm. from d93384b Get Build-Depends correct to build the package new 1b12ade Fix docs and add citation The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/docs | 3 +-- debian/upstream/metadata | 9 + 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 debian/upstream/metadata -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osrm.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
[otb] branch master updated (b1246df -> 8d482e7)
This is an automated email from the git hooks/post-receive script. tille pushed a change to branch master in repository otb. from b1246df OTB developer team is a closed group :-( new 8d482e7 License conditions belong to copyright (only) and not to long description The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/control | 24 ++-- 1 file changed, 6 insertions(+), 18 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/otb.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
[otb] 01/01: License conditions belong to copyright (only) and not to long description
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository otb. commit 8d482e755e81ce6a67321be77470e90be4988e55 Author: Andreas Tille Date: Sun Jul 13 18:04:47 2014 +0200 License conditions belong to copyright (only) and not to long description --- debian/control | 24 ++-- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/debian/control b/debian/control index 643f31d..8c7649d 100644 --- a/debian/control +++ b/debian/control @@ -47,9 +47,7 @@ Description: Free library of image processing algorithms - runtime ORFEO Toolbox (OTB) is distributed as an open source library of image processing algorithms. OTB is based on the medical image processing library ITK and offers particular functionalities for remote sensing image processing - in general and for high spatial resolution images in particular. OTB is - distributed under a free software license CeCILL (similar to GNU GPL) to - encourage contribution from users and to promote reproducible research. + in general and for high spatial resolution images in particular. . This package contains the shared libraries required by Monteverdi, Monteverdi2 and the OTB applications. @@ -77,9 +75,7 @@ Description: Free library of image processing algorithms - development ORFEO Toolbox (OTB) is distributed as an open source library of image processing algorithms. OTB is based on the medical image processing library ITK and offers particular functionalities for remote sensing image processing - in general and for high spatial resolution images in particular. OTB is - distributed under a free software license CeCILL (similar to GNU GPL) to - encourage contribution from users and to promote reproducible research. + in general and for high spatial resolution images in particular. . This package contains the development files needed to build your own OTB applications. @@ -94,9 +90,7 @@ Description: Plugins for ORFEO Toolbox applications ORFEO Toolbox (OTB) is distributed as an open source library of image processing algorithms. OTB is based on the medical image processing library ITK and offers particular functionalities for remote sensing image processing - in general and for high spatial resolution images in particular. OTB is - distributed under a free software license CeCILL (similar to GNU GPL) to - encourage contribution from users and to promote reproducible research. + in general and for high spatial resolution images in particular. . This package contains the application plugins used by otb-bin and otb-bin-qt @@ -109,9 +103,7 @@ Description: ORFEO Toolbox command line applications ORFEO Toolbox (OTB) is distributed as an open source library of image processing algorithms. OTB is based on the medical image processing library ITK and offers particular functionalities for remote sensing image processing - in general and for high spatial resolution images in particular. OTB is - distributed under a free software license CeCILL (similar to GNU GPL) to - encourage contribution from users and to promote reproducible research. + in general and for high spatial resolution images in particular. . This package contains the command line tools illustrating OTB features (using plugins provided by otb-bin-common package). @@ -127,9 +119,7 @@ Description: ORFEO Toolbox graphical user interface applications ORFEO Toolbox (OTB) is distributed as an open source library of image processing algorithms. OTB is based on the medical image processing library ITK and offers particular functionalities for remote sensing image processing - in general and for high spatial resolution images in particular. OTB is - distributed under a free software license CeCILL (similar to GNU GPL) to - encourage contribution from users and to promote reproducible research. + in general and for high spatial resolution images in particular. . This package contains the GUI tools illustrating OTB features (using plugins provided by otb-bin-common package). @@ -147,9 +137,7 @@ Description: ORFEO Toolbox Python API for applications ORFEO Toolbox (OTB) is distributed as an open source library of image processing algorithms. OTB is based on the medical image processing library ITK and offers particular functionalities for remote sensing image processing - in general and for high spatial resolution images in particular. OTB is - distributed under a free software license CeCILL (similar to GNU GPL) to - encourage contribution from users and to promote reproducible research. + in general and for high spatial resolution images in particular. . This package contains the Python API for applications provided by the otb-bin-common package. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/otb.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org
[otb] 02/03: Add some simply method to create manpages for otbcli applications
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository otb. commit fe69c6181997d3280287d43df1799a916959c724 Author: Andreas Tille Date: Mon Jul 14 17:28:45 2014 +0200 Add some simply method to create manpages for otbcli applications --- debian/otbcli.1 | 13 + debian/rules| 13 + 2 files changed, 26 insertions(+) diff --git a/debian/otbcli.1 b/debian/otbcli.1 new file mode 100644 index 000..295f624 --- /dev/null +++ b/debian/otbcli.1 @@ -0,0 +1,13 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.45.1. +.TH OTBCLI "1" "July 2014" "otbcli 4.0.0" "User Commands" +.SH NAME +otbcli \- ORFEO Toolbox command line applications +.SH DESCRIPTION +ORFEO Toolbox (OTB) is distributed as an open source library of image +processing algorithms. OTB is based on the medical image processing library +ITK and offers particular functionalities for remote sensing image processing +in general and for high spatial resolution images in particular. +.SH USAGE +\fI/usr/bin/otbApplicationLauncherCommandLine\fP module_name [MODULEPATH] [arguments] +.P +Here is a list of available module wrappers: diff --git a/debian/rules b/debian/rules index bdc77da..b234f71 100755 --- a/debian/rules +++ b/debian/rules @@ -47,6 +47,11 @@ CMAKE_FLAGS = \ -DOTB_WRAP_QT:BOOL=ON \ -DOTB_WRAP_PYTHON:BOOL=ON +pkgcli:=otb-bin +pkggui:=otb-bin-qt +mancli:=$(CURDIR)/debian/$(pkgcli)/usr/share/man/man1 +mangui:=$(CURDIR)/debian/$(pkggui)/usr/share/man/man1 + OTB_LIB_DIRS = /usr/lib/otb %: @@ -58,3 +63,11 @@ override_dh_auto_configure: override_dh_shlibdeps: LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):$(OTB_LIB_DIRS) dh_shlibdeps +override_dh_installman: + mkdir -p $(mancli) + cp -a debian/otbcli.1 $(mancli) + for bin in `ls $(CURDIR)/debian/$(pkgcli)/usr/bin/otbcli_*` ; do \ + echo '.IP' >> $(mancli)/otbcli.1 ; \ + basename $${bin} | sed 's/otbcli_//' >> $(mancli)/otbcli.1 ; \ + ln -sf otbcli.1 $(mancli)/`basename $${bin}`.1 ; \ + done -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/otb.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
[otb] branch master updated (8d482e7 -> 1be06c9)
This is an automated email from the git hooks/post-receive script. tille pushed a change to branch master in repository otb. from 8d482e7 License conditions belong to copyright (only) and not to long description new 618bd19 There is no need to auto generate d/control + d/changelog new fe69c61 Add some simply method to create manpages for otbcli applications new 1be06c9 Add also primitive manpage generation for otbgui_ binaries 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/otbcli.1 | 13 + debian/otbgui.1 | 13 + debian/rules| 32 3 files changed, 46 insertions(+), 12 deletions(-) create mode 100644 debian/otbcli.1 create mode 100644 debian/otbgui.1 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/otb.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
[otb] 01/03: There is no need to auto generate d/control + d/changelog
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository otb. commit 618bd19ad33d2a072a1418f3a5623ed0d28b50cd Author: Andreas Tille Date: Sun Jul 13 18:33:11 2014 +0200 There is no need to auto generate d/control + d/changelog --- debian/rules | 12 1 file changed, 12 deletions(-) diff --git a/debian/rules b/debian/rules index 898cde6..bdc77da 100755 --- a/debian/rules +++ b/debian/rules @@ -58,15 +58,3 @@ override_dh_auto_configure: override_dh_shlibdeps: LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):$(OTB_LIB_DIRS) dh_shlibdeps -control-file: - sed -e "s/@OTB_VERSION_MAJOR@/$(OTB_VERSION_MAJOR)/g" \ - -e "s/@OTB_VERSION_MINOR@/$(OTB_VERSION_MINOR)/g" \ - -e "s/@OTB_VERSION_PATCH@/$(OTB_VERSION_PATCH)/g" \ - -e "s/@OTB_VERSION_SONAME@/$(OTB_VERSION_SONAME)/g" \ - -e "s/@OTB_VERSION_FULL@/$(OTB_VERSION_FULL)/g" \ - < debian/control.in > debian/control - -changelog-file: - sed -e "s/@DIST@/$(DIST)/g" \ - -e "s/@PKGVERSION@/$(PKGVERSION)/g" \ - < debian/changelog.in > debian/changelog -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/otb.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
[otb] 03/03: Add also primitive manpage generation for otbgui_ binaries
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository otb. commit 1be06c960e2246509d85abf40518ec80d602da3a Author: Andreas Tille Date: Mon Jul 14 17:36:29 2014 +0200 Add also primitive manpage generation for otbgui_ binaries --- debian/otbgui.1 | 13 + debian/rules| 7 +++ 2 files changed, 20 insertions(+) diff --git a/debian/otbgui.1 b/debian/otbgui.1 new file mode 100644 index 000..0a5711d --- /dev/null +++ b/debian/otbgui.1 @@ -0,0 +1,13 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.45.1. +.TH OTBCLI "1" "July 2014" "otbcli 4.0.0" "User Commands" +.SH NAME +otbgui \- ORFEO Toolbox graphical user interface applications +.SH DESCRIPTION +ORFEO Toolbox (OTB) is distributed as an open source library of image +processing algorithms. OTB is based on the medical image processing library +ITK and offers particular functionalities for remote sensing image processing +in general and for high spatial resolution images in particular. +.SH USAGE +\fI/usr/bin/otbApplicationLauncherQt\fP module_name [MODULEPATH] [arguments] +.P +Here is a list of available module wrappers: diff --git a/debian/rules b/debian/rules index b234f71..188f2e1 100755 --- a/debian/rules +++ b/debian/rules @@ -71,3 +71,10 @@ override_dh_installman: basename $${bin} | sed 's/otbcli_//' >> $(mancli)/otbcli.1 ; \ ln -sf otbcli.1 $(mancli)/`basename $${bin}`.1 ; \ done + mkdir -p $(mangui) + cp -a debian/otbgui.1 $(mangui) + for bin in `ls $(CURDIR)/debian/$(pkggui)/usr/bin/otbgui_*` ; do \ + echo '.IP' >> $(mangui)/otbgui.1 ; \ + basename $${bin} | sed 's/otbgui_//' >> $(mangui)/otbgui.1 ; \ + ln -sf otbgui.1 $(mangui)/`basename $${bin}`.1 ; \ + done -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/otb.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
[otb] 01/02: Du not duplicate Section field
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository otb. commit d813200b89d9fc63969eed7e7c9ecf131676765b Author: Andreas Tille Date: Mon Jul 14 21:18:30 2014 +0200 Du not duplicate Section field --- debian/control | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/control b/debian/control index 8c7649d..1c777ce 100644 --- a/debian/control +++ b/debian/control @@ -82,7 +82,6 @@ Description: Free library of image processing algorithms - development Package: otb-bin-common Architecture: any -Section: science Depends: libotb (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/otb.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
[otb] branch master updated (1be06c9 -> e764a64)
This is an automated email from the git hooks/post-receive script. tille pushed a change to branch master in repository otb. from 1be06c9 Add also primitive manpage generation for otbgui_ binaries new d813200 Du not duplicate Section field new e764a64 Silence lintian warnings about spelling errors 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/control| 1 - debian/patches/series | 1 + debian/patches/spelling.patch | 831 ++ 3 files changed, 832 insertions(+), 1 deletion(-) create mode 100644 debian/patches/spelling.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/otb.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
[gis] branch osgeo created (now 7ac6906)
This is an automated email from the git hooks/post-receive script. tille pushed a change to branch osgeo in repository gis. at 7ac6906 osrm moved to Git, it also creates the binary osrm-tools No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/blends/projects/gis.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
[gis] branch master updated (7ac6906 -> 7704930)
This is an automated email from the git hooks/post-receive script. tille pushed a change to branch master in repository gis. from 7ac6906 osrm moved to Git, it also creates the binary osrm-tools new 7704930 Remove unused, unattended, unmaintained osgeo-* tasks and leave them in osgeo branch for further reference 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: tasks/osgeo-analytic | 14 -- tasks/osgeo-edit | 29 - tasks/osgeo-misc | 30 -- tasks/osgeo-pgrouting | 20 tasks/osgeo-web-server | 45 - tasks/osgeo-web-theme | 15 --- tasks/osgeo-web-viewer | 35 --- 7 files changed, 188 deletions(-) delete mode 100644 tasks/osgeo-analytic delete mode 100644 tasks/osgeo-edit delete mode 100644 tasks/osgeo-misc delete mode 100644 tasks/osgeo-pgrouting delete mode 100644 tasks/osgeo-web-server delete mode 100644 tasks/osgeo-web-theme delete mode 100644 tasks/osgeo-web-viewer -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/blends/projects/gis.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
[gis] 01/01: Remove unused, unattended, unmaintained osgeo-* tasks and leave them in osgeo branch for further reference
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository gis. commit 77049303b63ca5cc6970044bc6b3774b2d86b18c Author: Andreas Tille Date: Tue Jul 15 15:03:34 2014 +0200 Remove unused, unattended, unmaintained osgeo-* tasks and leave them in osgeo branch for further reference --- tasks/osgeo-analytic | 14 -- tasks/osgeo-edit | 29 - tasks/osgeo-misc | 30 -- tasks/osgeo-pgrouting | 20 tasks/osgeo-web-server | 45 - tasks/osgeo-web-theme | 15 --- tasks/osgeo-web-viewer | 35 --- 7 files changed, 188 deletions(-) diff --git a/tasks/osgeo-analytic b/tasks/osgeo-analytic deleted file mode 100644 index 1548d9e..000 --- a/tasks/osgeo-analytic +++ /dev/null @@ -1,14 +0,0 @@ -Task: OSGEO: traditional analytic GIS -Metapackage: false -Description: packages concerning traditional analytic GIS - OSGEO Desktop apps part 1 - . - Debian packages which are dealing traditional analytic GIS - . - FIXME: Idea from - https://trac.osgeo.org/osgeo/browser/livedvd/gisvm/trunk/bin/install_icons_and_menus.sh#L34 - but needs enhancement - -Depends: grass, qgis, gvsig, openjump, udig, ossimplanet, spatialite-bin, saga - -Ignore: atlasstyler geopublisher diff --git a/tasks/osgeo-edit b/tasks/osgeo-edit deleted file mode 100644 index 7b8b1fe..000 --- a/tasks/osgeo-edit +++ /dev/null @@ -1,29 +0,0 @@ -Task: OSGEO: geodata viewers and editors -Metapackage: false -Description: packages concerning geodata viewers and editors - OSGEO Desktop apps part 2 - . - Debian packages which are helpful to view or edit geodata. - . - FIXME: Idea from - https://trac.osgeo.org/osgeo/browser/livedvd/gisvm/trunk/bin/install_icons_and_menus.sh#L34 - but needs enhancement - -Depends: marble - -Depends: gpsdrive - -Depends: opencpn - -Depends: josm - -Depends: merkaartor - -Comment: The page above mentions "osm_online" but it is not clear whether this - is refering to a package. Package names are not allowed to contain '_' - -Depends: viking - -Depends: zygrib - -Depends: gpsprune diff --git a/tasks/osgeo-misc b/tasks/osgeo-misc deleted file mode 100644 index ee545e3..000 --- a/tasks/osgeo-misc +++ /dev/null @@ -1,30 +0,0 @@ -Task: OSGEO: infrastructure and miscellanea -Metapackage: false -Description: packages providing GIS infrastructure and miscellanea - OSGEO Infrastructure and miscellanea - . - Debian packages for a GIS infrastructure and miscellanea - . - FIXME: Idea from - https://trac.osgeo.org/osgeo/browser/livedvd/gisvm/trunk/bin/install_icons_and_menus.sh#L34 - but needs enhancement - -Depends: imagelinker - -Depends: r-base - -Depends: geokettle - -Depends: libjs-openlayers -Comment: The template was specifying openlayers which IMHO (A. Tille) belongs rather - to web. I hope I did guess the intention right. - -Depends: maptiler - -Depends: tilemill - -Depends: mapnik-utils, carto -Comment: The tempülate did specify "mapnik-*" which leaves a lot of room for speculation - what exact package should be put in here. I (A. Tille) picked just two possibilities. - -Depends: monteverdi diff --git a/tasks/osgeo-pgrouting b/tasks/osgeo-pgrouting deleted file mode 100644 index f11b1d5..000 --- a/tasks/osgeo-pgrouting +++ /dev/null @@ -1,20 +0,0 @@ -Task: OSGEO: PostGIS and Spatialite -Metapackage: false -Description: packages providing PostGIS and Spatialite - OSGEO pgadmin, sqlitebrowser, etc - . - Debian packages for PostGIS and Spatialite - . - FIXME: Idea from - https://trac.osgeo.org/osgeo/browser/livedvd/gisvm/trunk/bin/install_icons_and_menus.sh#L34 - but needs enhancement - -Depends: spatialite-bin, spatialite-gui, rasterlite-bin - -Depends: rasdaman -Comment: Originally the template said "*[Rr]asdaman*" but we need real packages here - without any wildcards - -Depends: qbrowser - -Depends: postgis, pgrouting diff --git a/tasks/osgeo-web-server b/tasks/osgeo-web-server deleted file mode 100644 index 6d955c9..000 --- a/tasks/osgeo-web-server +++ /dev/null @@ -1,45 +0,0 @@ -Task: OSGEO: web-enabled GIS; interactive/WPS -Metapackage: false -Description: packages concerning web-enabled GIS; interactive/WPS - OSGEO Server apps part 1 - . - Debian packages which are helpful for web-enabled GIS; interactive/WPS - . - FIXME: Idea from - https://trac.osgeo.org/osgeo/browser/livedvd/gisvm/trunk/bin/install_icons_and_menus.sh#L34 - but needs enhancement - -Depends: deegree -Comment: Originally the template said "geoserver-*" but we need real packages here - without any wildcards - -Depends: geonetwork -Comment: Originally the template said "*geonetwork*" but we need real packages here - without any wildcards - -Depends: mapserver - -Depends: mapproxy -Comment: Originally the template sai
[saga] tag debian/2.1.2+dfsg-1 created (now c84c2f5)
This is an automated email from the git hooks/post-receive script. tille pushed a change to tag debian/2.1.2+dfsg-1 in repository saga. at c84c2f5 (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/saga.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
[pg_comparator] tag debian/2.2.5-1 created (now ac0f31f)
This is an automated email from the git hooks/post-receive script. tille pushed a change to tag debian/2.2.5-1 in repository pg_comparator. at ac0f31f (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/pg_comparator.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
[gis] branch master updated (7704930 -> 0be6f99)
This is an automated email from the git hooks/post-receive script. tille pushed a change to branch master in repository gis. from 7704930 Remove unused, unattended, unmaintained osgeo-* tasks and leave them in osgeo branch for further reference new 0be6f99 d/source/format: 3.0 (native) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/blends/projects/gis.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
[gis] 01/01: d/source/format: 3.0 (native)
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository gis. commit 0be6f99454bbb1db727e6905e4a04f12a205ed96 Author: Andreas Tille Date: Fri Jul 25 10:03:12 2014 +0200 d/source/format: 3.0 (native) --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2efd489..d0351a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,13 +3,14 @@ debian-gis (0.0.3) UNRELEASED; urgency=low [ Andreas Tille ] * tasks/statistics: Add some prospective R packes that reside in Debian Science SVN + * d/source/format: 3.0 (native) [ Bas Couwenberg ] * tasks/devel: New development metapackage. * tasks/workstation: s/postgresql-9.1-postgis/postgresql-9.3-postgis-2.1/ Closes: #732413 - -- Andreas Tille Sun, 19 May 2013 08:31:35 +0200 + -- Andreas Tille Fri, 25 Jul 2014 10:02:47 +0200 debian-gis (0.0.2) unstable; urgency=low -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/blends/projects/gis.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
Bug#755553: Can not build osm2pgsql
Hi, I intended to sponsor the latest status of osm2pgsql in Git but it does not build for me. I attached the build log. Any idea what might went wrong? Kind regards Andreas. -- http://fam-tille.de osm2pgsql_0.84.0-2_amd64.build.gz Description: Binary data ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mbsystem] 02/05: Merge tag 'upstream/5.5.2252'
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository mbsystem. commit c98aa9f2639934fcd43d40fd81e253dcfb99bd82 Merge: 2c9d5ae cd455aa Author: Andreas Tille Date: Thu Aug 20 10:44:22 2015 +0200 Merge tag 'upstream/5.5.2252' Upstream version 5.5.2252 ChangeLog | 300 +- Makefile.in| 21 +- Makefile.template | 55 - configure | 3871 ++-- configure.ac | 1027 ++-- configure.ac => configure.ac.save | 172 +- configure.cmd | 197 +- configureGMT5.cmd | 15 + html/ChayesJul2003.gif | Bin 0 -> 19022 bytes html/MBTeamJul2003.gif | Bin 0 -> 146993 bytes html/ValJul2003.gif| Bin 0 -> 20392 bytes html/caress2001.gif| Bin 0 -> 14069 bytes html/gpl.html | 604 ++ {src/html => html}/index.html |2 +- {src/html => html}/mbsystem.html |8 +- html/mbsystem_capabilities.html| 254 + {src/html => html}/mbsystem_copyright.html |0 html/mbsystem_faq.html | 433 ++ {src/html => html}/mbsystem_formats.html |2 +- html/mbsystem_future.html | 122 + src/html/index.html => html/mbsystem_home.html |2 +- {src/html => html}/mbsystem_how_to_get.html|0 html/mbsystem_logo.gif | Bin 0 -> 66436 bytes html/mbsystem_logo_small.gif | Bin 0 -> 6158 bytes {src/html => html}/mbsystem_man_list.html |0 {src/html => html}/mbsystem_whatsnew.html |0 install_makefiles | 1020 libtool| 6154 ltmain.sh | 5528 +++--- src/Makefile.am|5 +- src/Makefile.in| 23 +- src/Makefile.template | 65 - src/bsio/Makefile.in | 18 +- src/bsio/Makefile.template | 109 - src/bsio/bs2asc.c |4 +- src/bsio/mbbs.h|4 +- src/bsio/mbbs_defines.h| 15 +- src/bsio/mbbs_io.c |7 +- src/bsio/mbbs_iomrv1.c |4 +- src/bsio/mbbs_iomrv2.c |4 +- src/bsio/mbbs_mem.h|6 +- src/bsio/mbbs_memalloc.c |8 +- src/bsio/mbbs_misc.c | 18 +- src/bsio/mbbs_swapbytes.c |4 +- src/bsio/mbbs_tm.c |4 +- src/bsio/mbbs_utils.c | 12 +- src/bsio/mbbs_wrhdrfields.c|4 +- src/bsio/mbbs_wrsampflags.c|4 +- src/gmt/Makefile.am| 23 +- src/gmt/Makefile.in| 256 +- src/gmt/Makefile.template | 105 - src/gmt/common_byteswap.h | 135 + src/gmt/common_math.h | 107 + src/gmt/common_runpath.h | 59 + src/gmt/common_sighandler.h| 34 + src/gmt/common_string.h| 88 + src/gmt/gmt_calclock.h | 68 + src/gmt/gmt_colors.h | 60 + src/gmt/gmt_common.h | 187 + src/gmt/gmt_config.h |0 src/gmt/gmt_constants.h| 224 + src/gmt/gmt_contour.h | 158 + src/gmt/gmt_core_module.h | 114 + src/gmt/gmt_crossing.h | 40 + src/gmt/gmt_customio.h | 55 + src/gmt/gmt_dcw.h | 55 + src/gmt/gmt_defaults.h | 170 + src/gmt/gmt_define.h | 45 + src/gmt/gmt_dev.h | 146 + src/gmt/gmt_dimensions.h | 29 + src/gmt/gmt_error.h| 139 + src/gmt/gmt_error_codes.h | 107 + src/gmt/gmt_fft.h
[mbsystem] 01/01: pristine-tar data for mbsystem_5.5.2252.orig.tar.gz
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch pristine-tar in repository mbsystem. commit 8d8ef94fcc2b4e0f25142943c2e89148b716fc10 Author: Andreas Tille Date: Thu Aug 20 10:44:22 2015 +0200 pristine-tar data for mbsystem_5.5.2252.orig.tar.gz --- mbsystem_5.5.2252.orig.tar.gz.delta | Bin 0 -> 33279 bytes mbsystem_5.5.2252.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/mbsystem_5.5.2252.orig.tar.gz.delta b/mbsystem_5.5.2252.orig.tar.gz.delta new file mode 100644 index 000..b05384a Binary files /dev/null and b/mbsystem_5.5.2252.orig.tar.gz.delta differ diff --git a/mbsystem_5.5.2252.orig.tar.gz.id b/mbsystem_5.5.2252.orig.tar.gz.id new file mode 100644 index 000..d9e85c4 --- /dev/null +++ b/mbsystem_5.5.2252.orig.tar.gz.id @@ -0,0 +1 @@ +79e077d427e4dd2d87e45b9909929af0f10d6df0 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mbsystem.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
[mbsystem] 03/05: Inject new upstream version (same build failures as in previous version :-()
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository mbsystem. commit c7d90f9d85402f2933e6024c9f6b4fc89b7adef5 Author: Andreas Tille Date: Thu Aug 20 10:45:40 2015 +0200 Inject new upstream version (same build failures as in previous version :-() --- debian/changelog | 6 ++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0d4be1e..053a91d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mbsystem (5.5.2252-1) UNRELEASED; urgency=low + + New upstream version + + -- Andreas Tille Thu, 20 Aug 2015 10:45:14 +0200 + mbsystem (5.4.2220-0) UNRELEASED; urgency=low [ M. Hamish Bowman ] -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mbsystem.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
[mbsystem] 05/05: Enhance long description of main package
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository mbsystem. commit 32bbde3302f08a037610220a1636dff4d5dee4f8 Author: Andreas Tille Date: Thu Aug 20 11:50:10 2015 +0200 Enhance long description of main package --- debian/control | 10 ++ 1 file changed, 10 insertions(+) diff --git a/debian/control b/debian/control index afa46eb..395ec1c 100644 --- a/debian/control +++ b/debian/control @@ -38,6 +38,16 @@ Description: Processing tools for multibeam and sidescan sonar data display of bathymetry and backscatter imagery data derived from multibeam, interferometry, and sidescan sonars. It interacts with GMT (The Generic Mapping Tools) and other GIS applications. + . + MB-System was originally developed at the Lamont-Doherty Earth + Observatory of Columbia University (L-DEO) and is now a collaborative + effort between the Monterey Bay Aquarium Research Institute (MBARI) and + L-DEO. The National Science Foundation has provided the primary support + for MB-System development since 1993. The Packard Foundation has + provided significant support through MBARI since 1998. Additional + support has derived from SeaBeam Instruments (1994-1997), NOAA (2002- + 2004), and others. + Package: mbsystem-doc Architecture: all -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mbsystem.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
[mbsystem] branch upstream updated (4125fb2 -> cd455aa)
This is an automated email from the git hooks/post-receive script. tille pushed a change to branch upstream in repository mbsystem. from 4125fb2 Imported Upstream version 5.4.2220 new cd455aa Imported Upstream version 5.5.2252 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: ChangeLog | 300 +- Makefile.in| 21 +- Makefile.template | 55 - configure | 3871 ++-- configure.ac | 1027 ++-- configure.ac => configure.ac.save | 172 +- configure.cmd | 197 +- configureGMT5.cmd | 15 + {src/html => html}/ChayesJul2003.gif | Bin {src/html => html}/MBTeamJul2003.gif | Bin {src/html => html}/ValJul2003.gif | Bin {src/html => html}/caress2001.gif | Bin {src/html => html}/gpl.html|0 src/html/mbsystem_home.html => html/index.html |0 {src/html => html}/mbsystem.html |8 +- {src/html => html}/mbsystem_capabilities.html |0 {src/html => html}/mbsystem_copyright.html |0 {src/html => html}/mbsystem_faq.html |0 {src/html => html}/mbsystem_formats.html |2 +- {src/html => html}/mbsystem_future.html|0 {src/html => html}/mbsystem_home.html |0 {src/html => html}/mbsystem_how_to_get.html|0 {src/html => html}/mbsystem_logo.gif | Bin {src/html => html}/mbsystem_logo_small.gif | Bin {src/html => html}/mbsystem_man_list.html |0 {src/html => html}/mbsystem_whatsnew.html |0 install_makefiles | 1020 libtool| 6154 ltmain.sh | 5528 +++--- src/Makefile.am|5 +- src/Makefile.in| 23 +- src/Makefile.template | 65 - src/bsio/Makefile.in | 18 +- src/bsio/Makefile.template | 109 - src/bsio/bs2asc.c |4 +- src/bsio/mbbs.h|4 +- src/bsio/mbbs_defines.h| 15 +- src/bsio/mbbs_io.c |7 +- src/bsio/mbbs_iomrv1.c |4 +- src/bsio/mbbs_iomrv2.c |4 +- src/bsio/mbbs_mem.h|6 +- src/bsio/mbbs_memalloc.c |8 +- src/bsio/mbbs_misc.c | 18 +- src/bsio/mbbs_swapbytes.c |4 +- src/bsio/mbbs_tm.c |4 +- src/bsio/mbbs_utils.c | 12 +- src/bsio/mbbs_wrhdrfields.c|4 +- src/bsio/mbbs_wrsampflags.c|4 +- src/gmt/Makefile.am| 23 +- src/gmt/Makefile.in| 256 +- src/gmt/Makefile.template | 105 - src/gmt/common_byteswap.h | 135 + src/gmt/common_math.h | 107 + src/gmt/common_runpath.h | 59 + src/gmt/common_sighandler.h| 34 + src/gmt/common_string.h| 88 + src/gmt/gmt_calclock.h | 68 + src/gmt/gmt_colors.h | 60 + src/gmt/gmt_common.h | 187 + src/gmt/gmt_config.h |0 src/gmt/gmt_constants.h| 224 + src/gmt/gmt_contour.h | 158 + src/gmt/gmt_core_module.h | 114 + src/gmt/gmt_crossing.h | 40 + src/gmt/gmt_customio.h | 55 + src/gmt/gmt_dcw.h | 55 + src/gmt/gmt_defaults.h | 170 + src/gmt/gmt_define.h | 45 + src/gmt/gmt_dev.h | 146 + src/gmt/gmt_dimensions.h | 29 + src/gmt/gmt_error.h| 139 + src/gmt/gmt_error_codes.h
[mbsystem] 04/05: New version has needs versioned dependency libgmt-dev (>= 5.1.2)
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository mbsystem. commit 581b9a53167b133c981e9279b235b2dfeb162159 Author: Andreas Tille Date: Thu Aug 20 10:47:16 2015 +0200 New version has needs versioned dependency libgmt-dev (>= 5.1.2) --- debian/changelog | 3 ++- debian/control | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 053a91d..69b9ac5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ mbsystem (5.5.2252-1) UNRELEASED; urgency=low - New upstream version + * New upstream version + * New package needs versioned dependency libgmt-dev (>= 5.1.2) -- Andreas Tille Thu, 20 Aug 2015 10:45:14 +0200 diff --git a/debian/control b/debian/control index bb45569..afa46eb 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Section: science Priority: optional Build-Depends: debhelper (>= 9), dh-autoreconf, - libgmt-dev, + libgmt-dev (>= 5.1.2), lesstif2-dev | libmotif-dev, libxt-dev, libnetcdf-dev, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mbsystem.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
[mbsystem] branch pristine-tar updated (96f22cb -> 8d8ef94)
This is an automated email from the git hooks/post-receive script. tille pushed a change to branch pristine-tar in repository mbsystem. from 96f22cb pristine-tar data for mbsystem_5.4.2220.orig.tar.gz new 8d8ef94 pristine-tar data for mbsystem_5.5.2252.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: mbsystem_5.5.2252.orig.tar.gz.delta | Bin 0 -> 33279 bytes mbsystem_5.5.2252.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 mbsystem_5.5.2252.orig.tar.gz.delta create mode 100644 mbsystem_5.5.2252.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mbsystem.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
Please fix upstream metadata for gmt (patch attached)
Hi, I'm frequently observing that people have a string ": " in the yaml value field of debian/upstream/metadata. Please note that this string marks the separation between field and value and is not allowed inside a value. The attached patch fixes this for gmt. You do not need to upload the package to fix this - it is sufficient to "git am" the patch. Thus I did not filed a bug report but currently I'm sitting behind a slow connection that does not permit me to clone the whole gmt repository and making some extra noise about this issue besides a simple commit might (hopefully) create some awareness of this issue which is a frequent mistake (not only in Debian GIS packages). Kind regards Andreas. -- http://fam-tille.de >From 974a4cffe02f766e266a75eed95734cd1dbbfdf1 Mon Sep 17 00:00:00 2001 From: Andreas Tille Date: Wed, 16 Sep 2015 07:29:15 + Subject: [PATCH] Fix Title field in citation data. You may not use ": " string in yaml values. --- debian/upstream/metadata | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/upstream/metadata b/debian/upstream/metadata index dcfe045..d440e6a 100644 --- a/debian/upstream/metadata +++ b/debian/upstream/metadata @@ -11,7 +11,7 @@ Reference: Month: nov Number: 45 Pages: 409-410 - Title: Generic Mapping Tools: Improved version released + Title: "Generic Mapping Tools: Improved version released" Volume: 94 Year: 2013 - -- 2.1.4 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Re: Comments regarding pyresample_1.1.0-1_amd64.changes
Hi Antonio, I had a short look at this: On Sun, Aug 03, 2014 at 10:57:38AM +0200, Antonio Valentino wrote: > > mpop for processing weather satellite data > ITP: #754556 > Vcs-Git: http://anonscm.debian.org/git/pkg-grass/python-mpop.git d/copyright says: Upstream-Name: pykdtree which is most probably a cut-n-pasto. As I said in PM: Feel free to ask for SoB-sponsering Andreas. -- http://fam-tille.de ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Sponsering more packages (Was: Comments regarding pyresample_1.1.0-1_amd64.changes)
Hi again, On Sun, Aug 03, 2014 at 10:57:38AM +0200, Antonio Valentino wrote: > mpop for processing weather satellite data > ITP: #754556 > Vcs-Git: http://anonscm.debian.org/git/pkg-grass/python-mpop.git further remark to d/copyright: Please use proper PATH for files with specific licenses. In several cases mpop/ is missing. I also noticed that python-mipp is a preconditcion. > mipp: for reading weather satellite data > ITP: #753054 > Vcs-Git: http://anonscm.debian.org/git/pkg-grass/mipp.git Any reason to name the source (and the repository) only mipp instead of python-mipp. As far as I understand Python libraries should also contain the 'python-' in the beginning. The long description has some typo: It's main task is to convert t low level satellite data into a format ^^ > [2] https://wiki.debian.org/DebianPureBlends/SoB As I said feel free to ping me via SoB Andreas. -- http://fam-tille.de ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Re: Sponsering more packages (Was: Comments regarding pyresample_1.1.0-1_amd64.changes)
Hi Antonio, On Mon, Aug 04, 2014 at 09:08:50PM +0200, Antonio Valentino wrote: > > noticed that python-mipp is a preconditcion. > > yes, it is a pre-ondition, mpop should be uploaded only after mipp OK. > >> mipp: for reading weather satellite data > >> ITP: #753054 > >> Vcs-Git: http://anonscm.debian.org/git/pkg-grass/mipp.git > > > > Any reason to name the source (and the repository) only mipp instead > > of python-mipp. As far as I understand Python libraries should also > > contain the 'python-' in the beginning. > > > > as far as I know the python- prefix is only required for binary packages. As far as I understood best practices of Python team you should also use the prefix for source packages. Could you please clarify this on Debian Python list since it would be better to clarify this before the first upload? So please ask debian-pyt...@lists.debian.org for a short review of your packaging in Git. A similar naming inconsistency is in pycoast - please also ask Python team to get a sensible default naming. Kind regards Andreas. -- http://fam-tille.de ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[osm-gps-map] branch master updated (327ab1f -> 8d13ade)
This is an automated email from the git hooks/post-receive script. tille pushed a change to branch master in repository osm-gps-map. from 327ab1f Set distribution to unstable new 8d13ade Do not Build-Depend hardening-wrapper which is deprecated The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 4 debian/control | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osm-gps-map.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
[osm-gps-map] 01/01: Do not Build-Depend hardening-wrapper which is deprecated
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository osm-gps-map. commit 8d13ade34f5731b9c634c9186b3445b1f18ab47e Author: Andreas Tille Date: Mon Aug 4 20:49:22 2014 +0200 Do not Build-Depend hardening-wrapper which is deprecated --- debian/changelog | 4 debian/control | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 922e427..26b607f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ osm-gps-map (1.0.2-2) unstable; urgency=medium + [ Ross Gammon ] * Install pkg-config file. Thanks to Ruben Undheim (Closes: 753808) * Fix lintian warning "Breaks-without-version" + [ Andreas Tille ] + * Do not Build-Depend hardening-wrapper which is deprecated + -- Ross Gammon Mon, 04 Aug 2014 19:53:27 +0200 osm-gps-map (1.0.2-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index c3f5093..6900886 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,6 @@ Uploaders: David Paleino , Section: libs Priority: optional Build-Depends: debhelper (>= 9~), - hardening-wrapper, libtool, automake, autoconf, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osm-gps-map.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
Re: Sponsering more packages (Was: Comments regarding pyresample_1.1.0-1_amd64.changes)
Hi Antonio, On Tue, Aug 05, 2014 at 12:27:47AM +0200, Antonio Valentino wrote: > > It seems there is no specific naming rule for source packages [1]. > Anyway if you prefer I can rename the packages adding the "python-" prefix. > > [1] https://lists.debian.org/debian-python/2014/08/msg00018.html OK, fine for me. Since I will not put my personal opinion onto my sponsees I uploaded as is. Kind regards and thanks for your preparation Andreas. PS: Please ping me for the last package if the dependency has arrived. -- http://fam-tille.de ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#757308: grass: Please update to use wxpython3.0
Hi, just a metacomment: Due to the wxPython issue several packages get RC bugs filed which in several cases leads to the fact that these are simply removed from testing and either create a lot of work or will be lost for the Jessie release. IMHO this is bad timing to get a predependency for several applications removed quite close to a release date. Kind regards Andreas. On Thu, Aug 07, 2014 at 10:52:42AM +0200, Sebastiaan Couwenberg wrote: > Hi Olly, > > On 08/07/2014 06:56 AM, Olly Betts wrote: > > It looks like grass 7.0.0 will be compatible with wxPython 3.0 - I see > > in http://trac.osgeo.org/grass/wiki/Release/7.0.0beta-News the entry: > > > > | wxPython 3 compatibility fixes > > > > So updating the package to this version seems the simplest fix. > > In theory this is a good idea. But updating from grass 6.4.3 to 7.0.0 > will require a transition, which we are unlikely to get in shape before > the freeze in November. > > Updating from grass 6.4.3 to 6.4.4 is more in the realm of > possibilities, so we'll need to look into backporting the wxPython 3.0 > changes to that. > > Kind Regards, > > Bas > > -- > GPG Key ID: 4096R/E88D4AF1 > Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1 > > ___ > Pkg-grass-devel mailing list > Pkg-grass-devel@lists.alioth.debian.org > http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel > -- http://fam-tille.de ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Re: RFS: spatialite-tools/4.2.0-1~exp1
Hi Bas, I noticed the availability of spatialite in experimental this afternoon and I'm about to upload tonight. Thanks for the ping anyway. On Thu, Aug 07, 2014 at 06:39:17PM +0200, Sebastiaan Couwenberg wrote: > Hi Andreas, > > Can you sponsor the upload for spatialite-tools now that its spatialite > 4.2.0 dependency is accepted by the ftp-masters? > > Kind Regards, > > Bas > > -- > GPG Key ID: 4096R/E88D4AF1 > Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1 > > -- http://fam-tille.de ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Re: [grass] 01/01: urgency back to low
Hi, On Fri, Aug 08, 2014 at 07:25:24AM +, Hamish Bowman wrote: > urgency back to low Any reason to switch back from default urgency which is "medium"? Kind regards Andreas. > --- a/debian/changelog > +++ b/debian/changelog > @@ -1,4 +1,4 @@ > -grass (6.4.4-1) UNRELEASED; urgency=medium > +grass (6.4.4-1) UNRELEASED; urgency=low > >[ M. Hamish Bowman ] >* Packaged new upstream version, drop redundant patches. > -- http://fam-tille.de ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#757308: grass: Please update to use wxpython3.0
Hi Olly, On Mon, Aug 11, 2014 at 08:07:09AM +0100, Olly Betts wrote: > On Thu, Aug 07, 2014 at 03:46:15PM +0200, Andreas Tille wrote: > > just a metacomment: Due to the wxPython issue several packages get RC > > bugs filed which in several cases leads to the fact that these are > > simply removed from testing and either create a lot of work or will be > > lost for the Jessie release. > > All the bugs I've filed for the wxpython3.0 transition are currently > severity important (as recommended here: > https://wiki.debian.org/Teams/ReleaseTeam/Transitions), which means > none are RC. Ahh, sorry. I considered them RC as well. > I've just looked through the packages which have been auto-removed so > far, and most of these bugs have had no response from the maintainer > (even when I've included a patch - e.g. #749870 and #751552), or the > maintainer has explicitly been OK with the package being removed from > testing. Uhmmm, good we talked about this. I think time is ripe to team hijack ctsim. Kevin M. Rosenberg is MIA / unresponsive regarding Debian Med team maintenance offers since a long time. So he was warned. I'll care about ctsim (#751552) in the next couple of days. > It seems to me the big issue here is really that we have a lot of > maintainers who don't respond to bugs in their packages. I perfectly agree that this is the most frustrating issue for migrations. > I'm intending to do a pass over the packages which are still using > wxwidgets2.8 and try to get as many as possible moved over. My aim > here is to migrate Debian to wxwidgets3.0 rather than to remove any > package that stands in the way of removing wxwidgets2.8. Thanks for your intense work on this. That's really welcome. > If you're alluding to #750910 particularly, the issue there was that > there's a significantly newer upstream version, and so trying to port > the current package to wx3 seemed a bad approach. You'd indicated > that the maintainers were going to look at updating, so I left it at > that. I did not had this particular bug in mind (even if we need to care for it in Debian Med team - to bad that the people who touched the package before did not responded yet). When I wrote my last mail I had this problem of gnumed-client[1] in mind. > > IMHO this is bad timing to get a predependency for several > > applications removed quite close to a release date. > > I left wxpython3.0 until later because it released a few months after > wxwidgets3.0, and I expect fewer problems (e.g. the Unicode handling > changes cause FTBFS for some C++ applications, but aren't a problem > for Python apps). The packages I've looked at so far seem to mostly > bear this out. > > I would certainly rather have started the wxpython3.0 work sooner, but > I'm the only active wx maintainer in recent times (though Gianfranco > Costamagna has started to get involved recently), and I've been busy > with the wxwidgets3.0 transition - there's only so much I can do at > once. That's fine. I hope my mail was not sounding to frustrated (I guess you get a lot of unfriendly response and I did not wanted to add to this set, really). Your work id really appreciated. May be you could ask for some help on wxpython3.0 on some relevant lists to also get this one in right in time? > But that's also the reason why we need to try to eliminate wxwidgets2.8 > from jessie - I just don't have the time to maintain packages of such > a large upstream project which the upstream maintainers are no longer > interested in. +1 > Nobody else in Debian seems interested in actually > helping to maintain 2.8, and the alternative is to have unmaintained > packages of such a large, complex and widely used piece of software. Luckily I managed to upload treeviewx yesterday and I will have a look into ctsim and sitplus soon. Hope this will help your effort. Kind regards Andreas. [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=707341#36 -- http://fam-tille.de ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mkgmap] 01/04: Fixed watch file to detect new upstream versions
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository mkgmap. commit dff7e46fead850e18781b1b84ac811c57b16681c Author: Andreas Tille Date: Wed Aug 13 22:16:15 2014 +0200 Fixed watch file to detect new upstream versions --- debian/changelog | 6 ++ debian/watch | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index dd6d8e3..5d74853 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mkgmap (0.0.0+svn3226-1) UNRELEASED; urgency=medium + + * New upstream version + + -- Andreas Tille Thu, 24 Apr 2014 16:29:08 +0200 + mkgmap (0.0.0+svn2981-1) unstable; urgency=low * New upstream version diff --git a/debian/watch b/debian/watch index b3ebd2c..8374cec 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=3 -opts="dversionmangle=s/0.0.0.svn//" \ -http://www.mkgmap.org.uk/download/mkgmap-r([\d]+)-src\.zip +opts="dversionmangle=s/0.0.0.svn//,downloadurlmangle=s/\.zip/-src.tar.gz/,filenamemangle=s/\/download\/mkgmap-r([\d]+)\.zip/mkgmap-r$1-src.tar.gz/" \ +http://www.mkgmap.org.uk/download/mkgmap-r([\d]+).zip -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.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
[mkgmap] 04/04: Merge tag 'upstream/3333'
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository mkgmap. commit e2de8d32b944244e04e09003b988aa9594b515d6 Merge: 1dd97db 98bd598 Author: Andreas Tille Date: Wed Aug 13 22:19:04 2014 +0200 Merge tag 'upstream/' Upstream version .idea/codeStyleSettings.xml| 1 - .idea/copyright/profiles_settings.xml | 4 +- .idea/inspectionProfiles/Mapping.xml |72 +- .idea/runConfigurations/mkgmap.xml | 2 +- doc/options.txt|34 +- doc/resources/asciidoc/local-docbook45.conf|28 +- doc/resources/docbook-xsl/fo.xsl |22 +- doc/resources/make.param |12 +- doc/styles/Makefile| 8 +- doc/styles/about.txt | 2 +- doc/styles/creating.txt|58 +- doc/styles/internal-tags.txt | 135 + doc/styles/main.txt| 2 +- doc/styles/rules-filters.txt |32 +- doc/styles/rules.txt | 257 +- doc/styles/style-manual.txt| 2 +- doc/typ-compiler.txt |18 +- extra/src/uk/me/parabola/util/CollationRules.java | 437 + ivy.xml|10 +- mkgmap.iml |34 +- resources/chars/ascii/rowff.trans | 2 +- resources/chars/latin1/rowff.trans | 2 +- resources/help/en/options |24 +- resources/installer/installer_template.nsi |11 +- resources/mkgmap-version.properties| 4 +- resources/sort/README |56 + resources/sort/cp0.txt |81 + resources/sort/cp1250.txt | 200 +- resources/sort/cp1251.txt | 312 +- resources/sort/cp1252.txt | 275 +- resources/sort/cp1253.txt | 142 + resources/sort/cp1254.txt | 133 + resources/sort/cp1255.txt | 158 + resources/sort/cp1256.txt | 282 +- resources/sort/cp1257.txt | 129 + resources/sort/cp1258.txt | 134 + resources/sort/cp65001.txt | 11135 +++ resources/styles/default/inc/access|92 +- resources/styles/default/inc/access_country|22 + resources/styles/default/inc/address |22 +- resources/styles/default/inc/name |11 + resources/styles/default/lines |16 +- resources/styles/default/points| 4 +- resources/styles/default/polygons |10 +- resources/styles/default/relations | 2 +- scripts/download/buildwatch|19 - scripts/download/mkdoc | 3 +- scripts/download/mksnap|12 +- scripts/download/mksnapbranches| 3 +- scripts/download/mksnapindex | 110 - scripts/download/nightly |11 + scripts/download/post-commit-svn-redis | 8 + scripts/download/pre-commit-crlf |22 + scripts/download/skel-bot |45 - scripts/download/skel-top |47 - src/uk/me/parabola/imgfmt/MapFailedException.java |19 +- src/uk/me/parabola/imgfmt/Utils.java | 101 + src/uk/me/parabola/imgfmt/app/Area.java|73 +- .../parabola/imgfmt/app/BufferedImgFileWriter.java | 4 +- src/uk/me/parabola/imgfmt/app/Coord.java | 589 +- src/uk/me/parabola/imgfmt/app/CoordNode.java |13 +- src/uk/me/parabola/imgfmt/app/Label.java |45 +- .../imgfmt/app/labelenc/AnyCharsetEncoder.java | 9 +- .../parabola/imgfmt/app/labelenc/BaseEncoder.java | 4 +- .../imgfmt/app/labelenc/CodeFunctions.java |22 +- .../parabola/imgfmt/app/labelenc/EncodedText.java |26 +- .../imgfmt/app/labelenc/Format6Encoder.java| 8 +- .../imgfmt/app/labelenc/Simple8Encoder.java|30 - .../parabola/imgfmt/app/labelenc/Utf8Encoder.java |11 +- src/uk/me/parabola/imgfmt/app/lbl/City.java| 4 + src/uk/me/parabola/imgfmt/app/lbl/LBLFile.java | 4 +- .../me/parabola/imgfmt/app/lbl/LBLFileReader.java |19 +- src/uk/me/parabola/imgfmt/app/lbl/PlacesFile.java |46 +- src/uk/me/parabola/imgfmt/app/mdr/MDRFile.java |14 +-
[mkgmap] 02/02: Remove wrongly versioned pristine-tar
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch pristine-tar in repository mkgmap. commit dd15891828302d696235b7138fc4a3d8a2c03872 Author: Andreas Tille Date: Wed Aug 13 22:21:02 2014 +0200 Remove wrongly versioned pristine-tar --- mkgmap_.orig.tar.gz.delta | Bin 45131 -> 0 bytes mkgmap_.orig.tar.gz.id| 1 - 2 files changed, 1 deletion(-) diff --git a/mkgmap_.orig.tar.gz.delta b/mkgmap_.orig.tar.gz.delta deleted file mode 100644 index 3b1a857..000 Binary files a/mkgmap_.orig.tar.gz.delta and /dev/null differ diff --git a/mkgmap_.orig.tar.gz.id b/mkgmap_.orig.tar.gz.id deleted file mode 100644 index e4c2eb9..000 --- a/mkgmap_.orig.tar.gz.id +++ /dev/null @@ -1 +0,0 @@ -7bc7c504af5167751040937d086409916c384056 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.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
[mkgmap] 01/02: pristine-tar data for mkgmap_3333.orig.tar.gz
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch pristine-tar in repository mkgmap. commit 17c3d1642da670ba7c4bdef491276ff48e9e7800 Author: Andreas Tille Date: Wed Aug 13 22:19:03 2014 +0200 pristine-tar data for mkgmap_.orig.tar.gz --- mkgmap_.orig.tar.gz.delta | Bin 0 -> 45131 bytes mkgmap_.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/mkgmap_.orig.tar.gz.delta b/mkgmap_.orig.tar.gz.delta new file mode 100644 index 000..3b1a857 Binary files /dev/null and b/mkgmap_.orig.tar.gz.delta differ diff --git a/mkgmap_.orig.tar.gz.id b/mkgmap_.orig.tar.gz.id new file mode 100644 index 000..e4c2eb9 --- /dev/null +++ b/mkgmap_.orig.tar.gz.id @@ -0,0 +1 @@ +7bc7c504af5167751040937d086409916c384056 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.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
[mkgmap] branch master updated (f076ebd -> e2de8d3)
This is an automated email from the git hooks/post-receive script. tille pushed a change to branch master in repository mkgmap. from f076ebd The "new upstream available bug" is actually not fixed since there is a newer upstream, but the "does not work bugs" are solved with this upload new dff7e46 Fixed watch file to detect new upstream versions new 1dd97db Add debian/classpath to fix classpath in MANIFEST.MF of mkgmap.jar (Manfred Stock ) new 98bd598 Imported Upstream version new e2de8d3 Merge tag 'upstream/' 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: .idea/codeStyleSettings.xml| 1 - .idea/copyright/profiles_settings.xml | 4 +- .idea/inspectionProfiles/Mapping.xml |72 +- .idea/runConfigurations/mkgmap.xml | 2 +- debian/changelog | 9 + debian/classpath | 1 + debian/watch | 4 +- doc/options.txt|34 +- doc/resources/asciidoc/local-docbook45.conf|28 +- doc/resources/docbook-xsl/fo.xsl |22 +- doc/resources/make.param |12 +- doc/styles/Makefile| 8 +- doc/styles/about.txt | 2 +- doc/styles/creating.txt|58 +- doc/styles/internal-tags.txt | 135 + doc/styles/main.txt| 2 +- doc/styles/rules-filters.txt |32 +- doc/styles/rules.txt | 257 +- doc/styles/style-manual.txt| 2 +- doc/typ-compiler.txt |18 +- extra/src/uk/me/parabola/util/CollationRules.java | 437 + ivy.xml|10 +- mkgmap.iml |34 +- resources/chars/ascii/rowff.trans | 2 +- resources/chars/latin1/rowff.trans | 2 +- resources/help/en/options |24 +- resources/installer/installer_template.nsi |11 +- resources/mkgmap-version.properties| 4 +- resources/sort/README |56 + resources/sort/cp0.txt |81 + resources/sort/cp1250.txt | 200 +- resources/sort/cp1251.txt | 312 +- resources/sort/cp1252.txt | 275 +- resources/sort/cp1253.txt | 142 + resources/sort/cp1254.txt | 133 + resources/sort/cp1255.txt | 158 + resources/sort/cp1256.txt | 282 +- resources/sort/cp1257.txt | 129 + resources/sort/cp1258.txt | 134 + resources/sort/cp65001.txt | 11135 +++ resources/styles/default/inc/access|92 +- resources/styles/default/inc/access_country|22 + resources/styles/default/inc/address |22 +- resources/styles/default/inc/name |11 + resources/styles/default/lines |16 +- resources/styles/default/points| 4 +- resources/styles/default/polygons |10 +- resources/styles/default/relations | 2 +- scripts/download/buildwatch|19 - scripts/download/mkdoc | 3 +- scripts/download/mksnap|12 +- scripts/download/mksnapbranches| 3 +- scripts/download/mksnapindex | 110 - scripts/download/nightly |11 + scripts/download/post-commit-svn-redis | 8 + scripts/download/pre-commit-crlf |22 + scripts/download/skel-bot |45 - scripts/download/skel-top |47 - src/uk/me/parabola/imgfmt/MapFailedException.java |19 +- src/uk/me/parabola/imgfmt/Utils.java | 101 + src/uk/me/parabola/imgfmt/app/Area.java|73 +- .../parabola/imgfmt/app/BufferedImgFileWriter.java | 4 +- src/uk/me/parabola/imgfmt/app/Coord.java | 589 +- src/uk/me/parabola/imgfmt/app/CoordNode.java |13 +- src/uk/me/parabola/imgfmt/app/Label.java |45 +- .../imgfmt/app/labelenc/A
[mkgmap] branch pristine-tar updated (9be2d93 -> dd15891)
This is an automated email from the git hooks/post-receive script. tille pushed a change to branch pristine-tar in repository mkgmap. from 9be2d93 pristine-tar data for mkgmap_0.0.0+svn2981.orig.tar.xz new 17c3d16 pristine-tar data for mkgmap_.orig.tar.gz new dd15891 Remove wrongly versioned pristine-tar 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: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.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
[mkgmap] 02/04: Add debian/classpath to fix classpath in MANIFEST.MF of mkgmap.jar (Manfred Stock )
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository mkgmap. commit 1dd97db6e36ce2da9b313d108ecd9144257fac3e Author: Andreas Tille Date: Wed Aug 13 22:18:20 2014 +0200 Add debian/classpath to fix classpath in MANIFEST.MF of mkgmap.jar (Manfred Stock ) --- debian/changelog | 5 - debian/classpath | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5d74853..16c6853 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ mkgmap (0.0.0+svn3226-1) UNRELEASED; urgency=medium * New upstream version + * add debian/classpath (thanks for the patch to Manfred Stock +) +Closes: #741596 - -- Andreas Tille Thu, 24 Apr 2014 16:29:08 +0200 + -- Andreas Tille Wed, 13 Aug 2014 22:13:41 +0200 mkgmap (0.0.0+svn2981-1) unstable; urgency=low diff --git a/debian/classpath b/debian/classpath new file mode 100644 index 000..84aeb75 --- /dev/null +++ b/debian/classpath @@ -0,0 +1 @@ +usr/share/mkgmap/mkgmap.jar /usr/share/java/fastutil.jar /usr/share/java/protobuf.jar /usr/share/java/osmpbf.jar -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.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
[mkgmap] branch upstream updated (deb0c79 -> 98bd598)
This is an automated email from the git hooks/post-receive script. tille pushed a change to branch upstream in repository mkgmap. from deb0c79 Imported Upstream version 0.0.0+svn2981 new 98bd598 Imported Upstream version 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: .idea/codeStyleSettings.xml| 1 - .idea/copyright/profiles_settings.xml | 4 +- .idea/inspectionProfiles/Mapping.xml |72 +- .idea/runConfigurations/mkgmap.xml | 2 +- doc/options.txt|34 +- doc/resources/asciidoc/local-docbook45.conf|28 +- doc/resources/docbook-xsl/fo.xsl |22 +- doc/resources/make.param |12 +- doc/styles/Makefile| 8 +- doc/styles/about.txt | 2 +- doc/styles/creating.txt|58 +- doc/styles/internal-tags.txt | 135 + doc/styles/main.txt| 2 +- doc/styles/rules-filters.txt |32 +- doc/styles/rules.txt | 257 +- doc/styles/style-manual.txt| 2 +- doc/typ-compiler.txt |18 +- extra/src/uk/me/parabola/util/CollationRules.java | 437 + ivy.xml|10 +- mkgmap.iml |34 +- resources/chars/ascii/rowff.trans | 2 +- resources/chars/latin1/rowff.trans | 2 +- resources/help/en/options |24 +- resources/installer/installer_template.nsi |11 +- resources/mkgmap-version.properties| 4 +- resources/sort/README |56 + resources/sort/cp0.txt |81 + resources/sort/cp1250.txt | 200 +- resources/sort/cp1251.txt | 312 +- resources/sort/cp1252.txt | 275 +- resources/sort/cp1253.txt | 142 + resources/sort/cp1254.txt | 133 + resources/sort/cp1255.txt | 158 + resources/sort/cp1256.txt | 282 +- resources/sort/cp1257.txt | 129 + resources/sort/cp1258.txt | 134 + resources/sort/cp65001.txt | 11135 +++ resources/styles/default/inc/access|92 +- resources/styles/default/inc/access_country|22 + resources/styles/default/inc/address |22 +- resources/styles/default/inc/name |11 + resources/styles/default/lines |16 +- resources/styles/default/points| 4 +- resources/styles/default/polygons |10 +- resources/styles/default/relations | 2 +- scripts/download/buildwatch|19 - scripts/download/mkdoc | 3 +- scripts/download/mksnap|12 +- scripts/download/mksnapbranches| 3 +- scripts/download/mksnapindex | 110 - scripts/download/nightly |11 + scripts/download/post-commit-svn-redis | 8 + scripts/download/pre-commit-crlf |22 + scripts/download/skel-bot |45 - scripts/download/skel-top |47 - src/uk/me/parabola/imgfmt/MapFailedException.java |19 +- src/uk/me/parabola/imgfmt/Utils.java | 101 + src/uk/me/parabola/imgfmt/app/Area.java|73 +- .../parabola/imgfmt/app/BufferedImgFileWriter.java | 4 +- src/uk/me/parabola/imgfmt/app/Coord.java | 589 +- src/uk/me/parabola/imgfmt/app/CoordNode.java |13 +- src/uk/me/parabola/imgfmt/app/Label.java |45 +- .../imgfmt/app/labelenc/AnyCharsetEncoder.java | 9 +- .../parabola/imgfmt/app/labelenc/BaseEncoder.java | 4 +- .../imgfmt/app/labelenc/CodeFunctions.java |22 +- .../parabola/imgfmt/app/labelenc/EncodedText.java |26 +- .../imgfmt/app/labelenc/Format6Encoder.java| 8 +- .../imgfmt/app/labelenc/Simple8Encoder.java|30 - .../parabola/imgfmt/app/labelenc/Utf8Encoder.java |11 +- src/uk/me/parabola/imgfmt/app/lbl/City.java| 4 + src/uk/me/parabola/imgfmt/app/lbl/LBLFile.java | 4 +- .../me
[mkgmap] branch master updated (e2de8d3 -> 10dae0c)
This is an automated email from the git hooks/post-receive script. tille pushed a change to branch master in repository mkgmap. from e2de8d3 Merge tag 'upstream/' new 2082d6a Imported Upstream version 0.0.0+svn new 10dae0c Merge tag 'upstream/0.0.0+svn' 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: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.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
[mkgmap] 01/02: Imported Upstream version 0.0.0+svn3333
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository mkgmap. commit 2082d6a548feae6f4c11fda9f2cd8f44c1de4fa3 Author: Andreas Tille Date: Wed Aug 13 22:22:13 2014 +0200 Imported Upstream version 0.0.0+svn -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.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
[mkgmap] 02/02: Merge tag 'upstream/0.0.0+svn3333'
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository mkgmap. commit 10dae0c61c98313f700dfb18c262c081710b2527 Merge: e2de8d3 2082d6a Author: Andreas Tille Date: Wed Aug 13 22:22:14 2014 +0200 Merge tag 'upstream/0.0.0+svn' Upstream version 0.0.0+svn -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.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
[mkgmap] branch pristine-tar updated (dd15891 -> a9e1f46)
This is an automated email from the git hooks/post-receive script. tille pushed a change to branch pristine-tar in repository mkgmap. from dd15891 Remove wrongly versioned pristine-tar new a9e1f46 pristine-tar data for mkgmap_0.0.0+svn.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: mkgmap_0.0.0+svn.orig.tar.gz.delta | Bin 0 -> 44911 bytes mkgmap_0.0.0+svn.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 mkgmap_0.0.0+svn.orig.tar.gz.delta create mode 100644 mkgmap_0.0.0+svn.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.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
[mkgmap] branch upstream updated (98bd598 -> 2082d6a)
This is an automated email from the git hooks/post-receive script. tille pushed a change to branch upstream in repository mkgmap. from 98bd598 Imported Upstream version new 2082d6a Imported Upstream version 0.0.0+svn 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: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.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
[mkgmap] 01/01: pristine-tar data for mkgmap_0.0.0+svn3333.orig.tar.gz
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch pristine-tar in repository mkgmap. commit a9e1f46b55cf019f3b0b84a75bbc2c61d8de5f6d Author: Andreas Tille Date: Wed Aug 13 22:22:14 2014 +0200 pristine-tar data for mkgmap_0.0.0+svn.orig.tar.gz --- mkgmap_0.0.0+svn.orig.tar.gz.delta | Bin 0 -> 44911 bytes mkgmap_0.0.0+svn.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/mkgmap_0.0.0+svn.orig.tar.gz.delta b/mkgmap_0.0.0+svn.orig.tar.gz.delta new file mode 100644 index 000..e693632 Binary files /dev/null and b/mkgmap_0.0.0+svn.orig.tar.gz.delta differ diff --git a/mkgmap_0.0.0+svn.orig.tar.gz.id b/mkgmap_0.0.0+svn.orig.tar.gz.id new file mode 100644 index 000..e4c2eb9 --- /dev/null +++ b/mkgmap_0.0.0+svn.orig.tar.gz.id @@ -0,0 +1 @@ +7bc7c504af5167751040937d086409916c384056 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.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
[mkgmap] branch master updated (10dae0c -> 215a969)
This is an automated email from the git hooks/post-receive script. tille pushed a change to branch master in repository mkgmap. from 10dae0c Merge tag 'upstream/0.0.0+svn' new a46abe2 DEP5 new 215a969 Make java8-compatibility.patch apply to this upstream version 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 | 4 +- debian/copyright | 59 - debian/patches/java8-compatibility.patch | 76 debian/patches/series| 1 + 4 files changed, 107 insertions(+), 33 deletions(-) create mode 100644 debian/patches/java8-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.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
[mkgmap] 01/02: DEP5
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository mkgmap. commit a46abe2faebf50d88990363889cc104af177db48 Author: Andreas Tille Date: Wed Aug 13 22:29:09 2014 +0200 DEP5 --- debian/changelog | 3 ++- debian/copyright | 59 ++-- 2 files changed, 29 insertions(+), 33 deletions(-) diff --git a/debian/changelog b/debian/changelog index 16c6853..a478ba5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -mkgmap (0.0.0+svn3226-1) UNRELEASED; urgency=medium +mkgmap (0.0.0+svn-1) UNRELEASED; urgency=medium * New upstream version * add debian/classpath (thanks for the patch to Manfred Stock ) Closes: #741596 + * d/copyright: DEP5 -- Andreas Tille Wed, 13 Aug 2014 22:13:41 +0200 diff --git a/debian/copyright b/debian/copyright index e48f54b..07acbf7 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,43 +1,38 @@ -This package was debianized by Andreas Putzo on -Sun, 13 Apr 2008 19:29:58 +. - -It was downloaded from http://www.mkgmap.org.uk/snapshots/ - -Upstream Author: - -Steve Ratcliffe - -Copyright: - -Copyright (C) 2007-2009 Steve Ratcliffe - -License: - +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: mkgmap +Source: http://www.mkgmap.org.uk/download/ + +Files: * +Copyright: © 2007-2014 Steve Ratcliffe +License: GPL-2+ + +Files: src/uk/me/parabola/mkgmap/general/MapPointMultimap.java + src/uk/me/parabola/mkgmap/general/MapPointFastFindMap.java + src/uk/me/parabola/mkgmap/build/LocatorConfig.java + src/uk/me/parabola/mkgmap/build/Locator.java +Copyright: 2009 Bernhard Heibler +License: GPL-2+ + +Files: debian/* +Copyright: 2008 Andreas Putzo + 2009 Francesco Paolo Lovergine + 2014 Andreas Tille +License: GPL-2+ + +License: GPL-2+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as published by the Free Software Foundation. - + . This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + . You should have received a copy of the GNU General Public License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + . + On Debian systems, the complete text of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL-2'. -On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL-2'. - - -The files: - src/uk/me/parabola/mkgmap/general/MapPointMultimap.java, - src/uk/me/parabola/mkgmap/general/MapPointFastFindMap.java, - src/uk/me/parabola/mkgmap/build/LocatorConfig.java, - src/uk/me/parabola/mkgmap/build/Locator.java, -are Copyright (C) 2009 Bernhard Heibler and -are licensed under the GPL version 2, see above. - - -The Debian packaging is (C) 2008,2009, Andreas Putzo and -is licensed under the GPL version 2, see above. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.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
[mkgmap] 02/02: Make java8-compatibility.patch apply to this upstream version
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository mkgmap. commit 215a9697acb349314a143391abad3eafa26e3c82 Author: Andreas Tille Date: Wed Aug 13 22:38:19 2014 +0200 Make java8-compatibility.patch apply to this upstream version --- debian/changelog | 1 + debian/patches/java8-compatibility.patch | 76 debian/patches/series| 1 + 3 files changed, 78 insertions(+) diff --git a/debian/changelog b/debian/changelog index a478ba5..aac852f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ mkgmap (0.0.0+svn-1) UNRELEASED; urgency=medium ) Closes: #741596 * d/copyright: DEP5 + * TODO: Make java8-compatibility.patch apply to this upstream version -- Andreas Tille Wed, 13 Aug 2014 22:13:41 +0200 diff --git a/debian/patches/java8-compatibility.patch b/debian/patches/java8-compatibility.patch new file mode 100644 index 000..eeb0236 --- /dev/null +++ b/debian/patches/java8-compatibility.patch @@ -0,0 +1,76 @@ +Note: Does not apply to latest upstream +Description: Rename the MultiHashMap and MultiIdentityHashMap remove(K, V) methods + to avoid a conflict with the new Map.remove(Object, Object) method introduced in Java 8 +Author: Emmanuel Bourg +Forwarded: no +Bug-Debian: https://bugs.debian.org/745097 +--- a/src/uk/me/parabola/mkgmap/osmstyle/RoadMerger.java b/src/uk/me/parabola/mkgmap/osmstyle/RoadMerger.java +@@ -458,9 +458,9 @@ + Coord mergePoint = points2.get(0); + Coord endPoint= points2.get(points2.size()-1); + +- startPoints.remove(mergePoint, road2); +- endPoints.remove(endPoint, road2); +- endPoints.remove(mergePoint, road1); ++ startPoints.removeKeyValue(mergePoint, road2); ++ endPoints.removeKeyValue(endPoint, road2); ++ endPoints.removeKeyValue(mergePoint, road1); + + points1.addAll(points2.subList(1, points2.size())); + endPoints.add(endPoint, road1); +--- a/src/uk/me/parabola/util/MultiIdentityHashMap.java b/src/uk/me/parabola/util/MultiIdentityHashMap.java +@@ -54,7 +54,7 @@ + return ( results ? value : null ); + } + +- public V remove(K key, V value ) ++ public V removeKeyValue(K key, V value ) + { + + List values = super.get(key); +--- a/src/uk/me/parabola/mkgmap/filters/LineMergeFilter.java b/src/uk/me/parabola/mkgmap/filters/LineMergeFilter.java +@@ -29,9 +29,9 @@ + // Merges the points in the second one + List points1 = line1.getPoints(); + List points2 = line2.getPoints(); +- startPoints.remove(points1.get(0), line1); +- endPoints.remove(points1.get(points1.size()-1), line1); +- startPoints.remove(points2.get(0), line2); ++ startPoints.removeKeyValue(points1.get(0), line1); ++ endPoints.removeKeyValue(points1.get(points1.size()-1), line1); ++ startPoints.removeKeyValue(points2.get(0), line2); + startPoints.add(points1.get(0), line2); + line2.insertPointsAtStart(points1); + linesMerged.remove(line1); +@@ -40,7 +40,7 @@ + private void addPointsAtStart(MapLine line, List additionalPoints) { + log.info("merged lines before " + line.getName()); + List points = line.getPoints(); +- startPoints.remove(points.get(0), line); ++ startPoints.removeKeyValue(points.get(0), line); + line.insertPointsAtStart(additionalPoints); + startPoints.add(points.get(0), line); + } +@@ -48,7 +48,7 @@ + private void addPointsAtEnd(MapLine line, List additionalPoints) { + log.info("merged lines after " + line.getName()); + List points = line.getPoints(); +- endPoints.remove(points.get(points.size()-1), line); ++ endPoints.removeKeyValue(points.get(points.size()-1), line); + line.insertPointsAtEnd(additionalPoints); + endPoints.add(points.get(points.size()-1), line); + } +--- a/src/uk/me/parabola/util/MultiHashMap.java b/src/uk/me/parabola/util/MultiHashMap.java +@@ -54,7 +54,7 @@ + return ( results ? value : null ); + } + +- public V remove(K key, V value ) ++ public V removeKeyValue(K key, V value ) + { + + List values = super.get(key); diff --git a/debian/patches/series b/debian/patches/series index 46a7f4e..0e645a8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ build_xml.patch +java8-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.git __
Re: Bug#745097: mkgmap: FTBFS with Java 8: name clash: remove(K, V) in MultiHashMap and remove(Object, Object) in HashMap have the same erasure
Hi Emmanuel, I intend to upload the latest upstream. Since your patch does not apply to the latest upstream I wonder whether you would be so kind to update ist ... preferably straight in Git (any DD has commit permissions in Debian GIS). Lintian is also claiming W: mkgmap: incompatible-java-bytecode-format Java7 version (Class format: 51) If you could add a fix for this as well I'd be really happy. Many thanks for your kind help Andreas. On Fri, Aug 08, 2014 at 05:58:29PM +0200, Emmanuel Bourg wrote: > Control: tags -1 patch > > Here is a patch fixing this issue. It renames the remove(K, V) methods > in MultiHashMap and MultiIdentityHashMap which are conflicting with the > new Map.remove(Object, Object) method introduced in Java 8. > > Description: Rename the MultiHashMap and MultiIdentityHashMap remove(K, V) > methods > to avoid a conflict with the new Map.remove(Object, Object) method > introduced in Java 8 > Author: Emmanuel Bourg > Forwarded: no > Bug-Debian: https://bugs.debian.org/745097 > --- a/src/uk/me/parabola/mkgmap/osmstyle/RoadMerger.java > +++ b/src/uk/me/parabola/mkgmap/osmstyle/RoadMerger.java > @@ -458,9 +458,9 @@ > Coord mergePoint = points2.get(0); > Coord endPoint= points2.get(points2.size()-1); > > - startPoints.remove(mergePoint, road2); > - endPoints.remove(endPoint, road2); > - endPoints.remove(mergePoint, road1); > + startPoints.removeKeyValue(mergePoint, road2); > + endPoints.removeKeyValue(endPoint, road2); > + endPoints.removeKeyValue(mergePoint, road1); > > points1.addAll(points2.subList(1, points2.size())); > endPoints.add(endPoint, road1); > --- a/src/uk/me/parabola/util/MultiIdentityHashMap.java > +++ b/src/uk/me/parabola/util/MultiIdentityHashMap.java > @@ -54,7 +54,7 @@ > return ( results ? value : null ); > } > > - public V remove(K key, V value ) > + public V removeKeyValue(K key, V value ) > { > > List values = super.get(key); > --- a/src/uk/me/parabola/mkgmap/filters/LineMergeFilter.java > +++ b/src/uk/me/parabola/mkgmap/filters/LineMergeFilter.java > @@ -29,9 +29,9 @@ > // Merges the points in the second one > List points1 = line1.getPoints(); > List points2 = line2.getPoints(); > - startPoints.remove(points1.get(0), line1); > - endPoints.remove(points1.get(points1.size()-1), line1); > - startPoints.remove(points2.get(0), line2); > + startPoints.removeKeyValue(points1.get(0), line1); > + endPoints.removeKeyValue(points1.get(points1.size()-1), line1); > + startPoints.removeKeyValue(points2.get(0), line2); > startPoints.add(points1.get(0), line2); > line2.insertPointsAtStart(points1); > linesMerged.remove(line1); > @@ -40,7 +40,7 @@ > private void addPointsAtStart(MapLine line, List > additionalPoints) { > log.info("merged lines before " + line.getName()); > List points = line.getPoints(); > - startPoints.remove(points.get(0), line); > + startPoints.removeKeyValue(points.get(0), line); > line.insertPointsAtStart(additionalPoints); > startPoints.add(points.get(0), line); > } > @@ -48,7 +48,7 @@ > private void addPointsAtEnd(MapLine line, List additionalPoints) > { > log.info("merged lines after " + line.getName()); > List points = line.getPoints(); > - endPoints.remove(points.get(points.size()-1), line); > + endPoints.removeKeyValue(points.get(points.size()-1), line); > line.insertPointsAtEnd(additionalPoints); > endPoints.add(points.get(points.size()-1), line); > } > --- a/src/uk/me/parabola/util/MultiHashMap.java > +++ b/src/uk/me/parabola/util/MultiHashMap.java > @@ -54,7 +54,7 @@ > return ( results ? value : null ); > } > > - public V remove(K key, V value ) > + public V removeKeyValue(K key, V value ) > { > > List values = super.get(key); > ___ > Pkg-grass-devel mailing list > Pkg-grass-devel@lists.alioth.debian.org > http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel -- http://fam-tille.de ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#741596: mkgmap crashes: java.lang.NoClassDefFoundError: it/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap
Hi Manfred, thanks a lot. Patch works. I'll just wait with an upload until #745097 is sorted out since the patch does not apply to the new upstream version I just commited to Git. Kind regards Andreas. On Sun, Jun 15, 2014 at 05:52:06PM +0200, Manfred Stock wrote: > Package: mkgmap > Version: 0.0.0+svn2981-1 > Followup-For: Bug #741596 > > Hi, > > I took another look at this issue, and I think the easiest solution to this is > to add a debian/classpath file like the one in the attached patch. This > injects > the correct Class-Path to the mkgmap.jar file which makes it work with the > mkgmap script and also results in jh_depends finding and adding the correct > dependencies to the package. > > Best regards > Manfred > > -- System Information: > Debian Release: jessie/sid > APT prefers unstable > APT policy: (500, 'unstable') > Architecture: amd64 (x86_64) > > Kernel: Linux 3.2.0-4-amd64 (SMP w/4 CPU cores) > Locale: LANG=de_CH.utf8, LC_CTYPE=de_CH.utf8 (charmap=UTF-8) > Shell: /bin/sh linked to /bin/dash > > Versions of packages mkgmap depends on: > ii ant1.9.4-1 > ii default-jre2:1.7-52 > ii openjdk-7-jre 7u55-2.4.7-2 > > mkgmap recommends no packages. > > Versions of packages mkgmap suggests: > pn josm > pn qlandkarte > > -- no debconf information > >From eb948a0570a23cd321df8943c0ce48be351935ed Mon Sep 17 00:00:00 2001 > From: Manfred Stock > Date: Sun, 15 Jun 2014 17:31:54 +0200 > Subject: [PATCH] Add debian/classpath to fix classpath in MANIFEST.MF of > mkgmap.jar > > This should fix #741596 by adding the correct classpath to mkgmap.jar and > thus also fixing the dependency resolution using jh_depends. > --- > debian/classpath | 1 + > 1 file changed, 1 insertion(+) > create mode 100644 debian/classpath > > diff --git a/debian/classpath b/debian/classpath > new file mode 100644 > index 000..84aeb75 > --- /dev/null > +++ b/debian/classpath > @@ -0,0 +1 @@ > +usr/share/mkgmap/mkgmap.jar /usr/share/java/fastutil.jar > /usr/share/java/protobuf.jar /usr/share/java/osmpbf.jar > -- > 2.0.0 > > ___ > Pkg-grass-devel mailing list > Pkg-grass-devel@lists.alioth.debian.org > http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel -- http://fam-tille.de ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[pyshp] tag debian/1.2.1 created (now 83275c8)
This is an automated email from the git hooks/post-receive script. tille pushed a change to tag debian/1.2.1 in repository pyshp. at 83275c8 (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/pyshp.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
[pyshp] 01/01: Priority: optional (instead of extra)
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository pyshp. commit 83275c828f454ba5d3f45261c2224ce70872875d Author: Andreas Tille Date: Wed Aug 13 22:56:03 2014 +0200 Priority: optional (instead of extra) --- debian/changelog | 4 debian/control | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c0aeaf4..f24341d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ pyshp (1.2.1-1) unstable; urgency=medium + [ Ross Gammon ] * Imported Upstream version 1.2.1 * Update to policy 3.9.5 - no changes required * Fix lintian error - canonical VCS fields @@ -7,6 +8,9 @@ pyshp (1.2.1-1) unstable; urgency=medium * Reformat debian control using Config::Model * Reformat Copyright file using Config::Model * Add gbp configuration file + + [ Andreas Tille ] + * Priority: optional (instead of extra) -- Ross Gammon Wed, 13 Aug 2014 22:20:05 +0200 diff --git a/debian/control b/debian/control index d785228..141e1aa 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Maintainer: Debian GIS Project Uploaders: David Paleino , Ross Gammon Section: python -Priority: extra +Priority: optional Build-Depends: debhelper (>= 8~), python-all, python-setuptools, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pyshp.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
[pyshp] branch master updated (9081d83 -> 83275c8)
This is an automated email from the git hooks/post-receive script. tille pushed a change to branch master in repository pyshp. from 9081d83 Set distribution to unstable new 83275c8 Priority: optional (instead of extra) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 4 debian/control | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pyshp.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
[mkgmap] 01/01: Verified that upstream has cared for Java 8 compatibility
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository mkgmap. commit 002192efc9188e279668cff249dcfcd02d6779dc Author: Andreas Tille Date: Tue Aug 19 17:40:28 2014 +0200 Verified that upstream has cared for Java 8 compatibility --- debian/changelog | 4 ++-- debian/patches/java8-compatibility.patch | 2 +- debian/patches/series| 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index aac852f..fc8cda5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -mkgmap (0.0.0+svn-1) UNRELEASED; urgency=medium +mkgmap (0.0.0+svn-1) unstable; urgency=medium * New upstream version +Closes: #745097 * add debian/classpath (thanks for the patch to Manfred Stock ) Closes: #741596 * d/copyright: DEP5 - * TODO: Make java8-compatibility.patch apply to this upstream version -- Andreas Tille Wed, 13 Aug 2014 22:13:41 +0200 diff --git a/debian/patches/java8-compatibility.patch b/debian/patches/java8-compatibility.patch index eeb0236..e4da220 100644 --- a/debian/patches/java8-compatibility.patch +++ b/debian/patches/java8-compatibility.patch @@ -1,4 +1,4 @@ -Note: Does not apply to latest upstream +Status: Upstream seems to have solved this (with some slightly different names - so patch is deactivated Description: Rename the MultiHashMap and MultiIdentityHashMap remove(K, V) methods to avoid a conflict with the new Map.remove(Object, Object) method introduced in Java 8 Author: Emmanuel Bourg diff --git a/debian/patches/series b/debian/patches/series index 0e645a8..46a7f4e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ build_xml.patch -java8-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.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
[mkgmap] annotated tag upstream/0.0.0+svn3333 created (now 95e77a9)
This is an automated email from the git hooks/post-receive script. tille pushed a change to annotated tag upstream/0.0.0+svn in repository mkgmap. at 95e77a9 (tag) tagging 2082d6a548feae6f4c11fda9f2cd8f44c1de4fa3 (commit) replaces upstream/ tagged by Andreas Tille on Wed Aug 13 22:22:14 2014 +0200 - Log - Upstream version 0.0.0+svn Andreas Tille (1): Imported Upstream version 0.0.0+svn --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.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
[mkgmap] branch master updated (215a969 -> 002192e)
This is an automated email from the git hooks/post-receive script. tille pushed a change to branch master in repository mkgmap. from 215a969 Make java8-compatibility.patch apply to this upstream version new 002192e Verified that upstream has cared for Java 8 compatibility The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 4 ++-- debian/patches/java8-compatibility.patch | 2 +- debian/patches/series| 1 - 3 files changed, 3 insertions(+), 4 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.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
[mkgmap] annotated tag upstream/3333 created (now 2d117f5)
This is an automated email from the git hooks/post-receive script. tille pushed a change to annotated tag upstream/ in repository mkgmap. at 2d117f5 (tag) tagging 98bd598c677fab18d9f9994ddf9ae6261bc45f0d (commit) replaces upstream/0.0.0+svn2981 tagged by Andreas Tille on Wed Aug 13 22:19:04 2014 +0200 - Log - Upstream version Andreas Tille (1): Imported Upstream version --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.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
[mkgmap] tag debian/0.0.0+svn3333-1 created (now 002192e)
This is an automated email from the git hooks/post-receive script. tille pushed a change to tag debian/0.0.0+svn-1 in repository mkgmap. at 002192e (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/mkgmap.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
[geographiclib] branch master updated (e1fefd8 -> 13bd7a0)
This is an automated email from the git hooks/post-receive script. tille pushed a change to branch master in repository geographiclib. from e1fefd8 Set distribution to unstable new 13bd7a0 Set distribution to UNRELEASED since we can not release with this lintian Error: The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/geographiclib.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
[geographiclib] 01/01: Imported Upstream version 1.35
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch upstream in repository geographiclib. commit 8a8ada8e2bdc629af99393115821920a76a602b3 Author: Andreas Tille Date: Mon Sep 1 09:11:13 2014 +0200 Imported Upstream version 1.35 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/geographiclib.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
[geographiclib] branch pristine-tar updated (1d49e84 -> 68253f9)
This is an automated email from the git hooks/post-receive script. tille pushed a change to branch pristine-tar in repository geographiclib. from 1d49e84 pristine-tar data for geographiclib_1.37.orig.tar.gz new 68253f9 pristine-tar data for geographiclib_1.35.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: geographiclib_1.35.orig.tar.gz.delta| Bin 0 -> 25281 bytes orig.tar.gz.id => geographiclib_1.35.orig.tar.gz.id | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 geographiclib_1.35.orig.tar.gz.delta copy geographiclib_1.37.orig.tar.gz.id => geographiclib_1.35.orig.tar.gz.id (100%) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/geographiclib.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
[geographiclib] 01/01: Set distribution to UNRELEASED since we can not release with this lintian Error:
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository geographiclib. commit 13bd7a07e0e1b46a8251fc652bc29799fec891d7 Author: Andreas Tille Date: Mon Sep 1 09:27:38 2014 +0200 Set distribution to UNRELEASED since we can not release with this lintian Error: E: geographiclib-tools: privacy-breach-logo usr/share/doc/geographiclib/scripts/geod-google-instructions.html http://sourceforge.net/sflogo.php?group_id=283628&type=9 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1e01536..f5d0431 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -geographiclib (1.35-3) unstable; urgency=medium +geographiclib (1.35-3) UNRELEASED; urgency=medium * Team upload. * Use dh-autoreconf to fix FTBFS on ppc64el. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/geographiclib.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
[geographiclib] branch upstream updated (3b594ea -> 8a8ada8)
This is an automated email from the git hooks/post-receive script. tille pushed a change to branch upstream in repository geographiclib. from 3b594ea Imported Upstream version 1.35 new 8a8ada8 Imported Upstream version 1.35 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: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/geographiclib.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
[geographiclib] 01/01: pristine-tar data for geographiclib_1.35.orig.tar.gz
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch pristine-tar in repository geographiclib. commit 68253f962f7c644df34e93cd42a055c7a9ccd3cb Author: Andreas Tille Date: Mon Sep 1 09:11:14 2014 +0200 pristine-tar data for geographiclib_1.35.orig.tar.gz --- geographiclib_1.35.orig.tar.gz.delta | Bin 0 -> 25281 bytes geographiclib_1.35.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/geographiclib_1.35.orig.tar.gz.delta b/geographiclib_1.35.orig.tar.gz.delta new file mode 100644 index 000..ab2857f Binary files /dev/null and b/geographiclib_1.35.orig.tar.gz.delta differ diff --git a/geographiclib_1.35.orig.tar.gz.id b/geographiclib_1.35.orig.tar.gz.id new file mode 100644 index 000..de4dc43 --- /dev/null +++ b/geographiclib_1.35.orig.tar.gz.id @@ -0,0 +1 @@ +505da48a1b4d71c91208ecbc0920918b5ee64144 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/geographiclib.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
Re: [geographiclib] 01/01: pristine-tar data for geographiclib_1.37.orig.tar.gz
Hi Ross, thanks for your work on geographiclib. I noticed that you created the missing pristine-tar branch but the commited upstream source did not fit the changelog version source. I just injected what I found in apt-get source geographiclib to fix this. However, since lintian found this error E: geographiclib-tools: privacy-breach-logo usr/share/doc/geographiclib/scripts/geod-google-instructions.html http://sourceforge.net/sflogo.php?group_id=283628&type=9 I can not yet upload this package since it would be auto-rejected. I wonder if you want to do the following: 1. Upgrade to latest upstream 2. Add your ID to Uploaders to make a real maintainer upload 3. Have a look into the other lintian issues Kind regards and thanks for your work on this Andreas. On Fri, Aug 29, 2014 at 08:22:58PM +, Ross Gammon wrote: > This is an automated email from the git hooks/post-receive script. > > ross-guest pushed a commit to branch pristine-tar > in repository geographiclib. > > commit 1d49e845eeba41bdd64f6d1533476af27744956c > Author: Ross Gammon > Date: Fri Aug 29 22:15:38 2014 +0200 > > pristine-tar data for geographiclib_1.37.orig.tar.gz > --- > geographiclib_1.37.orig.tar.gz.delta | Bin 0 -> 272356 bytes > geographiclib_1.37.orig.tar.gz.id| 1 + > 2 files changed, 1 insertion(+) > > diff --git a/geographiclib_1.37.orig.tar.gz.delta > b/geographiclib_1.37.orig.tar.gz.delta > new file mode 100644 > index 000..d1e06d0 > Binary files /dev/null and b/geographiclib_1.37.orig.tar.gz.delta differ > diff --git a/geographiclib_1.37.orig.tar.gz.id > b/geographiclib_1.37.orig.tar.gz.id > new file mode 100644 > index 000..de4dc43 > --- /dev/null > +++ b/geographiclib_1.37.orig.tar.gz.id > @@ -0,0 +1 @@ > +505da48a1b4d71c91208ecbc0920918b5ee64144 > > -- > Alioth's /usr/local/bin/git-commit-notice on > /srv/git.debian.org/git/pkg-grass/geographiclib.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 > -- http://fam-tille.de ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Re: qlandkartegt_1.7.7-3_amd64.changes REJECTED
Hi, On Mon, Sep 01, 2014 at 03:05:11PM +0200, Sebastiaan Couwenberg wrote: > > It looks like you uploaded the changes from the master branch, instead of > the changes for the proposed update on the wheezy branch (see: #738935). > > Can you do another build and upload using the wheezy branch? I just forgot how to pull non-default branches. What exactly is the git command to fetch this branch? I also wonder whether there are specific rules for backports or whether a simple upload is sufficient. Kind regards Andreas. -- http://fam-tille.de ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Re: [geographiclib] 01/01: pristine-tar data for geographiclib_1.37.orig.tar.gz
Hi Ross, On Mon, Sep 01, 2014 at 05:20:35PM +0200, Ross Gammon wrote: > > > > I can not yet upload this package since it would be auto-rejected. I > > wonder if you want to do the following: > > > > [...] Aah, I wasn't aware of the auto-rejection. I was trying to do the > bare minimum to solve the FTBFS on ppc64el. I understood the motivation and that's why I also suggested to make a maintainer upload by adding yourself to the Uploaders. > Sorry about the pristine tar mistake, I took it from the wrong > directory. Now you can see that I did consider doing [1] above at one > point :-) No problem. Thanks for your work on this Andreas. -- http://fam-tille.de ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Re: qlandkartegt_1.7.7-3_amd64.changes REJECTED
On Mon, Sep 01, 2014 at 11:40:40PM +0200, Sebastiaan Couwenberg wrote: > > Make sure the origin is up to date, and checkout the branch: > > git fetch origin > git checkout wheezy $ git fetch origin $ git branch * master pristine-tar upstream $ git checkout wheezy Branch wheezy konfiguriert zum Folgen von Remote-Branch wheezy von origin. Gewechselt zu einem neuem Branch 'wheezy' Am I doing something wrong? Kind regards Andreas. -- http://fam-tille.de ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Re: qlandkartegt_1.7.7-3_amd64.changes REJECTED
Hi Bas, On Tue, Sep 02, 2014 at 07:47:37AM +0200, Sebastiaan Couwenberg wrote: > On 09/01/2014 11:44 PM, Andreas Tille wrote: > > On Mon, Sep 01, 2014 at 11:40:40PM +0200, Sebastiaan Couwenberg wrote: > >> > >> Make sure the origin is up to date, and checkout the branch: > >> > >> git fetch origin > >> git checkout wheezy > > > > $ git fetch origin > > $ git branch > > * master > > pristine-tar > > upstream > > $ git checkout wheezy > > Branch wheezy konfiguriert zum Folgen von Remote-Branch wheezy von origin. > > Gewechselt zu einem neuem Branch 'wheezy' > > > > Am I doing something wrong? I think I might not have done anything wrong since when I'm looking today into the repository I was in branch wheezy. It seems that `git branch` is showing this only after I checked it out. I'd call this a bug. > The qlandkartegt repo should also have a up/doc branch, I have it > checked out via `gbp-clone --all`, do you have it in your remote? When doing a `git branch` (while beeing in wheezy branch) I dit not see up/doc branch ... only after `git checkout up/doc`. That's *very* confusing behaviour to my perception. I assumed `git branch` gives a list of all possible branches to enable me to pick one to check it out. I did not assumed that I need to wild guess what branches might exist to be able to check it out and only afterwards get a list of those branches I visited. That's adventure games style. :-( > git branch -av I should learn to use these options by default... > git remote -v > > I just did a fresh clone of the repo, and I get the wheezy branch just fine: > > git clone git://anonscm.debian.org/pkg-grass/qlandkartegt.git > cd qlandkartegt/ > git checkout pristine-tar > git checkout upstream > git checkout wheezy > > I'm not sure what's going on at your end, maybe the remote still points > to collab-maint where the repo no longer exists? No, I never cloned from collab-maint. Kind regards Andreas. -- http://fam-tille.de ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Re: RFS: qlandkartegt/1.5.0~dfsg1-1+deb7u1
Hi Bas, On Mon, Sep 01, 2014 at 11:40:40PM +0200, Sebastiaan Couwenberg wrote: > > > I also wonder whether there are specific rules for backports or whether > > a simple upload is sufficient. > > The most relevant difference is that the package needs to be built in an > up to date wheezy environment. Hmmm, this might last some time. I'm sitting behind a connection where I do not want to create another pbuilder chroot. If a different sponsor might be more quick than me this would be really welcome. Kind regards Andreas. -- http://fam-tille.de ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Building experimental branch of gdal-grass failed (Was: RFS: qlandkartegt/1.5.0~dfsg1-1+deb7u1)
Hi Bas, On Mon, Sep 08, 2014 at 07:14:24PM +0200, Sebastiaan Couwenberg wrote: > > The upload of qlandkartegt was sponsored by Jonathan Wiltshire today, so > you don't need to anymore. Thanks for your willingness anyway. Fine. Unfortunately my problem to build libgdal-grass experimental branch remains. I checked out branch experimental and did: git-buildpackage --git-debian-branch=experimental Unfortunately this ends up in Need to get 15.3 MB/116 MB of archives. After unpacking 490 MB will be used. The following packages have unmet dependencies: pbuilder-satisfydepends-dummy : Depends: libgdal-dev (>= 1.11.0-1~) but 1.10.1+dfsg-8+b2 is to be installed. libjpeg-dev : Depends: libjpeg62-dev (>= 1:1.3.1-2) but it is not going to be installed. Unable to resolve dependencies! Giving up... Despite the fact that I enabled experimental in sources.list of my pbuilder chroot. I feel a bit lost here since this worked in the past for other packages. :-( Kind regards Andreas. -- http://fam-tille.de ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Re: Building experimental branch of gdal-grass failed (Was: RFS: qlandkartegt/1.5.0~dfsg1-1+deb7u1)
Hi Bas, On Tue, Sep 09, 2014 at 12:58:00PM +0200, Sebastiaan Couwenberg wrote: > > > > Despite the fact that I enabled experimental in sources.list of my > > pbuilder chroot. I feel a bit lost here since this worked in the past > > for other packages. :-( > > Have you updated the chroot since adding experimental to the sources.list? > > It may just be that apt hasn't fetched the experimental data yet. Not only this: I watched closely the update process that experimental was included ... and it did. > I generally put the gdal 1.11.0 packages in my pbuilder-sid APT repo when > I need them to satisfy build dependencies. The pbuilder-sid repo is used > as an othermirror in my pbuilder chroots. But I also have explicit > experimental chroots. > > Using the experimental chroot I get a different unmet dependency: > > libgdal1h : Depends: libhdf5-7 which is a virtual package. > > We'll need to update gdal in experimental to build with the new hdf5 to > fix this. The alternative dependency change hasn't been built for Debian > yet, so a new gdal 1.11.0 build for experimental was in the pipeline > anyway. > > This doesn't solve your chroot issue though. What did you do to enable > experimental in your chroot? Just add it to sources.list and run > cowbuilder --update? Yep: $ cat /var/cache/pbuilder/base.cow/etc/apt/sources.list.d/02-experimental.list deb http://http.debian.net/debian/ experimental main $ sudo cowbuilder --update Kind regards Andreas. -- http://fam-tille.de ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Re: Building experimental branch of gdal-grass failed (Was: RFS: qlandkartegt/1.5.0~dfsg1-1+deb7u1)
Hi Bas, On Sun, Sep 14, 2014 at 11:11:26PM +0200, Sebastiaan Couwenberg wrote: > > Can you try another build? Done + uploaded, Andreas. -- http://fam-tille.de ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Re: Bug#761362: ITP: istsos -- Sensor Observation Service Data Management System
Hi Johan, this seems to be a target for Debian GIS and I guess you are packaging this in this team. I'd recommend adding the pkg-grass project to ITPs of this kind. Kind regards Andreas. On Sat, Sep 13, 2014 at 11:17:26AM +0200, Johan Van de Wauw wrote: > Package: wnpp > Severity: wishlist > Owner: Johan Van de Wauw > > * Package name: istsos > Version : 2.1.1 > Upstream Author : Istituto Scienze della Terra: > * URL : https://geoservice.ist.supsi.ch/projects/istsos/ > * License : GPLv2 > Programming Lang: Python > Description : Sensor Observation Service Data Management System > > IstSOS is an OGC Sensor Observation Service (SOS) server implementation > written in Python. istSOS allows for managing and dispatch observations > from monitoring sensors according to the Sensor Observation Service standard. > > The project provides also a Graphical user Interface that allows for easing > the daily operations and a RESTFul Web api for automatizing administration > procedures. > > > -- > To UNSUBSCRIBE, email to debian-gis-requ...@lists.debian.org > with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org > Archive: > https://lists.debian.org/20140913091726.2160.70797.report...@debian-usb.fritz.box > > -- http://fam-tille.de ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
python-mpop does not build
Hi Antonio, since python-mipp is now available I tried to build mpop but it failed when trying the unit tests: ... == ERROR: test_as_image (test_channel.TestChannel) Check the geo_image version of the channel. -- Traceback (most recent call last): File "/tmp/buildd/python-mpop-1.0.0/mpop/test_channel.py", line 311, in test_as_image img = self.chan.as_image(False) File "mpop/channel.py", line 252, in as_image from mpop.imageo.geo_image import GeoImage File "mpop/imageo/geo_image.py", line 35, in import Image as pil ImportError: No module named Image -- Ran 29 tests in 0.014s This is probably due to the fact that you forgot python-pil build-dependency. Could you please fix the Build-Depends and test the package in pbuilder? Kind regards Andreas. -- http://fam-tille.de ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#757884: Status of netcdf (Was: Bug#716540: [Mayhem] Bug report on minc-tools: minccopy crashes with exit status 139)
Hi, there exists a patch for an issue in netcdf and a changelog entry netcdf (4.3.2+git.20140613.4dcb673-1) UNRELEASED; urgency=medium * Incorporate NMU * New upstream release (Closes: #735075) -- Ross Gammon Mon, 18 Aug 2014 20:07:51 +0200 in Git about a new version. I wonder whether there is some volunteer to finalise this if no serious transition would be the consequence (I have not checked whether there is some ABI change). in any case the package seems to be in a state where some work should be done (bump debhelper compat level, perhaps drop cdbs in favour of dh, bump Standards-Version, canonical Vcs fields) Kind regards Andreas. On Fri, Oct 03, 2014 at 06:40:51PM +0200, Martin Steghöfer wrote: > Hi! > > This is essentially the same issue as the one that Mayhem detected > for "mincdump" (#716119): > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=716119 > > This means that it will also be fixed automatically as soon as the > "netcdf" maintainers pull in the patch I proposed in #757884: > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=757884 > > Cheers, > Martin -- http://fam-tille.de ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[otb] branch master updated (b5fb56f -> db76f9e)
This is an automated email from the git hooks/post-receive script. tille pushed a change to branch master in repository otb. from b5fb56f Updated package new db76f9e Foy owner of change The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/otb.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