More build fixes.

diff --git a/dorian.pro b/dorian.pro
index 8b3eba9..19ea789 100644 (file)
--- a/dorian.pro
+++ b/dorian.pro
@@ -71,7 +71,7 @@ windows {
 maemo5 {
     QT += maemo5
     isEmpty(PREFIX) {
-      PREFIX = /usr
+        PREFIX = /usr
     }
     BINDIR = $$PREFIX/bin
     DATADIR =$$PREFIX/share
@@ -84,11 +84,11 @@ maemo5 {
     target.path = $$BINDIR
 
     desktop.path = $$DATADIR/applications/hildon
-    desktop.files += dorian.desktop
+    desktop.files += pkg/maemo/dorian.desktop
 
-    icon48.path = $$DATADIR/icons/hicolor/48x48
+    icon48.path = $$DATADIR/icons/hicolor/48x48/hildon
     icon48.files += pkg/maemo/icon-48/dorian.png
 
-    icon64.path = $$DATADIR/icons/hicolor/64x64/apps
-    icon64.files += pkg/maemo/icon-scalable/dorian.png
+    iconscalable.path = $$DATADIR/icons/hicolor/scalable/hildon
+    iconscalable.files += pkg/maemo/icon-scalable/dorian.png
 }

diff --git a/pkg/changelog b/pkg/changelog
index e7cde1e..1102577 100644 (file)
--- a/pkg/changelog
+++ b/pkg/changelog
@@ -1,3 +1,9 @@
+dorian (0.0.8-1) unstable; urgency=low
+
+  * Ensure icons and desktop file are installed, too
+
+ -- Akos Polster <akos@pipacs.com>  Thu, 15 Jul 2010 20:00:00 +0200
+
 dorian (0.0.7-1) unstable; urgency=low
 
   * Make building and packaging with Maemo autobuilder work

diff --git a/pkg/maemo/autobuild-scratchbox.sh b/pkg/maemo/autobuild-scratchbox.sh
index afa52b8..d0804f5 100755 (executable)
--- a/pkg/maemo/autobuild-scratchbox.sh
+++ b/pkg/maemo/autobuild-scratchbox.sh
@@ -21,12 +21,13 @@ rm -rf ${AUTO_DIR}/dorian-${VERSION}
 cp -Rf ${BUILD_DIR} ${AUTO_DIR}/dorian-${VERSION}
 cd ${AUTO_DIR}/dorian-${VERSION}
 mkdir debian
-cp pkg/changelog pkg/maemo/control pkg/maemo/rules debian
+cp pkg/changelog pkg/maemo/control pkg/maemo/rules pkg/maemo/postinst debian
+chmod a+rx debian/postinst
 echo "Version: $VERSION" >> debian/control
 echo "Installed-Size: "`du -c -k ${AUTO_DIR} | tail -1 | cut -f1` \
     >> debian/control
 echo "XB-Maemo-Icon-26:" >> debian/control
-uuencode -m pkg/maemo/dorian-48.png dorian.png | \
+uuencode -m pkg/maemo/icon-48/dorian.png dorian.png | \
     (read; cat) | grep -v '^====' | \
     sed 's/^/ /' >> debian/control
 

diff --git a/pkg/maemo/build-scratchbox.sh b/pkg/maemo/build-scratchbox.sh
index 1ca005b..fcd0de1 100755 (executable)
--- a/pkg/maemo/build-scratchbox.sh
+++ b/pkg/maemo/build-scratchbox.sh
@@ -5,43 +5,12 @@
 
 set -x
 
-BUILD_DIR=/home/user/dorian-build
-PKG_DIR=/home/user/dorian-pkg
+BUILD_DIR=/home/user/dorian-auto
 
 [ `id -u` != "0" ] && { echo "Run as root"; exit 1; }
 [ ! -d ${BUILD_DIR} ] && { echo "Missing $BUILD_DIR"; exit 1; }
-[ ! -x /usr/bin/uuencode ] && { echo "Missing /usr/bin/uuencode"; exit 1; }
 
-VERSION=`cat ${BUILD_DIR}/pkg/version.txt`
-cd ${BUILD_DIR}
-make distclean || true
-qmake && make || exit 1
-
-[ -d ${PKG_DIR}/root ] && rm -rf ${PKG_DIR}/root
-install -m 755 -d ${PKG_DIR}/root
-install -m 755 -d ${PKG_DIR}/root/usr
-install -m 755 -d ${PKG_DIR}/root/usr/bin
-install -m 755 -d ${PKG_DIR}/root/usr/share/icons/hicolor/48x48
-install -m 755 -d ${PKG_DIR}/root/usr/share/icons/hicolor/scalable/hildon
-install -m 755 -d ${PKG_DIR}/root/usr/share/applications/hildon
-install -m 755 -d ${PKG_DIR}/root/DEBIAN
-install -m 755 ${BUILD_DIR}/dorian ${PKG_DIR}/root/usr/bin/dorian
-install -m 644 ${BUILD_DIR}/pkg/maemo/control ${PKG_DIR}/root/DEBIAN/control
-install -m 644 ${BUILD_DIR}/pkg/changelog ${PKG_DIR}/root/DEBIAN/changelog
-install -m 755 ${BUILD_DIR}/pkg/maemo/postinst ${PKG_DIR}/root/DEBIAN/postinst
-install -m 644 ${BUILD_DIR}/pkg/maemo/dorian-48.png \
-    ${PKG_DIR}/root/usr/share/icons/hicolor/48x48/dorian.png
-install -m 644 ${BUILD_DIR}/pkg/maemo/dorian-64.png \
-    ${PKG_DIR}/root/usr/share/icons/hicolor/scalable/hildon/dorian.png
-install -m 644 ${BUILD_DIR}/pkg/maemo/dorian.desktop \
-    ${PKG_DIR}/root/usr/share/applications/hildon/dorian.desktop
-echo "Version: $VERSION" >> ${PKG_DIR}/root/DEBIAN/control
-echo "Installed-Size: "`du -c -k ${PKG_DIR} | tail -1 | cut -f1` \
-    >> ${PKG_DIR}/root/DEBIAN/control
-echo "XB-Maemo-Icon-26:" >> ${PKG_DIR}/root/DEBIAN/control
-uuencode -m ${BUILD_DIR}/pkg/maemo/dorian-48.png dorian.png | \
-    (read; cat) | grep -v '^====' | \
-    sed 's/^/ /' >> ${PKG_DIR}/root/DEBIAN/control
-chmod a+r ${PKG_DIR}/root/DEBIAN/control
-dpkg-deb -b ${PKG_DIR}/root ${PKG_DIR}/dorian-maemo-${VERSION}.deb
-echo "Built $PKG_DIR/dorian-maemo-$VERSION.deb"
+# VERSION=`cat ${BUILD_DIR}/pkg/version.txt`
+VERSION=0.0.7
+cd ${BUILD_DIR}/dorian-${VERSION} || exit 1
+dpkg-buildpackage -rfakeroot

diff --git a/pkg/maemo/build.sh b/pkg/maemo/build.sh
index 807f628..dde79d0 100644 (file)
--- a/pkg/maemo/build.sh
+++ b/pkg/maemo/build.sh
@@ -2,14 +2,11 @@
 
 set -x
 
-SRC_DIR=/home/polster/workspace/dorian
-BUILD_DIR=/home/user/dorian-build
-SB_BUILD_DIR=/scratchbox/users/`id -un`${BUILD_DIR}
+sh autobuild.sh
 
-[ ! -d ${SRC_DIR} ] && { echo "Missing $SRC_DIR"; exit 1; }
-[ -d ${SB_BUILD_DIR} ] && rm -rf ${SB_BUILD_DIR}
-mkdir -p ${SB_BUILD_DIR}
-cp -R ${SRC_DIR}/* ${SB_BUILD_DIR}
-sb-conf select FREMANTLE_ARMEL
+VERSION=`cat ../version.txt`
+BUILD_DIR=/home/user/dorian-auto/dorian-${VERSION}
+SB_BUILD_DIR=/scratchbox/users/`id -un`${BUILD_DIR}
+[ ! -d ${SB_BUILD_DIR} ] && { echo "Missing $SB_BUILD_DIR"; exit 1; }
 chmod a+rx ${SB_BUILD_DIR}/pkg/maemo/build-scratchbox.sh
 scratchbox fakeroot ${BUILD_DIR}/pkg/maemo/build-scratchbox.sh

diff --git a/pkg/maemo/control b/pkg/maemo/control
index dc552b4..288c915 100644 (file)
--- a/pkg/maemo/control
+++ b/pkg/maemo/control
@@ -2,7 +2,6 @@ Source: dorian
 Section: user/education
 Priority: extra
 Maintainer: Akos Polster <akos@pipacs.com>
-Standards-Version: 3.7.3
 Build-Depends: debhelper (>= 5), libqt4-dev, libhildon1-dev, libhildondesktop1-dev
 Homepage: http://akos.pipacs.com
 

diff --git a/pkg/maemo/postinst b/pkg/maemo/postinst
index 1e85e4d..6576c8c 100644 (file)
--- a/pkg/maemo/postinst
+++ b/pkg/maemo/postinst
@@ -1,4 +1,5 @@
 #!/bin/sh
-gtk-update-icon-cache -f /usr/share/icons/hicolor/48x48
+gtk-update-icon-cache -f /usr/share/icons/hicolor
+gtk-update-icon-cache -f /usr/share/icons/hicolor/48x48/hildon
 gtk-update-icon-cache -f /usr/share/icons/hicolor/scalable/hildon
 # maemo-select-menu-location dorian.desktop

diff --git a/pkg/maemo/rules b/pkg/maemo/rules
index 9a742e1..a756045 100644 (file)
--- a/pkg/maemo/rules
+++ b/pkg/maemo/rules
@@ -1,26 +1,13 @@
 #!/usr/bin/make -f
 
 APPNAME := dorian
-builddir:
-       mkdir -p builddir
 
-builddir/Makefile: builddir
-       cd builddir && qmake PREFIX=/usr ../$(APPNAME).pro
-
-build: build-stamp
-
-build-stamp: builddir/Makefile
-       dh_testdir
-       # Add here commands to compile the package.
-       cd builddir && $(MAKE)
-       touch $@
+build: 
+       qmake PREFIX=/usr $(APPNAME).pro && make
 
 clean:
        dh_testdir
        dh_testroot
-       rm -f build-stamp
-       # Add here commands to clean up after the build process.
-       rm -rf builddir
        dh_clean
 
 install: build
@@ -29,11 +16,12 @@ install: build
        dh_clean -k
        dh_installdirs
        # Add here commands to install the package into debian/your_appname
-       cd builddir && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/$(APPNAME) install
+       # $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/$(APPNAME) install
+       $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp install
 
 # Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
+       # We have nothing to do by default.
 
 # Build architecture-dependent files here.
 binary-arch: build install
@@ -43,7 +31,7 @@ binary-arch: build install
        dh_installexamples
        dh_installman
        dh_link
-       dh_strip --dbg-package=my-application-dbg
+       dh_strip --dbg-package=dorian-dbg
        dh_compress
        dh_fixperms
        dh_installdeb

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