From ed1e84f57021a76763bf8c71b4d1abdf2c25dac4 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Thu, 7 Jun 2007 06:13:12 +0000 Subject: [PATCH] * really turn off the launcher for now (integration still seemed to activate it through DEB_BUILD_OPTIONS), because the launcher seems to impact network connectivity in some way. * add libhildonhelp-dev as a build dep pmo-trunk-r2089 --- debian/control-maemo1 | 2 +- debian/rules | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/debian/control-maemo1 b/debian/control-maemo1 index bb4d610..4a1e014 100644 --- a/debian/control-maemo1 +++ b/debian/control-maemo1 @@ -2,7 +2,7 @@ Source: modest Section: mail Priority: optional Maintainer: Dirk-Jan C. Binnema -Build-Depends: debhelper (>= 4.0.0), cdbs, gnome-common, gtkhtml-dev, libconic0-dev, libhildon1-dev, libdbus-1-dev, libdbus-glib-1-dev, libebook-dev, osso-af-settings, libedataserver-dev, libgconf2-dev, libglib2.0-dev, libosso-abook-dev, libosso-gnomevfs2-dev, libhildonmime-dev,libtinymail-1.0-0-dev, libtinymail-camel-1.0-0-dev, libtinymail-maemo-1.0-0-dev,libtinymailui-1.0-0-dev,libtinymail-gnomevfs-1.0-0-dev,libtinymailui-gtk-1.0-0-dev,wpeditor-dev,libosso-help-dev, modest-providers-data, libalarm-dev, gtk-doc-tools +Build-Depends: debhelper (>= 4.0.0), cdbs, gnome-common, gtkhtml-dev, libconic0-dev, libhildon1-dev, libdbus-1-dev, libdbus-glib-1-dev, libebook-dev, osso-af-settings, libedataserver-dev, libgconf2-dev, libglib2.0-dev, libosso-abook-dev, libosso-gnomevfs2-dev, libhildonmime-dev,libtinymail-1.0-0-dev, libtinymail-camel-1.0-0-dev, libtinymail-maemo-1.0-0-dev,libtinymailui-1.0-0-dev,libtinymail-gnomevfs-1.0-0-dev,libtinymailui-gtk-1.0-0-dev,wpeditor-dev,libhildonhelp-dev, modest-providers-data, libalarm-dev, gtk-doc-tools Standards-Version: 3.6.0 Package: modest diff --git a/debian/rules b/debian/rules index 3bd21d4..784d4cb 100755 --- a/debian/rules +++ b/debian/rules @@ -21,11 +21,15 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s endif -LAUNCHER = no -ifneq (,$(findstring maemo-launcher,$(DEB_BUILD_OPTIONS))) - LAUNCHER = yes +ifneq (,$(findstring thumb,$(DEB_BUILD_OPTIONS))) + CFLAGS += -mthumb endif +LAUNCHER = no +#ifneq (,$(findstring maemo-launcher,$(DEB_BUILD_OPTIONS))) +# LAUNCHER = yes +#endif + ifeq "$(strip $(LAUNCHER))" "yes" LAUNCHER_DEPENDS = -Vlauncher:Depends="maemo-launcher" LAUNCHER_CFLAGS = -shared @@ -61,7 +65,7 @@ clean: dh_testroot rm -f build-stamp - # commands to clean up after the build process. +# commands to clean up after the build process. -$(MAKE) distclean ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub @@ -77,7 +81,7 @@ install: build dh_clean -k dh_installdirs - # install the package into debian/tmp/ +# install the package into debian/tmp/ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp ifeq "$(strip $(LAUNCHER))" "yes" -- 1.7.9.5