* update debian package building scripts

pmo-trunk-r1716

diff --git a/debian/control b/debian/control
index f6da49c..5fbea24 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: modest
-Section: user/unknown
+Section: mail
 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, 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
@@ -10,3 +10,10 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 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
+
+

diff --git a/debian/control-maemo0 b/debian/control-maemo0
index 94ba3be..5fbea24 100644 (file)
--- a/debian/control-maemo0
+++ b/debian/control-maemo0
@@ -10,3 +10,10 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 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
+
+

diff --git a/debian/control-maemo1 b/debian/control-maemo1
index cdd65e2..71f9b69 100644 (file)
--- a/debian/control-maemo1
+++ b/debian/control-maemo1
@@ -10,3 +10,10 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 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
+
+

diff --git a/debian/rules b/debian/rules
index ce62387..33c7093 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,14 @@ ifneq (,$(findstring thumb,$(DEB_BUILD_OPTIONS)))
         CFLAGS += -mthumb
 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)}'`
+   
+
 config.status:
        if [ ! -x configure ]; then ./autogen.sh; fi
        dh_testdir
@@ -77,13 +85,13 @@ binary-indep: build install
 
 # Build architecture-dependent files here.
 binary-arch: build install
-       dh_testdir
-       dh_testroot
-#      dh_installchangelogs ChangeLog
-#      dh_installdocs
+       dh_testdir -a
+       dh_testroot -a 
+       dh_installchangelogs ChangeLog
+       dh_installdocs
 #      dh_installexamples
-#      dh_install
-#      dh_installmenu
+       dh_install --sourcedir=debian/modest 
+       dh_installmenu
 #      dh_installdebconf       
 #      dh_installlogrotate
 #      dh_installemacsen
@@ -92,16 +100,16 @@ binary-arch: build install
 #      dh_installinit
 #      dh_installcron
 #      dh_installinfo
-#      dh_installman
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
+       dh_installman
+       dh_link -a
+       dh_strip -a --dbg-package="modest" 
+       dh_compress -a
+       dh_fixperms -a
 #      dh_perl
 #      dh_python
-#      dh_makeshlibs
+       dh_makeshlibs -a -V 
        dh_installdeb
-       dh_shlibdeps
+       dh_shlibdeps -V
        dh_gencontrol
        dh_md5sums
        dh_builddeb