[routino] annotated tag debian/2.7.2-3 created (now f1f6bfd)

2014-12-08 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a change to annotated tag debian/2.7.2-3
in repository routino.

at  f1f6bfd   (tag)
   tagging  1bc992280030e8829e3219a26a8ce130353bc383 (commit)
  replaces  debian/2.7.2-2
 tagged by  Uwe Steinmann
on  Mon Dec 8 12:32:24 2014 +0100

- Log -
routino Debian release 2.7.2-3

Bas Couwenberg (7):
  Finalize changelog from tpu upload.
  Restructure control file with cme.
  Bump Standards-Version to 3.9.6, no changes.
  Use canonical Vcs-* URLs.
  Add patch to use hardening build flags.
  Remove period from package description.
  Set distribution to unstable.

Uwe Steinmann (1):
  Merge branch 'master' of 
ssh://git.debian.org/srv/git.debian.org/git/pkg-grass/routino

---

This annotated tag includes the following new commits:

   new  1bc9922   Merge branch 'master' of 
ssh://git.debian.org/srv/git.debian.org/git/pkg-grass/routino

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/routino.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


[routino] 01/01: Merge branch 'master' of ssh://git.debian.org/srv/git.debian.org/git/pkg-grass/routino

2014-12-08 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a commit to annotated tag debian/2.7.2-3
in repository routino.

commit 1bc992280030e8829e3219a26a8ce130353bc383
Merge: 1a0d53e 2c57673
Author: Uwe Steinmann ste...@debian.org
Date:   Mon Dec 8 09:51:17 2014 +0100

Merge branch 'master' of 
ssh://git.debian.org/srv/git.debian.org/git/pkg-grass/routino

Conflicts:
debian/changelog

 debian/changelog | 11 +++
 debian/control   | 30 +++---
 debian/patches/hardening | 23 +++
 debian/patches/series|  1 +
 4 files changed, 54 insertions(+), 11 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/routino.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


[routino] annotated tag debian/2.1.2-1 created (now 351e0d6)

2014-12-05 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a change to annotated tag debian/2.1.2-1
in repository routino.

at  351e0d6   (tag)
   tagging  fc62b06f6b7df8bd4565f4287e3581b8b49f8e46 (commit)
  replaces  upstream/2.1.2
 tagged by  Uwe Steinmann
on  Mon Nov 21 17:02:57 2011 +0100

- Log -
Debian release 2.1.2-1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)

iEYEABECAAYFAk7KdjoACgkQih2Zvw18pwEamACgpJLnd82x7JLwKnPQkeyKN35C
NkQAnRdFGAJQAT2G5j+pk274WhAWsqxb
=mD3/
-END PGP SIGNATURE-

Thibaut GRIDEL (4):
  initial packaging
  Merge branch 'upstream'
  fixing Homepage
  adding Vcs fields

Thibaut Gridel (4):
  Merge commit 'upstream/2.1.1'
  providing new version
  Fixing tests
  Installing Documentation

Uwe Steinmann (8):
  Merge commit 'upstream/2.1.2'
  - make extra package routino-www
  - make extra package routino-www
  - fixed lintian warnings and errors
  - set better description of routino-www
  - added mysql as Uploader
  - set right email address
  set current date

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/routino.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


[routino] annotated tag debian/2.1.2-2 created (now 27edc66)

2014-12-05 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a change to annotated tag debian/2.1.2-2
in repository routino.

at  27edc66   (tag)
   tagging  5e0b101f0e6116c406480fa396048c46d54cd674 (commit)
  replaces  debian/2.1.2-1
 tagged by  Uwe Steinmann
on  Wed Nov 23 17:41:11 2011 +0100

- Log -
Debian release 2.1.2-2

Uwe Steinmann (3):
  - set option --with quilt
  - extended patch on bounds set in visualizer.js
  - new release 2.1.2-2

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/routino.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


[routino] annotated tag debian/2.2-2 created (now 5eae9a4)

2014-12-05 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a change to annotated tag debian/2.2-2
in repository routino.

at  5eae9a4   (tag)
   tagging  f3631d16fe1605a38110683d9db713d4015b7f29 (commit)
  replaces  debian/2.2-1
 tagged by  Uwe Steinmann
on  Mon Apr 23 08:35:30 2012 +0200

- Log -
Debian release 2.2-2

Uwe Steinmann (1):
  dded dependency on javascript-common

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/routino.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


[routino] annotated tag debian/2.7-1 created (now a73848e)

2014-12-05 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a change to annotated tag debian/2.7-1
in repository routino.

at  a73848e   (tag)
   tagging  cc44ea0620a40884b86b8d8eb88653d3221aa911 (commit)
  replaces  debian/2.3.2-1
 tagged by  Uwe Steinmann
on  Tue Apr 22 15:02:17 2014 +0200

- Log -
routino Debian release 2.7-1

Uwe Steinmann (22):
  Imported Upstream version 2.4.1
  Merge tag 'upstream/2.4.1'
  - new release 2.4.1
  Imported Upstream version 2.7
  Merge tag 'upstream/2.7'
  adopt to apache 2.4
  depend on apache2 | httpd
  add new patches and update old ones
  replace etc/apache2/conf.d by etc/routino-www
  add configuration for avahi and freedesktop
  install apache, freedesktop, avahi config
  install new configuration files
  new version 2.7
  more renaming in src/test/Makefile
  add  libbz2-dev to Build-Depend
  push standards version to 3.9.5
  more changes for 2.7
  fixed nasty typo in date
  note about changes in data file format
  allow access to routino-www from localhost
  change name
  set center of map

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/routino.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


[routino] annotated tag debian/2.7.2-1 created (now 670b48e)

2014-12-05 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a change to annotated tag debian/2.7.2-1
in repository routino.

at  670b48e   (tag)
   tagging  ab3da291b09d2e4b8f63124ab619347f697081af (commit)
  replaces  debian/2.7-1
 tagged by  Uwe Steinmann
on  Fri Oct 31 09:15:43 2014 +0100

- Log -
routino Debian release 2.7.2-1

Uwe Steinmann (3):
  Imported Upstream version 2.7.2
  Merge tag 'upstream/2.7.2'
  new version 2.7.2

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/routino.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


[routino] annotated tag debian/2.3.2-1 created (now ec0dd99)

2014-12-05 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a change to annotated tag debian/2.3.2-1
in repository routino.

at  ec0dd99   (tag)
   tagging  fed661fa519744d7156381212baa5f3385541540 (commit)
  replaces  debian/2.2-2
 tagged by  Uwe Steinmann
on  Tue Oct 16 15:31:00 2012 +0200

- Log -
Debian release 2.3.2-1

Uwe Steinmann (15):
  - added missing dependency on apache2
  - added another osm layer for cyclemap
  - new version 2.2-4
  Imported Upstream version 2.3.1
  Merge tag 'upstream/2.3.1'
  - new upѕtream version 2.3.1
  - fixed test
  - more fixed to make it apply
  - another small fix
  - fixed patch
  - fixed it
  Imported Upstream version 2.3.2
  Merge tag 'upstream/2.3.2'
  - new version 2.3.2
  pushed standards version to 3.9.3

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/routino.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

[routino] annotated tag upstream/2.2 created (now 9b0e07c)

2014-12-05 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a change to annotated tag upstream/2.2
in repository routino.

at  9b0e07c   (tag)
   tagging  8394258c5a4e13045faeba6ee2aaa26a3ddd8378 (commit)
  replaces  upstream/2.1.2
 tagged by  Uwe Steinmann
on  Wed Mar 7 11:08:51 2012 +0100

- Log -
Upstream version 2.2

Uwe Steinmann (1):
  Imported Upstream version 2.2

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/routino.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


[routino] annotated tag debian/2.2-1 created (now ec207df)

2014-12-05 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a change to annotated tag debian/2.2-1
in repository routino.

at  ec207df   (tag)
   tagging  c536f3233aea5514875fdcd12b7c61a0cb2e2f92 (commit)
  replaces  debian/2.1.2-3
 tagged by  Uwe Steinmann
on  Wed Mar 7 11:58:01 2012 +0100

- Log -
Debian release 2.2-1

Uwe Steinmann (7):
  Imported Upstream version 2.2
  Merge tag 'upstream/2.2'
  - new version 2.2
  - file name to patch has changed
  - wrong file name
  - do not apply map_bounds
  - readded patch for map bounds, now applied to mapprops.js

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/routino.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


[routino] annotated tag upstream/2.4.1 created (now 414b7f4)

2014-12-05 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a change to annotated tag upstream/2.4.1
in repository routino.

at  414b7f4   (tag)
   tagging  fc6d7dd568613ee714d0ce7baa01008e9359e339 (commit)
  replaces  upstream/2.3.2
 tagged by  Uwe Steinmann
on  Fri Dec 21 21:34:25 2012 +0100

- Log -
Upstream version 2.4.1

Uwe Steinmann (1):
  Imported Upstream version 2.4.1

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/routino.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


[routino] annotated tag upstream/2.7 created (now 054da92)

2014-12-05 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a change to annotated tag upstream/2.7
in repository routino.

at  054da92   (tag)
   tagging  2e74f67a10c059eb4ec8a0b6fb06bc0d6f9ee3e6 (commit)
  replaces  upstream/2.4.1
 tagged by  Uwe Steinmann
on  Thu Apr 17 07:35:05 2014 +0200

- Log -
Upstream version 2.7

Uwe Steinmann (1):
  Imported Upstream version 2.7

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/routino.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


[routino] annotated tag upstream/2.3.2 created (now d301eb0)

2014-12-05 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a change to annotated tag upstream/2.3.2
in repository routino.

at  d301eb0   (tag)
   tagging  72fc36c51964adfaf494b086fc61d82f58dd3e3e (commit)
  replaces  upstream/2.3.1
 tagged by  Uwe Steinmann
on  Tue Oct 16 15:13:49 2012 +0200

- Log -
Upstream version 2.3.2

Uwe Steinmann (1):
  Imported Upstream version 2.3.2

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/routino.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


[routino] tag upstream/2.1.1 created (now 0208b8b)

2014-12-05 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a change to tag upstream/2.1.1
in repository routino.

