* debian/changelog update for packaging

* support for the maemo-launcher (turned-off for now)

pmo-trunk-r1852

diff --git a/debian/changelog b/debian/changelog
index b8093e4..0fd0984 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-modest (1.0-svn1847) unstable; urgency=low
+modest (1.0-svn1851) unstable; urgency=low
 
   * update for the tny account security settings update
+  * temporary change to give testers more info when connections don't work
 
  -- Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>  Mon, 14 May 2007 14:39:08 +0300
 

diff --git a/debian/rules b/debian/rules
index 9c3fe43..1064238 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,20 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
        INSTALL_PROGRAM += -s
 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
+
+
+
 config.status: configure
        dh_testdir
        # commands to configure the package.
@@ -43,7 +57,9 @@ build-stamp:  config.status
        dh_testdir
 
        # commands to compile the package.
-       $(MAKE) 
+       $(MAKE) \
+        MAEMO_LAUNCHER_CFLAGS="$(LAUNCHER_CFLAGS)" \
+        MAEMO_LAUNCHER_LDFLAGS="$(LAUNCHER_LDFLAGS)"
        touch build-stamp
 
 clean:
@@ -73,6 +89,14 @@ 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
+
+
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.
@@ -104,7 +128,7 @@ binary-arch: build install
        dh_makeshlibs
        dh_installdeb
        dh_shlibdeps
-       dh_gencontrol 
+       dh_gencontrol -- $(LAUNCHER_DEPENDS)
        dh_md5sums
        dh_builddeb
 

diff --git a/src/Makefile.am b/src/Makefile.am
index d3001a4..bd8f2c0 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -88,6 +88,9 @@ modest_SOURCES=\
        modest-widget-memory.c\
        modest-widget-memory.h 
 
+modest_CFLAGS  = "$modest_CFLAGS  $(MAEMO_LAUNCHER_CFLAGS)"
+modest_LDFLAGS = "$modest_LDFLAGS $(MAEMO_LAUNCHER_LDFLAGS)"
+
 modest_LDADD =                                                 \
        $(MODEST_GSTUFF_LIBS)                           \
        $(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS)        \