From 00440e8c1f865a055bd274799c7ec5b0c6dc1fe9 Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@ubuntu.com>
Date: Wed, 25 May 2011 17:57:25 -0500
Subject: [PATCH] * usr/share/byobu/ec2/Makefile.am,
 usr/share/byobu/ec2/rates.ap_si,   usr/share/byobu/ec2/rates.ap_to,
 usr/share/byobu/ec2/rates.eu_ie,   usr/share/byobu/ec2/rates.us_ca,
 usr/share/byobu/ec2/rates.us_va:   - update AWS prices, add the two new AP
 zones

---
 debian/changelog                |  4 ++++
 usr/share/byobu/ec2/Makefile.am |  2 +-
 usr/share/byobu/ec2/rates.ap_si | 15 +++++++++++++++
 usr/share/byobu/ec2/rates.ap_to | 15 +++++++++++++++
 usr/share/byobu/ec2/rates.eu_ie | 12 +++++++-----
 usr/share/byobu/ec2/rates.us_ca | 12 +++++++-----
 usr/share/byobu/ec2/rates.us_va | 12 +++++++-----
 7 files changed, 56 insertions(+), 16 deletions(-)
 create mode 100644 usr/share/byobu/ec2/rates.ap_si
 create mode 100644 usr/share/byobu/ec2/rates.ap_to

diff --git a/debian/changelog b/debian/changelog
index aeea7377..59aab9d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,10 @@ byobu (4.3) unreleased; urgency=low
   * usr/bin/byobu-janitor:
     - on initial setup, if it looks like we're running in ec2, enable
       ec2_cost monitor
+  * usr/share/byobu/ec2/Makefile.am, usr/share/byobu/ec2/rates.ap_si,
+    usr/share/byobu/ec2/rates.ap_to, usr/share/byobu/ec2/rates.eu_ie,
+    usr/share/byobu/ec2/rates.us_ca, usr/share/byobu/ec2/rates.us_va:
+    - update AWS prices, add the two new AP zones
 
   [ Scott Moser ]
   * usr/lib/byobu/.shutil: fix rounding across a decimal point in fpdiv()
diff --git a/usr/share/byobu/ec2/Makefile.am b/usr/share/byobu/ec2/Makefile.am
index 23f8bf60..73de0828 100644
--- a/usr/share/byobu/ec2/Makefile.am
+++ b/usr/share/byobu/ec2/Makefile.am
@@ -1,2 +1,2 @@
 ec2dir = $(datadir)/@PACKAGE@/ec2
-ec2_DATA = rates.eu_ie  rates.us_ca  rates.us_va
+ec2_DATA = rates.eu_ie  rates.us_ca  rates.us_va  rates.ap_si  rates.ap_to
diff --git a/usr/share/byobu/ec2/rates.ap_si b/usr/share/byobu/ec2/rates.ap_si
new file mode 100644
index 00000000..4ad0484a
--- /dev/null
+++ b/usr/share/byobu/ec2/rates.ap_si
@@ -0,0 +1,15 @@
+# 2011-05-25: Approximate Instance Cost Basis per hour from
+# http://aws.amazon.com/ec2/instance-types/
+# http://aws.amazon.com/ec2/pricing/
+# for AP - Singapore
+M1_SMALL="0.095"
+M1_LARGE="0.38"
+M1_XLARGE="0.76"
+T1_MICRO="0.025"
+M2_XLARGE="0.57"
+M2_2XLARGE="1.14"
+M2_4XLARGE="2.28"
+C1_MEDIUM="0.19"
+C1_XLARGE="0.76"
+CC1_4XLARGE="1.60"
+CG1_4XLARGE="2.10"
diff --git a/usr/share/byobu/ec2/rates.ap_to b/usr/share/byobu/ec2/rates.ap_to
new file mode 100644
index 00000000..ff10aed6
--- /dev/null
+++ b/usr/share/byobu/ec2/rates.ap_to
@@ -0,0 +1,15 @@
+# 2011-05-25: Approximate Instance Cost Basis per hour from
+# http://aws.amazon.com/ec2/instance-types/
+# http://aws.amazon.com/ec2/pricing/
+# for AP - Tokyo
+M1_SMALL="0.10"
+M1_LARGE="0.40"
+M1_XLARGE="0.80"
+T1_MICRO="0.027"
+M2_XLARGE="0.60"
+M2_2XLARGE="1.20"
+M2_4XLARGE="2.39"
+C1_MEDIUM="0.20"
+C1_XLARGE="0.80"
+CC1_4XLARGE="1.60"
+CG1_4XLARGE="2.10"
diff --git a/usr/share/byobu/ec2/rates.eu_ie b/usr/share/byobu/ec2/rates.eu_ie
index 36c19627..ecf0e5de 100644
--- a/usr/share/byobu/ec2/rates.eu_ie
+++ b/usr/share/byobu/ec2/rates.eu_ie
@@ -1,13 +1,15 @@
-# 2010-03-03: Approximate Instance Cost Basis per hour from
+# 2011-05-25: Approximate Instance Cost Basis per hour from
 # http://aws.amazon.com/ec2/instance-types/
