Commit 736d799d authored by Aaron Wells's avatar Aaron Wells
Browse files

Replace all git.nzoss.org.nz references with git.mahara.org

parent c93c369f
...@@ -9,5 +9,5 @@ Package: custom-site-mahara-langpacks ...@@ -9,5 +9,5 @@ Package: custom-site-mahara-langpacks
Architecture: all Architecture: all
Depends: ${misc:Depends}, apache2, php5-cli, perl, bash, debconf, git-core, libhtml-tiny-perl, liblocale-po-perl, libwww-perl, bzr Depends: ${misc:Depends}, apache2, php5-cli, perl, bash, debconf, git-core, libhtml-tiny-perl, liblocale-po-perl, libwww-perl, bzr
Description: Mahara langpack repository scripts Description: Mahara langpack repository scripts
Scripts to download mahara langpacks from git.nzoss.org.nz, clean them up, and Scripts to download mahara langpacks from git.mahara.org, clean them up, and
make them available for HTTP download. make them available for HTTP download.
...@@ -2,7 +2,7 @@ This package was debianized by Richard Hector <richard@catalyst.net.nz> on ...@@ -2,7 +2,7 @@ This package was debianized by Richard Hector <richard@catalyst.net.nz> on
Sat, 20 Nov 2010 18:38:57 +1300 Sat, 20 Nov 2010 18:38:57 +1300
It is incorporated into the same repository as the software itself, at It is incorporated into the same repository as the software itself, at
https://git.nzoss.org.nz/mahara/mahara-scripts https://git.mahara.org/scripts/mahara-scripts
Upstream Authors: Upstream Authors:
......
Template: custom-site-mahara-langpacks/projdir Template: custom-site-mahara-langpacks/projdir
Type: string Type: string
Default: git@git.nzoss.org.nz:mahara/mahara-lang.git Default:
Description: Project location Description: Project location
The git repository to get the langpacks from The git repository to get the langpacks from
Template: custom-site-mahara-langpacks/wwwroot Template: custom-site-mahara-langpacks/wwwroot
Type: string Type: string
Default: Default: http://langpacks.mahara.org
Description: WWW root Description: WWW root
The URL for the site, eg langpacks.dev.mahara.org The URL for the site, eg langpacks.mahara.org
...@@ -67,7 +67,7 @@ def send_bug_mail(bug_number, change_url, project, commit, submitter, branch, gi ...@@ -67,7 +67,7 @@ def send_bug_mail(bug_number, change_url, project, commit, submitter, branch, gi
to_address = bug_number + TO_ADDRESS_SUFFIX to_address = bug_number + TO_ADDRESS_SUFFIX
remote_url = 'https://git.nzoss.org.nz/mahara/%s/commit/%s' % (project, commit) remote_url = 'https://git.mahara.org/mahara/%s/commit/%s' % (project, commit)
body = '''Reviewed: %s body = '''Reviewed: %s
Committed: %s Committed: %s
Submitter: %s Submitter: %s
...@@ -89,7 +89,7 @@ def append_commit(commits, document, project, full_commit_id, author, log): ...@@ -89,7 +89,7 @@ def append_commit(commits, document, project, full_commit_id, author, log):
revision = subprocess.Popen(['git', '--git-dir=' + BASE_DIR + '/git/' + project + '.git', 'rev-parse', '--short', full_commit_id], stdout=subprocess.PIPE).communicate()[0].strip() revision = subprocess.Popen(['git', '--git-dir=' + BASE_DIR + '/git/' + project + '.git', 'rev-parse', '--short', full_commit_id], stdout=subprocess.PIPE).communicate()[0].strip()
remote_url = 'https://git.nzoss.org.nz/mahara/%s/commit/%s' % (project, full_commit_id) remote_url = 'https://git.mahara.org/mahara/%s/commit/%s' % (project, full_commit_id)
commit = document.createElement('commit') commit = document.createElement('commit')
commit_author = document.createElement('author') commit_author = document.createElement('author')
...@@ -136,7 +136,7 @@ def submit_to_cia(project, commit, branch, git_log): ...@@ -136,7 +136,7 @@ def submit_to_cia(project, commit, branch, git_log):
generator_version = doc.createElement('version') generator_version = doc.createElement('version')
generator_version.appendChild(doc.createTextNode('1.0')) generator_version.appendChild(doc.createTextNode('1.0'))
generator_url = doc.createElement('url') generator_url = doc.createElement('url')
generator_url.appendChild(doc.createTextNode('https://git.nzoss.org.nz/mahara/mahara-scripts/blobs/master/change-merged')) generator_url.appendChild(doc.createTextNode('https://git.mahara.org/scripts/mahara-scripts/blob/master/gerrit/change-merged'))
generator.appendChild(generator_name) generator.appendChild(generator_name)
generator.appendChild(generator_version) generator.appendChild(generator_version)
generator.appendChild(generator_url) generator.appendChild(generator_url)
......
...@@ -62,7 +62,7 @@ def send_bug_mail(bug_number, change_url, project, commit, uploader, branch, git ...@@ -62,7 +62,7 @@ def send_bug_mail(bug_number, change_url, project, commit, uploader, branch, git
to_address = bug_number + TO_ADDRESS_SUFFIX to_address = bug_number + TO_ADDRESS_SUFFIX
remote_url = 'https://git.nzoss.org.nz/mahara/%s/commit/%s' % (project, commit) remote_url = 'https://git.mahara.org/mahara/%s/commit/%s' % (project, commit)
body = 'Patch for "%s" branch: %s\n' % (branch, change_url) body = 'Patch for "%s" branch: %s\n' % (branch, change_url)
msg = MIMEText(body) msg = MIMEText(body)
......
...@@ -41,7 +41,7 @@ my $TARBALLS = "${DATA}/tarballs"; ...@@ -41,7 +41,7 @@ my $TARBALLS = "${DATA}/tarballs";
my $MAHARA = "${DATA}/mahara"; my $MAHARA = "${DATA}/mahara";
my $MAHARAREMOTE = 'git@github.com:MaharaProject/mahara.git'; my $MAHARAREMOTE = 'git@github.com:MaharaProject/mahara.git';
my $REPOLIST = 'https://git.nzoss.org.nz/mahara/mahara-scripts/blob/master/mahara-langpacks/language-repos.txt'; my $REPOLIST = 'https://git.mahara.org/scripts/mahara-scripts/blob/master/mahara-langpacks/language-repos.txt';
mkpath $GITDIR; mkpath $GITDIR;
mkpath $DIRTY; mkpath $DIRTY;
...@@ -125,7 +125,7 @@ foreach my $branch (@branches) { ...@@ -125,7 +125,7 @@ foreach my $branch (@branches) {
foreach my $lang (@langkeys) { foreach my $lang (@langkeys) {
if ( ! defined $last->{$lang} ) { if ( ! defined $last->{$lang} ) {
$last->{$lang} = { repo => "git@git.nzoss.org.nz:mahara-lang/$lang.git" }; $last->{$lang} = { repo => "git@git.mahara.org:lang-old/$lang.git" };
} }
if ( defined $langs{$lang}->{repo} ) { if ( defined $langs{$lang}->{repo} ) {
......
ar lp:mahara-lang ar lp:mahara-lang
ca lp:mahara-lang ca lp:mahara-lang
cs git@git.nzoss.org.nz:mahara-lang/cs.git cs git@git.mahara.org:lang-old/cs.git
da lp:mahara-lang da lp:mahara-lang
de lp:mahara-lang de lp:mahara-lang
de_du lp:mahara-lang de_du lp:mahara-lang
el lp:mahara-lang el lp:mahara-lang
en_GB lp:mahara-lang en_GB lp:mahara-lang
en_us git@git.nzoss.org.nz:mahara-lang/en_us.git en_us git@git.mahara.org:lang-old/en_us.git
es lp:mahara-lang es lp:mahara-lang
eu lp:mahara-lang eu lp:mahara-lang
fi lp:mahara-lang fi lp:mahara-lang
......
...@@ -29,7 +29,7 @@ if [ ! -d ${MAHARA} ] ; then ...@@ -29,7 +29,7 @@ if [ ! -d ${MAHARA} ] ; then
git clone ${mahararemote} ${MAHARA} git clone ${mahararemote} ${MAHARA}
fi fi
langremotebase='git@git.nzoss.org.nz:mahara-lang/' langremotebase='git@git.mahara.org:lang-old/'
langs="ca cs da de en_us es eu fi fr he it ja ko nl no_nb sl zh_tw" langs="ca cs da de en_us es eu fi fr he it ja ko nl no_nb sl zh_tw"
for lang in ${langs} ; do for lang in ${langs} ; do
......
...@@ -32,7 +32,7 @@ TEMP=${WORK}/temp ...@@ -32,7 +32,7 @@ TEMP=${WORK}/temp
[ ! -d ${TEMP} ] && mkdir ${TEMP} [ ! -d ${TEMP} ] && mkdir ${TEMP}
[ ! -d ${DOCROOT}/pot ] && mkdir ${DOCROOT}/pot [ ! -d ${DOCROOT}/pot ] && mkdir ${DOCROOT}/pot
#mahararemote='git@git.nzoss.org.nz/mahara/mahara.git' #mahararemote='git@git.mahara.org/mahara/mahara.git'
mahararemote='git@github.com:MaharaProject/mahara.git' mahararemote='git@github.com:MaharaProject/mahara.git'
if [ ! -d ${GITDIR} ]; then if [ ! -d ${GITDIR} ]; then
......
...@@ -85,7 +85,7 @@ pushd ${BUILDDIR}/mahara ...@@ -85,7 +85,7 @@ pushd ${BUILDDIR}/mahara
# Main Mahara repo to pull from # Main Mahara repo to pull from
#PUBLIC="git@git.nzoss.org.nz:mahara/mahara.git" #PUBLIC="git@git.mahara.org:mahara/mahara.git"
PUBLIC="git@github.com:MaharaProject/mahara.git" PUBLIC="git@github.com:MaharaProject/mahara.git"
echo "Cloning public repository ${PUBLIC} in ${BUILDDIR}/mahara" echo "Cloning public repository ${PUBLIC} in ${BUILDDIR}/mahara"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment