diff -Nru /tmp/XjNiXe0JdD/apt-show-versions-0.12/apt-show-versions /tmp/ro4FTxi3gh/apt-show-versions-0.12ubuntu1/apt-show-versions --- /tmp/XjNiXe0JdD/apt-show-versions-0.12/apt-show-versions 2008-01-02 17:56:11.000000000 +0100 +++ /tmp/ro4FTxi3gh/apt-show-versions-0.12ubuntu1/apt-show-versions 2008-01-09 08:52:17.000000000 +0100 @@ -181,7 +181,7 @@ my $archiv; $archiv = `fgrep -s Archive $release` or $archiv = `fgrep -s Suite $release` or - ($release =~ /(potato|woody|sarge|etch|lenny|sid|stable|testing|unstable|experimental)/ and $archiv = $1) or + ($release =~ /(warty|hoary|breezy|dapper|edgy|feisty|gutsy|hardy|potato|woody|sarge|etch|lenny|sid|stable|testing|unstable|experimental)/ and $archiv = $1) or $archiv = "unknown"; # next; $archiv =~ s/Archive: //; diff -Nru /tmp/XjNiXe0JdD/apt-show-versions-0.12/debian/changelog /tmp/ro4FTxi3gh/apt-show-versions-0.12ubuntu1/debian/changelog --- /tmp/XjNiXe0JdD/apt-show-versions-0.12/debian/changelog 2008-01-02 18:02:52.000000000 +0100 +++ /tmp/ro4FTxi3gh/apt-show-versions-0.12ubuntu1/debian/changelog 2008-01-09 09:22:00.000000000 +0100 @@ -1,3 +1,13 @@ +apt-show-versions (0.12ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP: #180441). Remaining Ubuntu changes: + - apt-show-versions: add Ubuntu releases to release names list. + * debian/ubuntu-patches/10_releases.patch: update to current Ubuntu releases. + * Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Andrea Colangelo Wed, 09 Jan 2008 09:03:20 +0100 + apt-show-versions (0.12) unstable; urgency=low [ Andreas Hoenen ] @@ -45,6 +55,33 @@ -- Christoph Martin Mon, 3 Dec 2007 13:06:12 +0100 +apt-show-versions (0.10ubuntu4) hardy; urgency=low + + * Add Hardy to the list of release names. (LP: #162091) + + -- Andrea Colangelo Sun, 11 Nov 2007 23:38:11 +0100 + +apt-show-versions (0.10ubuntu3) gutsy; urgency=low + + * Add gutsy to the list of releases. (LP: #115065) + * Replace Maintainer field. + + -- William Grant Thu, 17 May 2007 18:11:04 +1000 + +apt-show-versions (0.10ubuntu2) feisty; urgency=low + + * Add feisty to list of release names as well. Thanks to + Mikael Nilsson for the patch (closes lp#732). + + -- Stefan Potyra Mon, 11 Dec 2006 22:33:27 +0100 + +apt-show-versions (0.10ubuntu1) edgy; urgency=low + + * Merge from debian unstable. + * Add edgy to the list of release names. + + -- Jeremie Corbier Sun, 13 Aug 2006 12:17:03 +0200 + apt-show-versions (0.10) unstable; urgency=low * use full patch of apt-show-versions in postinsts (closes: #352960) @@ -56,6 +93,13 @@ -- Christoph Martin Wed, 9 Aug 2006 10:51:38 +0200 +apt-show-versions (0.09ubuntu1) dapper; urgency=low + + * Include patch from Alan Tam to match ubuntu's release names + (closes: lp#732, lp#30526, lp#37820). + + -- Stefan Potyra Fri, 26 May 2006 13:26:40 +0200 + apt-show-versions (0.09) unstable; urgency=low * include etch and experimental as releases (closes: #316620) @@ -150,4 +194,3 @@ -- Christoph Martin Tue, 4 Dec 2001 16:02:17 +0100 - diff -Nru /tmp/XjNiXe0JdD/apt-show-versions-0.12/debian/control /tmp/ro4FTxi3gh/apt-show-versions-0.12ubuntu1/debian/control --- /tmp/XjNiXe0JdD/apt-show-versions-0.12/debian/control 2008-01-02 17:56:11.000000000 +0100 +++ /tmp/ro4FTxi3gh/apt-show-versions-0.12ubuntu1/debian/control 2008-01-09 09:03:19.000000000 +0100 @@ -1,7 +1,8 @@ Source: apt-show-versions Section: admin Priority: optional -Maintainer: Christoph Martin +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Christoph Martin Uploaders: Andreas Hoenen Build-Depends: debhelper (>= 5) Build-Depends-Indep: po4a diff -Nru /tmp/XjNiXe0JdD/apt-show-versions-0.12/debian/ubuntu-patches/10_releases.patch /tmp/ro4FTxi3gh/apt-show-versions-0.12ubuntu1/debian/ubuntu-patches/10_releases.patch --- /tmp/XjNiXe0JdD/apt-show-versions-0.12/debian/ubuntu-patches/10_releases.patch 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/ro4FTxi3gh/apt-show-versions-0.12ubuntu1/debian/ubuntu-patches/10_releases.patch 2008-01-09 09:20:14.000000000 +0100 @@ -0,0 +1,11 @@ +--- apt-show-versions.orig/apt-show-versions 2008-01-02 17:56:11.000000000 +0100 ++++ apt-show-versions/apt-show-versions.patched 2008-01-09 09:16:30.000000000 +0100 +@@ -181,7 +181,7 @@ foreach (@files) { + my $archiv; + $archiv = `fgrep -s Archive $release` or + $archiv = `fgrep -s Suite $release` or +- ($release =~ /(potato|woody|sarge|etch|lenny|sid|stable|testing|unstable|experimental)/ and $archiv = $1) or ++ ($release =~ /(warty|hoary|breezy|dapper|edgy|feisty|gutsy|hardy|potato|woody|sarge|etch|lenny|sid|stable|testing|unstable|experimental)/ and $archiv = $1) or + $archiv = "unknown"; + # next; + $archiv =~ s/Archive: //; diff -Nru /tmp/XjNiXe0JdD/apt-show-versions-0.12/debian/ubuntu-patches/README /tmp/ro4FTxi3gh/apt-show-versions-0.12ubuntu1/debian/ubuntu-patches/README --- /tmp/XjNiXe0JdD/apt-show-versions-0.12/debian/ubuntu-patches/README 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/ro4FTxi3gh/apt-show-versions-0.12ubuntu1/debian/ubuntu-patches/README 2008-01-02 22:31:41.000000000 +0100 @@ -0,0 +1,9 @@ +This directory contains patches from ubuntu, which are already applied +against the sourcepackage. It's here only for convenience. + +* 10_releases.patch: + Adjust the releases to ubuntu release names. Patch from Alan Tam + (https://launchpad.net/distros/ubuntu/+source/apt-show-versions/+bug/732). + + + -- Stefan Potyra Fri, 26 May 2006 13:26:40 +0200