From 0a174260c5dd04d516da7a6021e681d49c312547 Mon Sep 17 00:00:00 2001
From: "Javier S. Pedro" <maemo@javispedro.com>
Date: Mon, 17 Sep 2012 23:17:18 +0200
Subject: minor build fixes

---
 distfoldd/distfoldd.pro              |  8 ++++++--
 distfoldd/keygen.sh                  |  7 +++++++
 qtc_packaging/debian_harmattan/rules | 10 +---------
 utils/keygen.sh                      |  5 -----
 4 files changed, 14 insertions(+), 16 deletions(-)
 create mode 100755 distfoldd/keygen.sh
 delete mode 100755 utils/keygen.sh

diff --git a/distfoldd/distfoldd.pro b/distfoldd/distfoldd.pro
index 3eb804e..3076068 100644
--- a/distfoldd/distfoldd.pro
+++ b/distfoldd/distfoldd.pro
@@ -30,6 +30,10 @@ HEADERS += \
     compressor.h
 
 contains(MEEGO_EDITION,harmattan) {
-    target.path = /opt/distfold/bin
-    INSTALLS += target
+	target.path = /opt/distfold/bin
+
+	scripts.files = keygen.sh
+	scripts.path = /opt/distfold/bin
+
+	INSTALLS += target scripts
 }
diff --git a/distfoldd/keygen.sh b/distfoldd/keygen.sh
new file mode 100755
index 0000000..d271b57
--- /dev/null
+++ b/distfoldd/keygen.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# Simple script to generate required SSL cert & private key.
+# Place server.* files in ~/.config/distfold/
+
+openssl req -x509 -batch -newkey rsa:2048 -keyout server.key -nodes -days 365 -out server.crt
+chmod 0400 server.key server.crt
diff --git a/qtc_packaging/debian_harmattan/rules b/qtc_packaging/debian_harmattan/rules
index 77c3092..48adab5 100755
--- a/qtc_packaging/debian_harmattan/rules
+++ b/qtc_packaging/debian_harmattan/rules
@@ -9,10 +9,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-
-
-
-
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -26,9 +22,7 @@ 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
-	#docbook-to-man debian/distfold.sgml > distfold.1
 
 	touch $@
 
@@ -37,8 +31,7 @@ clean:
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
-	# Add here commands to clean up after the build process.
-	$(MAKE) clean
+	-$(MAKE) clean
 
 	dh_clean 
 
@@ -48,7 +41,6 @@ install: build
 	dh_clean -k 
 	dh_installdirs
 
-	# Add here commands to install the package into debian/distfold.
 	$(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/distfold install
 
 
diff --git a/utils/keygen.sh b/utils/keygen.sh
deleted file mode 100755
index 8dd0119..0000000
--- a/utils/keygen.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-openssl req -x509 -batch -newkey rsa:2048 -keyout server.key -nodes -days 365 -out server.crt
-chmod 0400 server.key server.crt
-
-- 
cgit v1.2.3