* build packages correctly

* put packages in user/extra

pmo-trunk-r1754

diff --git a/debian/control-maemo0 b/debian/control-maemo0
index 4323088..a7676a1 100644 (file)
--- a/debian/control-maemo0
+++ b/debian/control-maemo0
@@ -1,5 +1,5 @@
 Source: modest
-Section: mail
+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

diff --git a/debian/control-maemo1 b/debian/control-maemo1
index 8288b82..a1633a0 100644 (file)
--- a/debian/control-maemo1
+++ b/debian/control-maemo1
@@ -1,5 +1,5 @@
 Source: modest
-Section: mail
+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

diff --git a/scripts/build-packages b/scripts/build-packages
index 57fd7dc..9e2d470 100755 (executable)
--- a/scripts/build-packages
+++ b/scripts/build-packages
@@ -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
-    test -e debian/control || ln -s debian/control.maemo0 debian/control
+    test -e debian/control || ( cd debian; ln -s control-maemo0 control; cd .. )
     mv -f debian/changelog debian/changelog.bak
     cat > debian/changelog <<EOF
 modest (1.0-svn${MODEST_REVISION}) unstable; urgency=low