r2644 - in trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches: . series

[maximilian attems]

Author: maks-guest
Date: 2005-03-08 13:49:59 +0100 (Tue, 08 Mar 2005)
New Revision: 2644

Added:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/docbook-allow-preprocessor-directives-between-kernel-doc-and-function.dpatch
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/docbook-fix-function-parameter-descriptin-in-fbmem.dpatch
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/docbook-move-kernel-doc-comment-next-to-function.dpatch
Removed:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/docbook-allow-preprocessor-directives-between-kernel-doc-and-function.patch
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/docbook-fix-function-parameter-descriptin-in-fbmem.patch
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/docbook-move-kernel-doc-comment-next-to-function.patch
Modified:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1
Log:
fix endings in dpatch


Copied: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/docbook-allow-preprocessor-directives-between-kernel-doc-and-function.dpatch (from rev 2643, trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/docbook-allow-preprocessor-directives-between-kernel-doc-and-function.patch)

Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/docbook-allow-preprocessor-directives-between-kernel-doc-and-function.patch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/docbook-allow-preprocessor-directives-between-kernel-doc-and-function.patch	2005-03-08 12:42:16 UTC (rev 2643)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/docbook-allow-preprocessor-directives-between-kernel-doc-and-function.patch	2005-03-08 12:49:59 UTC (rev 2644)
@@ -1,32 +0,0 @@
-
-From: Martin Waitz <tali@admingilde.org>
-
-Allow preprocessor directives between kernel-doc and function
-
-Signed-off-by: Martin Waitz <tali@admingilde.org>
-Signed-off-by: Andrew Morton <akpm@osdl.org>
----
-
- 25-akpm/scripts/kernel-doc |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff -puN scripts/kernel-doc~docbook-allow-preprocessor-directives-between-kernel-doc-and-function scripts/kernel-doc
---- 25/scripts/kernel-doc~docbook-allow-preprocessor-directives-between-kernel-doc-and-function	Thu Mar  3 16:55:20 2005
-+++ 25-akpm/scripts/kernel-doc	Thu Mar  3 16:55:20 2005
-@@ -1578,13 +1578,13 @@ sub process_state3_function($$) { 
-     my $x = shift;
-     my $file = shift;
- 
--    if ($x =~ m#\s*/\*\s+MACDOC\s*#io) {
-+    if ($x =~ m#\s*/\*\s+MACDOC\s*#io || ($x =~ /^#/ && $x !~ /^#define/)) {
- 	# do nothing
-     }
-     elsif ($x =~ /([^\{]*)/) {
-         $prototype .= $1;
-     }
--    if (($x =~ /\{/) || ($x =~ /\#/) || ($x =~ /;/)) {
-+    if (($x =~ /\{/) || ($x =~ /\#define/) || ($x =~ /;/)) {
-         $prototype =~ s@/\*.*?\*/@@gos;	# strip comments.
- 	$prototype =~ s@[\r\n]+@ @gos; # strip newlines/cr's.
- 	$prototype =~ s@^\s+@@gos; # strip leading spaces
-_

Copied: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/docbook-fix-function-parameter-descriptin-in-fbmem.dpatch (from rev 2643, trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/docbook-fix-function-parameter-descriptin-in-fbmem.patch)

Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/docbook-fix-function-parameter-descriptin-in-fbmem.patch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/docbook-fix-function-parameter-descriptin-in-fbmem.patch	2005-03-08 12:42:16 UTC (rev 2643)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/docbook-fix-function-parameter-descriptin-in-fbmem.patch	2005-03-08 12:49:59 UTC (rev 2644)
@@ -1,30 +0,0 @@
-
-From: Martin Waitz <tali@admingilde.org>
-
-Fix function parameter descriptin in fbmem
-
-Signed-off-by: Martin Waitz <tali@admingilde.org>
-Signed-off-by: Andrew Morton <akpm@osdl.org>
----
-
- 25-akpm/drivers/video/fbmem.c |    7 ++++---
- 1 files changed, 4 insertions(+), 3 deletions(-)
-
-diff -puN drivers/video/fbmem.c~docbook-fix-function-parameter-descriptin-in-fbmem drivers/video/fbmem.c
---- 25/drivers/video/fbmem.c~docbook-fix-function-parameter-descriptin-in-fbmem	Thu Mar  3 16:55:25 2005
-+++ 25-akpm/drivers/video/fbmem.c	Thu Mar  3 16:55:25 2005
-@@ -1211,9 +1211,10 @@ static int ofonly;
- 
- /**
-  * fb_get_options - get kernel boot parameters
-- * @name - framebuffer name as it would appear in
-- *         the boot parameter line
-- *         (video=<name>:<options>)
-+ * @name:   framebuffer name as it would appear in
-+ *          the boot parameter line
-+ *          (video=<name>:<options>)
-+ * @option: the option will be stored here
-  *
-  * NOTE: Needed to maintain backwards compatibility
-  */
-_

Copied: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/docbook-move-kernel-doc-comment-next-to-function.dpatch (from rev 2643, trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/docbook-move-kernel-doc-comment-next-to-function.patch)

Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/docbook-move-kernel-doc-comment-next-to-function.patch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/docbook-move-kernel-doc-comment-next-to-function.patch	2005-03-08 12:42:16 UTC (rev 2643)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/docbook-move-kernel-doc-comment-next-to-function.patch	2005-03-08 12:49:59 UTC (rev 2644)
@@ -1,36 +0,0 @@
-
-From: Martin Waitz <tali@admingilde.org>
-
-Move kernel-doc comment next to function
-
-Signed-off-by: Martin Waitz <tali@admingilde.org>
-Signed-off-by: Andrew Morton <akpm@osdl.org>
----
-
- 25-akpm/drivers/video/fbmem.c |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff -puN drivers/video/fbmem.c~docbook-move-kernel-doc-comment-next-to-function drivers/video/fbmem.c
---- 25/drivers/video/fbmem.c~docbook-move-kernel-doc-comment-next-to-function	Thu Mar  3 16:55:29 2005
-+++ 25-akpm/drivers/video/fbmem.c	Thu Mar  3 16:55:29 2005
-@@ -1248,6 +1248,9 @@ int fb_get_options(char *name, char **op
- 	return retval;
- }
- 
-+
-+extern const char *global_mode_option;
-+
- /**
-  *	video_setup - process command line options
-  *	@options: string of options
-@@ -1261,9 +1264,6 @@ int fb_get_options(char *name, char **op
-  *	Returns zero.
-  *
-  */
--
--extern const char *global_mode_option;
--
- int __init video_setup(char *options)
- {
- 	int i, global = 0;
-_

Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1	2005-03-08 12:42:16 UTC (rev 2643)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1	2005-03-08 12:49:59 UTC (rev 2644)
@@ -42,7 +42,7 @@
 + sparc64-hme-lockup.dpatch
 + amd64-int3-fix.dpatch
 + powerpc-pegasos-marvell.dpatch
-+ docbook-allow-preprocessor-directives-between-kernel-doc-and-function.patch
-+ docbook-fix-function-parameter-descriptin-in-fbmem.patch
-+ docbook-move-kernel-doc-comment-next-to-function.patch
++ docbook-allow-preprocessor-directives-between-kernel-doc-and-function.dpatch
++ docbook-fix-function-parameter-descriptin-in-fbmem.dpatch
++ docbook-move-kernel-doc-comment-next-to-function.dpatch