diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/00_autoconf_update.patch | 2 | ||||
| -rw-r--r-- | debian/patches/12_fixes_gcc-3.4.patch | 18 |
3 files changed, 9 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog index bde6743..51d5fbc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ gnumach (1:20040915.dfsg.1-2) UNRELEASED; urgency=low * Fix a typo in natsemi driver enable command. (Closes: #293950) Thanks to Regis Boudin <regis.boudin@gmail.com>. + * Sync patches with latest ones sent to upstream. -- Guillem Jover <guillem@debian.org> Mon, 7 Feb 2005 07:37:48 +0100 diff --git a/debian/patches/00_autoconf_update.patch b/debian/patches/00_autoconf_update.patch index aae2454..644cb02 100644 --- a/debian/patches/00_autoconf_update.patch +++ b/debian/patches/00_autoconf_update.patch @@ -290,7 +290,7 @@ diff -Naur gnumach-20040915.orig/Drivers.macros gnumach-20040915/Drivers.macros -AC_ARG_ENABLE([$1],, -enable_[$2]="$enable_[$1]" +AC_ARG_ENABLE([$1], -+ AS_HELP_STRING([--enable-$1], [enable driver alias $1]), ++ AS_HELP_STRING([--enable-$1], [enable driver alias $1 for $2]), + [enable_$2="$enable_$1"] )]) diff --git a/debian/patches/12_fixes_gcc-3.4.patch b/debian/patches/12_fixes_gcc-3.4.patch index 6833b4d..f705552 100644 --- a/debian/patches/12_fixes_gcc-3.4.patch +++ b/debian/patches/12_fixes_gcc-3.4.patch @@ -1,6 +1,6 @@ #DPATCHLEVEL=1 -2004-09-15 Guillem Jover <guillem@hadrons.org> +2005-01-10 Guillem Jover <guillem@hadrons.org> * linux/dev/include/linux/skbuff.h (skb_put, skb_push): Fix errors for deprecated use of labels at end of compound statements. @@ -10,23 +10,19 @@ diff -Naur gnumach-20040229.orig/linux/dev/include/linux/skbuff.h gnumach-20040229/linux/dev/include/linux/skbuff.h --- gnumach-20040229.orig/linux/dev/include/linux/skbuff.h 26 Apr 1999 05:48:00 -0000 1.1 +++ gnumach-20040229/linux/dev/include/linux/skbuff.h 15 Sep 2004 12:52:34 -0000 -@@ -405,8 +405,8 @@ - if(skb->tail>skb->end) - { +@@ -407,6 +407,7 @@ __label__ here; -- panic("skput:over: %p:%d", &&here,len); + panic("skput:over: %p:%d", &&here,len); here: -+ panic("skput:over: %p:%d", &&here,len); ++ ; } return tmp; } -@@ -418,8 +418,8 @@ - if(skb->data<skb->head) - { +@@ -420,6 +421,7 @@ __label__ here; -- panic("skpush:under: %p:%d", &&here,len); + panic("skpush:under: %p:%d", &&here,len); here: -+ panic("skpush:under: %p:%d", &&here,len); ++ ; } return skb->data; } |