[kernel] r11072 - in dists/etch/linux-latest-2.6-etchnhalf: . debian debian/bin debian/templates

[Dann Frazier]

Author: dannf
Date: Fri Apr 11 20:11:34 2008
New Revision: 11072

Log:
create linux-latest branch for etchnhalf

Added:
   dists/etch/linux-latest-2.6-etchnhalf/
      - copied from r11067, /dists/sid/linux-latest-2.6/
Modified:
   dists/etch/linux-latest-2.6-etchnhalf/debian/bin/gencontrol.py
   dists/etch/linux-latest-2.6-etchnhalf/debian/changelog
   dists/etch/linux-latest-2.6-etchnhalf/debian/rules.defs
   dists/etch/linux-latest-2.6-etchnhalf/debian/templates/control.extra.in
   dists/etch/linux-latest-2.6-etchnhalf/debian/templates/control.headers.latest.in
   dists/etch/linux-latest-2.6-etchnhalf/debian/templates/control.image.latest.type-modules.in
   dists/etch/linux-latest-2.6-etchnhalf/debian/templates/control.image.latest.type-standalone.in
   dists/etch/linux-latest-2.6-etchnhalf/debian/templates/control.source.in

Modified: dists/etch/linux-latest-2.6-etchnhalf/debian/bin/gencontrol.py
==============================================================================
--- /dists/sid/linux-latest-2.6/debian/bin/gencontrol.py	(original)
+++ dists/etch/linux-latest-2.6-etchnhalf/debian/bin/gencontrol.py	Fri Apr 11 20:11:34 2008
@@ -16,6 +16,7 @@
         self.version = VersionLinux(config_entry['source'])
         self.abiname = config_entry['abiname']
         self.vars = self.process_version_linux(self.version, self.abiname)
+        self.vars['extraversion'] = '-etchnhalf'
 
         changelog_version = Changelog()[0].version
         self.package_version = '%s+%s' % (self.version.upstream, changelog_version.complete)

Modified: dists/etch/linux-latest-2.6-etchnhalf/debian/changelog
==============================================================================
--- /dists/sid/linux-latest-2.6/debian/changelog	(original)
+++ dists/etch/linux-latest-2.6-etchnhalf/debian/changelog	Fri Apr 11 20:11:34 2008
@@ -1,3 +1,12 @@
+linux-latest-2.6-etchnhalf (13~etchnhalf.1) UNRELEASED; urgency=low
+
+  * Branch and rename source for etchnhalf.
+  * Drop transitional packages. Existing etch users should not migrate
+    to etchnhalf kernels automatically.
+  * Add extraversion to templates to provide 'etchnhalf' string.
+
+ -- dann frazier <dannf at debian.org>  Fri, 11 Apr 2008 13:30:19 -0600
+
 linux-latest-2.6 (13) unstable; urgency=low
 
   * Add transitional packages for k7.

Modified: dists/etch/linux-latest-2.6-etchnhalf/debian/rules.defs
==============================================================================
--- /dists/sid/linux-latest-2.6/debian/rules.defs	(original)
+++ dists/etch/linux-latest-2.6-etchnhalf/debian/rules.defs	Fri Apr 11 20:11:34 2008
@@ -1 +1 @@
-KERNELVERSION := 2.6.24-1
+KERNELVERSION := 2.6.24-etchnhalf.1

Modified: dists/etch/linux-latest-2.6-etchnhalf/debian/templates/control.extra.in
==============================================================================
--- /dists/sid/linux-latest-2.6/debian/templates/control.extra.in	(original)
+++ dists/etch/linux-latest-2.6-etchnhalf/debian/templates/control.extra.in	Fri Apr 11 20:11:34 2008
@@ -1,24 +0,0 @@
-Package: linux-image-k7
-Architecture: i386
-Section: admin
-Priority: extra
-Depends: linux-image-686
-Description: Linux image on AMD K7 - transition package
- This package is for transition only.
-
-Package: linux-image-2.6-k7
-Architecture: i386
-Section: admin
-Priority: extra
-Depends: linux-image-2.6-686
-Description: Linux 2.6 image on AMD K7 - transition package
- This package is for transition only.
-
-Package: linux-headers-2.6-k7
-Architecture: i386
-Section: devel
-Priority: extra
-Depends: linux-headers-2.6-686
-Description: Header files for Linux 2.6 on AMD K7 - transition package
- This package is for transition only.
-

Modified: dists/etch/linux-latest-2.6-etchnhalf/debian/templates/control.headers.latest.in
==============================================================================
--- /dists/sid/linux-latest-2.6/debian/templates/control.headers.latest.in	(original)
+++ dists/etch/linux-latest-2.6-etchnhalf/debian/templates/control.headers.latest.in	Fri Apr 11 20:11:34 2008
@@ -1,9 +1,9 @@
-Package: linux-headers- at major@@localversion@
+Package: linux-headers- at major@@extraversion@@localversion@
 Section: devel
 Priority: optional
 Depends: linux-headers- at upstreamversion@@abiname@@localversion@
