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

[plessy at users.alioth.debian.org]

    Date: Thursday, May 3, 2012 @ 13:29:33
  Author: plessy
Revision: 8607

Disable diversion of ureadahead, which is not packaged in Debian.

Modified:
  packages/cloud-init/trunk/debian/changelog
  packages/cloud-init/trunk/debian/cloud-init.postinst
  packages/cloud-init/trunk/debian/cloud-init.postrm
Deleted:
  packages/cloud-init/trunk/debian/cloud-init.lintian-overrides

Modified: packages/cloud-init/trunk/debian/changelog
===================================================================
--- packages/cloud-init/trunk/debian/changelog	2012-05-03 05:54:54 UTC (rev 8606)
+++ packages/cloud-init/trunk/debian/changelog	2012-05-03 13:29:33 UTC (rev 8607)
@@ -10,6 +10,7 @@
     - Build-depend on CDBS >= 0.4.90~.
     - Removed XS-Python-Version and XB-Python-Version in debian/control.
   * Use Debhelper 9 (debian/control, debian/compat). 
+  * Disable diversion of ureadahead, which is not packaged in Debian. 
 
  -- Charles Plessy <plessy at debian.org>  Thu, 03 May 2012 13:56:39 +0900
 

Deleted: packages/cloud-init/trunk/debian/cloud-init.lintian-overrides
===================================================================
--- packages/cloud-init/trunk/debian/cloud-init.lintian-overrides	2012-05-03 05:54:54 UTC (rev 8606)
+++ packages/cloud-init/trunk/debian/cloud-init.lintian-overrides	2012-05-03 13:29:33 UTC (rev 8607)
@@ -1,3 +0,0 @@
-# this explicitly diverts ureadahead.conf in ureadahead package
-# see LP: #499520 for more discussion
-cloud-init binary: diversion-for-unknown-file

Modified: packages/cloud-init/trunk/debian/cloud-init.postinst
===================================================================
--- packages/cloud-init/trunk/debian/cloud-init.postinst	2012-05-03 05:54:54 UTC (rev 8606)
+++ packages/cloud-init/trunk/debian/cloud-init.postinst	2012-05-03 13:29:33 UTC (rev 8607)
@@ -115,9 +115,6 @@
 }
 
 if [ "$1" = "configure" ]; then
-   # disable ureadahead (LP: #499520)
-   dpkg-divert --package cloud-init --rename --divert \
-      /etc/init/ureadahead.conf.disabled --add /etc/init/ureadahead.conf
    if db_get cloud-init/datasources; then
       values="$RET"
       if [ "${values#*MaaS}" != "${values}" ]; then

Modified: packages/cloud-init/trunk/debian/cloud-init.postrm
===================================================================
--- packages/cloud-init/trunk/debian/cloud-init.postrm	2012-05-03 05:54:54 UTC (rev 8606)
+++ packages/cloud-init/trunk/debian/cloud-init.postrm	2012-05-03 13:29:33 UTC (rev 8607)
@@ -7,8 +7,6 @@
       rm -f /etc/cloud/cloud.cfg.d/90_dpkg.cfg
       ;;
    remove)
-      dpkg-divert --package cloud-init --remove --rename --divert \
-            /etc/init/ureadahead.conf.disabled /etc/init/ureadahead.conf
       rm -f /etc/cloud/cloud.cfg.d/90cloud-init-pipelining
       ;;
 esac