X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=debian%2Frules;h=742754da0334ac700ab6b634adde79f063929514;hp=ed4407d551a3e1d9fbc8284d3b24cf47ecdc741d;hb=2e629db997bbb18f04f12ba67315c552b8dfc65e;hpb=a5a4d0bc2cd72c80283137bd2d0c6ecc0f334b95

diff --git a/debian/rules b/debian/rules
index ed4407d..742754d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,10 +25,12 @@ ifneq (,$(findstring thumb,$(DEB_BUILD_OPTIONS)))
         CFLAGS += -mthumb
 endif
 
-# maemo-launcher support is not working properly yet, so leave it disabled
-DEB_BUILD_OPTIONS := $(DEB_BUILD_OPTIONS),nolauncher
 ifeq (,$(findstring nolauncher,$(DEB_BUILD_OPTIONS)))
-	conf_opt := --enable-maemo-launcher
+	conf_opt = --enable-maemo-launcher
+endif
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	conf_opt += --enable-debug
 endif
 
 config.status: configure
@@ -59,7 +61,9 @@ clean:
 	rm -f build-stamp 
 
 # commands to clean up after the build process.
-	-$(MAKE) distclean
+#	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
+
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
 endif
@@ -107,7 +111,7 @@ binary-arch: build install
 #	dh_installinfo
 	dh_installman
 	dh_link
-	dh_strip --keep-debug --dbg-package=modest --dbg-package=libmodest-dbus-client
+	dh_strip --keep-debug --dbg-package=modest
 	dh_compress
 	dh_fixperms
 #	dh_perl
@@ -118,6 +122,7 @@ binary-arch: build install
 	# Not a requirement by now, so don't fail if it's not installed
 	which dh_maemolauncher && dh_maemolauncher usr/bin/modest || true
 	dh_gencontrol
+#	sh debian/scripts/renew_control_file.sh
 	dh_md5sums
 	dh_builddeb