Merge lp:~bilalakhtar/ubuntu/maverick/ureadahead/fix-545596 into lp:ubuntu/maverick/ureadahead

[Bilal Akhtar]

This branch fixes bug #545596 .

[lp:~bilalakhtar/ubuntu/maverick/ureadahead/fix-545596]

11. By Bilal Akhtar on 2010-07-19

* Passed --sourcedir argument to dh_install
  * Removed dh_gencontrol calls for package sreadahead.

12. By Bilal Akhtar on 2010-07-19

Renamed install file

13. By Bilal Akhtar on 2010-07-19

Added changelog entry for previous commit

[Martin Pitt (pitti)]

Merged into natty branch, thanks! (With a few corrections, see bug report).

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-06-25 12:42:41 +0000
+++ debian/changelog	2010-07-19 11:37:45 +0000
@@ -1,3 +1,12 @@
+ureadahead (0.100.0-6) maverick; urgency=low
+
+  * Removed sreadahead transitional package and its postinst, postrm,
+    preinst and install files. (LP: #545596)
+  * Passed --sourcedir argument to dh_install
+  * Removed dh_gencontrol calls for package sreadahead.
+
+ -- Bilal Akhtar <[e-mail]>  Mon, 19 Jul 2010 17:04:28 +0530
+
 ureadahead (0.100.0-5) maverick; urgency=low
 
   * src/pack.c: Amend mount point detection logic to stat the mount point

=== modified file 'debian/control'
--- debian/control	2010-02-17 12:57:00 +0000
+++ debian/control	2010-07-19 11:37:45 +0000
@@ -22,9 +22,3 @@
  .
  ureadahead requires a kernel patch included in the Ubuntu kernel.
 
-Package: sreadahead
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ureadahead
-Description: Transitional package for ureadahead
- sreadahead has been replaced by ureadahead, this package ensures
- that you are transitioned over and may be safely removed.

=== modified file 'debian/rules'
--- debian/rules	2009-12-01 02:25:50 +0000
+++ debian/rules	2010-07-19 11:37:45 +0000
@@ -21,13 +21,10 @@
 
 
 override_dh_install:
-	dh_install
+	dh_install --sourcedir=debian/ureadahead
 	install debian/ureadahead.apport \
 		debian/ureadahead/usr/share/apport/package-hooks/ureadahead.py
 
 
 version := $(shell sed -e '1{;s|^ureadahead (\(.*\))\ .*|\1|;q;}' debian/changelog)
 
-override_dh_gencontrol:
-	dh_gencontrol -psreadahead -u-v1:$(version)
-	dh_gencontrol -Nsreadahead

=== removed file 'debian/sreadahead.postinst'
--- debian/sreadahead.postinst	2009-11-09 18:38:51 +0000
+++ debian/sreadahead.postinst	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-#!/bin/sh -e
-# This script can be called in the following ways:
-#
-# After the package was installed:
-#	<postinst> configure <old-version>
-#
-# After a trigger is activated:
-#       <postinst> triggered <trigger-name>...
-#
-#
-# If prerm fails during upgrade or fails on failed upgrade:
-#	<old-postinst> abort-upgrade <new-version>
-#
-# If prerm fails during deconfiguration of a package:
-#	<postinst> abort-deconfigure in-favour <new-package> <version>
-#	           removing <old-package> <version>
-#
-# If prerm fails during replacement due to conflict:
-#	<postinst> abort-remove in-favour <new-package> <version>
-
-
-# Remove a no-longer used conffile
-rm_conffile()
-{
-    CONFFILE="$1"
-
-    if [ -e "$CONFFILE".dpkg-obsolete ]; then
-	echo "Removing obsolete conffile $CONFFILE"
-	rm -f "$CONFFILE".dpkg-obsolete
-    fi
-}
-
-
-case "$1" in
-    configure)
-	rm_conffile /etc/init/sreadahead.conf
-	rm_conffile /etc/cron.monthly/sreadahead
-
-	if [ -f /var/lib/sreadahead/pack ]; then
-            rm -f /var/lib/sreadahead/pack || true
-            rmdir /var/lib/sreadahead || true
-	fi
-	;;
-
-    abort-upgrade|abort-deconfigure|abort-remove)
-	;;
-
-    *)
-	echo "$0 called with unknown argument \`$1'" 1>&2
-	exit 1
-	;;
-esac
-
-#DEBHELPER#
-exit 0

