Remove lintian overrides. Remove desktop and service file and startup wrapper script...

diff --git a/packaging/debian/marble-data.dirs b/packaging/debian/marble-data.dirs
deleted file mode 100644 (file)
index 1da8fba..0000000
--- a/packaging/debian/marble-data.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/lintian/overrides

diff --git a/packaging/debian/marble-data.lintian b/packaging/debian/marble-data.lintian
deleted file mode 100644 (file)
index 7f02659..0000000
--- a/packaging/debian/marble-data.lintian
+++ /dev/null
@@ -1 +0,0 @@
-marble-data: desktop-command-not-in-package /usr/share/applications/marble.desktop marble

diff --git a/packaging/debian/marble.desktop b/packaging/debian/marble.desktop
deleted file mode 100644 (file)
index b7d920d..0000000
--- a/packaging/debian/marble.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Name=Marble
-Exec=/opt/marble/bin/marble.sh
-Icon=marble
-StartupWMClass=marble
-X-Window-Icon=marble
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Service=org.kde.edu.marble
-X-Osso-Type=application/x-executable

diff --git a/packaging/debian/marble.dirs b/packaging/debian/marble.dirs
deleted file mode 100644 (file)
index c7287b1..0000000
--- a/packaging/debian/marble.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/lintian/overrides
-usr/share/pixmaps

