r1282 - in trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26: . debian

Simon Horman horms@haydn.debian.org
Mon, 23 Aug 2004 22:28:14 -0600 

Author: horms
Date: 2004-08-23 22:28:02 -0600 (Mon, 23 Aug 2004)
New Revision: 1282

Modified:
   trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/debian/changelog
   trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/debian/control
   trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/post-install
Log:
kernel-image-2.4.26-i686 no longer provides meta packages

Modified: trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/debian/changelog
===================================================================
--- trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/debian/changelog	2004-08-24 04:22:30 UTC (rev 1281)
+++ trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/debian/changelog	2004-08-24 04:28:02 UTC (rev 1282)
@@ -11,8 +11,24 @@
     customised touch command tries to make a fresh copy of a file while
     another process tries to do the same.
   * Build against kernel-tree 2.4.26-6 (closes: #253871)
+  * Removed the following packages which are now provided by
+    kernel-image-2.4.27-i386
+    . kernel-image-2.4-586tsc
+    . kernel-image-2.4-686
+    . kernel-pcmcia-modules-2.4-686-smp
+    . kernel-image-2.4-k7-smp
+    . kernel-pcmcia-modules-2.4-k6
+    . kernel-pcmcia-modules-2.4-686
+    . kernel-image-2.4-686-smp
+    . kernel-image-2.4-k7
+    . kernel-image-2.4-k6
+    . kernel-image-2.4-386
+    . kernel-pcmcia-modules-2.4-k7
+    . kernel-pcmcia-modules-2.4-386
+    . kernel-pcmcia-modules-2.4-k7-smp
+    . kernel-pcmcia-modules-2.4-586tsc
 
- -- Simon Horman <horms@debian.org>  Thu, 29 Jul 2004 19:12:16 +0900
+ -- Simon Horman <horms@debian.org>  Tue, 24 Aug 2004 13:04:46 +0900
 
 kernel-image-2.4.26-i386 (2.4.26-4) unstable; urgency=low
 

Modified: trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/debian/control
===================================================================
--- trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/debian/control	2004-08-24 04:22:30 UTC (rev 1281)
+++ trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/debian/control	2004-08-24 04:28:02 UTC (rev 1282)
@@ -62,25 +62,6 @@
  and it is suggested that you install that package if you wish to
  create a custom kernel from the sources.
 
-Package: kernel-image-2.4-386
-Architecture: i386
-Section: base
-Priority: optional
-Depends: kernel-image-2.4.26-1-386
-Description: Linux kernel image for version 2.4 on 386.
- This package will always depend on the latest 2.4 kernel image available for
- 386.
-
-Package: kernel-pcmcia-modules-2.4-386
-Architecture: i386
-Section: base
-Priority: optional
-Depends: kernel-pcmcia-modules-2.4.26-1-386
-Description: Mainstream PCMCIA modules for version 2.4 on 386.
- This package will always depend on the latest 2.4 mainstream PCMCIA modules
- available for
- 386.
-
 Package: kernel-pcmcia-modules-2.4.26-1-386
 Architecture: i386
 Section: base
@@ -135,25 +116,6 @@
  and it is suggested that you install that package if you wish to
  create a custom kernel from the sources.
 
-Package: kernel-image-2.4-586tsc
-Architecture: i386
-Section: base
-Priority: optional
-Depends: kernel-image-2.4.26-1-586tsc
-Description: Linux kernel image for version 2.4 on Pentium-Classic.
- This package will always depend on the latest 2.4 kernel image available for
- Pentium-Classic.
-
-Package: kernel-pcmcia-modules-2.4-586tsc
-Architecture: i386
-Section: base
-Priority: optional
-Depends: kernel-pcmcia-modules-2.4.26-1-586tsc
-Description: Mainstream PCMCIA modules for version 2.4 on Pentium-Classic.
- This package will always depend on the latest 2.4 mainstream PCMCIA modules
- available for
- Pentium-Classic.
-
 Package: kernel-pcmcia-modules-2.4.26-1-586tsc
 Architecture: i386
 Section: base
@@ -208,25 +170,6 @@
  and it is suggested that you install that package if you wish to
  create a custom kernel from the sources.
 
-Package: kernel-image-2.4-686
-Architecture: i386
-Section: base
-Priority: optional
-Depends: kernel-image-2.4.26-1-686
-Description: Linux kernel image for version 2.4 on PPro/Celeron/PII/PIII/PIV.
- This package will always depend on the latest 2.4 kernel image available for
- Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV.
-
-Package: kernel-pcmcia-modules-2.4-686
-Architecture: i386
-Section: base
-Priority: optional
-Depends: kernel-pcmcia-modules-2.4.26-1-686
-Description: Mainstream PCMCIA modules for version 2.4 on PPro/Celeron/PII/PIII/PIV.
- This package will always depend on the latest 2.4 mainstream PCMCIA modules
- available for
- Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV.
-
 Package: kernel-pcmcia-modules-2.4.26-1-686
 Architecture: i386
 Section: base
@@ -283,27 +226,6 @@
  and it is suggested that you install that package if you wish to
  create a custom kernel from the sources.
 
-Package: kernel-image-2.4-686-smp
-Architecture: i386
-Section: base
-Priority: optional
-Depends: kernel-image-2.4.26-1-686-smp
-Description: Linux kernel image for version 2.4 on PPro/Celeron/PII/PIII/PIV SMP.
- This package will always depend on the latest 2.4 kernel image available for
- Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV with SMP support.
- SMP (symmtric multi-processing) is needed if you have multiple processors.
-
-Package: kernel-pcmcia-modules-2.4-686-smp
-Architecture: i386
-Section: base
-Priority: optional
-Depends: kernel-pcmcia-modules-2.4.26-1-686-smp
-Description: Mainstream PCMCIA modules for version 2.4 on PPro/Celeron/PII/PIII/PIV SMP.
- This package will always depend on the latest 2.4 mainstream PCMCIA modules
- available for
- Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV with SMP support.
- SMP (symmtric multi-processing) is needed if you have multiple processors.
-
 Package: kernel-pcmcia-modules-2.4.26-1-686-smp
 Architecture: i386
 Section: base
@@ -359,25 +281,6 @@
  and it is suggested that you install that package if you wish to
  create a custom kernel from the sources.
 
-Package: kernel-image-2.4-k6
-Architecture: i386
-Section: base
-Priority: optional
-Depends: kernel-image-2.4.26-1-k6
-Description: Linux kernel image for version 2.4 on AMD K6/K6-II/K6-III.
- This package will always depend on the latest 2.4 kernel image available for
- AMD K6/K6-II/K6-III.
-
-Package: kernel-pcmcia-modules-2.4-k6
-Architecture: i386
-Section: base
-Priority: optional
-Depends: kernel-pcmcia-modules-2.4.26-1-k6
-Description: Mainstream PCMCIA modules for version 2.4 on AMD K6/K6-II/K6-III.
- This package will always depend on the latest 2.4 mainstream PCMCIA modules
- available for
- AMD K6/K6-II/K6-III.
-
 Package: kernel-pcmcia-modules-2.4.26-1-k6
 Architecture: i386
 Section: base
@@ -432,25 +335,6 @@
  and it is suggested that you install that package if you wish to
  create a custom kernel from the sources.
 
-Package: kernel-image-2.4-k7
-Architecture: i386
-Section: base
-Priority: optional
-Depends: kernel-image-2.4.26-1-k7
-Description: Linux kernel image for version 2.4 on AMD K7.
- This package will always depend on the latest 2.4 kernel image available for
- AMD Duron/Athlon.
-
-Package: kernel-pcmcia-modules-2.4-k7
-Architecture: i386
-Section: base
-Priority: optional
-Depends: kernel-pcmcia-modules-2.4.26-1-k7
-Description: Mainstream PCMCIA modules for version 2.4 on AMD K7.
- This package will always depend on the latest 2.4 mainstream PCMCIA modules
- available for
- AMD Duron/Athlon.
-
 Package: kernel-pcmcia-modules-2.4.26-1-k7
 Architecture: i386
 Section: base
@@ -507,27 +391,6 @@
  and it is suggested that you install that package if you wish to
  create a custom kernel from the sources.
 
-Package: kernel-image-2.4-k7-smp
-Architecture: i386
-Section: base
-Priority: optional
-Depends: kernel-image-2.4.26-1-k7-smp
-Description: Linux kernel image for version 2.4 on AMD K7 SMP.
- This package will always depend on the latest 2.4 kernel image available for
- AMD Duron/Athlon with SMP support.
- SMP (symmtric multi-processing) is needed if you have multiple processors.
-
-Package: kernel-pcmcia-modules-2.4-k7-smp
-Architecture: i386
-Section: base
-Priority: optional
-Depends: kernel-pcmcia-modules-2.4.26-1-k7-smp
-Description: Mainstream PCMCIA modules for version 2.4 on AMD K7 SMP.
- This package will always depend on the latest 2.4 mainstream PCMCIA modules
- available for
- AMD Duron/Athlon with SMP support.
- SMP (symmtric multi-processing) is needed if you have multiple processors.
-
 Package: kernel-pcmcia-modules-2.4.26-1-k7-smp
 Architecture: i386
 Section: base

Modified: trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/post-install
===================================================================
--- trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/post-install	2004-08-24 04:22:30 UTC (rev 1281)
+++ trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/post-install	2004-08-24 04:28:02 UTC (rev 1282)
@@ -39,18 +39,6 @@
 debhelper_post $pkg
 
 suffix=${version#*$debnum-}
-prefix=${version%.*}
-
-
-for pkg in \
-	kernel-image-$prefix-$suffix \
-	kernel-pcmcia-modules-$prefix-$suffix
-do
-	debhelper_pre $pkg
-	debhelper_post $pkg
-done
-
-
 prefix=${version%%-*}$debnum
 pkg=kernel-headers-$version
 top=$PWD/debian/$pkg