r3724 - in trunk/kernel/source/linux-2.6/debian: . bin templates

[Bastian Blank]

Author: waldi
Date: 2005-08-07 21:01:54 +0000 (Sun, 07 Aug 2005)
New Revision: 3724

Added:
   trunk/kernel/source/linux-2.6/debian/templates/control.headers.main.in
Removed:
   trunk/kernel/source/linux-2.6/debian/templates/control.headers.flavour.in
Modified:
   trunk/kernel/source/linux-2.6/debian/
   trunk/kernel/source/linux-2.6/debian/bin/gencontrol.py
   trunk/kernel/source/linux-2.6/debian/templates/control.headers.in
   trunk/kernel/source/linux-2.6/debian/templates/control.image.latest.in
Log:
 r3721 at costa:  waldi | 2005-08-07 20:40:12 +0000
 Make template names easier.
 
 * debian/bin/gencontrol.py: Use updates template names.
 * debian/templates/control.headers.in: Move from control.headers.flavour.in.
 * debian/templates/control.headers.main.in: Move from control.headers.in.
 
 r3722 at costa:  waldi | 2005-08-07 20:51:49 +0000
 * debian/bin/gencontrol.py: Reorder packages.
 * debian/templates/control.image.latest.in: Add general dependency package.
 



Property changes on: trunk/kernel/source/linux-2.6/debian
___________________________________________________________________
Name: svk:merge
   - 510b9475-24dd-0310-9b6c-e0eefe99d49f:/people/waldi/kernel/source/linux-2.6/debian:3715
   + 510b9475-24dd-0310-9b6c-e0eefe99d49f:/people/waldi/kernel/source/linux-2.6/debian:3722

Modified: trunk/kernel/source/linux-2.6/debian/bin/gencontrol.py
===================================================================
--- trunk/kernel/source/linux-2.6/debian/bin/gencontrol.py	2005-08-07 20:58:32 UTC (rev 3723)
+++ trunk/kernel/source/linux-2.6/debian/bin/gencontrol.py	2005-08-07 21:01:54 UTC (rev 3724)
@@ -300,14 +300,14 @@
     tree = read_template("tree")
     packages.append(process_real_tree(tree[0], changelog, vars))
 
-    headers = read_template("headers")
+    headers_main = read_template("headers.main")
     a = subarches_architecture[None].keys()
     a.sort()
     b = vars.copy()
     b['arch'] = ' '.join(a)
-    packages.append(process_real_package(headers[0], b))
+    packages.append(process_real_package(headers_main[0], b))
 
-    headers_flavour = read_template("headers.flavour")
+    headers = read_template("headers")
     headers_latest = read_template("headers.latest")
     image = read_template("image")
     image_latest = read_template("image.latest")
@@ -341,10 +341,10 @@
                 if not flavour_vars.has_key('longclass'):
                     flavour_vars['longclass'] = flavour_vars['class']
 
-                packages.append(process_real_package(headers_flavour[0], flavour_vars))
+                packages.extend(process_real_packages(image_latest, flavour_vars))
+                packages.append(process_real_image(image[0], flavour_vars))
                 packages.append(process_real_package(headers_latest[0], flavour_vars))
-                packages.append(process_real_image(image[0], flavour_vars))
-                packages.append(process_real_package(image_latest[0], flavour_vars))
+                packages.append(process_real_package(headers[0], flavour_vars))
 
     write_control(packages)
 

Deleted: trunk/kernel/source/linux-2.6/debian/templates/control.headers.flavour.in
===================================================================
--- trunk/kernel/source/linux-2.6/debian/templates/control.headers.flavour.in	2005-08-07 20:58:32 UTC (rev 3723)
+++ trunk/kernel/source/linux-2.6/debian/templates/control.headers.flavour.in	2005-08-07 21:01:54 UTC (rev 3724)
@@ -1,13 +0,0 @@
-Package: linux-headers- at subarch@@version at -@abiname at -@flavour@
-Architecture: @arch@
-Section: devel
-Priority: optional
-Depends: coreutils | fileutils (>= 4.0), linux-headers- at subarch@@version at -@abiname@
-Provides: linux-headers, linux-headers- at major@
-Description: Architecture-specific header files for Linux kernel @version@ on @class@ machines
- This package provides the architecture-specific kernel header files
- for Linux kernel @version@ on @class@ machines, generally
- used for building out-of-tree kernel modules.  These files are going to be
- installed into /usr/src/linux-headers- at subarch@@version at -@abiname at -@flavour@, and can
- be used for building modules that load into the kernel provided by the
- linux-image- at subarch@@version at -@abiname at -@flavour@ package.

