Remove dependency on kernel-power-bootimg from other packages

[kernel-power] / kernel-power-2.6.28 / debian / control

diff --git a/kernel-power-2.6.28/debian/control b/kernel-power-2.6.28/debian/control
index 55f949c..1e2da4e 100644 (file)
--- a/kernel-power-2.6.28/debian/control
+++ b/kernel-power-2.6.28/debian/control
@@ -9,7 +9,6 @@ Standards-Version: 3.8.0
 
 Package: kernel-power
 Architecture: armel
-Conflicts: kernel-maemo
 Description: Flashable Linux kernel (kernel power 2.6.28.10)
  This package provides a flashable kernel image.
  .
@@ -19,23 +18,14 @@ Package: kernel-power-bootimg
 Section: user/system
 Architecture: armel
 Depends: kernel-power-modules (= ${binary:Version})
-Conflicts: multiboot-kernel-power
-Recommends: multiboot, kernel-power-flasher, kernel-power-settings, usbip, iptables, mtd-utils, kexec-tools
-Provides: kernel-feature-netfilter, kernel-feature-ipv6, kernel-feature-ext4, kernel-feature-xfs, kernel-feature-reiserfs,
-  kernel-feature-ntfs-read, kernel-feature-udf, kernel-feature-cifs, kernel-feature-automounter, kernel-feature-squashfs, 
-  kernel-feature-unionfs, kernel-feature-crypto, kernel-feature-dmloop, kernel-feature-utf8, kernel-feature-mousejoy,
-  kernel-feature-usbip, kernel-feature-ppp, kernel-feature-qos, kernel-feature-block2mtd, kernel-feature-kexec,
-  kernel-feature-overclock, kernel-feature-joikuspot, kernel-feature-slip, kernel-feature-battery, kernel-feature-pptp,
-  kernel-feature-wlan-monitor, kernel-feature-radiords, kernel-feature-ioacct, kernel-feature-usbhost, kernel-feature-framebuffer,
-  kernel-feature-smartreflex, kernel-feature-video720p, kernel-feature-packet-injection, kernel-feature-charger,
-  kernel-feature-errata-430973-workaround
-XB-Maemo-Display-Name: Linux kernel for power user (boot image for multiboot)
+Recommends: u-boot-flasher, kernel-power-flasher, kernel-power-settings, usbip, iptables, mtd-utils, kexec-tools
+XB-Maemo-Display-Name: Linux kernel for power user (boot image for U-Boot)
 Description: Linux kernel boot image (kernel power 2.6.28.10)
- This package provides a bootable kernel image and config files
- for U-Boot Bootmenu and Multiboot.
+ This package provides a bootable kernel image and config file
+ for U-Boot Bootmenu.
  .
  This package does not flash kernel image. Instead it install
- config files for proper Bootmenu entry in U-Boot and Multiboot
+ config files for proper Bootmenu entry in U-Boot.
 XB-Maemo-Icon-26:
  iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABmJLR0QAAAAA
  AAD5Q7t/AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAwAAAAMADO
@@ -108,9 +98,8 @@ XB-Maemo-Icon-26:
 Package: kernel-power-flasher
 Section: user/system
 Architecture: armel
-Pre-Depends: kernel-power (= ${binary:Version}), kernel-power-modules (= ${binary:Version}), softupd (>= 0.4.0), maemo-installer-utils
+Pre-Depends: kernel-power (= ${binary:Version}), kernel-power-modules (= ${binary:Version}), softupd (>= 0.4.0), hildon-application-manager
 Depends: sudo
-Conflicts: kernel-flasher-maemo (<= 2.6.28-maemo22), kernel-maemo, kernel-modules-maemo, kernel-headers-maemo, linux-kernel-headers-maemo
 Recommends: kernel-power-settings, usbip, iptables, mtd-utils, kexec-tools
 Provides: kernel-feature-netfilter, kernel-feature-ipv6, kernel-feature-ext4, kernel-feature-xfs, kernel-feature-reiserfs,
   kernel-feature-ntfs-read, kernel-feature-udf, kernel-feature-cifs, kernel-feature-automounter, kernel-feature-squashfs, 
@@ -118,7 +107,9 @@ Provides: kernel-feature-netfilter, kernel-feature-ipv6, kernel-feature-ext4, ke
   kernel-feature-usbip, kernel-feature-ppp, kernel-feature-qos, kernel-feature-block2mtd, kernel-feature-kexec,
   kernel-feature-overclock, kernel-feature-joikuspot, kernel-feature-slip, kernel-feature-battery, kernel-feature-pptp,
   kernel-feature-wlan-monitor, kernel-feature-radiords, kernel-feature-ioacct, kernel-feature-usbhost, kernel-feature-framebuffer,
-  kernel-feature-smartreflex, kernel-feature-video720p, kernel-feature-packet-injection, kernel-feature-charger
+  kernel-feature-smartreflex, kernel-feature-video720p, kernel-feature-packet-injection, kernel-feature-charger,
+  kernel-feature-errata-430973-workaround, kernel-feature-usbhost-new, kernel-feature-sigmask, kernel-feature-rx51-battery,
+  kernel-feature-bridge
 XB-Maemo-Display-Name: Linux kernel for power user
 Description: Linux kernel updater (kernel power 2.6.28.10)
  This package will flash the kernel image upon installation.
@@ -216,22 +207,19 @@ XB-Maemo-Icon-26:
 Package: kernel-power-headers
 Architecture: armel
 Depends: ${shlibs:Depends}
-Conflicts: kernel-headers-maemo
 Description: Linux kernel headers (kernel power 2.6.28.10)
  This package provides kernel headers.
 
 Package: linux-kernel-power-headers
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: linux-kernel-headers-maemo, linux-kernel-headers
 Description: Linux Kernel headers for development (kernel power 2.6.28.10)
  This package provides headers from the Linux kernel. These headers
  are used by the installed headers for GNU glibc and other system libraries.
 
 Package: kernel-power-modules
 Architecture: armel
-Conflicts: kernel-modules-maemo
-Depends: module-init-tools (>= 3.3), kernel-power (= ${binary:Version}) | kernel-power-bootimg (= ${binary:Version})
+Depends: module-init-tools (>= 3.3), kernel-power (= ${binary:Version})
 Description: Linux kernel modules (kernel power 2.6.28.10)
  This package provides kernel modules.