[Xfce4-commits] <xfce-git-hooks:master> Ok, let's not tag future Xfce releases as Xfce-... but rather xfce-...

[Jannis Pohlmann]

Updating branch refs/heads/master
         to 6572ccb033397ef2bdf83567ed8faf531a800356 (commit)
       from 92dc706b4429c7121e599ab57635e0aedb898ee4 (commit)

commit 6572ccb033397ef2bdf83567ed8faf531a800356
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Thu Aug 20 01:45:48 2009 +0200

    Ok, let's not tag future Xfce releases as Xfce-... but rather xfce-...

 hooks/update-03-send-commit-mails |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/hooks/update-03-send-commit-mails b/hooks/update-03-send-commit-mails
index a19b26f..34605f7 100755
--- a/hooks/update-03-send-commit-mails
+++ b/hooks/update-03-send-commit-mails
@@ -246,12 +246,13 @@ EOF
 
         # If this tag succeeds another, show which tag it replaces
         prevtag=`git describe $rev^ 2>/dev/null`
-        if echo "$prevtag" | grep "^Xfce-" >/dev/null; then # Xfce releases > 4.6.1
-          prevtag=`echo "$prevtag" | sed "s/^\(Xfce-[0-9]\+\.[0-9]\+\(pre[123]\)\?\).*$/\1/"`
-        elif echo "$prevtag" | grep "^$PROJECT" >/dev/null; then # Individual releases
+        if echo "$prevtag" | grep "^$PROJECT" >/dev/null; then # Individual releases
           prevtag=`echo "$prevtag" | sed "s/^\($PROJECT-[0-9]\.[0-9]\+\(\.[0-9]\+\)\{1,2\}\).*$/\1/"`
-        elif echo "$prevtag" | grep "^xfce-" >/dev/null; then # This one is for Xfce releases <= 4.6.1
+        elif echo "$prevtag" | grep "^xfce-" >/dev/null; then # Xfce releases
           prevtag=`echo "$prevtag" | sed "s/^\(xfce-[0-9]\.[0-9]\.[0-9]\).*$/\1/"`
+          # We need to remove the line above and replace it with this one once all
+          # core components have been tagged using git at least once:
+          #prevtag=`echo "$prevtag" | sed "s/^\(xfce-[0-9]\+\.[0-9]\+\(pre[123]\)\?\).*$/\1/"`
         fi
 
         if [[ -n "$prevtag" ]]; then