Updating branch refs/heads/master
         to b3c2a50593d13a23f966fda962431fbca3639ffc (commit)
       from 4723b3e2998a582ee4bb7d1a2e198324ec43c65d (commit)

commit b3c2a50593d13a23f966fda962431fbca3639ffc
Author: Christian Dywan <christ...@twotoasts.de>
Date:   Thu Mar 7 19:31:04 2013 +0100

    tools/release: Fix git commands, rename .nsi, omit script changes

 tools/release                                   |    6 +++---
 win32/makedist/{midori-0.3.3.nsi => midori.nsi} |    0
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/release b/tools/release
index d79f817..8197c5c 100755
--- a/tools/release
+++ b/tools/release
@@ -14,9 +14,9 @@ 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@g" wscript win32/makedist/midori-0.3.3.nsi
-echo; git log --pretty=format:%s $OLDVER..HEAD | grep -v l10n; echo
+echo git commit -m "'Bump version to $NEWVER'"';' git tag -a $NEWVER -m "'Bump 
version to $NEWVER'"
+sed -i "s@$OLDVER@$NEWVER@g" wscript win32/makedist/midori.nsi
+echo; git log --pretty='format: %s' $OLDVER..HEAD | grep -v l10n | grep -v 
makedist | grep -v tools/release | grep -v nsi; echo
 curl http://wiki.xfce.org/_export/xhtml/midori/faq | \
     sed 's@This is a list of frequently asked questions@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' > 
diff --git a/win32/makedist/midori-0.3.3.nsi b/win32/makedist/midori.nsi
similarity index 100%
rename from win32/makedist/midori-0.3.3.nsi
rename to win32/makedist/midori.nsi
Xfce4-commits mailing list

Reply via email to