Fixing harmattan pkgs

The fixes are going into the qtc_harmattan packaging scripts, since the
scratchbox for harmattan seems to be no longer working.  Eventually we
should remove it and put the qtc_harmattan one in instead, but for now
keep both around until its proven to work.  This is also important
because bifh might need it.

Basically - remove the translation line, fix up a lot of broken desktop
files, use a different location for the icons, and generally fix all
the problems as described in the bug.

Task-number: QTBUG-21955

Change-Id: I02cdf6c02ef9515b14384aaaf8e039a09a6cb82b
Reviewed-by: Patrick Burke <patrick.burke@nokia.com>

7 files changed, 84 insertions, 108 deletions

diff --git a/qtc_packaging/debian_harmattan/changelog b/qtc_packaging/debian_harmattan/changelog
index 9829c5d5d..15030940d 100644
--- a/qtc_packaging/debian_harmattan/changelog
+++ b/qtc_packaging/debian_harmattan/changelog
@@ -1,5 +1,5 @@
-quick3d (0.0.1) unstable; urgency=low
+libqt4-3d (1.0-rc) unstable; urgency=low
 
-  * Initial Release.
+  * Candidate for 1.0 Release.
 
- -- unknown <sarasmit@unknown>  Wed, 29 Jun 2011 16:52:34 +1000
+ -- Sarah Smith <sarah.j.smith@nokia.com>  Thu, 24 Nov 2011 16:00:00 +1000
diff --git a/qtc_packaging/debian_harmattan/changelog.old b/qtc_packaging/debian_harmattan/changelog.old
deleted file mode 100644
index 3a4ac83da..000000000
--- a/qtc_packaging/debian_harmattan/changelog.old
+++ /dev/null
@@ -1,5 +0,0 @@
-libqt4-3d (1.0-tp1) unstable; urgency=low
-
-  * Technology Preview 1 Release.
-
- -- Sarah Smith <sarah.j.smith@nokia.com>  Wed, 06 Apr 2011 16:30:00 +1000
diff --git a/qtc_packaging/debian_harmattan/control b/qtc_packaging/debian_harmattan/control
index b6ef34099..d4f57b710 100644
--- a/qtc_packaging/debian_harmattan/control
+++ b/qtc_packaging/debian_harmattan/control
@@ -1,14 +1,35 @@
-Source: quick3d
-Section: user/other
-Priority: optional
+Source: libqt4-3d
+Section: libdevel
+Priority: extra
 Maintainer: Sarah Smith <sarah.j.smith@nokia.com>
 Build-Depends: debhelper (>= 5), libqt4-dev
 Standards-Version: 3.7.3
 Homepage: http://doc.qt.nokia.com/qt-quick3d-snapshot/
 
-Package: quick3d
+Package: libqt4-3d
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: <insert up to 60 chars description>
+Description: Qt4 3D module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ The Qt3d module contains functionality for 3D scenes and UIs.
+
+Package: libqt4-3d-examples
+Architecture: any
+Depends: libqt4-3d (= ${binary:Version})
+Description: Qt 4 3d module examples
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains examples and demos for the Qt3d module
+
+Package: libqt4-3d-dev
+Architecture: any
+Depends: libqt4-3d (= ${binary:Version})
+Description: Qt 4 3d module development files
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains the development headers for the Qt3d moduleescription: <insert up to 60 chars description>
  Qt Quick 3D lets you use QML to write 3D (OpenGL) apps.