diff --git a/packaging/debian/marble.install b/packaging/debian/marble.install
index 48ee4a5..a1f21a1 100644 (file)
--- a/packaging/debian/marble.install
+++ b/packaging/debian/marble.install
@@ -1 +1,11 @@
-opt/marble/bin/*
+opt/marble/bin/marble
+opt/marble/bin/marble.sh
+usr/share/applications/hildon/marble.desktop
+usr/share/dbus-1/services/marble.service
+usr/share/icons/hicolor/128x128/apps/marble.png
+usr/share/icons/hicolor/64x64/apps/marble.png
+usr/share/icons/hicolor/48x48/apps/marble.png
+usr/share/icons/hicolor/26x26/apps/marble.png
+usr/share/icons/hicolor/32x32/apps/marble.png
+usr/share/icons/hicolor/22x22/apps/marble.png
+usr/share/icons/hicolor/16x16/apps/marble.png

diff --git a/packaging/debian/marble.lintian b/packaging/debian/marble.lintian
deleted file mode 100644 (file)
index daa0b18..0000000
--- a/packaging/debian/marble.lintian
+++ /dev/null
@@ -1,4 +0,0 @@
-marble: package-name-doesnt-match-sonames libmarblewidget5
-marble: non-dev-pkg-with-shlib-symlink opt/marble/lib/libmarblewidget.so.0.5.0 opt/marble/lib/libmarblewidget.so
-marble: binary-without-manpage opt/marble/bin/geodatatest
-marble: binary-without-manpage opt/marble/bin/tilecreator

diff --git a/packaging/debian/marble.service b/packaging/debian/marble.service
deleted file mode 100644 (file)
index 5f09c58..0000000
--- a/packaging/debian/marble.service
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.kde.edu.marble
-Exec=/opt/marble/bin/marble.sh

diff --git a/packaging/debian/marble.sh b/packaging/debian/marble.sh
deleted file mode 100755 (executable)
index 52715f8..0000000
--- a/packaging/debian/marble.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-# Set the environment variable XDG_DATA_HOME to have
-# marble store cached data in /home/user/MyDocs/marble/data
-# Can be overridden by specifying an alternative path in 
-# the environment variable MARBLE_DATA_HOME, e.g.
-# $ export MARBLE_DATA_HOME=/home/user
-# which would result in cached data being written to
-# /home/user/marble/data.
-XDG_DATA_HOME="${MARBLE_DATA_HOME:-/home/user/MyDocs/.local/share}"
-export XDG_DATA_HOME
-
-# Marble is installed in /opt/marble. Add it's library
-# to the library search path.
-LD_LIBRARY_PATH="/opt/marble/lib:${LD_LIBRARY_PATH}"
-export LD_LIBRARY_PATH
-
-PATH="/opt/marble/bin:${PATH}"
-export PATH
-
-/opt/marble/bin/marble $*

diff --git a/packaging/debian/patches/maemo-startup-files.diff b/packaging/debian/patches/maemo-startup-files.diff
new file mode 100644 (file)
index 0000000..22d03da
--- /dev/null
+++ b/packaging/debian/patches/maemo-startup-files.diff
@@ -0,0 +1,93 @@
+Index: marble-0.85+svn1207808/src/CMakeLists.txt
+===================================================================
+--- marble-0.85+svn1207808.orig/src/CMakeLists.txt     2010-12-19 13:16:39.000000000 -0500
++++ marble-0.85+svn1207808/src/CMakeLists.txt  2010-12-19 15:03:25.000000000 -0500
+@@ -202,3 +202,12 @@
+   ${CMAKE_CURRENT_SOURCE_DIR}/config-marble.h.cmake
+   ${CMAKE_CURRENT_BINARY_DIR}/config-marble.h
+ )
++
++install ( FILES marble.sh DESTINATION bin/ PERMISSIONS
++  OWNER_EXECUTE OWNER_WRITE OWNER_READ
++  GROUP_EXECUTE GROUP_READ
++  WORLD_READ WORLD_EXECUTE)
++install ( FILES marble.desktop DESTINATION
++  ${CMAKE_INSTALL_PREFIX}/../../usr/share/applications/hildon/ )
++install ( FILES marble.service DESTINATION
++  ${CMAKE_INSTALL_PREFIX}/../../usr/share/dbus-1/services/ )
+Index: marble-0.85+svn1207808/src/marble.desktop
+===================================================================
+--- marble-0.85+svn1207808.orig/src/marble.desktop     2010-12-19 13:16:18.000000000 -0500
++++ marble-0.85+svn1207808/src/marble.desktop  2010-12-19 13:16:32.000000000 -0500
+@@ -1,7 +1,6 @@
+ [Desktop Entry]
+ Type=Application
+-TryExec=marble
+-Exec=marble
++Exec=/opt/marble/bin/marble.sh
+ Name=Marble
+ Name[ast]=Marble
+ Name[bg]=Marble
+@@ -108,5 +107,9 @@
+ GenericName[zh_TW]=桌面星象儀
+ Icon=marble
+ Terminal=false
+-Categories=Qt;KDE;Education;Geography;
++StartupWMClass=marble
++X-Window-Icon=marble
+ X-DocPath=marble/index.html
++X-HildonDesk-ShowInToolbar=true
++X-Osso-Service=org.kde.edu.marble
++X-Osso-Type=application/x-executable
+Index: marble-0.85+svn1207808/src/marble.sh
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ marble-0.85+svn1207808/src/marble.sh       2010-12-19 13:19:17.000000000 -0500
+@@ -0,0 +1,21 @@
++#!/bin/sh
++
++# Set the environment variable XDG_DATA_HOME to have
++# marble store cached data in /home/user/MyDocs/marble/data
++# Can be overridden by specifying an alternative path in
++# the environment variable MARBLE_DATA_HOME, e.g.
++# $ export MARBLE_DATA_HOME=/home/user
++# which would result in cached data being written to
++# /home/user/marble/data.
++XDG_DATA_HOME="${MARBLE_DATA_HOME:-/home/user/MyDocs/.local/share}"
++export XDG_DATA_HOME
++
++# Marble is installed in /opt/marble. Add it's library
++# to the library search path.
++LD_LIBRARY_PATH="/opt/marble/lib:${LD_LIBRARY_PATH}"
++export LD_LIBRARY_PATH
++
++PATH="/opt/marble/bin:${PATH}"
++export PATH
++
++/opt/marble/bin/marble $*
+Index: marble-0.85+svn1207808/src/marble.service
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ marble-0.85+svn1207808/src/marble.service  2010-12-19 15:03:43.000000000 -0500
+@@ -0,0 +1,3 @@
++[D-BUS Service]
++Name=org.kde.edu.marble
++Exec=/opt/marble/bin/marble.sh
+Index: marble-0.85+svn1207808/data/CMakeLists.txt
+===================================================================
+--- marble-0.85+svn1207808.orig/data/CMakeLists.txt    2010-12-19 15:06:33.000000000 -0500
++++ marble-0.85+svn1207808/data/CMakeLists.txt 2010-12-19 15:54:14.000000000 -0500
+@@ -231,11 +231,12 @@
+ 
+ if(NOT APPLE AND NOT WIN32)
+   if(QTONLY)
+-    set(ICON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/icons)
++    set(ICON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/../../usr/share/icons)
+   endif(QTONLY)
+     install (FILES icons/hi128-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/128x128/apps/ RENAME marble.png)
+     install (FILES icons/hi64-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/64x64/apps/ RENAME marble.png)
+     install (FILES icons/hi48-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/48x48/apps/ RENAME marble.png)
++    install (FILES icons/hi32-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/26x26/apps/ RENAME marble.png)
+     install (FILES icons/hi32-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/32x32/apps/ RENAME marble.png)
+     install (FILES icons/hi22-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/22x22/apps/ RENAME marble.png)
+     install (FILES icons/hi16-app-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/16x16/apps/ RENAME marble.png)

diff --git a/packaging/debian/patches/series b/packaging/debian/patches/series
new file mode 100644 (file)
index 0000000..373c36c
--- /dev/null
+++ b/packaging/debian/patches/series
@@ -0,0 +1 @@
+maemo-startup-files.diff

diff --git a/packaging/debian/rules b/packaging/debian/rules
index 96d5401..813f75c 100755 (executable)
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -3,7 +3,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 CMAKE = cmake -DCMAKE_INSTALL_PREFIX=$(CURDIR)/debian/tmp/opt/marble -DMARBLE_DATA_INSTALL_PATH=$(CURDIR)/debian/tmp/opt/marble/share/marble/data -DQTONLY=ON -DMARBLE_DATA_PATH=/opt/marble/share/marble/data -DMARBLE_PLUGIN_INSTALL_PATH=$(CURDIR)/debian/tmp/opt/marble/lib/marble/plugins -DMARBLE_PLUGIN_PATH=/opt/marble/lib/marble/plugins -DPACKAGE_ROOT_PREFIX=$(CURDIR)/debian/tmp -DCMAKE_SKIP_RPATH=ON -DBUILD_MARBLE_TESTS=OFF -DENABLE_TESTS=FALSE -DCMAKE_BUILD_TYPE=Release
 
@@ -67,21 +66,7 @@ clean::
 common-configure-arch::
        $(CMAKE)
 
-common-install-arch::
-       install -D -m 644 $(CURDIR)/debian/marble.lintian $(CURDIR)/debian/marble/usr/share/lintian/overrides/marble
-       install -D -m 644 $(CURDIR)/debian/marble.desktop $(CURDIR)/debian/marble/usr/share/applications/hildon/marble.desktop
-       install -D -m 644 $(CURDIR)/debian/marble.service $(CURDIR)/debian/marble/usr/share/dbus-1/services/marble.service
-       install -D -m 644 $(CURDIR)/data/icons/hi16-app-marble.png $(CURDIR)/debian/marble/usr/share/icons/hicolor/16x16/apps/marble.png
-       install -D -m 644 $(CURDIR)/data/icons/hi22-app-marble.png $(CURDIR)/debian/marble/usr/share/icons/hicolor/22x22/apps/marble.png
-       install -D -m 644 $(CURDIR)/data/icons/hi32-app-marble.png $(CURDIR)/debian/marble/usr/share/icons/hicolor/26x26/apps/marble.png
-       install -D -m 644 $(CURDIR)/data/icons/hi48-app-marble.png $(CURDIR)/debian/marble/usr/share/icons/hicolor/48x48/apps/marble.png
-       install -D -m 644 $(CURDIR)/data/icons/hi64-app-marble.png $(CURDIR)/debian/marble/usr/share/icons/hicolor/64x64/apps/marble.png
-       install -D -m 644 $(CURDIR)/data/icons/hi128-app-marble.png $(CURDIR)/debian/marble/usr/share/icons/hicolor/128x128/apps/marble.png
-       install -D -m 644 $(CURDIR)/data/icons/hisc-app-marble.svgz $(CURDIR)/debian/marble/usr/share/icons/hicolor/scalable/apps/marble.svgz
-       install -D -m 755 $(CURDIR)/debian/marble.sh $(CURDIR)/debian/marble/opt/marble/bin/marble.sh
-
 common-install-indep::
-       install -D -m 644 $(CURDIR)/debian/marble-data.lintian $(CURDIR)/debian/marble-data/usr/share/lintian/overrides/marble-data
        mv $(CURDIR)/debian/tmp/opt/marble/share/marble/data/placemarks/cityplacemarks{_large_population,}.cache
 
 common-binary-post-install-indep::

diff --git a/packaging/debian/source/format b/packaging/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
+++ b/packaging/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

diff --git a/packaging/debian/stamp-patched b/packaging/debian/stamp-patched
deleted file mode 100644 (file)
index e69de29..0000000