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
