[kernel] r6845 - in dists/sid/linux-2.6.16/debian: templates

Bastian Blank waldi at costa.debian.org
Tue Jun 20 13:08:41 UTC 2006


Author: waldi
Date: Tue Jun 20 13:08:39 2006
New Revision: 6845

Modified:
   dists/sid/linux-2.6.16/debian/bin/gencontrol.py
   dists/sid/linux-2.6.16/debian/templates/control.extra.in

Log:
* debian/bin/gencontrol.py: Remove meta packages.
* debian/templates/control.extra.in: Remove transition packages.


Modified: dists/sid/linux-2.6.16/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux-2.6.16/debian/bin/gencontrol.py	(original)
+++ dists/sid/linux-2.6.16/debian/bin/gencontrol.py	Tue Jun 20 13:08:39 2006
@@ -108,8 +108,6 @@
         image_type_modulesinline = self.templates["control.image.type-modulesinline"]
         image_type_standalone = self.templates["control.image.type-standalone"]
         headers = self.templates["control.headers"]
-        image_latest = self.templates["control.image.latest"]
-        headers_latest = self.templates["control.headers.latest"]
 
         config_entry_relations = self.config.merge('relations', arch, subarch, flavour)
 
@@ -124,7 +122,6 @@
             image_depends.append(l)
 
         packages_own = []
-        packages_dummy = []
 
         if vars['type'] == 'plain-s390-tape':
             image = image_type_standalone
@@ -135,15 +132,13 @@
 
         for i in image:
             packages_own.append(self.process_real_image(i, {'depends': image_depends}, config_entry_relations, vars))
-        packages_dummy.extend(self.process_packages(image_latest, vars))
 
         if image in (image_type_modulesextra, image_type_modulesinline):
             makeflags['MODULES'] = True
             packages_own.append(self.process_package(headers[0], vars))
-            packages_dummy.append(self.process_package(headers_latest[0], vars))
             extra['headers_arch_depends'].append('%s (= ${Source-Version})' % packages_own[-1]['Package'])
 
-        for package in packages_own + packages_dummy:
+        for package in packages_own:
             name = package['Package']
             if packages.has_key(name):
                 package = packages.get(name)
@@ -156,7 +151,6 @@
 
         cmds_binary_arch = []
         cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags_string,))
-        cmds_binary_arch.append(("$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='%s' %s" % (' '.join(["-p%s" % i['Package'] for i in packages_dummy]), makeflags_string),))
         cmds_build = []
         cmds_build.append(("$(MAKE) -f debian/rules.real build %s" % makeflags_string,))
         cmds_setup = []

