From 236826c2eb671d09626221d1f3453dd9746b41e7 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Tue, 24 Jul 2007 18:31:40 +0000
Subject: [PATCH] * debian/config: Move from debian/arch. *
 debian/bin/abicheck.py, debian/bin/abiupdate.py, debian/bin/kconfig.py,  
 debian/lib/python/debian_linux/gencontrol.py, debian/rules,  
 debian/rules.real: Use debian/config instead of debian/arch.

svn path=/dists/trunk/linux-2.6/; revision=9187
---
 debian/bin/abicheck.py                                 | 6 +++---
 debian/bin/abiupdate.py                                | 4 ++--
 debian/bin/kconfig.py                                  | 2 +-
 debian/{arch => config}/_vserver/config                | 0
 debian/{arch => config}/_xen/config                    | 0
 debian/{arch => config}/alpha/config                   | 0
 debian/{arch => config}/alpha/config.alpha-generic     | 0
 debian/{arch => config}/alpha/config.alpha-legacy      | 0
 debian/{arch => config}/alpha/config.alpha-smp         | 0
 debian/{arch => config}/alpha/defines                  | 0
 debian/{arch => config}/alpha/vserver/defines          | 0
 debian/{arch => config}/amd64/config                   | 0
 debian/{arch => config}/amd64/config.amd64             | 0
 debian/{arch => config}/amd64/defines                  | 0
 debian/{arch => config}/amd64/vserver/defines          | 0
 debian/{arch => config}/amd64/xen-vserver/defines      | 0
 debian/{arch => config}/amd64/xen/config               | 0
 debian/{arch => config}/amd64/xen/defines              | 0
 debian/{arch => config}/arm/config                     | 0
 debian/{arch => config}/arm/config.footbridge          | 0
 debian/{arch => config}/arm/config.iop32x              | 0
 debian/{arch => config}/arm/config.ixp4xx              | 0
 debian/{arch => config}/arm/config.versatile           | 0
 debian/{arch => config}/arm/defines                    | 0
 debian/{arch => config}/armel/config                   | 0
 debian/{arch => config}/armel/defines                  | 0
 debian/{arch => config}/config                         | 0
 debian/{arch => config}/defines                        | 0
 debian/{arch => config}/hppa/config                    | 0
 debian/{arch => config}/hppa/config.parisc             | 0
 debian/{arch => config}/hppa/config.parisc-smp         | 0
 debian/{arch => config}/hppa/config.parisc64           | 0
 debian/{arch => config}/hppa/config.parisc64-smp       | 0
 debian/{arch => config}/hppa/defines                   | 0
 debian/{arch => config}/i386/config                    | 0
 debian/{arch => config}/i386/config.486                | 0
 debian/{arch => config}/i386/config.686                | 0
 debian/{arch => config}/i386/config.686-bigmem         | 0
 debian/{arch => config}/i386/config.k7                 | 0
 debian/{arch => config}/i386/defines                   | 0
 debian/{arch => config}/i386/vserver/defines           | 0
 debian/{arch => config}/i386/xen-vserver/defines       | 0
 debian/{arch => config}/i386/xen/config                | 0
 debian/{arch => config}/i386/xen/defines               | 0
 debian/{arch => config}/ia64/config                    | 0
 debian/{arch => config}/ia64/config.itanium            | 0
 debian/{arch => config}/ia64/config.mckinley           | 0
 debian/{arch => config}/ia64/defines                   | 0
 debian/{arch => config}/ia64/vserver/defines           | 0
 debian/{arch => config}/m68k/README.build              | 0
 debian/{arch => config}/m68k/config                    | 0
 debian/{arch => config}/m68k/config.amiga              | 0
 debian/{arch => config}/m68k/config.atari              | 0
 debian/{arch => config}/m68k/config.bvme6000           | 0
 debian/{arch => config}/m68k/config.hp                 | 0
 debian/{arch => config}/m68k/config.mac                | 0
 debian/{arch => config}/m68k/config.mvme147            | 0
 debian/{arch => config}/m68k/config.mvme16x            | 0
 debian/{arch => config}/m68k/config.q40                | 0
 debian/{arch => config}/m68k/config.sun3               | 0
 debian/{arch => config}/m68k/defines                   | 0
 debian/{arch => config}/mips/config                    | 0
 debian/{arch => config}/mips/config.4kc-malta          | 0
 debian/{arch => config}/mips/config.qemu               | 0
 debian/{arch => config}/mips/config.r4k-ip22           | 0
 debian/{arch => config}/mips/config.r5k-ip32           | 0
 debian/{arch => config}/mips/config.sb1-bcm91250a      | 0
 debian/{arch => config}/mips/config.sb1a-bcm91480b     | 0
 debian/{arch => config}/mips/defines                   | 0
 debian/{arch => config}/mipsel/config                  | 0
 debian/{arch => config}/mipsel/config.4kc-malta        | 0
 debian/{arch => config}/mipsel/config.qemu             | 0
 debian/{arch => config}/mipsel/config.r5k-cobalt       | 0
 debian/{arch => config}/mipsel/config.sb1-bcm91250a    | 0
 debian/{arch => config}/mipsel/config.sb1a-bcm91480b   | 0
 debian/{arch => config}/mipsel/defines                 | 0
 debian/{arch => config}/powerpc/config                 | 0
 debian/{arch => config}/powerpc/config.apus            | 0
 debian/{arch => config}/powerpc/config.powerpc         | 0
 debian/{arch => config}/powerpc/config.powerpc-miboot  | 0
 debian/{arch => config}/powerpc/config.powerpc-smp     | 0
 debian/{arch => config}/powerpc/config.powerpc64       | 0
 debian/{arch => config}/powerpc/config.prep            | 0
 debian/{arch => config}/powerpc/defines                | 0
 debian/{arch => config}/powerpc/modules                | 0
 debian/{arch => config}/powerpc/modules.README         | 0
 debian/{arch => config}/powerpc/modules.powerpc        | 0
 debian/{arch => config}/powerpc/modules.powerpc-miboot | 0
 debian/{arch => config}/powerpc/modules.powerpc64      | 0
 debian/{arch => config}/powerpc/vserver/defines        | 0
 debian/{arch => config}/s390/config                    | 0
 debian/{arch => config}/s390/config.s390               | 0
 debian/{arch => config}/s390/config.s390-tape          | 0
 debian/{arch => config}/s390/config.s390x              | 0
 debian/{arch => config}/s390/defines                   | 0
 debian/{arch => config}/s390/vserver/defines           | 0
 debian/{arch => config}/sparc/config                   | 0
 debian/{arch => config}/sparc/config.sparc32           | 0
 debian/{arch => config}/sparc/config.sparc64           | 0
 debian/{arch => config}/sparc/config.sparc64-smp       | 0
 debian/{arch => config}/sparc/defines                  | 0
 debian/{arch => config}/sparc/vserver/defines          | 0
 debian/lib/python/debian_linux/gencontrol.py           | 2 +-
 debian/rules                                           | 2 +-
 debian/rules.real                                      | 4 ++--
 105 files changed, 10 insertions(+), 10 deletions(-)
 rename debian/{arch => config}/_vserver/config (100%)
 rename debian/{arch => config}/_xen/config (100%)
 rename debian/{arch => config}/alpha/config (100%)
 rename debian/{arch => config}/alpha/config.alpha-generic (100%)
 rename debian/{arch => config}/alpha/config.alpha-legacy (100%)
 rename debian/{arch => config}/alpha/config.alpha-smp (100%)
 rename debian/{arch => config}/alpha/defines (100%)
 rename debian/{arch => config}/alpha/vserver/defines (100%)
 rename debian/{arch => config}/amd64/config (100%)
 rename debian/{arch => config}/amd64/config.amd64 (100%)
 rename debian/{arch => config}/amd64/defines (100%)
 rename debian/{arch => config}/amd64/vserver/defines (100%)
 rename debian/{arch => config}/amd64/xen-vserver/defines (100%)
 rename debian/{arch => config}/amd64/xen/config (100%)
 rename debian/{arch => config}/amd64/xen/defines (100%)
 rename debian/{arch => config}/arm/config (100%)
 rename debian/{arch => config}/arm/config.footbridge (100%)
 rename debian/{arch => config}/arm/config.iop32x (100%)
 rename debian/{arch => config}/arm/config.ixp4xx (100%)
 rename debian/{arch => config}/arm/config.versatile (100%)
 rename debian/{arch => config}/arm/defines (100%)
 rename debian/{arch => config}/armel/config (100%)
 rename debian/{arch => config}/armel/defines (100%)
 rename debian/{arch => config}/config (100%)
 rename debian/{arch => config}/defines (100%)
 rename debian/{arch => config}/hppa/config (100%)
 rename debian/{arch => config}/hppa/config.parisc (100%)
 rename debian/{arch => config}/hppa/config.parisc-smp (100%)
 rename debian/{arch => config}/hppa/config.parisc64 (100%)
 rename debian/{arch => config}/hppa/config.parisc64-smp (100%)
 rename debian/{arch => config}/hppa/defines (100%)
 rename debian/{arch => config}/i386/config (100%)
 rename debian/{arch => config}/i386/config.486 (100%)
 rename debian/{arch => config}/i386/config.686 (100%)
 rename debian/{arch => config}/i386/config.686-bigmem (100%)
 rename debian/{arch => config}/i386/config.k7 (100%)
 rename debian/{arch => config}/i386/defines (100%)
 rename debian/{arch => config}/i386/vserver/defines (100%)
 rename debian/{arch => config}/i386/xen-vserver/defines (100%)
 rename debian/{arch => config}/i386/xen/config (100%)
 rename debian/{arch => config}/i386/xen/defines (100%)
 rename debian/{arch => config}/ia64/config (100%)
 rename debian/{arch => config}/ia64/config.itanium (100%)
 rename debian/{arch => config}/ia64/config.mckinley (100%)
 rename debian/{arch => config}/ia64/defines (100%)
 rename debian/{arch => config}/ia64/vserver/defines (100%)
 rename debian/{arch => config}/m68k/README.build (100%)
 rename debian/{arch => config}/m68k/config (100%)
 rename debian/{arch => config}/m68k/config.amiga (100%)
 rename debian/{arch => config}/m68k/config.atari (100%)
 rename debian/{arch => config}/m68k/config.bvme6000 (100%)
 rename debian/{arch => config}/m68k/config.hp (100%)
 rename debian/{arch => config}/m68k/config.mac (100%)
 rename debian/{arch => config}/m68k/config.mvme147 (100%)
 rename debian/{arch => config}/m68k/config.mvme16x (100%)
 rename debian/{arch => config}/m68k/config.q40 (100%)
 rename debian/{arch => config}/m68k/config.sun3 (100%)
 rename debian/{arch => config}/m68k/defines (100%)
 rename debian/{arch => config}/mips/config (100%)
 rename debian/{arch => config}/mips/config.4kc-malta (100%)
 rename debian/{arch => config}/mips/config.qemu (100%)
 rename debian/{arch => config}/mips/config.r4k-ip22 (100%)
 rename debian/{arch => config}/mips/config.r5k-ip32 (100%)
 rename debian/{arch => config}/mips/config.sb1-bcm91250a (100%)
 rename debian/{arch => config}/mips/config.sb1a-bcm91480b (100%)
 rename debian/{arch => config}/mips/defines (100%)
 rename debian/{arch => config}/mipsel/config (100%)
 rename debian/{arch => config}/mipsel/config.4kc-malta (100%)
 rename debian/{arch => config}/mipsel/config.qemu (100%)
 rename debian/{arch => config}/mipsel/config.r5k-cobalt (100%)
 rename debian/{arch => config}/mipsel/config.sb1-bcm91250a (100%)
 rename debian/{arch => config}/mipsel/config.sb1a-bcm91480b (100%)
 rename debian/{arch => config}/mipsel/defines (100%)
 rename debian/{arch => config}/powerpc/config (100%)
 rename debian/{arch => config}/powerpc/config.apus (100%)
 rename debian/{arch => config}/powerpc/config.powerpc (100%)
 rename debian/{arch => config}/powerpc/config.powerpc-miboot (100%)
 rename debian/{arch => config}/powerpc/config.powerpc-smp (100%)
 rename debian/{arch => config}/powerpc/config.powerpc64 (100%)
 rename debian/{arch => config}/powerpc/config.prep (100%)
 rename debian/{arch => config}/powerpc/defines (100%)
 rename debian/{arch => config}/powerpc/modules (100%)
 rename debian/{arch => config}/powerpc/modules.README (100%)
 rename debian/{arch => config}/powerpc/modules.powerpc (100%)
 rename debian/{arch => config}/powerpc/modules.powerpc-miboot (100%)
 rename debian/{arch => config}/powerpc/modules.powerpc64 (100%)
 rename debian/{arch => config}/powerpc/vserver/defines (100%)
 rename debian/{arch => config}/s390/config (100%)
 rename debian/{arch => config}/s390/config.s390 (100%)
 rename debian/{arch => config}/s390/config.s390-tape (100%)
 rename debian/{arch => config}/s390/config.s390x (100%)
 rename debian/{arch => config}/s390/defines (100%)
 rename debian/{arch => config}/s390/vserver/defines (100%)
 rename debian/{arch => config}/sparc/config (100%)
 rename debian/{arch => config}/sparc/config.sparc32 (100%)
 rename debian/{arch => config}/sparc/config.sparc64 (100%)
 rename debian/{arch => config}/sparc/config.sparc64-smp (100%)
 rename debian/{arch => config}/sparc/defines (100%)
 rename debian/{arch => config}/sparc/vserver/defines (100%)