-# http://aws.amazon.com/ec2/#pricing
+# http://aws.amazon.com/ec2/pricing/
 # for EU - Ireland
 M1_SMALL="0.095"
 M1_LARGE="0.38"
 M1_XLARGE="0.76"
+T1_MICRO="0.025"
 M2_XLARGE="0.57"
-M2_2XLARGE="1.34"
-M2_4XLARGE="2.68"
+M2_2XLARGE="1.14"
+M2_4XLARGE="2.28"
 C1_MEDIUM="0.19"
 C1_XLARGE="0.76"
-T1_MICRO="0.025"
+CC1_4XLARGE="1.60"
+CG1_4XLARGE="2.10"
diff --git a/usr/share/byobu/ec2/rates.us_ca b/usr/share/byobu/ec2/rates.us_ca
index 272bf84c..a625a61f 100644
--- a/usr/share/byobu/ec2/rates.us_ca
+++ b/usr/share/byobu/ec2/rates.us_ca
@@ -1,13 +1,15 @@
-# 2010-03-03: Approximate Instance Cost Basis per hour from
+# 2011-05-25: Approximate Instance Cost Basis per hour from
 # http://aws.amazon.com/ec2/instance-types/
-# http://aws.amazon.com/ec2/#pricing
+# http://aws.amazon.com/ec2/pricing/
 # for US - N. California
 M1_SMALL="0.095"
 M1_LARGE="0.38"
 M1_XLARGE="0.76"
+T1_MICRO="0.025"
 M2_XLARGE="0.57"
-M2_2XLARGE="1.34"
-M2_4XLARGE="2.68"
+M2_2XLARGE="1.14"
+M2_4XLARGE="2.28"
 C1_MEDIUM="0.19"
 C1_XLARGE="0.76"
-T1_MICRO="0.025"
+CC1_4XLARGE="1.60"
+CG1_4XLARGE="2.10"
diff --git a/usr/share/byobu/ec2/rates.us_va b/usr/share/byobu/ec2/rates.us_va
index d5a9e0b6..73149083 100644
--- a/usr/share/byobu/ec2/rates.us_va
+++ b/usr/share/byobu/ec2/rates.us_va
@@ -1,13 +1,15 @@
-# 2010-03-03: Approximate Instance Cost Basis per hour from
+# 2011-05-25: Approximate Instance Cost Basis per hour from
 # http://aws.amazon.com/ec2/instance-types/
-# http://aws.amazon.com/ec2/#pricing
+# http://aws.amazon.com/ec2/pricing/
 # for US - N. Virginia
 M1_SMALL="0.085"
 M1_LARGE="0.34"
 M1_XLARGE="0.68"
+T1_MICRO="0.02"
 M2_XLARGE="0.50"
-M2_2XLARGE="1.20"
-M2_4XLARGE="2.40"
+M2_2XLARGE="1.00"
+M2_4XLARGE="2.00"
 C1_MEDIUM="0.17"
 C1_XLARGE="0.68"
-T1_MICRO="0.02"
+CC1_4XLARGE="1.60"
+CG1_4XLARGE="2.10"