From: Joachim Wiedorn <ad_debian@joonet.de>
Date: Fri, 11 Mar 2011 19:37:15 +0000 (+0100)
Subject: Remove debconf code for old files check
X-Git-Tag: debian/23.1-2~20
X-Git-Url: https://git.rrq.au/?a=commitdiff_plain;h=39c1ff5363544b01a5f8bad13500f91f2818c400;p=rrq%2Fmaintain_lilo.git

Remove debconf code for old files check
---

diff --git a/debian/changelog b/debian/changelog
index 8d7a50d..5338b11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ lilo (1:23.1-2) unstable; urgency=low
   * debconf scripts:
     - Fix typos in some debconf translation files. (Closes: #504733)
     - Use better style in debconf translations. (Closes: #312451, #504733)
+    - Remove debconf code for managing old boot/boot.b and similar files.
 
- -- Joachim Wiedorn <ad_debian@joonet.de>  Thu, 03 Mar 2011 22:22:54 +0100
+ -- Joachim Wiedorn <ad_debian@joonet.de>  Thu, 06 Mar 2011 12:55:03 +0100
 
 lilo (1:23.1-1) unstable; urgency=low
 
diff --git a/debian/lilo.config b/debian/lilo.config
index d4d69b6..440c282 100644
--- a/debian/lilo.config
+++ b/debian/lilo.config
@@ -39,14 +39,6 @@ else
 		db_endblock
 		db_go
 	fi
-
-	if [ -e /boot/boot.b ]; then	
-		have_to_run=1
-		db_beginblock
-		db_text high lilo/upgrade || true
-		db_endblock
-		db_go
-	fi
 fi
 
 if [ x"$have_to_run" != x"0" ]; then
diff --git a/debian/lilo.dirs b/debian/lilo.dirs
index ccc5c78..557e92c 100644
--- a/debian/lilo.dirs
+++ b/debian/lilo.dirs
@@ -3,6 +3,5 @@ usr/sbin
 usr/lib/lilo
 usr/share/pixmaps
 usr/share/lilo
-boot
 etc/initramfs
 etc/kernel
diff --git a/debian/lilo.templates b/debian/lilo.templates
index 87bda43..07ef5df 100644
--- a/debian/lilo.templates
+++ b/debian/lilo.templates
@@ -7,24 +7,6 @@ _Description: LILO configuration
  .
  LILO won't work if you don't do this. 
 
-Template: lilo/upgrade
-Type: note
-_Description: Deprecated parameters in LILO configuration
- Deprecated files have been found on your system.
- You must update the 'install=' parameter in your LILO configuration file
- (/etc/lilo.conf) in order to properly upgrade the package.
- .
- The new 'install=' options are:
- .
-  new: install=bmp
-  old: install=/boot/boot-bmp.b
- .
-  new: install=text
-  old: install=/boot/boot-text.b
- .
-  new: install=menu
-  old: install=/boot/boot-menu.b or boot.b
-
 Template: lilo/add_large_memory
 Type: boolean
 Default: false