diff --git a/contrib/extract_translations/prepare-translation.sh b/contrib/extract_translations/prepare-translation.sh index 0ecb61139..7a40fee78 100755 --- a/contrib/extract_translations/prepare-translation.sh +++ b/contrib/extract_translations/prepare-translation.sh @@ -97,7 +97,7 @@ extract_lang_all () done cd $MSGS_DIR - REVISION=`svn info | grep "^Rev" | head -1 | awk '{print $2}'` + REVISION=`git describe --always` zip $HOME/ejabberd-langs-$REVISION.zip *.translate; rm *.translate diff --git a/src/Makefile.in b/src/Makefile.in index eb999d913..496d101bc 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -295,12 +295,3 @@ Makefile: Makefile.in dialyzer: $(BEAMS) @dialyzer -c . - -LASTSVNREVCHANGELOG = 2075 -changelog: - svn up -r $(LASTSVNREVCHANGELOG) ../ChangeLog - mv ../ChangeLog ../ChangeLog.old - svn2cl -r BASE:$(LASTSVNREVCHANGELOG) -o ../ChangeLog --group-by-day \ - --separate-daylogs --break-before-msg --reparagraph .. - cat ../ChangeLog.old >> ../ChangeLog - rm ../ChangeLog.old diff --git a/src/ejabberd_admin.erl b/src/ejabberd_admin.erl index 25cb31c53..bf4b5bd1c 100644 --- a/src/ejabberd_admin.erl +++ b/src/ejabberd_admin.erl @@ -144,7 +144,7 @@ commands() -> args = [{days, integer}], result = {res, rescode}}, #ejabberd_commands{name = rename_default_nodeplugin, tags = [mnesia], - desc = "Update PubSub table from ejabberd trunk SVN to 2.1.0", + desc = "Update PubSub table from old ejabberd trunk SVN to 2.1.0", module = mod_pubsub, function = rename_default_nodeplugin, args = [], result = {res, rescode}},