[PATCH] Make linux-doc non-versioned, fixing 382115 and 247517

[Tim Gardner]

Colin Watson wrote:
> On Sun, Jun 21, 2009 at 02:56:26PM +0100, Matt Zimmerman wrote:
>> Unfortunately, this change caused a problem:
>> 
>> http://launchpadlibrarian.net/28126940/upload_1084377_log.txt
>> 
>> 2009-06-19 22:58:57 WARNING Upload was rejected: 2009-06-19
>> 22:58:57 WARNING 	linux-doc_2.6.30-10.11_all.deb: Version older
>> than that in the archive. 2.6.30-10.11 <= 2.6.30.9.8
>> 
>> I didn't notice that linux-meta and linux used different version
>> numbering schemes: linux is at 2.6.30-10.11 while linux-meta is at
>> 2.6.30.9.8 (note the differing punctuation).
>> 
>> Some possible ways to fix this:
>> 
>> * Use the linux-meta scheme in both places (it's a native package
>> anyway)
> 
> It's native right now, but we usually try to change it to non-native 
> once the real upstream 2.6.X release has happened, so that we're 
> shipping a corresponding .orig.tar.gz in the archive and our changes
> are easy to see without having to figure out revision control
> details.
> 
>> * Upload the next linux-meta (which should drop linux-doc) and then
>> try again after the old linux-doc has been removed (may need manual
>>  intervention)
> 
> I'm not willing to intervene manually for this purpose (and I don't 
> think the Soyuz team should do so either) unless there is absolutely
> no other way. I realise it only affects upgrades within Karmic, but
> it sets a bad precedent.
> 
>> * Artificially and temporarily inflate the version number on
>> linux-doc only (and let the problem solve itself with 2.6.31)
> 
> I'd be happy to supply a patch for this, but 2.6.30-10.11 doesn't
> seem to be in git. Did somebody forget to push?
> 

Yes, somebody forgot to push.

I am a bit confused by the conflict. The Karmic archive currently
contains linux-doc-2.6.30_2.6.30.9.10. The most recent kernel upload
should have produced linux-doc_2.6.30-10.11, which is a different
package name, right?

Or is it conflicting with the existing linux-meta package which is also
named linux-doc_2.6.30-* ? That must be it.

rtg
-- 
Tim Gardner tim.gardner at canonical.com