[Lunar-commits] <moonbase> telepathy-gabble: version bump to 0.9.5

[Auke Kok]

Zachary McGrew wrote:
> commit 916798674fccc6acff66d89b3dac70dcfe81d76f
> Author: Zachary McGrew <zmcgrew at lunar-linux.org>
> Date:   Sat Feb 20 20:56:46 2010 -0800
> 
>     telepathy-gabble: version bump to 0.9.5
> ---
>  chat/telepathy-gabble/DETAILS |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/chat/telepathy-gabble/DETAILS b/chat/telepathy-gabble/DETAILS
> index 5db67af..f437ae3 100644
> --- a/chat/telepathy-gabble/DETAILS
> +++ b/chat/telepathy-gabble/DETAILS
> @@ -1,11 +1,11 @@
>            MODULE=telepathy-gabble
> -         VERSION=0.9.1
> +         VERSION=0.9.5
>            SOURCE=$MODULE-$VERSION.tar.gz
>        SOURCE_URL=http://telepathy.freedesktop.org/releases/$MODULE/
> -      SOURCE_VFY=sha1:35e5d7158a14253d96b5d1fe05e451b0aa894d42
> +      SOURCE_VFY=sha1:58ec6b7708d84ff8a32c4211d2939677da41f423
>          WEB_SITE=http://telepathy.freedesktop.org/wiki/
>           ENTERED=20071029
> -         UPDATED=20091003
> +         UPDATED=20100220
>             SHORT="telepathy jabber/xmpp connection manager"
>  cat << EOF
>  A Jabber/XMPP connection manager that handles single- and multi-user chats and 
> _______________________________________________


I need to educate people about merge "folding" or squashing:

from git merge --help:


        --squash
            Produce the working tree and index state as if a real merge
            happened (except for the merge information), but do not actually
            make a commit or move the HEAD, nor record 
$GIT_DIR/MERGE_HEAD to
            cause the next git commit command to create a merge commit. This
            allows you to create a single commit on top of the current 
branch
            whose effect is the same as merging another branch (or more 
in case
            of an octopus).