at  0208b8b   (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/routino.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


[routino] annotated tag upstream/2.1.2 created (now ab8187d)

2014-12-05 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a change to annotated tag upstream/2.1.2
in repository routino.

at  ab8187d   (tag)
   tagging  cf6949b878258ac0fb0685fe38551f5940d1adb9 (commit)
 tagged by  Uwe Steinmann
on  Fri Nov 18 16:24:48 2011 +0100

- Log -
Upstream version 2.1.2

Thibaut GRIDEL (3):
  Imported Upstream version 1.4.1
  Imported Upstream version 1.5
  Imported Upstream version 1.5.1

Thibaut Gridel (1):
  Imported Upstream version 2.1.1

Uwe Steinmann (1):
  Imported Upstream version 2.1.2

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/routino.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


[routino] annotated tag debian/2.7.2-2 created (now 2b8be65)

2014-12-05 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a change to annotated tag debian/2.7.2-2
in repository routino.

at  2b8be65   (tag)
   tagging  1a0d53eb2124d255e3872b0796ea5db52eb5111e (commit)
  replaces  debian/2.7.2-1
 tagged by  Uwe Steinmann
on  Fri Dec 5 21:09:22 2014 +0100

- Log -
routino Debian release 2.7.2-2

Bas Couwenberg (7):
  Incorporate changes from 2.7-1.1 NMU.
  Incorporate changes from 2.7-1.2 NMU.
  Set Debian GIS Project as Maintainer, move Thibaut Gridel to Uploaders.
  Incorporate changes from NMUs.
  Add gbp.conf to use pristine-tar by default.
  Add prerm for routino-www to remove the Apache configuration.
  Verified that apache configuration works with Apache 2.4.

Uwe Steinmann (1):
  add my name for upload

---

This annotated tag includes the following new commits:

   new  1a0d53e   add my name for upload

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/routino.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


[routino] 01/01: add my name for upload

2014-12-05 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a commit to annotated tag debian/2.7.2-2
in repository routino.

commit 1a0d53eb2124d255e3872b0796ea5db52eb5111e
Author: Uwe Steinmann ste...@debian.org
Date:   Fri Dec 5 20:13:31 2014 +0100

add my name for upload
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b437da9..dbc993a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-routino (2.7.2-2) UNRELEASED; urgency=medium
+routino (2.7.2-2) testing-proposed-updates; urgency=medium
 
   * Team upload.
   * Incorporate changes from NMUs:
@@ -10,7 +10,7 @@ routino (2.7.2-2) UNRELEASED; urgency=medium
   * Verified that apache configuration works with Apache 2.4.
 (closes: #669788)
 
- -- Bas Couwenberg sebas...@xs4all.nl  Fri, 05 Dec 2014 17:27:13 +0100
+ -- Uwe Steinmann ste...@debian.org  Fri, 05 Dec 2014 17:27:13 +0100
 
 routino (2.7.2-1) unstable; urgency=low
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/routino.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


[routino] branch upstream updated (2e74f67 - 615634a)

2014-10-31 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a change to branch upstream
in repository routino.

  from  2e74f67   Imported Upstream version 2.7
   new  615634a   Imported Upstream version 2.7.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:
 ChangeLog  | 350 +
 doc/INSTALL.txt|  17 +-
 doc/NEWS.txt   |  61 +++-
 doc/README.txt |   9 +-
 doc/TAGGING.txt|  14 +-
 doc/USAGE.txt  |   3 +-
 doc/html/installation.html |  16 +-
 doc/html/readme.html   |  82 -
 doc/html/tagging.html  |  25 +-
 doc/html/usage.html|   4 +-
 src/cache.h|   4 +-
 src/errorlogx.c|   2 +-
 src/fakes.c|  29 +-
 src/fakes.h|   4 +-
 src/filedumper.c   |  24 +-
 src/optimiser.c| 108 ---
 src/osmparser.c|  21 +-
 src/output.c   | 126 ++--
 src/prunex.c   |  35 ++-
 src/router.c   | 194 +++-
 src/segments.c |   2 +-
 src/segments.h |   6 +-
 src/superx.c   |  24 +-
 src/test/Makefile  |   2 +-
 src/test/{a-b-c.sh = a-b-c-d.sh}  |   5 +-
 src/test/coincident-waypoint.osm   | 101 ++
 src/test/coincident-waypoint.sh|   1 +
 src/test/cycle-both-ways.osm   | 107 +++
 src/test/cycle-both-ways.sh|   1 +
 src/test/{start-1-finish.sh = cycle-drive.sh} |  22 +-
 src/test/expected/coincident-waypoint-WP01.txt |  12 +
 src/test/expected/coincident-waypoint-WP02.txt |  11 +
 src/test/expected/coincident-waypoint-WP03.txt |  12 +
 ...super-WP02.txt = coincident-waypoint-WP04.txt} |   7 +-
 src/test/expected/cycle-both-ways-WP01.txt |  16 +
 src/test/expected/cycle-both-ways-WP02.txt |  16 +
 src/test/expected/fake-node-with-loop-WP01.txt |  19 ++
 src/test/expected/fake-node-with-loop-WP02.txt |  18 ++
 src/test/expected/loops-WP01.txt   |  11 +-
 src/test/expected/loops-WP02.txt   |  13 +-
 src/test/expected/loops-WP06.txt   |   9 +-
 src/test/expected/loops-WP07.txt   |  11 +-
 src/test/expected/roundabout-waypoints-WP01.txt|  12 +
 src/test/expected/roundabout-waypoints-WP02.txt|  13 +
 src/test/expected/roundabout-waypoints-WP03.txt|  12 +
 src/test/expected/roundabout-waypoints-WP04.txt|  13 +
 src/test/expected/roundabout-waypoints-WP05.txt|  12 +
 src/test/expected/roundabout-waypoints-WP06.txt|  13 +
 src/test/expected/roundabout-waypoints-WP07.txt|  12 +
 src/test/fake-node-with-loop.osm   | 102 ++
 src/test/{no-super.sh = fake-node-with-loop.sh}   |   0
 src/test/prune-straight.osm|   2 +-
 src/test/roundabout-waypoints.osm  | 105 +++
 src/test/{dead-ends.sh = roundabout-waypoints.sh} |   0
 src/types.c|  10 +-
 src/types.h|  13 +-
 src/visualiser.c   |  76 ++---
 src/visualiser.h   |   4 +-
 web/Makefile   |  24 +-
 web/translations/router.html   |  22 +-
 web/translations/translate.pl  | 235 +-
 web/translations/translation.de.txt| 168 +-
 web/translations/translation.en.txt| 111 ++-
 web/translations/translation.fr.txt| 112 ++-
 web/translations/translation.nl.txt|  99 +-
 web/translations/translation.ru.txt| 168 ++
 web/translations/translations-body.xml |  93 ++
 .../translations/translations-head.xml |  14 +-
 web/translations/translations-tail.xml |   1 +
 web/translations/visualiser.html   |  64 ++--
 web/www/routino/router.css |  26 +-
 web/www/routino/router.html.de | 162 +-
 

[routino] 03/03: new version 2.7.2

2014-10-31 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a commit to branch master
in repository routino.

commit ab3da291b09d2e4b8f63124ab619347f697081af
Author: Uwe Steinmann ste...@debian.org
Date:   Thu Oct 30 06:47:46 2014 +0100

new version 2.7.2
---
 debian/changelog | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fbc7d0b..13f6712 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+routino (2.7.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Uwe Steinmann ste...@debian.org  Thu, 30 Oct 2014 6:45:27 +0100
+
 routino (2.7-1) unstable; urgency=low
 
   * New upstream release

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/routino.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


[routino] 02/05: note about changes in data file format

2014-04-22 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a commit to branch master
in repository routino.

commit ff3e3565a815a7bb4fe5fd5ce2f45b07a3989697
Author: Uwe Steinmann ste...@debian.org
Date:   Tue Apr 22 08:06:42 2014 +0200

note about changes in data file format
---
 debian/README.Debian | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index c6cf81d..bec2d89 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -24,4 +24,10 @@ Results of the router when called by the web frontend are 
stored in
 /var/lib/routino/results. This directory is cleared from old files
 by a cron job weekly.
 
- -- Uwe Steinmann ste...@debian.org, Thu, 10 Nov 2011 8:24:13 +0100
+There has been various changes in the format of the data files which
+makes data files build for previous versions of routino unusable for
+newer versions of routino. So, make sure to always have recent set
+of data files compatible to the installed version of routino. If
+unsure consult the web page of routino for detailed information.
+
+ -- Uwe Steinmann ste...@debian.org, Tue, 22 Apr 2014 8:03:52 +0200

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/routino.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


[routino] 03/05: allow access to routino-www from localhost

2014-04-22 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a commit to branch master
in repository routino.

commit df45012060ccbb933f51a70eaeef38ae04095cea
Author: Uwe Steinmann ste...@debian.org
Date:   Tue Apr 22 08:12:25 2014 +0200

allow access to routino-www from localhost
---
 debian/apache.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/apache.conf b/debian/apache.conf
index db1992b..3f19c05 100644
--- a/debian/apache.conf
+++ b/debian/apache.conf
@@ -6,6 +6,7 @@ ForceLanguagePriority Prefer Fallback
 Options +ExecCGI
 AllowOverride None
 Require ip 127.0.0.0/255.0.0.0
+Require host localhost
 FilesMatch .*\.pl$
Require all denied
 /FilesMatch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/routino.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


[routino] 01/05: fixed nasty typo in date

2014-04-22 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a commit to branch master
in repository routino.

commit d258f95ca4be5a508315568f11b51ab488a24e0d
Author: Uwe Steinmann ste...@debian.org
Date:   Tue Apr 22 07:49:34 2014 +0200

fixed nasty typo in date
---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 20ecbb0..fbc7d0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,7 @@ routino (2.7-1) unstable; urgency=low
   * Depend on apache2 | httpd, Build-Depend on libbz2-dev
   * push standards version to 3.9.5
 
- -- Uwe Steinmann ste...@debian.org  Tu2, 22 Apr 2014 7:40:08 +0200
+ -- Uwe Steinmann ste...@debian.org  Tue, 22 Apr 2014 7:40:08 +0200
 
 routino (2.4.1-1) unstable; urgency=low
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/routino.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


[routino] 04/05: change name

2014-04-22 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a commit to branch master
in repository routino.

commit f597db03f92daa29fcfa15d48d1c99f0a2238eb1
Author: Uwe Steinmann ste...@debian.org
Date:   Tue Apr 22 08:20:31 2014 +0200

change name
---
 debian/routino-www.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/routino-www.desktop b/debian/routino-www.desktop
index 50c9f38..8b036ce 100644
--- a/debian/routino-www.desktop
+++ b/debian/routino-www.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=Routino WWW
+Name=Routino Router
 Comment=Web GUI for router routino
 Exec=sensible-browser http://localhost/routino/
 Terminal=false

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/routino.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


[routino] 05/05: set center of map

2014-04-22 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a commit to branch master
in repository routino.

commit cc44ea0620a40884b86b8d8eb88653d3221aa911
Author: Uwe Steinmann ste...@debian.org
Date:   Tue Apr 22 13:34:40 2014 +0200

set center of map

older leaflet versions like the one in debian squeeze seem to need it
---
 debian/patches/maploader | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/debian/patches/maploader b/debian/patches/maploader
index 306a591..2f2d226 100644
--- a/debian/patches/maploader
+++ b/debian/patches/maploader
@@ -21,3 +21,14 @@ Author: Uwe Steinmann ste...@debian.org
  
  load_js(location.pathname.replace(/\.html.*/,.openlayers.js));
 }
+--- a/web/www/routino/router.leaflet.js
 b/web/www/routino/router.leaflet.js
+@@ -744,6 +744,8 @@
+   maxBounds: 
L.latLngBounds(L.latLng(mapprops.southedge,mapprops.westedge),L.latLng(mapprops.northedge,mapprops.eastedge))
+   });
+ 
++ map.setView({lng: 0, lat: 0}, 2);
++
+  // Add map tile layers
+ 
+  var baselayers={};

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/routino.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


