[Xfce4-commits] <midori:master> itools/release: Bump wscript/ nsi version, URLs, git commands

[Christian Dywan]

Updating branch refs/heads/master
         to 77622218a5c58d18817a1c1a3dd0454c6baf3995 (commit)
       from 4f1cd3dcc1378340b52b3d443ece74f81b4deb02 (commit)

commit 77622218a5c58d18817a1c1a3dd0454c6baf3995
Author: Christian Dywan <christian at twotoasts.de>
Date:   Tue Feb 26 23:06:14 2013 +0100

    itools/release: Bump wscript/ nsi version, URLs, git commands

 tools/release |   12 ++++++++++--
 wscript       |    7 ++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/tools/release b/tools/release
index 286dc40..d79f817 100755
--- a/tools/release
+++ b/tools/release
@@ -9,12 +9,20 @@
 #
 # See the file COPYING for the full license text.
 
+OLDVER=$(git describe --abbrev=0)
+NEWVER=$(python -c "print('0.'+str(float('$OLDVER'[2:])+.1))")
+echo Bumping from $OLDVER to $NEWVER
+echo https://releases.xfce.org/
+echo http://git.xfce.org/apps/midori/snapshot/midori-$NEWVER.tar.bz2
+echo git tag -a $NEWVER -m "Bump version to $NEWVER"';' git commit -m "Bump version to $NEWVER"
+sed -i "s@$OLDVER@$NEWVER at g" wscript win32/makedist/midori-0.3.3.nsi
+echo; git log --pretty=format:%s $OLDVER..HEAD | grep -v l10n; echo
 curl http://wiki.xfce.org/_export/xhtml/midori/faq | \
     sed 's at This is a list of frequently asked questions at This is <a href="http://wiki.xfce.org/midori/faq">a snapshot of the online FAQ</a>@g' | \
     sed 's@<link rel="style.*>@<link rel="stylesheet" href="faq.css" />@g' > data/faq.html
-git log --pretty=format:%s $(git describe --abbrev=0)..HEAD | grep -v l10n
+echo Press RETURN to update Launchpad bugs now; read yes
 if [ -n $(which bugreleaser 1>/dev/null) ]; then
     bugreleaser midori
 else
-    bzr branch lp:~mgiuca/+junk/launchpad-tools
+    echo bzr branch lp:~mgiuca/+junk/launchpad-tools
 fi
diff --git a/wscript b/wscript
index a4dcedc..75ebfcb 100644
--- a/wscript
+++ b/wscript
@@ -27,12 +27,8 @@ from TaskGen import extension, feature, taskgen
 import misc
 from Configure import find_program_impl
 
-major = 0
-minor = 4
-micro = 8
-
 APPNAME = 'midori'
-VERSION = VERSION_FULL = str (major) + '.' + str (minor) + '.' + str (micro)
+VERSION = VERSION_FULL = '0.4.8'
 VERSION_SUFFIX = ' (%s)' % VERSION
 
 try:
@@ -343,6 +339,7 @@ def configure (conf):
     conf.define ('GETTEXT_PACKAGE', APPNAME)
 
     conf.define ('MIDORI_VERSION', VERSION)
+    major, minor, micro = VERSION.split ('.', 2)
     conf.define ('MIDORI_MAJOR_VERSION', major)
     conf.define ('MIDORI_MINOR_VERSION', minor)
     conf.define ('MIDORI_MICRO_VERSION', micro)