[Pkg-osm-commits] [SCM] monav branch, master, updated. debian/0.2+svn450-1-4-g6058418
David Paleino
dapal at debian.org
Sat Apr 23 17:22:44 UTC 2011
The following commit has been merged in the master branch:
commit 6058418423631db3fa987427db94e284efe208e3
Author: David Paleino <dapal at debian.org>
Date: Sat Apr 23 19:22:15 2011 +0200
Patches refreshed
diff --git a/debian/changelog b/debian/changelog
index fbd38ee..d033f31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
monav (0.3-1) UNRELEASED; urgency=low
* New upstream version
+ * Patches refreshed
- -- David Paleino <dapal at debian.org> Sat, 23 Apr 2011 19:21:39 +0200
+ -- David Paleino <dapal at debian.org> Sat, 23 Apr 2011 19:22:00 +0200
monav (0.2+svn450-1) unstable; urgency=low
diff --git a/debian/patches/01-fix_build_issues.patch b/debian/patches/01-fix_build_issues.patch
index f46ab24..aec17ed 100644
--- a/debian/patches/01-fix_build_issues.patch
+++ b/debian/patches/01-fix_build_issues.patch
@@ -6,8 +6,7 @@ Forwarded: no
---
preprocessor/preprocessor.pro | 1 -
routingdaemon/routingdaemon.pro | 1 -
- utils/log.cpp | 2 +-
- 3 files changed, 1 insertion(+), 3 deletions(-)
+ 2 files changed, 2 deletions(-)
--- monav.orig/routingdaemon/routingdaemon.pro
+++ monav/routingdaemon/routingdaemon.pro
@@ -29,14 +28,3 @@ Forwarded: no
DEFINES+=_7ZIP_ST
---- monav.orig/utils/log.cpp
-+++ monav/utils/log.cpp
-@@ -67,7 +67,7 @@ Log::~Log()
- }
-
- // returns the only instance of the log
--Log::Log* Log::instance()
-+Log* Log::instance()
- {
- static Log log;
- return &log;
diff --git a/debian/patches/02-toll-booth_routing.patch b/debian/patches/02-toll-booth_routing.patch
index eda2ad9..edbf943 100644
--- a/debian/patches/02-toll-booth_routing.patch
+++ b/debian/patches/02-toll-booth_routing.patch
@@ -10,7 +10,7 @@ Forwarded: no
--- monav.orig/plugins/osmimporter/osmimporter.cpp
+++ monav/plugins/osmimporter/osmimporter.cpp
-@@ -1299,6 +1299,10 @@ void OSMImporter::readNode( OSMImporter:
+@@ -1301,6 +1301,10 @@ void OSMImporter::readNode( OSMImporter:
}
case NodeTags::Barrier:
{
diff --git a/debian/patches/03-dont_embed_resources.patch b/debian/patches/03-dont_embed_resources.patch
index c51479c..b707f84 100644
--- a/debian/patches/03-dont_embed_resources.patch
+++ b/debian/patches/03-dont_embed_resources.patch
@@ -6,17 +6,16 @@ Forwarded: no
---
client/client.pro | 2 -
client/descriptiongenerator.h | 20 +++++++-------
- client/mainwindow.cpp | 46 +++++++++++++++++-----------------
- client/mainwindow.ui | 47 ++++++++++++++++-------------------
- client/placechooser.ui | 19 +++++---------
- client/streetchooser.ui | 11 ++------
+ client/mainwindow.cpp | 50 +++++++++++++++++------------------
+ client/mainwindow.ui | 20 +++++++-------
+ client/placechooser.ui | 19 +++++--------
+ client/streetchooser.ui | 11 ++-----
client/worldmapchooser.cpp | 2 -
preprocessor/aboutdialog.ui | 5 ---
preprocessor/preprocessingwindow.cpp | 16 +++++------
preprocessor/preprocessingwindow.ui | 5 ---
preprocessor/preprocessor-gui.pro | 1
- preprocessor/preprocessor.pro | 1
- 12 files changed, 78 insertions(+), 97 deletions(-)
+ 11 files changed, 68 insertions(+), 83 deletions(-)
--- monav.orig/client/client.pro
+++ monav/client/client.pro
@@ -107,20 +106,22 @@ Forwarded: no
else
--- monav.orig/client/mainwindow.cpp
+++ monav/client/mainwindow.cpp
-@@ -159,47 +159,47 @@ void MainWindow::connectSlots()
+@@ -172,45 +172,45 @@ void MainWindow::connectSlots()
void MainWindow::setupMenu()
{
d->gotoMenu = new QMenu( tr( "Show" ), this );
-- d->gotoMenu->addAction( QIcon( ":/images/oxygen/network-wireless.png" ), tr( "GPS-Location" ), this, SLOT(gotoGPS()) );
+- d->gotoMenu->addAction( QIcon( ":/images/oxygen/network-wireless.png" ), tr( "GPS-Location" ), this, SLOT(gotoGpsLocation()) );
- d->gotoMenu->addAction( QIcon( ":/images/source.png" ), tr( "Departure" ), this, SLOT(gotoSource()) );
- d->gotoMenu->addAction( QIcon( ":/images/target.png" ), tr( "Destination" ), this, SLOT(gotoTarget()) );
-- d->gotoMenu->addAction( QIcon( ":/images/oxygen/bookmarks.png" ), tr( "Bookmark" ), this, SLOT(gotoBookmark()) );
-- d->gotoMenu->addAction( QIcon( ":/images/address.png" ), tr( "Address" ), this, SLOT(gotoAddress()) );
+- d->gotoMenu->addAction( QIcon( ":/images/oxygen/bookmarks.png" ), tr( "Bookmark..." ), this, SLOT(gotoBookmark()) );
+- d->gotoMenu->addAction( QIcon( ":/images/address.png" ), tr( "Address..." ), this, SLOT(gotoAddress()) );
+- d->gotoMenu->addAction( QIcon( ":/images/oxygen/network-wireless.png" ), tr( "GPS-Coordinate..." ), this, SLOT(gotoGpsCoordinate()) );
+ d->gotoMenu->addAction( QIcon( "/usr/share/monav/images/oxygen/network-wireless.png" ), tr( "GPS-Location" ), this, SLOT(gotoGPS()) );
+ d->gotoMenu->addAction( QIcon( "/usr/share/monav/images/source.png" ), tr( "Departure" ), this, SLOT(gotoSource()) );
+ d->gotoMenu->addAction( QIcon( "/usr/share/monav/images/target.png" ), tr( "Destination" ), this, SLOT(gotoTarget()) );
+ d->gotoMenu->addAction( QIcon( "/usr/share/monav/images/oxygen/bookmarks.png" ), tr( "Bookmark" ), this, SLOT(gotoBookmark()) );
+ d->gotoMenu->addAction( QIcon( "/usr/share/monav/images/address.png" ), tr( "Address" ), this, SLOT(gotoAddress()) );
++ d->gotoMenu->addAction( QIcon( "/usr/share/monav/images/oxygen/network-wireless.png" ), tr( "GPS-Coordinate..." ), this, SLOT(gotoGpsCoordinate()) );
d->gotoOverlay = new OverlayWidget( this, tr( "Show" ) );
d->gotoOverlay->addActions( d->gotoMenu->actions() );
@@ -129,11 +130,11 @@ Forwarded: no
- d->sourceMenu->addAction( QIcon( ":/images/map.png" ), tr( "Tap on Map" ), this, SLOT(setModeSourceSelection()) );
- d->sourceMenu->addAction( QIcon( ":/images/oxygen/bookmarks.png" ), tr( "Bookmark" ), this, SLOT(sourceByBookmark()) );
- d->sourceMenu->addAction( QIcon( ":/images/address.png" ), tr( "Address" ), this, SLOT(sourceByAddress()) );
-- d->sourceMenu->addAction( QIcon( ":/images/oxygen/network-wireless.png" ), tr( "GPS Receiver" ), this, SLOT(sourceByGPS()) );
+- d->sourceMenu->addAction( QIcon( ":/images/oxygen/network-wireless.png" ), tr( "GPS-Location" ), this, SLOT(sourceByGPS()) );
+ d->sourceMenu->addAction( QIcon( "/usr/share/monav/images/map.png" ), tr( "Tap on Map" ), this, SLOT(setModeSourceSelection()) );
+ d->sourceMenu->addAction( QIcon( "/usr/share/monav/images/oxygen/bookmarks.png" ), tr( "Bookmark" ), this, SLOT(sourceByBookmark()) );
+ d->sourceMenu->addAction( QIcon( "/usr/share/monav/images/address.png" ), tr( "Address" ), this, SLOT(sourceByAddress()) );
-+ d->sourceMenu->addAction( QIcon( "/usr/share/monav/images/oxygen/network-wireless.png" ), tr( "GPS Receiver" ), this, SLOT(sourceByGPS()) );
++ d->sourceMenu->addAction( QIcon( "/usr/share/monav/images/oxygen/network-wireless.png" ), tr( "GPS-Location" ), this, SLOT(sourceByGPS()) );
d->sourceOverlay = new OverlayWidget( this, tr( "Departure" ) );
d->sourceOverlay->addActions( d->sourceMenu->actions() );
@@ -145,17 +146,15 @@ Forwarded: no
+ d->targetMenu->addAction( QIcon( "/usr/share/monav/images/map.png" ), tr( "Tap on Map" ), this, SLOT(setModeTargetSelection()) );
+ d->targetMenu->addAction( QIcon( "/usr/share/monav/images/oxygen/bookmarks.png" ), tr( "Bookmark" ), this, SLOT(targetByBookmark()) );
+ d->targetMenu->addAction( QIcon( "/usr/share/monav/images/address.png" ), tr( "Address" ), this, SLOT(targetByAddress()) );
+ d->targetMenu->addSeparator();
+- d->targetMenu->addAction( QIcon( ":/images/oxygen/list-add.png" ), tr( "+Waypoint" ), this, SLOT(addRoutepoint()) );
+- d->targetMenu->addAction( QIcon( ":/images/oxygen/list-remove.png" ), tr( "-Waypoint" ), this, SLOT(subductRoutepoint()) );
++ d->targetMenu->addAction( QIcon( "/usr/share/monav/images/oxygen/list-add.png" ), tr( "+Waypoint" ), this, SLOT(addRoutepoint()) );
++ d->targetMenu->addAction( QIcon( "/usr/share/monav/images/oxygen/list-remove.png" ), tr( "-Waypoint" ), this, SLOT(subductRoutepoint()) );
d->targetOverlay = new OverlayWidget( this, tr( "Destination" ) );
d->targetOverlay->addActions( d->targetMenu->actions() );
- d->toolsMenu = new QMenu( tr( "Tools" ), this );
-- d->toolsMenu->addAction( QIcon( ":/images/oxygen/bookmarks.png" ), tr( "Bookmarks" ), this, SLOT(bookmarks()) );
-+ d->toolsMenu->addAction( QIcon( "/usr/share/monav/images/oxygen/bookmarks.png" ), tr( "Bookmarks" ), this, SLOT(bookmarks()) );
-
- d->toolsOverlay = new OverlayWidget( this, tr( "Tools" ) );
- d->toolsOverlay->addActions( d->toolsMenu->actions() );
-
d->settingsMenu = new QMenu( tr( "Settings" ), this );
- d->settingsMenu->addAction( QIcon( ":/images/oxygen/folder-tar.png" ), tr( "Map Packages" ), this, SLOT(displayMapChooser()) );
- d->settingsMenu->addAction( QIcon( ":/images/oxygen/folder-tar.png" ), tr( "Map Modules" ), this, SLOT(displayModuleChooser()) );
@@ -176,7 +175,7 @@ Forwarded: no
d->settingsOverlay = new OverlayWidget( this, tr( "Settings" ) );
d->settingsOverlay->addActions( d->settingsMenu->actions() );
-@@ -648,10 +648,10 @@ void MainWindow::toogleLocked()
+@@ -735,10 +735,10 @@ void MainWindow::toggleLocked()
d->fixed = !d->fixed;
m_ui->paintArea->setFixed( d->fixed );
if ( d->fixed ) {
@@ -191,7 +190,7 @@ Forwarded: no
}
--- monav.orig/client/worldmapchooser.cpp
+++ monav/client/worldmapchooser.cpp
-@@ -50,7 +50,7 @@ WorldMapChooser::WorldMapChooser( QWidge
+@@ -51,7 +51,7 @@ WorldMapChooser::WorldMapChooser( QWidge
d->maxX = 1;
d->maxY = 1;
@@ -254,149 +253,98 @@ Forwarded: no
unix {
QMAKE_CXXFLAGS_RELEASE -= -O2
QMAKE_CXXFLAGS_RELEASE += -O3 \
---- monav.orig/preprocessor/preprocessor.pro
-+++ monav/preprocessor/preprocessor.pro
-@@ -38,7 +38,6 @@ HEADERS += interfaces/iimporter.h \
- DESTDIR = ../bin
- TARGET = monav-preprocessor
-
--RESOURCES += images.qrc
- unix {
- QMAKE_CXXFLAGS_RELEASE -= -O2
- QMAKE_CXXFLAGS_RELEASE += -O3 \
--- monav.orig/client/mainwindow.ui
+++ monav/client/mainwindow.ui
-@@ -14,8 +14,8 @@
- <string>MoNav</string>
- </property>
- <property name="windowIcon">
-- <iconset resource="images.qrc">
-- <normaloff>:/images/source.png</normaloff>:/images/source.png</iconset>
-+ <iconset>
-+ <normaloff>/usr/share/monav/images/source.png</normaloff>/usr/share/monav/images/source.png</iconset>
- </property>
- <widget class="QWidget" name="centralwidget">
- <layout class="QVBoxLayout" name="verticalLayout">
-@@ -158,8 +158,8 @@
- <string>...</string>
- </property>
- <property name="icon">
-- <iconset resource="images.qrc">
-- <normaloff>:/images/oxygen/emblem-unlocked.png</normaloff>:/images/oxygen/emblem-unlocked.png</iconset>
-+ <iconset>
-+ <normaloff>/usr/share/monav/images/oxygen/emblem-unlocked.png</normaloff>/usr/share/monav/images/oxygen/emblem-unlocked.png</iconset>
- </property>
- <property name="checkable">
- <bool>true</bool>
-@@ -178,8 +178,8 @@
- <string>...</string>
- </property>
- <property name="icon">
-- <iconset resource="images.qrc">
-- <normaloff>:/images/source.png</normaloff>:/images/source.png</iconset>
-+ <iconset>
-+ <normaloff>/usr/share/monav/images/source.png</normaloff>/usr/share/monav/images/source.png</iconset>
- </property>
- <property name="autoRaise">
- <bool>true</bool>
-@@ -195,8 +195,8 @@
- <string>...</string>
- </property>
- <property name="icon">
-- <iconset resource="images.qrc">
-- <normaloff>:/images/target.png</normaloff>:/images/target.png</iconset>
-+ <iconset>
-+ <normaloff>/usr/share/monav/images/target.png</normaloff>/usr/share/monav/images/target.png</iconset>
- </property>
- <property name="autoRaise">
- <bool>true</bool>
-@@ -450,8 +450,8 @@
- <string>...</string>
- </property>
- <property name="icon">
-- <iconset resource="images.qrc">
-- <normaloff>:/images/target.png</normaloff>:/images/target.png</iconset>
-+ <iconset>
-+ <normaloff>/usr/share/monav/images/target.png</normaloff>/usr/share/monav/images/target.png</iconset>
- </property>
- <property name="autoRaise">
- <bool>true</bool>
-@@ -467,8 +467,8 @@
- <string>...</string>
- </property>
- <property name="icon">
-- <iconset resource="images.qrc">
-- <normaloff>:/images/source.png</normaloff>:/images/source.png</iconset>
-+ <iconset>
-+ <normaloff>/usr/share/monav/images/source.png</normaloff>/usr/share/monav/images/source.png</iconset>
- </property>
- <property name="autoRaise">
- <bool>true</bool>
-@@ -631,8 +631,8 @@
- <string>+</string>
- </property>
- <property name="icon">
-- <iconset resource="images.qrc">
-- <normaloff>:/images/oxygen/zoom-in.png</normaloff>:/images/oxygen/zoom-in.png</iconset>
-+ <iconset>
-+ <normaloff>/usr/share/monav/images/oxygen/zoom-in.png</normaloff>/usr/share/monav/images/oxygen/zoom-in.png</iconset>
- </property>
- <property name="autoRaise">
- <bool>true</bool>
-@@ -654,8 +654,8 @@
- <string>-</string>
- </property>
- <property name="icon">
-- <iconset resource="images.qrc">
-- <normaloff>:/images/oxygen/zoom-out.png</normaloff>:/images/oxygen/zoom-out.png</iconset>
-+ <iconset>
-+ <normaloff>/usr/share/monav/images/oxygen/zoom-out.png</normaloff>/usr/share/monav/images/oxygen/zoom-out.png</iconset>
- </property>
- <property name="autoRaise">
- <bool>true</bool>
-@@ -1016,8 +1016,8 @@
- <string>...</string>
- </property>
- <property name="icon">
-- <iconset resource="images.qrc">
-- <normaloff>:/images/oxygen/start-here.png</normaloff>:/images/oxygen/start-here.png</iconset>
-+ <iconset>
-+ <normaloff>/usr/share/monav/images/oxygen/start-here.png</normaloff>/usr/share/monav/images/oxygen/start-here.png</iconset>
- </property>
- <property name="autoRaise">
- <bool>true</bool>
-@@ -1033,8 +1033,8 @@
- <string>...</string>
- </property>
- <property name="icon">
-- <iconset resource="images.qrc">
-- <normaloff>:/images/oxygen/go-next.png</normaloff>:/images/oxygen/go-next.png</iconset>
-+ <iconset>
-+ <normaloff>/usr/share/monav/images/oxygen/go-next.png</normaloff>/usr/share/monav/images/oxygen/go-next.png</iconset>
- </property>
- <property name="autoRaise">
- <bool>true</bool>
-@@ -1050,8 +1050,8 @@
- <string>...</string>
- </property>
- <property name="icon">
-- <iconset resource="images.qrc">
-- <normaloff>:/images/oxygen/configure.png</normaloff>:/images/oxygen/configure.png</iconset>
-+ <iconset>
-+ <normaloff>/usr/share/monav/images/oxygen/configure.png</normaloff>/usr/share/monav/images/oxygen/configure.png</iconset>
- </property>
- <property name="autoRaise">
- <bool>true</bool>
-@@ -1131,9 +1131,6 @@
- <container>1</container>
- </customwidget>
- </customwidgets>
-- <resources>
-- <include location="images.qrc"/>
-- </resources>
- <connections>
- <connection>
- <sender>lockButton</sender>
+@@ -15,7 +15,7 @@
+ </property>
+ <property name="windowIcon">
+ <iconset resource="images.qrc">
+- <normaloff>:/images/source.png</normaloff>:/images/source.png</iconset>
++ <normaloff>/usr/share/monav/images/source.png</normaloff>/usr/share/monav/images/source.png</iconset>
+ </property>
+ <widget class="QWidget" name="centralwidget">
+ <layout class="QVBoxLayout" name="verticalLayout">
+@@ -159,7 +159,7 @@
+ </property>
+ <property name="icon">
+ <iconset resource="images.qrc">
+- <normaloff>:/images/oxygen/emblem-unlocked.png</normaloff>:/images/oxygen/emblem-unlocked.png</iconset>
++ <normaloff>/usr/share/monav/images/oxygen/emblem-unlocked.png</normaloff>/usr/share/monav/images/oxygen/emblem-unlocked.png</iconset>
+ </property>
+ <property name="checkable">
+ <bool>true</bool>
+@@ -179,7 +179,7 @@
+ </property>
+ <property name="icon">
+ <iconset resource="images.qrc">
+- <normaloff>:/images/map.png</normaloff>:/images/map.png</iconset>
++ <normaloff>/usr/share/monav/images/map.png</normaloff>/usr/share/monav/images/map.png</iconset>
+ </property>
+ <property name="autoRaise">
+ <bool>true</bool>
+@@ -413,7 +413,7 @@
+ </property>
+ <property name="icon">
+ <iconset resource="images.qrc">
+- <normaloff>:/images/target.png</normaloff>:/images/target.png</iconset>
++ <normaloff>/usr/share/monav/images/target.png</normaloff>/usr/share/monav/images/target.png</iconset>
+ </property>
+ <property name="autoRaise">
+ <bool>true</bool>
+@@ -430,7 +430,7 @@
+ </property>
+ <property name="icon">
+ <iconset resource="images.qrc">
+- <normaloff>:/images/source.png</normaloff>:/images/source.png</iconset>
++ <normaloff>/usr/share/monav/images/source.png</normaloff>/usr/share/monav/images/source.png</iconset>
+ </property>
+ <property name="autoRaise">
+ <bool>true</bool>
+@@ -591,7 +591,7 @@
+ </property>
+ <property name="icon">
+ <iconset resource="images.qrc">
+- <normaloff>:/images/oxygen/zoom-in.png</normaloff>:/images/oxygen/zoom-in.png</iconset>
++ <normaloff>/usr/share/monav/images/oxygen/zoom-in.png</normaloff>/usr/share/monav/images/oxygen/zoom-in.png</iconset>
+ </property>
+ <property name="autoRaise">
+ <bool>true</bool>
+@@ -614,7 +614,7 @@
+ </property>
+ <property name="icon">
+ <iconset resource="images.qrc">
+- <normaloff>:/images/oxygen/zoom-out.png</normaloff>:/images/oxygen/zoom-out.png</iconset>
++ <normaloff>/usr/share/monav/images/oxygen/zoom-out.png</normaloff>/usr/share/monav/images/oxygen/zoom-out.png</iconset>
+ </property>
+ <property name="autoRaise">
+ <bool>true</bool>
+@@ -976,7 +976,7 @@
+ </property>
+ <property name="icon">
+ <iconset resource="images.qrc">
+- <normaloff>:/images/oxygen/bookmarks.png</normaloff>:/images/oxygen/bookmarks.png</iconset>
++ <normaloff>/usr/share/monav/images/oxygen/bookmarks.png</normaloff>/usr/share/monav/images/oxygen/bookmarks.png</iconset>
+ </property>
+ <property name="autoRaise">
+ <bool>true</bool>
+@@ -993,7 +993,7 @@
+ </property>
+ <property name="icon">
+ <iconset resource="images.qrc">
+- <normaloff>:/images/oxygen/go-next.png</normaloff>:/images/oxygen/go-next.png</iconset>
++ <normaloff>/usr/share/monav/images/oxygen/go-next.png</normaloff>/usr/share/monav/images/oxygen/go-next.png</iconset>
+ </property>
+ <property name="autoRaise">
+ <bool>true</bool>
+@@ -1010,7 +1010,7 @@
+ </property>
+ <property name="icon">
+ <iconset resource="images.qrc">
+- <normaloff>:/images/oxygen/configure.png</normaloff>:/images/oxygen/configure.png</iconset>
++ <normaloff>/usr/share/monav/images/oxygen/configure.png</normaloff>/usr/share/monav/images/oxygen/configure.png</iconset>
+ </property>
+ <property name="autoRaise">
+ <bool>true</bool>
--- monav.orig/client/placechooser.ui
+++ monav/client/placechooser.ui
@@ -149,8 +149,8 @@
--
fast navigation system featuring exact routing
More information about the Pkg-osm-commits
mailing list