--- ec2-api-tools-1.3.36506.orig/debian/copyright
+++ ec2-api-tools-1.3.36506/debian/copyright
@@ -0,0 +1,26 @@
+This package was debianized by Chuck Short <chuck.short@canonical.com> on
+Wed, 18 Mar 2009 09:03:37 -0400.
+
+It was downloaded from <http://ec2-downloads.s3.amazonaws.com>
+
+Upstream Author(s):
+
+    Amazon.com
+
+Copyright:
+
+    Copyright 2008 Amazon.com  Inc or its affiliates.
+
+License:
+
+    Licensed under the Amazon Software License (the
+    "License").  You may not use this file except in compliance with the
+    License. A copy of the License is located at
+    http://aws.amazon.com/asl or in the "license" file accompanying this
+    file.  This file is distributed on an "AS IS" BASIS, WITHOUT
+    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+    the License for the specific language governing permissions and
+    limitations under the License
+
+The Debian packaging is copyright 2009, Chuck Short<chuck.short@canonical.com> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
--- ec2-api-tools-1.3.36506.orig/debian/rules
+++ ec2-api-tools-1.3.36506/debian/rules
@@ -0,0 +1,8 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+binary-post-install/ec2-api-tools::
+	# we need no stinking windows batch scripts
+	rm  -f debian/ec2-api-tools/usr/bin/*.cmd
--- ec2-api-tools-1.3.36506.orig/debian/control
+++ ec2-api-tools-1.3.36506/debian/control
@@ -0,0 +1,13 @@
+Source: ec2-api-tools
+Section: admin
+Priority: extra
+Maintainer: Chuck Short <zulcss@ubuntu.com>
+Build-Depends: cdbs, debhelper (>= 7), quilt
+Standards-Version: 3.8.1
+
+Package: ec2-api-tools
+Architecture: amd64 i386
+Depends: ${misc:Depends}, java6-runtime-headless | default-jre-headless
+Description: Amazon EC2 API tools
+ The Amazon EC2 API tools are command-line utilities to help manage an 
+ Amazon Machine Image (AMI), manage firewalls and other utilities.
--- ec2-api-tools-1.3.36506.orig/debian/compat
+++ ec2-api-tools-1.3.36506/debian/compat
@@ -0,0 +1 @@
+7
--- ec2-api-tools-1.3.36506.orig/debian/docs
+++ ec2-api-tools-1.3.36506/debian/docs
@@ -0,0 +1,3 @@
+license.txt
+notice.txt
+THIRDPARTYLICENSE.TXT
--- ec2-api-tools-1.3.36506.orig/debian/changelog
+++ ec2-api-tools-1.3.36506/debian/changelog
@@ -0,0 +1,35 @@
+ec2-api-tools (1.3.36506-0ubuntu4) karmic; urgency=low
+
+  * ec2-cmd: remove need for setting JAVA_HOME (LP: #410328)
+
+ -- Scott Moser <smoser@ubuntu.com>  Wed, 12 Aug 2009 16:20:54 -0400
+
+ec2-api-tools (1.3.36506-0ubuntu3) karmic; urgency=low
+
+  * Really fix cmd wrappers. Thanks to Ville Aine. (LP: #363931) 
+
+ -- Chuck Short <zulcss@ubuntu.com>  Wed, 12 Aug 2009 09:31:15 -0400
+
+ec2-api-tools (1.3.36506-0ubuntu2) karmic; urgency=low
+
+  * Remove *.cmd wrappers (LP: #363931) 
+
+ -- Chuck Short <zulcss@ubuntu.com>  Mon, 08 Jun 2009 08:57:31 -0400
+
+ec2-api-tools (1.3.36506-0ubuntu1) karmic; urgency=low
+
+  * New version.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Mon, 01 Jun 2009 20:19:17 -0400
+
+ec2-api-tools (1.3.34128-0ubuntu2) jaunty; urgency=low
+
+  * Update copyright. 
+
+ -- Chuck Short <zulcss@ubuntu.com>  Wed, 25 Mar 2009 19:01:28 -0400
+
+ec2-api-tools (1.3.34128-0ubuntu1) jaunty; urgency=low
+
+  * Initial release.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Wed, 18 Mar 2009 09:03:37 -0400
--- ec2-api-tools-1.3.36506.orig/debian/ec2-api-tools.install
+++ ec2-api-tools-1.3.36506/debian/ec2-api-tools.install
@@ -0,0 +1,2 @@
+bin/* usr/bin
+lib/* usr/lib/ec2-api-tools
--- ec2-api-tools-1.3.36506.orig/debian/patches/series
+++ ec2-api-tools-1.3.36506/debian/patches/series
@@ -0,0 +1,2 @@
+ubuntu-fix-paths.patch
+ubuntu-do-not-require-java-home.patch
--- ec2-api-tools-1.3.36506.orig/debian/patches/ubuntu-fix-paths.patch
+++ ec2-api-tools-1.3.36506/debian/patches/ubuntu-fix-paths.patch
@@ -0,0 +1,914 @@
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-add-group ec2-api-tools-1.3.34128/bin/ec2-add-group
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-add-group	2009-03-11 10:04:14.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-add-group	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd AddGroup "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2addgrp ec2-api-tools-1.3.34128/bin/ec2addgrp
+--- ec2-api-tools-1.3.34128.orig/bin/ec2addgrp	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2addgrp	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd AddGroup "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2addkey ec2-api-tools-1.3.34128/bin/ec2addkey
+--- ec2-api-tools-1.3.34128.orig/bin/ec2addkey	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2addkey	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd CreateKeyPair "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-add-keypair ec2-api-tools-1.3.34128/bin/ec2-add-keypair
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-add-keypair	2009-03-11 10:04:14.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-add-keypair	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd CreateKeyPair "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2addsnap ec2-api-tools-1.3.34128/bin/ec2addsnap
+--- ec2-api-tools-1.3.34128.orig/bin/ec2addsnap	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2addsnap	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd CreateSnapshot "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2addvol ec2-api-tools-1.3.34128/bin/ec2addvol
+--- ec2-api-tools-1.3.34128.orig/bin/ec2addvol	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2addvol	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd CreateVolume "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2allocaddr ec2-api-tools-1.3.34128/bin/ec2allocaddr
+--- ec2-api-tools-1.3.34128.orig/bin/ec2allocaddr	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2allocaddr	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd AllocateAddress "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-allocate-address ec2-api-tools-1.3.34128/bin/ec2-allocate-address
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-allocate-address	2009-03-11 10:04:14.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-allocate-address	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd AllocateAddress "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2assocaddr ec2-api-tools-1.3.34128/bin/ec2assocaddr
+--- ec2-api-tools-1.3.34128.orig/bin/ec2assocaddr	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2assocaddr	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd AssociateAddress "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-associate-address ec2-api-tools-1.3.34128/bin/ec2-associate-address
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-associate-address	2009-03-11 10:04:14.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-associate-address	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd AssociateAddress "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-attach-volume ec2-api-tools-1.3.34128/bin/ec2-attach-volume
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-attach-volume	2009-03-11 10:04:14.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-attach-volume	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd AttachVolume "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2attvol ec2-api-tools-1.3.34128/bin/ec2attvol
+--- ec2-api-tools-1.3.34128.orig/bin/ec2attvol	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2attvol	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd AttachVolume "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2auth ec2-api-tools-1.3.34128/bin/ec2auth
+--- ec2-api-tools-1.3.34128.orig/bin/ec2auth	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2auth	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd AuthorizeGroup "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-authorize ec2-api-tools-1.3.34128/bin/ec2-authorize
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-authorize	2009-03-11 10:04:14.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-authorize	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd AuthorizeGroup "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2bundle ec2-api-tools-1.3.34128/bin/ec2bundle
+--- ec2-api-tools-1.3.34128.orig/bin/ec2bundle	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2bundle	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd BundleInstance "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-bundle-instance ec2-api-tools-1.3.34128/bin/ec2-bundle-instance
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-bundle-instance	2009-03-11 10:04:14.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-bundle-instance	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd BundleInstance "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-cancel-bundle-task ec2-api-tools-1.3.34128/bin/ec2-cancel-bundle-task
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-cancel-bundle-task	2009-03-11 10:04:14.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-cancel-bundle-task	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd CancelBundleTask "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2cbun ec2-api-tools-1.3.34128/bin/ec2cbun
+--- ec2-api-tools-1.3.34128.orig/bin/ec2cbun	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2cbun	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd CancelBundleTask "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-cmd ec2-api-tools-1.3.34128/bin/ec2-cmd
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-cmd	2009-03-11 10:04:14.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-cmd	2009-03-19 15:52:04.000000000 -0400
+@@ -10,8 +10,8 @@
+ # for maintainability.
+ 
+ # 'Globals'
+-EC2_HOME=${EC2_HOME:-EC2_HOME is not set}
+-LIBDIR=$EC2_HOME/lib
++EC2_HOME=/usr
++LIBDIR=$EC2_HOME/lib/ec2-api-tools
+ 
+ # Check our Java env
+ JAVA_HOME=${JAVA_HOME:?JAVA_HOME is not set}
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-confirm-product-instance ec2-api-tools-1.3.34128/bin/ec2-confirm-product-instance
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-confirm-product-instance	2009-03-11 10:04:14.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-confirm-product-instance	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd ConfirmProductInstance "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2cpi ec2-api-tools-1.3.34128/bin/ec2cpi
+--- ec2-api-tools-1.3.34128.orig/bin/ec2cpi	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2cpi	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd ConfirmProductInstance "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-create-snapshot ec2-api-tools-1.3.34128/bin/ec2-create-snapshot
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-create-snapshot	2009-03-11 10:04:14.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-create-snapshot	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd CreateSnapshot "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-create-volume ec2-api-tools-1.3.34128/bin/ec2-create-volume
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-create-volume	2009-03-11 10:04:14.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-create-volume	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd CreateVolume "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2daddr ec2-api-tools-1.3.34128/bin/ec2daddr
+--- ec2-api-tools-1.3.34128.orig/bin/ec2daddr	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2daddr	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DescribeAddresses "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2datt ec2-api-tools-1.3.34128/bin/ec2datt
+--- ec2-api-tools-1.3.34128.orig/bin/ec2datt	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2datt	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DescribeImageAttribute "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2daz ec2-api-tools-1.3.34128/bin/ec2daz
+--- ec2-api-tools-1.3.34128.orig/bin/ec2daz	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2daz	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DescribeAvailabilityZones "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2dbun ec2-api-tools-1.3.34128/bin/ec2dbun
+--- ec2-api-tools-1.3.34128.orig/bin/ec2dbun	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2dbun	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DescribeBundleTasks "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-delete-group ec2-api-tools-1.3.34128/bin/ec2-delete-group
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-delete-group	2009-03-11 10:04:14.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-delete-group	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DeleteGroup "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-delete-keypair ec2-api-tools-1.3.34128/bin/ec2-delete-keypair
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-delete-keypair	2009-03-11 10:04:14.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-delete-keypair	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DeleteKeyPair "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-delete-snapshot ec2-api-tools-1.3.34128/bin/ec2-delete-snapshot
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-delete-snapshot	2009-03-11 10:04:14.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-delete-snapshot	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DeleteSnapshot "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-delete-volume ec2-api-tools-1.3.34128/bin/ec2-delete-volume
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-delete-volume	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-delete-volume	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DeleteVolume "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2delgrp ec2-api-tools-1.3.34128/bin/ec2delgrp
+--- ec2-api-tools-1.3.34128.orig/bin/ec2delgrp	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2delgrp	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DeleteGroup "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2delkey ec2-api-tools-1.3.34128/bin/ec2delkey
+--- ec2-api-tools-1.3.34128.orig/bin/ec2delkey	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2delkey	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DeleteKeyPair "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2delsnap ec2-api-tools-1.3.34128/bin/ec2delsnap
+--- ec2-api-tools-1.3.34128.orig/bin/ec2delsnap	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2delsnap	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DeleteSnapshot "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2delvol ec2-api-tools-1.3.34128/bin/ec2delvol
+--- ec2-api-tools-1.3.34128.orig/bin/ec2delvol	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2delvol	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DeleteVolume "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2dereg ec2-api-tools-1.3.34128/bin/ec2dereg
+--- ec2-api-tools-1.3.34128.orig/bin/ec2dereg	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2dereg	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DeregisterImage "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-deregister ec2-api-tools-1.3.34128/bin/ec2-deregister
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-deregister	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-deregister	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DeregisterImage "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-describe-addresses ec2-api-tools-1.3.34128/bin/ec2-describe-addresses
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-describe-addresses	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-describe-addresses	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DescribeAddresses "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-describe-availability-zones ec2-api-tools-1.3.34128/bin/ec2-describe-availability-zones
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-describe-availability-zones	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-describe-availability-zones	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DescribeAvailabilityZones "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-describe-bundle-tasks ec2-api-tools-1.3.34128/bin/ec2-describe-bundle-tasks
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-describe-bundle-tasks	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-describe-bundle-tasks	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DescribeBundleTasks "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-describe-group ec2-api-tools-1.3.34128/bin/ec2-describe-group
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-describe-group	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-describe-group	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DescribeGroups "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-describe-image-attribute ec2-api-tools-1.3.34128/bin/ec2-describe-image-attribute
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-describe-image-attribute	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-describe-image-attribute	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DescribeImageAttribute "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-describe-images ec2-api-tools-1.3.34128/bin/ec2-describe-images
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-describe-images	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-describe-images	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DescribeImages "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-describe-instances ec2-api-tools-1.3.34128/bin/ec2-describe-instances
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-describe-instances	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-describe-instances	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DescribeInstances "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-describe-keypairs ec2-api-tools-1.3.34128/bin/ec2-describe-keypairs
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-describe-keypairs	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-describe-keypairs	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DescribeKeyPairs "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-describe-regions ec2-api-tools-1.3.34128/bin/ec2-describe-regions
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-describe-regions	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-describe-regions	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DescribeRegions "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-describe-reserved-instances ec2-api-tools-1.3.34128/bin/ec2-describe-reserved-instances
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-describe-reserved-instances	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-describe-reserved-instances	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DescribeReservedInstances "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-describe-reserved-instances-offerings ec2-api-tools-1.3.34128/bin/ec2-describe-reserved-instances-offerings
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-describe-reserved-instances-offerings	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-describe-reserved-instances-offerings	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DescribeReservedInstancesOfferings "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-describe-snapshots ec2-api-tools-1.3.34128/bin/ec2-describe-snapshots
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-describe-snapshots	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-describe-snapshots	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DescribeSnapshots "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-describe-volumes ec2-api-tools-1.3.34128/bin/ec2-describe-volumes
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-describe-volumes	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-describe-volumes	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DescribeVolumes "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-detach-volume ec2-api-tools-1.3.34128/bin/ec2-detach-volume
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-detach-volume	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-detach-volume	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DetachVolume "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2detvol ec2-api-tools-1.3.34128/bin/ec2detvol
+--- ec2-api-tools-1.3.34128.orig/bin/ec2detvol	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2detvol	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DetachVolume "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2dgrp ec2-api-tools-1.3.34128/bin/ec2dgrp
+--- ec2-api-tools-1.3.34128.orig/bin/ec2dgrp	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2dgrp	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DescribeGroups "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2dim ec2-api-tools-1.3.34128/bin/ec2dim
+--- ec2-api-tools-1.3.34128.orig/bin/ec2dim	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2dim	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DescribeImages "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2din ec2-api-tools-1.3.34128/bin/ec2din
+--- ec2-api-tools-1.3.34128.orig/bin/ec2din	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2din	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DescribeInstances "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2disaddr ec2-api-tools-1.3.34128/bin/ec2disaddr
+--- ec2-api-tools-1.3.34128.orig/bin/ec2disaddr	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2disaddr	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DisassociateAddress "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-disassociate-address ec2-api-tools-1.3.34128/bin/ec2-disassociate-address
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-disassociate-address	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-disassociate-address	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DisassociateAddress "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2dkey ec2-api-tools-1.3.34128/bin/ec2dkey
+--- ec2-api-tools-1.3.34128.orig/bin/ec2dkey	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2dkey	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DescribeKeyPairs "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2dre ec2-api-tools-1.3.34128/bin/ec2dre
+--- ec2-api-tools-1.3.34128.orig/bin/ec2dre	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2dre	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DescribeRegions "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2dri ec2-api-tools-1.3.34128/bin/ec2dri
+--- ec2-api-tools-1.3.34128.orig/bin/ec2dri	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2dri	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DescribeReservedInstances "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2drio ec2-api-tools-1.3.34128/bin/ec2drio
+--- ec2-api-tools-1.3.34128.orig/bin/ec2drio	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2drio	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DescribeReservedInstancesOfferings "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2dsnap ec2-api-tools-1.3.34128/bin/ec2dsnap
+--- ec2-api-tools-1.3.34128.orig/bin/ec2dsnap	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2dsnap	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DescribeSnapshots "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2dvol ec2-api-tools-1.3.34128/bin/ec2dvol
+--- ec2-api-tools-1.3.34128.orig/bin/ec2dvol	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2dvol	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd DescribeVolumes "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-fingerprint-key ec2-api-tools-1.3.34128/bin/ec2-fingerprint-key
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-fingerprint-key	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-fingerprint-key	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd FingerprintKey "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2fp ec2-api-tools-1.3.34128/bin/ec2fp
+--- ec2-api-tools-1.3.34128.orig/bin/ec2fp	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2fp	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd FingerprintKey "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2gcons ec2-api-tools-1.3.34128/bin/ec2gcons
+--- ec2-api-tools-1.3.34128.orig/bin/ec2gcons	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2gcons	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd GetConsoleOutput "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-get-console-output ec2-api-tools-1.3.34128/bin/ec2-get-console-output
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-get-console-output	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-get-console-output	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd GetConsoleOutput "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-get-password ec2-api-tools-1.3.34128/bin/ec2-get-password
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-get-password	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-get-password	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd GetPassword "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2gpass ec2-api-tools-1.3.34128/bin/ec2gpass
+--- ec2-api-tools-1.3.34128.orig/bin/ec2gpass	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2gpass	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd GetPassword "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2kill ec2-api-tools-1.3.34128/bin/ec2kill
+--- ec2-api-tools-1.3.34128.orig/bin/ec2kill	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2kill	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd TerminateInstances "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2matt ec2-api-tools-1.3.34128/bin/ec2matt
+--- ec2-api-tools-1.3.34128.orig/bin/ec2matt	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2matt	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd ModifyImageAttribute "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-migrate-image ec2-api-tools-1.3.34128/bin/ec2-migrate-image
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-migrate-image	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-migrate-image	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd MigrateBundle "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2mim ec2-api-tools-1.3.34128/bin/ec2mim
+--- ec2-api-tools-1.3.34128.orig/bin/ec2mim	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2mim	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd MigrateBundle "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-modify-image-attribute ec2-api-tools-1.3.34128/bin/ec2-modify-image-attribute
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-modify-image-attribute	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-modify-image-attribute	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd ModifyImageAttribute "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2prio ec2-api-tools-1.3.34128/bin/ec2prio
+--- ec2-api-tools-1.3.34128.orig/bin/ec2prio	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2prio	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd PurchaseReservedInstancesOffering "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-purchase-reserved-instances-offering ec2-api-tools-1.3.34128/bin/ec2-purchase-reserved-instances-offering
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-purchase-reserved-instances-offering	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-purchase-reserved-instances-offering	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd PurchaseReservedInstancesOffering "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2ratt ec2-api-tools-1.3.34128/bin/ec2ratt
+--- ec2-api-tools-1.3.34128.orig/bin/ec2ratt	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2ratt	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd ResetImageAttribute "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2reboot ec2-api-tools-1.3.34128/bin/ec2reboot
+--- ec2-api-tools-1.3.34128.orig/bin/ec2reboot	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2reboot	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd RebootInstances "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-reboot-instances ec2-api-tools-1.3.34128/bin/ec2-reboot-instances
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-reboot-instances	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-reboot-instances	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd RebootInstances "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2reg ec2-api-tools-1.3.34128/bin/ec2reg
+--- ec2-api-tools-1.3.34128.orig/bin/ec2reg	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2reg	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd RegisterImage "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-register ec2-api-tools-1.3.34128/bin/ec2-register
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-register	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-register	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd RegisterImage "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2reladdr ec2-api-tools-1.3.34128/bin/ec2reladdr
+--- ec2-api-tools-1.3.34128.orig/bin/ec2reladdr	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2reladdr	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd ReleaseAddress "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-release-address ec2-api-tools-1.3.34128/bin/ec2-release-address
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-release-address	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-release-address	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd ReleaseAddress "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-reset-image-attribute ec2-api-tools-1.3.34128/bin/ec2-reset-image-attribute
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-reset-image-attribute	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-reset-image-attribute	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd ResetImageAttribute "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2revoke ec2-api-tools-1.3.34128/bin/ec2revoke
+--- ec2-api-tools-1.3.34128.orig/bin/ec2revoke	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2revoke	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd RevokeGroup "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-revoke ec2-api-tools-1.3.34128/bin/ec2-revoke
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-revoke	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-revoke	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd RevokeGroup "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2run ec2-api-tools-1.3.34128/bin/ec2run
+--- ec2-api-tools-1.3.34128.orig/bin/ec2run	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2run	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd RunInstances "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-run-instances ec2-api-tools-1.3.34128/bin/ec2-run-instances
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-run-instances	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-run-instances	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd RunInstances "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-terminate-instances ec2-api-tools-1.3.34128/bin/ec2-terminate-instances
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-terminate-instances	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-terminate-instances	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd TerminateInstances "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2ver ec2-api-tools-1.3.34128/bin/ec2ver
+--- ec2-api-tools-1.3.34128.orig/bin/ec2ver	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2ver	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd ShowVersion "$@"
+diff -Naurp ec2-api-tools-1.3.34128.orig/bin/ec2-version ec2-api-tools-1.3.34128/bin/ec2-version
+--- ec2-api-tools-1.3.34128.orig/bin/ec2-version	2009-03-11 10:04:15.000000000 -0400
++++ ec2-api-tools-1.3.34128/bin/ec2-version	2009-03-19 15:50:27.000000000 -0400
+@@ -6,5 +6,5 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
++EC2_HOME=/usr
+ $EC2_HOME/bin/ec2-cmd ShowVersion "$@"
--- ec2-api-tools-1.3.36506.orig/debian/patches/ubuntu-do-not-require-java-home.patch
+++ ec2-api-tools-1.3.36506/debian/patches/ubuntu-do-not-require-java-home.patch
@@ -0,0 +1,18 @@
+--- old/bin/ec2-cmd.dist	2009-08-12 16:24:46.000000000 -0400
++++ new/bin/ec2-cmd	2009-08-12 16:24:57.000000000 -0400
+@@ -13,9 +13,6 @@
+ EC2_HOME=/usr
+ LIBDIR=$EC2_HOME/lib/ec2-api-tools
+ 
+-# Check our Java env
+-JAVA_HOME=${JAVA_HOME:?JAVA_HOME is not set}
+-
+ # If a classpath exists preserve it
+ CP=$CLASSPATH
+ 
+@@ -58,4 +55,4 @@
+ 
+ CMD=$1
+ shift
+-"$JAVA_HOME/bin/java" $EC2_JVM_ARGS $cygprop -classpath "$CP" com.amazon.aes.webservices.client.cmd.$CMD "$@"
++java $EC2_JVM_ARGS $cygprop -classpath "$CP" com.amazon.aes.webservices.client.cmd.$CMD "$@"