Merge lp:~jbrowne/ubuntu/precise/elbcli/precise into lp:~awstools-dev/ubuntu/precise/elbcli/precise

[Jim Browne]

Changes to bring this package in sync with the state of the similar RDS CLI package.

Remaining differences:

- This package has no debian/watch file (reason noted in debian/README.source)
- The added Makefile builds the .fixperms target (removed in RDS package)

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2012-05-22 06:55:19 +0000
@@ -0,0 +1,1 @@
+.pc
 
=== removed file 'README.txt'
=== modified file 'credential-file-path.template'
--- credential-file-path.template	2011-12-09 15:50:39 +0000
+++ credential-file-path.template	2012-05-22 06:55:19 +0000
@@ -1,2 +1,5 @@
+# Enter the AWS Keys without the < or >
+# These can be found at http://aws.amazon.com under Account->Security Credentials
 AWSAccessKeyId=<Write your AWS access ID>
-AWSSecretKey=<Write your AWS secret key>
 \ No newline at end of file
+AWSSecretKey=<Write your AWS secret key>
+
 
=== modified file 'debian/README.source'
--- debian/README.source	2011-12-13 14:30:58 +0000
+++ debian/README.source	2012-05-22 06:55:19 +0000
@@ -77,3 +77,8 @@
 
 Currently that list needs to be manually synced to the dependencies in
 debian/control.
+
+== Testing ==
+debian/README.example contains an example of how to test some function of the
+package.
+
 
=== modified file 'debian/control'
--- debian/control	2011-12-13 16:24:19 +0000
+++ debian/control	2012-05-22 06:55:19 +0000
@@ -5,7 +5,7 @@
 Build-Depends: debhelper (>= 7),
                java6-runtime-headless | default-jre-headless,
                quilt
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: http://aws.amazon.com/developertools/2536
 
 Package: elbcli
 
=== modified file 'debian/copyright'
--- debian/copyright	2011-12-13 15:51:33 +0000
+++ debian/copyright	2012-05-22 06:55:19 +0000
@@ -151,7 +151,7 @@
  SOFTWARE.
 
 Copyright: Copyright (c) 2000 The Apache Software Foundation.
-Files: jdom-1.0.jar
+Files: lib/jdom-1.0.jar
 License: Apache-1.1
  The Apache Software License, Version 1.1
  .
 
=== modified file 'debian/patches/replace-commands.patch'
--- debian/patches/replace-commands.patch	2011-12-13 14:52:14 +0000
+++ debian/patches/replace-commands.patch	2012-05-22 06:55:19 +0000
@@ -1,35 +1,32 @@
-Subject: re-write the wrapper commands from original source
-This patch just rewrites the wrapper commands that are provided
-in the zip file with one more tailored for installation.
+Description: re-write the wrapper commands from original source
+ This patch just rewrites the wrapper commands that are provided
+ in the zip file with one more tailored for installation.
 
 To regenerate this patch:
-  files=$(for f in bin/*; do 
-     case "${f##*/}" in (*.cmd|service|elb-cmd) continue;; esac
-     echo $f; done)
-  # the only program that has a different argument to 'elb-cmd'
-  # than its filename is 'elb-version'.  That has to be shortened to
-  # 'version'
-  quilt delete replace-commands.patch
-  rm debian/patches/replace-commands.patch
-  quilt new replace-commands.patch
-  quilt add ${files}
-  for f in ${files}; do
-     [ "${f}" = "bin/elb-version" ] && cmd="version" || cmd="${f#*/}"
-     cat debian/wrapper-header > "${f}" && \
-        printf 'exec "$service" %s "$@"\n' "$cmd" >> "${f}"
-  done
-  quilt refresh
-
-To verify that each command called 'elb-cmd' with its command name, without
-this patch applied, you can do something like:
-  for f in $files; do 
-    cmd=$(awk '$1 ~ /elb-cmd$/ { print $2 }' $f); 
-    [ "${f#*/}" != "$cmd" ] && echo -n "DIFFERENT: "
-    echo $f: $cmd
-  done
-
+   files=$(for f in bin/*; do
+      case "${f##*/}" in (*.cmd|service|elb-cmd) continue;; esac
+      echo $f; done)
+   # the only program that has a different argument to 'elb-cmd'
+   # than its filename is 'elb-version'.  That has to be shortened to
+   # 'version'
+   patch=debian/patches/replace-commands.patch
+   quilt header ${patch##*/} > header.tmp
+   quilt delete ${patch##*/}
+   rm $patch
+   quilt new ${patch##*/}
+   quilt add ${files}
+   for f in ${files}; do
+      [ "${f}" = "bin/elb-version" ] && cmd="version" || cmd="${f#*/}"
+      cat debian/wrapper-header > "${f}" && \
+         printf 'exec "$service" %s "$@"\n' "$cmd" >> "${f}"
+   done
+   quilt refresh
+   # replace header
+   quilt header ${patch##*/} -r < header.tmp
+   rm -f header.tmp
 Origin: Scott Moser <[e-mail]>
 Last-Update: 2011-12-13
+
 --- a/bin/elb-apply-security-groups-to-lb
 +++ b/bin/elb-apply-security-groups-to-lb
 @@ -1,7 +1,5 @@