Merge lp:~ubuntu-branches/ubuntu/maverick/ec2-api-tools/maverick-201009211812 into lp:ubuntu/maverick/ec2-api-tools

[James Westby]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/maverick/ec2-api-tools now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/maverick/ec2-api-tools/maverick-201009211812. A merge should be performed if necessary.

Unmerged revisions

19. By Scott Moser on 2010-09-21

releasing version 1.3.57419-0ubuntu1

18. By Scott Moser on 2010-09-20

add debian/README.source

17. By Scott Moser on 2010-09-20

refresh ubuntu-fix-paths.patch for 1.3.57419

16. By Scott Moser on 2010-09-20

refresh ubuntu-do-not-require-java-home and make it first in series

15. By Scott Moser on 2010-09-20

New upstream release. original import.

=== added file 'debian/README.source'
--- debian/README.source	1970-01-01 00:00:00 +0000
+++ debian/README.source	2010-09-21 18:17:58 +0000
@@ -0,0 +1,38 @@
+=== General Info ===
+Development packaging branch is at
+   lp:~ubuntu-on-ec2/ubuntu/ec2-api-tools/<suite>
+
+The package uses quilt, but not quilt 3.0.  Patches are unapplied in the
+source directory.
+
+=== To upgrade to new zip file from amazon ===
+
+bzr branch lp:ubuntu/ec2-api-tools/<suite>
+
+cd maverick
+out=$(./debian/upstream-check ec2-api-tools)
+set -- ${out}
+newzip=${1}; date=${2}; size=${3}
+url=http://s3.amazonaws.com/ec2-downloads
+(cd .. && wget "${url}/${newzip}")
+ver=${newzip#ec2-api-tools-}; ver=${ver%.zip}
+ver=$(echo "${ver}" | tr '-' '.')
+
+bzr merge-upstream ../${newzip} --version ${ver}
+
+# update 'debian/ubuntu-fix-paths.patch' patch
+p=ubuntu-fix-paths.patch
+while [ "$(quilt next)" != "${p}" ]; do quilt push; done
+quilt header ${p} > header
+quilt del ${p}
+quilt new ${p}
+printf '#!/bin/sh\ncat header > "$1"\n' > xed
+chmod 755 xed
+EDITOR="$PWD/xed" quilt header -e
+files=$(ls bin/* | egrep -v "([.]cmd|ec2-cmd|~[0-9]~)$")
+quilt add ${files}
+sed -i -e 's,^#!/usr/bin/env bash,#!/bin/sh,' -e '/^EC2_HOME=/d' \
+      -e 's,.*/ec2-cmd \([^ ]*\) ,ec2-cmd \1 ,' ${files}
+quilt refresh
+rm header xed
+bzr commit -m "refresh ${p} for ${ver}" debian/patches/${p}

=== renamed file 'debian/README.source' => 'debian/README.source.moved'
=== modified file 'debian/upstream-check' (properties changed: -x to +x)