[SCM] routino branch, master, updated. 03bb1aa56f40991fed3557c1aad73cf11154e7f1
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
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
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
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
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
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
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