diff --git a/debian/bin/abicheck.py b/debian/bin/abicheck.py
index cc4fd72ef..5bbe017e2 100755
--- a/debian/bin/abicheck.py
+++ b/debian/bin/abicheck.py
@@ -6,13 +6,13 @@ from debian_linux.config import *
 
 class checker(object):
     def __init__(self, dir, arch, subarch, flavour):
-        self.config = ConfigReaderCore(["debian/arch"])
+        self.config = ConfigReaderCore(["debian/config"])
         self.filename_new = "%s/Module.symvers" % dir
         abiname = self.config['abi',]['abiname']
         if subarch == 'none':
-            self.filename_ref = "debian/arch/%s/abi-%s.%s" % (arch, abiname, flavour)
+            self.filename_ref = "debian/config/%s/abi-%s.%s" % (arch, abiname, flavour)
         else:
-            self.filename_ref = "debian/arch/%s/%s/abi-%s.%s" % (arch, subarch, abiname, flavour)
+            self.filename_ref = "debian/config/%s/%s/abi-%s.%s" % (arch, subarch, abiname, flavour)
 
     def __call__(self, out):
         ret = 0
diff --git a/debian/bin/abiupdate.py b/debian/bin/abiupdate.py
index 25b1307a8..e1aac4a7a 100755
--- a/debian/bin/abiupdate.py
+++ b/debian/bin/abiupdate.py
@@ -47,7 +47,7 @@ class main(object):
         self.version = changelog.version.linux_version
         self.version_source = changelog.version.complete
 
