[kernel] r16202 - in dists/sid/linux-2.6/debian: . bin

[Bastian Blank]

Author: waldi
Date: Sun Aug 29 12:35:45 2010
New Revision: 16202

Log:
* debian/changelog: Update.
* debian/bin/gencontrol.py
  - Generate Breaks field.
  - Use Breaks instead of Conflicts.

Modified:
   dists/sid/linux-2.6/debian/bin/gencontrol.py
   dists/sid/linux-2.6/debian/changelog

Modified: dists/sid/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux-2.6/debian/bin/gencontrol.py	Sun Aug 29 12:34:09 2010	(r16201)
+++ dists/sid/linux-2.6/debian/bin/gencontrol.py	Sun Aug 29 12:35:45 2010	(r16202)
@@ -122,7 +122,7 @@
         packages['source']['Build-Depends'].extend(relations_compiler_build_dep)
 
         image_fields = {'Description': PackageDescription()}
-        for field in 'Depends', 'Provides', 'Suggests', 'Recommends', 'Conflicts':
+        for field in 'Depends', 'Provides', 'Suggests', 'Recommends', 'Conflicts', 'Breaks':
             image_fields[field] = PackageRelation(config_entry_image.get(field.lower(), None), override_arches=(arch,))
 
         if config_entry_image.get('initramfs', True):
@@ -137,7 +137,7 @@
                 a = PackageRelationEntry(i)
                 if a.operator is not None:
                     a.operator = -a.operator
-                    image_fields['Conflicts'].append(PackageRelationGroup([a]))
+                    image_fields['Breaks'].append(PackageRelationGroup([a]))
             image_fields['Depends'].append(l_depends)
 
         desc_parts = self.config.get_merge('description', arch, featureset, flavour, 'parts')

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sun Aug 29 12:34:09 2010	(r16201)
+++ dists/sid/linux-2.6/debian/changelog	Sun Aug 29 12:35:45 2010	(r16202)
@@ -15,6 +15,9 @@
   * rt2860sta, rt2870sta: Enable channels 12-14 (Closes: #594561)
   * SCSI/mptsas: fix hangs caused by ATA pass-through (Closes: #594690)
 
+  [ Bastian Blank ]
+  * Use Breaks instead of Conflicts.
+
  -- Ben Hutchings <ben at decadent.org.uk>  Fri, 27 Aug 2010 08:38:26 +0100
 
 linux-2.6 (2.6.32-21) unstable; urgency=high