r3311 - in trunk/kernel/ia64/kernel-image-2.6.11-ia64-2.6.11: . debian

[Dann Frazier]

Author: dannf
Date: 2005-06-12 16:43:47 +0000 (Sun, 12 Jun 2005)
New Revision: 3311

Modified:
   trunk/kernel/ia64/kernel-image-2.6.11-ia64-2.6.11/debian/changelog
   trunk/kernel/ia64/kernel-image-2.6.11-ia64-2.6.11/debian/control
   trunk/kernel/ia64/kernel-image-2.6.11-ia64-2.6.11/post-install
Log:
Include metapackages again.


Modified: trunk/kernel/ia64/kernel-image-2.6.11-ia64-2.6.11/debian/changelog
===================================================================
--- trunk/kernel/ia64/kernel-image-2.6.11-ia64-2.6.11/debian/changelog	2005-06-12 16:32:52 UTC (rev 3310)
+++ trunk/kernel/ia64/kernel-image-2.6.11-ia64-2.6.11/debian/changelog	2005-06-12 16:43:47 UTC (rev 3311)
@@ -3,8 +3,10 @@
   * Drop de4x5 module from build.  This module is deprecated.
     See #281569 and #294867.
   * Rebuild against kernel-tree-2.6.11-6
+  * Include metapackages again.  Sarge has released, so we can make 2.6.11
+    the default kernel in sid now.
 
- -- dann frazier <dannf@debian.org>  Sat, 11 Jun 2005 13:51:24 -0600
+ -- dann frazier <dannf@hp.com>  Sun, 12 Jun 2005 10:46:40 -0600
 
 kernel-image-2.6.11-ia64 (2.6.11-4) unstable; urgency=low
 

Modified: trunk/kernel/ia64/kernel-image-2.6.11-ia64-2.6.11/debian/control
===================================================================
--- trunk/kernel/ia64/kernel-image-2.6.11-ia64-2.6.11/debian/control	2005-06-12 16:32:52 UTC (rev 3310)
+++ trunk/kernel/ia64/kernel-image-2.6.11-ia64-2.6.11/debian/control	2005-06-12 16:43:47 UTC (rev 3311)
@@ -27,9 +27,18 @@
  This package provides kernel header files for version 2.6.11 on
  Itanium,
  for sites that want the latest kernel headers.
- Please read /usr/share/doc/kernel-headers-2.6.11-1-itanium/debian.README.gz for
- details.
+ Please read /usr/share/doc/kernel-headers-2.6.11-1-itanium/debian.README.gz
+ for details.
 
+Package: kernel-headers-2.6-itanium
+Architecture: ia64
+Section: devel
+Priority: optional
+Depends: kernel-headers-2.6.11-1-itanium
+Description: Linux kernel headers 2.6 on Itanium
+ This package will always depend on the latest 2.6 kernel headers available
+ for Itanium.
+
 Package: kernel-image-2.6.11-1-itanium
 Architecture: ia64
 Section: base
@@ -49,6 +58,15 @@
  and it is suggested that you install that package if you wish to
  create a custom kernel from the sources.
 
+Package: kernel-image-2.6-itanium
+Architecture: ia64
+Section: base
+Priority: optional
+Depends: kernel-image-2.6.11-1-itanium
+Description: Linux kernel image for version 2.6 on Itanium
+ This package will always depend on the latest 2.6 kernel image available
+ for Itanium.
+
 Package: kernel-headers-2.6.11-1-itanium-smp
 Architecture: ia64
 Section: devel
@@ -64,6 +82,16 @@
  /usr/share/doc/kernel-headers-2.6.11-1-itanium-smp/debian.README.gz for
  details.
 
+Package: kernel-headers-2.6-itanium-smp
+Architecture: ia64
+Section: devel
+Priority: optional
+Depends: kernel-headers-2.6.11-1-itanium-smp
+Description: Linux kernel headers 2.6 on Itanium SMP
+ This package will always depend on the latest 2.6 kernel headers available
+ for Itanium with SMP support.
+ SMP (symmetric multi-processing) is needed if you have multiple processors.
+
 Package: kernel-image-2.6.11-1-itanium-smp
 Architecture: ia64
 Section: base
