From 4b0b1e76530d122491c8b63bf6d85aa5640ffd69 Mon Sep 17 00:00:00 2001 From: brent s Date: Tue, 13 Sep 2016 15:45:56 -0400 Subject: [PATCH] moving zandronum-dev to zandronum-hg --- .gitmodules | 6 +++--- _bin/new.package.sh | 4 ++++ _docs/PKGBUILD.templates.d/vcs/04.vcsver.bzr | 2 +- _docs/PKGBUILD.templates.d/vcs/04.vcsver.hg | 2 +- _docs/PKGBUILD.templates.d/vcs/04.vcsver.svn | 2 +- ecdsatool-git | 2 +- storcli | 2 +- zandronum-dev | 1 - zandronum-hg | 1 + 9 files changed, 13 insertions(+), 9 deletions(-) delete mode 160000 zandronum-dev create mode 160000 zandronum-hg diff --git a/.gitmodules b/.gitmodules index 558f1e0..d623127 100644 --- a/.gitmodules +++ b/.gitmodules @@ -127,12 +127,12 @@ [submodule "wpscrack"] path = wpscrack url = aur@aur.archlinux.org:wpscrack -[submodule "zandronum-dev"] - path = zandronum-dev - url = aur@aur.archlinux.org:zandronum-dev [submodule "augeas-git"] path = augeas-git url = aur@aur.archlinux.org:augeas-git [submodule "ecdsatool-git"] path = ecdsatool-git url = aur@aur.archlinux.org:ecdsatool-git +[submodule "zandronum-hg"] + path = zandronum-hg + url = aur@aur.archlinux.org:zandronum-hg diff --git a/_bin/new.package.sh b/_bin/new.package.sh index 3f4fbb0..a1ceda3 100755 --- a/_bin/new.package.sh +++ b/_bin/new.package.sh @@ -50,6 +50,10 @@ then VCSTYPE='svn' break ;; + "Mercurial") + VCSTYPE='hg' + break + ;; "Bazaar") VCSTYPE='bzr' break diff --git a/_docs/PKGBUILD.templates.d/vcs/04.vcsver.bzr b/_docs/PKGBUILD.templates.d/vcs/04.vcsver.bzr index 791a0ec..e1abc6a 100644 --- a/_docs/PKGBUILD.templates.d/vcs/04.vcsver.bzr +++ b/_docs/PKGBUILD.templates.d/vcs/04.vcsver.bzr @@ -1,4 +1,4 @@ pkgver() { - cd "${pkgname}" + cd "${_pkgname}" printf "r%s" "$(bzr revno)" } diff --git a/_docs/PKGBUILD.templates.d/vcs/04.vcsver.hg b/_docs/PKGBUILD.templates.d/vcs/04.vcsver.hg index 21c6a4e..a804bdc 100644 --- a/_docs/PKGBUILD.templates.d/vcs/04.vcsver.hg +++ b/_docs/PKGBUILD.templates.d/vcs/04.vcsver.hg @@ -1,4 +1,4 @@ pkgver() { - cd "${pkgname}" + cd "${_pkgname}" printf "r%s.%s" "$(hg identify -n)" "$(hg identify -i)" } diff --git a/_docs/PKGBUILD.templates.d/vcs/04.vcsver.svn b/_docs/PKGBUILD.templates.d/vcs/04.vcsver.svn index c70e492..85e9db8 100644 --- a/_docs/PKGBUILD.templates.d/vcs/04.vcsver.svn +++ b/_docs/PKGBUILD.templates.d/vcs/04.vcsver.svn @@ -1,5 +1,5 @@ pkgver() { - cd "${pkgname}" + cd "${_pkgname}" local ver="$(svnversion)" printf "r%s" "${ver//[[:alpha:]]}" } diff --git a/ecdsatool-git b/ecdsatool-git index d6f1fea..b671967 160000 --- a/ecdsatool-git +++ b/ecdsatool-git @@ -1 +1 @@ -Subproject commit d6f1fea9d6672b6681bfc35b9603726065da3458 +Subproject commit b6719671474645d300c524d2499e98d6b962b022 diff --git a/storcli b/storcli index 7fa80fe..93ba38a 160000 --- a/storcli +++ b/storcli @@ -1 +1 @@ -Subproject commit 7fa80fe218039a5b8509bfb14418d04a1ff977bf +Subproject commit 93ba38a37b985134f47f3b84ef5a8b141b7b4173 diff --git a/zandronum-dev b/zandronum-dev deleted file mode 160000 index 292be23..0000000 --- a/zandronum-dev +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 292be23cb035d092491a53b4b55e279a1a95ce71 diff --git a/zandronum-hg b/zandronum-hg new file mode 160000 index 0000000..cd87b69 --- /dev/null +++ b/zandronum-hg @@ -0,0 +1 @@ +Subproject commit cd87b6916139675f9be7a45f9043fe3a337139de