[kernel] r9184 - in dists/trunk/linux-2.6/debian/patches: debian series

[Maximilian Attems]

Author: maks
Date: Mon Jul 23 13:52:05 2007
New Revision: 9184

Log:
urrgs overseen needs more cleanup,
don't understand the sym_ok snippet so leaving that reject:
patching file scripts/kconfig/confdata.c
Hunk #1 FAILED at 338.


Modified:
   dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Modified: dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch	Mon Jul 23 13:52:05 2007
@@ -24,9 +24,9 @@
 +updateoldconfig: $(obj)/conf
 +	$< -U arch/$(ARCH)/Kconfig
 +
- update-po-config: $(obj)/kxgettext
- 	xgettext --default-domain=linux \
-           --add-comments --keyword=_ --keyword=N_ \
+ # Create new linux.po file
+ # Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files
+ # The symlink is used to repair a deficiency in arch/um
 diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
 index 4dcb886..b5e1b25 100644
 --- a/scripts/kconfig/conf.c

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Mon Jul 23 13:52:05 2007
@@ -1,7 +1,7 @@
 + debian/version.patch
 + debian/kernelvariables.patch
 + debian/doc-build-parallel.patch
-+ debian/scripts-kconfig-reportoldconfig.patch
+#+ debian/scripts-kconfig-reportoldconfig.patch
 + debian/powerpc-mkvmlinuz-support-ppc.patch
 #+ debian/powerpc-mkvmlinuz-support-powerpc.patch