[Pkg-osm-commits] [SCM] monav branch, master, updated. upstream/0.2+svn405-36-g350b43d

[David Paleino]

The following commit has been merged in the master branch:
commit 48f5ed3ac4aaa0619fda93cad049345b599ad028
Author: David Paleino <dapal at debian.org>
Date:   Tue Jan 11 16:25:31 2011 +0100

    Add patch to fix some easy source code typos

diff --git a/debian/patches/03-fix_source_typos.patch b/debian/patches/03-fix_source_typos.patch
new file mode 100644
index 0000000..93498ff
--- /dev/null
+++ b/debian/patches/03-fix_source_typos.patch
@@ -0,0 +1,40 @@
+From: David Paleino <dapal at debian.org>
+Subject: fix some lintian-spotted typos
+Forwarded: no
+
+---
+ client/mapview.cpp                   |    4 ++--
+ plugins/osmrenderer/rendererbase.cpp |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+--- monav.orig/client/mapview.cpp
++++ monav/client/mapview.cpp
+@@ -146,7 +146,7 @@ void MapView::setupMenu()
+ 	m_sourceByTapAction = m_sourceMenu->addAction( QIcon( ":/images/map.png" ), tr( "Tap on Map" ), this, SLOT(setModeSourceSelection()) );
+ 	m_sourceByBookmarkAction = m_sourceMenu->addAction( QIcon( ":/images/oxygen/bookmarks.png" ), tr( "Bookmark" ), this, SLOT(sourceByBookmark()) );
+ 	m_sourceByAddressAction = m_sourceMenu->addAction( QIcon( ":/images/address.png" ), tr( "Address" ), this, SLOT(sourceByAddress()) );
+-	m_sourceByAddressAction = m_sourceMenu->addAction( QIcon( ":/images/oxygen/network-wireless.png" ), tr( "GPS Reciever" ), this, SLOT(sourceByGPS()) );
++	m_sourceByAddressAction = m_sourceMenu->addAction( QIcon( ":/images/oxygen/network-wireless.png" ), tr( "GPS Receiver" ), this, SLOT(sourceByGPS()) );
+ 
+ 	m_sourceOverlay = new OverlayWidget( this, tr( "Departure" ) );
+ 	m_sourceOverlay->addActions( m_sourceMenu->actions() );
+@@ -173,7 +173,7 @@ void MapView::setupMenu()
+ 	m_settingsRenderer = m_settingsMenu->addAction( QIcon( ":/images/map.png" ), tr( "Renderer" ), this, SLOT(settingsRenderer()) );
+ 	m_settingsRouter = m_settingsMenu->addAction( QIcon( ":/images/route.png" ), tr( "Router" ), this, SLOT(settingsRouter()) );
+ 	m_settingsAddressLookup = m_settingsMenu->addAction( QIcon( ":/images/address.png" ), tr( "Address Lookup" ), this, SLOT(settingsAddressLookup()) );
+-	m_settingsGPS = m_settingsMenu->addAction( QIcon( ":/images/oxygen/hwinfo.png" ), tr( "GPS Reciever" ), this, SLOT(settingsGPS()) );
++	m_settingsGPS = m_settingsMenu->addAction( QIcon( ":/images/oxygen/hwinfo.png" ), tr( "GPS Receiver" ), this, SLOT(settingsGPS()) );
+ 
+ 	m_settingsOverlay = new OverlayWidget( this, tr( "Settings" ) );
+ 	m_settingsOverlay->addActions( m_settingsMenu->actions() );
+--- monav.orig/plugins/osmrenderer/rendererbase.cpp
++++ monav/plugins/osmrenderer/rendererbase.cpp
+@@ -207,7 +207,7 @@ bool RendererBase::Paint( QPainter* pain
+ 
+ 					long long minCacheSize = 2 * m_tileSize * m_tileSize * tile->depth() / 8 * ( maxX - minX ) * ( maxY - minY );
+ 					if ( m_cache.maxCost() < minCacheSize ) {
+-						qDebug() << "had to increase cache size to accomodate all tiles for at least two images: " << minCacheSize / 1024 / 1024 << " MB";
++						qDebug() << "had to increase cache size to accommodate all tiles for at least two images: " << minCacheSize / 1024 / 1024 << " MB";
+ 						m_cache.setMaxCost( minCacheSize );
+ 					}
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 3ab3080..fec5780 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-fix_daemon_compilation.patch
 02-toll-booth_routing.patch
+03-fix_source_typos.patch

-- 
fast navigation system featuring exact routing