* update the debian packaging instructions

pmo-trunk-r1740

diff --git a/debian/changelog b/debian/changelog
index 5cdd85e..b330aae 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-modest (svn1707) unstable; urgency=low
+modest (1.0-svn1729) unstable; urgency=low
+ 
+  * First release to integration
+  * Implemented: NR#149683, NR#149681, NR#149685, NR#149679, NR#149677, NR#149675, NR#149662, NR#149672, NR#149667, NR#149669, NR#149670, NR#149794, NR#149795, NR#149796, NR#149797, NR#149798, NR#149800, NR#149801, NR#149804, NR#149782, NR#149783, NR#149784, NR#149788, NR#149789, NR#149692, NR#149701, NR#149702, NR#149703, NR#149704, NR#149705, NR#149706, NR#149710, NR#149711, NR#149712, NR#149713, NR#149693, NR#149714, NR#149697, NR#149698, NR#149699, NR#149700, NR#149719, NR#149720, NR#149754, NR#149765, NR#149766, NR#149767, NR#149768, NR#149769, NR#149779, NR#149756, NR#149758, NR#149735, NR#149736, NR#149737, NR#149738, NR#149740, NR#149724, NR#149742, NR#149743, NR#149726, NR#149750, NR#149727, NR#149728, NR#149729, NR#149730, NR#149731, NR#149732
 
-  * Package subversion revision svn1707
+ -- Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>  Wed,  2 May 2007 08:12:04 +0300
 
- -- Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>  Sat, 28 Apr 2007 11:40:28 +0300

diff --git a/debian/modest.install b/debian/modest.install
new file mode 100644 (file)
index 0000000..a2e7131
--- /dev/null
+++ b/debian/modest.install
@@ -0,0 +1,5 @@
+usr/bin/modest*
+usr/share/dbus-1/services/*
+usr/share/applications/hildon/*
+usr/share/doc/modest/*
+usr/share/mime/packages/*

diff --git a/debian/rules b/debian/rules
index 73597e2..b60e89e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -13,42 +13,50 @@ DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 
-CFLAGS = -Wall -Wno-format -g
+CFLAGS = -Wall -g
+PACKAGENAME = modest
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
        CFLAGS += -O0
 else
+#      CFLAGS += -O2
        CFLAGS += -O2
 endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
        INSTALL_PROGRAM += -s
 endif
-ifneq (,$(findstring thumb,$(DEB_BUILD_OPTIONS)))
-        CFLAGS += -mthumb
-endif
 
+ifneq (,$(findstring maemo-launcher,$(DEB_BUILD_OPTIONS)))
+       LAUNCHER = yes
+endif
 
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-version=`ls libmodest-dbus-client/.libs/lib*.so.* | \
- awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-major=`ls libmodest-dbus-client/.libs/lib*.so.* | \
- awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-   
+ifeq "$(strip $(LAUNCHER))" "yes"
+       LAUNCHER_DEPENDS = -Vlauncher:Depends="maemo-launcher"
+       LAUNCHER_CFLAGS = -shared
+       LAUNCHER_LDFLAGS = -shared -export-dynamic
+endif
 
-config.status:
-       if [ ! -x configure ]; then ./autogen.sh; fi
+config.status: configure
        dh_testdir
-       # Add here commands to configure the package.
+       # commands to configure the package.
        CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
 
+configure: configure-stamp
+configure-stamp:
+       dh_testdir
+       ./autogen.sh
+       touch configure-stamp
 
 build: build-stamp
 
 build-stamp:  config.status
        dh_testdir
 
-       # Add here commands to compile the package.
-       $(MAKE)
+       # 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
 
        touch build-stamp
 
@@ -57,7 +65,7 @@ clean:
        dh_testroot
        rm -f build-stamp 
 
-       # Add here commands to clean up after the build process.
+       # commands to clean up after the build process.
        -$(MAKE) distclean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
        cp -f /usr/share/misc/config.sub config.sub
@@ -75,9 +83,16 @@ install: build
        dh_clean -k 
        dh_installdirs
 
-       # Add here commands to install the package into debian/modest
-       $(MAKE) install DESTDIR=$(CURDIR)/debian/modest
+       # install the package into debian/tmp/
+       #
+       $(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
@@ -85,13 +100,13 @@ binary-indep: build install
 
 # Build architecture-dependent files here.
 binary-arch: build install
-       dh_testdir 
-       dh_testroot  
-       dh_installchangelogs 
+       dh_testdir
+       dh_testroot
+       dh_installchangelogs ChangeLog
        dh_installdocs
-#      dh_installexamples
-       dh_install --sourcedir=debian/modest 
-       dh_installmenu
+       dh_installexamples
+       dh_install --sourcedir=debian/tmp -v
+#      dh_installmenu
 #      dh_installdebconf       
 #      dh_installlogrotate
 #      dh_installemacsen
@@ -100,19 +115,19 @@ binary-arch: build install
 #      dh_installinit
 #      dh_installcron
 #      dh_installinfo
-       dh_installman
-       dh_link 
-       dh_strip -a --dbg-package="modest" 
-       dh_compress 
-       dh_fixperms 
+#      dh_installman
+       dh_link
+       dh_strip --dbg-package=modest
+       dh_compress
+       dh_fixperms
 #      dh_perl
 #      dh_python
-       dh_makeshlibs  -V 
+       dh_makeshlibs
        dh_installdeb
-       dh_shlibdeps -V
-       dh_gencontrol
+       dh_shlibdeps
+       dh_gencontrol -- $(LAUNCHER_DEPENDS)
        dh_md5sums
        dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install