Patchwork Clean up sections in linux-backports-modules

login
register
mail settings
Submitter Colin Watson
Date Oct. 9, 2009, 12:17 p.m.
Message ID <20091009121702.GV13423@riva.ucam.org>
Download mbox | patch
Permalink /patch/35616/
State Accepted
Headers show

Comments

Colin Watson - Oct. 9, 2009, 12:17 p.m.
This patch would have saved me some time in archive processing today; it
cleans up Section fields to match the overrides in the archive. We don't
use Section: base any more.

I'm not sending this in 'git format-patch' form because you ought to run
'debian/rules debian/control' before applying it, and the git repository
still has generated files referring to 2.6.31-11, which makes the patch
rather noisy and hard to read.


Thanks,
Tim Gardner - Oct. 9, 2009, 1:05 p.m.
Colin Watson wrote:
> This patch would have saved me some time in archive processing today; it
> cleans up Section fields to match the overrides in the archive. We don't
> use Section: base any more.
> 
> I'm not sending this in 'git format-patch' form because you ought to run
> 'debian/rules debian/control' before applying it, and the git repository
> still has generated files referring to 2.6.31-11, which makes the patch
> rather noisy and hard to read.
> 
> diff --git a/debian/control.d/flavour-control.stub b/debian/control.d/flavour-control.stub
> index 67e9b4d..9939509 100644
> --- a/debian/control.d/flavour-control.stub
> +++ b/debian/control.d/flavour-control.stub
> @@ -25,7 +25,7 @@ Description: Ubuntu supplied Linux modules for version PKGVER on DESC
>  
>  Package: linux-headers-lbm-PKGVER-ABINUM-FLAVOUR
>  Architecture: ARCH
> -Section: SECTION_IMAGE
> +Section: SECTION_HEADERS
>  Priority: optional
>  Depends: coreutils | fileutils (>= 4.0), linux-headers-PKGVER-ABINUM-FLAVOUR
>  Provides: linux-headers-lbm, linux-headers-lbm-2.6
> diff --git a/debian/control.stub.in b/debian/control.stub.in
> index f76299a..9c0d6fe 100644
> --- a/debian/control.stub.in
> +++ b/debian/control.stub.in
> @@ -1,5 +1,5 @@
>  Source: linux-backports-modules-PKGVER
> -Section: base
> +Section: admin
>  Priority: optional
>  Maintainer: Ubuntu Kernel Team <kernel-team@lists.ubuntu.com>
>  Standards-Version: 3.6.1
> diff --git a/debian/scripts/control-create b/debian/scripts/control-create
> index 58edbde..eef7f9d 100755
> --- a/debian/scripts/control-create
> +++ b/debian/scripts/control-create
> @@ -4,7 +4,7 @@ stub=debian/control.d/flavour-control.stub
>  vars=$1
>  
>  # Defaults
> -section_image=base
> +section_image=admin
>  section_headers=devel
>  
>  . $vars
> @@ -20,4 +20,5 @@ cat $stub | grep -v '^#' | sed			\
>  	-e "s#DESC#$desc#g"			\
>  	-e "s#ARCH#$arch#g"			\
>  	-e "s#=PROVIDES=#$provides#g"		\
> -	-e "s#SECTION_IMAGE#$section_image#g"
> +	-e "s#SECTION_IMAGE#$section_image#g"	\
> +	-e "s#SECTION_HEADERS#$section_headers#g"
> 
> Thanks,
> 

applied

Patch

diff --git a/debian/control.d/flavour-control.stub b/debian/control.d/flavour-control.stub
index 67e9b4d..9939509 100644
--- a/debian/control.d/flavour-control.stub
+++ b/debian/control.d/flavour-control.stub
@@ -25,7 +25,7 @@  Description: Ubuntu supplied Linux modules for version PKGVER on DESC
 
 Package: linux-headers-lbm-PKGVER-ABINUM-FLAVOUR
 Architecture: ARCH
-Section: SECTION_IMAGE
+Section: SECTION_HEADERS
 Priority: optional
 Depends: coreutils | fileutils (>= 4.0), linux-headers-PKGVER-ABINUM-FLAVOUR
 Provides: linux-headers-lbm, linux-headers-lbm-2.6
diff --git a/debian/control.stub.in b/debian/control.stub.in
index f76299a..9c0d6fe 100644
--- a/debian/control.stub.in
+++ b/debian/control.stub.in
@@ -1,5 +1,5 @@ 
 Source: linux-backports-modules-PKGVER
-Section: base
+Section: admin
 Priority: optional
 Maintainer: Ubuntu Kernel Team <kernel-team@lists.ubuntu.com>
 Standards-Version: 3.6.1
diff --git a/debian/scripts/control-create b/debian/scripts/control-create
index 58edbde..eef7f9d 100755
--- a/debian/scripts/control-create
+++ b/debian/scripts/control-create
@@ -4,7 +4,7 @@  stub=debian/control.d/flavour-control.stub
 vars=$1
 
 # Defaults
-section_image=base
+section_image=admin
 section_headers=devel
 
 . $vars
@@ -20,4 +20,5 @@  cat $stub | grep -v '^#' | sed			\
 	-e "s#DESC#$desc#g"			\
 	-e "s#ARCH#$arch#g"			\
 	-e "s#=PROVIDES=#$provides#g"		\
-	-e "s#SECTION_IMAGE#$section_image#g"
+	-e "s#SECTION_IMAGE#$section_image#g"	\
+	-e "s#SECTION_HEADERS#$section_headers#g"