From 56a8f216901d58808925c1314195d4edbe085058 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Mon, 14 May 2007 17:30:46 +0000 Subject: [PATCH] * turn off launcher stuff for now pmo-trunk-r1860 --- debian/changelog | 2 +- debian/rules | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0fd0984..3860fb0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -modest (1.0-svn1851) unstable; urgency=low +modest (1.0-svn1860) unstable; urgency=low * update for the tny account security settings update * temporary change to give testers more info when connections don't work diff --git a/debian/rules b/debian/rules index e76e8ac..6384dfb 100755 --- a/debian/rules +++ b/debian/rules @@ -27,16 +27,16 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) 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 - LAUNCHER_LDFLAGS = -pie -shared -export-dynamic -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 +# LAUNCHER_LDFLAGS = -pie -shared -export-dynamic +#endif @@ -89,12 +89,12 @@ install: build # $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp -ifeq "$(strip $(LAUNCHER))" "yes" - mv $(CURDIR)/debian/modest/usr/bin/modest \ - $(CURDIR)/debian/modest/usr/bin/modest.launch - ln -s /usr/bin/maemo-invoker \ - $(CURDIR)/debian/modest/usr/bin/modest -endif +#ifeq "$(strip $(LAUNCHER))" "yes" +# mv $(CURDIR)/debian/modest/usr/bin/modest \ +# $(CURDIR)/debian/modest/usr/bin/modest.launch +# ln -s /usr/bin/maemo-invoker \ +# $(CURDIR)/debian/modest/usr/bin/modest +#endif # Build architecture-independent files here. binary-indep: build install -- 1.7.9.5