More packaging fixes.

diff --git a/dorian.pro b/dorian.pro
index bca76dc..8b3eba9 100644 (file)
--- a/dorian.pro
+++ b/dorian.pro
@@ -65,7 +65,30 @@ DEFINES += \
     USE_FILE32API
 
 unix: LIBS += -lz
-maemo5: QT += maemo5
 windows {
     # FIXME: Build zlib, too
 }
+maemo5 {
+    QT += maemo5
+    isEmpty(PREFIX) {
+      PREFIX = /usr
+    }
+    BINDIR = $$PREFIX/bin
+    DATADIR =$$PREFIX/share
+    DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\"
+
+    # For "make install"
+
+    INSTALLS += target desktop icon48 iconscalable
+
+    target.path = $$BINDIR
+
+    desktop.path = $$DATADIR/applications/hildon
+    desktop.files += dorian.desktop
+
+    icon48.path = $$DATADIR/icons/hicolor/48x48
+    icon48.files += pkg/maemo/icon-48/dorian.png
+
+    icon64.path = $$DATADIR/icons/hicolor/64x64/apps
+    icon64.files += pkg/maemo/icon-scalable/dorian.png
+}

diff --git a/pkg/changelog b/pkg/changelog
index ceeb7f3..e7cde1e 100644 (file)
--- a/pkg/changelog
+++ b/pkg/changelog
@@ -1,3 +1,9 @@
+dorian (0.0.7-1) unstable; urgency=low
+
+  * Make building and packaging with Maemo autobuilder work
+
+ -- Akos Polster <akos@pipacs.com>  Thu, 15 Jul 2010 19:00:00 +0200
+
 dorian (0.0.6-1) unstable; urgency=low
 
   * Fix crash when deleting book: https://code.nokia.com/dorian/ticket/1

diff --git a/pkg/maemo/autobuild-scratchbox.sh b/pkg/maemo/autobuild-scratchbox.sh
index c284ccd..afa52b8 100755 (executable)
--- a/pkg/maemo/autobuild-scratchbox.sh
+++ b/pkg/maemo/autobuild-scratchbox.sh
@@ -20,7 +20,6 @@ mkdir -p ${AUTO_DIR}
 rm -rf ${AUTO_DIR}/dorian-${VERSION}
 cp -Rf ${BUILD_DIR} ${AUTO_DIR}/dorian-${VERSION}
 cd ${AUTO_DIR}/dorian-${VERSION}
-rm -rf books
 mkdir debian
 cp pkg/changelog pkg/maemo/control pkg/maemo/rules debian
 echo "Version: $VERSION" >> debian/control

diff --git a/pkg/maemo/icon-48/dorian.png b/pkg/maemo/icon-48/dorian.png
new file mode 100644 (file)
index 0000000..775b670
Binary files /dev/null and b/pkg/maemo/icon-48/dorian.png differ

diff --git a/pkg/maemo/icon-scalable/dorian.png b/pkg/maemo/icon-scalable/dorian.png
new file mode 100644 (file)
index 0000000..cf1aec2
Binary files /dev/null and b/pkg/maemo/icon-scalable/dorian.png differ

diff --git a/pkg/version.txt b/pkg/version.txt
index 1750564..5a5831a 100644 (file)
--- a/pkg/version.txt
+++ b/pkg/version.txt
@@ -1 +1 @@
-0.0.6
+0.0.7