[Initscripts-ng-commits] r1059 - in /trunk/src/insserv/debian: changelog patches/92_m68k_alignment.patch

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Fri May  7 07:24:23 2010
New Revision: 1059

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=1059
Log:
Modify 92_m68k_alignment.patch so that the define is grouped in an
area of code which other similar defines live.

Modified:
    trunk/src/insserv/debian/changelog
    trunk/src/insserv/debian/patches/92_m68k_alignment.patch

Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=1059&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Fri May  7 07:24:23 2010
@@ -10,13 +10,15 @@
   * Add 30_interactive_regexp_match_fix.patch which fixes failure to
     properly match the correct group in the regular expression used on
     the X-Interactive keyword. (Closes: #580564)
+  * Modify 92_m68k_alignment.patch so that the define is grouped in an
+    area of code which other similar defines live.
 
   [ Petter Reinholdtsen ]
   * Improve the output from make-testsuite. 
   * Adjust the test_x_interactive behaviour to make sure it fails with
     a fatal error if X-Interactive: true do not work.
 
- -- Kel Modderman <kel at otaku42.de>  Fri, 07 May 2010 17:20:47 +1000
+ -- Kel Modderman <kel at otaku42.de>  Fri, 07 May 2010 17:22:58 +1000
 
 insserv (1.14.0-1) unstable; urgency=low
 

Modified: trunk/src/insserv/debian/patches/92_m68k_alignment.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/92_m68k_alignment.patch?rev=1059&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/92_m68k_alignment.patch (original)
+++ trunk/src/insserv/debian/patches/92_m68k_alignment.patch Fri May  7 07:24:23 2010
@@ -5,14 +5,14 @@
 ---
 --- a/insserv.c
 +++ b/insserv.c
-@@ -151,6 +151,10 @@ static boolean dryrun = false;
- static boolean set_override = false;
- static boolean set_insconf = false;
+@@ -53,6 +53,10 @@
+ #endif /* SUSE */
+ #include "listing.h"
  
 +#ifdef __m68k__ /* Fix #493637 */
 +#  define aligned(a)
 +#endif
 +
- /* Search results points here */
- typedef struct lsb_struct {
-     char *provides;
+ #if defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 600
+ # ifndef POSIX_FADV_SEQUENTIAL
+ #  define posix_fadvise(fd, off, len, adv)  (-1)