From 73d5f43480a6de570f447d46c68612eb00938550 Mon Sep 17 00:00:00 2001 From: Joachim Wiedorn Date: Sat, 29 Jan 2011 00:40:40 +0100 Subject: [PATCH] Add patchset for Ubuntu --- debian/changelog | 1 + debian/patches/02_lilo-version-ubuntu.patch | 39 +++++++++++++++++++ .../03_keytab-lilo.8-debian-based.patch | 6 +-- debian/patches/04_lilo.8-debian-based.patch | 6 +-- debian/patches/ubuntu.series | 11 ++++++ 5 files changed, 57 insertions(+), 6 deletions(-) create mode 100644 debian/patches/02_lilo-version-ubuntu.patch create mode 100644 debian/patches/ubuntu.series diff --git a/debian/changelog b/debian/changelog index 325dd0c..e877ec3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -53,6 +53,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. * debconf files: - Remove message above old bitmap path. (Closes: #304065) diff --git a/debian/patches/02_lilo-version-ubuntu.patch b/debian/patches/02_lilo-version-ubuntu.patch new file mode 100644 index 0000000..a8dce93 --- /dev/null +++ b/debian/patches/02_lilo-version-ubuntu.patch @@ -0,0 +1,39 @@ +Package: lilo +Subject: add lilo version for Ubuntu +Author: Joachim Wiedorn +Forwarded: no +Last-Update: 2011-01-28 + +--- + +diff -urN s01/src/crt.S s02/src/crt.S +--- s01/src/crt.S 2010-11-01 16:32:09.000000000 +0100 ++++ s02/src/crt.S 2010-11-05 00:30:35.183058179 +0100 +@@ -694,7 +694,7 @@ + + + str_title: +- .ascii "GNU/Linux - " ++ .ascii "Ubuntu - " + .ascii "LILO " + #ifdef LCF_VERSION + .ascii SA(VERSION_MAJOR) +diff -urN s01/src/lilo.c s02/src/lilo.c +--- s01/src/lilo.c 2010-06-28 23:29:23.000000000 +0200 ++++ s02/src/lilo.c 2010-11-05 00:29:44.219065803 +0100 +@@ -819,6 +819,7 @@ + printf("LILO version %d.%d%s%s", VERSION_MAJOR, VERSION_MINOR, + VERSION_EDIT, test ? " (test mode)" : ""); + if (version && verbose<=0) { ++ printf (" (Ubuntu GNU/Linux)"); + printf("\n"); + return 0; + } +@@ -843,6 +844,7 @@ + } + #endif + } ++ printf ("Ubuntu GNU/Linux\n"); + printf("\n"); + if (version) { + if (verbose>=2) configuration(); diff --git a/debian/patches/03_keytab-lilo.8-debian-based.patch b/debian/patches/03_keytab-lilo.8-debian-based.patch index 57f1b3f..ce85ad5 100644 --- a/debian/patches/03_keytab-lilo.8-debian-based.patch +++ b/debian/patches/03_keytab-lilo.8-debian-based.patch @@ -1,8 +1,8 @@ Package: lilo -Subject: keytab-lilo.8 for Debian +Subject: keytab-lilo.8 for Debian-based systems Author: Joachim Wiedorn Forwarded: no -Last-Update: 2010-11-11 +Last-Update: 2011-01-28 --- @@ -16,4 +16,4 @@ diff -urN v03/man/keytab-lilo.8 v04/man/keytab-lilo.8 + +.B lilo +comes with extensive documentation which can be found in -+/usr/share/doc/lilo/ on Debian systems. ++/usr/share/doc/lilo-doc/ on Debian-based systems. diff --git a/debian/patches/04_lilo.8-debian-based.patch b/debian/patches/04_lilo.8-debian-based.patch index b9fe990..f0fc6dd 100644 --- a/debian/patches/04_lilo.8-debian-based.patch +++ b/debian/patches/04_lilo.8-debian-based.patch @@ -1,8 +1,8 @@ Package: lilo -Subject: lilo.8 for Debian +Subject: lilo.8 for Debian-based systems Author: Joachim Wiedorn Forwarded: no -Last-Update: 2010-11-11 +Last-Update: 2011-01-28 --- @@ -13,7 +13,7 @@ diff -urN v04/man/lilo.8 v05/man/lilo.8 The lilo distribution comes with very extensive TeX documentation through Version 21. Text file README's in the source directory provide updates on more recent topics. -+This can be found in /usr/share/doc/lilo on Debian systems. ++This can be found in /usr/share/doc/lilo-doc/ on Debian-based systems. .SH "AUTHORS" Werner Almesberger (versions 0 to 21) .br diff --git a/debian/patches/ubuntu.series b/debian/patches/ubuntu.series new file mode 100644 index 0000000..fcf4139 --- /dev/null +++ b/debian/patches/ubuntu.series @@ -0,0 +1,11 @@ +01_makefile-adds.patch +02_lilo-version-ubuntu.patch +03_keytab-lilo.8-debian-based.patch +04_lilo.8-debian-based.patch +05_readme.disk-change.patch +06_notinteractive.patch +07_bad-partition-warn.patch +08_install-also-dat-files.patch +09_use-of-newer-debhelper.patch +10_add-info-about-h-option.patch +11_remove-obsolete-bios-workaround.patch -- 2.39.2