* update the scripts

pmo-trunk-r1943

diff --git a/scripts/build-packages b/scripts/build-packages
index 93fcf78..e268125 100755 (executable)
--- a/scripts/build-packages
+++ b/scripts/build-packages
@@ -1,5 +1,5 @@
 #!/bin/sh
-#Time-stamp: <2007-05-16 11:54:34 (djcb)>
+#Time-stamp: <2007-05-19 20:12:52 (djcb)>
 
 # Copyright (c) 2007, Nokia Corporation
 # All rights reserved.
@@ -64,7 +64,7 @@
 
 TINYMAIL_PATH="$HOME/src/tinymail"
 MODEST_PATH="$HOME/src/modest-email/modest/trunk"
-MODEST_PROVIDERS_DATA_PATH="$HOME/src/modest-email/modest-providers-data/"
+MAEMO_PROVIDERS_DATA_PATH="$HOME/src/modest-email/maemo-providers-data/"
 
 # the packager
 PACKAGER="Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>"
@@ -96,7 +96,7 @@ fi
 # checking paths
 echo 
 echo "*** checking paths"
-for p in "$TINYMAIL_PATH" "$MODEST_PATH" "$MODEST_PROVIDERS_DATA_PATH" "$PACKAGE_PATH"; do
+for p in "$TINYMAIL_PATH" "$MODEST_PATH" "$MAEMO_PROVIDERS_DATA_PATH" "$PACKAGE_PATH"; do
     if test -d $p; then
        echo "+ found '$p'"
     else
@@ -119,9 +119,9 @@ cd $TINYMAIL_PATH
 TINYMAIL_REVISION="`svn info | grep '^Revision:' | sed 's/Revision: //'`"
 echo "* tinymail revision: $TINYMAIL_REVISION"
 
-cd $MODEST_PROVIDERS_DATA_PATH
-MODEST_PROVIDERS_DATA_REVISION="`svn info | grep '^Revision:' | sed 's/Revision: //'`"
-echo "* modest-providers-data revision: $MODEST_PROVIDERS_DATA_REVISION"
+cd $MAEMO_PROVIDERS_DATA_PATH
+MAEMO_PROVIDERS_DATA_REVISION="`svn info | grep '^Revision:' | sed 's/Revision: //'`"
+echo "* maemo-providers-data revision: $MAEMO_PROVIDERS_DATA_REVISION"
 
 cd $MODEST_PATH
 MODEST_REVISION="`svn info | grep '^Revision:' | sed 's/Revision: //'`"
@@ -159,28 +159,28 @@ fi
 
 
 
-# build modest-providers-data
-if test -n "`ls $PACKAGE_PATH/*providers*${MODEST_PROVIDERS_DATA_REVISION}*.deb`"; then
-    echo "* modest-providers-data seems already built, skipping (but still installing pkgs)"
-    $SCRATCHBOX "fakeroot dpkg -i ${PACKAGE_PATH}/*${MODEST_PROVIDERS_DATA_REVISION}*.deb"
+# build maemo-providers-data
+if test -n "`ls $PACKAGE_PATH/*providers*${MAEMO_PROVIDERS_DATA_REVISION}*.deb`"; then
+    echo "* maemo-providers-data seems already built, skipping (but still installing pkgs)"
+    $SCRATCHBOX "fakeroot dpkg -i ${PACKAGE_PATH}/*${MAEMO_PROVIDERS_DATA_REVISION}*.deb"
 else
-    cd $MODEST_PROVIDERS_DATA_PATH
+    cd $MAEMO_PROVIDERS_DATA_PATH
     mv -f debian/changelog debian/changelog.bak
     cat > debian/changelog <<EOF
-modest-providers-data (1.0-svn${MODEST_PROVIDERS_DATA_REVISION}) unstable; urgency=low
+maemo-providers-data (1.0-svn${MAEMO_PROVIDERS_DATA_REVISION}) unstable; urgency=low
 
-  * Package subversion revision svn${MODEST_PROVIDERS_DATA_REVISION}
+  * Package subversion revision svn${MAEMO_PROVIDERS_DATA_REVISION}
 
  -- ${PACKAGER}  ${NOW}
 EOF
-    echo "*** building modest-providers-data"
-    $SCRATCHBOX -d "$MODEST_PROVIDERS_DATA_PATH" "dpkg-buildpackage -rfakeroot -uc -us -sa -D" || {
-       echo "failed to build modest-providers-data"
+    echo "*** building maemo-providers-data"
+    $SCRATCHBOX -d "$MAEMO_PROVIDERS_DATA_PATH" "dpkg-buildpackage -rfakeroot -uc -us -sa -D" || {
+       echo "failed to build maemo-providers-data"
        exit 1
     }
     mv -f debian/changelog.bak debian/changelog
-    $SCRATCHBOX "mv ${MODEST_PROVIDERS_DATA_PATH}/../*${MODEST_PROVIDERS_DATA_REVISION}* $PACKAGE_PATH"
-    $SCRATCHBOX "fakeroot dpkg -i ${PACKAGE_PATH}/*${MODEST_PROVIDERS_DATA_REVISION}*.deb"
+    $SCRATCHBOX "mv ${MAEMO_PROVIDERS_DATA_PATH}/../*${MAEMO_PROVIDERS_DATA_REVISION}* $PACKAGE_PATH"
+    $SCRATCHBOX "fakeroot dpkg -i ${PACKAGE_PATH}/*${MAEMO_PROVIDERS_DATA_REVISION}*.deb"
 fi
  
 

diff --git a/scripts/update-garage b/scripts/update-garage
index 26058d7..b5bf994 100755 (executable)
--- a/scripts/update-garage
+++ b/scripts/update-garage
@@ -31,8 +31,12 @@ cd modest
 
 echo "+ removing internal stuff"
 rm -rf scripts
+rm Changelog2
 rm debian/changelog
 
+echo "+ defaulting to maemo0"
+cp debian/control-maemo0 debian/control
+
 echo "+ get the external debian/changelog"
 svn up debian/changelog
 
@@ -43,4 +47,4 @@ svn add `find -type f | grep -v '.svn'` 2> /dev/null
 echo "+ showing the differences"
 svn diff | diffstat
 
-echo "+ now, go to $LOCAL_GARAGE_DIR/modest, edit debian/changelog, run 'svn commit' and write a nice commit message"
\ No newline at end of file
+echo "+ now, go to $LOCAL_GARAGE_DIR/modest, edit debian/changelog, run 'svn commit' and write a nice commit message"