[DebianGIS-dev] [SCM] routino branch, master, created. 9dffc9de96014e24d1fd1030a79317ba34c504e8
The branch, master has been created at 9dffc9de96014e24d1fd1030a79317ba34c504e8 (commit) - Shortlog commit 9dffc9de96014e24d1fd1030a79317ba34c504e8 Merge: 42c9226 5a44d59 Author: Thibaut GRIDEL tgri...@free.fr Date: Tue Dec 28 22:16:42 2010 +0100 Merge branch 'upstream' commit 42c9226fc71c19af4d755c6900120bfa07f7e99c Author: Thibaut GRIDEL tgri...@free.fr Date: Tue Dec 28 22:16:29 2010 +0100 initial packaging --- -- Packaging for routino ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] [SCM] routino branch, upstream, created. 5a44d59fac1aa6104956f4d5dbeef567169c32c0
The branch, upstream has been created at 5a44d59fac1aa6104956f4d5dbeef567169c32c0 (commit) - Shortlog --- -- Packaging for routino ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] [SCM] routino branch, master, updated. d9fbb62d9f8b23bd2dad60f541b725e3a893d9a1
The following commit has been merged in the master branch: commit d9fbb62d9f8b23bd2dad60f541b725e3a893d9a1 Author: Thibaut GRIDEL tgri...@free.fr Date: Wed Dec 29 22:47:27 2010 +0100 fixing Homepage diff --git a/debian/control b/debian/control index 25f782f..b176a67 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: Thibaut Gridel tgri...@free.fr Build-Depends: debhelper (= 7.0.50~), flex Standards-Version: 3.9.1 -Homepage: http://www.routino.org/download/ +Homepage: http://www.routino.org/ Package: routino Architecture: any -- Packaging for routino ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] [SCM] routino branch, master, updated. 0afc45ba643e3f231460315c44d3590f65f4d10b
The following commit has been merged in the master branch: commit 0afc45ba643e3f231460315c44d3590f65f4d10b Author: Thibaut GRIDEL tgri...@free.fr Date: Thu Dec 30 00:24:19 2010 +0100 adding Vcs fields diff --git a/debian/control b/debian/control index b176a67..4c3fd40 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,9 @@ Maintainer: Thibaut Gridel tgri...@free.fr Build-Depends: debhelper (= 7.0.50~), flex Standards-Version: 3.9.1 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 + Package: routino Architecture: any -- Packaging for routino ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[SCM] routino branch, master, updated. 59f7dd29369e69f05afb4de29306d16a08197830
The following commit has been merged in the master branch: commit 787821d2e5a4cb09032d3ad2ed47ac65d7bc6811 Merge: 0afc45ba643e3f231460315c44d3590f65f4d10b fb9657174e57b36b0427c58b4869a50b075c54b4 Author: Thibaut Gridel tgri...@free.fr Date: Wed Oct 26 18:23:37 2011 +0200 Merge commit 'upstream/2.1.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. 59f7dd29369e69f05afb4de29306d16a08197830
The following commit has been merged in the master branch: commit e4fe4f4e3e096d4f945d289ec2137b4190b25c26 Author: Thibaut Gridel tgri...@free.fr Date: Wed Oct 26 19:03:50 2011 +0200 Fixing tests diff --git a/src/test/a-b-c.sh b/src/test/a-b-c.sh index c8e0c8a..62ae8fd 100755 --- a/src/test/a-b-c.sh +++ b/src/test/a-b-c.sh @@ -74,8 +74,8 @@ for waypoint in $waypoints; do [ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint -echo ../router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c $log -$debugger ../router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c $log +echo ../routino-router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c $log +$debugger ../routino-router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c $log mv shortest* $dir/$name-$waypoint diff --git a/src/test/a-b.sh b/src/test/a-b.sh index 0361ab6..c2b1df6 100755 --- a/src/test/a-b.sh +++ b/src/test/a-b.sh @@ -73,8 +73,8 @@ for waypoint in $waypoints; do [ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint -echo ../router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $log -$debugger ../router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $log +echo ../routino-router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $log +$debugger ../routino-router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $log mv shortest* $dir/$name-$waypoint diff --git a/src/test/start-1-finish.sh b/src/test/start-1-finish.sh index 58e8f1a..810fc11 100755 --- a/src/test/start-1-finish.sh +++ b/src/test/start-1-finish.sh @@ -73,8 +73,8 @@ for waypoint in $waypoints; do [ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint -echo ../router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_start $waypoint_test $waypoint_finish $log -$debugger ../router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_start $waypoint_test $waypoint_finish $log +echo ../routino-router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_start $waypoint_test $waypoint_finish $log +$debugger ../routino-router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_start $waypoint_test $waypoint_finish $log mv shortest* $dir/$name-$waypoint diff --git a/web/www/routino/paths.pl b/web/www/routino/paths.pl index 2233efb..05375db 100644 --- a/web/www/routino/paths.pl +++ b/web/www/routino/paths.pl @@ -30,7 +30,7 @@ $data_dir=$root_dir/data; $results_dir=$root_dir/results; # EDIT THIS to change the names of the executables (enables easy selection of slim mode). -$router_exe=router; +$router_exe=routino-router; $filedumper_exe=filedumper; 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. 59f7dd29369e69f05afb4de29306d16a08197830
The following commit has been merged in the master branch: commit 59f7dd29369e69f05afb4de29306d16a08197830 Author: Thibaut Gridel tgri...@free.fr Date: Wed Oct 26 19:24:44 2011 +0200 providing new version diff --git a/debian/changelog b/debian/changelog index b59fcf5..f0c3191 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +routino (2.1.1-1) unstable; urgency=low + + * New upstream release (Closes: #643800). + * Fixing Tests. + * Not installing INSTALL.txt. + * Bumping Standards version (no impact). + + -- Thibaut Gridel tgri...@free.fr Wed, 26 Oct 2011 19:23:41 +0200 + routino (1.5.1-1) unstable; urgency=low * Initial release (Closes: #608150). diff --git a/debian/control b/debian/control index 4c3fd40..ba20b86 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: misc Priority: extra Maintainer: Thibaut Gridel tgri...@free.fr Build-Depends: debhelper (= 7.0.50~), flex -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 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 -- 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. 59f7dd29369e69f05afb4de29306d16a08197830
The following commit has been merged in the master branch: commit 98ba1e289a5ced33b3aa4fc00022d4fa2927bf34 Author: Thibaut Gridel tgri...@free.fr Date: Wed Oct 26 19:04:21 2011 +0200 Not installing INSTALL.txt diff --git a/doc/Makefile b/doc/Makefile index 3d1dc88..9c40a0e 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -25,7 +25,7 @@ WEBDIR=../web/www/routino/documentation # Files to install HTML_FILES=html/* -TXT_FILES=*.txt +TXT_FILES=ALGORITHM.txt CONFIGURATION.txt DATA.txt NEWS.txt OUTPUT.txt README.txt TAGGING.txt USAGE.txt TOP_FILES=../agpl-3.0.txt -- 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. 0208b8be5079986a90a0980c09593849155d168c
The following commit has been merged in the master branch: commit 49fbcb03b07987a397a884d97329ef76426595c6 Author: Thibaut Gridel tgri...@free.fr Date: Wed Oct 26 19:24:44 2011 +0200 providing new version diff --git a/debian/changelog b/debian/changelog index b59fcf5..f0c3191 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +routino (2.1.1-1) unstable; urgency=low + + * New upstream release (Closes: #643800). + * Fixing Tests. + * Not installing INSTALL.txt. + * Bumping Standards version (no impact). + + -- Thibaut Gridel tgri...@free.fr Wed, 26 Oct 2011 19:23:41 +0200 + routino (1.5.1-1) unstable; urgency=low * Initial release (Closes: #608150). diff --git a/debian/control b/debian/control index 4c3fd40..ba20b86 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: misc Priority: extra Maintainer: Thibaut Gridel tgri...@free.fr Build-Depends: debhelper (= 7.0.50~), flex -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 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 -- 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. 0208b8be5079986a90a0980c09593849155d168c
The following commit has been merged in the master branch: commit a19774659b1aefb226fb3dd8c0cc8647f2692fbf Author: Thibaut Gridel tgri...@free.fr Date: Wed Oct 26 22:27:48 2011 +0200 Fixing tests diff --git a/debian/patches/fix_tests b/debian/patches/fix_tests new file mode 100644 index 000..911076b --- /dev/null +++ b/debian/patches/fix_tests @@ -0,0 +1,53 @@ +Description: Fix for Tests +Author: Thibaut Gridel tgri...@free.fr + +--- routino-2.1.1.orig/src/test/a-b-c.sh routino-2.1.1/src/test/a-b-c.sh +@@ -74,8 +74,8 @@ for waypoint in $waypoints; do + + [ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint + +-echo ../router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c $log +-$debugger ../router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c $log ++echo ../routino-router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c $log ++$debugger ../routino-router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c $log + + mv shortest* $dir/$name-$waypoint + +--- routino-2.1.1.orig/src/test/a-b.sh routino-2.1.1/src/test/a-b.sh +@@ -73,8 +73,8 @@ for waypoint in $waypoints; do + + [ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint + +-echo ../router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $log +-$debugger ../router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $log ++echo ../routino-router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $log ++$debugger ../routino-router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $log + + mv shortest* $dir/$name-$waypoint + +--- routino-2.1.1.orig/src/test/start-1-finish.sh routino-2.1.1/src/test/start-1-finish.sh +@@ -73,8 +73,8 @@ for waypoint in $waypoints; do + + [ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint + +-echo ../router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_start $waypoint_test $waypoint_finish $log +-$debugger ../router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_start $waypoint_test $waypoint_finish $log ++echo ../routino-router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_start $waypoint_test $waypoint_finish $log ++$debugger ../routino-router$slim $option_dir $option_prefix $option_osm $option_router $waypoint_start $waypoint_test $waypoint_finish $log + + mv shortest* $dir/$name-$waypoint + +--- routino-2.1.1.orig/web/www/routino/paths.pl routino-2.1.1/web/www/routino/paths.pl +@@ -30,7 +30,7 @@ $data_dir=$root_dir/data; + $results_dir=$root_dir/results; + + # EDIT THIS to change the names of the executables (enables easy selection of slim mode). +-$router_exe=router; ++$router_exe=routino-router; + $filedumper_exe=filedumper; + + 1; diff --git a/debian/patches/series b/debian/patches/series index 5f9c716..edd41ec 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ install_path rename_router +fix_tests -- 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. 0208b8be5079986a90a0980c09593849155d168c
The following commit has been merged in the master branch: commit 0208b8be5079986a90a0980c09593849155d168c Author: Thibaut Gridel tgri...@free.fr Date: Wed Oct 26 22:28:03 2011 +0200 Installing Documentation diff --git a/debian/patches/install_documentation b/debian/patches/install_documentation new file mode 100644 index 000..176f84b --- /dev/null +++ b/debian/patches/install_documentation @@ -0,0 +1,14 @@ +Description: Install Documentation +Author: Thibaut Gridel tgri...@free.fr + +--- routino-2.1.1.orig/doc/Makefile routino-2.1.1/doc/Makefile +@@ -25,7 +25,7 @@ WEBDIR=../web/www/routino/documentation + # Files to install + + HTML_FILES=html/* +-TXT_FILES=*.txt ++TXT_FILES=ALGORITHM.txt CONFIGURATION.txt DATA.txt NEWS.txt OUTPUT.txt README.txt TAGGING.txt USAGE.txt + TOP_FILES=../agpl-3.0.txt + + diff --git a/debian/patches/series b/debian/patches/series index edd41ec..f947a2f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ install_path rename_router fix_tests +install_documentation -- 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
