From 5ff64b5b4c5c0c8101bd5a4f3a22d20cb6710d77 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Sun, 6 May 2007 10:18:43 +0000 Subject: [PATCH 1/1] * debian packaging updates pmo-trunk-r1764 --- configure.ac | 8 ++++++++ debian/control-maemo0 | 2 +- debian/modest.install | 1 + debian/rules | 2 +- scripts/build-packages | 6 +++--- src/Makefile.am | 5 ++--- 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 628cbab..aa69fac 100644 --- 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` + dbus_api="dbus_api" + AC_SUBST(dbus_api) + # 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."]) + + # no dbus api for gnome + dbus_api="" + AC_SUBST(dbus_api) + fi dnl do we have the easy setup stuff? diff --git a/debian/control-maemo0 b/debian/control-maemo0 index a7676a1..fe33191 100644 --- a/debian/control-maemo0 +++ b/debian/control-maemo0 @@ -2,7 +2,7 @@ Source: modest Section: user/extra Priority: optional Maintainer: Dirk-Jan C. Binnema -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 diff --git a/debian/modest.install b/debian/modest.install index f227c5e..c741ba9 100644 --- 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/modest/provider-data/mcc_mapping usr/share/pixmaps/modest/* usr/share/man/man1/* diff --git a/debian/rules b/debian/rules index cbe5770..0d627aa 100755 --- a/debian/rules +++ b/debian/rules @@ -96,7 +96,7 @@ binary-arch: build install # dh_installinfo dh_installman dh_link - dh_strip + dh_strip --dbg-package="modest-dbg" dh_compress dh_fixperms # dh_perl diff --git a/scripts/build-packages b/scripts/build-packages index 9e2d470..3abe2df 100755 --- 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 - 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 < debian/changelog < -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)\ @@ -12,7 +12,6 @@ INCLUDES=\ -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/\" -- 1.7.9.5