From 2657e3675b07972e5af613215cc61aca359c86ea Mon Sep 17 00:00:00 2001
From: Son Nguyen <son.nguyen@catalyst.net.nz>
Date: Tue, 23 Oct 2012 14:03:05 +1300
Subject: [PATCH] Add 1.6 branch for language packs

Signed-off-by: Son Nguyen <son.nguyen@catalyst.net.nz>
---
 mahara-langpacks/langpacks.pl  | 6 +++---
 mahara-langpacks/update-pot.sh | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mahara-langpacks/langpacks.pl b/mahara-langpacks/langpacks.pl
index 8ace463..747c030 100644
--- a/mahara-langpacks/langpacks.pl
+++ b/mahara-langpacks/langpacks.pl
@@ -109,7 +109,7 @@ system "git fetch --quiet origin";
 
 # For launchpad, all languages are in a single branch, so update the lot
 ! -d $BZRDIR && system "bzr init-repo $BZRDIR";
-my @branches = qw(1.3_STABLE 1.4_STABLE 1.5_STABLE master);
+my @branches = qw(1.3_STABLE 1.4_STABLE 1.5_STABLE 1.6_STABLE master);
 
 foreach my $branch (@branches) {
     if ( ! -d "$BZRDIR/$branch" ) {
@@ -143,14 +143,14 @@ foreach my $lang (@langkeys) {
 
     if ( $remote =~ m/^lp:mahara-lang/ ) {
         $repotype = 'launchpad';
-        @branches = qw(1.3_STABLE 1.4_STABLE 1.5_STABLE master);
+        @branches = qw(1.3_STABLE 1.4_STABLE 1.5_STABLE 1.6_STABLE master);
     }
     elsif ( $remote =~ m{^git://gitorious\.org} ) {
         $repotype = 'gitorious';
         ! -d "$gitlangdir" && system "git clone --quiet $remote $gitlangdir";
         chdir $gitlangdir;
         system "git fetch --quiet";
-        my $remotebranchcmd = 'git branch -r | grep -v "HEAD" | grep "origin\/\(master\|1.3_STABLE\|1.4_STABLE\|1.5_STABLE\)$"';
+        my $remotebranchcmd = 'git branch -r | grep -v "HEAD" | grep "origin\/\(master\|1.3_STABLE\|1.4_STABLE\|1.5_STABLE|1.6_STABLE\)$"';
         my $remotebranches = `$remotebranchcmd`;
         $remotebranches =~ s/\s+/ /;
         @branches = ();
diff --git a/mahara-langpacks/update-pot.sh b/mahara-langpacks/update-pot.sh
index d361c3f..8e6bd55 100755
--- a/mahara-langpacks/update-pot.sh
+++ b/mahara-langpacks/update-pot.sh
@@ -40,7 +40,7 @@ BZR=${WORK}/mahara-lang-bzr
 cd ${GITDIR}
 git fetch --quiet origin
 
-branches="1.3_STABLE 1.4_STABLE 1.5_STABLE master"
+branches="1.3_STABLE 1.4_STABLE 1.5_STABLE 1.6_STABLE master"
 
 for branch in ${branches} ; do
     branchexists=`git branch | grep "${branch}$"`
@@ -179,4 +179,4 @@ for branch in ${branches} ; do
 
         echo "${remotecommit}" > ${last}
     fi
-done
\ No newline at end of file
+done
-- 
GitLab