=== removed file 'debian/sreadahead.postrm'
--- debian/sreadahead.postrm	2009-11-09 18:38:51 +0000
+++ debian/sreadahead.postrm	1970-01-01 00:00:00 +0000
@@ -1,80 +0,0 @@
-#!/bin/sh -e
-# This script can be called in the following ways:
-#
-# After the package was removed:
-#	<postrm> remove
-#
-# After the package was purged:
-#	<postrm> purge
-#
-# After the package was upgraded:
-#	<old-postrm> upgrade <new-version>
-# if that fails:
-#	<new-postrm> failed-upgrade <old-version>
-#
-#
-# After all of the packages files have been replaced:
-#	<postrm> disappear <overwriting-package> <version>
-#
-#
-# If preinst fails during install:
-#	<new-postrm> abort-install
-#
-# If preinst fails during upgrade of removed package:
-#	<new-postrm> abort-install <old-version>
-#
-# If preinst fails during upgrade:
-#	<new-postrm> abort-upgrade <old-version>
-
-
-# Undo removal of a no-longer used conffile
-undo_rm_conffile()
-{
-    CONFFILE="$1"
-
-    if [ ! -e "$CONFFILE" ]; then
-	if [ -e "$CONFFILE".dpkg-bak ]; then
-	    echo "Restoring modified conffile $CONFFILE"
-	    mv -f "$CONFFILE".dpkg-bak "$CONFFILE"
-	elif [ -e "$CONFFILE".dpkg-obsolete ]; then
-	    mv -f "$CONFFILE".dpkg-obsolete "$CONFFILE"
-	fi
-    fi
-}
-
-# Finish removal of a no-longer used conffile
-finish_rm_conffile()
-{
-    CONFFILE="$1"
-
-    if [ -e "$CONFFILE".dpkg-bak ]; then
-	rm -f "$CONFFILE".dpkg-bak
-    fi
-}
-
-
-case "$1" in
-    remove)
-	;;
-
-    purge)
-    	finish_rm_conffile /etc/init/sreadahead.conf
-    	finish_rm_conffile /etc/cron.monthly/sreadahead
-	;;
-
-    upgrade|failed-upgrade|disappear)
-	;;
-
-    abort-install|abort-upgrade)
-    	undo_rm_conffile /etc/init/sreadahead.conf
-    	undo_rm_conffile /etc/cron.monthly/sreadahead
-	;;
-
-    *)
-	echo "$0 called with unknown argument \`$1'" 1>&2
-	exit 1
-	;;
-esac
-
-#DEBHELPER#
-exit 0

=== removed file 'debian/sreadahead.preinst'
--- debian/sreadahead.preinst	2009-11-09 18:38:51 +0000
+++ debian/sreadahead.preinst	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-#!/bin/sh -e
-# This script can be called in the following ways:
-#
-# Before the package is installed:
-#	<new-preinst> install
-#
-# Before removed package is upgraded:
-#	<new-preinst> install <old-version>
-#
-# Before the package is upgraded:
-#	<new-preinst> upgrade <old-version>
-#
-#
-# If postrm fails during upgrade or fails on failed upgrade:
-#	<old-preinst> abort-upgrade <new-version>
-
-
-# Prepare to remove a no-longer used conffile
-prep_rm_conffile()
-{
-    CONFFILE="$1"
-
-    if [ -e "$CONFFILE" ]; then
-        md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
-        old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE '{s/ obsolete$//;s/.* //;p}}\" /var/lib/dpkg/status`"
-        if [ "$md5sum" != "$old_md5sum" ]; then
-            echo "Obsolete conffile $CONFFILE has been modified by you, renaming to .dpkg-bak"
-            mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
-	else
-	    mv -f "$CONFFILE" "$CONFFILE".dpkg-obsolete
-	fi
-    fi
-}
-
-
-case "$1" in
-    install|upgrade)
-	prep_rm_conffile /etc/init/sreadahead.conf
-	prep_rm_conffile /etc/cron.monthly/sreadahead
-	;;
-
-    abort-upgrade)
-	;;
-
-    *)
-	echo "$0 called with unknown argument \`$1'" 1>&2
-	exit 1
-	;;
-esac
-
-#DEBHELPER#
-exit 0

=== removed file 'debian/ureadahead.install'
--- debian/ureadahead.install	2009-12-01 02:25:50 +0000
+++ debian/ureadahead.install	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-etc/init
-sbin/ureadahead
-usr/share/man/man8/ureadahead.8