From 5f1a43489b8fb54bf09d624fb48bad3079682b9d Mon Sep 17 00:00:00 2001
From: Logan Dethrow <log@lindenlab.com>
Date: Thu, 6 Jun 2013 17:04:09 -0400
Subject: Use the codeticket number ($revision) instead of the nonexistent
 ${VERSION_VIEWER} to set a unique version in the debian changelogs and
 version strings.

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 1275f41fe1..dfb0ddad7a 100755
--- a/build.sh
+++ b/build.sh
@@ -279,7 +279,7 @@ then
       # mangle the changelog
       dch --force-bad-version \
           --distribution unstable \
-          --newversion "${VIEWER_VERSION}" \
+          --newversion "${revision}" \
           "Automated build #$build_id, repository $branch revision $revision." \
           >> "$build_log" 2>&1
 
-- 
cgit v1.2.3


From 36812775a4e3dc4badb64175582b43f9166b973b Mon Sep 17 00:00:00 2001
From: Logan Dethrow <log@lindenlab.com>
Date: Thu, 6 Jun 2013 18:53:06 -0400
Subject: Updated llappearance-utility-source autobuild package to latest and
 changed debian changelog mangling to include codeticket number.

---
 build.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index dfb0ddad7a..4b966acbe0 100755
--- a/build.sh
+++ b/build.sh
@@ -276,10 +276,14 @@ then
     then
       begin_section "Build Viewer Debian Package"
       local have_private_repo=false
+      
+      # Get the current version. 
+      local current_version=`dpkg-parsechangelog | grep ^Version | awk '{ print $2 }'`
+      
       # mangle the changelog
       dch --force-bad-version \
           --distribution unstable \
-          --newversion "${revision}" \
+          --newversion "${current_version}"+"${revision}" \
           "Automated build #$build_id, repository $branch revision $revision." \
           >> "$build_log" 2>&1
 
-- 
cgit v1.2.3


From d847b9dc3fdbc0a17ca4a1191955699505940f65 Mon Sep 17 00:00:00 2001
From: Logan Dethrow <log@lindenlab.com>
Date: Thu, 6 Jun 2013 19:42:22 -0400
Subject: Can't use bash local keyword outside of functions.

---
 build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 4b966acbe0..e4183f0ace 100755
--- a/build.sh
+++ b/build.sh
@@ -275,10 +275,10 @@ then
     if $build_viewer_deb && [ "$last_built_variant" == "Release" ]
     then
       begin_section "Build Viewer Debian Package"
-      local have_private_repo=false
+      have_private_repo=false
       
       # Get the current version. 
-      local current_version=`dpkg-parsechangelog | grep ^Version | awk '{ print $2 }'`
+      current_version=`dpkg-parsechangelog | grep ^Version | awk '{ print $2 }'`
       
       # mangle the changelog
       dch --force-bad-version \
-- 
cgit v1.2.3