From 5f7ecd9c8b72dc9333b9e4a0d1b2b70ea2c3b248 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Sat, 23 Jan 2010 03:39:07 +0100 Subject: [PATCH] * use .links for more optify stuff fix harder the right package layout --- debian/maptool.install | 2 +- debian/maptool.links | 1 + debian/navit.install | 22 +++++++++++----------- debian/navit.links | 1 + debian/rules | 3 +-- 5 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 debian/maptool.links create mode 100644 debian/navit.links diff --git a/debian/maptool.install b/debian/maptool.install index 61ca1ed..311ebc1 100644 --- a/debian/maptool.install +++ b/debian/maptool.install @@ -1 +1 @@ -debian/tmp/usr/bin/maptool +opt/navit/bin/maptool diff --git a/debian/maptool.links b/debian/maptool.links new file mode 100644 index 0000000..4b168b0 --- /dev/null +++ b/debian/maptool.links @@ -0,0 +1 @@ +opt/navit/bin/maptool usr/bin/maptool diff --git a/debian/navit.install b/debian/navit.install index c2282f6..67f9bb1 100644 --- a/debian/navit.install +++ b/debian/navit.install @@ -1,11 +1,11 @@ -debian/tmp/opt/navit/lib/navit/map/*.so -debian/tmp/opt/navit/lib/navit/osd/*.so -debian/tmp/opt/navit/lib/navit/binding/*.so -debian/tmp/opt/navit/lib/navit/speech/*.so -debian/tmp/opt/navit/lib/navit/vehicle/*.so -debian/tmp/opt/navit/lib/navit/font/*.so -debian/tmp/opt/navit/lib/navit/graphics/libgraphics_null*.so -debian/tmp/opt/navit/share/applications/navit.desktop /usr/share/applications/hildon -debian/tmp/opt/navit/share/applications/org.navit-project.Navit.service /usr/share/dbus-1/services -debian/tmp/opt/navit/bin/navit -/etc/navit/ +opt/navit/lib/navit/map/*.so +opt/navit/lib/navit/osd/*.so +opt/navit/lib/navit/binding/*.so +opt/navit/lib/navit/speech/*.so +opt/navit/lib/navit/vehicle/*.so +opt/navit/lib/navit/font/*.so +opt/navit/lib/navit/graphics/libgraphics_null*.so +opt/navit/share/applications/navit.desktop usr/share/applications/hildon +opt/navit/share/dbus-1/services/org.navit_project.navit.service usr/share/dbus-1/services +opt/navit/bin/navit +opt/navit/share/navit/navit.xml etc/navit/ diff --git a/debian/navit.links b/debian/navit.links new file mode 100644 index 0000000..486863d --- /dev/null +++ b/debian/navit.links @@ -0,0 +1 @@ +opt/navit/bin/navit usr/bin/navit diff --git a/debian/rules b/debian/rules index 050ea1b..8a8f935 100755 --- a/debian/rules +++ b/debian/rules @@ -19,8 +19,7 @@ else DEB_CONFIGURE_EXTRA_FLAGS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) endif -DEB_CONFIGURE_EXTRA_FLAGS += --prefix=/opt/navit \ - --sysconfdir=/etc +DEB_CONFIGURE_EXTRA_FLAGS += --prefix=/opt/navit # scale all gui icons DEB_CONFIGURE_EXTRA_FLAGS += --enable-svg2png-scaling="32 48 64" \ -- 1.7.9.5