Modified: dists/sid/linux-2.6.16/debian/templates/control.extra.in
==============================================================================
--- dists/sid/linux-2.6.16/debian/templates/control.extra.in	(original)
+++ dists/sid/linux-2.6.16/debian/templates/control.extra.in	Tue Jun 20 13:08:39 2006
@@ -1,242 +0,0 @@
-Package: kernel-image-2.6-generic
-X-Version-Overwrite-Epoch: 1
-Architecture: alpha
-Section: base
-Priority: extra
-Depends: linux-image-2.6-alpha-generic
-Description: Linux kernel 2.6 image on Alpha machines - transition package
- This package is for transition only.
-
-Package: kernel-image-2.6-smp
-X-Version-Overwrite-Epoch: 1
-Architecture: alpha
-Section: base
-Priority: extra
-Depends: linux-image-2.6-alpha-smp
-Description: Linux kernel 2.6 image on Alpha SMP machines - transition package
- This package is for transition only.
-
-Package: kernel-image-2.6-386
-X-Version-Overwrite-Epoch: 1
-Architecture: i386
-Section: base
-Priority: extra
-Depends: linux-image-2.6-486
-Description: Linux kernel 2.6 image on 486-class machines - transition package
- This package is for transition only.
-
-Package: kernel-image-2.6-686
-X-Version-Overwrite-Epoch: 1
-Architecture: i386
-Section: base
-Priority: extra
-Depends: linux-image-2.6-686
-Description: Linux kernel 2.6 image on PPro/Celeron/PII/PIII/P4 machines - transition package
- This package is for transition only.
-
-Package: kernel-image-2.6-686-smp
-X-Version-Overwrite-Epoch: 1
-Architecture: i386
-Section: base
-Priority: extra
-Depends: linux-image-2.6-686-smp
-Description: Linux kernel 2.6 image on PPro/Celeron/PII/PIII/P4 SMP machines - transition package
- This package is for transition only.
-
-Package: kernel-image-2.6-k7
-X-Version-Overwrite-Epoch: 1
-Architecture: i386
-Section: base
-Priority: extra
-Depends: linux-image-2.6-k7
-Description: Linux kernel 2.6 image on AMD K7 machines - transition package
- This package is for transition only.
-
-Package: kernel-image-2.6-k7-smp
-X-Version-Overwrite-Epoch: 1
-Architecture: i386
-Section: base
-Priority: extra
-Depends: linux-image-2.6-k7-smp
-Description: Linux kernel 2.6 image on AMD K7 SMP machines - transition package
- This package is for transition only.
-
-Package: kernel-image-2.6-itanium
-X-Version-Overwrite-Epoch: 1
-Architecture: ia64
-Section: base
-Priority: extra
-Depends: linux-image-2.6-itanium
-Description: Linux kernel 2.6 image on Itanium machines - transition package
- This package is for transition only.
-
-Package: kernel-image-2.6-itanium-smp
-X-Version-Overwrite-Epoch: 1
-Architecture: ia64
-Section: base
-Priority: extra
-Depends: linux-image-2.6-itanium-smp
-Description: Linux kernel 2.6 image on multi-processor Itanium machines - transition package
- This package is for transition only.
-
-Package: kernel-image-2.6-mckinley
-X-Version-Overwrite-Epoch: 1
-Architecture: ia64
-Section: base
-Priority: extra
-Depends: linux-image-2.6-mckinley
-Description: Linux kernel 2.6 image on Itanium II machines - transition package
- This package is for transition only.
-
-Package: kernel-image-2.6-mckinley-smp
-X-Version-Overwrite-Epoch: 1
-Architecture: ia64
-Section: base
-Priority: extra
-Depends: linux-image-2.6-mckinley-smp
-Description: Linux kernel 2.6 image on multi-processor Itanium II machines - transition package
- This package is for transition only.
-
-Package: kernel-image-powerpc
-X-Version-Overwrite-Epoch: 1
-Architecture: powerpc
-Section: base
-Priority: extra
-Depends: linux-image-powerpc
-Description: Linux kernel image on powerpc-class machines - transition package
- This package is for transition only.
-
-Package: kernel-image-2.6-powerpc
-X-Version-Overwrite-Epoch: 1
-Architecture: powerpc
-Section: base
-Priority: extra
-Depends: linux-image-2.6-powerpc
-Description: Linux kernel 2.6 image on powerpc-class machines - transition package
- This package is for transition only.
-
-Package: kernel-image-powerpc-smp
-X-Version-Overwrite-Epoch: 1
-Architecture: powerpc
-Section: base
-Priority: extra
-Depends: linux-image-powerpc-smp
-Description: Linux kernel image on powerpc-smp-class machines - transition package
- This package is for transition only.
-
-Package: kernel-image-2.6-powerpc-smp
-X-Version-Overwrite-Epoch: 1
-Architecture: powerpc
-Section: base
-Priority: extra
-Depends: linux-image-2.6-powerpc-smp
-Description: Linux kernel 2.6 image on powerpc-smp-class machines - transition package
- This package is for transition only.
-
-Package: kernel-image-power3
-X-Version-Overwrite-Epoch: 1
-Architecture: powerpc
-Section: base
-Priority: extra
-Depends: linux-image-powerpc64
-Description: linux kernel image on power3 - transition package
- This package is for transition only.
-
-Package: kernel-image-2.6-power3
-X-Version-Overwrite-Epoch: 1
-Architecture: powerpc
-Section: base
-Priority: extra
-Depends: linux-image-2.6-powerpc64
-Description: linux kernel 2.6 image on power3 - transition package
- This package is for transition only.
-
-Package: kernel-image-power3-smp
-X-Version-Overwrite-Epoch: 1
-Architecture: powerpc
-Section: base
-Priority: extra
-Depends: linux-image-powerpc64
-Description: linux kernel image on power3 - transition package
- This package is for transition only.
-
-Package: kernel-image-2.6-power3-smp
-X-Version-Overwrite-Epoch: 1
-Architecture: powerpc
-Section: base
-Priority: extra
-Depends: linux-image-2.6-powerpc64
-Description: linux kernel 2.6 image on power3 - transition package
- This package is for transition only.
-
-Package: kernel-image-power4
-X-Version-Overwrite-Epoch: 1
-Architecture: powerpc
-Section: base
-Priority: extra
-Depends: linux-image-powerpc64
-Description: linux kernel image on power4/G5 - transition package
- This package is for transition only.
-
-Package: kernel-image-2.6-power4
-X-Version-Overwrite-Epoch: 1
-Architecture: powerpc
-Section: base
-Priority: extra
-Depends: linux-image-2.6-powerpc64
-Description: linux kernel 2.6 image on power4/G5 - transition package
- This package is for transition only.
-
-Package: kernel-image-power4-smp
-X-Version-Overwrite-Epoch: 1
-Architecture: powerpc
-Section: base
-Priority: extra
-Depends: linux-image-powerpc64
-Description: linux kernel image on power4/G5 - transition package
- This package is for transition only.
-
-Package: kernel-image-2.6-power4-smp
-X-Version-Overwrite-Epoch: 1
-Architecture: powerpc
-Section: base
-Priority: extra
-Depends: linux-image-2.6-powerpc64
-Description: linux kernel 2.6 image on SMP power4/G5 - transition package
- This package is for transition only.
-
-Package: kernel-image-2.6-s390
-Architecture: s390
-Section: base
-Priority: extra
-Depends: linux-image-2.6-s390
-Description: Linux kernel 2.6 image on IBM S/390 machines - transition package
- This package is for transition only.
-
-Package: kernel-image-2.6-s390x
-Architecture: s390
-Section: base
-Priority: extra
-Depends: linux-image-2.6-s390x
-Description: Linux kernel 2.6 image on IBM zSeries machines - transition package
- This package is for transition only.
-
-Package: kernel-image-2.6-sparc64
-X-Version-Overwrite-Epoch: 1
-Architecture: sparc
-Section: base
-Priority: extra
-Depends: linux-image-2.6-sparc64
-Description: Linux kernel 2.6 image on uniprocessor 64-bit UltraSPARC class machines - transition package
- This package is for transition only.
-
-Package: kernel-image-2.6-sparc64-smp
-X-Version-Overwrite-Epoch: 1
-Architecture: sparc
-Section: base
-Priority: extra
-Depends: linux-image-2.6-sparc64-smp
-Description: Linux kernel 2.6 image on multi-processor 64-bit UltraSPARC class machines - transition package
- This package is for transition only.
-
-



More information about the Kernel-svn-changes mailing list