From: Joachim Wiedorn <ad_debian@joonet.de>
Date: Fri, 28 Jan 2011 23:40:34 +0000 (+0100)
Subject: Modify Debian-based patches
X-Git-Tag: debian/23.1-1~3
X-Git-Url: https://git.rrq.au/?a=commitdiff_plain;h=de31ed363248bad2da7d4466f638e8110515f8c9;p=rrq%2Fmaintain_lilo.git

Modify Debian-based patches
---

diff --git a/debian/patches/02_lilo-version-debian.patch b/debian/patches/02_lilo-version-debian.patch
index fc99084..0048a37 100644
--- a/debian/patches/02_lilo-version-debian.patch
+++ b/debian/patches/02_lilo-version-debian.patch
@@ -2,7 +2,7 @@ Package:     lilo
 Subject:     add lilo version for Debian
 Author:      Joachim Wiedorn <ad_debian at joonet.de>
 Forwarded:   no
-Last-Update: 2010-11-13
+Last-Update: 2011-01-28
 
 ---
 
@@ -25,7 +25,7 @@ diff -urN s01/src/lilo.c s02/src/lilo.c
         printf("LILO version %d.%d%s%s", VERSION_MAJOR, VERSION_MINOR,
  	      VERSION_EDIT, test ? " (test mode)" : "");
  	if (version && verbose<=0) {
-+	    printf (" (Debian)");
++	    printf (" (Debian GNU/Linux)");
  	    printf("\n");
  	    return 0;
  	}
@@ -33,7 +33,7 @@ diff -urN s01/src/lilo.c s02/src/lilo.c
  	    }
  #endif
  	}
-+        printf ("Debian\n");
++        printf ("Debian 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
new file mode 100644
index 0000000..57f1b3f
--- /dev/null
+++ b/debian/patches/03_keytab-lilo.8-debian-based.patch
@@ -0,0 +1,19 @@
+Package:     lilo
+Subject:     keytab-lilo.8 for Debian
+Author:      Joachim Wiedorn <ad_debian at joonet.de>
+Forwarded:   no
+Last-Update: 2010-11-11
+
+---
+
+diff -urN v03/man/keytab-lilo.8 v04/man/keytab-lilo.8
+--- v03/man/keytab-lilo.8	2010-06-28 22:41:18.000000000 +0200
++++ v04/man/keytab-lilo.8	2010-07-03 09:21:19.560354947 +0200
+@@ -100,3 +100,7 @@
+ .BR lilo (8),
+ .BR keytables (5),
+ .BR gzip (1)
++
++.B lilo
++comes with extensive documentation which can be found in
++/usr/share/doc/lilo/ on Debian systems.
diff --git a/debian/patches/03_keytab-lilo.8-debian.patch b/debian/patches/03_keytab-lilo.8-debian.patch
deleted file mode 100644
index 57f1b3f..0000000
--- a/debian/patches/03_keytab-lilo.8-debian.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Package:     lilo
-Subject:     keytab-lilo.8 for Debian
-Author:      Joachim Wiedorn <ad_debian at joonet.de>
-Forwarded:   no
-Last-Update: 2010-11-11
-
----
-
-diff -urN v03/man/keytab-lilo.8 v04/man/keytab-lilo.8
---- v03/man/keytab-lilo.8	2010-06-28 22:41:18.000000000 +0200
-+++ v04/man/keytab-lilo.8	2010-07-03 09:21:19.560354947 +0200
-@@ -100,3 +100,7 @@
- .BR lilo (8),
- .BR keytables (5),
- .BR gzip (1)
-+
-+.B lilo
-+comes with extensive documentation which can be found in
-+/usr/share/doc/lilo/ on Debian systems.
diff --git a/debian/patches/04_lilo.8-debian-based.patch b/debian/patches/04_lilo.8-debian-based.patch
new file mode 100644
index 0000000..b9fe990
--- /dev/null
+++ b/debian/patches/04_lilo.8-debian-based.patch
@@ -0,0 +1,19 @@
+Package:     lilo
+Subject:     lilo.8 for Debian
+Author:      Joachim Wiedorn <ad_debian at joonet.de>
+Forwarded:   no
+Last-Update: 2010-11-11
+
+---
+
+diff -urN v04/man/lilo.8 v05/man/lilo.8
+--- v04/man/lilo.8	2010-06-28 22:40:35.000000000 +0200
++++ v05/man/lilo.8	2010-07-03 09:25:47.995224569 +0200
+@@ -490,6 +490,7 @@
+ 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.
+ .SH "AUTHORS"
+ Werner Almesberger <almesber@lrc.epfl.ch> (versions 0 to 21)
+ .br
diff --git a/debian/patches/04_lilo.8-for-debian.patch b/debian/patches/04_lilo.8-for-debian.patch
deleted file mode 100644
index b9fe990..0000000
--- a/debian/patches/04_lilo.8-for-debian.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Package:     lilo
-Subject:     lilo.8 for Debian
-Author:      Joachim Wiedorn <ad_debian at joonet.de>
-Forwarded:   no
-Last-Update: 2010-11-11
-
----
-
-diff -urN v04/man/lilo.8 v05/man/lilo.8
---- v04/man/lilo.8	2010-06-28 22:40:35.000000000 +0200
-+++ v05/man/lilo.8	2010-07-03 09:25:47.995224569 +0200
-@@ -490,6 +490,7 @@
- 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.
- .SH "AUTHORS"
- Werner Almesberger <almesber@lrc.epfl.ch> (versions 0 to 21)
- .br
diff --git a/debian/patches/series b/debian/patches/series
index 91d30f0..fa3c5e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,7 @@
 01_makefile-adds.patch
 02_lilo-version-debian.patch
-03_keytab-lilo.8-debian.patch
-04_lilo.8-for-debian.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