* debian packaging updates

pmo-trunk-r1764

diff --git a/configure.ac b/configure.ac
index 628cbab..aa69fac 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -116,6 +116,9 @@ if test "x$with_platform" = "xmaemo"; then
   pluginlibdir=`$PKG_CONFIG hildon-control-panel --variable=plugindir`
   plugindesktopentrydir=`$PKG_CONFIG hildon-control-panel --variable=plugindesktopentrydir`
 
   pluginlibdir=`$PKG_CONFIG hildon-control-panel --variable=plugindir`
   plugindesktopentrydir=`$PKG_CONFIG hildon-control-panel --variable=plugindesktopentrydir`
 

+  dbus_api="dbus_api"
+  AC_SUBST(dbus_api)
+

   # Define as variables in Makefiles
   AC_SUBST(desktopentrydir)
   AC_SUBST(serviceentrydir)
   # Define as variables in Makefiles
   AC_SUBST(desktopentrydir)
   AC_SUBST(serviceentrydir)

@@ -138,6 +141,11 @@ else
    AC_SUBST(MODEST_LIBTINYMAIL_GNOME_DESKTOP_CFLAGS)
    AC_SUBST(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS)  
    AC_DEFINE_UNQUOTED(MODEST_PLATFORM_GNOME, 1, ["Whether modest is being built for the GNOME platform."])
    AC_SUBST(MODEST_LIBTINYMAIL_GNOME_DESKTOP_CFLAGS)
    AC_SUBST(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS)  
    AC_DEFINE_UNQUOTED(MODEST_PLATFORM_GNOME, 1, ["Whether modest is being built for the GNOME platform."])

+
+  # no dbus api for gnome
+  dbus_api=""
+  AC_SUBST(dbus_api)
+

 fi
 
 dnl do we have the easy setup stuff?
 fi
 
 dnl do we have the easy setup stuff?

diff --git a/debian/control-maemo0 b/debian/control-maemo0
index a7676a1..fe33191 100644 (file)
--- a/debian/control-maemo0
+++ b/debian/control-maemo0
@@ -2,7 +2,7 @@ Source: modest
 Section: user/extra 
 Priority: optional
 Maintainer: Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com> 
 Section: user/extra 
 Priority: optional
 Maintainer: Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com> 

-Build-Depends: debhelper (>= 4.0.0), cdbs, gtkhtml-dev, libconic0-dev, hildon-libs-dev, libdbus-1-dev, libdbus-glib-1-dev, libebook-dev, libedataserver-dev, libgconf2-dev, libglib2.0-dev, libosso-abook-dev, libosso-gnomevfs2-dev, libossomime-dev,libtinymail-1.0-0-dev, libtinymail-camel-1.0-0-dev, libtinymail-maemo-1.0-0-dev,libtinymailui-1.0-0-dev,libtinymailui-gtk-1.0-0-dev,wpeditor-dev,libosso-help-dev, modest-providers-data
+Build-Depends: debhelper (>= 4.0.0), cdbs, gtkhtml-dev, libconic0-dev, hildon-libs-dev, libdbus-1-dev, libdbus-glib-1-dev, libalarm-dev, gtk-doc-tools, libebook-dev, libedataserver-dev, libgconf2-dev, libglib2.0-dev, libosso-abook-dev, libosso-gnomevfs2-dev, libossomime-dev,libtinymail-1.0-0-dev, libtinymail-camel-1.0-0-dev, libtinymail-maemo-1.0-0-dev,libtinymailui-1.0-0-dev,libtinymailui-gtk-1.0-0-dev,wpeditor-dev,libosso-help-dev, modest-providers-data

 Standards-Version: 3.6.0
 
 Package: modest
 Standards-Version: 3.6.0
 
 Package: modest

