[kernel] r6565 - in dists/sarge-backports/linux-2.6/debian: . arch arch/m68k arch/powerpc arch/powerpc/vserver

[Bastian Blank]

Author: waldi
Date: Sat May 13 20:48:55 2006
New Revision: 6565

Modified:
   dists/sarge-backports/linux-2.6/debian/arch/defines
   dists/sarge-backports/linux-2.6/debian/arch/m68k/defines
   dists/sarge-backports/linux-2.6/debian/arch/powerpc/defines
   dists/sarge-backports/linux-2.6/debian/arch/powerpc/vserver/defines
   dists/sarge-backports/linux-2.6/debian/changelog
   dists/sarge-backports/linux-2.6/debian/templates/control.source.in

Log:
* debian/arch/defines
  - Set abiname to 1-sarge.
  - Use gcc 3.3 as compiler.
* debian/arch/m68k/defines: Remove special compiler setting.
* debian/arch/powerpc/defines, debian/arch/powerpc/vserver/defines:
  Remove powerpc64.
* debian/changelog: Update.
* debian/templates/control.source.in: Use python2.4 instead of python2.4-minimal.


Modified: dists/sarge-backports/linux-2.6/debian/arch/defines
==============================================================================
--- dists/sarge-backports/linux-2.6/debian/arch/defines	(original)
+++ dists/sarge-backports/linux-2.6/debian/arch/defines	Sat May 13 20:48:55 2006
@@ -1,5 +1,5 @@
 [abi]
-abiname: 2
+abiname: 1-sarge
 
 [base]
 arches:
@@ -26,8 +26,7 @@
 yaird: mkinitrd.yaird
 
 [relations]
-gcc: gcc (>= 4:4.0)
-gcc-3.3: gcc-3.3
+gcc: gcc (>> 4:3.3), gcc (<< 4:3.4)
 initramfs-fallback: linux-initramfs-tool
 initramfs-tools: initramfs-tools (>= 0.53)
 yaird: yaird (>= 0.0.12-8)

Modified: dists/sarge-backports/linux-2.6/debian/arch/m68k/defines
==============================================================================
--- dists/sarge-backports/linux-2.6/debian/arch/m68k/defines	(original)
+++ dists/sarge-backports/linux-2.6/debian/arch/m68k/defines	Sat May 13 20:48:55 2006
@@ -1,5 +1,4 @@
 [base]
-compiler: gcc-3.3
 flavours:
  amiga
  atari

Modified: dists/sarge-backports/linux-2.6/debian/arch/powerpc/defines
==============================================================================
--- dists/sarge-backports/linux-2.6/debian/arch/powerpc/defines	(original)
+++ dists/sarge-backports/linux-2.6/debian/arch/powerpc/defines	Sat May 13 20:48:55 2006
@@ -3,7 +3,6 @@
  powerpc
  powerpc-smp
  powerpc-miboot
- powerpc64
 kernel-header-dirs: powerpc ppc m68k
 kernel-arch: powerpc
 kpkg-subarch: ppc

Modified: dists/sarge-backports/linux-2.6/debian/arch/powerpc/vserver/defines
==============================================================================
--- dists/sarge-backports/linux-2.6/debian/arch/powerpc/vserver/defines	(original)
+++ dists/sarge-backports/linux-2.6/debian/arch/powerpc/vserver/defines	Sat May 13 20:48:55 2006
@@ -1,7 +1,6 @@
 [base]
 flavours:
  powerpc
- powerpc64
 
 [powerpc]
 depends: mkvmlinuz (>= 20)

Modified: dists/sarge-backports/linux-2.6/debian/changelog
==============================================================================
--- dists/sarge-backports/linux-2.6/debian/changelog	(original)
+++ dists/sarge-backports/linux-2.6/debian/changelog	Sat May 13 20:48:55 2006
@@ -1,3 +1,9 @@
+linux-2.6 (2.6.16-12kab.1) UNRELEASED; urgency=low
+
+  * Backport to sarge.
+
+ -- Bastian Blank <waldi at debian.org>  Sat, 13 May 2006 22:39:58 +0200
+
 linux-2.6 (2.6.16-13) unstable; urgency=low
 
   [ Frederik Schüler ]

Modified: dists/sarge-backports/linux-2.6/debian/templates/control.source.in
==============================================================================
--- dists/sarge-backports/linux-2.6/debian/templates/control.source.in	(original)
+++ dists/sarge-backports/linux-2.6/debian/templates/control.source.in	Sat May 13 20:48:55 2006
@@ -4,5 +4,5 @@
 Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
 Uploaders: Andres Salomon <dilinger at debian.org>, Bastian Blank <waldi at debian.org>, Simon Horman <horms at debian.org>, Sven Luther <luther at debian.org>, Jonas Smedegaard <dr at jones.dk>, Norbert Tretkowski <nobse at debian.org>, Frederik Schüler <fs at debian.org>, maximilian attems <maks at sternwelten.at>
 Standards-Version: 3.6.1.0
-Build-Depends: debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, sparc-utils [sparc], kernel-package (>= 10.047), ocaml-interp, python, python2.4-minimal
+Build-Depends: debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, sparc-utils [sparc], kernel-package (>= 10.047), ocaml-interp, python, python2.4
 Build-Depends-Indep: docbook-utils, gs, transfig, xmlto