@@ -84,6 +112,16 @@
  and it is suggested that you install that package if you wish to
  create a custom kernel from the sources.
 
+Package: kernel-image-2.6-itanium-smp
+Architecture: ia64
+Section: base
+Priority: optional
+Depends: kernel-image-2.6.11-1-itanium-smp
+Description: Linux kernel image for version 2.6 on Itanium SMP
+ This package will always depend on the latest 2.6 kernel image available
+ for Itanium with SMP support.
+ SMP (symmetric multi-processing) is needed if you have multiple processors.
+
 Package: kernel-headers-2.6.11-1-mckinley
 Architecture: ia64
 Section: devel
@@ -98,6 +136,15 @@
  /usr/share/doc/kernel-headers-2.6.11-1-mckinley/debian.README.gz for
  details.
 
+Package: kernel-headers-2.6-mckinley
+Architecture: ia64
+Section: devel
+Priority: optional
+Depends: kernel-headers-2.6.11-1-mckinley
+Description: Linux kernel headers 2.6 on Itanium II
+ This package will always depend on the latest 2.6 kernel headers available
+ for Itanium II (also known as McKinley)
+
 Package: kernel-image-2.6.11-1-mckinley
 Architecture: ia64
 Section: base
@@ -117,6 +164,15 @@
  and it is suggested that you install that package if you wish to
  create a custom kernel from the sources.
 
+Package: kernel-image-2.6-mckinley
+Architecture: ia64
+Section: base
+Priority: optional
+Depends: kernel-image-2.6.11-1-mckinley
+Description: Linux kernel image for version 2.6 on Itanium II
+ This package will always depend on the latest 2.6 kernel image available
+ for Itanium II (also known as McKinley).
+
 Package: kernel-headers-2.6.11-1-mckinley-smp
 Architecture: ia64
 Section: devel
@@ -132,6 +188,16 @@
  /usr/share/doc/kernel-headers-2.6.11-1-mckinley-smp/debian.README.gz for
  details.
 
+Package: kernel-headers-2.6-mckinley-smp
+Architecture: ia64
+Section: devel
+Priority: optional
+Depends: kernel-headers-2.6.11-1-mckinley-smp
+Description: Linux kernel headers 2.6 on Itanium II SMP
+ This package will always depend on the latest 2.6 kernel headers available
+ for Itanium II (also known as McKinley) with SMP support.
+ SMP (symmetric multi-processing) is needed if you have multiple processors.
+
 Package: kernel-image-2.6.11-1-mckinley-smp
 Architecture: ia64
 Section: base
@@ -151,3 +217,13 @@
  Kernel image packages are generally produced using kernel-package,
  and it is suggested that you install that package if you wish to
  create a custom kernel from the sources.
+
+Package: kernel-image-2.6-mckinley-smp
+Architecture: ia64
+Section: base
+Priority: optional
+Depends: kernel-image-2.6.11-1-mckinley-smp
+Description: Linux kernel image for version 2.6 on Itanium II SMP
+This package will always depend on the latest 2.6 kernel image available
+ for Itanium II (also known as McKinley) with SMP support.
+ SMP (symmetric multi-processing) is needed if you have multiple processors.

Modified: trunk/kernel/ia64/kernel-image-2.6.11-ia64-2.6.11/post-install
===================================================================
--- trunk/kernel/ia64/kernel-image-2.6.11-ia64-2.6.11/post-install	2005-06-12 16:32:52 UTC (rev 3310)
+++ trunk/kernel/ia64/kernel-image-2.6.11-ia64-2.6.11/post-install	2005-06-12 16:43:47 UTC (rev 3311)
@@ -22,6 +22,14 @@
 suffix=${version#*$debnum-}
 prefix=${version%.*}
 
+## generate metapackages
+for pkg in \
+  kernel-headers-$prefix-$suffix kernel-image-$prefix-$suffix
+do
+  debhelper_pre $pkg
+  debhelper_post $pkg
+done
+
 prefix=$DEBIAN_UPSTREAM_VERSION$debnum
 pkg=kernel-headers-$version
 top=$PWD/debian/$pkg