-XSBC-Maemo-Display-Name: quick3d
diff --git a/qtc_packaging/debian_harmattan/control.old b/qtc_packaging/debian_harmattan/control.old
deleted file mode 100644
index 7d969ded6..000000000
--- a/qtc_packaging/debian_harmattan/control.old
+++ /dev/null
@@ -1,33 +0,0 @@
-Source: libqt4-3d
-Section: libdevel
-Priority: extra
-Maintainer: Sarah Smith <sarah.j.smith@nokia.com>
-Build-Depends: debhelper (>= 7), libqt4-dev (>= 4.7.2~git20110208-0maemo1+0m6), cdbs (>= 0.4.87+maemo2+0m6)
-Standards-Version: 3.8.4
-
-Package: libqt4-3d
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Qt4 3D module
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- The Qt3d module contains functionality for 3D scenes and UIs.
-
-Package: libqt4-3d-examples
-Architecture: any
-Depends: libqt4-3d (= ${binary:Version})
-Description: Qt 4 3d module examples
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This package contains examples and demos for the Qt3d module
-
-Package: libqt4-3d-dev
-Architecture: any
-Depends: libqt4-3d (= ${binary:Version})
-Description: Qt 4 3d module development files
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This package contains the development headers for the Qt3d module
diff --git a/qtc_packaging/debian_harmattan/libqt4-3d-examples.install b/qtc_packaging/debian_harmattan/libqt4-3d-examples.install
index 9bc01a58c..47d99cab1 100644
--- a/qtc_packaging/debian_harmattan/libqt4-3d-examples.install
+++ b/qtc_packaging/debian_harmattan/libqt4-3d-examples.install
@@ -1,4 +1,4 @@
 usr/bin/*
 usr/share/qt4/quick3d
-usr/share/themes/base/meegotouch/icons
+usr/share/icons/hicolor/80x80/apps
 usr/share/applications
diff --git a/qtc_packaging/debian_harmattan/rules b/qtc_packaging/debian_harmattan/rules
index b9f7b7dce..72f257efc 100644..100755
--- a/qtc_packaging/debian_harmattan/rules
+++ b/qtc_packaging/debian_harmattan/rules
@@ -1,34 +1,74 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# This rules file is for new Nokia devices using maemo6/meego.
+# For fremantle / N900 see the file devices/maemo5/debian/rules.
+# For ubuntu desktop see the file devices/ubuntu/debian/rules.
+
+# To build using this rules file, the Madde environment is needed.  This ships
+# (for example) with the QtSDK.
+#
+# This file ships ready to use with Qt Creator.  To use it from the command line
+# uncomment the lines below which say # Uncomment for use without Qt Creator
+# and then follow these steps:
+#
+# ### Step 1: set up the build directory - DO NOT CD INTO IT YET!
+# mkdir -p ~/build/harmattan/pkg
+# cd ~/build/harmattan
+#
+# ### Step 2: set up to use the Madde build environment - eg if Madde is in your home under QtSDK:
+# export MADDE=$HOME/QtSDK/Madde
+# export PATH=$MADDE/targets/harmattan-platform-api/bin:$MADDE/bin:$MADDE/madlib:$MADDE/madbin:$PATH
+# export PERL5LIB=$MADDE/madlib/perl5
+# export SYSROOT_DIR=$MADDE/sysroots/harmattan-meego-arm-sysroot-1122-slim
+#
+# ### Step 3: copy all the stuff across - cannot shadow build (probably don't want git)
+# (cd ~/depot/qt/quick3d && tar cf - --exclude-vcs .)|(cd pkg && tar xf -)
+# cd pkg
+# cp -f -v qtc_packaging/debian_harmattan/* debian/.
+#
+# ### Step 4: actually do the build, using lots of cores if available
+# export DEB_BUILD_OPTIONS="parallel=4"
+# dpkg-buildpackage -b
+#
+#
+# This rules file should use the control and *.install files (driven by the dh_install cmd below)
+# to actually build 3 seperate debian packages:
+#    libqt4-3d  -- Qt3D "run time" with C++ libs and QML imports
+#    libqt4-3d-dev  -- Qt3D development files - eg headers and .prf files
+#    libqt4-3d-examples  -- installed Qt3D examples incl desktop files to run on device
+
 
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
+# Find out how many parallel threads to run
+TMP_BUILD_OPTS = $(subst $(comma),$(space),$(DEB_BUILD_OPTIONS))
+ifneq (,$(filter parallel=%,$(TMP_BUILD_OPTS)))
+	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(TMP_BUILD_OPTS)))
+	PARALLEL_MAKEFLAGS += -j$(NUMJOBS)
+endif
+
+DEB_MAKE_INVOKE := $(MAKE) $(PARALLEL_MAKEFLAGS)
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	# qmake PREFIX=/usr# Uncomment this line for use without Qt Creator
-
+	qmake -spec linux-g++-maemo quick3d.pro CONFIG+=qtc_harmattan # Uncomment this line for use without Qt Creator
 	touch configure-stamp
 
-
 build: build-stamp
 
 build-stamp: configure-stamp  
 	dh_testdir
 
 	# Add here commands to compile the package.
-	# $(MAKE) # Uncomment this line for use without Qt Creator
+	$(DEB_MAKE_INVOKE) # Uncomment this line for use without Qt Creator
 	#docbook-to-man debian/quick3d.sgml > quick3d.1
 
 	touch $@
 
-clean: 
+clean: configure-stamp
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
@@ -44,8 +84,8 @@ install: build
 	dh_clean -k 
 	dh_installdirs
 
-	# Add here commands to install the package into debian/quick3d.
-	$(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/quick3d install
+	# Add here commands to install the package into debian/tmp.
+	$(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/tmp install
 
 
 # Build architecture-independent files here.
@@ -59,7 +99,7 @@ binary-arch: build install
 	dh_installchangelogs 
 	dh_installdocs
 	dh_installexamples
-#	dh_install
+	dh_install --sourcedir=debian/tmp
 #	dh_installmenu
 #	dh_installdebconf	
 #	dh_installlogrotate
diff --git a/qtc_packaging/debian_harmattan/rules.old b/qtc_packaging/debian_harmattan/rules.old
deleted file mode 100644
index a09b5b39a..000000000
--- a/qtc_packaging/debian_harmattan/rules.old
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-
-# This rules file is for new Nokia devices using maemo6/meego.
-# For fremantle / N900 see the file devices/maemo5/debian/rules.
-# For ubuntu desktop see the file devices/ubuntu/debian/rules.
-
-# To build using this rules file:
-# #
-# ### install debian packaging stuff if not already present:
-# sudo apt-get install dpkg-dev debhelper cdbs
-#
-# ### set up the build directory with version number - DO NOT CD INTO IT YET!
-# mkdir quick3d-tp1
-#
-# ### copy all the stuff across - cannot shadow build (probably don't want git)
-# (cd ~/depot/qt/quick3d && tar cf - --exclude-vcs .)|(cd quick3d-tp1 && tar xf -)
-#
-# ### if the qmake in the $PATH is not the Qt you want to use
-# ### you can use a binary package or a Qt built from source (even if its installed with
-# ### "make install") as long as it has declarative & opengl
-# # export PATH=/usr/local/qt/%VERSION%/bin:$PATH
-#
-# cd quick3d-tp1
-# export DEB_BUILD_OPTIONS="parallel=4"
-# dpkg-buildpackage -b
-
-# Uncomment this to turn on verbose mode.
-export DH_OPTIONS=-v
-export DH_VERBOSE=1
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
-
-# Find out how many parallel threads to run 
-TMP_BUILD_OPTS = $(subst $(comma),$(space),$(DEB_BUILD_OPTIONS))
-ifneq (,$(filter parallel=%,$(TMP_BUILD_OPTS)))
-	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(TMP_BUILD_OPTS)))
-	PARALLEL_MAKEFLAGS += -j$(NUMJOBS)
-endif
-
-DEB_MAKE_INVOKE := $(MAKE) $(PARALLEL_MAKEFLAGS)
-DEB_MAKE_INSTALL_TARGET := INSTALL_ROOT=$(DEB_DESTDIR) install
-DEB_DH_INSTALL_SOURCEDIR := debian/tmp
-
-common-configure-arch::
-	qmake -spec linux-g++-maemo quick3d.pro CONFIG+=maemo CONFIG+=package