-Provides: linux-headers, linux-headers- at major@
-Description: Header files for Linux @major@ on @class@
+Provides: linux-headers, linux-headers- at major@@extraversion@
+Description: Header files for Linux @major@@extraversion@ on @class@
  This package depends on the architecture-specific header files for the latest
- Linux kernel @major@ on @longclass@ machines.
+ Linux kernel @major@@extraversion@ on @longclass@ machines.
 

Modified: dists/etch/linux-latest-2.6-etchnhalf/debian/templates/control.image.latest.type-modules.in
==============================================================================
--- /dists/sid/linux-latest-2.6/debian/templates/control.image.latest.type-modules.in	(original)
+++ dists/etch/linux-latest-2.6-etchnhalf/debian/templates/control.image.latest.type-modules.in	Fri Apr 11 20:11:34 2008
@@ -1,33 +1,25 @@
-Package: linux-image at localversion@
+Package: linux-image- at major@@extraversion@@localversion@
 Section: admin
 Priority: optional
-Depends: linux-image- at major@@localversion@, linux-modules at localversion@
-Description: Linux image on @class@
- This package depends on the latest binary image for Linux kernel on
- @longclass@ machines.
-
-Package: linux-image- at major@@localversion@
-Section: admin
-Priority: optional
-Depends: linux-image- at upstreamversion@@abiname@@localversion@, linux-modules- at major@@localversion@
-Description: Linux @major@ image on @class@
- This package depends on the latest binary image for Linux kernel @major@
+Depends: linux-image- at upstreamversion@@abiname@@localversion@, linux-modules- at major@@extraversion@@localversion@
+Description: Linux @major@@extraversion@ image on @class@
+ This package depends on the latest binary image for Linux kernel @major@@extraversion@
  on @longclass@ machines.
 
 Package: linux-modules at localversion@
 Section: admin
 Priority: optional
-Depends: linux-modules- at major@@localversion@
+Depends: linux-modules- at major@@extraversion@@localversion@
 Description: Linux modules on @class@
  This package depends on the latest pre-built loadable modules for Linux kernel
  on @longclass@ machines.
 
-Package: linux-modules- at major@@localversion@
+Package: linux-modules- at major@@extraversion@@localversion@
 Section: admin
 Priority: optional
 Depends: linux-modules- at upstreamversion@@abiname@@localversion@
 Provides: linux-latest-modules- at upstreamversion@@abiname@@localversion@
-Description: Linux @major@ modules on @class@
+Description: Linux @major@@extraversion@ modules on @class@
  This package depends on the latest pre-built loadable modules for Linux kernel
- @major@ on @longclass@ machines.
+ @major@@extraversion@ on @longclass@ machines.
 

Modified: dists/etch/linux-latest-2.6-etchnhalf/debian/templates/control.image.latest.type-standalone.in
==============================================================================
--- /dists/sid/linux-latest-2.6/debian/templates/control.image.latest.type-standalone.in	(original)
+++ dists/etch/linux-latest-2.6-etchnhalf/debian/templates/control.image.latest.type-standalone.in	Fri Apr 11 20:11:34 2008
@@ -1,16 +1,8 @@
-Package: linux-image at localversion@
-Section: admin
-Priority: optional
-Depends: linux-image- at major@@localversion@
-Description: Linux image on @class@
- This package depends on the latest binary image for Linux kernel on
- @longclass@ machines.
-
-Package: linux-image- at major@@localversion@
+Package: linux-image- at major@@extraversion@@localversion@
 Section: admin
 Priority: optional
 Depends: linux-image- at upstreamversion@@abiname@@localversion@
 Provides: linux-latest-modules- at upstreamversion@@abiname@@localversion@
-Description: Linux @major@ image on @class@
- This package depends on the latest binary image for Linux kernel @major@
+Description: Linux @major@@extraversion@ image on @class@
+ This package depends on the latest binary image for Linux kernel @major@@extraversion@
  on @longclass@ machines.

Modified: dists/etch/linux-latest-2.6-etchnhalf/debian/templates/control.source.in
==============================================================================
--- /dists/sid/linux-latest-2.6/debian/templates/control.source.in	(original)
+++ dists/etch/linux-latest-2.6-etchnhalf/debian/templates/control.source.in	Fri Apr 11 20:11:34 2008
@@ -1,4 +1,4 @@
-Source: linux-latest- at major@
+Source: linux-latest- at major@@extraversion at -etchnhalf
 Section: admin
 Priority: optional
 Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>