From: Gilles Filippini Date: Tue, 17 Feb 2009 21:18:10 +0000 (+0100) Subject: Merging with bzed's package on alioth (first pass - need fixes). X-Git-Url: http://git.maemo.org/git/?a=commitdiff_plain;h=b04d6345aa7a6d166a244b6d4088ee4df4ced9d9;p=navit-package Merging with bzed's package on alioth (first pass - need fixes). --- diff --git a/debian/changelog b/debian/changelog index 92ebe71..4976782 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,158 @@ -navit (0.0.4+svn~20080823-1) experimental; urgency=low +navit (0.1.1.~svn2032-2) unstable; urgency=low - * Initial release (Closes: #451561) + * debian/rules: + + DEB_CONFIGURE_SCRIPT_ENV: removed experimental PKG_CONFIG_PATH of no use + right now. + + -- Gilles Filippini Fri, 13 Feb 2009 21:08:30 +0100 + +navit (0.1.1.~svn2032-1) unstable; urgency=low + + * New upstream release. + + * debian/rules: + + Switched to CDBS + * debian/copyright: + + Reworked to conform to revision 437 of CopyrightFormat proposal + available at http://wiki.debian.org/Proposals/CopyrightFormat + * debian/README.source: + + New file to keep track of packaging related issues + * debian/control: + + Set myself as the maintainer + + Bumped standard version to 3.8.0 + + Depends: + - Added cdbs, quilt, libsdl-image1.2-dev + - Replaced kdelibs4-dev with (librsvg2-bin|inkscape|kdebase-runtime| + kdelibs4-dev) to provides at least one of the svg to png converter + looked for by ./configure.in + * debian/changelog: + + Temporary change of the versioning scheme since I started erromeously + with 0.1.1+svnNNNN instead of 0.1.1~svnNNNN. I've added an extra dot + (0.1.1.~svnNNNN) until 0.1.1 is released. + * debian/navit.pl: removed since unused + * debian/navit.init: + + issues 'echo 2 > /proc/cpu/alignment' at boot time + * Patches: + + clean_pngs: remove generated png files during distclean-local so that + the package can afford two builds in a row. + + clean_pngs.autoreconf: modified Makefile.in from clean_pngs patch + + -- Gilles Filippini Fri, 13 Feb 2009 01:50:54 +0100 + +navit (0.1.1+svn2023-1) unstable; urgency=low + + * New upstream snapshot + * debian/control: Depends: added libtool + * debian/rules: + + copy ltmain.sh from libtool + * tweak the targets so that several builds in a row succeed + + -- Gilles Filippini Sat, 07 Feb 2009 12:07:03 +0100 + +navit (0.1.1+svn1966-1) unstable; urgency=low + + * New upstream snapshot + * debian/rules: CFLAGS: removed -g + * debian/control: Depends: added autotools-dev, cvs + + -- Gilles Filippini Sat, 24 Jan 2009 14:51:21 +0100 + +navit (0.1.1+svn1873-1) unstable; urgency=low + + * New upstream snapshot + * debian/rules: + + Added configure option --enable-svg2png-scaling-flag="8 16 32 48 96" to + enable country flag icons. + * debian/control: + + Build-Depends: kdelibs4-dev to enable country flag SVGs conversion to + PNG files. + + -- Gilles Filippini Tue, 30 Dec 2008 00:00:07 +0100 + +navit (0.1.1+svn1865-1) unstable; urgency=low + + * New upstream snapshot + * Rearranged source package to match the standard with a orig.tar.gz + pristine source tree and a diff.gz debian patch. + + -- Gilles Filippini Mon, 29 Dec 2008 11:12:02 +0100 + +navit (0.1.1+svn1863-1) unstable; urgency=low + + * New upstream snapshot + * debian/control: + + Depends: librsvg2-common + + -- Gilles Filippini Sun, 28 Dec 2008 21:52:39 +0100 + +navit (0.1.0+svn1857-1) unstable; urgency=low + + * New upstream snapshot + + -- Gilles Filippini Sun, 28 Dec 2008 11:42:04 +0100 + +navit (0.1.0+svn1843-1) unstable; urgency=low + + * New upstream snapshot + * Removed the navit.pl wrapper script which is too specific for openmoko. + * debian/control: + + removed gdsd version reference to enable fso-gpsd + + -- Gilles Filippini Tue, 23 Dec 2008 00:52:01 +0100 + +navit (0.0.4+svn1229-3) unstable; urgency=low + + * fixed a small bug in navit.pl: delete LC_ALL from the environment, instead + of only undefining it. + + -- Carsten Wolff Sat, 25 Oct 2008 21:07:46 +0200 + +navit (0.0.4+svn1229-2) unstable; urgency=low + + * Added new startup script. This script will: + - check, if gpsd is running and try to start it + - if it fails, it will run dpkg-reconfigure gpsd + - check, if a navit.xml exists in the user's home + - if not, create one and download an osm map, the user selects from a list + + -- Carsten Wolff Thu, 6 Sep 2008 18:30:23 +0200 + +navit (0.0.4+svn1229-1) unstable; urgency=low + + * New upstream snapshot + + -- Carsten Wolff Thu, 24 Jul 2008 00:25:53 +0200 + +navit (0.0.4+svn1205-1) unstable; urgency=low + + * New upstream snapshot + * enabled garmin map support + + -- Carsten Wolff Sat, 12 Jul 2008 17:43:36 +0200 + +navit (0.0.4+cvs20080525-2) unstable; urgency=low + + * put a wrapper in place of the navit binary to take care of setting the + right environment for navit + + -- Carsten Wolff Mon, 26 May 2008 19:02:13 +0200 + +navit (0.0.4+cvs20080525-1) unstable; urgency=low + + * New cvs version + + -- Carsten Wolff Mon, 26 May 2008 14:58:50 +0200 + +navit (0.0.4+cvs20080419-1) unstable; urgency=low + + * todays CVS version + * added some dependencies + + -- Carsten Wolff Sat, 19 Apr 2008 18:37:24 +0200 + +navit (0.0.4+cvs20080418-1) unstable; urgency=low + + * Initial release + + -- Carsten Wolff Fri, 18 Apr 2008 23:28:24 +0200 - -- Bernd Zeimetz Sat, 23 Aug 2008 17:03:12 +0200 diff --git a/debian/control b/debian/control index 42fa7da..88fa78a 100644 --- a/debian/control +++ b/debian/control @@ -1,20 +1,13 @@ Source: navit Section: misc Priority: extra -Maintainer: Bernd Zeimetz -Build-Depends: debhelper (>= 5), quilt, - libtool, automake, autoconf, freeglut3-dev, libpq-dev, - mdbtools-dev, libspeechd-dev, libatk1.0-dev, libcairo2-dev, - libdbus-1-dev, libdbus-glib-1-dev, libfontconfig1-dev, - libfreetype6-dev, libglib2.0-dev, libgps-dev, libgtk2.0-dev, - libimlib2-dev, libpango1.0-dev, libspeechd-dev, python-dev, - libsdl1.2-dev, libqt4-dev, libqt4-opengl-dev, zlib1g-dev, - libsdl-image1.2-dev, libcegui-mk2-dev, libglc-dev, - libclutter-0.8-dev, - libfreetype6-dev, libpcre3-dev, libxerces-c2-dev, - libdevil-dev, libpng12-dev, libtiff4-dev, libjpeg62-dev, - libmng-dev, - libfribidi-dev +Maintainer: Gilles Filippini +Build-Depends: cdbs, autotools-dev, libtool, quilt, libdevil-dev, + libgtk2.0-dev, libsdl1.2-dev, libcegui-mk2-dev (>= 0.6.1), + libglc-dev (>= 0.7.1), libspeechd-dev, libgps-dev (>= 2.37), glutg3-dev, + libimlib2-dev, libdbus-1-dev, libxml2-dev, libfribidi-dev, + libgarmin-dev, libsdl-image1.2-dev, + librsvg2-bin | inkscape | kdebase-runtime | kdelibs4-dev Standards-Version: 3.8.0 Homepage: http://navit.sourceforge.net/ Vcs-Browser: http://git.debian.org/?p=collab-maint/navit.git;a=summary @@ -25,4 +18,17 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: gpsd Description: Car navigation system with routing engine - + Navit is a car navigation system with routing engine. + . + Its modular design is capable of using vector maps of various formats for + routing and rendering of the displayed map. It's even possible to use multiple + maps at a time. + . + The GTK+ or SDL user interfaces are designed to work well with touch screen + displays. Points of Interest of various formats are displayed on the map. + . + The current vehicle position is either read from gpsd or directly from NMEA + GPS sensors. + . + The routing engine not only calculates an optimal route to your destination, + but also generates directions and even speaks to you using speech-dispatcher. diff --git a/debian/copyright b/debian/copyright index 814e78c..9c62090 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,96 +1,107 @@ -This package was debianized by Bernd Zeimetz on -Sat, 23 Aug 2008 13:19:50 +0200. - -It was downloaded using svn from - https://navit.svn.sourceforge.net/svnroot/navit/ - -Upstream Author(s): - - Michael Farmbauer - Martin Schaller - Pierre Grandin - Alexander Atanasov - - And all the Navit Team members and contributors. - See - http://wiki.navit-project.org/index.php/Navit_project_members_and_contributors - for the full list! - - -Copyright: - - Copyright 2005 - 2008 Navit Team - -License: - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - version 2 as published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. - - -On Debian systems, the complete text of the GNU General -Public License, version 2, can be found in -`/usr/share/common-licenses/GPL-2'. - -The Debian packaging is (C) 2008, Bernd Zeimetz and -is licensed under the same license as Navit, see above. - - -Files with different licenses and/or copyrights: - - * navit/data/garmin/*.h - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License - version 2 as published by the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. - - On Debian systems, the complete text of the GNU Library General - Public License, version 2, can be found in - `/usr/share/common-licenses/LGPL-2'. - - - - -*** FIXME *** - -navit/graphics/sdl - - - -navit/fib-1.1 - -REMOVE!!! -navit/data/poi_geodownload/libmdb/*.c -navit/data/poi_geodownload/libmdb/include/*.h - -REMOVE!!!! -navit/gui/cegui/datafiles/fonts - - -!???? -navit/tools/latlon2bookmark.c - -REMOVE: -/projs/CodeBlocks - - +Format-Specification: + http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=437 +Upstream-Name: navit +Upstream-Maintainer: + Martin Schaller + Michael Farmbauer + Pierre Grandin + Alexander Atanasov + Bryan Rittmeyer + http://wiki.navit-project.org/index.php/Navit_project_members_and_contributors +Upstream-Source: + http://www.navit-project.org/ + +Files: * +Copyright: © 2005-2008 Navit Team +License: GPL-2 + +Files: navit/*.h +Copyright: © 2005-2008 Navit Team +License: LGPL-2 + +Files: navit/atom.h, navit/cache.h, navit/command.h, navit/event_glib.h, + navit/keys.h, navit/navit_nls.h, navit/window.h +Copyright: © 2005-2008 Navit Team +License: GPL-2 + +Files: navit/graphics/sdl/* +Copyright: © 2005-2008 Bryan Rittmeyer +License: LGPL-2 + +Files: navit/graphics/sdl/graphics_sdl.c +Copyright: © 2005-2008 Bryan Rittmeyer +License: GPL-2 + +Files: navit/script/osm/Utils/*, navit/script/osm/Geo/Tracks/* +Copyright: © 2006 Jörg Ostertag +License: GPL-2+ + +Files: navit/script/osm/Utils/*, navit/script/osm/Geo/Tracks/*, + navit/script/osm/Geo/GPX/*, navit/script/osm/Geo/Filter/*, + navit/script/osm/Geo/Geometry.pm, navit/script/osm/Geo/OSM/MapFeatures.pm, + navit/script/osm/Geo/OSM/Planet.pm, navit/script/osm/Geo/OSM/SegmentList.pm, + navit/script/osm/Geo/OSM/Tracks2OSM.pm, navit/script/osm/Geo/OSM/Upload.pm, + navit/script/osm/Geo/OSM/Write.pm +Copyright: © 2006 Jörg Ostertag +License: GPL-2+ + +Files: navit/script/osm/Geo/Tracks/OziExplorer.pm +Copyright: © 2006 2008, Matthias Pitzl +License: GPL-2+ + +Files: navit/script/osm/Geo/OSM/OsmXML.pm +Copyright: © 2006 Oliver White +License: GPL-2+ + +Files: navit/script/osm/Geo/OSM/APIClient*.pm, + navit/script/osm/Geo/OSM/Entities*.pm, + navit/script/osm/Geo/OSM/OsmChangeReader*.pm, + navit/script/osm/Geo/OSM/OsmReader*.pm +Copyright: © 2007-2008 Martijn van Oosterhout +License: LGPL + +Files: navit/fib-1.1/* +Copyright: © 1997-2003 John-Mark Gurney +License: FreeBSD + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +Files: debian/* +Copyright: © 2008 Carsten Wolff +Copyright: © 2008 Bernd Zeimetz +Copyright: © 2008-2009 Gilles Filippini +License: GPL-2+ + +License: GPL-2 + On Debian systems the full text of the GNU General Public License version 2 + can be found in the `/usr/share/common-licenses/GPL-2' file. + +License: GPL-2+ + On Debian systems the full text of the GNU General Public License version 2 + can be found in the `/usr/share/common-licenses/GPL-2' file. + +License: LGPL-2 + On Debian systems the full text of the GNU Lesser General Public License + version 2 can be found in the `/usr/share/common-licenses/LGPL-2' file. + +License: LGPL + On Debian systems the full text of the GNU Lesser General Public License + can be found in the `/usr/share/common-licenses/LGPL' file. diff --git a/debian/patches/autoreconf b/debian/patches/autoreconf new file mode 100644 index 0000000..a725666 --- /dev/null +++ b/debian/patches/autoreconf @@ -0,0 +1,76 @@ +Index: navit-0.1.1.~svn2032/navit/xpm/Makefile.in +=================================================================== +--- navit-0.1.1.~svn2032.orig/navit/xpm/Makefile.in 2009-02-13 00:20:36.000000000 +0100 ++++ navit-0.1.1.~svn2032/navit/xpm/Makefile.in 2009-02-13 00:26:58.000000000 +0100 +@@ -35,10 +35,10 @@ + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/Makefile.inc + @USE_SVG_TRUE@am__append_1 = $(svgs) +-@USE_SVG2PNG_TRUE@am__append_2 = $(addsuffix .png,$(basename $(svgs))) +-@USE_SVG2PNG_SCALES_TRUE@@USE_SVG2PNG_TRUE@am__append_3 = $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(svgs)))) +-@USE_SVG2PNG_SCALES_FLAG_TRUE@@USE_SVG2PNG_TRUE@am__append_4 = $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES_FLAG@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(flag_svgs)))) +-@USE_SVG2PNG_SCALES_NAV_TRUE@@USE_SVG2PNG_TRUE@am__append_5 = $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES_NAV@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(nav_svgs)))) ++@USE_SVG2PNG_SCALES_TRUE@@USE_SVG2PNG_TRUE@am__append_2 = $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(svgs)))) ++@USE_SVG2PNG_SCALES_FLAG_TRUE@@USE_SVG2PNG_TRUE@am__append_3 = $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES_FLAG@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(flag_svgs)))) ++@USE_SVG2PNG_SCALES_NAV_TRUE@@USE_SVG2PNG_TRUE@am__append_4 = $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES_NAV@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(nav_svgs)))) ++@USE_SVG2PNG_TRUE@am__append_5 = $(pngs) + subdir = navit/xpm + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/configure.in +@@ -324,8 +324,7 @@ + traffic_signals.xpm trailerpark.xpm unknown.xpm wifi.xpm \ + viewpoint.xpm zoo.xpm zoom_in.xpm zoom_out.xpm \ + toggle_fullscreen.xpm menu.xpm school.xpm public_office.xpm \ +- $(am__append_1) $(am__append_2) $(am__append_3) \ +- $(am__append_4) $(am__append_5) ++ $(am__append_1) $(am__append_5) + svgs = gui_actions.svg gui_active.svg gui_bookmark.svg gui_display.svg \ + gui_help.svg gui_home.svg gui_inactive.svg gui_map.svg \ + gui_maps.svg gui_rules.svg gui_settings.svg gui_sound.svg \ +@@ -443,6 +442,9 @@ + country_VN.svgz country_VU.svgz country_WF.svgz \ + country_WS.svgz country_YE.svgz country_YT.svgz \ + country_ZA.svgz country_ZM.svgz country_ZW.svgz ++@USE_SVG2PNG_TRUE@pngs = $(addsuffix .png,$(basename $(svgs))) \ ++@USE_SVG2PNG_TRUE@ $(am__append_2) $(am__append_3) \ ++@USE_SVG2PNG_TRUE@ $(am__append_4) + @USE_SVG2PNG_TRUE@xsize = $(firstword $(subst x, ,$(scale))) + @USE_SVG2PNG_TRUE@ysize = $(lastword $(subst x, ,$(scale))) + @USE_SVG2PNG_TRUE@comma = , +@@ -623,13 +625,14 @@ + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." ++@USE_SVG2PNG_FALSE@distclean-local: + clean: clean-am + + clean-am: clean-generic clean-libtool mostlyclean-am + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic ++distclean-am: clean-am distclean-generic distclean-local + + dvi: dvi-am + +@@ -682,8 +685,8 @@ + .MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install \ ++ distclean distclean-generic distclean-libtool distclean-local \ ++ distdir dvi dvi-am html html-am info info-am install \ + install-DESKTOPFILEDATA install-ICON128DATA install-ICON22DATA \ + install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ +@@ -701,6 +704,9 @@ + @USE_SVG2PNG_TRUE@ SRCDIR=$(srcdir) $(srcdir)/navit_svg2png "@SVG2PNG@" "$@" + #burgerking.ico: + # wget http://www.burgerking.de/favicon.ico -O burgerking.ico ++ ++@USE_SVG2PNG_TRUE@distclean-local: ++@USE_SVG2PNG_TRUE@ rm -f $(pngs) + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff --git a/debian/patches/clean_pngs b/debian/patches/clean_pngs new file mode 100644 index 0000000..9756ac4 --- /dev/null +++ b/debian/patches/clean_pngs @@ -0,0 +1,38 @@ +Index: navit-0.1.1.~svn2032/navit/xpm/Makefile.am +=================================================================== +--- navit-0.1.1.~svn2032.orig/navit/xpm/Makefile.am 2009-02-13 00:19:17.000000000 +0100 ++++ navit-0.1.1.~svn2032/navit/xpm/Makefile.am 2009-02-13 00:24:45.000000000 +0100 +@@ -181,19 +181,20 @@ + if USE_SVG2PNG + %.png:$(srcdir)/*.svg + SRCDIR=$(srcdir) $(srcdir)/navit_svg2png "@SVG2PNG@" "$@" +-xpm_DATA += $(addsuffix .png,$(basename $(svgs))) ++pngs = $(addsuffix .png,$(basename $(svgs))) + xsize=$(firstword $(subst x, ,$(scale))) + ysize=$(lastword $(subst x, ,$(scale))) + comma=, + if USE_SVG2PNG_SCALES +-xpm_DATA += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(svgs)))) ++pngs += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(svgs)))) + endif + if USE_SVG2PNG_SCALES_FLAG +-xpm_DATA += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES_FLAG@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(flag_svgs)))) ++pngs += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES_FLAG@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(flag_svgs)))) + endif + if USE_SVG2PNG_SCALES_NAV +-xpm_DATA += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES_NAV@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(nav_svgs)))) ++pngs += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES_NAV@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(nav_svgs)))) + endif ++xpm_DATA += $(pngs) + endif + + DESKTOPFILEdir=$(datadir)/applications +@@ -208,3 +209,8 @@ + EXTRA_DIST = $(xpm_DATA) $(DESKTOPFILE_DATA) $(ICON128_DATA) $(ICON22_DATA) navit_svg2png + #burgerking.ico: + # wget http://www.burgerking.de/favicon.ico -O burgerking.ico ++ ++if USE_SVG2PNG ++distclean-local: ++ rm -f $(pngs) ++endif diff --git a/debian/patches/series b/debian/patches/series index 87878e0..d470b6c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,3 @@ +clean_pngs remove-libmdb.diff +autoreconf diff --git a/debian/rules b/debian/rules index 2a24220..78824f8 100755 --- a/debian/rules +++ b/debian/rules @@ -1,164 +1,38 @@ #!/usr/bin/make -f -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk -include /usr/share/quilt/quilt.make +# svg2png is required to display country flags +DEB_CONFIGURE_EXTRA_FLAGS += --enable-svg2png-scaling-flag="8 16 32 48 96" - -#let's help configure to figure out our host/build system -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) - CONFFLAGS += --build $(DEB_HOST_GNU_TYPE) -else - CONFFLAGS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) -endif - -#disable gypsy support as there's no gypsy in Debian -CONFFLAGS += --disable-gypsy - -#use posix threads -CONFFLAGS += --enable-threads - -#configure options for paths to use -CONFFLAGS += --prefix=/usr --docdir=/usr/share/doc/navit +#OpenGL is broken +DEB_CONFIGURE_EXTRA_FLAGS += --disable-gui-clutter #don't build the samplemap - we don't want to download #stuff while building... -CONFFLAGS += --disable-samplemap - -#OpenGL is broken -CONFFLAGS += --disable-gui-clutter - -#let's take care of optimization + debug builds -CFLAGS += -Wall -g -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -config-stamp: $(QUILT_STAMPFN) - [ -f configure ] || sh autogen.sh - LDFLAGS="$(LINKER_FLAGS)" \ - CFLAGS="$(CFLAGS)" \ - ./configure $(CONFFLAGS) - touch $@ +DEB_CONFIGURE_EXTRA_FLAGS += --disable-samplemap +#disable gypsy support as there's no gypsy in Debian +DEB_CONFIGURE_EXTRA_FLAGS += --disable-gypsy -build: build-stamp -build-stamp: config-stamp - dh_testdir - - $(MAKE) - - touch $@ - -clean: clean-patched unpatch -clean-patched: - dh_testdir - dh_testroot - rm -f build-stamp config-stamp - - # Add here commands to clean up after the build process. - [ ! -f Makefile ] || $(MAKE) distclean - find $(CURDIR) -name Makefile.in -print0 | xargs -0 rm -f - find $(CURDIR)/intl -mindepth 1 -name VERSION -o -type f -print0 | xargs -0 rm -f - find $(CURDIR)/po -mindepth 1 -name '*.po' -o -name Makefile.am -o -print0 | xargs -0 rm -f - find $(CURDIR)/navit/xpm -mindepth 1 -maxdepth 1 -name '*.xpm' -o -name 'osd_*.png' -o -type f -name '*.png' -print0 | xargs -0 rm -f - rm -f ABOUT-NLS INSTALL aclocal.m4 compile config.guess \ - config.h.in config.rpath config.sub configure depcomp \ - install-sh missing mkinstalldirs ltmain.sh - rm -rf autom4te.cache m4 - rm -f navit/graphics/cogl/graphics_cogl.loT - - dh_clean - -install: -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - - # Add here commands to install the package into debian/tmp. - $(MAKE) install DESTDIR=$(CURDIR)/debian/navit - - mv $(CURDIR)/debian/navit/usr/share/navit/navit.xml \ - $(CURDIR)/debian/navit/etc/navit +#use posix threads +DEB_CONFIGURE_EXTRA_FLAGS += --enable-threads - mv $(CURDIR)/debian/navit/usr/share/navit/README \ - $(CURDIR)/debian/navit/usr/share/doc/navit +DEB_CONFIGURE_SCRIPT_ENV += CFLAGS="-Wall" - dh_install +DEB_DH_INSTALLINIT_ARGS = -- start 20 S . -# Build architecture-independent files here. -binary-indep: build install - dh_testdir -i - dh_testroot -i - dh_installchangelogs -i - dh_installdocs -i - dh_installexamples -i -# dh_installmenu -i -# dh_installdebconf -i -# dh_installlogrotate -i -# dh_installemacsen -i -# dh_installcatalogs -i -# dh_installpam -i -# dh_installmime -i -# dh_installinit -i -# dh_installcron -i -# dh_installinfo -i -# dh_installwm -i -# dh_installudev -i -# dh_lintian -i -# dh_undocumented -i - dh_installman -i - dh_link -i - dh_compress -i - dh_fixperms -i -# dh_perl -i -# dh_python -i - dh_installdeb -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i +# Yes... I know... Quite ugly! +post-patches:: post-patches-stamp -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir -a - dh_testroot -a - dh_installchangelogs -a - dh_installdocs -a - dh_installexamples -a - dh_installmenu -a -# dh_installdebconf -a -# dh_installlogrotate -a -# dh_installemacsen -a -# dh_installcatalogs -a -# dh_installpam -a -# dh_installmime -a -# dh_installinit -a -# dh_installcron -a -# dh_installinfo -a -# dh_installwm -a -# dh_installudev -a -# dh_lintian -a -# dh_undocumented -a - dh_installman -a - dh_strip -a - dh_link -a - dh_compress -a - dh_fixperms -a -# dh_perl -a -# dh_python -a -# dh_makeshlibs -a - dh_installdeb -a - dh_shlibdeps -a - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a +post-patches-stamp: Makefile.in + touch aclocal.m4 + touch config.h.in + touch configure + find $(CURDIR) -name Makefile.in -exec touch {} \; + touch post-patches-stamp -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +clean:: + rm -f post-patches-stamp