[Python-apps-commits] r8603 - in packages/cloud-init/trunk/debian (3 files)

[plessy at users.alioth.debian.org]

    Date: Thursday, May 3, 2012 @ 05:30:21
  Author: plessy
Revision: 8603

Remove ec2-init package and support for upgrade.

In my understanding, since Ubuntu 12.04 is a LTS, since ec2-init is an empty
package there, and since upgraded skipping a LTS are not supported, the removed
part are not necessary anymore in Ubuntu.

Modified:
  packages/cloud-init/trunk/debian/changelog
  packages/cloud-init/trunk/debian/cloud-init.preinst
  packages/cloud-init/trunk/debian/control

Modified: packages/cloud-init/trunk/debian/changelog
===================================================================
--- packages/cloud-init/trunk/debian/changelog	2012-05-03 05:24:25 UTC (rev 8602)
+++ packages/cloud-init/trunk/debian/changelog	2012-05-03 05:30:21 UTC (rev 8603)
@@ -3,6 +3,7 @@
   * Debian package based on Ubuntu's package.
   * Machine-readable debian/copyright file; discarded extra information.
   * Documented homepage and VCS URLs in debian/control.
+  * Remove ec2-init package and support for upgrade.
 
  -- Charles Plessy <plessy at debian.org>  Thu, 03 May 2012 13:56:39 +0900
 

Modified: packages/cloud-init/trunk/debian/cloud-init.preinst
===================================================================
--- packages/cloud-init/trunk/debian/cloud-init.preinst	2012-05-03 05:24:25 UTC (rev 8602)
+++ packages/cloud-init/trunk/debian/cloud-init.preinst	2012-05-03 05:30:21 UTC (rev 8603)
@@ -107,13 +107,6 @@
 
 case "$1" in
 	install|upgrade)
-		# removing obsolete conffiles from the 'ec2-init' package
-		if dpkg --compare-versions "$2" le "0.5.1"; then
-			rm_conffile ec2-init "/etc/init/cloud-ssh-keygen.conf"
-		fi
-		if dpkg --compare-versions "$2" lt "0.5.3"; then
-			rm_conffile ec2-init "/etc/init/ec2init.conf"
-		fi
 		if [ "$2" = "0.5.7-0ubuntu1" ]; then
 			bad_d=/etc/update-motd.d/92-ec2-upgrade-available
 			rm_conffile cloud-init "${bad_d}/motd-hook"

Modified: packages/cloud-init/trunk/debian/control
===================================================================
--- packages/cloud-init/trunk/debian/control	2012-05-03 05:24:25 UTC (rev 8602)
+++ packages/cloud-init/trunk/debian/control	2012-05-03 05:30:21 UTC (rev 8603)
@@ -30,9 +30,6 @@
          python-yaml,
          ${misc:Depends},
          ${python:Depends}
-Provides: ec2-init
-Replaces: ec2-init (<<0.5.3)
-Conflicts: ec2-init (<<0.5.3)
 XB-Python-Version: ${python:Versions}
 Description: Init scripts for cloud instances
  Cloud instances need special scripts to run during initialisation
@@ -47,9 +44,3 @@
  EC2 instances that use grub-legacy as a bootloader need a way to keep
  /boot/grub/menu.lst up to date while not conflicting with grub-pc.
  This package provides that.
-
-Package: ec2-init
-Depends: cloud-init, ${misc:Depends}
-Architecture: all
-Description: package renamed -> cloud-init
- This package has been renamed to 'cloud-init'.