From 36812775a4e3dc4badb64175582b43f9166b973b Mon Sep 17 00:00:00 2001 From: Logan Dethrow 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. --- autobuild.xml | 37 ++++++++++++++++++------------------- build.sh | 6 +++++- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 5e76702302..f0d2d04c67 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -498,9 +498,9 @@ archive hash - 10352aab979c333a52dbad21b6e6fba9 + 10352aab979c333a52dbad21b6e6fba9 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-fmodex-private/rev/274403/arch/Darwin/installer/fmodex-4.44-darwin-20130419.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-fmodex-private/rev/274403/arch/Darwin/installer/fmodex-4.44-darwin-20130419.tar.bz2 name darwin @@ -510,7 +510,7 @@ archive hash - 79e45527aa9fb90b813599dff5ce01a7 + 79e45527aa9fb90b813599dff5ce01a7 url http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-fmodex-private/rev/274378/arch/Linux/installer/fmodex-4.44-linux-20130419.tar.bz2 @@ -522,9 +522,9 @@ archive hash - 0980cdf98a322a780ba739e324d0b955 + 0980cdf98a322a780ba739e324d0b955 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-fmodex-private/rev/274401/arch/CYGWIN/installer/fmodex-4.44-windows-20130419.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-fmodex-private/rev/274401/arch/CYGWIN/installer/fmodex-4.44-windows-20130419.tar.bz2 name windows @@ -747,7 +747,6 @@ - google_breakpad license @@ -762,10 +761,10 @@ archive - hash - aff5566e04003de0383941981198e04e - url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-breakpad/rev/273073/arch/Darwin/installer/google_breakpad-0.0.0-rev1099-darwin-20130329.tar.bz2 + hash + aff5566e04003de0383941981198e04e + url + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-breakpad/rev/273073/arch/Darwin/installer/google_breakpad-0.0.0-rev1099-darwin-20130329.tar.bz2 name darwin @@ -774,10 +773,10 @@ archive - hash - 52257e5eb166a0b69c9c0c38f6e1920e - url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-breakpad/rev/273079/arch/Linux/installer/google_breakpad-0.0.0-rev1099-linux-20130329.tar.bz2 + hash + 52257e5eb166a0b69c9c0c38f6e1920e + url + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-breakpad/rev/273079/arch/Linux/installer/google_breakpad-0.0.0-rev1099-linux-20130329.tar.bz2 name linux @@ -787,9 +786,9 @@ archive hash - d812a6dfcabe6528198a3191068dac09 + d812a6dfcabe6528198a3191068dac09 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-breakpad/rev/273073/arch/CYGWIN/installer/google_breakpad-0.0.0-rev1099-windows-20130329.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-breakpad/rev/273073/arch/CYGWIN/installer/google_breakpad-0.0.0-rev1099-windows-20130329.tar.bz2 name windows @@ -837,7 +836,7 @@ hash 98994d5b0b4b3d43be22aa6a5c36e6fa url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-mock-graham/rev/272961/arch/CYGWIN/installer/gmock-1.6.0-windows-20130327.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-mock-graham/rev/272961/arch/CYGWIN/installer/gmock-1.6.0-windows-20130327.tar.bz2 name windows @@ -1291,9 +1290,9 @@ archive hash - 8a4043450403dc43c0b228118c4bb34b + 495feeabaaa38a96e8cc3d3d42c0e124 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llappearanceutility-source/rev/277034/arch/Linux/installer/llappearanceutility_source-0.1-linux-20130605.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llappearanceutility-source/rev/277105/arch/Linux/installer/llappearanceutility_source-0.1-linux-20130606.tar.bz2 name linux 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