diff --git a/debian/modest.install b/debian/modest.install
index f227c5e..c741ba9 100644 (file)
--- a/debian/modest.install
+++ b/debian/modest.install
@@ -5,5 +5,6 @@ usr/share/doc/modest/*
 usr/share/mime/packages/*
 usr/locale/en_GB/LC_MESSAGES/*
 usr/share/modest/ui/*
 usr/share/mime/packages/*
 usr/locale/en_GB/LC_MESSAGES/*
 usr/share/modest/ui/*

+usr/share/modest/provider-data/mcc_mapping

 usr/share/pixmaps/modest/*
 usr/share/man/man1/*
 usr/share/pixmaps/modest/*
 usr/share/man/man1/*

diff --git a/debian/rules b/debian/rules
index cbe5770..0d627aa 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -96,7 +96,7 @@ binary-arch: build install
 #      dh_installinfo
        dh_installman
        dh_link
 #      dh_installinfo
        dh_installman
        dh_link

-       dh_strip 
+       dh_strip --dbg-package="modest-dbg"

        dh_compress
        dh_fixperms
 #      dh_perl
        dh_compress
        dh_fixperms
 #      dh_perl

diff --git a/scripts/build-packages b/scripts/build-packages
index 9e2d470..3abe2df 100755 (executable)
--- a/scripts/build-packages
+++ b/scripts/build-packages
@@ -113,8 +113,8 @@ if test -n "`ls $PACKAGE_PATH/*tinymail*${TINYMAIL_REVISION}*.deb`"; then
     $SCRATCHBOX "fakeroot dpkg -i ${PACKAGE_PATH}/*${TINYMAIL_REVISION}*.deb"
 else
     cd $TINYMAIL_PATH
     $SCRATCHBOX "fakeroot dpkg -i ${PACKAGE_PATH}/*${TINYMAIL_REVISION}*.deb"
 else
     cd $TINYMAIL_PATH

-    test -e debian/rules   || ln -s debian/rules.maemo debian/rules
-    test -e debian/control || ln -s debian/control.maemo debian/control
+    test -e debian/rules   || cp debian/rules.maemo debian/rules
+    test -e debian/control || cp debian/control.maemo debian/control

     mv -f debian/changelog debian/changelog.bak
     cat > debian/changelog <<EOF
 tinymail (1.0-svn${TINYMAIL_REVISION}) unstable; urgency=low
     mv -f debian/changelog debian/changelog.bak
     cat > debian/changelog <<EOF
 tinymail (1.0-svn${TINYMAIL_REVISION}) unstable; urgency=low

@@ -170,7 +170,7 @@ if test -n "`ls $PACKAGE_PATH/*modest_*${MODEST_REVISION}*.deb`"; then
     $SCRATCHBOX "fakeroot dpkg -i ${PACKAGE_PATH}/*${MODEST_REVISION}*.deb"
 else
     cd $MODEST_PATH
     $SCRATCHBOX "fakeroot dpkg -i ${PACKAGE_PATH}/*${MODEST_REVISION}*.deb"
 else
     cd $MODEST_PATH

-    test -e debian/control || ( cd debian; ln -s control-maemo0 control; cd .. )
+    test -e debian/control || ( cd debian; cp control-maemo0 control; cd .. )

     mv -f debian/changelog debian/changelog.bak
     cat > debian/changelog <<EOF
 modest (1.0-svn${MODEST_REVISION}) unstable; urgency=low
     mv -f debian/changelog debian/changelog.bak
     cat > debian/changelog <<EOF
 modest (1.0-svn${MODEST_REVISION}) unstable; urgency=low

diff --git a/src/Makefile.am b/src/Makefile.am
index c0203f1..9d92a5a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,8 @@
 #
 # Makefile.am
 # Time-stamp: <2007-04-21 11:15:36 (djcb)>
 #
 # Makefile.am
 # Time-stamp: <2007-04-21 11:15:36 (djcb)>

-SUBDIRS=$(MODEST_PLATFORM) widgets dbus_api
-DIST_SUBDIRS = widgets gnome maemo
+SUBDIRS=$(MODEST_PLATFORM) widgets $(dbus_api)
+DIST_SUBDIRS = widgets gnome maemo dbus_api

 
 INCLUDES=\
        $(MODEST_GSTUFF_CFLAGS)\
 
 INCLUDES=\
        $(MODEST_GSTUFF_CFLAGS)\

@@ -12,7 +12,6 @@ INCLUDES=\
        -DPREFIX=\"@prefix@\" \
        -DMODEST_LOCALEDIR=\"$(MODEST_LOCALEDIR)\" \
        -DMODEST_PLATFORM=\"$(MODEST_PLATFORM)\" \
        -DPREFIX=\"@prefix@\" \
        -DMODEST_LOCALEDIR=\"$(MODEST_LOCALEDIR)\" \
        -DMODEST_PLATFORM=\"$(MODEST_PLATFORM)\" \

-       -DMODEST_PLATFORM_ID=$(MODEST_PLATFORM_ID) \

        -DPIXMAP_PREFIX=\"${datadir}/pixmaps/modest/\" \
        -DMODEST_UIDIR=\"$(datadir)/modest/ui/\"
 
        -DPIXMAP_PREFIX=\"${datadir}/pixmaps/modest/\" \
        -DMODEST_UIDIR=\"$(datadir)/modest/ui/\"