[PATCH 1/1] UBUNTU: rename the debug packages to match archive standard

[Andy Whitcroft]

On Thu, Feb 25, 2010 at 11:36:21AM -0600, Mario Limonciello wrote:
>  
> 
> On 02/25/2010 11:35 AM, Andy Whitcroft wrote:
> > BugLink: http://bugs.launchpad.net/bugs/527837
> >
> > Our .ddebs are expiring after 14 days as the archive cleaner expects
> > the debug packages to have a matching binary package.  That is the
> > prefix if the debug package must match the full name of the binary
> > package.  Rename the debug packages as below:
> >
> >     linux-image-VERSION-ABI-FLAVOUR-debug
> >
> > Signed-off-by: Andy Whitcroft <apw at canonical.com>
> > ---
> >  debian.master/control.d/flavour-control.stub |    2 +-
> >  debian/rules.d/0-common-vars.mk              |    1 -
> >  debian/rules.d/2-binary-arch.mk              |    4 ++--
> >  3 files changed, 3 insertions(+), 4 deletions(-)
> >
> > diff --git a/debian.master/control.d/flavour-control.stub b/debian.master/control.d/flavour-control.stub
> > index 3a30ce1..88c2a69 100644
> > --- a/debian.master/control.d/flavour-control.stub
> > +++ b/debian.master/control.d/flavour-control.stub
> > @@ -60,7 +60,7 @@ Description: Linux kernel headers for version PKGVER on DESC
> >   This is for sites that want the latest kernel headers.  Please read
> >   /usr/share/doc/SRCPKGNAME-headers-PKGVER-ABINUM/debian.README.gz for details.
> >  
> > -Package: linux-image-debug-PKGVER-ABINUM-FLAVOUR
> > +Package: linux-image-PKGVER-ABINUM-FLAVOUR-debug
> >  Architecture: ARCH
> >  Section: devel
> >  Priority: optional
> > diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
> > index 9827504..e125ffc 100644
> > --- a/debian/rules.d/0-common-vars.mk
> > +++ b/debian/rules.d/0-common-vars.mk
> > @@ -86,7 +86,6 @@ stampdir	:= $(CURDIR)/debian/stamps
> >  # assumption that the binary package always starts with linux-image will never change.
> >  #
> >  bin_pkg_name=linux-image-$(abi_release)
> > -dbg_pkg_name=linux-image-debug-$(abi_release)
> >  hdrs_pkg_name=linux-headers-$(abi_release)
> >  #
> >  # The generation of content in the doc package depends on both 'AUTOBUILD=' and
> > diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
> > index 76aa495..a32c61b 100644
> > --- a/debian/rules.d/2-binary-arch.mk
> > +++ b/debian/rules.d/2-binary-arch.mk
> > @@ -40,7 +40,7 @@ $(stampdir)/stamp-build-%: prepare-%
> >  # Install the finished build
> >  install-%: pkgdir = $(CURDIR)/debian/$(bin_pkg_name)-$*
> >  install-%: bindoc = $(pkgdir)/usr/share/doc/$(bin_pkg_name)-$*
> > -install-%: dbgpkgdir = $(CURDIR)/debian/$(dbg_pkg_name)-$*
> > +install-%: dbgpkgdir = $(CURDIR)/debian/$(bin_pkg_name)-$*-debug
> >  install-%: basepkg = $(hdrs_pkg_name)
> >  install-%: hdrdir = $(CURDIR)/debian/$(basepkg)-$*/usr/src/$(basepkg)-$*
> >  install-%: target_flavour = $*
> > @@ -248,7 +248,7 @@ endif
> >  
> >  binary-%: pkgimg = $(bin_pkg_name)-$*
> >  binary-%: pkghdr = $(hdrs_pkg_name)-$*
> > -binary-%: dbgpkg = $(dbg_pkg_name)-$*
> > +binary-%: dbgpkg = $(bin_pkg_name)-$*-debug
> >  binary-%: install-%
> >  	dh_testdir
> >  	dh_testroot
> >   
> Shouldn't these be -dbg then rather than -debug if they're gonna match
> what the rest of the archive is doing?

As I understand things -dbg is the autogenerated ones.  As this isn't
autogenerated then it seems appropriate to use a manual postfix.  The
key issue is to match on prefix.

-apw