Update of some patches; remove of some patches

[rrq/maintain_lilo.git] / debian / patches / 02_lilo-version-ubuntu.patch

diff --git a/debian/patches/02_lilo-version-ubuntu.patch b/debian/patches/02_lilo-version-ubuntu.patch
index a8dce931fb468451a919f64d080d54e423f0a742..197984a942c4ae7424974512244a048fc30a37eb 100644 (file)
--- a/debian/patches/02_lilo-version-ubuntu.patch
+++ b/debian/patches/02_lilo-version-ubuntu.patch
@@ -2,13 +2,13 @@ Package:     lilo
 Subject:     add lilo version for Ubuntu
 Author:      Joachim Wiedorn <ad_debian at joonet.de>
 Forwarded:   no
-Last-Update: 2011-01-28
+Last-Update: 2011-05-06
 
 ---
 
 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
++++ s02/src/crt.S      2011-05-06 17:26:25.856704412 +0200
 @@ -694,7 +694,7 @@
  
  
@@ -19,21 +19,23 @@ diff -urN s01/src/crt.S s02/src/crt.S
  #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 @@
-           }
+--- s01/src/lilo.c     2011-04-09 18:40:33.000000000 +0200
++++ s02/src/lilo.c     2011-05-06 17:28:53.484698617 +0200
+@@ -824,7 +824,8 @@
+         else
+           printf(" (released %s)\n", VERSION_DATE);
+         if (version && verbose<=0) {
+-          /* exit if user asks for version and no verbose */
++          /* user asks for version without verbose */
++          printf ("(Ubuntu GNU/Linux)\n");
+           return 0;
+         }
+         printf("  * Copyright (C) 1992-1998 Werner Almesberger  (until v20)\n"
+@@ -847,6 +848,7 @@
+           }
  #endif
-       }
-+        printf ("Ubuntu GNU/Linux\n");
+         }
++        printf("Ubuntu GNU/Linux\n");
          printf("\n");
          if (version) {
              if (verbose>=2) configuration();