[Pkg-osm-commits] [SCM] monav branch, master, updated. upstream/0.2+svn405-36-g350b43d
David Paleino
dapal at debian.org
Fri Mar 11 17:46:16 UTC 2011
The following commit has been merged in the master branch:
commit 350b43d0a8b6bb23e33ee1bb8d4345ebcee452bc
Author: David Paleino <dapal at debian.org>
Date: Fri Mar 11 18:44:08 2011 +0100
Make new monav-data binary package: split images into an arch-independent package, instead of embedding them into a Qt Resource file (03-dont_embed_resources.patch and other files)
diff --git a/debian/changelog b/debian/changelog
index da5550a..e5d3a49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,11 @@ monav (0.2+svn450-1) UNRELEASED; urgency=low
* Also build monav-preprocessor-gui and monav-packager
* Upstream now uses sane binary names, drop the hackery in
debian/rules, and install proper files in debian/*.install
+ * Make new monav-data binary package: split images into an
+ arch-independent package, instead of embedding them into a Qt
+ Resource file (03-dont_embed_resources.patch and other files)
- -- David Paleino <dapal at debian.org> Fri, 11 Mar 2011 17:20:17 +0100
+ -- David Paleino <dapal at debian.org> Fri, 11 Mar 2011 18:43:50 +0100
monav (0.2+svn405-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 8b68033..eda1a05 100644
--- a/debian/control
+++ b/debian/control
@@ -46,6 +46,7 @@ Description: metapackage for MoNav
Package: monav-client
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+ , monav-data (= ${source:Version})
Recommends: monav-preprocessor
Description: fast navigation system featuring exact routing - client
MoNav is a Desktop / Mobile application that offers state-of-the-art fast and
@@ -69,6 +70,7 @@ Description: fast navigation system featuring exact routing - client
Package: monav-preprocessor
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+ , monav-data (= ${source:Version})
Description: fast navigation system featuring exact routing - preprocessor
MoNav is a Desktop / Mobile application that offers state-of-the-art fast and
exact routing with OpenStreetMap Data.
@@ -109,3 +111,25 @@ Description: fast navigation system featuring exact routing - routing daemon
server for other applications.
.
This package provides the routing daemon.
+
+Package: monav-data
+Architecture: all
+Depends: ${misc:Depends}
+Description: fast navigation system featuring exact routing - data files
+ MoNav is a Desktop / Mobile application that offers state-of-the-art fast and
+ exact routing with OpenStreetMap Data.
+ .
+ In contrast to most commercial and open-source routing applications, MoNav
+ offers exact routing without heuristic assumptions and with very little
+ computational work. Its routing core is based on Contraction Hierarchies.
+ .
+ The application is divided into two parts: The MoNav Preprocessor transforms
+ the raw OpenStreetMap data into file formats usable by the MoNav Client
+ application. The preprocessing is often time consuming and requires larger
+ amounts of memory. The client application on the other hand has very few
+ requirements and can even run on mobile devices.
+ .
+ Additionally a routing daemon is available to act as a background route
+ server for other applications.
+ .
+ This package contains architecture-independent data files.
diff --git a/debian/monav-data.install b/debian/monav-data.install
new file mode 100644
index 0000000..62397e9
--- /dev/null
+++ b/debian/monav-data.install
@@ -0,0 +1 @@
+images/ /usr/share/monav/
diff --git a/debian/patches/03-dont_embed_resources.patch b/debian/patches/03-dont_embed_resources.patch
new file mode 100644
index 0000000..c51479c
--- /dev/null
+++ b/debian/patches/03-dont_embed_resources.patch
@@ -0,0 +1,529 @@
+From: David Paleino <dapal at debian.org>
+Subject: use system-installed images
+Origin: vendor
+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/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(-)
+
+--- monav.orig/client/client.pro
++++ monav/client/client.pro
+@@ -86,8 +86,6 @@ maemo5 {
+ QT += maemo5
+ }
+
+-RESOURCES += images.qrc
+-
+ LIBS += -L../bin/plugins_client -lmapnikrendererclient -lcontractionhierarchiesclient -lgpsgridclient -losmrendererclient -lunicodetournamenttrieclient -lqtilerendererclient
+
+ #required by osmrendererclient
+--- monav.orig/client/descriptiongenerator.h
++++ monav/client/descriptiongenerator.h
+@@ -159,9 +159,9 @@ protected:
+ void describe( QStringList* icons, QStringList* labels )
+ {
+ if ( m_exitNumber != 0 ) {
+- icons->push_back( QString( ":/images/directions/roundabout.png" ) );
++ icons->push_back( QString( "/usr/share/monav/images/directions/roundabout.png" ) );
+ labels->push_back( QString( "Enter the roundabout." ) );
+- icons->push_back( QString( ":/images/directions/roundabout_exit%1.png" ).arg( m_exitNumber ) );
++ icons->push_back( QString( "/usr/share/monav/images/directions/roundabout_exit%1.png" ).arg( m_exitNumber ) );
+ labels->push_back( QString( "Take the %1. exit." ).arg( m_exitNumber ) );
+ m_exitNumber = 0;
+ return;
+@@ -174,37 +174,37 @@ protected:
+ break;
+ case 1:
+ {
+- icons->push_back( ":/images/directions/slightly_right.png" );
++ icons->push_back( "/usr/share/monav/images/directions/slightly_right.png" );
+ labels->push_back( "Keep slightly right" );
+ break;
+ }
+ case 2:
+ {
+- icons->push_back( ":/images/directions/right.png" );
++ icons->push_back( "/usr/share/monav/images/directions/right.png" );
+ labels->push_back( "Turn right" );
+ break;
+ }
+ case 3:
+ {
+- icons->push_back( ":/images/directions/sharply_right.png" );
++ icons->push_back( "/usr/share/monav/images/directions/sharply_right.png" );
+ labels->push_back( "Turn sharply right" );
+ break;
+ }
+ case -1:
+ {
+- icons->push_back( ":/images/directions/slightly_left.png" );
++ icons->push_back( "/usr/share/monav/images/directions/slightly_left.png" );
+ labels->push_back( "Keep slightly left" );
+ break;
+ }
+ case -2:
+ {
+- icons->push_back( ":/images/directions/left.png" );
++ icons->push_back( "/usr/share/monav/images/directions/left.png" );
+ labels->push_back( "Turn left" );
+ break;
+ }
+ case -3:
+ {
+- icons->push_back( ":/images/directions/sharply_left.png" );
++ icons->push_back( "/usr/share/monav/images/directions/sharply_left.png" );
+ labels->push_back( "Turn sharply left" );
+ break;
+ }
+@@ -218,7 +218,7 @@ protected:
+
+ if ( m_lastType == "motorway_link" ) {
+ if ( m_direction == 0 ) {
+- icons->push_back( ":/images/directions/forward.png" );
++ icons->push_back( "/usr/share/monav/images/directions/forward.png" );
+ labels->push_back( "" );
+ }
+ if ( !name.isEmpty() )
+@@ -238,7 +238,7 @@ protected:
+ else
+ distance = QString( "%1km" ).arg( ( int ) m_distance / 1000 );
+
+- icons->push_back( ":/images/directions/forward.png" );
++ icons->push_back( "/usr/share/monav/images/directions/forward.png" );
+ if ( !name.isEmpty() )
+ labels->push_back( ( "Continue on " + name + " for " + distance + "." ) );
+ else
+--- monav.orig/client/mainwindow.cpp
++++ monav/client/mainwindow.cpp
+@@ -159,47 +159,47 @@ 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/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( "/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->gotoOverlay = new OverlayWidget( this, tr( "Show" ) );
+ d->gotoOverlay->addActions( d->gotoMenu->actions() );
+
+ d->sourceMenu = new QMenu( tr( "Departure" ), this );
+- 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( "/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->sourceOverlay = new OverlayWidget( this, tr( "Departure" ) );
+ d->sourceOverlay->addActions( d->sourceMenu->actions() );
+
+ d->targetMenu = new QMenu( tr( "Destination" ), this );
+- d->targetMenu->addAction( QIcon( ":/images/map.png" ), tr( "Tap on Map" ), this, SLOT(setModeTargetSelection()) );
+- d->targetMenu->addAction( QIcon( ":/images/oxygen/bookmarks.png" ), tr( "Bookmark" ), this, SLOT(targetByBookmark()) );
+- d->targetMenu->addAction( QIcon( ":/images/address.png" ), tr( "Address" ), this, SLOT(targetByAddress()) );
++ 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->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()) );
+- d->settingsMenu->addAction( QIcon( ":/images/oxygen/preferences-system.png" ), tr( "General" ), this, SLOT(settingsGeneral()) );
+- d->settingsMenu->addAction( QIcon( ":/images/oxygen/network-wireless.png" ), tr( "GPS Lookup" ), this, SLOT(settingsGPSLookup()) );
+- d->settingsMenu->addAction( QIcon( ":/images/map.png" ), tr( "Renderer" ), this, SLOT(settingsRenderer()) );
+- d->settingsMenu->addAction( QIcon( ":/images/route.png" ), tr( "Router" ), this, SLOT(settingsRouter()) );
+- d->settingsMenu->addAction( QIcon( ":/images/address.png" ), tr( "Address Lookup" ), this, SLOT(settingsAddressLookup()) );
+- d->settingsMenu->addAction( QIcon( ":/images/oxygen/hwinfo.png" ), tr( "GPS Receiver" ), this, SLOT(settingsGPS()) );
++ d->settingsMenu->addAction( QIcon( "/usr/share/monav/images/oxygen/folder-tar.png" ), tr( "Map Packages" ), this, SLOT(displayMapChooser()) );
++ d->settingsMenu->addAction( QIcon( "/usr/share/monav/images/oxygen/folder-tar.png" ), tr( "Map Modules" ), this, SLOT(displayModuleChooser()) );
++ d->settingsMenu->addAction( QIcon( "/usr/share/monav/images/oxygen/preferences-system.png" ), tr( "General" ), this, SLOT(settingsGeneral()) );
++ d->settingsMenu->addAction( QIcon( "/usr/share/monav/images/oxygen/network-wireless.png" ), tr( "GPS Lookup" ), this, SLOT(settingsGPSLookup()) );
++ d->settingsMenu->addAction( QIcon( "/usr/share/monav/images/map.png" ), tr( "Renderer" ), this, SLOT(settingsRenderer()) );
++ d->settingsMenu->addAction( QIcon( "/usr/share/monav/images/route.png" ), tr( "Router" ), this, SLOT(settingsRouter()) );
++ d->settingsMenu->addAction( QIcon( "/usr/share/monav/images/address.png" ), tr( "Address Lookup" ), this, SLOT(settingsAddressLookup()) );
++ d->settingsMenu->addAction( QIcon( "/usr/share/monav/images/oxygen/hwinfo.png" ), tr( "GPS Receiver" ), this, SLOT(settingsGPS()) );
+
+ d->settingsOverlay = new OverlayWidget( this, tr( "Settings" ) );
+ d->settingsOverlay->addActions( d->settingsMenu->actions() );
+@@ -648,10 +648,10 @@ void MainWindow::toogleLocked()
+ d->fixed = !d->fixed;
+ m_ui->paintArea->setFixed( d->fixed );
+ if ( d->fixed ) {
+- m_ui->lockButton->setIcon( QIcon( ":images/oxygen/emblem-locked.png") );
++ m_ui->lockButton->setIcon( QIcon( "/usr/share/monav/images/oxygen/emblem-locked.png") );
+ instructionsChanged();
+ } else {
+- m_ui->lockButton->setIcon( QIcon( ":images/oxygen/emblem-unlocked.png") );
++ m_ui->lockButton->setIcon( QIcon( "/usr/share/monav/images/oxygen/emblem-unlocked.png") );
+ m_ui->infoWidget->hide();
+ }
+ }
+--- monav.orig/client/worldmapchooser.cpp
++++ monav/client/worldmapchooser.cpp
+@@ -50,7 +50,7 @@ WorldMapChooser::WorldMapChooser( QWidge
+ d->maxX = 1;
+ d->maxY = 1;
+
+- QDir dir( ":/images/world" );
++ QDir dir( "/usr/share/monav/images/world" );
+ // crude heuristic: the largest image will be the most accurate one
+ // in praxis only one image should exist as an appropiate one shouldbe selected during
+ // the build process
+--- monav.orig/preprocessor/preprocessingwindow.cpp
++++ monav/preprocessor/preprocessingwindow.cpp
+@@ -37,10 +37,10 @@ PreprocessingWindow::PreprocessingWindow
+ {
+ m_ui->setupUi(this);
+
+- setWindowIcon( QIcon( ":/images/target.png" ) );
++ setWindowIcon( QIcon( "/usr/share/monav/images/target.png" ) );
+
+ LogWindow* log = new LogWindow();
+- log->setWindowIcon( QIcon( ":/images/target.png" ) );
++ log->setWindowIcon( QIcon( "/usr/share/monav/images/target.png" ) );
+ log->show();
+
+ connectSlots();
+@@ -313,22 +313,22 @@ void PreprocessingWindow::taskFinished(
+ }
+ switch( m_tasks.front() ) {
+ case TaskImporting:
+- m_ui->importerLabel->setPixmap( QPixmap( result ? ":/images/ok.png" : ":/images/notok.png" ) );
++ m_ui->importerLabel->setPixmap( QPixmap( result ? "/usr/share/monav/images/ok.png" : "/usr/share/monav/images/notok.png" ) );
+ break;
+ case TaskRouting:
+- m_ui->routerLabel->setPixmap( QPixmap( result ? ":/images/ok.png" : ":/images/notok.png" ) );
++ m_ui->routerLabel->setPixmap( QPixmap( result ? "/usr/share/monav/images/ok.png" : "/usr/share/monav/images/notok.png" ) );
+ break;
+ case TaskRendering:
+- m_ui->rendererLabel->setPixmap( QPixmap( result ? ":/images/ok.png" : ":/images/notok.png" ) );
++ m_ui->rendererLabel->setPixmap( QPixmap( result ? "/usr/share/monav/images/ok.png" : "/usr/share/monav/images/notok.png" ) );
+ break;
+ case TaskAddressLookup:
+- m_ui->addressLookupLabel->setPixmap( QPixmap( result ? ":/images/ok.png" : ":/images/notok.png" ) );
++ m_ui->addressLookupLabel->setPixmap( QPixmap( result ? "/usr/share/monav/images/ok.png" : "/usr/share/monav/images/notok.png" ) );
+ break;
+ case TaskConfig:
+- m_ui->configLabel->setPixmap( QPixmap( result ? ":/images/ok.png" : ":/images/notok.png" ) );
++ m_ui->configLabel->setPixmap( QPixmap( result ? "/usr/share/monav/images/ok.png" : "/usr/share/monav/images/notok.png" ) );
+ break;
+ case TaskDeleteTemporary:
+- m_ui->deleteTemporaryLabel->setPixmap( QPixmap( result ? ":/images/ok.png" : ":/images/notok.png" ) );
++ m_ui->deleteTemporaryLabel->setPixmap( QPixmap( result ? "/usr/share/monav/images/ok.png" : "/usr/share/monav/images/notok.png" ) );
+ break;
+ }
+
+--- monav.orig/preprocessor/preprocessor-gui.pro
++++ monav/preprocessor/preprocessor-gui.pro
+@@ -42,7 +42,6 @@ DESTDIR = ../bin
+ TARGET = monav-preprocessor-gui
+ FORMS += preprocessingwindow.ui \
+ ../utils/logwindow.ui
+-RESOURCES += images.qrc
+ 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>
+--- monav.orig/client/placechooser.ui
++++ monav/client/placechooser.ui
+@@ -149,8 +149,8 @@
+ <string>...</string>
+ </property>
+ <property name="icon">
+- <iconset resource="images.qrc">
+- <normaloff>:/images/oxygen/go-previous.png</normaloff>:/images/oxygen/go-previous.png</iconset>
++ <iconset>
++ <normaloff>/usr/share/monav/images/oxygen/go-previous.png</normaloff>/usr/share/monav/images/oxygen/go-previous.png</iconset>
+ </property>
+ <property name="autoRaise">
+ <bool>true</bool>
+@@ -173,8 +173,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>
+@@ -345,8 +345,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>
+@@ -368,8 +368,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>
+@@ -433,8 +433,5 @@
+ <container>1</container>
+ </customwidget>
+ </customwidgets>
+- <resources>
+- <include location="images.qrc"/>
+- </resources>
+ <connections/>
+ </ui>
+--- monav.orig/client/streetchooser.ui
++++ monav/client/streetchooser.ui
+@@ -311,8 +311,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>
+@@ -334,8 +334,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>
+@@ -399,8 +399,5 @@
+ <container>1</container>
+ </customwidget>
+ </customwidgets>
+- <resources>
+- <include location="images.qrc"/>
+- </resources>
+ <connections/>
+ </ui>
+--- monav.orig/preprocessor/aboutdialog.ui
++++ monav/preprocessor/aboutdialog.ui
+@@ -57,7 +57,7 @@
+ <string/>
+ </property>
+ <property name="pixmap">
+- <pixmap resource="images.qrc">:/images/about.png</pixmap>
++ <pixmap>/usr/share/monav/images/about.png</pixmap>
+ </property>
+ <property name="scaledContents">
+ <bool>true</bool>
+@@ -73,9 +73,6 @@
+ </item>
+ </layout>
+ </widget>
+- <resources>
+- <include location="images.qrc"/>
+- </resources>
+ <connections>
+ <connection>
+ <sender>pushButton</sender>
+--- monav.orig/preprocessor/preprocessingwindow.ui
++++ monav/preprocessor/preprocessingwindow.ui
+@@ -132,7 +132,7 @@
+ <string/>
+ </property>
+ <property name="pixmap">
+- <pixmap resource="images.qrc">:/images/about.png</pixmap>
++ <pixmap>/usr/share/monav/images/about.png</pixmap>
+ </property>
+ <property name="scaledContents">
+ <bool>true</bool>
+@@ -861,9 +861,6 @@
+ </action>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+- <resources>
+- <include location="images.qrc"/>
+- </resources>
+ <connections>
+ <connection>
+ <sender>pageList</sender>
diff --git a/debian/patches/series b/debian/patches/series
index 30b8769..2f93b7a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
01-fix_build_issues.patch
02-toll-booth_routing.patch
+03-dont_embed_resources.patch
--
fast navigation system featuring exact routing
More information about the Pkg-osm-commits
mailing list