[routino] branch master updated (ecfd2cc - d64d675)

2014-04-21 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a change to branch master
in repository routino.

  from  ecfd2cc   new version 2.7
   new  41d6cf3   more renaming in src/test/Makefile
   new  d64d675   add  libbz2-dev to Build-Depend

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   |  2 +-
 debian/patches/rename_router | 11 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/routino.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


[routino] 01/02: more renaming in src/test/Makefile

2014-04-21 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a commit to branch master
in repository routino.

commit 41d6cf343249c74fc9297ae8638d7022e4fb6a62
Author: Uwe Steinmann ste...@debian.org
Date:   Thu Apr 17 21:18:14 2014 +0200

more renaming in src/test/Makefile
---
 debian/patches/rename_router | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/debian/patches/rename_router b/debian/patches/rename_router
index ae0e401..3629383 100644
--- a/debian/patches/rename_router
+++ b/debian/patches/rename_router
@@ -41,3 +41,14 @@ Author: Thibaut Gridel tgri...@free.fr
  filedumper filedumper-slim \
  filedumperx
  
+--- a/src/test/Makefile
 b/src/test/Makefile
+@@ -25,7 +25,7 @@
+ # executables
+ 
+ ROUTINO_EXE=../planetsplitter ../planetsplitter-slim \
+-../router ../router-slim \
++../routino-router ../routino-router-slim \
+ ../filedumper ../filedumper-slim
+ 
+ EXE=is-fast-math

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/routino.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


[routino] 01/02: push standards version to 3.9.5

2014-04-21 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a commit to branch master
in repository routino.

commit 732a18499441e4c1753c339e1667558492ae8993
Author: Uwe Steinmann ste...@debian.org
Date:   Tue Apr 22 07:39:15 2014 +0200

push standards version to 3.9.5
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index d6074e8..1afaac4 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Thibaut Gridel tgri...@free.fr
 Uploaders: Uwe Steinmann ste...@debian.org
 Build-Depends: debhelper (= 7.0.50~), flex, libbz2-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
 Homepage: http://www.routino.org/
 Vcs-Git: git://git.debian.org/pkg-grass/routino.git
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/routino.git

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/routino.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


[routino] branch master updated (d64d675 - 35f6657)

2014-04-21 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a change to branch master
in repository routino.

  from  d64d675   add  libbz2-dev to Build-Depend
   new  732a184   push standards version to 3.9.5
   new  35f6657   more changes for 2.7

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 | 5 +++--
 debian/control   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/routino.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


[routino] branch master updated (fed661f - ecfd2cc)

2014-04-17 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a change to branch master
in repository routino.

  from  fed661f   pushed standards version to 3.9.3
   new  fc6d7dd   Imported Upstream version 2.4.1
   new  5e9d3fa   Merge tag 'upstream/2.4.1'
   new  4f810a1   - new release 2.4.1
   new  2e74f67   Imported Upstream version 2.7
   new  ff97bf8   Merge tag 'upstream/2.7'
   new  b864d96   adopt to apache 2.4
   new  84baad0   depend on apache2 | httpd
   new  a7951dc   add new patches and update old ones
   new  dbfd021   replace etc/apache2/conf.d by etc/routino-www
   new  c81031e   add configuration for avahi and freedesktop
   new  e9edc1c   install apache, freedesktop, avahi config
   new  4fc9d0f   install new configuration files
   new  ecfd2cc   new version 2.7

The 13 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  | 2584 
 Makefile   |   36 +-
 Makefile.conf  |   81 +
 debian/apache.conf |7 +-
 debian/avahi.conf  |   10 +
 debian/changelog   |   16 +
 debian/control |2 +-
 debian/patches/fix_tests   |   37 +-
 debian/patches/install_documentation   |   10 +-
 debian/patches/install_path|   10 +-
 debian/patches/map_bounds  |   12 -
 debian/patches/maploader   |   23 +
 debian/patches/mapprops|   56 +
 debian/patches/rename_router   |   25 +-
 debian/patches/series  |5 +-
 debian/patches/web_path|   34 +
 debian/routino-www.desktop |8 +
 debian/routino-www.install |2 +-
 debian/routino-www.postinst|   50 +
 debian/rules   |6 +-
 doc/ALGORITHM.txt  |   76 +-
 doc/CONFIGURATION.txt  |   76 +-
 doc/DATALIFE.txt   |   85 +
 doc/INSTALL.txt|  211 +-
 doc/LIMITS.txt |  167 ++
 doc/Makefile   |   59 +-
 doc/NEWS.txt   |  205 ++
 doc/README.txt |   47 +-
 doc/TAGGING.txt|  172 +-
 doc/USAGE.txt  |  240 +-
 doc/html/algorithm.html|  137 +-
 doc/html/configuration.html|  122 +-
 doc/html/data.html |   42 +-
 doc/html/index.html|   51 +-
 doc/html/installation.html |  289 ++-
 doc/html/limits.html   |  244 ++
 doc/html/output.html   |   42 +-
 doc/html/readme.html   |  218 +-
 doc/html/style.css |   34 +-
 doc/html/tagging.html  |  284 ++-
 doc/html/usage.html|  257 +-
 Makefile = extras/Makefile|   38 +-
 extras/README.txt  |   27 +
 extras/errorlog/README.txt |   29 +
 extras/errorlog/summarise-log.pl   |  295 +++
 extras/find-fixme/Makefile |  175 ++
 extras/find-fixme/README.txt   |   96 +
 extras/find-fixme/fixme-dumper.c   |  346 +++
 extras/find-fixme/fixme-finder.c   |  365 +++
 .../find-fixme/fixme.xml   |   29 +-
 extras/find-fixme/osmparser.c  |  314 +++
 extras/find-fixme/web/www/fixme.cgi|  147 ++
 .../find-fixme/web/www/fixme.css   |   30 +-
 extras/find-fixme/web/www/fixme.html   |  162 ++
 extras/find-fixme/web/www/fixme.leaflet.js |  563 +
 extras/find-fixme/web/www/fixme.openlayers.js  |  623 +
 .../find-fixme/web/www/index.html  |   38 +-
 .../find-fixme/web/www/paths.pl|   36 +-
 extras/plot-time/README.txt|   18 +
 extras/plot-time/plot-planetsplitter-time.pl   |  108 +
 extras/tagmodifier/Makefile|   84 +
 extras/tagmodifier/README.txt  |   42 +
 {src = 

[routino] 10/13: add configuration for avahi and freedesktop

2014-04-17 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a commit to branch master
in repository routino.

commit c81031e290749bce8181807cd6440cdbec38892c
Author: Uwe Steinmann ste...@debian.org
Date:   Thu Apr 17 13:02:37 2014 +0200

add configuration for avahi and freedesktop
---
 debian/avahi.conf  | 10 ++
 debian/routino-www.desktop |  8 
 2 files changed, 18 insertions(+)

diff --git a/debian/avahi.conf b/debian/avahi.conf
new file mode 100644
index 000..8238a7b
--- /dev/null
+++ b/debian/avahi.conf
@@ -0,0 +1,10 @@
+?xml version=1.0 standalone='no'?
+!DOCTYPE service-group SYSTEM avahi-service.dtd
+service-group
+ name replace-wildcards=yesRoutino WWW on %h/name
+  service
+   type_http._tcp/type
+   port80/port
+   txt-recordpath=/routino//txt-record
+  /service
+/service-group
diff --git a/debian/routino-www.desktop b/debian/routino-www.desktop
new file mode 100644
index 000..50c9f38
--- /dev/null
+++ b/debian/routino-www.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Routino WWW
+Comment=Web GUI for router routino
+Exec=sensible-browser http://localhost/routino/
+Terminal=false
+Type=Application
+Icon=routino
+Categories=Network;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/routino.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


[routino] 09/13: replace etc/apache2/conf.d by etc/routino-www

2014-04-17 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a commit to branch master
in repository routino.

commit dbfd0218a69d3b91449f10147934ca9265b56262
Author: Uwe Steinmann ste...@debian.org
Date:   Thu Apr 17 13:01:37 2014 +0200

replace etc/apache2/conf.d by etc/routino-www
---
 debian/routino-www.install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/routino-www.install b/debian/routino-www.install
index 586445a..ff2a278 100644
--- a/debian/routino-www.install
+++ b/debian/routino-www.install
@@ -1,2 +1,2 @@
 usr/share/routino/www
-etc/apache2/conf.d
+etc/routino-www

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/routino.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


[routino] 05/13: Merge tag 'upstream/2.7'

2014-04-17 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a commit to branch master
in repository routino.

commit ff97bf88228d6678c4c3f114da390fe2a3b2ddae
Merge: 4f810a1 2e74f67
Author: Uwe Steinmann ste...@debian.org
Date:   Thu Apr 17 07:35:05 2014 +0200

Merge tag 'upstream/2.7'

Upstream version 2.7

 ChangeLog  | 1965 
 Makefile   |   36 +-
 Makefile.conf  |   81 +
 doc/ALGORITHM.txt  |   53 +-
 doc/CONFIGURATION.txt  |   76 +-
 doc/DATALIFE.txt   |   77 +-
 doc/INSTALL.txt|  211 ++-
 doc/LIMITS.txt |  167 ++
 doc/Makefile   |   59 +-
 doc/NEWS.txt   |  157 +-
 doc/README.txt |   45 +-
 doc/TAGGING.txt|  161 +-
 doc/USAGE.txt  |  162 +-
 doc/html/algorithm.html|  113 +-
 doc/html/configuration.html|  122 +-
 doc/html/data.html |   42 +-
 doc/html/index.html|   51 +-
 doc/html/installation.html |  289 ++-
 doc/html/limits.html   |  244 +++
 doc/html/output.html   |   42 +-
 doc/html/readme.html   |  171 +-
 doc/html/style.css |   34 +-
 doc/html/tagging.html  |  252 +--
 doc/html/usage.html|  185 +-
 Makefile = extras/Makefile|   38 +-
 extras/README.txt  |   27 +
 extras/errorlog/README.txt |   29 +
 {web/bin = extras/errorlog}/summarise-log.pl  |  144 +-
 extras/find-fixme/Makefile |  175 ++
 extras/find-fixme/README.txt   |   96 +
 extras/find-fixme/fixme-dumper.c   |  346 
 extras/find-fixme/fixme-finder.c   |  365 
 extras/find-fixme/fixme.xml|   74 +
 extras/find-fixme/osmparser.c  |  314 
 extras/find-fixme/web/www/fixme.cgi|  147 ++
 .../find-fixme/web/www/fixme.css   |   30 +-
 extras/find-fixme/web/www/fixme.html   |  162 ++
 extras/find-fixme/web/www/fixme.leaflet.js |  563 ++
 extras/find-fixme/web/www/fixme.openlayers.js  |  623 +++
 .../find-fixme/web/www}/index.html |   38 +-
 .../find-fixme/web/www/paths.pl|   28 +-
 extras/plot-time/README.txt|   18 +
 extras/plot-time/plot-planetsplitter-time.pl   |  108 ++
 extras/tagmodifier/Makefile|   84 +
 extras/tagmodifier/README.txt  |   42 +
 {src = extras/tagmodifier}/tagmodifier.c  |  254 +--
 src/Makefile   |  133 +-
 src/cache.h|  180 ++
 src/errorlog.c |  178 ++
 src/errorlog.h |  195 ++
 src/errorlogx.c|  980 ++
 src/errorlogx.h|   70 +
 src/fakes.c|   16 +-
 src/filedumper.c   |  391 +++-
 src/filedumperx.c  |  173 +-
 src/files.c|  429 -
 src/files.h|  130 +-
 src/functions.h|6 +-
 src/logerror.c |  219 +++
 src/logging.c  |  102 +-
 src/logging.h  |   35 +-
 src/nodes.c|  151 +-
 src/nodes.h|   35 +-
 src/nodesx.c   |  196 +-
 src/nodesx.h   |   36 +-
 src/optimiser.c|  733 ++--
 src/osmo5mparse.c  |  856 +
 src/osmparser.c| 1123 ---
 src/osmparser.h|   43 +-
 src/osmpbfparse.c  | 1234 
 src/osmxmlparse.c  |  703 +++
 src/output.c   |  188 +-
 src/planetsplitter.c   |  359 ++--
 src/profiles.c