-        local_config = config_reader_arch(["debian/arch"])
+        local_config = config_reader_arch(["debian/config"])
 
         self.abiname = local_config['abi',]['abiname']
         self.version_abi = self.version + '-' + self.abiname
@@ -107,7 +107,7 @@ class main(object):
         return filename_out
 
     def save_abi(self, symbols, arch, subarch, flavour):
-        out = "debian/arch/%s" % arch
+        out = "debian/config/%s" % arch
         if subarch != 'none':
             out += "/%s" % subarch
         out += "/abi-%s.%s" % (self.abiname, flavour)
diff --git a/debian/bin/kconfig.py b/debian/bin/kconfig.py
index 60d42f671..b7bcf83f4 100755
--- a/debian/bin/kconfig.py
+++ b/debian/bin/kconfig.py
@@ -4,7 +4,7 @@ import optparse, os.path, sys
 from debian_linux.kconfig import *
 
 def merge(output, *config):
-    config = [os.path.join('debian/arch', c) for c in config]
+    config = [os.path.join('debian/config', c) for c in config]
 
     kconfig = KconfigFile()
     for c in config:
diff --git a/debian/arch/_vserver/config b/debian/config/_vserver/config
similarity index 100%
rename from debian/arch/_vserver/config
rename to debian/config/_vserver/config
diff --git a/debian/arch/_xen/config b/debian/config/_xen/config
similarity index 100%
rename from debian/arch/_xen/config
rename to debian/config/_xen/config
diff --git a/debian/arch/alpha/config b/debian/config/alpha/config
similarity index 100%
rename from debian/arch/alpha/config
rename to debian/config/alpha/config
diff --git a/debian/arch/alpha/config.alpha-generic b/debian/config/alpha/config.alpha-generic
similarity index 100%
rename from debian/arch/alpha/config.alpha-generic
rename to debian/config/alpha/config.alpha-generic
diff --git a/debian/arch/alpha/config.alpha-legacy b/debian/config/alpha/config.alpha-legacy
similarity index 100%
rename from debian/arch/alpha/config.alpha-legacy
rename to debian/config/alpha/config.alpha-legacy
diff --git a/debian/arch/alpha/config.alpha-smp b/debian/config/alpha/config.alpha-smp
similarity index 100%
rename from debian/arch/alpha/config.alpha-smp
rename to debian/config/alpha/config.alpha-smp
diff --git a/debian/arch/alpha/defines b/debian/config/alpha/defines
similarity index 100%
rename from debian/arch/alpha/defines
rename to debian/config/alpha/defines
diff --git a/debian/arch/alpha/vserver/defines b/debian/config/alpha/vserver/defines
similarity index 100%
rename from debian/arch/alpha/vserver/defines
rename to debian/config/alpha/vserver/defines
diff --git a/debian/arch/amd64/config b/debian/config/amd64/config
similarity index 100%
rename from debian/arch/amd64/config
rename to debian/config/amd64/config
diff --git a/debian/arch/amd64/config.amd64 b/debian/config/amd64/config.amd64
similarity index 100%
rename from debian/arch/amd64/config.amd64
rename to debian/config/amd64/config.amd64
diff --git a/debian/arch/amd64/defines b/debian/config/amd64/defines
similarity index 100%
rename from debian/arch/amd64/defines
rename to debian/config/amd64/defines
diff --git a/debian/arch/amd64/vserver/defines b/debian/config/amd64/vserver/defines
similarity index 100%
rename from debian/arch/amd64/vserver/defines
rename to debian/config/amd64/vserver/defines
diff --git a/debian/arch/amd64/xen-vserver/defines b/debian/config/amd64/xen-vserver/defines
similarity index 100%
rename from debian/arch/amd64/xen-vserver/defines
rename to debian/config/amd64/xen-vserver/defines
diff --git a/debian/arch/amd64/xen/config b/debian/config/amd64/xen/config
similarity index 100%
rename from debian/arch/amd64/xen/config
rename to debian/config/amd64/xen/config
diff --git a/debian/arch/amd64/xen/defines b/debian/config/amd64/xen/defines
similarity index 100%
rename from debian/arch/amd64/xen/defines
rename to debian/config/amd64/xen/defines
diff --git a/debian/arch/arm/config b/debian/config/arm/config
similarity index 100%
rename from debian/arch/arm/config
rename to debian/config/arm/config
diff --git a/debian/arch/arm/config.footbridge b/debian/config/arm/config.footbridge
similarity index 100%
rename from debian/arch/arm/config.footbridge
rename to debian/config/arm/config.footbridge
diff --git a/debian/arch/arm/config.iop32x b/debian/config/arm/config.iop32x
similarity index 100%
rename from debian/arch/arm/config.iop32x
rename to debian/config/arm/config.iop32x
diff --git a/debian/arch/arm/config.ixp4xx b/debian/config/arm/config.ixp4xx
similarity index 100%
rename from debian/arch/arm/config.ixp4xx
rename to debian/config/arm/config.ixp4xx
diff --git a/debian/arch/arm/config.versatile b/debian/config/arm/config.versatile
similarity index 100%
rename from debian/arch/arm/config.versatile
rename to debian/config/arm/config.versatile
diff --git a/debian/arch/arm/defines b/debian/config/arm/defines
similarity index 100%
rename from debian/arch/arm/defines
rename to debian/config/arm/defines
diff --git a/debian/arch/armel/config b/debian/config/armel/config
similarity index 100%
rename from debian/arch/armel/config
rename to debian/config/armel/config
diff --git a/debian/arch/armel/defines b/debian/config/armel/defines
similarity index 100%
rename from debian/arch/armel/defines
rename to debian/config/armel/defines
diff --git a/debian/arch/config b/debian/config/config
similarity index 100%
rename from debian/arch/config
rename to debian/config/config
diff --git a/debian/arch/defines b/debian/config/defines
similarity index 100%
rename from debian/arch/defines
rename to debian/config/defines
diff --git a/debian/arch/hppa/config b/debian/config/hppa/config
similarity index 100%
rename from debian/arch/hppa/config
rename to debian/config/hppa/config
diff --git a/debian/arch/hppa/config.parisc b/debian/config/hppa/config.parisc
similarity index 100%
rename from debian/arch/hppa/config.parisc
rename to debian/config/hppa/config.parisc
diff --git a/debian/arch/hppa/config.parisc-smp b/debian/config/hppa/config.parisc-smp
similarity index 100%
rename from debian/arch/hppa/config.parisc-smp
rename to debian/config/hppa/config.parisc-smp
diff --git a/debian/arch/hppa/config.parisc64 b/debian/config/hppa/config.parisc64
similarity index 100%
rename from debian/arch/hppa/config.parisc64
rename to debian/config/hppa/config.parisc64
diff --git a/debian/arch/hppa/config.parisc64-smp b/debian/config/hppa/config.parisc64-smp
similarity index 100%
rename from debian/arch/hppa/config.parisc64-smp
rename to debian/config/hppa/config.parisc64-smp
diff --git a/debian/arch/hppa/defines b/debian/config/hppa/defines
similarity index 100%
rename from debian/arch/hppa/defines
rename to debian/config/hppa/defines
diff --git a/debian/arch/i386/config b/debian/config/i386/config
similarity index 100%
rename from debian/arch/i386/config
rename to debian/config/i386/config
diff --git a/debian/arch/i386/config.486 b/debian/config/i386/config.486
similarity index 100%
rename from debian/arch/i386/config.486
rename to debian/config/i386/config.486
diff --git a/debian/arch/i386/config.686 b/debian/config/i386/config.686
similarity index 100%
rename from debian/arch/i386/config.686
rename to debian/config/i386/config.686
diff --git a/debian/arch/i386/config.686-bigmem b/debian/config/i386/config.686-bigmem
similarity index 100%
rename from debian/arch/i386/config.686-bigmem
rename to debian/config/i386/config.686-bigmem
diff --git a/debian/arch/i386/config.k7 b/debian/config/i386/config.k7
similarity index 100%
rename from debian/arch/i386/config.k7
rename to debian/config/i386/config.k7
diff --git a/debian/arch/i386/defines b/debian/config/i386/defines
similarity index 100%
rename from debian/arch/i386/defines
rename to debian/config/i386/defines
diff --git a/debian/arch/i386/vserver/defines b/debian/config/i386/vserver/defines
similarity index 100%
rename from debian/arch/i386/vserver/defines
rename to debian/config/i386/vserver/defines
diff --git a/debian/arch/i386/xen-vserver/defines b/debian/config/i386/xen-vserver/defines
similarity index 100%
rename from debian/arch/i386/xen-vserver/defines
rename to debian/config/i386/xen-vserver/defines
diff --git a/debian/arch/i386/xen/config b/debian/config/i386/xen/config
similarity index 100%
rename from debian/arch/i386/xen/config
rename to debian/config/i386/xen/config
diff --git a/debian/arch/i386/xen/defines b/debian/config/i386/xen/defines
similarity index 100%
rename from debian/arch/i386/xen/defines
rename to debian/config/i386/xen/defines
diff --git a/debian/arch/ia64/config b/debian/config/ia64/config
similarity index 100%
rename from debian/arch/ia64/config
rename to debian/config/ia64/config
diff --git a/debian/arch/ia64/config.itanium b/debian/config/ia64/config.itanium
similarity index 100%
rename from debian/arch/ia64/config.itanium
rename to debian/config/ia64/config.itanium
diff --git a/debian/arch/ia64/config.mckinley b/debian/config/ia64/config.mckinley
similarity index 100%
rename from debian/arch/ia64/config.mckinley
rename to debian/config/ia64/config.mckinley
diff --git a/debian/arch/ia64/defines b/debian/config/ia64/defines
similarity index 100%
rename from debian/arch/ia64/defines
rename to debian/config/ia64/defines
diff --git a/debian/arch/ia64/vserver/defines b/debian/config/ia64/vserver/defines
similarity index 100%
rename from debian/arch/ia64/vserver/defines
rename to debian/config/ia64/vserver/defines
diff --git a/debian/arch/m68k/README.build b/debian/config/m68k/README.build
similarity index 100%
rename from debian/arch/m68k/README.build
rename to debian/config/m68k/README.build
diff --git a/debian/arch/m68k/config b/debian/config/m68k/config
similarity index 100%
rename from debian/arch/m68k/config
rename to debian/config/m68k/config
diff --git a/debian/arch/m68k/config.amiga b/debian/config/m68k/config.amiga
similarity index 100%
rename from debian/arch/m68k/config.amiga
rename to debian/config/m68k/config.amiga
diff --git a/debian/arch/m68k/config.atari b/debian/config/m68k/config.atari
similarity index 100%
rename from debian/arch/m68k/config.atari
rename to debian/config/m68k/config.atari
diff --git a/debian/arch/m68k/config.bvme6000 b/debian/config/m68k/config.bvme6000
similarity index 100%
rename from debian/arch/m68k/config.bvme6000
rename to debian/config/m68k/config.bvme6000
diff --git a/debian/arch/m68k/config.hp b/debian/config/m68k/config.hp
similarity index 100%
rename from debian/arch/m68k/config.hp
rename to debian/config/m68k/config.hp
diff --git a/debian/arch/m68k/config.mac b/debian/config/m68k/config.mac
similarity index 100%
rename from debian/arch/m68k/config.mac
rename to debian/config/m68k/config.mac
diff --git a/debian/arch/m68k/config.mvme147 b/debian/config/m68k/config.mvme147
similarity index 100%
rename from debian/arch/m68k/config.mvme147
rename to debian/config/m68k/config.mvme147
diff --git a/debian/arch/m68k/config.mvme16x b/debian/config/m68k/config.mvme16x
similarity index 100%
rename from debian/arch/m68k/config.mvme16x
rename to debian/config/m68k/config.mvme16x
diff --git a/debian/arch/m68k/config.q40 b/debian/config/m68k/config.q40
similarity index 100%
rename from debian/arch/m68k/config.q40
rename to debian/config/m68k/config.q40
diff --git a/debian/arch/m68k/config.sun3 b/debian/config/m68k/config.sun3
similarity index 100%
rename from debian/arch/m68k/config.sun3
rename to debian/config/m68k/config.sun3
diff --git a/debian/arch/m68k/defines b/debian/config/m68k/defines
similarity index 100%
rename from debian/arch/m68k/defines
rename to debian/config/m68k/defines
diff --git a/debian/arch/mips/config b/debian/config/mips/config
similarity index 100%
rename from debian/arch/mips/config
rename to debian/config/mips/config
diff --git a/debian/arch/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta
similarity index 100%
rename from debian/arch/mips/config.4kc-malta
rename to debian/config/mips/config.4kc-malta
diff --git a/debian/arch/mips/config.qemu b/debian/config/mips/config.qemu
similarity index 100%
rename from debian/arch/mips/config.qemu
rename to debian/config/mips/config.qemu
diff --git a/debian/arch/mips/config.r4k-ip22 b/debian/config/mips/config.r4k-ip22
similarity index 100%
rename from debian/arch/mips/config.r4k-ip22
rename to debian/config/mips/config.r4k-ip22
diff --git a/debian/arch/mips/config.r5k-ip32 b/debian/config/mips/config.r5k-ip32
similarity index 100%
rename from debian/arch/mips/config.r5k-ip32
rename to debian/config/mips/config.r5k-ip32
diff --git a/debian/arch/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a
similarity index 100%
rename from debian/arch/mips/config.sb1-bcm91250a
rename to debian/config/mips/config.sb1-bcm91250a
diff --git a/debian/arch/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b
similarity index 100%
rename from debian/arch/mips/config.sb1a-bcm91480b
rename to debian/config/mips/config.sb1a-bcm91480b
diff --git a/debian/arch/mips/defines b/debian/config/mips/defines
similarity index 100%
rename from debian/arch/mips/defines
rename to debian/config/mips/defines
diff --git a/debian/arch/mipsel/config b/debian/config/mipsel/config
similarity index 100%
rename from debian/arch/mipsel/config
rename to debian/config/mipsel/config
diff --git a/debian/arch/mipsel/config.4kc-malta b/debian/config/mipsel/config.4kc-malta
similarity index 100%
rename from debian/arch/mipsel/config.4kc-malta
rename to debian/config/mipsel/config.4kc-malta
diff --git a/debian/arch/mipsel/config.qemu b/debian/config/mipsel/config.qemu
similarity index 100%
rename from debian/arch/mipsel/config.qemu
rename to debian/config/mipsel/config.qemu
diff --git a/debian/arch/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt
similarity index 100%
rename from debian/arch/mipsel/config.r5k-cobalt
rename to debian/config/mipsel/config.r5k-cobalt
diff --git a/debian/arch/mipsel/config.sb1-bcm91250a b/debian/config/mipsel/config.sb1-bcm91250a
similarity index 100%
rename from debian/arch/mipsel/config.sb1-bcm91250a
rename to debian/config/mipsel/config.sb1-bcm91250a
diff --git a/debian/arch/mipsel/config.sb1a-bcm91480b b/debian/config/mipsel/config.sb1a-bcm91480b
similarity index 100%
rename from debian/arch/mipsel/config.sb1a-bcm91480b
rename to debian/config/mipsel/config.sb1a-bcm91480b
diff --git a/debian/arch/mipsel/defines b/debian/config/mipsel/defines
similarity index 100%
rename from debian/arch/mipsel/defines
rename to debian/config/mipsel/defines
diff --git a/debian/arch/powerpc/config b/debian/config/powerpc/config
similarity index 100%
rename from debian/arch/powerpc/config
rename to debian/config/powerpc/config
diff --git a/debian/arch/powerpc/config.apus b/debian/config/powerpc/config.apus
similarity index 100%
rename from debian/arch/powerpc/config.apus
rename to debian/config/powerpc/config.apus
diff --git a/debian/arch/powerpc/config.powerpc b/debian/config/powerpc/config.powerpc
similarity index 100%
rename from debian/arch/powerpc/config.powerpc
rename to debian/config/powerpc/config.powerpc
diff --git a/debian/arch/powerpc/config.powerpc-miboot b/debian/config/powerpc/config.powerpc-miboot
similarity index 100%
rename from debian/arch/powerpc/config.powerpc-miboot
rename to debian/config/powerpc/config.powerpc-miboot
diff --git a/debian/arch/powerpc/config.powerpc-smp b/debian/config/powerpc/config.powerpc-smp
similarity index 100%
rename from debian/arch/powerpc/config.powerpc-smp
rename to debian/config/powerpc/config.powerpc-smp
diff --git a/debian/arch/powerpc/config.powerpc64 b/debian/config/powerpc/config.powerpc64
similarity index 100%
rename from debian/arch/powerpc/config.powerpc64
rename to debian/config/powerpc/config.powerpc64
diff --git a/debian/arch/powerpc/config.prep b/debian/config/powerpc/config.prep
similarity index 100%
rename from debian/arch/powerpc/config.prep
rename to debian/config/powerpc/config.prep
diff --git a/debian/arch/powerpc/defines b/debian/config/powerpc/defines
similarity index 100%
rename from debian/arch/powerpc/defines
rename to debian/config/powerpc/defines
diff --git a/debian/arch/powerpc/modules b/debian/config/powerpc/modules
similarity index 100%
rename from debian/arch/powerpc/modules
rename to debian/config/powerpc/modules
diff --git a/debian/arch/powerpc/modules.README b/debian/config/powerpc/modules.README
similarity index 100%
rename from debian/arch/powerpc/modules.README
rename to debian/config/powerpc/modules.README
diff --git a/debian/arch/powerpc/modules.powerpc b/debian/config/powerpc/modules.powerpc
similarity index 100%
rename from debian/arch/powerpc/modules.powerpc
rename to debian/config/powerpc/modules.powerpc
diff --git a/debian/arch/powerpc/modules.powerpc-miboot b/debian/config/powerpc/modules.powerpc-miboot
similarity index 100%
rename from debian/arch/powerpc/modules.powerpc-miboot
rename to debian/config/powerpc/modules.powerpc-miboot
diff --git a/debian/arch/powerpc/modules.powerpc64 b/debian/config/powerpc/modules.powerpc64
similarity index 100%
rename from debian/arch/powerpc/modules.powerpc64
rename to debian/config/powerpc/modules.powerpc64
diff --git a/debian/arch/powerpc/vserver/defines b/debian/config/powerpc/vserver/defines
similarity index 100%
rename from debian/arch/powerpc/vserver/defines
rename to debian/config/powerpc/vserver/defines
diff --git a/debian/arch/s390/config b/debian/config/s390/config
similarity index 100%
rename from debian/arch/s390/config
rename to debian/config/s390/config
diff --git a/debian/arch/s390/config.s390 b/debian/config/s390/config.s390
similarity index 100%
rename from debian/arch/s390/config.s390
rename to debian/config/s390/config.s390
diff --git a/debian/arch/s390/config.s390-tape b/debian/config/s390/config.s390-tape
similarity index 100%
rename from debian/arch/s390/config.s390-tape
rename to debian/config/s390/config.s390-tape
diff --git a/debian/arch/s390/config.s390x b/debian/config/s390/config.s390x
similarity index 100%
rename from debian/arch/s390/config.s390x
rename to debian/config/s390/config.s390x
diff --git a/debian/arch/s390/defines b/debian/config/s390/defines
similarity index 100%
rename from debian/arch/s390/defines
rename to debian/config/s390/defines
diff --git a/debian/arch/s390/vserver/defines b/debian/config/s390/vserver/defines
similarity index 100%
rename from debian/arch/s390/vserver/defines
rename to debian/config/s390/vserver/defines
diff --git a/debian/arch/sparc/config b/debian/config/sparc/config
similarity index 100%
rename from debian/arch/sparc/config
rename to debian/config/sparc/config
diff --git a/debian/arch/sparc/config.sparc32 b/debian/config/sparc/config.sparc32
similarity index 100%
rename from debian/arch/sparc/config.sparc32
rename to debian/config/sparc/config.sparc32
diff --git a/debian/arch/sparc/config.sparc64 b/debian/config/sparc/config.sparc64
similarity index 100%
rename from debian/arch/sparc/config.sparc64
rename to debian/config/sparc/config.sparc64
diff --git a/debian/arch/sparc/config.sparc64-smp b/debian/config/sparc/config.sparc64-smp
similarity index 100%
rename from debian/arch/sparc/config.sparc64-smp
rename to debian/config/sparc/config.sparc64-smp
diff --git a/debian/arch/sparc/defines b/debian/config/sparc/defines
similarity index 100%
rename from debian/arch/sparc/defines
rename to debian/config/sparc/defines
diff --git a/debian/arch/sparc/vserver/defines b/debian/config/sparc/vserver/defines
similarity index 100%
rename from debian/arch/sparc/vserver/defines
rename to debian/config/sparc/vserver/defines
diff --git a/debian/lib/python/debian_linux/gencontrol.py b/debian/lib/python/debian_linux/gencontrol.py
index 9661aa8e6..f47cf6691 100644
--- a/debian/lib/python/debian_linux/gencontrol.py
+++ b/debian/lib/python/debian_linux/gencontrol.py
@@ -25,7 +25,7 @@ class Gencontrol(object):
     makefile_targets = ('binary-arch', 'build', 'setup', 'source')
 
     def __init__(self, underlay = None):
