Merging debian version 6.7.7-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 18 insertions, 24 deletions

diff --git a/debian/config/m68k/config b/debian/config/m68k/config
index c7dc8d1aaa..5a171354f4 100644
--- a/debian/config/m68k/config
+++ b/debian/config/m68k/config
@@ -346,11 +346,6 @@ CONFIG_MAC_EMUMOUSEBTN=m
 # CONFIG_MTD is not set
 
 ##
-## file: drivers/net/appletalk/Kconfig
-##
-CONFIG_DEV_APPLETALK=m
-
-##
 ## file: drivers/net/arcnet/Kconfig
 ##
 # CONFIG_ARCNET is not set
diff --git a/debian/config/m68k/defines b/debian/config/m68k/defines
deleted file mode 100644
index b572549dcc..0000000000
--- a/debian/config/m68k/defines
+++ /dev/null
@@ -1,19 +0,0 @@
-[base]
-cflags: -ffreestanding
-flavours:
- m68k
-default-flavour: m68k
-kernel-arch: m68k
-
-[build]
-image-file: vmlinux
-
-[image]
-suggests: vmelilo, fdutils
-install-stem: vmlinux
-
-[m68k_description]
-hardware: Motorola MC68020+ family
-
-[m68k_packages]
-installer: true
diff --git a/debian/config/m68k/defines.toml b/debian/config/m68k/defines.toml
new file mode 100644
index 0000000000..c5dbaab92e
--- /dev/null
+++ b/debian/config/m68k/defines.toml
@@ -0,0 +1,18 @@
+[[flavour]]
+name = 'm68k'
+[flavour.defs]
+is_default = true
+[flavour.description]
+hardware = 'Motorola MC68020+ family'
+[flavour.packages]
+installer = true
+
+[[featureset]]
+name = 'none'
+
+[build]
+kernel_file = 'vmlinux'
+kernel_stem = 'vmlinux'
+
+[relations.image]
+suggests = ['vmelilo', 'fdutils']