[routino] 03/13: - new release 2.4.1

2014-04-17 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a commit to branch master
in repository routino.

commit 4f810a1b874be6911d4abe8298b433468859ed88
Author: Uwe Steinmann ste...@debian.org
Date:   Sat Dec 22 13:31:02 2012 +0100

- new release 2.4.1
---
 debian/changelog |  6 ++
 debian/patches/install_path  |  8 +---
 debian/patches/rename_router | 14 +++---
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4251cc5..86f29ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+routino (2.4.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Uwe Steinmann ste...@debian.org  Fri, 21 Dec 2012 21:35:08 +0100
+
 routino (2.3.2-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/patches/install_path b/debian/patches/install_path
index 663fa88..00c48fc 100644
--- a/debian/patches/install_path
+++ b/debian/patches/install_path
@@ -1,9 +1,11 @@
 Description: Installation path changes
 Author: Thibaut Gridel tgri...@free.fr 
 
 routino-1.5.1.orig/Makefile
-+++ routino-1.5.1/Makefile
-@@ -22,9 +22,9 @@
+Index: routino/Makefile
+===
+--- routino.orig/Makefile  2012-08-21 07:23:48.0 +0200
 routino/Makefile   2012-12-21 21:35:18.0 +0100
+@@ -20,9 +20,9 @@
  
  # Installation locations
  
diff --git a/debian/patches/rename_router b/debian/patches/rename_router
index 5484498..c699540 100644
--- a/debian/patches/rename_router
+++ b/debian/patches/rename_router
@@ -1,18 +1,18 @@
 Description: Rename router binaries
 Author: Thibaut Gridel tgri...@free.fr
 
 routino-1.5.1.orig/src/Makefile
-+++ routino-1.5.1/src/Makefile
-@@ -57,7 +57,7 @@ FLAGS64=-D_FILE_OFFSET_BITS=64
+--- routino/src/Makefile   2012-12-21 21:34:27.0 +0100
 routino/src/Makefile   2012-12-21 22:02:46.0 +0100
+@@ -60,7 +60,7 @@
  C=$(wildcard *.c)
  D=$(wildcard .deps/*.d)
  
--EXE=planetsplitter planetsplitter-slim router router-slim filedumper 
filedumper-slim tagmodifier
-+EXE=planetsplitter planetsplitter-slim routino-router routino-router-slim 
filedumper filedumper-slim tagmodifier
+-EXE=planetsplitter planetsplitter-slim router router-slim filedumperx 
filedumper filedumper-slim tagmodifier
++EXE=planetsplitter planetsplitter-slim routino-router routino-router-slim 
filedumperx filedumper filedumper-slim tagmodifier
  
  
  
-@@ -104,7 +104,7 @@ ROUTER_OBJ=router.o \
+@@ -107,7 +107,7 @@
   files.o logging.o profiles.o xmlparse.o \
   results.o queue.o translations.o
  
@@ -21,7 +21,7 @@ Author: Thibaut Gridel tgri...@free.fr
$(LD) $(ROUTER_OBJ) -o $@ $(LDFLAGS)
  
  
-@@ -115,7 +115,7 @@ ROUTER_SLIM_OBJ=router-slim.o \
+@@ -118,7 +118,7 @@
files.o logging.o profiles.o xmlparse.o \
results.o queue.o translations.o
  

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/routino.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


[routino] branch upstream updated (72fc36c - 2e74f67)

2014-04-17 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a change to branch upstream
in repository routino.

  from  72fc36c   Imported Upstream version 2.3.2
   new  fc6d7dd   Imported Upstream version 2.4.1
   new  2e74f67   Imported Upstream version 2.7

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:
 ChangeLog  | 2584 
 Makefile   |   36 +-
 Makefile.conf  |   81 +
 doc/ALGORITHM.txt  |   76 +-
 doc/CONFIGURATION.txt  |   76 +-
 doc/DATALIFE.txt   |   85 +
 doc/INSTALL.txt|  211 +-
 doc/LIMITS.txt |  167 ++
 doc/Makefile   |   59 +-
 doc/NEWS.txt   |  205 ++
 doc/README.txt |   47 +-
 doc/TAGGING.txt|  172 +-
 doc/USAGE.txt  |  240 +-
 doc/html/algorithm.html|  137 +-
 doc/html/configuration.html|  122 +-
 doc/html/data.html |   42 +-
 doc/html/index.html|   51 +-
 doc/html/installation.html |  289 ++-
 doc/html/limits.html   |  244 ++
 doc/html/output.html   |   42 +-
 doc/html/readme.html   |  218 +-
 doc/html/style.css |   34 +-
 doc/html/tagging.html  |  284 ++-
 doc/html/usage.html|  257 +-
 Makefile = extras/Makefile|   38 +-
 extras/README.txt  |   27 +
 extras/errorlog/README.txt |   29 +
 extras/errorlog/summarise-log.pl   |  295 +++
 extras/find-fixme/Makefile |  175 ++
 extras/find-fixme/README.txt   |   96 +
 extras/find-fixme/fixme-dumper.c   |  346 +++
 extras/find-fixme/fixme-finder.c   |  365 +++
 .../find-fixme/fixme.xml   |   29 +-
 extras/find-fixme/osmparser.c  |  314 +++
 extras/find-fixme/web/www/fixme.cgi|  147 ++
 .../find-fixme/web/www/fixme.css   |   30 +-
 extras/find-fixme/web/www/fixme.html   |  162 ++
 extras/find-fixme/web/www/fixme.leaflet.js |  563 +
 extras/find-fixme/web/www/fixme.openlayers.js  |  623 +
 .../find-fixme/web/www/index.html  |   38 +-
 .../find-fixme/web/www/paths.pl|   36 +-
 extras/plot-time/README.txt|   18 +
 extras/plot-time/plot-planetsplitter-time.pl   |  108 +
 extras/tagmodifier/Makefile|   84 +
 extras/tagmodifier/README.txt  |   42 +
 {src = extras/tagmodifier}/tagmodifier.c  |  254 +-
 src/Makefile   |  141 +-
 src/cache.h|  180 ++
 src/errorlog.c |  178 ++
 src/errorlog.h |  195 ++
 src/errorlogx.c|  980 
 src/errorlogx.h|   70 +
 src/fakes.c|   56 +-
 src/fakes.h|6 +-
 src/filedumper.c   |  622 +++--
 src/filedumperx.c  |  330 +++
 src/files.c|  459 +++-
 src/files.h|  131 +-
 src/functions.h|6 +-
 src/logerror.c |  219 ++
 src/logging.c  |  108 +-
 src/logging.h  |   38 +-
 src/nodes.c|  217 +-
 src/nodes.h|   37 +-
 src/nodesx.c   |  660 +++--
 src/nodesx.h   |   64 +-
 src/optimiser.c|  969 +---
 src/osmo5mparse.c  |  856 +++
 src/osmparser.c| 1009 +++-
 src/osmparser.h|   43 +-
 src/osmpbfparse.c  | 1234 

[routino] 07/13: depend on apache2 | httpd

2014-04-17 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a commit to branch master
in repository routino.

commit 84baad0d334d86b0c84f26d52f28125fbfe59269
Author: Uwe Steinmann ste...@debian.org
Date:   Thu Apr 17 12:59:49 2014 +0200

depend on apache2 | httpd
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 700ce81..26d5526 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Description: Set of tools to find a path between two points.
 
 Package: routino-www
 Architecture: all
-Depends: apache2, libjs-openlayers, javascript-common, routino, ${misc:Depends}
+Depends: apache2 | httpd, libjs-leaflet, javascript-common, routino, 
${misc:Depends}
 Description: Web frontend for routino
  Routino is an application for finding a route between two points
  using the dataset of topographical information collected by

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/routino.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


[routino] 11/13: install apache, freedesktop, avahi config

2014-04-17 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a commit to branch master
in repository routino.

commit e9edc1c1e811c88a6a103b12975ccef5b6d3b828
Author: Uwe Steinmann ste...@debian.org
Date:   Thu Apr 17 13:03:34 2014 +0200

install apache, freedesktop, avahi config
---
 debian/routino-www.postinst | 50 +
 1 file changed, 50 insertions(+)

diff --git a/debian/routino-www.postinst b/debian/routino-www.postinst
index a2e9ef0..e5486a4 100644
--- a/debian/routino-www.postinst
+++ b/debian/routino-www.postinst
@@ -7,6 +7,33 @@ if [ $DPKG_DEBUG = developer ]; then
set -x
 fi
 
+avahi_install() {
+   if [ -d /etc/avahi/services/ -a ! -e 
/etc/avahi/services/routino-www.service -a ! -L 
/etc/avahi/services/routino-www.service ] ; then
+   ln -s ../../routino-www/routino-www.service /etc/avahi/services/
+   fi
+}
+
+desktop_install() {
+   if [ -d /usr/share/applications/ -a ! -e 
/usr/share/applications/routino-www.desktop -a ! -L 
/usr/share/applications/routino-www.desktop ] ; then
+   ln -s /etc/routino-www/routino-www.desktop 
/usr/share/applications/
+   fi
+}
+
+apache_install() {
+   mkdir -p /etc/apache2/conf-available
+   ln -sf ../../routino-www/apache.conf 
/etc/apache2/conf-available/routino-www.conf
+   
+   COMMON_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 
2/dev/null | awk '{print $3}' || true)
+
+   if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+   . /usr/share/apache2/apache2-maintscript-helper
+   apache2_invoke enconf routino-www
+   elif [ $COMMON_STATE = installed ] || [ $COMMON_STATE = 
unpacked ] ; then
+   [ -d /etc/apache2/conf.d/ ]  [ ! -L 
/etc/apache2/conf.d/routino-www.conf ]  ln -s 
../conf-available/routino-www.conf /etc/apache2/conf.d/routino-www.conf
+   fi
+
+}
+
 case $1 in
configure)
if [ ! -d /var/lib/routino/data ] ; then
@@ -17,6 +44,29 @@ case $1 in
fi
chown -R www-data:www-data /var/lib/routino/results
 
+   webservers=apache2
+
+   for webserver in $webservers; do
+   webserver=${webserver%,}
+   if [ $webserver = lighttpd ] ; then
+   lighttpd_install
+   else
+   apache_install $1
+   fi
+   # Reload webserver in any case, configuration might 
have changed
+   # Redirection of 3 is needed because Debconf uses it 
and it might 
+   # be inherited by webserver. See bug #446324.
+   if [ -f /etc/init.d/$webserver ] ; then
+   if [ -x 
/usr/sbin/invoke-rc.d ]; then
+   
invoke-rc.d $webserver reload 3/dev/null || true
+   else
+   
/etc/init.d/$webserver reload 3/dev/null || true
+   fi
+   fi
+   done
+
+   avahi_install
+   desktop_install
;;
 
abort-upgrade|abort-remove|abort-deconfigure)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/routino.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


[routino] 06/13: adopt to apache 2.4

2014-04-17 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a commit to branch master
in repository routino.

commit b864d96b6f014d6c2448e1977adb887b868702fe
Author: Uwe Steinmann ste...@debian.org
Date:   Thu Apr 17 12:57:19 2014 +0200

adopt to apache 2.4
---
 debian/apache.conf | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/debian/apache.conf b/debian/apache.conf
index 9e5cc0d..db1992b 100644
--- a/debian/apache.conf
+++ b/debian/apache.conf
@@ -5,11 +5,8 @@ LanguagePriority en
 ForceLanguagePriority Prefer Fallback
 Options +ExecCGI
 AllowOverride None
-Order deny,allow
-Deny from all
-Allow from 127.0.0.0/255.0.0.0 ::1/128
+Require ip 127.0.0.0/255.0.0.0
 FilesMatch .*\.pl$
-   Order deny,allow
-   Deny from all
+   Require all denied
 /FilesMatch
 /Directory

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/routino.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


[routino] 13/13: new version 2.7

2014-04-17 Thread Uwe Steinmann
This is an automated email from the git hooks/post-receive script.

steinm-guest pushed a commit to branch master
in repository routino.

commit ecfd2cc84350eba02a0fe47e4f08c0a0823bcdfd
Author: Uwe Steinmann ste...@debian.org
Date:   Thu Apr 17 13:06:17 2014 +0200

new version 2.7
---
 debian/changelog | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 86f29ba..dc1acd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+routino (2.7-1) unstable; urgency=low
+
+  * New upstream release
+  * Add desktop and avahi service file
+  * Use leaflet instead of openlayers
+  * Update patches
+  * Depend on apache2 | httpd
+
+ -- Uwe Steinmann ste...@debian.org  Thu, 17 Apr 2014 7:37:00 +0200
+
 routino (2.4.1-1) unstable; urgency=low
 
   * New upstream release

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/routino.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


[SCM] routino branch, master, updated. fed661fa519744d7156381212baa5f3385541540

2012-10-16 Thread Uwe Steinmann
The following commit has been merged in the master branch:
commit 2ac86ae99032251c4316fdf9d257c69769e68ec9
Author: Uwe Steinmann ste...@debian.org
Date:   Tue Oct 16 15:15:22 2012 +0200

- new version 2.3.2

diff --git a/debian/changelog b/debian/changelog
index f7570b9..3a6b2d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+routino (2.3.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Uwe Steinmann ste...@debian.org  Tue, 16 Oct 2012 15:14:57 +0200
+
 routino (2.3.1-1) unstable; urgency=low
 
   * New upstream release

-- 
Packaging for routino

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] routino branch, master, updated. 03bb1aa56f40991fed3557c1aad73cf11154e7f1

2012-08-21 Thread Uwe Steinmann
The following commit has been merged in the master branch:
commit f577ed5ba492c1b626606d6f83a87ac58432160e
Author: Uwe Steinmann ste...@debian.org
Date:   Tue May 8 18:02:02 2012 +0200

- added missing dependency on apache2

diff --git a/debian/changelog b/debian/changelog
index 1279631..54be622 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+routino (2.2-3) unstable; urgency=low
+
+  * added missing dependency on apache2
+
+ -- Uwe Steinmann ste...@debian.org  Tue, 8 Mai 2012 18:00:54 +0200
+
 routino (2.2-2) unstable; urgency=low
 
   * added dependency on javascript-common
diff --git a/debian/control b/debian/control
index 809723e..a964587 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Description: Set of tools to find a path between two points.
 
 Package: routino-www
 Architecture: all
-Depends: libjs-openlayers, javascript-common, routino, ${misc:Depends}
+Depends: apache2, libjs-openlayers, javascript-common, routino, ${misc:Depends}
 Description: Web frontend for routino
  Routino is an application for finding a route between two points
  using the dataset of topographical information collected by

-- 
Packaging for routino

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] routino branch, master, updated. 03bb1aa56f40991fed3557c1aad73cf11154e7f1

2012-08-21 Thread Uwe Steinmann
The following commit has been merged in the master branch:
commit 435a89b01d6a4d719a3d27edb5b7f363ea9e1246
Merge: 228b9245b11ee0743fb8df979dc0ca3b45867600 
fded03865ea1626ed007414fdb12a95ce3e83350
Author: Uwe Steinmann ste...@debian.org
Date:   Sun Aug 19 17:44:57 2012 +0200

Merge tag 'upstream/2.3.1'

Upstream version 2.3.1


-- 
Packaging for routino

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] routino branch, master, updated. 03bb1aa56f40991fed3557c1aad73cf11154e7f1

2012-08-21 Thread Uwe Steinmann
The following commit has been merged in the master branch:
commit d782237e59d7d950841fa027779cf964ec72e65e
Author: Uwe Steinmann ste...@debian.org
Date:   Sun Aug 19 17:48:07 2012 +0200

- new upѕtream version 2.3.1

diff --git a/debian/changelog b/debian/changelog
index 0a04051..f7570b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+routino (2.3.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Uwe Steinmann ste...@debian.org  Sun, 19 Aug 2012 17:47:07 +0200
+
 routino (2.2-4) unstable; urgency=low
 
   * routino-www: added OSM CycleMap to list of layers

-- 
Packaging for routino

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

[SCM] routino branch, master, updated. 03bb1aa56f40991fed3557c1aad73cf11154e7f1

2012-08-21 Thread Uwe Steinmann
The following commit has been merged in the master branch:
commit 641503d84062ff698ad71d299713ed91a34cc6ef
Author: Uwe Steinmann ste...@debian.org
Date:   Sun Aug 19 18:03:44 2012 +0200

- fixed test

diff --git a/debian/patches/fix_tests b/debian/patches/fix_tests
index 05d12d4..09b0029 100644
--- a/debian/patches/fix_tests
+++ b/debian/patches/fix_tests
@@ -55,9 +55,12 @@ Author: Thibaut Gridel tgri...@free.fr
  $data_dir=$root_dir/data;
  $results_dir=$root_dir/results;
 
-@@ -30,7 +30,7 @@ $data_dir=$root_dir/data;
+@@ -30,10 +30,10 @@ $data_dir=$root_dir/data;
  $results_dir=$root_dir/results;
  
+ # EDIT THIS to set the filename prefix for the routing database files.
+ $data_prefix=;
+
  # EDIT THIS to change the names of the executables (enables easy selection of 
slim mode).
 -$router_exe=router;
 +$router_exe=routino-router;

-- 
Packaging for routino

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] routino branch, master, updated. 03bb1aa56f40991fed3557c1aad73cf11154e7f1

2012-08-21 Thread Uwe Steinmann
The following commit has been merged in the master branch:
commit e54076a93377b43374d34e9f4773e49b3a621ff9
Author: Uwe Steinmann ste...@debian.org
Date:   Sun Aug 19 18:09:09 2012 +0200

- more fixed to make it apply

diff --git a/debian/patches/fix_tests b/debian/patches/fix_tests
index 09b0029..5fdd18b 100644
--- a/debian/patches/fix_tests
+++ b/debian/patches/fix_tests
@@ -55,7 +55,7 @@ Author: Thibaut Gridel tgri...@free.fr
  $data_dir=$root_dir/data;
  $results_dir=$root_dir/results;
 
-@@ -30,10 +30,10 @@ $data_dir=$root_dir/data;
+@@ -30,15 +30,15 @@ $data_dir=$root_dir/data;
  $results_dir=$root_dir/results;
  
  # EDIT THIS to set the filename prefix for the routing database files.
@@ -66,4 +66,8 @@ Author: Thibaut Gridel tgri...@free.fr
 +$router_exe=routino-router;
  $filedumper_exe=filedumper;
  
+ # EDIT THIS to change the search type and base URL (must be a type recognised 
by search.pl).
+ $search_type=nominatim;
+ $search_baseurl=http://nominatim.openstreetmap.org/search;;
+
  1;

-- 
Packaging for routino

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] routino branch, master, updated. 03bb1aa56f40991fed3557c1aad73cf11154e7f1

2012-08-21 Thread Uwe Steinmann
The following commit has been merged in the master branch:
commit 42cfcaac891d0903a47fdf05948e3589d03e645e
Author: Uwe Steinmann ste...@debian.org
Date:   Sun Aug 19 18:11:45 2012 +0200

- another small fix

diff --git a/debian/patches/fix_tests b/debian/patches/fix_tests
index 5fdd18b..703e16c 100644
--- a/debian/patches/fix_tests
+++ b/debian/patches/fix_tests
@@ -55,7 +55,7 @@ Author: Thibaut Gridel tgri...@free.fr
  $data_dir=$root_dir/data;
  $results_dir=$root_dir/results;
 
-@@ -30,15 +30,15 @@ $data_dir=$root_dir/data;
+@@ -30,14 +30,14 @@ $data_dir=$root_dir/data;
  $results_dir=$root_dir/results;
  
  # EDIT THIS to set the filename prefix for the routing database files.

-- 
Packaging for routino

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] routino branch, master, updated. 03bb1aa56f40991fed3557c1aad73cf11154e7f1

2012-08-21 Thread Uwe Steinmann
The following commit has been merged in the master branch:
commit d3784beee4d9104c18d2f352d3b2887807d47e0f
Author: Uwe Steinmann ste...@debian.org
Date:   Sun Aug 19 18:14:52 2012 +0200

- fixed patch

diff --git a/debian/patches/map_bounds b/debian/patches/map_bounds
index b2807b4..4732d22 100644
--- a/debian/patches/map_bounds
+++ b/debian/patches/map_bounds
@@ -24,7 +24,7 @@ Author: Uwe Steinmann ste...@debian.org
  
   // EDIT THIS above to change the visible map limits
 
-@@ -29,9 +29,15 @@
+@@ -30,9 +30,15 @@
  label:OSM map,
  baseurl:  http://tile.openstreetmap.org/;,
  errorurl: http://openstreetmap.org/openlayers/img/404.png;

-- 
Packaging for routino

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] routino branch, master, updated. f3631d16fe1605a38110683d9db713d4015b7f29

2012-04-23 Thread Uwe Steinmann
The following commit has been merged in the master branch:
commit f3631d16fe1605a38110683d9db713d4015b7f29
Author: Uwe Steinmann ste...@debian.org
Date:   Mon Apr 23 08:32:59 2012 +0200

dded dependency on javascript-common

diff --git a/debian/changelog b/debian/changelog
index 80bd130..1279631 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+routino (2.2-2) unstable; urgency=low
+
+  * added dependency on javascript-common
+
+ -- Uwe Steinmann ste...@debian.org  Mon, 23 Apr 2012 8:32:41 +0200
+
 routino (2.2-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index f11aa10..809723e 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Description: Set of tools to find a path between two points.
 
 Package: routino-www
 Architecture: all
-Depends: libjs-openlayers, routino, ${misc:Depends}
+Depends: libjs-openlayers, javascript-common, routino, ${misc:Depends}
 Description: Web frontend for routino
  Routino is an application for finding a route between two points
  using the dataset of topographical information collected by

-- 
Packaging for routino

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] routino branch, master, updated. c536f3233aea5514875fdcd12b7c61a0cb2e2f92

2012-03-07 Thread Uwe Steinmann
The following commit has been merged in the master branch:
commit 5901e572723ec37caf8b8b772a1fba3b4afc63eb
Author: Uwe Steinmann ste...@debian.org
Date:   Thu Nov 24 22:26:02 2011 +0100

- new relase 2.1.2-3
- removed --with-quilt from dh in rules

diff --git a/debian/changelog b/debian/changelog
index 2631b20..36acc25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+routino (2.1.2-3) unstable; urgency=low
+
+  * do not use option --with-quilt for dh anymore (Closes: #649723)
+
+ -- Uwe Steinmann ste...@debian.org  Thu, 24 Nov 2011 09:11:41 +0100
+
 routino (2.1.2-2) unstable; urgency=low
 
   * patch map bounds in data visualizer
diff --git a/debian/rules b/debian/rules
index b47d8d3..c3824cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@
 #export DH_VERBOSE=1
 
 %:
-   dh $@ --with quilt
+   dh $@
 
 override_dh_auto_install:
dh_auto_install

-- 
Packaging for routino

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] routino branch, master, updated. c536f3233aea5514875fdcd12b7c61a0cb2e2f92

2012-03-07 Thread Uwe Steinmann
The following commit has been merged in the master branch:
commit ddc1e7da08a822a55bb26a358cfb08682f342f3c
Merge: 5901e572723ec37caf8b8b772a1fba3b4afc63eb 
8394258c5a4e13045faeba6ee2aaa26a3ddd8378
Author: Uwe Steinmann ste...@debian.org
Date:   Wed Mar 7 11:08:51 2012 +0100

Merge tag 'upstream/2.2'

Upstream version 2.2


-- 
Packaging for routino

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] routino branch, master, updated. c536f3233aea5514875fdcd12b7c61a0cb2e2f92

2012-03-07 Thread Uwe Steinmann
The following commit has been merged in the master branch:
commit 087cc60e14c6cdf00a84d212724dd81ea94709a8
Author: Uwe Steinmann ste...@debian.org
Date:   Wed Mar 7 11:13:43 2012 +0100

- new version 2.2

diff --git a/debian/changelog b/debian/changelog
index 36acc25..80bd130 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+routino (2.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Uwe Steinmann ste...@debian.org  Wed, 7 Mar 2012 11:13:07 +0100
+
 routino (2.1.2-3) unstable; urgency=low
 
   * do not use option --with-quilt for dh anymore (Closes: #649723)

-- 
Packaging for routino

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] routino branch, master, updated. c536f3233aea5514875fdcd12b7c61a0cb2e2f92

2012-03-07 Thread Uwe Steinmann
The following commit has been merged in the master branch:
commit 65c64eba14f61a48272b9feda72d4878bb699d13
Author: Uwe Steinmann ste...@debian.org
Date:   Wed Mar 7 11:25:07 2012 +0100

- file name to patch has changed

diff --git a/debian/patches/use_openlayers b/debian/patches/use_openlayers
index ff22d81..f018857 100644
--- a/debian/patches/use_openlayers
+++ b/debian/patches/use_openlayers
@@ -24,8 +24,8 @@ Author: Thibaut Gridel tgri...@free.fr
  !-- Page elements --
  script src=page-elements.js type=text/javascript/script
 
 routino-2.1.1.orig/web/www/routino/visualiser.html
-+++ routino-2.1.1/web/www/routino/visualiser.html
+--- routino-2.1.1.orig/web/www/routino/visualiser.en.html
 routino-2.1.1/web/www/routino/visualiser.en.html
 @@ -28,7 +28,7 @@
  meta http-equiv=Content-Type content=text/html; charset=UTF-8
  

-- 
Packaging for routino

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] routino branch, master, updated. 5e0b101f0e6116c406480fa396048c46d54cd674

2011-11-23 Thread Uwe Steinmann
The following commit has been merged in the master branch:
commit b98ec0b8a476959758e3f4435c992d76ee99a7df
Author: Uwe Steinmann ste...@debian.org
Date:   Wed Nov 23 13:48:34 2011 +0100

- set option --with quilt

diff --git a/debian/rules b/debian/rules
index cdaebc2..b47d8d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@
 #export DH_VERBOSE=1
 
 %:
-   dh $@ 
+   dh $@ --with quilt
 
 override_dh_auto_install:
dh_auto_install

-- 
Packaging for routino

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] routino branch, master, updated. 5e0b101f0e6116c406480fa396048c46d54cd674

2011-11-23 Thread Uwe Steinmann
The following commit has been merged in the master branch:
commit bd55c8e2e775474753880daa9cab47206d50b900
Author: Uwe Steinmann ste...@debian.org
Date:   Wed Nov 23 13:49:26 2011 +0100

- extended patch on bounds set in visualizer.js

diff --git a/debian/patches/map_bounds b/debian/patches/map_bounds
index 9c70209..3fbbbcc 100644
--- a/debian/patches/map_bounds
+++ b/debian/patches/map_bounds
@@ -1,5 +1,5 @@
 Description: Enlarge bounds of visible map to world
-Author: Thibaut Gridel tgri...@free.fr
+Author: Uwe Steinmann ste...@debian.org
 
 --- routino-2.1.1.orig/web/www/routino/router.js
 +++ routino-2.1.1/web/www/routino/router.js
@@ -22,3 +22,24 @@ Author: Thibaut Gridel tgri...@free.fr
  
   // EDIT THIS above to change the visible map limits
  
+--- a/web/www/routino/visualiser.js
 b/web/www/routino/visualiser.js
+@@ -98,12 +98,12 @@
+ 
+  // EDIT THIS below to change the visible map limits
+ 
+- var westedge  = -11.0;  // Minimum longitude (degrees)
+- var eastedge  =   2.0;  // Maximum longitude (degrees)
+- var southedge =  49.5;  // Minimum latitude (degrees)
+- var northedge =  61.0;  // Maximum latitude (degrees)
+- var zoomout   = 4;  // Minimum zoom
+- var zoomin=15;  // Maximum zoom
++ var westedge  = -180.0;  // Minimum longitude (degrees)
++ var eastedge  =  180.0;  // Maximum longitude (degrees)
++ var southedge =  -80.5;  // Minimum latitude (degrees)
++ var northedge =   80.0;  // Maximum latitude (degrees)
++ var zoomout   =  2;  // Minimum zoom
++ var zoomin= 16;  // Maximum zoom
+ 
+  // EDIT THIS above to change the visible map limits
+ 

-- 
Packaging for routino

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] routino branch, master, updated. 5e0b101f0e6116c406480fa396048c46d54cd674

2011-11-23 Thread Uwe Steinmann
The following commit has been merged in the master branch:
commit 5e0b101f0e6116c406480fa396048c46d54cd674
Author: Uwe Steinmann ste...@debian.org
Date:   Wed Nov 23 13:50:01 2011 +0100

- new release 2.1.2-2

diff --git a/debian/changelog b/debian/changelog
index 7406b98..2631b20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+routino (2.1.2-2) unstable; urgency=low
+
+  * patch map bounds in data visualizer
+  * added option --with quilt when calling 'dh $@'
+
+ -- Uwe Steinmann ste...@debian.org  Wed, 23 Nov 2011 12:35:57 +0100
+
 routino (2.1.2-1) unstable; urgency=low
 
   * New upstream release

-- 
Packaging for routino

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] routino branch, master, updated. fc62b06f6b7df8bd4565f4287e3581b8b49f8e46

2011-11-21 Thread Uwe Steinmann
The following commit has been merged in the master branch:
commit fc62b06f6b7df8bd4565f4287e3581b8b49f8e46
Author: Uwe Steinmann ste...@debian.org
Date:   Mon Nov 21 16:50:52 2011 +0100

set current date
added more info aboutc changes

diff --git a/debian/changelog b/debian/changelog
index c729970..7406b98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 routino (2.1.2-1) unstable; urgency=low
 
   * New upstream release
+  * Added myself as uploader
+  * New package containing the web frontend of routino
 
- -- Uwe Steinmann ste...@debian.org  Mon, 14 Nov 2011 09:59:26 +0100
+ -- Uwe Steinmann ste...@debian.org  Mon, 21 Nov 2011 09:59:26 +0100
 
 routino (2.1.1-1) unstable; urgency=low
 

-- 
Packaging for routino

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] routino branch, master, updated. 8365ebb252ad15fecbd5ce5733b76d91108c0558

2011-11-18 Thread Uwe Steinmann
The following commit has been merged in the master branch:
commit 26cdced43b60a0ddd28422d9d6b46351ac33987a
Merge: 0208b8be5079986a90a0980c09593849155d168c 
cf6949b878258ac0fb0685fe38551f5940d1adb9
Author: Uwe Steinmann ste...@debian.org
Date:   Fri Nov 18 16:24:48 2011 +0100

Merge commit 'upstream/2.1.2'


-- 
Packaging for routino

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] routino branch, master, updated. 8365ebb252ad15fecbd5ce5733b76d91108c0558

2011-11-18 Thread Uwe Steinmann
The following commit has been merged in the master branch:
commit b3dbf92483c5b411fab9f91255188da1b311f169
Author: Uwe Steinmann ste...@debian.org
Date:   Fri Nov 18 17:02:11 2011 +0100

- make extra package routino-www

diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 000..71c2ffc
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,27 @@
+routino for Debian
+--
+
+routino is a set of applications for finding a route based on topographical
+information from OpenStreetMap and creating the underlying database files.
+The router application itself has been renamed from 'router' to
+'routino-router'. The other programms (planetsplitter, filedumpeŗ and
+tagmodifier) has remained its name.
+
+routino has been split into two packages:
+
+routino:
+  containing the command line programms
+routino-www:
+  containing the web interface
+
+The web interface can be reached under http://localhost/routino
+It requires the two directories /var/lib/routino/data and
+/var/lib/routino/results. Both are created during installation of
+routino-www. /var/lib/routino/data must contain the four database
+files: nodes.mem, relations.mem, segments.mem and ways.mem previously
+created by planetsplitter. 
+Results of the router when called by the web frontend are stored in
+/var/lib/routino/results. This directory is cleared from old files
+by a cron job weekly.
+
+ -- Uwe Steinmann ste...@debian.org, Thu, 10 Nov 2011 8:24:13 +0100
diff --git a/debian/apache.conf b/debian/apache.conf
new file mode 100644
index 000..9e5cc0d
--- /dev/null
+++ b/debian/apache.conf
@@ -0,0 +1,15 @@
+Alias /routino /usr/share/routino/www
+Directory /usr/share/routino/www
+AddHandler cgi-script .cgi
+LanguagePriority en
+ForceLanguagePriority Prefer Fallback
+Options +ExecCGI
+AllowOverride None
+Order deny,allow
+Deny from all
+Allow from 127.0.0.0/255.0.0.0 ::1/128
+FilesMatch .*\.pl$
+   Order deny,allow
+   Deny from all
+/FilesMatch
+/Directory
diff --git a/debian/patches/map_bounds b/debian/patches/map_bounds
new file mode 100644
index 000..9c70209
--- /dev/null
+++ b/debian/patches/map_bounds
@@ -0,0 +1,24 @@
+Description: Enlarge bounds of visible map to world
+Author: Thibaut Gridel tgri...@free.fr
+
+--- routino-2.1.1.orig/web/www/routino/router.js
 routino-2.1.1/web/www/routino/router.js
+@@ -458,12 +458,12 @@ function map_init(lat,lon,zoom)
+ 
+  // EDIT THIS below to change the visible map limits
+ 
+- var westedge  = -11.0;  // Minimum longitude (degrees)
+- var eastedge  =   2.0;  // Maximum longitude (degrees)
+- var southedge =  49.5;  // Minimum latitude (degrees)
+- var northedge =  61.0;  // Maximum latitude (degrees)
+- var zoomout   = 4;  // Minimum zoom
+- var zoomin=15;  // Maximum zoom
++ var westedge  = -180.0;  // Minimum longitude (degrees)
++ var eastedge  = +180.0;  // Maximum longitude (degrees)
++ var southedge =  -80.0;  // Minimum latitude (degrees)
++ var northedge =  +80.0;  // Maximum latitude (degrees)
++ var zoomout   =  2;  // Minimum zoom
++ var zoomin= 16;  // Maximum zoom
+ 
+  // EDIT THIS above to change the visible map limits
+ 
diff --git a/debian/patches/use_openlayers b/debian/patches/use_openlayers
new file mode 100644
index 000..ff22d81
--- /dev/null
+++ b/debian/patches/use_openlayers
@@ -0,0 +1,37 @@
+Description: use installed openlayers form libjs-openlayers
+Author: Thibaut Gridel tgri...@free.fr
+
+--- routino-2.1.1.orig/web/www/routino/router.html.en
 routino-2.1.1/web/www/routino/router.html.en
+@@ -28,7 +28,7 @@
+ meta http-equiv=Content-Type content=text/html; charset=UTF-8
+ 
+ !-- OpenLayers Javascript library --
+-script src=../openlayers/OpenLayers.js type=text/javascript/script
++script src=/javascript/openlayers/OpenLayers.js 
type=text/javascript/script
+ 
+ !-- Page elements --
+ script src=page-elements.js type=text/javascript/script
+--- routino-2.1.1.orig/web/www/routino/router.html.nl
 routino-2.1.1/web/www/routino/router.html.nl
+@@ -30,7 +30,7 @@
+ meta http-equiv=Content-Type content=text/html; charset=UTF-8
+ 
+ !-- OpenLayers Javascript library --
+-script src=../openlayers/OpenLayers.js type=text/javascript/script
++script src=/javascript/openlayers/OpenLayers.js 
type=text/javascript/script
+ 
+ !-- Page elements --
+ script src=page-elements.js type=text/javascript/script
+
+--- routino-2.1.1.orig/web/www/routino/visualiser.html
 routino-2.1.1/web/www/routino/visualiser.html
+@@ -28,7 +28,7 @@
+ meta http-equiv=Content-Type content=text/html; charset=UTF-8
+ 
+ !-- OpenLayers Javascript library --
+-script src=../openlayers/OpenLayers.js type=text/javascript/script
++script src=/javascript/openlayers/OpenLayers.js 
type=text/javascript/script
+ 
+ !-- Page elements --
+ script src=page-elements.js type=text/javascript/script
diff --git a/debian/routino-www.cron.d b/debian

[SCM] routino branch, master, updated. 8365ebb252ad15fecbd5ce5733b76d91108c0558

2011-11-18 Thread Uwe Steinmann
The following commit has been merged in the master branch:
commit 8365ebb252ad15fecbd5ce5733b76d91108c0558
Author: Uwe Steinmann ste...@debian.org
Date:   Fri Nov 18 17:03:11 2011 +0100

- make extra package routino-www

diff --git a/debian/changelog b/debian/changelog
index f0c3191..8d65465 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
+routino (2.1.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Uwe Steinmann u...@steinmann.cx  Mon, 14 Nov 2011 09:59:26 +0100
+
 routino (2.1.1-1) unstable; urgency=low
 
   * New upstream release (Closes: #643800).
-  * Fixing Tests.
-  * Not installing INSTALL.txt.
+  * Fixing Tests (see patch).
+  * Not installing INSTALL.txt (see patch).
   * Bumping Standards version (no impact).
 
  -- Thibaut Gridel tgri...@free.fr  Wed, 26 Oct 2011 19:23:41 +0200
diff --git a/debian/control b/debian/control
index ba20b86..8d2b8ee 100644
--- a/debian/control
+++ b/debian/control
@@ -16,3 +16,13 @@ Description: Set of tools to find a path between two points.
  Routino is an application for finding a route between two points
  using the dataset of topographical information collected by
  OpenStreetMap
+
+Package: routino-www
+Architecture: all
+Depends: libjs-openlayers, routino
+Description: Set of tools to find a path between two points.
+ Routino is an application for finding a route between two points
+ using the dataset of topographical information collected by
+ OpenStreetMap
+ .
+ This is the web frontend to the router.
diff --git a/debian/patches/fix_tests b/debian/patches/fix_tests
index 911076b..05d12d4 100644
--- a/debian/patches/fix_tests
+++ b/debian/patches/fix_tests
@@ -42,6 +42,19 @@ Author: Thibaut Gridel tgri...@free.fr
  
 --- routino-2.1.1.orig/web/www/routino/paths.pl
 +++ routino-2.1.1/web/www/routino/paths.pl
+@@ -22,10 +22,10 @@
+ # Directory path parameters
+ 
+ # EDIT THIS to set the root directory for the non-web data files.
+-$root_dir=../..;
++$root_dir=/var/lib/routino;
+ 
+ # EDIT THIS to change the location of the individual directories.
+-$bin_dir=$root_dir/bin;
++$bin_dir=/usr/bin;
+ $data_dir=$root_dir/data;
+ $results_dir=$root_dir/results;
+
 @@ -30,7 +30,7 @@ $data_dir=$root_dir/data;
  $results_dir=$root_dir/results;
  
diff --git a/debian/patches/rename_router b/debian/patches/rename_router
index 9fb1345..5484498 100644
--- a/debian/patches/rename_router
+++ b/debian/patches/rename_router
@@ -5,14 +5,14 @@ Author: Thibaut Gridel tgri...@free.fr
 +++ routino-1.5.1/src/Makefile
 @@ -57,7 +57,7 @@ FLAGS64=-D_FILE_OFFSET_BITS=64
  C=$(wildcard *.c)
- D=$(foreach f,$(C),$(addprefix .deps/,$(addsuffix .d,$(basename $f
+ D=$(wildcard .deps/*.d)
  
 -EXE=planetsplitter planetsplitter-slim router router-slim filedumper 
filedumper-slim tagmodifier
 +EXE=planetsplitter planetsplitter-slim routino-router routino-router-slim 
filedumper filedumper-slim tagmodifier
  
  
  
-@@ -103,7 +103,7 @@ ROUTER_OBJ=router.o \
+@@ -104,7 +104,7 @@ ROUTER_OBJ=router.o \
   files.o logging.o profiles.o xmlparse.o \
   results.o queue.o translations.o
  
@@ -21,7 +21,7 @@ Author: Thibaut Gridel tgri...@free.fr
$(LD) $(ROUTER_OBJ) -o $@ $(LDFLAGS)
  
  
-@@ -114,7 +114,7 @@ ROUTER_SLIM_OBJ=router-slim.o \
+@@ -115,7 +115,7 @@ ROUTER_SLIM_OBJ=router-slim.o \
files.o logging.o profiles.o xmlparse.o \
results.o queue.o translations.o
  
diff --git a/debian/patches/series b/debian/patches/series
index f947a2f..0b10a16 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,6 @@
 install_path
 rename_router
 fix_tests
+use_openlayers
+map_bounds
 install_documentation
diff --git a/debian/rules b/debian/rules
index b760bee..62736a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,3 +11,11 @@
 
 %:
dh $@ 
+
+override_dh_auto_install:
+   dh_auto_install
+   install -d $(CURDIR)/debian/tmp/usr/share/routino/www
+   cp -r web/www/routino/* $(CURDIR)/debian/tmp/usr/share/routino/www
+   install -d $(CURDIR)/debian/tmp/etc/apache2/conf.d/
+   install debian/apache.conf 
$(CURDIR)/debian/tmp/etc/apache2/conf.d/routino.conf
+

-- 
Packaging for routino

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] routino branch, master, updated. c0f4168522465fed6013782e82d2fd86e4b1d06e

2011-11-18 Thread Uwe Steinmann
The following commit has been merged in the master branch:
commit 58c4a38ed7cdd9023870fed915bd1d869643df93
Author: Uwe Steinmann ste...@debian.org
Date:   Fri Nov 18 17:35:12 2011 +0100

- fixed lintian warnings and errors

diff --git a/debian/README.Debian b/debian/README.Debian
index 71c2ffc..c6cf81d 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -4,13 +4,13 @@ routino for Debian
 routino is a set of applications for finding a route based on topographical
 information from OpenStreetMap and creating the underlying database files.
 The router application itself has been renamed from 'router' to
-'routino-router'. The other programms (planetsplitter, filedumpeŗ and
+'routino-router'. The other programs (planetsplitter, filedumpeŗ and
 tagmodifier) has remained its name.
 
 routino has been split into two packages:
 
 routino:
-  containing the command line programms
+  containing the command line programs
 routino-www:
   containing the web interface
 
diff --git a/debian/copyright b/debian/copyright
index 0cb7f48..bc489a5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,7 @@ It was downloaded from:
 
 http://www.routino.org/download/
 
-Upstream Author(s):
+Upstream Author:
 
 Andrew M. Bishop  a...@gedanken.demon.co.uk
 
diff --git a/debian/routino-www.postinst b/debian/routino-www.postinst
index 3eda835..a2e9ef0 100644
--- a/debian/routino-www.postinst
+++ b/debian/routino-www.postinst
@@ -1,6 +1,7 @@
 #! /bin/sh
 # postinst script for routino-www
 #
+set -e
 
 if [ $DPKG_DEBUG = developer ]; then
set -x
@@ -14,7 +15,7 @@ case $1 in
if [ ! -d /var/lib/routino/results ] ; then
mkdir -p /var/lib/routino/results
fi
-   chown -R www-data.www-data /var/lib/routino/results
+   chown -R www-data:www-data /var/lib/routino/results
 
;;
 
diff --git a/debian/routino-www.postrm b/debian/routino-www.postrm
index 73e94f7..9b279b6 100644
--- a/debian/routino-www.postrm
+++ b/debian/routino-www.postrm
@@ -1,6 +1,7 @@
 #! /bin/sh
 # postrm script for routino-www
 #
+set -e
 
 if [ $DPKG_DEBUG = developer ]; then
   set -x
diff --git a/debian/rules b/debian/rules
index 62736a3..cdaebc2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,5 +17,5 @@ override_dh_auto_install:
install -d $(CURDIR)/debian/tmp/usr/share/routino/www
cp -r web/www/routino/* $(CURDIR)/debian/tmp/usr/share/routino/www
install -d $(CURDIR)/debian/tmp/etc/apache2/conf.d/
-   install debian/apache.conf 
$(CURDIR)/debian/tmp/etc/apache2/conf.d/routino.conf
+   install -m 644 debian/apache.conf 
$(CURDIR)/debian/tmp/etc/apache2/conf.d/routino.conf
 

-- 
Packaging for routino

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

[SCM] routino branch, master, updated. c0f4168522465fed6013782e82d2fd86e4b1d06e

2011-11-18 Thread Uwe Steinmann
The following commit has been merged in the master branch:
commit c0f4168522465fed6013782e82d2fd86e4b1d06e
Author: Uwe Steinmann ste...@debian.org
Date:   Fri Nov 18 17:40:23 2011 +0100

- set better description of routino-www

diff --git a/debian/control b/debian/control
index 8d2b8ee..dc22d67 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Description: Set of tools to find a path between two points.
 Package: routino-www
 Architecture: all
 Depends: libjs-openlayers, routino
-Description: Set of tools to find a path between two points.
+Description: Web frontend for routino
  Routino is an application for finding a route between two points
  using the dataset of topographical information collected by
  OpenStreetMap

-- 
Packaging for routino

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] routino branch, master, updated. 898ea7bb5b3069a92c2c76f44dae7f79dbbe5c8e

2011-11-18 Thread Uwe Steinmann
The following commit has been merged in the master branch:
commit cdaa00ab858edbf5ca7c2070c7e88a1a57edbe19
Author: Uwe Steinmann ste...@debian.org
Date:   Fri Nov 18 21:19:06 2011 +0100

- added mysql as Uploader
- added misc:depend

diff --git a/debian/control b/debian/control
index dc22d67..f11aa10 100644
--- a/debian/control
+++ b/debian/control
@@ -2,6 +2,7 @@ Source: routino
 Section: misc
 Priority: extra
 Maintainer: Thibaut Gridel tgri...@free.fr
+Uploaders: Uwe Steinmann ste...@debian.org
 Build-Depends: debhelper (= 7.0.50~), flex
 Standards-Version: 3.9.2
 Homepage: http://www.routino.org/
@@ -19,7 +20,7 @@ Description: Set of tools to find a path between two points.
 
 Package: routino-www
 Architecture: all
-Depends: libjs-openlayers, routino
+Depends: libjs-openlayers, routino, ${misc:Depends}
 Description: Web frontend for routino
  Routino is an application for finding a route between two points
  using the dataset of topographical information collected by

-- 
Packaging for routino

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] routino branch, master, updated. 898ea7bb5b3069a92c2c76f44dae7f79dbbe5c8e

2011-11-18 Thread Uwe Steinmann
The following commit has been merged in the master branch:
commit 898ea7bb5b3069a92c2c76f44dae7f79dbbe5c8e
Author: Uwe Steinmann ste...@debian.org
Date:   Fri Nov 18 21:19:49 2011 +0100

- set right email address

diff --git a/debian/changelog b/debian/changelog
index 8d65465..c729970 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ routino (2.1.2-1) unstable; urgency=low
 
   * New upstream release
 
- -- Uwe Steinmann u...@steinmann.cx  Mon, 14 Nov 2011 09:59:26 +0100
+ -- Uwe Steinmann ste...@debian.org  Mon, 14 Nov 2011 09:59:26 +0100
 
 routino (2.1.1-1) unstable; urgency=low
 

-- 
Packaging for routino

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel