Add changelog entries for Ubuntu

diff --git a/debian/changelog b/debian/changelog
index e877ec3405676ea945741ed8fb534aec71f8650c..f3c4c65ca5fcf408036ec841fa17e5d3eaa1c3be 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,14 @@ lilo (1:23.1-1) unstable; urgency=low
     - Include diffs for NMUs. (Closes: #504267, #409663)
     - Fix error with LVM partition. (Closes: #244741)
     - Compatible with devmapper version. (Closes: #325235)
+  * Solved upstream bugs of Ubuntu:
+    - Raid related error while upgrading (LP: #242879)
+    - Warn if initrd is too large (LP: #260059)
+    - Allow using LVM as root partition (LP: #274972)
+    - Stack overlaping on second stage (LP: #438177)
+    - Raid setup fatal errors (LP: #470502)
+    - Use hook scripts while updating kernel/initrd 
+      (LP: #43869, #345482, #628858, #636211, #691975)
 
   * Remove all old patches.
   * Remove very old lilo.conf examples.
@@ -53,7 +61,7 @@ lilo (1:23.1-1) unstable; urgency=low
   * Remove obsolete file debian/NEWS.
   * Remove obsolete debian/TODO file.
   * Remove obsolete debian/lilo.changelogs file.
-  * Add patchset for use in Ubuntu.
+  * Add patchset and changelog entries for use in Ubuntu.
 
   * debconf files:
     - Remove message above old bitmap path. (Closes: #304065)
@@ -79,6 +87,14 @@ lilo (1:22.8-10) unstable; urgency=low
 
  -- Joachim Wiedorn <ad_debian@joonet.de>  Tue, 14 Dec 2010 18:02:55 +0100
 
+lilo (1:22.8-9ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable (LP: #690090). Remaining changes:
+    - 03_boot-prompt.patch, 03_lilo-version.patch: Change Debian branding to
+      Ubuntu.
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Tue, 14 Dec 2010 12:58:18 +0100
+
 lilo (1:22.8-9) unstable; urgency=low
 
   * New maintainer.
@@ -106,6 +122,14 @@ lilo (1:22.8-9) unstable; urgency=low
 
  -- Joachim Wiedorn <ad_debian@joonet.de>  Fri, 10 Dec 2010 22:21:25 +0100
 
+lilo (1:22.8-8.3ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable (LP: #669363). Remaining change:
+    - 03_boot-prompt.patch, 03_lilo-version.patch: Change Debian branding to
+      Ubuntu.
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Mon, 01 Nov 2010 14:15:56 +0530
+
 lilo (1:22.8-8.3) unstable; urgency=high
 
   * Non-maintainer upload.
@@ -136,6 +160,15 @@ lilo (1:22.8-8.1) unstable; urgency=low
 
  -- Christian Perrier <bubulle@debian.org>  Mon, 14 Sep 2009 19:54:16 +0200
 
+lilo (1:22.8-8ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #409321
+    - debian/control: Build for lpia, too.
+    - 03_boot-prompt.patch, 03_lilo-version.patch: Change Debian branding to
+      Ubuntu.
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Wed, 05 Aug 2009 18:43:40 +0530
+
 lilo (1:22.8-8) unstable; urgency=low
 
   * Fix some more bashisms. (Closes: #535399)
@@ -144,6 +177,15 @@ lilo (1:22.8-8) unstable; urgency=low
 
  -- William Pitcock <nenolod@dereferenced.org>  Sat, 01 Aug 2009 15:54:10 -0500
 
+lilo (1:22.8-7ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes: (LP: #304346)
+    - debian/control: Build for lpia, too.
+    - 03_boot-prompt.patch, 03_lilo-version.patch: Change Debian branding to
+      Ubuntu.
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Tue, 02 Dec 2008 16:26:42 +0530
+
 lilo (1:22.8-7) unstable; urgency=low
 
   [ William Pitcock ]
@@ -162,6 +204,15 @@ lilo (1:22.8-7) unstable; urgency=low
 
  -- William Pitcock <nenolod@dereferenced.org>  Sat, 15 Nov 2008 11:01:59 -0600
 
+lilo (1:22.8-6.4ubuntu1) jaunty; urgency=low
+
+  * Merge with Debian unstable. Remaining Ubuntu changes:
+    - debian/control: Build for lpia, too.
+    - 03_boot-prompt.patch, 03_lilo-version.patch: Change Debian branding to
+      Ubuntu.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 04 Nov 2008 12:08:07 +0100
+
 lilo (1:22.8-6.4) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -258,7 +309,7 @@ lilo (1:22.8-2) testing-proposed-updates; urgency=medium
     - Added again and updated to avoid checking '/dev/fd'.
       (Closes: #409994)
 
- -- AndrÃ\83©s RoldÃ\83¡n <aroldan@debian.org>  Thu, 15 Mar 2007 13:47:26 +0000
+ -- Andrés Roldán <aroldan@debian.org>  Thu, 15 Mar 2007 13:47:26 +0000
 
 lilo (1:22.8-1.1) unstable; urgency=low
 
@@ -284,7 +335,7 @@ lilo (1:22.8-1) unstable; urgency=low
   * debian/patches/17_dont_scan_udev.dpatch:
     - Not longer applied as upstream already managed this problem.
 
- -- AndrÃ\83©s RoldÃ\83¡n <aroldan@debian.org>  Thu, 22 Feb 2007 22:52:37 +0000
+ -- Andrés Roldán <aroldan@debian.org>  Thu, 22 Feb 2007 22:52:37 +0000
  
 lilo (1:22.7.3-1.4) unstable; urgency=low