← Back to branch summary

~awstools-dev/ubuntu/lucid/ec2-ami-tools/lucid

« back to all changes in this revision

Viewing changes to debian/patches/point-to-right-place.patch

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2009-01-13 11:46:59 UTC
  • Revision ID: james.westby@ubuntu.com-20090113114659-d2g70wekc6b0dz3x
Tags: 1.3-31057-0ubuntu1
https://launchpad.net/bugs/310547
https://launchpad.net/bugs/308548
* New upstream version. (LP: #310547)
* debian/patches/exclude-udev-rules.patch: Exclude the copying of 
  /etc/udev/rules.d/70-persistent-net.rules and
  /etc/udev/rules.d/z25_persistent-net.rules when rebundling an image. 
  (LP: #308548)
* debian/patches/point-to-right-place: Updated patch to take in account
  ec2-migrate-manifest and ec2-migrate-bundle.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/point-to-right-place.patch
1
 
diff -Naur ec2-ami-tools-1.3-26357.orig/bin/ec2-ami-tools-version ec2-ami-tools-1.3-26357/bin/ec2-ami-tools-version
2
 
--- ec2-ami-tools-1.3-26357.orig/bin/ec2-ami-tools-version      2008-10-06 04:55:29.000000000 -0400
3
 
+++ ec2-ami-tools-1.3-26357/bin/ec2-ami-tools-version   2008-10-14 08:26:59.000000000 -0400
 
1
diff -Naur ec2-ami-tools-1.3-31057.orig/bin/ec2-ami-tools-version ec2-ami-tools-1.3-31057/bin/ec2-ami-tools-version
 
2
--- ec2-ami-tools-1.3-31057.orig/bin/ec2-ami-tools-version      2008-12-29 12:49:39.000000000 -0500
 
3
+++ ec2-ami-tools-1.3-31057/bin/ec2-ami-tools-version   2009-01-15 09:58:08.000000000 -0500
4
4
@@ -1,4 +1,4 @@
5
5
 #!/bin/bash
6
6
 
7
7
-home=${EC2_AMITOOL_HOME:-${EC2_HOME:?Neither of EC2_AMITOOL_HOME or EC2_HOME environment variables are set}}
8
8
+home=/usr/lib/ec2-ami-tools
9
9
 ruby -I $home/lib ${home}/lib/ec2/amitools/showversion.rb $*
10
 
diff -Naur ec2-ami-tools-1.3-26357.orig/bin/ec2-bundle-image ec2-ami-tools-1.3-26357/bin/ec2-bundle-image
11
 
--- ec2-ami-tools-1.3-26357.orig/bin/ec2-bundle-image   2008-10-06 04:55:29.000000000 -0400
12
 
+++ ec2-ami-tools-1.3-26357/bin/ec2-bundle-image        2008-10-14 08:28:25.000000000 -0400
 
10
diff -Naur ec2-ami-tools-1.3-31057.orig/bin/ec2-bundle-image ec2-ami-tools-1.3-31057/bin/ec2-bundle-image
 
11
--- ec2-ami-tools-1.3-31057.orig/bin/ec2-bundle-image   2008-12-29 12:49:39.000000000 -0500
 
12
+++ ec2-ami-tools-1.3-31057/bin/ec2-bundle-image        2009-01-15 09:58:08.000000000 -0500
13
13
@@ -1,4 +1,4 @@
14
14
 #!/bin/bash
15
15
 
16
16
-home=${EC2_AMITOOL_HOME:-${EC2_HOME:?Neither of EC2_AMITOOL_HOME or EC2_HOME environment variables are set}}
17
17
+home=/usr/lib/ec2-ami-tools
18
18
 ruby -I $home/lib ${home}/lib/ec2/amitools/bundleimage.rb $*
19
 
diff -Naur ec2-ami-tools-1.3-26357.orig/bin/ec2-bundle-vol ec2-ami-tools-1.3-26357/bin/ec2-bundle-vol
20
 
--- ec2-ami-tools-1.3-26357.orig/bin/ec2-bundle-vol     2008-10-06 04:55:29.000000000 -0400
21
 
+++ ec2-ami-tools-1.3-26357/bin/ec2-bundle-vol  2008-10-14 08:29:13.000000000 -0400
 
19
diff -Naur ec2-ami-tools-1.3-31057.orig/bin/ec2-bundle-vol ec2-ami-tools-1.3-31057/bin/ec2-bundle-vol
 
20
--- ec2-ami-tools-1.3-31057.orig/bin/ec2-bundle-vol     2008-12-29 12:49:39.000000000 -0500
 
21
+++ ec2-ami-tools-1.3-31057/bin/ec2-bundle-vol  2009-01-15 09:58:08.000000000 -0500
22
22
@@ -1,4 +1,4 @@
23
23
 #!/bin/bash
24
24
 
25
25
-home=${EC2_AMITOOL_HOME:-${EC2_HOME:?Neither of EC2_AMITOOL_HOME or EC2_HOME environment variables are set}}
26
26
+home=/usr/lib/ec2-ami-tools
27
27
 ruby -I $home/lib ${home}/lib/ec2/amitools/bundlevol.rb $*
28
 
diff -Naur ec2-ami-tools-1.3-26357.orig/bin/ec2-delete-bundle ec2-ami-tools-1.3-26357/bin/ec2-delete-bundle
29
 
--- ec2-ami-tools-1.3-26357.orig/bin/ec2-delete-bundle  2008-10-06 04:55:29.000000000 -0400
30
 
+++ ec2-ami-tools-1.3-26357/bin/ec2-delete-bundle       2008-10-14 08:29:44.000000000 -0400
 
28
diff -Naur ec2-ami-tools-1.3-31057.orig/bin/ec2-delete-bundle ec2-ami-tools-1.3-31057/bin/ec2-delete-bundle
 
29
--- ec2-ami-tools-1.3-31057.orig/bin/ec2-delete-bundle  2008-12-29 12:49:39.000000000 -0500
 
30
+++ ec2-ami-tools-1.3-31057/bin/ec2-delete-bundle       2009-01-15 09:58:08.000000000 -0500
31
31
@@ -1,4 +1,4 @@
32
32
 #!/bin/bash
33
33
 
34
34
-home=${EC2_AMITOOL_HOME:-${EC2_HOME:?Neither of EC2_AMITOOL_HOME or EC2_HOME environment variables are set}}
35
35
+home=/usr/lib/ec2-ami-tools
36
36
 ruby -I $home/lib ${home}/lib/ec2/amitools/deletebundle.rb $*
37
 
diff -Naur ec2-ami-tools-1.3-26357.orig/bin/ec2-download-bundle ec2-ami-tools-1.3-26357/bin/ec2-download-bundle
38
 
--- ec2-ami-tools-1.3-26357.orig/bin/ec2-download-bundle        2008-10-06 04:55:29.000000000 -0400
39
 
+++ ec2-ami-tools-1.3-26357/bin/ec2-download-bundle     2008-10-14 08:30:10.000000000 -0400
 
37
diff -Naur ec2-ami-tools-1.3-31057.orig/bin/ec2-download-bundle ec2-ami-tools-1.3-31057/bin/ec2-download-bundle
 
38
--- ec2-ami-tools-1.3-31057.orig/bin/ec2-download-bundle        2008-12-29 12:49:39.000000000 -0500
 
39
+++ ec2-ami-tools-1.3-31057/bin/ec2-download-bundle     2009-01-15 09:58:08.000000000 -0500
40
40
@@ -1,4 +1,4 @@
41
41
 #!/bin/bash
42
42
 
43
43
-home=${EC2_AMITOOL_HOME:-${EC2_HOME:?Neither of EC2_AMITOOL_HOME or EC2_HOME environment variables are set}}
44
44
+home=/usr/lib/ec2-ami-tools
45
45
 ruby -I $home/lib ${home}/lib/ec2/amitools/downloadbundle.rb $*
46
 
diff -Naur ec2-ami-tools-1.3-26357.orig/bin/ec2-unbundle ec2-ami-tools-1.3-26357/bin/ec2-unbundle
47
 
--- ec2-ami-tools-1.3-26357.orig/bin/ec2-unbundle       2008-10-06 04:55:29.000000000 -0400
48
 
+++ ec2-ami-tools-1.3-26357/bin/ec2-unbundle    2008-10-14 08:30:21.000000000 -0400
 
46
diff -Naur ec2-ami-tools-1.3-31057.orig/bin/ec2-migrate-bundle ec2-ami-tools-1.3-31057/bin/ec2-migrate-bundle
 
47
--- ec2-ami-tools-1.3-31057.orig/bin/ec2-migrate-bundle 2008-12-29 12:49:39.000000000 -0500
 
48
+++ ec2-ami-tools-1.3-31057/bin/ec2-migrate-bundle      2009-01-15 09:58:49.000000000 -0500
 
49
@@ -1,4 +1,4 @@
 
50
 #!/bin/bash
 
51
 
 
52
-home=${EC2_AMITOOL_HOME:-${EC2_HOME:?Neither of EC2_AMITOOL_HOME or EC2_HOME environment variables are set}}
 
53
+home=/usr/lib/ec2-ami-tools
 
54
 ruby -I $home/lib ${home}/lib/ec2/amitools/migratebundle.rb $*
 
55
diff -Naur ec2-ami-tools-1.3-31057.orig/bin/ec2-migrate-manifest ec2-ami-tools-1.3-31057/bin/ec2-migrate-manifest
 
56
--- ec2-ami-tools-1.3-31057.orig/bin/ec2-migrate-manifest       2008-12-29 12:49:39.000000000 -0500
 
57
+++ ec2-ami-tools-1.3-31057/bin/ec2-migrate-manifest    2009-01-15 09:58:38.000000000 -0500
 
58
@@ -1,4 +1,4 @@
 
59
 #!/bin/bash
 
60
 
 
61
-home=${EC2_AMITOOL_HOME:-${EC2_HOME:?Neither of EC2_AMITOOL_HOME or EC2_HOME environment variables are set}}
 
62
+home=/usr/lib/ec2-ami-tools
 
63
 ruby -I $home/lib ${home}/lib/ec2/amitools/migratemanifest.rb $*
 
64
diff -Naur ec2-ami-tools-1.3-31057.orig/bin/ec2-unbundle ec2-ami-tools-1.3-31057/bin/ec2-unbundle
 
65
--- ec2-ami-tools-1.3-31057.orig/bin/ec2-unbundle       2008-12-29 12:49:39.000000000 -0500
 
66
+++ ec2-ami-tools-1.3-31057/bin/ec2-unbundle    2009-01-15 09:58:08.000000000 -0500
49
67
@@ -1,4 +1,4 @@
50
68
 #!/bin/bash
51
69
 
52
70
-home=${EC2_AMITOOL_HOME:-${EC2_HOME:?Neither of EC2_AMITOOL_HOME or EC2_HOME environment variables are set}}
53
71
+home=/usr/lib/ec2-ami-tools
54
72
 ruby -I $home/lib ${home}/lib/ec2/amitools/unbundle.rb $*
55
 
diff -Naur ec2-ami-tools-1.3-26357.orig/bin/ec2-upload-bundle ec2-ami-tools-1.3-26357/bin/ec2-upload-bundle
56
 
--- ec2-ami-tools-1.3-26357.orig/bin/ec2-upload-bundle  2008-10-06 04:55:29.000000000 -0400
57
 
+++ ec2-ami-tools-1.3-26357/bin/ec2-upload-bundle       2008-10-14 08:30:37.000000000 -0400
 
73
diff -Naur ec2-ami-tools-1.3-31057.orig/bin/ec2-upload-bundle ec2-ami-tools-1.3-31057/bin/ec2-upload-bundle
 
74
--- ec2-ami-tools-1.3-31057.orig/bin/ec2-upload-bundle  2008-12-29 12:49:39.000000000 -0500
 
75
+++ ec2-ami-tools-1.3-31057/bin/ec2-upload-bundle       2009-01-15 09:58:08.000000000 -0500
58
76
@@ -1,4 +1,4 @@
59
77
 #!/bin/bash
60
78