Modified: trunk/kernel/source/linux-2.6/debian/templates/control.headers.in
===================================================================
--- trunk/kernel/source/linux-2.6/debian/templates/control.headers.in	2005-08-07 20:58:32 UTC (rev 3723)
+++ trunk/kernel/source/linux-2.6/debian/templates/control.headers.in	2005-08-07 21:01:54 UTC (rev 3724)
@@ -1,17 +1,13 @@
-Package: linux-headers- at version@- at abiname@
+Package: linux-headers- at subarch@@version at -@abiname at -@flavour@
 Architecture: @arch@
 Section: devel
 Priority: optional
-Depends: coreutils | fileutils (>= 4.0)
+Depends: coreutils | fileutils (>= 4.0), linux-headers- at subarch@@version at -@abiname@
 Provides: linux-headers, linux-headers- at major@
-Description: Common architecture-specific header files for Linux kernel @version@
- This package provides the (sub)architecture-specific common kernel header files
- for Linux kernel version @version@, generally used for building out-of-tree
- kernel modules. To obtain a complete set of headers you also need to install
- the linux-headers- at version@- at abiname@-(flavour) package, matching the
- flavour of the kernel you intend the build for. To obtain such a set for the
- currently running kernel it is sufficient to run a command
- .
- apt-get install linux-headers- at version@- at abiname@-$(uname -r)
- .
- and it will be unpacked in /usr/src/linux-headers- at version@- at abiname@-(flavour).
+Description: Architecture-specific header files for Linux kernel @version@ on @class@ machines
+ This package provides the architecture-specific kernel header files
+ for Linux kernel @version@ on @class@ machines, generally
+ used for building out-of-tree kernel modules.  These files are going to be
+ installed into /usr/src/linux-headers- at subarch@@version at -@abiname at -@flavour@, and can
+ be used for building modules that load into the kernel provided by the
+ linux-image- at subarch@@version at -@abiname at -@flavour@ package.

Added: trunk/kernel/source/linux-2.6/debian/templates/control.headers.main.in
===================================================================
--- trunk/kernel/source/linux-2.6/debian/templates/control.headers.main.in	2005-08-07 20:58:32 UTC (rev 3723)
+++ trunk/kernel/source/linux-2.6/debian/templates/control.headers.main.in	2005-08-07 21:01:54 UTC (rev 3724)
@@ -0,0 +1,17 @@
+Package: linux-headers- at version@- at abiname@
+Architecture: @arch@
+Section: devel
+Priority: optional
+Depends: coreutils | fileutils (>= 4.0)
+Provides: linux-headers, linux-headers- at major@
+Description: Common architecture-specific header files for Linux kernel @version@
+ This package provides the (sub)architecture-specific common kernel header files
+ for Linux kernel version @version@, generally used for building out-of-tree
+ kernel modules. To obtain a complete set of headers you also need to install
+ the linux-headers- at version@- at abiname@-(flavour) package, matching the
+ flavour of the kernel you intend the build for. To obtain such a set for the
+ currently running kernel it is sufficient to run a command
+ .
+ apt-get install linux-headers- at version@- at abiname@-$(uname -r)
+ .
+ and it will be unpacked in /usr/src/linux-headers- at version@- at abiname@-(flavour).

Modified: trunk/kernel/source/linux-2.6/debian/templates/control.image.latest.in
===================================================================
--- trunk/kernel/source/linux-2.6/debian/templates/control.image.latest.in	2005-08-07 20:58:32 UTC (rev 3723)
+++ trunk/kernel/source/linux-2.6/debian/templates/control.image.latest.in	2005-08-07 21:01:54 UTC (rev 3724)
@@ -1,3 +1,12 @@
+Package: linux-image- at subarch@@flavour@
+Architecture: @arch@
+Section: base
+Priority: optional
+Depends: linux-image- at subarch@@major at -@flavour@
+Description: Linux kernel image on @class@ machines
+ This package depends on the latest binary image for Linux kernel on
+ @longclass@ machines.
+
 Package: linux-image- at subarch@@major at -@flavour@
 Architecture: @arch@
 Section: base
@@ -3,5 +12,4 @@
 Priority: optional
 Depends: linux-image- at subarch@@version at -@abiname at -@flavour@
-Suggests: linux-doc- at version@ | linux-source- at version@
 Description: Linux kernel @major@ image on @class@ machines
  This package depends on the latest binary image for Linux kernel @major@