3 files changed, 9 insertions, 9 deletions
diff --git a/debian.linaro/control.d/flavour-control.stub b/debian.linaro/control.d/flavour-control.stub
index b5403ce6945..96ad80d5781 100644
--- a/debian.linaro/control.d/flavour-control.stub
+++ b/debian.linaro/control.d/flavour-control.stub
@@ -72,7 +72,7 @@ Package: linux-headers-PKGVER-ABINUM-FLAVOUR
 Architecture: ARCH
 Section: devel
 Priority: optional
-Depends: ${misc:Depends}, SRCPKGNAME-headers-PKGVER-ABINUM, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Provides: SRCPKGNAME-headers, SRCPKGNAME-headers-3.0
 Description: Linux kernel headers for version PKGVER on DESC
  This package provides kernel header files for version PKGVER on
diff --git a/debian.linaro/control.d/vars.linaro-SOCFLAVOUR b/debian.linaro/control.d/vars.linaro-SOCFLAVOUR
new file mode 100644
index 00000000000..92158f0f17e
--- /dev/null
+++ b/debian.linaro/control.d/vars.linaro-SOCFLAVOUR
@@ -0,0 +1,8 @@
+arch="armel armhf"
+supported="SOCVENDOR SOCFAMILY"
+desc="SOCVENDOR SOCFAMILY-based systems"
+target="Targeted towards boards such as SAMPLEBOARDS, etc."
+bootloader="uboot-mkimage, flash-kernel"
+provides=""
+section_image="universe/base"
+do_debug="Yes"
diff --git a/debian.linaro/control.d/vars.omap b/debian.linaro/control.d/vars.omap
deleted file mode 100644
index bc9a17c2480..00000000000
--- a/debian.linaro/control.d/vars.omap
+++ /dev/null
@@ -1,8 +0,0 @@
-arch="armel armhf"
-supported="TI OMAP3"
-desc="TI OMAP3-based =HUMAN= systems"
-target="Targeted towards boards such as Beagleboard, Gumstix, IGEPv2, etc."
-bootloader="flash-kernel"
-provides=""
-section_image="universe/base"
-do_debug="Yes"