Drop compatibility with old changelog parsers (as planned)

2 files changed, 3 insertions, 20 deletions

diff --git a/scripts/Dpkg/Changelog/Parse.pm b/scripts/Dpkg/Changelog/Parse.pm
index 91a54c176..35ca2c771 100644
--- a/scripts/Dpkg/Changelog/Parse.pm
+++ b/scripts/Dpkg/Changelog/Parse.pm
@@ -93,13 +93,6 @@ sub changelog_parse {
 	delete $options{"changelogformat"};
 	$force = 1;
     }
-    # XXX: For compatibility with old parsers, don't use --since but -v
-    # This can be removed later (in lenny+1 for example)
-    if (exists $options{"since"}) {
-	my $since = $options{"since"};
-	$options{"-v$since"} = undef;
-	delete $options{"since"};
-    }
 
     # Extract the format from the changelog file if possible
     unless($force or ($changelogfile eq "-")) {
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index f5e44b49c..1ec0a5686 100755
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -190,11 +190,7 @@ my $changelog = changelog_parse(%options);
 delete $options{"since"};
 $options{"count"} = 1;
 $options{"offset"} = 1;
-my ($prev_changelog, $bad_parser);
-eval { # Do not fail if parser failed due to unsupported options
-    $prev_changelog = changelog_parse(%options);
-};
-$bad_parser = 1 if ($@);
+my $prev_changelog = changelog_parse(%options);
 # Other initializations
 my $control = Dpkg::Control::Info->new($controlfile);
 my $fields = Dpkg::Control->new(type => CTRL_FILE_CHANGES);
@@ -430,14 +426,8 @@ if (!is_binaryonly) {
 	my $prev = Dpkg::Version->new($prev_changelog->{"Version"});
 	$include_tarball = ($cur->version() ne $prev->version()) ? 1 : 0;
     } else {
-	if ($bad_parser) {
-	    # The parser doesn't support extracting a previous version
-	    # Fallback to version check
-	    $include_tarball = ($sversion =~ /-(0|1|0\.1)$/) ? 1 : 0;
-	} else {
-	    # No previous entry means first upload, tarball required
-	    $include_tarball = 1;
-	}
+	# No previous entry means first upload, tarball required
+	$include_tarball = 1;
     }
 
     if ((($sourcestyle =~ m/i/ && not($include_tarball)) ||