* debian packaging fixes

pmo-trunk-r1762

diff --git a/debian/changelog b/debian/changelog
index b330aae..dc42417 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+modest (1.0-svn1759) unstable; urgency=low
+
+  * Week 19 prelease
+  * Fixes: NB#55338, NB#55341, NB#55343, NB#55370, NB#55377, NB#55390,
+    NB#55391, NB#55441, NB#55446, NB#55514, NB#55934
+
+ -- Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>  Fri,  4 May 2007 18:33:33 +0300
+
 modest (1.0-svn1729) unstable; urgency=low
  
   * First release to integration

diff --git a/debian/control-maemo1 b/debian/control-maemo1
index a1633a0..4616315 100644 (file)
--- a/debian/control-maemo1
+++ b/debian/control-maemo1
@@ -2,7 +2,7 @@ Source: modest
 Section: user/extra
 Priority: optional
 Maintainer: Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com> 
-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,libtinymailui-gtk-1.0-0-dev,wpeditor-dev,libosso-help-dev, modest-providers-data, libalarm-dev
+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,libtinymailui-gtk-1.0-0-dev,wpeditor-dev,libosso-help-dev, modest-providers-data, libalarm-dev, gtk-doc-tools
 Standards-Version: 3.6.0
 
 Package: modest
@@ -10,10 +10,10 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, modest-providers-data
 Description: an e-mail client for platforms with modest resources
 
-Package: modest-dbg
-Section: devel
-Architecture: all
-Depends: modest (=${Source-Version})
-Description: debug package for modest
+#Package: modest-dbg
+#Section: devel
+#Architecture: all
+#Depends: modest (=${Source-Version})
+#Description: debug package for modest
 
 

diff --git a/debian/modest.install b/debian/modest.install
index 380b149..f227c5e 100644 (file)
--- a/debian/modest.install
+++ b/debian/modest.install
@@ -5,3 +5,5 @@ usr/share/doc/modest/*
 usr/share/mime/packages/*
 usr/locale/en_GB/LC_MESSAGES/*
 usr/share/modest/ui/*
+usr/share/pixmaps/modest/*
+usr/share/man/man1/*

diff --git a/debian/rules b/debian/rules
index a4ee397..cbe5770 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -26,16 +26,6 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
        INSTALL_PROGRAM += -s
 endif
 
-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 = -shared -export-dynamic
-endif
-
 config.status: configure
        dh_testdir
        # commands to configure the package.
@@ -53,11 +43,7 @@ build-stamp:  config.status
        dh_testdir
 
        # commands to compile the package.
-       $(MAKE) \
-         MAEMO_LAUNCHER_CFLAGS="$(LAUNCHER_CFLAGS)" \
-         MAEMO_LAUNCHER_LDFLAGS="$(LAUNCHER_LDFLAGS)"
-       #/usr/bin/docbook-to-man debian/osso-sketch.sgml > osso-sketch.1
-
+       $(MAKE) 
        touch build-stamp
 
 clean:
@@ -87,13 +73,6 @@ install: build
        #
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
-ifeq "$(strip $(LAUNCHER))" "yes"
-       mv $(CURDIR)/debian/tmp/usr/bin/modest \
-          $(CURDIR)/debian/tmp/usr/bin/modest.launch
-       ln -s /usr/bin/maemo-invoker \
-             $(CURDIR)/debian/tmp/usr/bin/modest
-endif
-
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.
@@ -106,7 +85,7 @@ binary-arch: build install
        dh_installdocs
        dh_installexamples
        dh_install --sourcedir=debian/tmp -v
-#      dh_installmenu
+       dh_installmenu
 #      dh_installdebconf       
 #      dh_installlogrotate
 #      dh_installemacsen
@@ -115,9 +94,9 @@ binary-arch: build install
 #      dh_installinit
 #      dh_installcron
 #      dh_installinfo
-#      dh_installman
+       dh_installman
        dh_link
-       dh_strip --dbg-package=modest
+       dh_strip 
        dh_compress
        dh_fixperms
 #      dh_perl
@@ -125,7 +104,7 @@ binary-arch: build install
 #      dh_makeshlibs
        dh_installdeb
        dh_shlibdeps
-       dh_gencontrol -- $(LAUNCHER_DEPENDS)
+       dh_gencontrol 
        dh_md5sums
        dh_builddeb