[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 1226f82cf2c4fde6a17ea8252c1d4016f7d956ac
Author: David Paleino <dapal at debian.org>
Date:   Fri Mar 11 16:38:05 2011 +0100

    Patches refreshed, 03-fix_source_typos.patch removed (merged upstream)

diff --git a/debian/changelog b/debian/changelog
index 4c045a8..9e5a853 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ monav (0.2+svn450-1) UNRELEASED; urgency=low
 
   * New upstream snapshot
   * Refresh information in debian/copyright
+  * Patches refreshed, 03-fix_source_typos.patch removed (merged
+    upstream)
 
- -- David Paleino <dapal at debian.org>  Fri, 11 Mar 2011 16:32:35 +0100
+ -- David Paleino <dapal at debian.org>  Fri, 11 Mar 2011 16:37:37 +0100
 
 monav (0.2+svn405-1) experimental; urgency=low
 
diff --git a/debian/patches/01-fix_daemon_compilation.patch b/debian/patches/01-fix_daemon_compilation.patch
index e6e69e3..89949ab 100644
--- a/debian/patches/01-fix_daemon_compilation.patch
+++ b/debian/patches/01-fix_daemon_compilation.patch
@@ -8,10 +8,10 @@ Forwarded: no
 
 --- monav.orig/routingdaemon/routingdaemon.pro
 +++ monav/routingdaemon/routingdaemon.pro
-@@ -4,7 +4,6 @@ DESTDIR = ../bin
- INCLUDEPATH += ..
+@@ -6,7 +6,6 @@ INCLUDEPATH += ..
+ DEFINES+=_7ZIP_ST
  
- TARGET = MoNavD
+ TARGET = monav-daemon
 -QT -= gui
  QT +=network
  
diff --git a/debian/patches/02-toll-booth_routing.patch b/debian/patches/02-toll-booth_routing.patch
index 722e970..eda2ad9 100644
--- a/debian/patches/02-toll-booth_routing.patch
+++ b/debian/patches/02-toll-booth_routing.patch
@@ -4,9 +4,13 @@ Forwarded: no
 
 ---
 
---- monav-0.2+svn405.orig/plugins/osmimporter/osmimporter.cpp
-+++ monav-0.2+svn405/plugins/osmimporter/osmimporter.cpp
-@@ -1296,6 +1296,10 @@ void OSMImporter::readNode( OSMImporter:
+---
+ plugins/osmimporter/osmimporter.cpp |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- monav.orig/plugins/osmimporter/osmimporter.cpp
++++ monav/plugins/osmimporter/osmimporter.cpp
+@@ -1299,6 +1299,10 @@ void OSMImporter::readNode( OSMImporter:
  				}
  			case NodeTags::Barrier:
  				{
@@ -14,6 +18,6 @@ Forwarded: no
 +						node->access = true;
 +						break;
 +					}
- 					if ( node->accessPriority == m_settings.accessList.size() )
+ 					if ( node->accessPriority == m_profile.accessList.size() )
  						node->access = false;
  					break;
diff --git a/debian/patches/03-fix_source_typos.patch b/debian/patches/03-fix_source_typos.patch
deleted file mode 100644
index 93498ff..0000000
--- a/debian/patches/03-fix_source_typos.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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 fec5780..3ab3080 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01-fix_daemon_compilation.patch
 02-toll-booth_routing.patch
-03-fix_source_typos.patch

-- 
fast navigation system featuring exact routing