The following commit has been merged in the master branch:
commit 6a802a4d4055d985edb438bcd59ff42c273bd0fd
Author: James Vega <[email protected]>
Date: Sun May 1 22:20:14 2011 -0400
Update recognized Ubuntu releases (- jaunty/karmic, + oneiric).
Signed-off-by: James Vega <[email protected]>
diff --git a/debian/changelog b/debian/changelog
index 7496c94..0782975 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,10 @@ devscripts (2.10.73) UNRELEASED; urgency=low
Lindfors for the patch. (Closes: #587523)
+ Only download a file if it doesn't exist or its hashsum doesn't match
the one specified by snapshot.d.o.
- * debchange: Add -M option to use debian/control's Maintainer information.
- Thanks to Modestas Vainius for the patch. (Closes: #560900)
+ * debchange:
+ + Add -M option to use debian/control's Maintainer information. Thanks to
+ Modestas Vainius for the patch. (Closes: #560900)
+ + Update recognized Ubuntu releases (- jaunty/karmic, + oneiric).
[ Benjamin Drung ]
* Add myself to uploaders.
diff --git a/scripts/debchange.pl b/scripts/debchange.pl
index 5885ebe..e523137 100755
--- a/scripts/debchange.pl
+++ b/scripts/debchange.pl
@@ -412,7 +412,7 @@ if (defined $opt_D) {
$warnings++ if not $opt_force_dist;
}
} elsif ($distributor eq 'Ubuntu') {
- unless ($opt_D =~
/^((dapper|hardy|jaunty|karmic|lucid|maverick|natty)(-updates|-security|-proposed|-backports)?|UNRELEASED)$/)
{
+ unless ($opt_D =~
/^((dapper|hardy|lucid|maverick|natty|oneiric)(-updates|-security|-proposed|-backports)?|UNRELEASED)$/)
{
warn "$progname warning: Recognised distributions
are:\n{dapper,hardy,jaunty,karmic,lucid,maverick,natty}{,-updates,-security,-proposed,-backports}
and UNRELEASED.\nUsing your request anyway.\n";
$warnings++ if not $opt_force_dist;
}
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