-        self.config = ConfigReaderCore([underlay, "debian/arch"])
+        self.config = ConfigReaderCore([underlay, "debian/config"])
         self.templates = Templates()
 
     def __call__(self):
diff --git a/debian/rules b/debian/rules
index 86175eeb1..3f678ea39 100755
--- a/debian/rules
+++ b/debian/rules
@@ -68,7 +68,7 @@ binary-arch: $(STAMPS_DIR)/build-base
 binary:	binary-indep binary-arch
 
 CONTROL_FILES = debian/changelog $(wildcard debian/templates/*.in)
-CONTROL_FILES += debian/arch/defines $(wildcard debian/arch/*/defines) $(wildcard debian/arch/*/*/defines)
+CONTROL_FILES += debian/config/defines $(wildcard debian/config/*/defines) $(wildcard debian/config/*/*/defines)
 debian/control debian/rules.gen: debian/bin/gencontrol.py $(CONTROL_FILES)
 	if [ -f debian/control.md5sum ]; then \
 		if [ "$(VERSION_DEBIAN_BINNMU)" ]; then \
diff --git a/debian/rules.real b/debian/rules.real
index 65aa24ce5..b37f0ba3e 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -68,7 +68,7 @@ setup-flavour: $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE)
 source-arch: $(STAMPS_DIR)/source
 source-subarch: $(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH)
 
-$(BUILD_DIR)/config.$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(foreach t,$(KCONFIG),debian/arch/$(t))
+$(BUILD_DIR)/config.$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(foreach t,$(KCONFIG),debian/config/$(t))
 	python2.4 debian/bin/kconfig.py '$@' $(KCONFIG)
 
 $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2: SOURCE_DIR=$(BUILD_DIR)/source
@@ -356,7 +356,7 @@ install-support:
 	dh_testroot
 	dh_clean -k -d
 	chmod a+x debian/modules/gencontrol.py
-	dh_install debian/arch debian/lib debian/modules /usr/src/$(PACKAGE_NAME)
+	dh_install debian/config debian/lib debian/modules /usr/src/$(PACKAGE_NAME)
 	dh_python -V 2.4 /usr/src/$(PACKAGE_NAME)/lib/python
 	echo -e "[version]\nsource: $(SOURCEVERSION)\nabiname: $(ABINAME)" > $(PACKAGE_DIR)/usr/src/$(PACKAGE_NAME)/version
 	$(MAKE) -f debian/rules.real install-base