diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2019-06-23 16:39:18 +0100 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2019-06-23 16:39:18 +0100 |
commit | fa917e493d6d4d30b0b824cc7ed4c02f5067eaab (patch) | |
tree | bdc1b4f0d969a294eb47e18bebc1777e7e65bbd9 | |
parent | 5eb8e042adf67fc5a7a25a1694b4df1dd50b44de (diff) | |
parent | 0594f61c6ea940a4d88bffb5384f775d5a7be194 (diff) |
Merge tag 'debian/8.5' into stretch-bpo
dgit release 8.5 for unstable (sid) [dgit]
[dgit distro=debian]
# gpg: Signature made Mon 27 May 2019 12:24:02 AM BST
# gpg: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Good signature from "Ian Jackson (new general purpose key) <ijackson@chiark.greenend.org.uk>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 559A E46C 2D6B 6D32 65E7 CBA1 E3E3 3923 48B5 0D39
-rw-r--r-- | Debian/Dgit.pm | 56 | ||||
-rw-r--r-- | debian/changelog | 32 | ||||
-rw-r--r-- | debian/tests/control | 2 | ||||
-rwxr-xr-x | dgit | 292 | ||||
-rw-r--r-- | dgit-downstream-dsc.7.pod | 8 | ||||
-rw-r--r-- | dgit-maint-debrebase.7.pod | 6 | ||||
-rw-r--r-- | dgit-maint-native.7.pod | 2 | ||||
-rw-r--r-- | dgit-sponsorship.7.pod | 2 | ||||
-rw-r--r-- | dgit-user.7.pod | 2 | ||||
-rw-r--r-- | dgit.1 | 183 | ||||
-rw-r--r-- | dgit.7 | 4 | ||||
-rwxr-xr-x | git-debrebase | 58 | ||||
-rw-r--r-- | git-debrebase.1.pod | 12 | ||||
-rw-r--r-- | git-debrebase.5.pod | 20 | ||||
-rw-r--r-- | po/en_US.po | 955 | ||||
-rw-r--r-- | po/messages.pot | 978 | ||||
-rw-r--r-- | po/nl.po | 1032 | ||||
-rw-r--r-- | po4a/dgit-downstream-dsc_7.pot | 27 | ||||
-rw-r--r-- | po4a/dgit-maint-debrebase_7.pot | 12 | ||||
-rw-r--r-- | po4a/dgit-maint-native_7.pot | 10 | ||||
-rw-r--r-- | po4a/dgit-sponsorship_7.pot | 14 | ||||
-rw-r--r-- | po4a/dgit-user_7.nl.po | 6 | ||||
-rw-r--r-- | po4a/dgit-user_7.pot | 6 | ||||
-rw-r--r-- | po4a/dgit_1.pot | 132 | ||||
-rw-r--r-- | po4a/dgit_7.pot | 12 | ||||
-rw-r--r-- | po4a/git-debrebase_1.pot | 16 | ||||
-rw-r--r-- | po4a/git-debrebase_5.pot | 38 | ||||
-rwxr-xr-x | tests/tests/import-dsc | 2 | ||||
-rwxr-xr-x | tests/tests/import-linkorigs | 60 |
29 files changed, 2045 insertions, 1934 deletions
diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm index 2ef32f3..61476d9 100644 --- a/Debian/Dgit.pm +++ b/Debian/Dgit.pm @@ -148,11 +148,11 @@ sub setup_sigwarn () { sub initdebug ($) { ($debugprefix) = @_; - open DEBUG, ">/dev/null" or confess $!; + open DEBUG, ">/dev/null" or confess "$!"; } sub enabledebug () { - open DEBUG, ">&STDERR" or confess $!; + open DEBUG, ">&STDERR" or confess "$!"; DEBUG->autoflush(1); $debuglevel ||= 1; } @@ -181,7 +181,7 @@ sub printdebug { print DEBUG $debugprefix unless $printdebug_noprefix; pop @_ while @_ and !length $_[-1]; return unless @_; - print DEBUG @_ or confess $!; + print DEBUG @_ or confess "$!"; $printdebug_noprefix = $_[-1] !~ m{\n$}; } @@ -214,9 +214,9 @@ sub shellquote { sub printcmd { my $fh = shift @_; my $intro = shift @_; - print $fh $intro," " or confess $!; - print $fh shellquote @_ or confess $!; - print $fh "\n" or confess $!; + print $fh $intro," " or confess "$!"; + print $fh shellquote @_ or confess "$!"; + print $fh "\n" or confess "$!"; } sub debugcmd { @@ -347,7 +347,7 @@ sub waitstatusmsg () { sub failedcmd_report_cmd { my $intro = shift @_; $intro //= __ "failed command"; - { local ($!); printcmd \*STDERR, _us().": $intro:", @_ or confess $!; }; + { local ($!); printcmd \*STDERR, _us().": $intro:", @_ or confess "$!"; }; } sub failedcmd_waitstatus { @@ -395,7 +395,7 @@ sub cmdoutput_errok { my $d; $!=0; $?=0; { local $/ = undef; $d = <P>; } - confess $! if P->error; + confess "$!" if P->error; if (!close P) { printdebug "=>!$?\n"; return undef; } chomp $d; if ($debuglevel > 0) { @@ -528,10 +528,10 @@ sub git_cat_file ($;$) { if (!$gcf_pid) { my @cmd = qw(git cat-file --batch); debugcmd "GCF|", @cmd; - $gcf_pid = open2 $gcf_o, $gcf_i, @cmd or confess $!; + $gcf_pid = open2 $gcf_o, $gcf_i, @cmd or confess "$!"; } printdebug "GCF>| $objname\n"; - print $gcf_i $objname, "\n" or confess $!; + print $gcf_i $objname, "\n" or confess "$!"; my $x = <$gcf_o>; printdebug "GCF<| ", $x; if ($x =~ m/ (missing)$/) { return $chk->($1, undef); } @@ -567,7 +567,7 @@ sub git_for_each_ref ($$;$) { if (defined $gitdir) { @cmd = ('sh','-ec','cd "$1"; shift; exec "$@"','x', $gitdir, @cmd); } - open GFER, "-|", @cmd or confess $!; + open GFER, "-|", @cmd or confess "$!"; debugcmd "|", @cmd; while (<GFER>) { chomp or confess "$_ ?"; @@ -665,7 +665,7 @@ sub git_slurp_config_src ($) { local $/="\0"; my $r = { }; - open GITS, "-|", @cmd or confess $!; + open GITS, "-|", @cmd or confess "$!"; while (<GITS>) { chomp or confess; printdebug "=> ", (messagequote $_), "\n"; @@ -728,7 +728,7 @@ sub parsecontrol { my $fh = new IO::Handle; open $fh, '<', $file or fail f_ "open %s (%s): %s", $file, $desc, $!; my $c = parsecontrolfh($fh,$desc,$allowsigned); - $fh->error and confess $!; + $fh->error and confess "$!"; close $fh; return $c; } @@ -737,7 +737,7 @@ sub parsechangelog { my $c = Dpkg::Control::Hash->new(name => 'parsed changelog'); my $p = new IO::Handle; my @cmd = (qw(dpkg-parsechangelog), @_); - open $p, '-|', @cmd or confess $!; + open $p, '-|', @cmd or confess "$!"; $c->parse($p); $?=0; $!=0; close $p or failedcmd @cmd; return $c; @@ -755,7 +755,7 @@ sub parsechangelog_loop ($$$) { # @$clogcmd is qw(dpkg-parsechangelog ...some...options...) # calls $fn->($thisstanza, $desc); debugcmd "|",@$clogcmd; - open CLOGS, "-|", @$clogcmd or confess $!; + open CLOGS, "-|", @$clogcmd or confess "$!"; for (;;) { my $stanzatext = do { local $/=""; <CLOGS>; }; printdebug "clogp stanza ".Dumper($stanzatext) if $debuglevel>1; @@ -767,7 +767,7 @@ sub parsechangelog_loop ($$$) { $fn->($thisstanza, $desc); } - confess $! if CLOGS->error; + confess "$!" if CLOGS->error; close CLOGS or $?==SIGPIPE or failedcmd @$clogcmd; } @@ -777,11 +777,11 @@ sub make_commit_text ($) { my @cmd = (qw(git hash-object -w -t commit --stdin)); debugcmd "|",@cmd; print Dumper($text) if $debuglevel > 1; - my $child = open2($out, $in, @cmd) or confess $!; + my $child = open2($out, $in, @cmd) or confess "$!"; my $h; eval { - print $in $text or confess $!; - close $in or confess $!; + print $in $text or confess "$!"; + close $in or confess "$!"; $h = <$out>; $h =~ m/^\w+$/ or confess; $h = $&; @@ -803,7 +803,7 @@ sub reflog_cache_insert ($$$) { my $parent = $ref; $parent =~ s{/[^/]+$}{}; ensuredir "$maindir_gitcommon/logs/$parent"; my $makelogfh = new IO::File "$maindir_gitcommon/logs/$ref", '>>' - or confess $!; + or confess "$!"; my $oldcache = git_get_ref $ref; @@ -832,11 +832,11 @@ sub reflog_cache_lookup ($$) { # you must have called record_maindir my @cmd = (qw(git log -g), '--pretty=format:%H %gs', $ref); debugcmd "|(probably)",@cmd; - my $child = open GC, "-|"; defined $child or confess $!; + my $child = open GC, "-|"; defined $child or confess "$!"; if (!$child) { - chdir $maindir or confess $!; + chdir $maindir or confess "$!"; if (!stat "$maindir_gitcommon/logs/$ref") { - $! == ENOENT or confess $!; + $! == ENOENT or confess "$!"; printdebug ">(no reflog)\n"; finish 0; } @@ -849,7 +849,7 @@ sub reflog_cache_lookup ($$) { close GC; return $1; } - confess $! if GC->error; + confess "$!" if GC->error; failedcmd unless close GC; return undef; } @@ -975,11 +975,11 @@ sub playtree_setup (;$) { # $maindir_gitdir contains our main working "dgit", HEAD, etc. # $maindir_gitcommon the shared stuff, including .objects rmtree('.git/objects'); - symlink "$maindir_gitcommon/objects",'.git/objects' or confess $!; + symlink "$maindir_gitcommon/objects",'.git/objects' or confess "$!"; ensuredir '.git/info'; - open GA, "> .git/info/attributes" or confess $!; - print GA "* $negate_harmful_gitattrs\n" or confess $!; - close GA or confess $!; + open GA, "> .git/info/attributes" or confess "$!"; + print GA "* $negate_harmful_gitattrs\n" or confess "$!"; + close GA or confess "$!"; } 1; diff --git a/debian/changelog b/debian/changelog index d61ec59..cb82895 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,35 @@ +dgit (8.5) unstable; urgency=medium + + * Replace `confess $!' with `confess "$!"', to actually print errno + when crashing. Closes:#929549. + + -- Ian Jackson <ijackson@chiark.greenend.org.uk> Mon, 27 May 2019 00:20:58 +0100 + +dgit (8.4) unstable; urgency=medium + + Bugfixes: + * dgit: import-dsc: Handle relative symlinks correctly. + Closes:#913259. + * dgit: Do not misrecognise some initial packaging as + gdr-compatible. Closes:#922446. [Report from Sean Whitton] + * git-debrebase: convert-*: Fix two broken error messages. + Closes:#922462. [Report from Didier 'OdyX' Raboud] + + Documentation: + * [nl] translations updated. Closes:#921088. [Frans Spiesschaert] + * Many manpage typo fixes. Closes:#918384. [Paul Hardy] + * dgit(1): Write the leading dash of an option as '\-'. + Closes:#921965. [Bjarni Ingi Gislason] + + Test suite: + * dgit: import-dsc: New test for abs/rel dsc component links + + Internal changes: + * dgit: cmd_import_dsc: comment on lack of is_orig_file check + * git-debrebase: resolve_upstream_version: Return $used too + + -- Ian Jackson <ijackson@chiark.greenend.org.uk> Fri, 01 Mar 2019 21:53:40 +0000 + dgit (8.3~bpo9+1) stretch-backports; urgency=medium * Rebuild for stretch-backports. diff --git a/debian/tests/control b/debian/tests/control index 6559071..7f0a908 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -68,7 +68,7 @@ Tests: trustingpolicy-replay Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, dput-ng -Tests: absurd-gitapply badcommit-rewrite build-modes build-modes-long build-modes-source checkout clone-clogsigpipe clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp defdistro-rpush defdistro-setup distropatches-reject dpkgsourceignores-correct drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast gbp-orig gitconfig gitworktree import-dsc import-maintmangle import-native import-nonnative import-tarbomb inarchivecopy mismatches-contents mismatches-dscchanges multisuite newtag-clone-nogit oldnewtagalt oldtag-clone-nogit orig-include-exclude orig-include-exclude-chkquery overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version pbuilder protocol-compat push-buildproductsdir push-newpackage push-newrepeat push-nextdgit push-source push-source-with-changes quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains quilt-useremail rpush sourceonlypolicy tag-updates unrepresentable version-opt +Tests: absurd-gitapply badcommit-rewrite build-modes build-modes-long build-modes-source checkout clone-clogsigpipe clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp defdistro-rpush defdistro-setup distropatches-reject dpkgsourceignores-correct drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast gbp-orig gitconfig gitworktree import-dsc import-linkorigs import-maintmangle import-native import-nonnative import-tarbomb inarchivecopy mismatches-contents mismatches-dscchanges multisuite newtag-clone-nogit oldnewtagalt oldtag-clone-nogit orig-include-exclude orig-include-exclude-chkquery overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version pbuilder protocol-compat push-buildproductsdir push-newpackage push-newrepeat push-nextdgit push-source push-source-with-changes quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains quilt-useremail rpush sourceonlypolicy tag-updates unrepresentable version-opt Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime @@ -32,6 +32,7 @@ use Data::Dumper; use LWP::UserAgent; use Dpkg::Control::Hash; use File::Path; +use File::Spec; use File::Temp qw(tempdir); use File::Basename; use Dpkg::Version; @@ -164,6 +165,7 @@ our %opts_cfg_insertpos = map { } keys %opts_opt_map; sub parseopts_late_defaults(); +sub quiltify_trees_differ ($$;$$$); sub setup_gitattrs(;$); sub check_gitattrs($$); @@ -396,7 +398,9 @@ sub branch_is_gdr ($) { return 0; } if ($tip_patches eq '' and - !defined git_cat_file "$walk:debian") { + !defined git_cat_file "$walk~:debian" and + !quiltify_trees_differ "$walk~", $walk + ) { # (gdr classification of parent: BreakwaterStart printdebug "branch_is_gdr $walk unmarked BreakwaterStart YES\n"; return 1; @@ -520,11 +524,11 @@ sub protocol_send_file ($$) { my $got = read PF, $d, 65536; die "$ourfn: $!" unless defined $got; last if !$got; - print $fh "data-block ".length($d)."\n" or confess $!; - print $fh $d or confess $!; + print $fh "data-block ".length($d)."\n" or confess "$!"; + print $fh $d or confess "$!"; } PF->error and die "$ourfn $!"; - print $fh "data-end\n" or confess $!; + print $fh "data-end\n" or confess "$!"; close PF; } @@ -549,9 +553,9 @@ sub protocol_receive_file ($$) { } $fh; last unless $y; my $d = protocol_read_bytes $fh, $l; - print PF $d or confess $!; + print PF $d or confess "$!"; } - close PF or confess $!; + close PF or confess "$!"; } #---------- remote protocol support, responder ---------- @@ -561,7 +565,7 @@ sub responder_send_command ($) { return unless $we_are_responder; # called even without $we_are_responder printdebug ">> $command\n"; - print PO $command, "\n" or confess $!; + print PO $command, "\n" or confess "$!"; } sub responder_send_file ($$) { @@ -596,8 +600,8 @@ sub initiator_expect (&) { sub progress { if ($we_are_responder) { my $m = join '', @_; - responder_send_command "progress ".length($m) or confess $!; - print PO $m or confess $!; + responder_send_command "progress ".length($m) or confess "$!"; + print PO $m or confess "$!"; } else { print @_, "\n"; } @@ -612,7 +616,7 @@ sub url_get { } my $what = $_[$#_]; progress "downloading $what..."; - my $r = $ua->get(@_) or confess $!; + my $r = $ua->get(@_) or confess "$!"; return undef if $r->code == 404; $r->is_success or fail f_ "failed to fetch %s: %s", $what, $r->status_line; @@ -676,7 +680,7 @@ Perhaps the upload is stuck in incoming. Using the version from git. END sub badusage { - print STDERR f_ "%s: %s\n%s", $us, "@_", __ $helpmsg or confess $!; + print STDERR f_ "%s: %s\n%s", $us, "@_", __ $helpmsg or confess "$!"; finish 8; } @@ -689,7 +693,7 @@ sub pre_help () { not_necessarily_a_tree(); } sub cmd_help () { - print __ $helpmsg or confess $!; + print __ $helpmsg or confess "$!"; finish 0; } @@ -939,8 +943,8 @@ sub supplementary_message ($) { return; } elsif ($protovsn >= 3) { responder_send_command "supplementary-message ".length($msg) - or confess $!; - print PO $msg or confess $!; + or confess "$!"; + print PO $msg or confess "$!"; } } @@ -1077,7 +1081,7 @@ sub commit_getclogp ($) { } sub parse_dscdata () { - my $dscfh = new IO::File \$dscdata, '<' or confess $!; + my $dscfh = new IO::File \$dscdata, '<' or confess "$!"; printdebug Dumper($dscdata) if $debuglevel>1; $dsc = parsecontrolfh($dscfh,$dscurl,1); printdebug Dumper($dsc) if $debuglevel>1; @@ -1295,17 +1299,17 @@ sub aptget_prep ($) { cfg_apply_map(\$aptsuites, 'suite map', access_cfg('aptget-suite-map', 'RETURN-UNDEF')); - open SRCS, ">", "$aptget_base/$sourceslist" or confess $!; + open SRCS, ">", "$aptget_base/$sourceslist" or confess "$!"; printf SRCS "deb-src %s %s %s\n", access_cfg('mirror'), $aptsuites, access_cfg('aptget-components') - or confess $!; + or confess "$!"; ensuredir "$aptget_base/cache"; ensuredir "$aptget_base/lists"; - open CONF, ">", $aptget_configpath or confess $!; + open CONF, ">", $aptget_configpath or confess "$!"; print CONF <<END; Debug::NoLocking "true"; APT::Get::List-Cleanup "false"; @@ -1325,10 +1329,10 @@ END Dir::Etc::preferencesparts )) { ensuredir "$aptget_base/$key"; - print CONF "$key \"$quoted_base/$key\";\n" or confess $!; + print CONF "$key \"$quoted_base/$key\";\n" or confess "$!"; }; - my $oldatime = (time // confess $!) - 1; + my $oldatime = (time // confess "$!") - 1; foreach my $oldlist (<$aptget_base/lists/*Release>) { next unless stat_exists $oldlist; my ($mtime) = (stat _)[9]; @@ -1428,7 +1432,7 @@ sub dummycatapi_run_in_mirror ($@) { my @cmd = (qw(sh -ec), 'cd "$1"; shift'."\n".$rune, qw(x), $mirror, @$argl); debugcmd "-|", @cmd; - open FIA, "-|", @cmd or confess $!; + open FIA, "-|", @cmd or confess "$!"; my $r = $fn->(); close FIA or ($!==0 && $?==141) or die failedcmd @cmd; return $r; @@ -1531,7 +1535,7 @@ sub sshpsql ($$$) { " export LC_MESSAGES=C; export LC_CTYPE=C;". " ".shellquote qw(psql -A), $dbname, qw(-c), $sql); debugcmd "|",@cmd; - open P, "-|", @cmd or confess $!; + open P, "-|", @cmd or confess "$!"; while (<P>) { chomp or die; printdebug(">|$_|\n"); @@ -1832,7 +1836,7 @@ sub remove_stray_gits ($) { my ($what) = @_; my @gitscmd = qw(find -name .git -prune -print0); debugcmd "|",@gitscmd; - open GITS, "-|", @gitscmd or confess $!; + open GITS, "-|", @gitscmd or confess "$!"; { local $/="\0"; while (<GITS>) { @@ -2233,7 +2237,7 @@ sub dotdot_bpd_transfer_origs ($$$) { "check orig file %s in ..: %s", $leaf, $!; if (-l _) { stat "$dotdot/$leaf" or fail f_ - "check targe of orig symlink %s in ..: %s", $leaf, $!; + "check target of orig symlink %s in ..: %s", $leaf, $!; my $ltarget = readlink "$dotdot/$leaf" or die "readlink $dotdot/$leaf: $!"; if ($ltarget !~ m{^/}) { @@ -2360,9 +2364,9 @@ sub generate_commits_from_dsc () { new Dpkg::Compression::Process compression => $cname; @compr_cmd = $compr_proc->get_uncompress_cmdline(); my $compr_fh = new IO::Handle; - my $compr_pid = open $compr_fh, "-|" // confess $!; + my $compr_pid = open $compr_fh, "-|" // confess "$!"; if (!$compr_pid) { - open STDIN, "<&", $input or confess $!; + open STDIN, "<&", $input or confess "$!"; exec @compr_cmd; die "dgit (child): exec $compr_cmd[0]: $!\n"; } @@ -2370,23 +2374,23 @@ sub generate_commits_from_dsc () { } rmtree "_unpack-tar"; - mkdir "_unpack-tar" or confess $!; + mkdir "_unpack-tar" or confess "$!"; my @tarcmd = qw(tar -x -f - --no-same-owner --no-same-permissions --no-acls --no-xattrs --no-selinux); - my $tar_pid = fork // confess $!; + my $tar_pid = fork // confess "$!"; if (!$tar_pid) { - chdir "_unpack-tar" or confess $!; - open STDIN, "<&", $input or confess $!; + chdir "_unpack-tar" or confess "$!"; + open STDIN, "<&", $input or confess "$!"; exec @tarcmd; die f_ "dgit (child): exec %s: %s", $tarcmd[0], $!; } - $!=0; (waitpid $tar_pid, 0) == $tar_pid or confess $!; + $!=0; (waitpid $tar_pid, 0) == $tar_pid or confess "$!"; !$? or failedcmd @tarcmd; close $input or (@compr_cmd ? ($?==SIGPIPE || failedcmd @compr_cmd) - : confess $!); + : confess "$!"); # finally, we have the results in "tarball", but maybe # with the wrong permissions @@ -2543,14 +2547,14 @@ END_T printdebug "import main commit\n"; - open C, ">../commit.tmp" or confess $!; - print C <<END or confess $!; + open C, ">../commit.tmp" or confess "$!"; + print C <<END or confess "$!"; tree $tree END - print C <<END or confess $! foreach @tartrees; + print C <<END or confess "$!" foreach @tartrees; parent $_->{Commit} END - print C <<END or confess $!; + print C <<END or confess "$!"; author $authline committer $authline @@ -2559,7 +2563,7 @@ $changes [dgit import $treeimporthow $package $cversion] END - close C or confess $!; + close C or confess "$!"; my $rawimport_hash = make_commit qw(../commit.tmp); if (madformat $dsc->{format}) { @@ -2604,7 +2608,7 @@ END progress f_ "%s: trying slow absurd-git-apply...", $us; rename "../../gbp-pq-output","../../gbp-pq-output.0" or $!==ENOENT - or confess $!; + or confess "$!"; } eval { die "forbid absurd git-apply\n" if $use_absurd @@ -2670,7 +2674,7 @@ Version actually in archive: %s (older) Last version pushed with dgit: %s (newer or same) %s END - __ $later_warning_msg or confess $!; + __ $later_warning_msg or confess "$!"; @output = $lastpush_mergeinput; } else { # Same version. Use what's in the server git branch, @@ -2700,7 +2704,7 @@ sub complete_file_from_dsc ($$;$) { open F, "<", "$tf" or die "$tf: $!"; $fi->{Digester}->reset(); $fi->{Digester}->addfile(*F); - F->error and confess $!; + F->error and confess "$!"; $got = $fi->{Digester}->hexdigest(); return $got eq $fi->{Hash}; }; @@ -2834,7 +2838,7 @@ sub git_lrfetch_sane { debugcmd "|",@lcmd; my %wantr; - open GITLS, "-|", @lcmd or confess $!; + open GITLS, "-|", @lcmd or confess "$!"; while (<GITLS>) { printdebug "=> ", $_; m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?"; @@ -3256,7 +3260,7 @@ sub fetch_from_archive () { printdebug "del_lrfetchrefs: $objid $fullrefname\n"; if (!$gur) { $gur ||= new IO::Handle; - open $gur, "|-", qw(git update-ref --stdin) or confess $!; + open $gur, "|-", qw(git update-ref --stdin) or confess "$!"; } printf $gur "delete %s %s\n", $fullrefname, $objid; } @@ -3277,7 +3281,7 @@ Commit referred to by archive: %s Last version pushed with dgit: %s %s END - __ $later_warning_msg or confess $!; + __ $later_warning_msg or confess "$!"; @mergeinputs = ($lastpush_mergeinput); } else { # Archive has .dsc which is not a descendant of the last dgit @@ -3312,11 +3316,11 @@ END Package not found in the archive, but has allegedly been pushed using dgit. %s END - __ $later_warning_msg or confess $!; + __ $later_warning_msg or confess "$!"; } else { printdebug "nothing found!\n"; if (defined $skew_warning_vsn) { - print STDERR f_ <<END, $skew_warning_vsn or confess $!; + print STDERR f_ <<END, $skew_warning_vsn or confess "$!"; Warning: relevant archive skew detected. Archive allegedly contains %s @@ -3382,26 +3386,26 @@ END my $mcf = dgit_privdir()."/mergecommit"; open MC, ">", $mcf or die "$mcf $!"; - print MC <<END or confess $!; + print MC <<END or confess "$!"; tree $tree END my @parents = grep { $_->{Commit} } @mergeinputs; @parents = reverse @parents if $compat_info->{ReverseParents}; - print MC <<END or confess $! foreach @parents; + print MC <<END or confess "$!" foreach @parents; parent $_->{Commit} END - print MC <<END or confess $!; + print MC <<END or confess "$!"; author $author committer $author END if (defined $compat_info->{Message}) { - print MC $compat_info->{Message} or confess $!; + print MC $compat_info->{Message} or confess "$!"; } else { - print MC f_ <<END, $package, $cversion, $csuite or confess $!; + print MC f_ <<END, $package, $cversion, $csuite or confess "$!"; Record %s (%s) in archive suite %s Record that @@ -3410,17 +3414,17 @@ END my ($mi) = (@_); my $mversion = mergeinfo_version $mi; printf MC " %-20s %s\n", $mversion, $mi->{Info} - or confess $!; + or confess "$!"; }; $message_add_info->($mergeinputs[0]); - print MC __ <<END or confess $!; + print MC __ <<END or confess "$!"; should be treated as descended from END $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs]; } - close MC or confess $!; + close MC or confess "$!"; $hash = make_commit $mcf; } else { $hash = $mergeinputs[0]{Commit}; @@ -3445,7 +3449,7 @@ END my $got_vsn = getfield $gotclogp, 'Version'; printdebug "SKEW CHECK GOT $got_vsn\n"; if (version_compare($got_vsn, $skew_warning_vsn) < 0) { - print STDERR f_ <<END, $skew_warning_vsn, $got_vsn or confess $!; + print STDERR f_ <<END, $skew_warning_vsn, $got_vsn or confess "$!"; Warning: archive skew detected. Using the available version: Archive allegedly contains %s @@ -3489,12 +3493,12 @@ sub setup_mergechangelogs (;$) { while (<ATTRS>) { chomp; next if m{^debian/changelog\s}; - print NATTRS $_, "\n" or confess $!; + print NATTRS $_, "\n" or confess "$!"; } - ATTRS->error and confess $!; + ATTRS->error and confess "$!"; close ATTRS; } - print NATTRS "debian/changelog merge=$driver\n" or confess $!; + print NATTRS "debian/changelog merge=$driver\n" or confess "$!"; close NATTRS; set_local_git_config "$cb.name", __ 'debian/changelog merge driver'; @@ -3550,7 +3554,7 @@ sub is_gitattrs_setup () { printdebug "is_gitattrs_setup: found old macro\n"; return 0; } - $gai->error and confess $!; + $gai->error and confess "$!"; printdebug "is_gitattrs_setup: found nothing\n"; return undef; } @@ -3571,8 +3575,8 @@ END my $af = "$maindir_gitcommon/info/attributes"; ensuredir "$maindir_gitcommon/info"; - open GAO, "> $af.new" or confess $!; - print GAO <<END, __ <<ENDT or confess $! unless defined $already; + open GAO, "> $af.new" or confess "$!"; + print GAO <<END, __ <<ENDT or confess "$!" unless defined $already; * dgit-defuse-attrs $new END @@ -3586,11 +3590,11 @@ ENDT $_ = $new; } chomp; - print GAO $_, "\n" or confess $!; + print GAO $_, "\n" or confess "$!"; } - $gai->error and confess $!; + $gai->error and confess "$!"; } - close GAO or confess $!; + close GAO or confess "$!"; rename "$af.new", "$af" or fail f_ "install %s: %s", $af, $!; } @@ -3609,7 +3613,7 @@ sub check_gitattrs ($$) { my @cmd = (@git, qw(ls-tree -lrz --), "${treeish}:"); debugcmd "|",@cmd; my $gafl = new IO::File; - open $gafl, "-|", @cmd or confess $!; + open $gafl, "-|", @cmd or confess "$!"; while (<$gafl>) { chomp or die; s/^\d+\s+\w+\s+\w+\s+(\d+)\t// or die; @@ -3634,7 +3638,7 @@ sub multisuite_suite_child ($$$) { # in child, sets things up, calls $fn->(), and returns undef # in parent, returns canonical suite name for $tsuite my $canonsuitefh = IO::File::new_tmpfile; - my $pid = fork // confess $!; + my $pid = fork // confess "$!"; if (!$pid) { forkcheck_setup(); $isuite = $tsuite; @@ -3642,17 +3646,17 @@ sub multisuite_suite_child ($$$) { $debugprefix .= " "; progress f_ "fetching %s...", $tsuite; canonicalise_suite(); - print $canonsuitefh $csuite, "\n" or confess $!; - close $canonsuitefh or confess $!; + print $canonsuitefh $csuite, "\n" or confess "$!"; + close $canonsuitefh or confess "$!"; $fn->(); return undef; } - waitpid $pid,0 == $pid or confess $!; + waitpid $pid,0 == $pid or confess "$!"; fail f_ "failed to obtain %s: %s", $tsuite, waitstatusmsg() if $? && $?!=256*4; - seek $canonsuitefh,0,0 or confess $!; + seek $canonsuitefh,0,0 or confess "$!"; local $csuite = <$canonsuitefh>; - confess $! unless defined $csuite && chomp $csuite; + confess "$!" unless defined $csuite && chomp $csuite; if ($? == 256*4) { printdebug "multisuite $tsuite missing\n"; return $csuite; @@ -3795,9 +3799,9 @@ sub fork_for_multisuite ($) { } sub clone_set_head () { - open H, "> .git/HEAD" or confess $!; - print H "ref: ".lref()."\n" or confess $!; - close H or confess $!; + open H, "> .git/HEAD" or confess "$!"; + print H "ref: ".lref()."\n" or confess "$!"; + close H or confess "$!"; } sub clone_finish ($) { my ($dstdir) = @_; @@ -3979,18 +3983,18 @@ sub get_source_format () { $options{$_} = 1; } } - F->error and confess $!; + F->error and confess "$!"; close F; } else { - confess $! unless $!==&ENOENT; + confess "$!" unless $!==&ENOENT; } if (!open F, "debian/source/format") { - confess $! unless $!==&ENOENT; + confess "$!" unless $!==&ENOENT; return ''; } $_ = <F>; - F->error and confess $!; + F->error and confess "$!"; chomp; return ($_, \%options); } @@ -4127,7 +4131,7 @@ sub pseudomerge_make_commit ($$$$ $$) { # git rev-list --first-parent DTRT. my $pmf = dgit_privdir()."/pseudomerge"; open MC, ">", $pmf or die "$pmf $!"; - print MC <<END or confess $!; + print MC <<END or confess "$!"; tree $tree parent $dgitview parent $archive_hash @@ -4138,7 +4142,7 @@ $msg_msg [$msg_cmd] END - close MC or confess $!; + close MC or confess "$!"; return make_commit($pmf); } @@ -4318,7 +4322,7 @@ sub push_mktags ($$ $$ $) { $dsc->{$ourdscfield[0]} = join " ", $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag}, $reader_giturl; - $dsc->save("$dscfn.tmp") or confess $!; + $dsc->save("$dscfn.tmp") or confess "$!"; my $changes = parsecontrol($changesfile,$changesfilewhat); foreach my $field (qw(Source Distribution Version)) { @@ -4341,8 +4345,8 @@ sub push_mktags ($$ $$ $) { my $head = $tw->{Objid}; my $tag = $tw->{Tag}; - open TO, '>', $tfn->('.tmp') or confess $!; - print TO <<END or confess $!; + open TO, '>', $tfn->('.tmp') or confess "$!"; + print TO <<END or confess "$!"; object $head type commit tag $tag @@ -4353,12 +4357,12 @@ END print TO f_ <<ENDT, $package, $cversion, $clogsuite, $csuite %s release %s for %s (%s) [dgit] ENDT - or confess $!; - print TO <<END or confess $!; + or confess "$!"; + print TO <<END or confess "$!"; [dgit distro=$declaredistro$delibs] END foreach my $ref (sort keys %previously) { - print TO <<END or confess $!; + print TO <<END or confess "$!"; [dgit previously:$ref=$previously{$ref}] END } @@ -4368,12 +4372,12 @@ END (maintainer view tag generated by dgit --quilt=%s) END $quilt_mode - or confess $!; + or confess "$!"; } else { confess Dumper($tw)."?"; } - close TO or confess $!; + close TO or confess "$!"; my $tagobjfn = $tfn->('.tmp'); if ($sign) { @@ -4383,7 +4387,7 @@ END if (!defined $keyid) { $keyid = getfield $clogp, 'Maintainer'; } - unlink $tfn->('.tmp.asc') or $!==&ENOENT or confess $!; + unlink $tfn->('.tmp.asc') or $!==&ENOENT or confess "$!"; my @sign_cmd = (@gpg, qw(--detach-sign --armor)); push @sign_cmd, qw(-u),$keyid if defined $keyid; push @sign_cmd, $tfn->('.tmp'); @@ -4990,11 +4994,11 @@ sub pre_remote_push_build_host { $we_are_responder = 1; $us .= " (build host)"; - open PI, "<&STDIN" or confess $!; - open STDIN, "/dev/null" or confess $!; - open PO, ">&STDOUT" or confess $!; + open PI, "<&STDIN" or confess "$!"; + open STDIN, "/dev/null" or confess "$!"; + open PO, ">&STDOUT" or confess "$!"; autoflush PO 1; - open STDOUT, ">&STDERR" or confess $!; + open STDOUT, ">&STDERR" or confess "$!"; autoflush STDOUT 1; $vsnwant //= 1; @@ -5118,7 +5122,7 @@ sub i_resp_complete { $i_child_pid = undef; # prevents killing some other process with same pid printdebug "waiting for build host child $pid...\n"; my $got = waitpid $pid, 0; - confess $! unless $got == $pid; + confess "$!" unless $got == $pid; fail f_ "build host child failed: %s", waitstatusmsg() if $?; i_cleanup(); @@ -5174,7 +5178,7 @@ sub i_resp_want ($) { foreach my $localpath (@localpaths) { protocol_send_file \*RI, $localpath; } - print RI "files-end\n" or confess $!; + print RI "files-end\n" or confess "$!"; } our ($i_clogp, $i_version, $i_dscfn, $i_changesfn, @i_buildinfos); @@ -5281,13 +5285,13 @@ sub quiltify_dpkg_commit ($$$;$) { my $descfn = ".git/dgit/quilt-description.tmp"; open O, '>', $descfn or confess "$descfn: $!"; $msg =~ s/\n+/\n\n/; - print O <<END or confess $!; + print O <<END or confess "$!"; From: $author ${xinfo}Subject: $msg --- END - close O or confess $!; + close O or confess "$!"; { local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0; @@ -5469,12 +5473,12 @@ ENDU close GIPATCH or die "$gipatch: $!"; runcmd shell_cmd "exec >>$gipatch", @git, qw(diff), $unapplied, $headref, "--", sort keys %$editedignores; - open SERIES, "+>>", "debian/patches/series" or confess $!; - defined seek SERIES, -1, 2 or $!==EINVAL or confess $!; + open SERIES, "+>>", "debian/patches/series" or confess "$!"; + defined seek SERIES, -1, 2 or $!==EINVAL or confess "$!"; my $newline; - defined read SERIES, $newline, 1 or confess $!; - print SERIES "\n" or confess $! unless $newline eq "\n"; - print SERIES "auto-gitignore\n" or confess $!; + defined read SERIES, $newline, 1 or confess "$!"; + print SERIES "\n" or confess "$!" unless $newline eq "\n"; + print SERIES "auto-gitignore\n" or confess "$!"; close SERIES or die $!; runcmd @git, qw(add -f -- debian/patches/series), $gipatch; commit_admin +(__ <<END).<<ENDU @@ -5844,7 +5848,7 @@ END sub unpack_playtree_mkwork ($) { my ($headref) = @_; - mkdir "work" or confess $!; + mkdir "work" or confess "$!"; changedir "work"; mktree_in_ud_here(); runcmd @git, qw(reset -q --hard), $headref; @@ -5916,8 +5920,8 @@ sub quilt_make_fake_dsc ($) { my $fakeversion="$upstreamversion-~~DGITFAKE"; - my $fakedsc=new IO::File 'fake.dsc', '>' or confess $!; - print $fakedsc <<END or confess $!; + my $fakedsc=new IO::File 'fake.dsc', '>' or confess "$!"; + print $fakedsc <<END or confess "$!"; Format: 3.0 (quilt) Source: $package Version: $fakeversion @@ -5930,11 +5934,11 @@ END my $md = new Digest::MD5; my $fh = new IO::File $leaf, '<' or die "$leaf $!"; - stat $fh or confess $!; + stat $fh or confess "$!"; my $size = -s _; $md->addfile($fh); - print $fakedsc " ".$md->hexdigest." $size $leaf\n" or confess $!; + print $fakedsc " ".$md->hexdigest." $size $leaf\n" or confess "$!"; }; unpack_playtree_linkorigs($upstreamversion, $dscaddfile); @@ -5951,7 +5955,7 @@ END runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C), $maindir, @files; $dscaddfile->($debtar); - close $fakedsc or confess $!; + close $fakedsc or confess "$!"; } sub quilt_fakedsc2unapplied ($$) { @@ -6144,7 +6148,7 @@ END progress __ "Tree already contains .pc - will use it then delete it."; $mustdeletepc=1; } else { - rename '../fake/.pc','.pc' or confess $!; + rename '../fake/.pc','.pc' or confess "$!"; } changedir '../fake'; @@ -6224,7 +6228,7 @@ END quiltify($clogp,$headref,$oldtiptree,\@failsuggestion); if (!open P, '>>', ".pc/applied-patches") { - $!==&ENOENT or confess $!; + $!==&ENOENT or confess "$!"; } else { close P; } @@ -6243,21 +6247,21 @@ sub quilt_fixup_editor () { open I2, '<', $editing or confess "$editing: $!"; unlink $editing or confess "$editing: $!"; open O, '>', $editing or confess "$editing: $!"; - while (<I1>) { print O or confess $!; } I1->error and confess $!; + while (<I1>) { print O or confess "$!"; } I1->error and confess "$!"; my $copying = 0; while (<I2>) { $copying ||= m/^\-\-\- /; next unless $copying; - print O or confess $!; + print O or confess "$!"; } - I2->error and confess $!; + I2->error and confess "$!"; close O or die $1; finish 0; } sub maybe_apply_patches_dirtily () { return unless $quilt_mode =~ m/gbp|unapplied/; - print STDERR __ <<END or confess $!; + print STDERR __ <<END or confess "$!"; dgit: Building, or cleaning with rules target, in patches-unapplied tree. dgit: Have to apply the patches - making the tree dirty. @@ -6287,7 +6291,7 @@ sub clean_tree_check_git ($$$) { push @cmd, qw(-x) unless $honour_ignores; my $leftovers = cmdoutput @cmd; if (length $leftovers) { - print STDERR $leftovers, "\n" or confess $!; + print STDERR $leftovers, "\n" or confess "$!"; $message .= $ignmessage if $honour_ignores; fail $message; } @@ -6546,7 +6550,7 @@ END "@changesfiles"; } printdone f_ "build successful, results in %s\n", $result - or confess $!; + or confess "$!"; } sub midbuild_checkchanges () { @@ -6644,7 +6648,7 @@ sub cmd_gbp_build { if ($gbp_make_orig) { my $priv = dgit_privdir(); my $ok = "$priv/origs-gen-ok"; - unlink $ok or $!==&ENOENT or confess $!; + unlink $ok or $!==&ENOENT or confess "$!"; my @origs_cmd = @cmd; push @origs_cmd, qw(--git-cleaner=true); push @origs_cmd, "--git-prebuild=". @@ -6876,7 +6880,7 @@ sub cmd_print_unapplied_treeish { my $uv = upstreamversion $version; quilt_make_fake_dsc($uv); my $u = quilt_fakedsc2unapplied($headref, $uv); - print $u, "\n" or confess $!; + print $u, "\n" or confess "$!"; } sub import_dsc_result { @@ -7003,29 +7007,49 @@ END my @dfi = dsc_files_info(); foreach my $fi (@dfi) { my $f = $fi->{Filename}; + # We transfer all the pieces of the dsc to the bpd, not just + # origs. This is by analogy with dgit fetch, which wants to + # keep them somewhere to avoid downloading them again. + # We make symlinks, though. If the user wants copies, then + # they can copy the parts of the dsc to the bpd using dcmd, + # or something. my $here = "$buildproductsdir/$f"; if (lstat $here) { - next if stat $here; + if (stat $here) { + next; + } fail f_ "lstat %s works but stat gives %s !", $here, $!; } fail f_ "stat %s: %s", $here, $! unless $! == ENOENT; + printdebug "not in bpd, $f ...\n"; + # $f does not exist in bpd, we need to transfer it my $there = $dscfn; - if ($dscfn =~ m#^(?:\./+)?\.\./+#) { - $there = $'; - } elsif ($dscfn =~ m#^/#) { - $there = $dscfn; + $there =~ s{[^/]+$}{$f} or confess "$there ?"; + # $there is file we want, relative to user's cwd, or abs + printdebug "not in bpd, $f, test $there ...\n"; + stat $there or fail f_ + "import %s requires %s, but: %s", $dscfn, $there, $!; + if ($there =~ m#^(?:\./+)?\.\./+#) { + # $there is relative to user's cwd + my $there_from_parent = $'; + if ($buildproductsdir !~ m{^/}) { + # abs2rel, despite its name, can take two relative paths + $there = File::Spec->abs2rel($there,$buildproductsdir); + # now $there is relative to bpd, great + printdebug "not in bpd, $f, abs2rel, $there ...\n"; + } else { + $there = (dirname $maindir)."/$there_from_parent"; + # now $there is absoute + printdebug "not in bpd, $f, rel2rel, $there ...\n"; + } + } elsif ($there =~ m#^/#) { + # $there is absolute already + printdebug "not in bpd, $f, abs, $there ...\n"; } else { fail f_ "cannot import %s which seems to be inside working tree!", $dscfn; } - $there =~ s#/+[^/]+$## or fail f_ - "import %s requires .../%s, but it does not exist", - $dscfn, $f; - $there .= "/$f"; - my $test = $there =~ m{^/} ? $there : "../$there"; - stat $test or fail f_ - "import %s requires %s, but: %s", $dscfn, $test, $!; symlink $there, $here or fail f_ "symlink %s to %s: %s", $there, $here, $!; progress f_ "made symlink %s -> %s", $here, $there; @@ -7107,7 +7131,7 @@ sub cmd_print_dgit_repos_server_source_url { "no arguments allowed to dgit print-dgit-repos-server-source-url" if @ARGV; my $url = repos_server_url(); - print $url, "\n" or confess $!; + print $url, "\n" or confess "$!"; } sub pre_print_dpkg_source_ignores { @@ -7117,7 +7141,7 @@ sub cmd_print_dpkg_source_ignores { badusage __ "no arguments allowed to dgit print-dpkg-source-ignores" if @ARGV; - print "@dpkg_source_ignores\n" or confess $!; + print "@dpkg_source_ignores\n" or confess "$!"; } sub cmd_setup_mergechangelogs { @@ -7148,7 +7172,7 @@ sub cmd_setup_new_tree { #---------- argument parsing and main program ---------- sub cmd_version { - print "dgit version $our_version\n" or confess $!; + print "dgit version $our_version\n" or confess "$!"; finish 0; } @@ -7405,7 +7429,7 @@ sub parseopts () { sub check_env_sanity () { my $blocked = new POSIX::SigSet; - sigprocmask SIG_UNBLOCK, $blocked, $blocked or confess $!; + sigprocmask SIG_UNBLOCK, $blocked, $blocked or confess "$!"; eval { foreach my $name (qw(PIPE CHLD)) { @@ -7522,7 +7546,7 @@ print STDERR __ "DRY RUN ONLY\n" if $dryrun_level > 1; print STDERR __ "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" if $dryrun_level == 1; if (!@ARGV) { - print STDERR __ $helpmsg or confess $!; + print STDERR __ $helpmsg or confess "$!"; finish 8; } $cmd = $subcommand = shift @ARGV; diff --git a/dgit-downstream-dsc.7.pod b/dgit-downstream-dsc.7.pod index fcbce05..91d9023 100644 --- a/dgit-downstream-dsc.7.pod +++ b/dgit-downstream-dsc.7.pod @@ -121,8 +121,8 @@ but in most installations this is not needed. If there is no or little distinction between (i) developers who are entitled to upload (push) and (ii) repository administrators, -then a it is sufficient to provide a -git server with a unix account for each user who will pushing, +then it is sufficient to provide a +git server with a unix account for each user who will be pushing, perhaps using ssh restricted commands. =item Debian-format archive (repository) @@ -216,7 +216,7 @@ yet a git repository for a particular package. If you always have a git repository for every package in your archive, perhaps because you never use dput/dupload, and always dgit push, -Set C<git-check> to B<true>. +set C<git-check> to B<true>. Otherwise, set C<git-check> to a url prefix - ideally, https. dgit clone will try to fetch @@ -312,7 +312,7 @@ Either don't do that, or set up B<dgit-repos-server>. When a user who can push runs dgit, dgit uses ssh to access the git server. -To make ssh restricted command easier, +To make use of ssh restricted command easier, and for the benefit of dgit-repos-server, dgit's ssh commands each start with a parseable commentish rune. diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod index 4996e6a..b91ed16 100644 --- a/dgit-maint-debrebase.7.pod +++ b/dgit-maint-debrebase.7.pod @@ -376,7 +376,7 @@ release: =back Pass I<--stat> just to see the list of changed files, which is useful -to determine whether there are any new or deleted files to may need +to determine whether there are any new or deleted files that may need accounting for in your copyright file. If you obtained a tarball from upstream, you are ready to try a build. @@ -451,7 +451,7 @@ In some cases where you used B<git debrebase convert-from-gbp> since the last upload, it is not possible for dgit to make your history fast-forwarding from the history on B<dgit-repos>. In such cases you will have to pass I<--overwrite> to dgit. git-debrebase will normally -tell you if this is will be needed. +tell you if this will be needed. Right before uploading, if you did not just already do so, you might want to have git-debrebase(1) shuffle your branch such that the Debian @@ -559,7 +559,7 @@ In the simplest case, =back -If that fails, because your branch and the NMUers work represent +If that fails, because your branch and the NMUers' work represent divergent branches of development, you have a number of options. Here we describe the two simplest. diff --git a/dgit-maint-native.7.pod b/dgit-maint-native.7.pod index ac57728..792be10 100644 --- a/dgit-maint-native.7.pod +++ b/dgit-maint-native.7.pod @@ -85,7 +85,7 @@ is fast forward from the dgit archive view. Alternatively, if this was the first ever dgit push of the package, you can avoid this merge commit by -passing C<--deliberately-not-fast-forward>. +passing C<--deliberately-not-fast-forward> instead of C<--overwrite>. This avoids introducing a new origin commit into your git history. diff --git a/dgit-sponsorship.7.pod b/dgit-sponsorship.7.pod index 199903c..2e6f82d 100644 --- a/dgit-sponsorship.7.pod +++ b/dgit-sponsorship.7.pod @@ -9,7 +9,7 @@ and a sponsoring DD (or DM) can collaborate and publish using git. -The sponsor must to be intending to use dgit for the upload. +The sponsor must be intending to use dgit for the upload. (If the sponsor does not use dgit, it is not possible to properly publish a sponsee's git branch.) diff --git a/dgit-user.7.pod b/dgit-user.7.pod index 036d5bb..18f06da 100644 --- a/dgit-user.7.pod +++ b/dgit-user.7.pod @@ -379,7 +379,7 @@ If neither of those are an option, your desperate last resort is to try using the same version number as the official package for your own package. -(The version is controlled by C<debian/changelog> - see above). +(The version is controlled by C<debian/changelog> - see above.) This is not ideal because it makes it hard to tell what is installed, and because it will mislead and confuse apt. @@ -147,8 +147,8 @@ commit. Tagging, signing and actually uploading should be left to dgit push. dgit's build operations access the network, -to get the -v option right. -See -v, below. +to get the \-v option right. +See \-v, below. .TP \fBdgit build-source\fR ... Builds the source package, and a changes file for a prospective @@ -163,12 +163,12 @@ Tagging, signing and actually uploading should be left to dgit push-source, or dgit push. .TP .B dgit clean -Cleans the current working tree (according to the --clean= option in +Cleans the current working tree (according to the \-\-clean= option in force). .TP -\fBdgit update-vcs-git\fR [\fIsuite\fP|\fB.\fR] [\fB--\fR] [\fIgit fetch options\fR] +\fBdgit update-vcs-git\fR [\fIsuite\fP|\fB.\fR] [\fB\-\-\fR] [\fIgit fetch options\fR] .TQ -\fBdgit update-vcs-git\fR [\fIsuite|\fP\fB.\fR] \fB-\fR +\fBdgit update-vcs-git\fR [\fIsuite|\fP\fB.\fR] \fB\-\fR Sets up, or updates the url of, the vcs-git remote, and (unless \fB-\fR was specified) runs git fetch on it. @@ -194,7 +194,7 @@ The output is left in .IP Note that by default sbuild does not build arch-independent packages. -You probably want to pass -A, to request those. +You probably want to pass \-A, to request those. .IP Tagging, signing and actually uploading should be left to dgit push. .TP @@ -206,12 +206,12 @@ binary changes files. The output is left in .IR package \fB_\fR version \fB_multi.changes\fR. -You should ensure that your dgit --build-products-dir setting matches -your pbuilder --buildresult. +You should ensure that your dgit \-\-build-products-dir setting matches +your pbuilder \-\-buildresult. -The \fIdebbuildopts\fP are passed to pbuilder using its --debbuildopts +The \fIdebbuildopts\fP are passed to pbuilder using its \-\-debbuildopts option. If you want to pass other options to pbuilder, use the -\fB--pbuilder:\fR dgit option as described below +\fB\-\-pbuilder:\fR dgit option as described below (remember that dgit options should appear between \fBdgit\fR and \fBpbuilder\fR). @@ -251,7 +251,7 @@ In more detail: dgit push checks that the current HEAD corresponds to the .dsc. It then pushes the HEAD to the suite's dgit-repos branch, adjusts the .changes to include any .origs which the archive lacks and exclude .origs which the archive has -(so -sa and -sd are not needed when building for dgit push), +(so \-sa and \-sd are not needed when building for dgit push), makes a signed git tag, edits the .dsc to contain the dgit metadata field, runs debsign to sign the upload (.dsc and .changes), pushes the signed tag, and finally uses dput to upload the .changes to the @@ -267,11 +267,11 @@ to prepare the branch for source package upload and push. .TP \fBdgit push-source\fR [\fIsuite\fP] -Without \fB-C\fR, builds a source package and dgit pushes it. Saying +Without \fB\-C\fR, builds a source package and dgit pushes it. Saying \fBdgit push-source\fR is like saying "update the source code in the archive to match my git HEAD, and let the autobuilders do the rest." -With \fB-C\fR, performs a dgit push, additionally ensuring that no +With \fB\-C\fR, performs a dgit push, additionally ensuring that no binary packages are uploaded. .TP \fBdgit rpush\fR \fIbuild-host\fR\fB:\fR\fIbuild-dir\fR [\fIpush args...\fR] @@ -286,7 +286,7 @@ l l. 1. Clone on build host (dgit clone) 2. Edit code on build host (edit, git commit) 3. Build package on build host (dgit build) -4. Test package on build host or elsewhere (dpkg -i, test) +4. Test package on build host or elsewhere (dpkg \-i, test) 5. Upload by invoking dgit rpush on host with your GPG key. .TE @@ -338,8 +338,8 @@ which uses Set up the working tree's .B .git/info/attributes to disable all transforming attributes for all files. -This is done by defining a macro attribute -.B dgit-defuse-attrs +This is done by defining a macro attribute, +.B dgit-defuse-attrs, and applying it to .BR * . For why, see @@ -355,7 +355,7 @@ in .git/info/attributes, but it is insufficient, because it was made by an earlier version of dgit and git has since introduced new transforming attributes, -modifies the macro to disable the newer transformations. +this modifies the macro to disable the newer transformations. (If there is already a macro attribute line .B [attr]dgit-defuse-attrs @@ -390,7 +390,7 @@ dgit can make patches in some situations where git-debrebase fails, so dgit quilt-fixup can be useful in its own right. To always use dgit's own patch generator instead of git-debrebase make-patches, -pass --git-debrebase=true to dgit. +pass \-\-git-debrebase=true to dgit. See .B FORMAT 3.0 (QUILT) @@ -421,14 +421,14 @@ and specifying where to find that commit import-dsc might need online access. If this is a problem (or dgit's efforts to find the commit fail), -consider --no-chase-dsc-distro -or --force-import-dsc-with-dgit-field. +consider \-\-no-chase-dsc-distro +or \-\-force-import-dsc-with-dgit-field. There is only one sub-option: -.B --require-valid-signature +.B \-\-require-valid-signature causes dgit to insist that the signature on the .dsc is valid -(using the same criteria as dpkg-source -x). +(using the same criteria as dpkg-source \-x). Otherwise, dgit tries to verify the signature but the outcome is reported only as messages to stderr. @@ -448,7 +448,7 @@ and dgit actually imports the dsc dgit will make a pseudomerge so that the result is necessarily fast forward from the existing branch. -Otherwise, if branch already exists, +Otherwise, if \fIbranch\fR already exists, dgit will stop with an error message. If @@ -468,7 +468,7 @@ This is hopefully suitable for use as a git remote url. It may not be useable in a browser. .TP .BI "dgit print-dpkg-source-ignores" -Prints the -i and -I arguments which must be passed to dpkg-souce +Prints the \-i and \-I arguments which must be passed to dpkg-souce to cause it to exclude exactly the .git directory and nothing else. The separate arguments are unquoted, separated by spaces, @@ -495,18 +495,18 @@ See ACCESS CONFIGURATION, below. This function is primarily provided for the benefit of git-debrebase. .SH OPTIONS .TP -.BR --dry-run " | " -n +.BR \-\-dry-run " | " \-n Go through the motions, fetching all information needed, but do not actually update the output(s). For push, dgit does the required checks and leaves the new .dsc in a temporary file, but does not sign, tag, push or upload. .TP -.BR --damp-run " | " -L +.BR \-\-damp-run " | " \-L Go through many more of the motions: do everything that doesn't involve either signing things, or making changes on the public servers. .TP -.BI -k keyid +.BI \-k keyid Use .I keyid for signing the tag and the upload. The default comes from the @@ -568,7 +568,7 @@ and can avoid needing the build-dependencies. With .BR ,ignores or -.BR -wci , +.BR \-wci , untracked files covered by .gitignore are tolerated, so only files which show up as .B ? @@ -576,7 +576,7 @@ in git status (ie, ones you maybe forgot to git add) are treated as a problem. .TP -.BR --clean=none " | " -wn +.BR \-\-clean=none " | " \-wn Do not clean the tree, nor check that it is clean. Avoids running rules clean, and can avoid needing the build-dependencies. @@ -607,7 +607,7 @@ The rules clean target will only be run if it is needed: when dgit is going to build source or binary packages from your working tree, rather than from your git branch -(for example because of --include-dirty +(for example because of \-\-include-dirty or because the binary package build uses your working tree). In all cases, @@ -661,7 +661,7 @@ It is safer not to specify .IR previous-version , and usually it's not needed. Just say -.BR --overwrite , +.BR \-\-overwrite , unless you know what you are doing. This option is useful if you are the maintainer, and you have @@ -699,7 +699,7 @@ git history, so that your push is a fast forward from the archive. implying a split between the dgit view and the maintainer view, the pseudo-merge will appear only in the dgit view.) .TP -.BR --delayed =\fIdays\fR +.BR \-\-delayed =\fIdays\fR Upload to a DELAYED queue. .B WARNING: @@ -741,7 +741,7 @@ Also, it can mean that dgit fails to find necessary git commits. .TP -.BR --save-dgit-view= \fIbranch\fR|\fIref\fR +.BR \-\-save-dgit-view= \fIbranch\fR|\fIref\fR Specifies that when a split view quilt mode is in operation, and dgit calculates (or looks up in its cache) @@ -754,28 +754,28 @@ so don't specify a branch you want to keep. This option is effective only with the following operations: quilt-fixup; push; all builds. And it is only effective with ---[quilt=]gbp, ---[quilt=]dpm, ---quilt=unpatched. +\-\-[quilt=]gbp, +\-\-[quilt=]dpm, +\-\-quilt=unpatched. If ref does not start with refs/ it is taken to be a branch - i.e. refs/heads/ is prepended. -.B --dgit-view-save +.B \-\-dgit-view-save is a deprecated alias for ---save-dgit-view. +\-\-save-dgit-view. .TP -.BI --deliberately- something +.BI \-\-deliberately- something Declare that you are deliberately doing .IR something . This can be used to override safety catches, including safety catches which relate to distro-specific policies. -The use of --deliberately is declared and published in the signed tags +The use of \-\-deliberately is declared and published in the signed tags generated for you by dgit, so that the archive software can give effect to your intent, and -for the benefit humans looking at the history. +for the benefit of humans looking at the history. The meanings of .IR something s understood in the context of Debian are discussed below: @@ -852,7 +852,7 @@ because the dgit git tree does not have a directory.) .TP .BR --quilt=nocheck " | " --no-quilt-fixup -Do not check whether up source format `3.0 (quilt)' metadata needs +Do not check whether source format `3.0 (quilt)' metadata needs fixing up. If you use this option and the metadata did in fact need fixing up, dgit push will fail. .TP @@ -902,16 +902,16 @@ for the dgit view. dgit quilt-fixup will merely do some checks, and cache the maintainer view. -.B If you have a branch like this it is essential to specify the appropriate --quilt= option! +.B If you have a branch like this it is essential to specify the appropriate \-\-quilt= option! This is because it is not always possible to tell: a patches-unapplied git branch of a package with one patch, for example, looks very like a patches-applied branch where the user has used git revert to undo the patch, expecting to actually revert it. However, if you fail to specify the right \-\-quilt option, and you aren't too lucky, dgit will notice the problem and stop, -with a useful hint. +with a useful hint. .TP -.BR -d "\fIdistro\fR | " --distro= \fIdistro\fR +.BR \-d "\fIdistro\fR | " \-\-distro= \fIdistro\fR Specifies that the suite to be operated on is part of distro .IR distro . This overrides the default value found from the git config option @@ -923,7 +923,7 @@ for accessing the archive and dgit-repos) used are If your suite is part of a distro that dgit already knows about, you can use this option to make dgit work even if your dgit doesn't know about the suite. For example, specifying -.B -ddebian +.B \-ddebian will work when the suite is an unknown suite in the Debian archive. To define a new distro it is necessary to define methods and URLs @@ -931,21 +931,21 @@ for fetching (and, for dgit push, altering) a variety of information both in the archive and in dgit-repos. How to set this up is not yet documented. .TP -.BI -C changesfile +.BI \-C changesfile Specifies the .changes file which is to be uploaded. By default -dgit push looks for single .changes file in the parent directory whose +dgit push looks for a single .changes file in the parent directory whose filename suggests it is for the right package and version. If the specified .I changesfile pathname contains slashes, the directory part is also used as the value for -.BR --build-products-dir ; +.BR \-\-build-products-dir ; otherwise, the changes file is expected in that directory (by default, in .BR .. ). .TP -.B --rm-old-changes +.B \-\-rm-old-changes When doing a build, delete any changes files matching .IB package _ version _*.changes before starting. This ensures that @@ -960,7 +960,7 @@ or the .rm-old-changes configuration setting. Note that \fBdgit push-source\fR will always find the right .changes, regardless of this option. .TP -.BI --build-products-dir= directory +.BI \-\-build-products-dir= directory Specifies where to find and create tarballs, binary packages, source packages, .changes files, and so on. @@ -1069,26 +1069,26 @@ and cause lossage. For dpkg-buildpackage, dpkg-genchanges, mergechanges and sbuild, the option applies only when the program is invoked directly by dgit. Usually, for passing options to dpkg-genchanges, you should use -.BR --ch: \fIoption\fR. +.BR \-\-ch: \fIoption\fR. -Specifying --git is not effective for some lower-level read-only git +Specifying \-\-git is not effective for some lower-level read-only git operations performed by dgit, and also not when git is invoked by another program run by dgit. See notes below regarding ssh and dgit. -NB that --gpg:option is not supported (because debsign does not +NB that \-\-gpg:option is not supported (because debsign does not have that facility). But see -.B -k +.B \-k and the .B keyid distro config setting. .TP -.RI \fB--curl!:\fR option " | \fB--dput!:\fR" option " |..." +.RI \fB\-\-curl!:\fR option " | \fB\-\-dput!:\fR" option " |..." Specifies an option to remove from the command line for a program called by dgit, as for -\fB--\fR\fIprogram\fI\fB:\fR\fIoption\fR +\fB\-\-\fR\fIprogram\fI\fB:\fR\fIoption\fR (and the same caveats apply). Any options or arguments exactly identical to @@ -1099,11 +1099,11 @@ are removed. This can only be used to delete options which are always passed by default by dgit, or to undo a previous -\fB--\fR\fIprogram\fI\fB:\fR\fIoption\fR. +\fB\-\-\fR\fIprogram\fI\fB:\fR\fIoption\fR. It cannot be used to override option(s) dynamically decided on by dgit. .TP -.RI \fB--curl=\fR program " | \fB--dput=\fR" program " |..." +.RI \fB\-\-curl=\fR program " | \fB\-\-dput=\fR" program " |..." Specifies alternative programs to use instead of .BR curl , .BR dput , @@ -1138,8 +1138,8 @@ For .BR dgit , specifies the command to run on the remote host when dgit rpush needs to invoke a remote copy of itself. (dgit also reinvokes -itself as the EDITOR for dpkg-source --commit; this is done using -argv[0], and is not affected by --dgit=). +itself as the EDITOR for dpkg-source \-\-commit; this is done using +argv[0], and is not affected by \-\-dgit=). .BR gbp-build 's value @@ -1172,25 +1172,25 @@ git config variables .BI dgit-distro. distro .ssh and .B .dgit.default.ssh -(which can in turn be overridden with -c). Also, when dgit is using +(which can in turn be overridden with \-c). Also, when dgit is using git to access dgit-repos, only git's idea of what ssh to use (eg, .BR GIT_SSH ) is relevant. .TP -.BI --existing-package= package +.BI \-\-existing-package= package dgit push needs to canonicalise the suite name. Sometimes, dgit lacks a way to ask the archive to do this without knowing the -name of an existing package. Without --new we can just use the -package we are trying to push. But with --new that will not work, so +name of an existing package. Without \-\-new we can just use the +package we are trying to push. But with \-\-new that will not work, so we guess .B dpkg or use the value of this option. This option is not needed with the default mechanisms for accessing the archive. .TP -.BR -h | --help +.BR \-h | \-\-help Print a usage summary. .TP -.BI --initiator-tempdir= directory +.BI \-\-initiator-tempdir= directory dgit rpush uses a temporary directory on the invoking (signing) host. This option causes dgit to use .I directory @@ -1199,7 +1199,7 @@ removed and recreated before dgit starts, rather than removed after dgit finishes. The directory specified must be an absolute pathname. .TP -.BI --force- something +.BI \-\-force- something Instructs dgit to try to proceed despite detecting what it thinks is going to be a fatal problem. .B This is probably not going to work. @@ -1207,45 +1207,45 @@ These options are provided as an escape hatch, in case dgit is confused. (They might also be useful for testing error cases.) .TP -.B --force-import-dsc-with-dgit-field +.B \-\-force-import-dsc-with-dgit-field Tell dgit import-dsc to treat a .dsc with a Dgit field like one without it. The result is a fresh import, discarding the git history that the person who pushed that .dsc was working with. .TP -.B --force-uploading-binaries +.B \-\-force-uploading-binaries Carry on and upload binaries even though dgit thinks your distro does not permit that. .TP -.B --force-uploading-source-only +.B \-\-force-uploading-source-only Carry on and do a source-only upload, without any binaries, even though dgit thinks your distro does not permit that, or does not permit that in this situation. .TP -.B --force-unrepresentable +.B \-\-force-unrepresentable Carry on even if dgit thinks that your git tree contains changes (relative to your .orig tarballs) which dpkg-source is not able to represent. Your build or push will probably fail later. .TP -.B --force-changes-origs-exactly +.B \-\-force-changes-origs-exactly Use the set of .origs specified in your .changes, exactly, without regard to what is in the archive already. The archive may well reject your upload. .TP -.B --force-unsupported-source-format +.B \-\-force-unsupported-source-format Carry on despite dgit not understanding your source package format. dgit will probably mishandle it. .TP -.B --force-dsc-changes-mismatch +.B \-\-force-dsc-changes-mismatch Do not check whether .dsc and .changes match. The archive will probably reject your upload. .TP -.BR --force-import-gitapply-absurd " | " --force-import-gitapply-no-absurd +.BR \-\-force-import-gitapply-absurd " | " \-\-force-import-gitapply-no-absurd Force on or off the use of the absurd git-apply emulation when running gbp pq import when importing a package from a .dsc. @@ -1285,18 +1285,18 @@ for each the default value used if there is no distro-specific setting. .TP .BR dgit-distro. \fIdistro\fR .clean-mode -One of the values for the command line --clean= option; used if ---clean is not specified. +One of the values for the command line \-\-clean= option; used if +\-\-clean is not specified. .TP .BR dgit-distro. \fIdistro\fR .clean-mode-newer Like .clean-mode, -but ignored if the value does not make sense to this version of dgit. +but ignored if the value is unknown to this version of dgit. Setting both .clean-mode and .clean-mode-newer is useful to provide a single git config compatible with different dgit versions. .TP .BR dgit-distro. \fIdistro\fR .quilt-mode -One of the values for the command line --quilt= option; used if ---quilt is not specified. +One of the values for the command line \-\-quilt= option; used if +\-\-quilt is not specified. .TP .BR dgit-distro. \fIdistro\fR .rm-old-changes Boolean, used if neither \-\-rm-old-changes nor \-\-no-rm-old-changes @@ -1311,7 +1311,7 @@ git repository server. .TP .BI dgit-distro. distro .keyid See also -.BR -k . +.BR \-k . .TP .BI dgit-distro. distro .mirror " url" .TP @@ -1328,10 +1328,10 @@ used, respectively. Only used if .setup-usermail is not disabled. .TP .BI dgit-distro. distro .setup-useremail Whether to set user.name and user.email in new git trees. -True by default. Ignored for dgit setup-setup-useremail, which does it anyway. +True by default. Ignored for dgit setup-useremail, which does it anyway. .TP .BI dgit-distro. distro .setup-mergechangelogs -Whether to setup a merge driver which uses dpkg-mergechangelogs for +Whether to set up a merge driver which uses dpkg-mergechangelogs for debian/changelog. True by default. Ignored for dgit setup-mergechangelogs, which does it anyway. .TP @@ -1345,18 +1345,19 @@ True by default. Ignored for dgit setup-gitattributes, which does it anyway. Program to use instead of .IR cmd . Works like -.BR -- \fIcmd\fR = "... ." +.BR \-\- \fIcmd\fR = "... ." .TP .BI dgit-distro. distro .opts- cmd Extra options to pass to .IR cmd . Works like -.BR -- \fIcmd\fR : "... ." +.BR \-\- \fIcmd\fR : "... ." To pass several options, configure multiple values in git config -(with git config --add). The options for +(with git config \-\-add). The options for .BI dgit.default.opts- cmd +and .BI dgit-distro. distro /push.opts- cmd -and are all used, followed by options from dgit's command line. +are all used, followed by options from dgit's command line. .SH ACCESS CONFIGURATION There are many other settings which specify how a particular distro's services (archive and git) are provided. These should not normally be @@ -1433,7 +1434,7 @@ if it contains any whitespace will be passed to the shell. GIT_SSH specifies just the program; no arguments can be specified, so dgit interprets it the same way as git does. See -also the --ssh= and --ssh: options. +also the \-\-ssh= and \-\-ssh: options. .TP .BR DEBEMAIL ", " DEBFULLNAME Default git user.email and user.name for new trees. See @@ -1462,10 +1463,10 @@ your current HEAD. Sadly this is necessary for packages in the `3.0 (quilt)' source format. This is ultimately due to what I consider design problems in quilt and dpkg-source. ---dry-run does not always work properly, as not doing some of the git +\-\-dry-run does not always work properly, as not doing some of the git fetches may result in subsequent actions being different. Doing a non-dry-run dgit fetch first will help. ---damp-run is likely to work much better. +\-\-damp-run is likely to work much better. .SH SEE ALSO \fBdgit\fP(7), \fBdgit-*\fP(7), @@ -161,7 +161,7 @@ or to try to upload to it. When using this facility, it is important to always specify the same suites in the same order: -dgit will not be make a coherent fast-forwarding history +dgit will not make a coherent fast-forwarding history view otherwise. The history generated by this feature is not normally suitable @@ -361,7 +361,7 @@ whose tree is identical to o+d/p in all upstream files. In the error message, 696c9bd5..84ae8f96 is the first commit child-parent edge -which cannot be sensibly be +which cannot sensibly be either ignored, or turned into a patch in debian/patches. In this example, this is because it itself changes files in debian/patches, diff --git a/git-debrebase b/git-debrebase index 829ab82..71bf39d 100755 --- a/git-debrebase +++ b/git-debrebase @@ -144,10 +144,10 @@ sub run_ref_updates_now ($$) { my @upd_cmd = (git_update_ref_cmd "debrebase: $mrest", qw(--stdin)); debugcmd '>|', @upd_cmd; - open U, "|-", @upd_cmd or confess $!; + open U, "|-", @upd_cmd or confess "$!"; foreach (@$updates) { printdebug ">= ", $_, "\n"; - print U $_, "\n" or confess $!; + print U $_, "\n" or confess "$!"; } printdebug ">\$\n"; close U or failedcmd @upd_cmd; @@ -611,7 +611,7 @@ sub merge_series ($$$;@) { if ($any) { open S, $seriesfile or confess "$seriesfile $!"; while (my $patch = <S>) { - chomp $patch or confess $!; + chomp $patch or confess "$!"; $prereq{$patch} //= {}; foreach my $earlier (@earlier) { $prereq{$patch}{$earlier}{$s}++ and confess; @@ -708,7 +708,7 @@ sub merge_series ($$$;@) { }; }; - open NS, '>', $seriesfile or confess $!; + open NS, '>', $seriesfile or confess "$!"; while (keys %prereq) { my $best; @@ -723,7 +723,7 @@ sub merge_series ($$$;@) { $best = $try; } printdebug "merge_series series next $best\n"; - print NS "$best\n" or confess $!; + print NS "$best\n" or confess "$!"; delete $prereq{$best}; foreach my $gp (values %prereq) { delete $gp->{$best}; @@ -765,9 +765,9 @@ sub merge_series_patchqueue_convert ($$$) { my $tree = cmdoutput @git, qw(write-tree); $commit =~ s{^parent (\S+)$}{parent $build}m or confess; $commit =~ s{^tree (\S+)$}{tree $tree}m or confess; - open C, ">", "../mcommit" or confess $!; - print C $commit or confess $!; - close C or confess $!; + open C, ">", "../mcommit" or confess "$!"; + print C $commit or confess "$!"; + close C or confess "$!"; $build = cmdoutput @git, qw(hash-object -w -t commit ../mcommit); } $result = $build; @@ -1586,7 +1586,7 @@ sub walk ($;$$$) { confess __ "internal error" unless $build eq (pop @processed)->{CommitId}; in_workarea sub { - mkdir $rd or $!==EEXIST or confess $!; + mkdir $rd or $!==EEXIST or confess "$!"; my $current_method; my $want_debian = $build; my $want_upstream = $build; @@ -1696,9 +1696,9 @@ sub walk ($;$$$) { or confess "$ch ?"; } my $cf = "$rd/m$rewriting"; - open CD, ">", $cf or confess $!; - print CD $ch, "\n", $cl->{Msg} or confess $!; - close CD or confess $!; + open CD, ">", $cf or confess "$!"; + print CD $ch, "\n", $cl->{Msg} or confess "$!"; + close CD or confess "$!"; my @cmd = (@git, qw(hash-object)); push @cmd, qw(-w) if $rewriting; push @cmd, qw(-t commit), $cf; @@ -1811,7 +1811,7 @@ sub cmd_analyse () { $old = git_rev_parse 'HEAD'; } my ($dummy,$breakwater) = walk $old, 1,*STDOUT; - STDOUT->error and confess $!; + STDOUT->error and confess "$!"; } sub ffq_check ($;$$) { @@ -1828,7 +1828,7 @@ sub ffq_check ($;$$) { # normally $currentval should be HEAD my ($currentval, $ff, $notff) =@_; - $ff //= sub { print $_[0] or confess $!; }; + $ff //= sub { print $_[0] or confess "$!"; }; $notff //= \&snag; my ($status, $message, $current, $ffq_prev, $gdrlast) @@ -2008,6 +2008,7 @@ sub upstream_commitish_search ($$) { sub resolve_upstream_version ($$) { my ($new_upstream, $upstream_version) = @_; + my $used = $new_upstream; if (!defined $new_upstream) { my @tried; $new_upstream = upstream_commitish_search $upstream_version, \@tried; @@ -2018,10 +2019,12 @@ sub resolve_upstream_version ($$) { " Check version, and specify upstream commitish explicitly.", "@tried"; } + $used = $tried[-1]; } $new_upstream = git_rev_parse $new_upstream; - return $new_upstream; + return ($new_upstream, $used); + # used is a human-readable idea of what we found } sub cmd_new_upstream () { @@ -2043,7 +2046,8 @@ sub cmd_new_upstream () { my $new_upstream = shift @ARGV; my $new_upstream_version = upstreamversion $new_version; - $new_upstream = + my $new_upstream_used; + ($new_upstream, $new_upstream_used) = resolve_upstream_version $new_upstream, $new_upstream_version; record_ffq_auto(); @@ -2257,7 +2261,7 @@ sub cmd_record_ffq_prev () { badusage "no arguments allowed" if @ARGV; my ($status, $msg) = record_ffq_prev_deferred(); if ($status eq 'exists' && $opt_noop_ok) { - print __ "Previous head already recorded\n" or confess $!; + print __ "Previous head already recorded\n" or confess "$!"; } elsif ($status eq 'deferred') { run_deferred_updates 'record-ffq-prev'; } else { @@ -2268,13 +2272,13 @@ sub cmd_record_ffq_prev () { sub cmd_anchor () { badusage __ "no arguments allowed" if @ARGV; my ($anchor, $bw) = keycommits +(git_rev_parse 'HEAD'), 0,0; - print "$anchor\n" or confess $!; + print "$anchor\n" or confess "$!"; } sub cmd_breakwater () { badusage __ "no arguments allowed" if @ARGV; my ($anchor, $bw) = keycommits +(git_rev_parse 'HEAD'), 0,0; - print "$bw\n" or confess $!; + print "$bw\n" or confess "$!"; } sub cmd_status () { @@ -2307,7 +2311,7 @@ sub cmd_status () { my $prcommitinfo = sub { my ($cid) = @_; - flush STDOUT or confess $!; + flush STDOUT or confess "$!"; runcmd @git, qw(--no-pager log -n1), '--pretty=format: %h %s%n', $cid; @@ -2549,7 +2553,7 @@ sub cmd_convert_from_gbp () { my ($upstream_spec) = @ARGV; my $upstream_version = upstreamversion $version; - my $upstream = + my ($upstream, $upstream_used) = resolve_upstream_version($upstream_spec, $upstream_version); my ($old_head, $gdrlastinfo) = begin_convert_from(); @@ -2559,7 +2563,7 @@ sub cmd_convert_from_gbp () { runcmd @git, qw(--no-pager diff --stat), $upstream, $old_head, qw( -- :!/debian :/); - fail f_ <<END, $upstream_spec, $upstream_spec; + fail f_ <<END, $upstream_used, $upstream; upstream (%s) and HEAD are not identical in upstream files. See diffstat above, or run git diff %s HEAD -- :!/debian :/ @@ -2576,9 +2580,9 @@ END if (length $wrong) { snag 'unexpected-upstream-changes', f_ "history between upstream (%s) and HEAD contains direct changes to upstream files - are you sure this is a gbp (patches-unapplied) branch?", - $upstream; + $upstream_used; print STDERR f_ "list expected changes with: %s\n", - "git log --stat --ancestry-path $upstream_spec..HEAD -- :/ ':!/debian'"; + "git log --stat --ancestry-path $upstream..HEAD -- :/ ':!/debian'"; } } @@ -2670,7 +2674,7 @@ END }; complete_convert_from $old_head, $work, $gdrlastinfo, 'convert-from-gbp'; - print f_ <<END, $us or confess $!; + print f_ <<END, $us or confess "$!"; %s: converted from patched-unapplied (gbp) branch format, OK END } @@ -2699,7 +2703,7 @@ sub cmd_convert_to_gbp () { } snags_maybe_bail(); update_head_checkout $head, $out, "convert to gbp (v0)"; - print f_ <<END, $us,$us,$us or confess $!; + print f_ <<END, $us,$us,$us or confess "$!"; %s: converted to git-buildpackage branch format %s: WARNING: do not now run "git-debrebase" any more %s: WARNING: doing so would drop all upstream patches! @@ -3026,7 +3030,7 @@ getoptions_main push @$opt_defaultcmd_interactive, @ARGV; @ARGV=(); }, - 'help' => sub { print __ $usage_message or confess $!; finish 0; }, + 'help' => sub { print __ $usage_message or confess "$!"; finish 0; }, ); initdebug('git-debrebase '); diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index 00b664b..cbdf292 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -19,7 +19,7 @@ L<dgit-maint-debrebase(7)>. For background, theory of operation, and definitions see L<git-debrebase(5)>. -You should read this manpage in cojnunction with +You should read this manpage in conjunction with L<git-debrebase(5)/TERMINOLOGY>, which defines many important terms used here. @@ -59,7 +59,7 @@ It is hazardous to use plain git-rebase on a git-debrebase branch, because git-rebase has a tendency to start the rebase too far back in history, and then drop important commits. -Soo L<git-debrebase(5)/ILLEGAL OPERATIONS> +See L<git-debrebase(5)/ILLEGAL OPERATIONS> =item git-debrebase status @@ -155,7 +155,7 @@ the whole new upstream operation is aborted, except for the laundering. <new-version> -may be whole new Debian version, including revision, +may be a whole new Debian version, including revision, or just the upstream part, in which case -1 will be appended to make the new Debian version. @@ -249,7 +249,7 @@ If the patches implied by the current branch are not a simple superset of those already in debian/patches, make-patches will fail with exit status 7, and an error message. -(The message can be suppress with --quiet-would-amend.) +(The message can be suppressed with --quiet-would-amend.) If the problem is simply that the existing patches were not made by git-debrebase, using dgit quilt-fixup instead should succeed. @@ -258,7 +258,7 @@ using dgit quilt-fixup instead should succeed. =item git-debrebase convert-from-gbp [<upstream-commit-ish>] -Cnnverts any of the following into a git-debrebase interchange branch: +Converts any of the following into a git-debrebase interchange branch: =over @@ -370,7 +370,7 @@ and any ffq-prev is deleted. This is provided mostly for the test suite and for unusual situations. -It should only be used with a care and +It should only be used with care and with a proper understanding of the underlying theory. Be sure to not accidentally treat the result as diff --git a/git-debrebase.5.pod b/git-debrebase.5.pod index 439fd63..d23c6b2 100644 --- a/git-debrebase.5.pod +++ b/git-debrebase.5.pod @@ -146,7 +146,7 @@ See L</STITCHING, PSEUDO-MERGES, FFQ RECORD>. git-debrebase has one primary branch, the B<interchange branch>. -This branch is found on Debian contributor's workstations +This branch is found on Debian contributors' workstations (typically, a maintainer would call it B<master>), in the Debian dgit git server as the suite branch (B<dgit/dgit/sid>) and on other git servers which support Debian work @@ -175,7 +175,7 @@ the upstream commits). The breakwater does not contain any representation of the delta queue (not even debian/patches). The part of the breakwater processed by git-debrebase -is the part since the most reecent B<anchor>, +is the part since the most recent B<anchor>, which is usually a special merge generated by git-debrebase. When working, locally, @@ -255,7 +255,7 @@ a representation of the delta queue: =item Delta queue commits Zero or more single-parent commits -contaioning only changes to upstream files. +containing only changes to upstream files. =back @@ -266,7 +266,7 @@ branch state is also B<rebasing>. It has the same contents as the laundered state, except that it may contain, additionally, -in B<in any order but after the breakwater>: +B<in any order but after the breakwater>: =over @@ -379,8 +379,8 @@ When ffq-prev is not present, C<refs/debrebase-last/B> records some ancestor of refs/B, (usually, the result of last stitch). This is used for status printing and some error error checks - -especially for printing guesses what a problem is. -To determine whether a branch is +especially for printing guesses about what a problem is. +To determine whether a branch is being maintained in git-debrebase form it is necessary to walk its history. @@ -419,7 +419,7 @@ so we can at least detect unsupported merges. =head1 LEGAL OPERATIONS -The following basic operations follows from this model +The following basic operations follow from this model (refer to the diagram above): =over @@ -472,7 +472,7 @@ so that git log shows the packaging history.) =item Stitch Make a pseudomerge, -whose contributing parent to is the unstitched branch +whose contributing parent is the unstitched branch and whose overwritten parent is ffq-prev, consuming ffq-prev in the process @@ -483,7 +483,7 @@ or perhaps a laundered branch with a quilt patch addition commit. =item Commit quilt patches To generate a tree which can be represented as a -3.0 (quilt) .dsc source packages, +3.0 (quilt) .dsc source package, the delta queue must be reified inside the git tree in B<debian/patches/>. These patch files can be stripped out and/or regenerated as needed. @@ -515,7 +515,7 @@ For these reasons, it is better to use git-debrebase and let it choose the base for your rebase. -If you do realise you have make this mistake, +If you do realise you have made this mistake, it is best to use the reflog to recover to a suitable good previous state. diff --git a/po/en_US.po b/po/en_US.po index 0e4ddfb..b0e64d4 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dgit ongoing\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-06 17:50+0000\n" +"POT-Creation-Date: 2019-03-01 21:54+0000\n" "PO-Revision-Date: 2018-08-26 16:55+0100\n" "Last-Translator: Ian Jackson <ijackson@chiark.greenend.org.uk>\n" "Language-Team: dgit developrs <dgit@packages.debian.org>\n" @@ -17,78 +17,78 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../dgit:240 +#: ../dgit:242 #, perl-format msgid "%s: invalid configuration: %s\n" msgstr "" -#: ../dgit:247 +#: ../dgit:249 msgid "warning: overriding problem due to --force:\n" msgstr "" -#: ../dgit:255 +#: ../dgit:257 #, perl-format msgid "warning: skipping checks or functionality due to --force-%s\n" msgstr "" -#: ../dgit:260 +#: ../dgit:262 #, perl-format msgid "%s: source package %s does not exist in suite %s\n" msgstr "" -#: ../dgit:483 +#: ../dgit:487 #, perl-format msgid "build host child %s" msgstr "" -#: ../dgit:488 ../dgit:494 +#: ../dgit:492 ../dgit:498 #, perl-format msgid "connection lost: %s" msgstr "" -#: ../dgit:489 +#: ../dgit:493 #, perl-format msgid "protocol violation; %s not expected" msgstr "" -#: ../dgit:497 +#: ../dgit:501 #, perl-format msgid "eof (reading %s)" msgstr "" -#: ../dgit:504 +#: ../dgit:508 msgid "protocol message" msgstr "" -#: ../dgit:512 +#: ../dgit:516 #, perl-format msgid "`%s'" msgstr "" -#: ../dgit:533 +#: ../dgit:537 msgid "bad byte count" msgstr "" -#: ../dgit:536 +#: ../dgit:540 msgid "data block" msgstr "" -#: ../dgit:617 +#: ../dgit:621 #, perl-format msgid "failed to fetch %s: %s" msgstr "" -#: ../dgit:629 +#: ../dgit:633 #, perl-format msgid "%s ok: %s" msgstr "" -#: ../dgit:631 +#: ../dgit:635 #, perl-format msgid "would be ok: %s (but dry run only)" msgstr "" -#: ../dgit:656 +#: ../dgit:660 msgid "" "main usages:\n" " dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n" @@ -109,141 +109,141 @@ msgid "" " -c<name>=<value> set git config option (used directly by dgit too)\n" msgstr "" -#: ../dgit:675 +#: ../dgit:679 msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n" msgstr "" -#: ../dgit:679 +#: ../dgit:683 #, perl-format msgid "" "%s: %s\n" "%s" msgstr "" -#: ../dgit:684 +#: ../dgit:688 msgid "too few arguments" msgstr "" -#: ../dgit:795 +#: ../dgit:799 #, perl-format msgid "multiple values for %s (in %s git config)" msgstr "" -#: ../dgit:798 +#: ../dgit:802 #, perl-format msgid "value for config option %s (in %s git config) contains newline(s)!" msgstr "" -#: ../dgit:818 +#: ../dgit:822 #, perl-format msgid "" "need value for one of: %s\n" "%s: distro or suite appears not to be (properly) supported" msgstr "" -#: ../dgit:859 +#: ../dgit:863 #, perl-format msgid "bad syntax for (nominal) distro `%s' (does not match %s)" msgstr "" -#: ../dgit:874 +#: ../dgit:878 #, perl-format msgid "backports-quirk needs % or ( )" msgstr "" -#: ../dgit:890 +#: ../dgit:894 #, perl-format msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'" msgstr "" -#: ../dgit:910 +#: ../dgit:914 msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)" msgstr "" -#: ../dgit:919 ../git-debrebase:1586 ../Debian/Dgit.pm:201 +#: ../dgit:923 ../git-debrebase:1586 ../Debian/Dgit.pm:201 msgid "internal error" msgstr "" -#: ../dgit:921 +#: ../dgit:925 msgid "pushing but distro is configured readonly" msgstr "" -#: ../dgit:925 +#: ../dgit:929 msgid "" "Push failed, before we got started.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:1090 +#: ../dgit:1094 msgid "this operation does not support multiple comma-separated suites" msgstr "" -#: ../dgit:1136 +#: ../dgit:1140 #, perl-format msgid "" "config requested specific TLS key but do not know how to get curl to use " "exactly that EE key (%s)" msgstr "" -#: ../dgit:1157 +#: ../dgit:1161 msgid "ftpmasterapi archive query method takes no data part" msgstr "" -#: ../dgit:1165 +#: ../dgit:1169 msgid "curl failed to print 3-digit HTTP code" msgstr "" -#: ../dgit:1169 +#: ../dgit:1173 #, perl-format msgid "fetch of %s gave HTTP code %s" msgstr "" -#: ../dgit:1185 +#: ../dgit:1189 #, perl-format msgid "unknown suite %s, maybe -d would help" msgstr "" -#: ../dgit:1189 +#: ../dgit:1193 #, perl-format msgid "multiple matches for suite %s\n" msgstr "" -#: ../dgit:1191 +#: ../dgit:1195 #, perl-format msgid "suite %s info has no codename\n" msgstr "" -#: ../dgit:1193 +#: ../dgit:1197 #, perl-format msgid "suite %s maps to bad codename\n" msgstr "" -#: ../dgit:1195 ../dgit:1220 +#: ../dgit:1199 ../dgit:1224 msgid "bad ftpmaster api response: " msgstr "" -#: ../dgit:1209 +#: ../dgit:1213 #, perl-format msgid "bad version: %s\n" msgstr "" -#: ../dgit:1211 +#: ../dgit:1215 msgid "bad component" msgstr "" -#: ../dgit:1214 +#: ../dgit:1218 msgid "bad filename" msgstr "" -#: ../dgit:1216 +#: ../dgit:1220 msgid "bad sha256sum" msgstr "" -#: ../dgit:1267 +#: ../dgit:1271 msgid "aptget archive query method takes no data part" msgstr "" -#: ../dgit:1351 +#: ../dgit:1355 #, perl-format msgid "" "apt seemed to not to update dgit's cached Release files for %s.\n" @@ -251,163 +251,163 @@ msgid "" " is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n" msgstr "" -#: ../dgit:1373 +#: ../dgit:1377 #, perl-format msgid "Release file (%s) specifies intolerable %s" msgstr "" -#: ../dgit:1401 +#: ../dgit:1405 msgid "apt-get source did not produce a .dsc" msgstr "" -#: ../dgit:1402 +#: ../dgit:1406 #, perl-format msgid "apt-get source produced several .dscs (%s)" msgstr "" -#: ../dgit:1507 +#: ../dgit:1511 #, perl-format msgid "" "unable to canonicalise suite using package %s which does not appear to exist " "in suite %s; --existing-package may help" msgstr "" -#: ../dgit:1698 +#: ../dgit:1702 #, perl-format msgid "cannot operate on %s suite" msgstr "" -#: ../dgit:1701 +#: ../dgit:1705 #, perl-format msgid "canonical suite name for %s is %s" msgstr "" -#: ../dgit:1703 +#: ../dgit:1707 #, perl-format msgid "canonical suite name is %s" msgstr "" -#: ../dgit:1723 +#: ../dgit:1727 #, perl-format msgid "%s has hash %s but archive told us to expect %s" msgstr "" -#: ../dgit:1729 +#: ../dgit:1733 #, perl-format msgid "unsupported source format %s, sorry" msgstr "" -#: ../dgit:1756 +#: ../dgit:1760 #, perl-format msgid "diverting to %s (using config for %s)" msgstr "" -#: ../dgit:1773 +#: ../dgit:1777 msgid "unexpected results from git check query - " msgstr "" -#: ../dgit:1788 +#: ../dgit:1792 #, perl-format msgid "unknown git-check `%s'" msgstr "" -#: ../dgit:1803 +#: ../dgit:1807 #, perl-format msgid "unknown git-create `%s'" msgstr "" -#: ../dgit:1840 +#: ../dgit:1844 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "" -#: ../dgit:1886 +#: ../dgit:1890 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "" -#: ../dgit:1897 +#: ../dgit:1901 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "" -#: ../dgit:1943 +#: ../dgit:1947 #, perl-format msgid "hash or size of %s varies in %s fields (between: %s)" msgstr "" -#: ../dgit:1952 +#: ../dgit:1956 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "" -#: ../dgit:1956 +#: ../dgit:1960 #, perl-format msgid "%s has no files list field(s)" msgstr "" -#: ../dgit:1962 +#: ../dgit:1966 #, perl-format msgid "no file appears in all file lists (looked in: %s)" msgstr "" -#: ../dgit:2002 +#: ../dgit:2006 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "" -#: ../dgit:2015 +#: ../dgit:2019 msgid "cannot find section/priority from .changes Files field" msgstr "" -#: ../dgit:2028 +#: ../dgit:2032 msgid "" "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n" msgstr "" -#: ../dgit:2044 +#: ../dgit:2048 #, perl-format msgid ".dsc %s missing entry for %s" msgstr "" -#: ../dgit:2049 +#: ../dgit:2053 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "" -#: ../dgit:2057 +#: ../dgit:2061 #, perl-format msgid "archive %s: %s" msgstr "" -#: ../dgit:2064 +#: ../dgit:2068 #, perl-format msgid "archive contains %s with different checksum" msgstr "" -#: ../dgit:2092 +#: ../dgit:2096 #, perl-format msgid "edited .changes for archive .orig contents: %s %s" msgstr "" -#: ../dgit:2100 +#: ../dgit:2104 #, perl-format msgid "[new .changes left in %s]" msgstr "" -#: ../dgit:2103 +#: ../dgit:2107 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "" -#: ../dgit:2127 +#: ../dgit:2131 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " "Maintainer field)" msgstr "" -#: ../dgit:2150 +#: ../dgit:2154 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -422,113 +422,113 @@ msgid "" "\n" msgstr "" -#: ../dgit:2162 +#: ../dgit:2166 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" msgstr "" -#: ../dgit:2193 +#: ../dgit:2197 msgid "Dpkg::Vendor `current vendor'" msgstr "" -#: ../dgit:2195 +#: ../dgit:2199 msgid "(base) distro being accessed" msgstr "" -#: ../dgit:2197 +#: ../dgit:2201 msgid "(nominal) distro being accessed" msgstr "" -#: ../dgit:2202 +#: ../dgit:2206 #, perl-format msgid "build-products-dir %s is not accessible: %s\n" msgstr "" -#: ../dgit:2227 +#: ../dgit:2231 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" msgstr "" -#: ../dgit:2231 +#: ../dgit:2235 #, perl-format msgid "check orig file %s in bpd %s: %s" msgstr "" -#: ../dgit:2233 +#: ../dgit:2237 #, perl-format msgid "check orig file %s in ..: %s" msgstr "" -#: ../dgit:2236 +#: ../dgit:2240 #, perl-format -msgid "check targe of orig symlink %s in ..: %s" +msgid "check target of orig symlink %s in ..: %s" msgstr "" -#: ../dgit:2245 +#: ../dgit:2249 #, perl-format msgid "%s: cloned orig symlink from ..: %s\n" msgstr "" -#: ../dgit:2249 +#: ../dgit:2253 #, perl-format msgid "%s: hardlinked orig from ..: %s\n" msgstr "" -#: ../dgit:2252 +#: ../dgit:2256 #, perl-format msgid "failed to make %s a hardlink to %s: %s" msgstr "" -#: ../dgit:2258 +#: ../dgit:2262 #, perl-format msgid "%s: symmlinked orig from .. on other filesystem: %s\n" msgstr "" -#: ../dgit:2290 ../dgit:2295 +#: ../dgit:2294 ../dgit:2299 #, perl-format msgid "accessing %s: %s" msgstr "" -#: ../dgit:2310 ../dgit:2317 +#: ../dgit:2314 ../dgit:2321 #, perl-format msgid "saving %s: %s" msgstr "" -#: ../dgit:2382 +#: ../dgit:2386 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "" -#: ../dgit:2446 ../dgit:5970 +#: ../dgit:2450 ../dgit:5974 msgid "source package" msgstr "" -#: ../dgit:2464 +#: ../dgit:2468 msgid "package changelog" msgstr "" -#: ../dgit:2504 +#: ../dgit:2508 msgid "package changelog has no entries!" msgstr "" -#: ../dgit:2523 +#: ../dgit:2527 #, perl-format msgid "Import %s" msgstr "" -#: ../dgit:2604 +#: ../dgit:2608 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "" -#: ../dgit:2623 +#: ../dgit:2627 #, perl-format msgid "%s failed: %s\n" msgstr "" -#: ../dgit:2632 +#: ../dgit:2636 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -537,21 +537,21 @@ msgid "" " dpkg-source --before-build gave tree %s\n" msgstr "" -#: ../dgit:2647 +#: ../dgit:2651 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "" -#: ../dgit:2651 +#: ../dgit:2655 msgid "Import of source package" msgstr "" -#: ../dgit:2664 +#: ../dgit:2668 #, perl-format msgid "Record %s (%s) in archive suite %s\n" msgstr "" -#: ../dgit:2668 +#: ../dgit:2672 #, perl-format msgid "" "\n" @@ -560,51 +560,51 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:2710 +#: ../dgit:2714 #, perl-format msgid "using existing %s" msgstr "" -#: ../dgit:2714 +#: ../dgit:2718 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " "file?)" msgstr "" -#: ../dgit:2718 +#: ../dgit:2722 #, perl-format msgid "need to fetch correct version of %s" msgstr "" -#: ../dgit:2734 +#: ../dgit:2738 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" msgstr "" -#: ../dgit:2829 +#: ../dgit:2833 msgid "too many iterations trying to get sane fetch!" msgstr "" -#: ../dgit:2844 +#: ../dgit:2848 #, perl-format msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n" msgstr "" -#: ../dgit:2888 +#: ../dgit:2892 #, perl-format msgid "warning: git fetch %s created %s; this is silly, deleting it.\n" msgstr "" -#: ../dgit:2903 +#: ../dgit:2907 msgid "" "--dry-run specified but we actually wanted the results of git fetch,\n" "so this is not going to work. Try running dgit fetch first,\n" "or using --damp-run instead of --dry-run.\n" msgstr "" -#: ../dgit:2908 +#: ../dgit:2912 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -614,49 +614,49 @@ msgid "" "warning: Will try again...\n" msgstr "" -#: ../dgit:2975 +#: ../dgit:2979 #, perl-format msgid "Not updating %s from %s to %s.\n" msgstr "" -#: ../dgit:3024 +#: ../dgit:3028 #, perl-format msgid "%s: NO git hash" msgstr "" -#: ../dgit:3028 +#: ../dgit:3032 #, perl-format msgid "%s: specified git info (%s)" msgstr "" -#: ../dgit:3035 +#: ../dgit:3039 #, perl-format msgid "%s: specified git hash" msgstr "" -#: ../dgit:3037 +#: ../dgit:3041 #, perl-format msgid "%s: invalid Dgit info" msgstr "" -#: ../dgit:3059 +#: ../dgit:3063 #, perl-format msgid "not chasing .dsc distro %s: not fetching %s" msgstr "" -#: ../dgit:3064 +#: ../dgit:3068 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr "" -#: ../dgit:3069 +#: ../dgit:3073 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" "for which we have no configured url and .dsc provides no hint\n" msgstr "" -#: ../dgit:3079 +#: ../dgit:3083 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -665,54 +665,54 @@ msgid "" "(can be overridden by config - consult documentation)\n" msgstr "" -#: ../dgit:3099 +#: ../dgit:3103 msgid "rewrite map" msgstr "" -#: ../dgit:3106 +#: ../dgit:3110 msgid "server's git history rewrite map contains a relevant entry!" msgstr "" -#: ../dgit:3110 +#: ../dgit:3114 msgid "using rewritten git hash in place of .dsc value" msgstr "" -#: ../dgit:3112 +#: ../dgit:3116 msgid "server data says .dsc hash is to be disregarded" msgstr "" -#: ../dgit:3119 +#: ../dgit:3123 msgid "additional commits" msgstr "" -#: ../dgit:3122 +#: ../dgit:3126 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" "but we could not obtain that object anywhere.\n" msgstr "" -#: ../dgit:3147 +#: ../dgit:3151 msgid "last upload to archive" msgstr "" -#: ../dgit:3151 +#: ../dgit:3155 msgid "no version available from the archive" msgstr "" -#: ../dgit:3234 +#: ../dgit:3238 msgid "dgit suite branch on dgit git server" msgstr "" -#: ../dgit:3241 +#: ../dgit:3245 msgid "dgit client's archive history view" msgstr "" -#: ../dgit:3246 +#: ../dgit:3250 msgid "Dgit field in .dsc from archive" msgstr "" -#: ../dgit:3274 +#: ../dgit:3278 #, perl-format msgid "" "\n" @@ -722,15 +722,15 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3287 +#: ../dgit:3291 msgid "archive .dsc names newer git commit" msgstr "" -#: ../dgit:3290 +#: ../dgit:3294 msgid "archive .dsc names other git commit, fixing up" msgstr "" -#: ../dgit:3311 +#: ../dgit:3315 #, perl-format msgid "" "\n" @@ -738,7 +738,7 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3320 +#: ../dgit:3324 #, perl-format msgid "" "\n" @@ -748,7 +748,7 @@ msgid "" "\n" msgstr "" -#: ../dgit:3405 +#: ../dgit:3409 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -756,19 +756,19 @@ msgid "" "Record that\n" msgstr "" -#: ../dgit:3418 +#: ../dgit:3422 msgid "should be treated as descended from\n" msgstr "" -#: ../dgit:3436 +#: ../dgit:3440 msgid "dgit repo server tip (last push)" msgstr "" -#: ../dgit:3438 +#: ../dgit:3442 msgid "local tracking tip (last fetch)" msgstr "" -#: ../dgit:3449 +#: ../dgit:3453 #, perl-format msgid "" "\n" @@ -778,30 +778,30 @@ msgid "" "\n" msgstr "" -#: ../dgit:3464 +#: ../dgit:3468 msgid "fetched source tree" msgstr "" -#: ../dgit:3500 +#: ../dgit:3504 msgid "debian/changelog merge driver" msgstr "" -#: ../dgit:3565 +#: ../dgit:3569 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" msgstr "" -#: ../dgit:3579 +#: ../dgit:3583 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n" msgstr "" -#: ../dgit:3594 +#: ../dgit:3598 #, perl-format msgid "install %s: %s" msgstr "" -#: ../dgit:3621 +#: ../dgit:3625 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -809,30 +809,30 @@ msgid "" "tree.\n" msgstr "" -#: ../dgit:3643 +#: ../dgit:3647 #, perl-format msgid "fetching %s..." msgstr "" -#: ../dgit:3651 +#: ../dgit:3655 #, perl-format msgid "failed to obtain %s: %s" msgstr "" -#: ../dgit:3690 +#: ../dgit:3694 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "" -#: ../dgit:3722 +#: ../dgit:3726 msgid "local combined tracking branch" msgstr "" -#: ../dgit:3724 +#: ../dgit:3728 msgid "archive seems to have rewound: local tracking branch is ahead!" msgstr "" -#: ../dgit:3763 +#: ../dgit:3767 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -840,7 +840,7 @@ msgid "" "Input branches:\n" msgstr "" -#: ../dgit:3777 +#: ../dgit:3781 msgid "" "\n" "Key\n" @@ -849,248 +849,248 @@ msgid "" "\n" msgstr "" -#: ../dgit:3792 +#: ../dgit:3796 #, perl-format msgid "calculated combined tracking suite %s" msgstr "" -#: ../dgit:3810 +#: ../dgit:3814 #, perl-format msgid "ready for work in %s" msgstr "" -#: ../dgit:3818 +#: ../dgit:3822 msgid "dry run makes no sense with clone" msgstr "" -#: ../dgit:3833 +#: ../dgit:3837 #, perl-format msgid "create `%s': %s" msgstr "" -#: ../dgit:3849 +#: ../dgit:3853 msgid "fetching existing git history" msgstr "" -#: ../dgit:3853 +#: ../dgit:3857 msgid "starting new git history" msgstr "" -#: ../dgit:3879 +#: ../dgit:3883 #, perl-format msgid "" "FYI: Vcs-Git in %s has different url to your vcs-git remote.\n" " Your vcs-git remote url may be out of date. Use dgit update-vcs-git ?\n" msgstr "" -#: ../dgit:3884 +#: ../dgit:3888 #, perl-format msgid "fetched into %s" msgstr "" -#: ../dgit:3896 +#: ../dgit:3900 #, perl-format msgid "Merge from %s [dgit]" msgstr "" -#: ../dgit:3898 +#: ../dgit:3902 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "" -#: ../dgit:3906 +#: ../dgit:3910 #, perl-format msgid "git tree contains %s" msgstr "" -#: ../dgit:3917 +#: ../dgit:3921 msgid "you have uncommitted changes to critical files, cannot continue:\n" msgstr "" -#: ../dgit:3936 +#: ../dgit:3940 #, perl-format msgid "" "quilt fixup required but quilt mode is `nofix'\n" "HEAD commit%s differs from tree implied by debian/patches%s" msgstr "" -#: ../dgit:3953 +#: ../dgit:3957 msgid "nothing quilty to commit, ok." msgstr "" -#: ../dgit:3956 +#: ../dgit:3960 msgid " (wanted to commit patch update)" msgstr "" -#: ../dgit:3960 +#: ../dgit:3964 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" msgstr "" -#: ../dgit:4003 +#: ../dgit:4007 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" msgstr "" -#: ../dgit:4008 +#: ../dgit:4012 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "" -#: ../dgit:4018 +#: ../dgit:4022 #, perl-format msgid "commit id %s" msgstr "" -#: ../dgit:4024 +#: ../dgit:4028 #, perl-format msgid "and left in %s" msgstr "" -#: ../dgit:4050 +#: ../dgit:4054 #, perl-format msgid "Wanted tag %s (%s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4053 +#: ../dgit:4057 #, perl-format msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4061 +#: ../dgit:4065 #, perl-format msgid "%s (%s) .. %s (%s) is not fast forward\n" msgstr "" -#: ../dgit:4070 +#: ../dgit:4074 msgid "version currently in archive" msgstr "" -#: ../dgit:4079 +#: ../dgit:4083 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" -#: ../dgit:4087 +#: ../dgit:4091 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "" -#: ../dgit:4097 +#: ../dgit:4101 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "" -#: ../dgit:4100 +#: ../dgit:4104 #, perl-format msgid "" "%s is %s\n" "Your tree seems to based on earlier (not uploaded) %s.\n" msgstr "" -#: ../dgit:4114 +#: ../dgit:4118 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "" -#: ../dgit:4170 +#: ../dgit:4174 msgid "Checking that HEAD includes all changes in archive..." msgstr "" -#: ../dgit:4179 +#: ../dgit:4183 msgid "maintainer view tag" msgstr "" -#: ../dgit:4181 +#: ../dgit:4185 msgid "dgit view tag" msgstr "" -#: ../dgit:4182 +#: ../dgit:4186 msgid "current archive contents" msgstr "" -#: ../dgit:4195 +#: ../dgit:4199 msgid "" "| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n" msgstr "" -#: ../dgit:4205 +#: ../dgit:4209 #, perl-format msgid "Declare fast forward from %s\n" msgstr "" -#: ../dgit:4206 +#: ../dgit:4210 #, perl-format msgid "Make fast forward from %s\n" msgstr "" -#: ../dgit:4210 +#: ../dgit:4214 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "" -#: ../dgit:4223 +#: ../dgit:4227 #, perl-format msgid "Declare fast forward from %s" msgstr "" -#: ../dgit:4231 +#: ../dgit:4235 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "" -#: ../dgit:4243 +#: ../dgit:4247 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "" -#: ../dgit:4265 +#: ../dgit:4269 #, perl-format msgid "%s is for %s %s but debian/changelog is for %s %s" msgstr "" -#: ../dgit:4326 +#: ../dgit:4330 #, perl-format msgid "changes field %s `%s' does not match changelog `%s'" msgstr "" -#: ../dgit:4354 +#: ../dgit:4358 #, perl-format msgid "%s release %s for %s (%s) [dgit]\n" msgstr "" -#: ../dgit:4367 +#: ../dgit:4371 #, perl-format msgid "" "%s release %s for %s (%s)\n" "(maintainer view tag generated by dgit --quilt=%s)\n" msgstr "" -#: ../dgit:4419 +#: ../dgit:4423 msgid "" "Push failed, while checking state of the archive.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:4428 +#: ../dgit:4432 msgid "" "package appears to be new in this suite; if this is intentional, use --new" msgstr "" -#: ../dgit:4433 +#: ../dgit:4437 msgid "" "Push failed, while preparing your push.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:4456 +#: ../dgit:4460 #, perl-format msgid "looked for .dsc %s, but %s; maybe you forgot to build" msgstr "" -#: ../dgit:4473 +#: ../dgit:4477 #, perl-format msgid "" "Branch is managed by git-debrebase (%s\n" @@ -1099,14 +1099,14 @@ msgid "" "Or, maybe, run git-debrebase forget-was-ever-debrebase.\n" msgstr "" -#: ../dgit:4497 +#: ../dgit:4501 #, perl-format msgid "" "--quilt=%s but no cached dgit view:\n" " perhaps HEAD changed since dgit build[-source] ?" msgstr "" -#: ../dgit:4528 +#: ../dgit:4532 msgid "" "dgit push: HEAD is not a descendant of the archive's version.\n" "To overwrite the archive's contents, pass --overwrite[=VERSION].\n" @@ -1114,24 +1114,24 @@ msgid "" "forward." msgstr "" -#: ../dgit:4538 +#: ../dgit:4542 #, perl-format msgid "checking that %s corresponds to HEAD" msgstr "" -#: ../dgit:4572 ../dgit:4584 +#: ../dgit:4576 ../dgit:4588 #, perl-format msgid "HEAD specifies a different tree to %s:\n" msgstr "" -#: ../dgit:4578 +#: ../dgit:4582 #, perl-format msgid "" "There is a problem with your source tree (see dgit(7) for some hints).\n" "To see a full diff, run git diff %s %s\n" msgstr "" -#: ../dgit:4588 +#: ../dgit:4592 #, perl-format msgid "" "Perhaps you forgot to build. Or perhaps there is a problem with your\n" @@ -1139,52 +1139,52 @@ msgid "" " git diff %s %s\n" msgstr "" -#: ../dgit:4599 +#: ../dgit:4603 #, perl-format msgid "" "failed to find unique changes file (looked for %s in %s); perhaps you need " "to use dgit -C" msgstr "" -#: ../dgit:4621 +#: ../dgit:4625 msgid "uploading binaries, although distro policy is source only" msgstr "" -#: ../dgit:4625 +#: ../dgit:4629 msgid "source-only upload, although distro policy requires .debs" msgstr "" -#: ../dgit:4629 +#: ../dgit:4633 #, perl-format msgid "" "source-only upload, even though package is entirely NEW\n" "(this is contrary to policy in %s)" msgstr "" -#: ../dgit:4636 +#: ../dgit:4640 #, perl-format msgid "unknown source-only-uploads policy `%s'" msgstr "" -#: ../dgit:4680 +#: ../dgit:4684 msgid "" "Push failed, while signing the tag.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:4693 +#: ../dgit:4697 msgid "" "Push failed, *after* signing the tag.\n" "If you want to try again, you should use a new version number.\n" msgstr "" -#: ../dgit:4710 +#: ../dgit:4714 msgid "" "Push failed, while updating the remote git repository - see messages above.\n" "If you want to try again, you should use a new version number.\n" msgstr "" -#: ../dgit:4727 +#: ../dgit:4731 msgid "" "Push failed, while obtaining signatures on the .changes and .dsc.\n" "If it was just that the signature failed, you may try again by using\n" @@ -1193,155 +1193,155 @@ msgid "" "If you need to change the package, you must use a new version number.\n" msgstr "" -#: ../dgit:4758 +#: ../dgit:4762 #, perl-format msgid "pushed and uploaded %s" msgstr "" -#: ../dgit:4770 +#: ../dgit:4774 msgid "-p is not allowed with clone; specify as argument instead" msgstr "" -#: ../dgit:4781 +#: ../dgit:4785 msgid "incorrect arguments to dgit clone" msgstr "" -#: ../dgit:4787 ../git-debrebase:1839 +#: ../dgit:4791 ../git-debrebase:1839 #, perl-format msgid "%s already exists" msgstr "" -#: ../dgit:4801 +#: ../dgit:4805 #, perl-format msgid "remove %s: %s\n" msgstr "" -#: ../dgit:4805 +#: ../dgit:4809 #, perl-format msgid "check whether to remove %s: %s\n" msgstr "" -#: ../dgit:4843 +#: ../dgit:4847 msgid "incorrect arguments to dgit fetch or dgit pull" msgstr "" -#: ../dgit:4860 +#: ../dgit:4864 #, perl-format msgid "dgit pull not yet supported in split view mode (--quilt=%s)\n" msgstr "" -#: ../dgit:4869 +#: ../dgit:4873 msgid "dgit checkout needs a suite argument" msgstr "" -#: ../dgit:4931 +#: ../dgit:4935 #, perl-format msgid "setting up vcs-git: %s\n" msgstr "" -#: ../dgit:4934 +#: ../dgit:4938 #, perl-format msgid "vcs git already configured: %s\n" msgstr "" -#: ../dgit:4936 +#: ../dgit:4940 #, perl-format msgid "changing vcs-git url to: %s\n" msgstr "" -#: ../dgit:4941 +#: ../dgit:4945 #, perl-format msgid "fetching (%s)\n" msgstr "" -#: ../dgit:4956 +#: ../dgit:4960 #, perl-format msgid "incorrect arguments to dgit %s" msgstr "" -#: ../dgit:4967 +#: ../dgit:4971 #, perl-format msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s" msgstr "" -#: ../dgit:5005 +#: ../dgit:5009 #, perl-format msgid "" "build host has dgit rpush protocol versions %s but invocation host has %s" msgstr "" -#: ../dgit:5085 +#: ../dgit:5089 #, perl-format msgid "create %s: %s" msgstr "" -#: ../dgit:5122 +#: ../dgit:5126 #, perl-format msgid "build host child failed: %s" msgstr "" -#: ../dgit:5125 +#: ../dgit:5129 msgid "all done\n" msgstr "" -#: ../dgit:5134 +#: ../dgit:5138 #, perl-format msgid "file %s (%s) twice" msgstr "" -#: ../dgit:5142 +#: ../dgit:5146 msgid "bad param spec" msgstr "" -#: ../dgit:5148 +#: ../dgit:5152 msgid "bad previously spec" msgstr "" -#: ../dgit:5167 +#: ../dgit:5171 #, perl-format msgid "" "rpush negotiated protocol version %s which does not support quilt mode %s" msgstr "" -#: ../dgit:5212 +#: ../dgit:5216 #, perl-format msgid "buildinfo mismatch in field %s" msgstr "" -#: ../dgit:5215 +#: ../dgit:5219 #, perl-format msgid "buildinfo contains forbidden field %s" msgstr "" -#: ../dgit:5256 +#: ../dgit:5260 msgid "remote changes file" msgstr "" -#: ../dgit:5331 +#: ../dgit:5335 msgid "not a plain file or symlink\n" msgstr "" -#: ../dgit:5337 +#: ../dgit:5341 msgid "mode or type changed\n" msgstr "" -#: ../dgit:5338 +#: ../dgit:5342 msgid "modified symlink\n" msgstr "" -#: ../dgit:5341 +#: ../dgit:5345 msgid "deletion of symlink\n" msgstr "" -#: ../dgit:5345 +#: ../dgit:5349 msgid "creation with non-default mode\n" msgstr "" -#: ../dgit:5375 +#: ../dgit:5379 msgid "dgit view: changes are required..." msgstr "" -#: ../dgit:5404 +#: ../dgit:5408 #, perl-format msgid "" "\n" @@ -1349,31 +1349,31 @@ msgid "" " %s\n" msgstr "" -#: ../dgit:5411 +#: ../dgit:5415 #, perl-format msgid "" "--quilt=%s specified, implying patches-unapplied git tree\n" " but git tree differs from orig in upstream files." msgstr "" -#: ../dgit:5417 +#: ../dgit:5421 msgid "" "\n" " ... debian/patches is missing; perhaps this is a patch queue branch?" msgstr "" -#: ../dgit:5424 +#: ../dgit:5428 #, perl-format msgid "" "--quilt=%s specified, implying patches-applied git tree\n" " but git tree differs from result of applying debian/patches to upstream\n" msgstr "" -#: ../dgit:5431 +#: ../dgit:5435 msgid "dgit view: creating patches-applied version using gbp pq" msgstr "" -#: ../dgit:5440 +#: ../dgit:5444 #, perl-format msgid "" "--quilt=%s specified, implying that HEAD is for use with a\n" @@ -1381,16 +1381,16 @@ msgid "" " .gitignores: but, such patches exist in debian/patches.\n" msgstr "" -#: ../dgit:5449 +#: ../dgit:5453 msgid "dgit view: creating patch to represent .gitignore changes" msgstr "" -#: ../dgit:5454 +#: ../dgit:5458 #, perl-format msgid "%s already exists; but want to create it to record .gitignore changes" msgstr "" -#: ../dgit:5459 +#: ../dgit:5463 msgid "" "Subject: Update .gitignore from Debian packaging branch\n" "\n" @@ -1399,63 +1399,63 @@ msgid "" "updates to users of the official Debian archive view of the package.\n" msgstr "" -#: ../dgit:5481 +#: ../dgit:5485 msgid "Commit patch to update .gitignore\n" msgstr "" -#: ../dgit:5495 +#: ../dgit:5499 msgid "converted" msgstr "" -#: ../dgit:5496 +#: ../dgit:5500 #, perl-format msgid "dgit view: created (%s)" msgstr "" -#: ../dgit:5561 +#: ../dgit:5565 msgid "maximum search space exceeded" msgstr "" -#: ../dgit:5579 +#: ../dgit:5583 #, perl-format msgid "has %s not %s" msgstr "" -#: ../dgit:5588 +#: ../dgit:5592 msgid "root commit" msgstr "" -#: ../dgit:5594 +#: ../dgit:5598 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "" -#: ../dgit:5606 +#: ../dgit:5610 #, perl-format msgid "changed %s" msgstr "" -#: ../dgit:5625 +#: ../dgit:5629 #, perl-format msgid "" "\n" "%s: error: quilt fixup cannot be linear. Stopped at:\n" msgstr "" -#: ../dgit:5632 +#: ../dgit:5636 #, perl-format msgid "%s: %s: %s\n" msgstr "" -#: ../dgit:5644 +#: ../dgit:5648 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" -#: ../dgit:5647 +#: ../dgit:5651 msgid "quilt fixup cannot be linear, smashing..." msgstr "" -#: ../dgit:5659 +#: ../dgit:5663 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1463,68 +1463,68 @@ msgid "" "\n" msgstr "" -#: ../dgit:5666 +#: ../dgit:5670 msgid "quiltify linearisation planning successful, executing..." msgstr "" -#: ../dgit:5700 +#: ../dgit:5704 msgid "contains unexpected slashes\n" msgstr "" -#: ../dgit:5701 +#: ../dgit:5705 msgid "contains leading punctuation\n" msgstr "" -#: ../dgit:5702 +#: ../dgit:5706 msgid "contains bad character(s)\n" msgstr "" -#: ../dgit:5703 +#: ../dgit:5707 msgid "is series file\n" msgstr "" -#: ../dgit:5704 +#: ../dgit:5708 msgid "too long\n" msgstr "" -#: ../dgit:5708 +#: ../dgit:5712 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" -#: ../dgit:5737 +#: ../dgit:5741 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "" -#: ../dgit:5880 +#: ../dgit:5884 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" -#: ../dgit:5890 +#: ../dgit:5894 msgid "starting quiltify (single-debian-patch)" msgstr "" -#: ../dgit:5992 +#: ../dgit:5996 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" -#: ../dgit:6023 +#: ../dgit:6027 #, perl-format msgid "dgit view: found cached (%s)" msgstr "" -#: ../dgit:6028 +#: ../dgit:6032 msgid "dgit view: found cached, no changes required" msgstr "" -#: ../dgit:6039 +#: ../dgit:6043 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "" -#: ../dgit:6130 +#: ../dgit:6134 msgid "" "failed to apply your git tree's patch stack (from debian/patches/) to\n" " the corresponding upstream tarball(s). Your source tree and .orig\n" @@ -1532,58 +1532,58 @@ msgid "" " anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n" msgstr "" -#: ../dgit:6144 +#: ../dgit:6148 msgid "Tree already contains .pc - will use it then delete it." msgstr "" -#: ../dgit:6181 +#: ../dgit:6185 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "" -#: ../dgit:6184 +#: ../dgit:6188 #, perl-format msgid "" "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n" "%s: quilt differences: HEAD %s o+d/p HEAD %s o+d/p" msgstr "" -#: ../dgit:6190 +#: ../dgit:6194 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "" -#: ../dgit:6194 +#: ../dgit:6198 msgid "" "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" msgstr "" -#: ../dgit:6201 +#: ../dgit:6205 msgid "This might be a patches-unapplied branch." msgstr "" -#: ../dgit:6204 +#: ../dgit:6208 msgid "This might be a patches-applied branch." msgstr "" -#: ../dgit:6207 +#: ../dgit:6211 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" -#: ../dgit:6210 +#: ../dgit:6214 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" -#: ../dgit:6214 +#: ../dgit:6218 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" -#: ../dgit:6223 +#: ../dgit:6227 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "" -#: ../dgit:6261 +#: ../dgit:6265 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1592,102 +1592,102 @@ msgid "" "\n" msgstr "" -#: ../dgit:6273 +#: ../dgit:6277 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" -#: ../dgit:6302 +#: ../dgit:6306 msgid "" "If this is just missing .gitignore entries, use a different clean\n" "mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them\n" "or --clean=git (-wg/-wgf) to use `git clean' instead.\n" msgstr "" -#: ../dgit:6314 +#: ../dgit:6318 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" -#: ../dgit:6317 +#: ../dgit:6321 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" -#: ../dgit:6320 +#: ../dgit:6324 msgid "" "tree contains uncommited, untracked, unignored files\n" "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." msgstr "" -#: ../dgit:6338 +#: ../dgit:6342 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" -#: ../dgit:6352 +#: ../dgit:6356 msgid "clean takes no additional arguments" msgstr "" -#: ../dgit:6365 +#: ../dgit:6369 #, perl-format msgid "-p is not allowed with dgit %s" msgstr "" -#: ../dgit:6404 +#: ../dgit:6408 #, perl-format msgid "remove old changes file %s: %s" msgstr "" -#: ../dgit:6406 +#: ../dgit:6410 #, perl-format msgid "would remove %s" msgstr "" -#: ../dgit:6432 +#: ../dgit:6436 msgid "archive query failed (queried because --since-version not specified)" msgstr "" -#: ../dgit:6438 +#: ../dgit:6442 #, perl-format msgid "changelog will contain changes since %s" msgstr "" -#: ../dgit:6441 +#: ../dgit:6445 msgid "package seems new, not specifying -v<version>" msgstr "" -#: ../dgit:6484 +#: ../dgit:6488 msgid "Wanted to build nothing!" msgstr "" -#: ../dgit:6522 +#: ../dgit:6526 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "" -#: ../dgit:6529 +#: ../dgit:6533 #, perl-format msgid "%s found in binaries changes file %s" msgstr "" -#: ../dgit:6536 +#: ../dgit:6540 #, perl-format msgid "%s unexpectedly not created by build" msgstr "" -#: ../dgit:6540 +#: ../dgit:6544 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "" -#: ../dgit:6545 +#: ../dgit:6549 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "" -#: ../dgit:6548 +#: ../dgit:6552 #, perl-format msgid "build successful, results in %s\n" msgstr "" -#: ../dgit:6561 +#: ../dgit:6565 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1695,136 +1695,136 @@ msgid "" "Suggest you delete %s.\n" msgstr "" -#: ../dgit:6579 +#: ../dgit:6583 msgid "build successful\n" msgstr "" -#: ../dgit:6586 +#: ../dgit:6590 #, perl-format msgid "" "%s: warning: build-products-dir set, but not supported by dpkg-buildpackage\n" "%s: warning: build-products-dir will be ignored; files will go to ..\n" msgstr "" -#: ../dgit:6696 +#: ../dgit:6700 #, perl-format msgid "remove %s: %s" msgstr "" -#: ../dgit:6731 +#: ../dgit:6735 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "" -#: ../dgit:6751 +#: ../dgit:6755 #, perl-format msgid "put in place new built file (%s): %s" msgstr "" -#: ../dgit:6764 +#: ../dgit:6768 msgid "build-source takes no additional arguments" msgstr "" -#: ../dgit:6768 +#: ../dgit:6772 #, perl-format msgid "source built, results in %s and %s" msgstr "" -#: ../dgit:6775 +#: ../dgit:6779 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" msgstr "" -#: ../dgit:6781 +#: ../dgit:6785 msgid "source changes file" msgstr "" -#: ../dgit:6783 +#: ../dgit:6787 msgid "user-specified changes file is not source-only" msgstr "" -#: ../dgit:6803 ../dgit:6805 +#: ../dgit:6807 ../dgit:6809 #, perl-format msgid "%s (in build products dir): %s" msgstr "" -#: ../dgit:6818 +#: ../dgit:6822 msgid "" "perhaps you need to pass -A ? (sbuild's default is to build only\n" "arch-specific binaries; dgit 1.4 used to override that.)\n" msgstr "" -#: ../dgit:6830 +#: ../dgit:6834 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" msgstr "" -#: ../dgit:6834 +#: ../dgit:6838 msgid "" "we must build a .dsc to pass to the builder but your debbuiltopts forbids " "the building of a source package; cannot continue" msgstr "" -#: ../dgit:6864 +#: ../dgit:6868 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "" -#: ../dgit:6886 +#: ../dgit:6890 msgid "source tree" msgstr "" -#: ../dgit:6888 +#: ../dgit:6892 #, perl-format msgid "dgit: import-dsc: %s" msgstr "" -#: ../dgit:6901 +#: ../dgit:6905 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "" -#: ../dgit:6905 +#: ../dgit:6909 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "" -#: ../dgit:6909 +#: ../dgit:6913 msgid "dry run makes no sense with import-dsc" msgstr "" -#: ../dgit:6926 +#: ../dgit:6930 #, perl-format msgid "%s is checked out - will not update it" msgstr "" -#: ../dgit:6931 +#: ../dgit:6935 #, perl-format msgid "open import .dsc (%s): %s" msgstr "" -#: ../dgit:6933 +#: ../dgit:6937 #, perl-format msgid "read %s: %s" msgstr "" -#: ../dgit:6944 +#: ../dgit:6948 msgid "import-dsc signature check failed" msgstr "" -#: ../dgit:6947 +#: ../dgit:6951 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "" -#: ../dgit:6958 +#: ../dgit:6962 msgid "Dgit metadata in .dsc" msgstr "" -#: ../dgit:6969 +#: ../dgit:6973 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "" -#: ../dgit:6978 +#: ../dgit:6982 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -1832,21 +1832,21 @@ msgid "" "plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n" msgstr "" -#: ../dgit:6985 +#: ../dgit:6989 msgid "Not fast forward, forced update." msgstr "" -#: ../dgit:6987 +#: ../dgit:6991 #, perl-format msgid "Not fast forward to %s" msgstr "" -#: ../dgit:6992 +#: ../dgit:6996 #, perl-format msgid "updated git ref %s" msgstr "" -#: ../dgit:6997 +#: ../dgit:7001 #, perl-format msgid "" "Branch %s already exists\n" @@ -1854,139 +1854,134 @@ msgid "" "Specify +%s to overwrite, discarding existing history\n" msgstr "" -#: ../dgit:7009 +#: ../dgit:7021 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "" -#: ../dgit:7011 +#: ../dgit:7023 #, perl-format msgid "stat %s: %s" msgstr "" -#: ../dgit:7019 -#, perl-format -msgid "cannot import %s which seems to be inside working tree!" -msgstr "" - -#: ../dgit:7023 +#: ../dgit:7031 #, perl-format -msgid "import %s requires .../%s, but it does not exist" +msgid "import %s requires %s, but: %s" msgstr "" -#: ../dgit:7028 +#: ../dgit:7050 #, perl-format -msgid "import %s requires %s, but: %s" +msgid "cannot import %s which seems to be inside working tree!" msgstr "" -#: ../dgit:7030 +#: ../dgit:7054 #, perl-format msgid "symlink %s to %s: %s" msgstr "" -#: ../dgit:7031 +#: ../dgit:7055 #, perl-format msgid "made symlink %s -> %s" msgstr "" -#: ../dgit:7042 +#: ../dgit:7066 msgid "Import, forced update - synthetic orphan git history." msgstr "" -#: ../dgit:7044 +#: ../dgit:7068 msgid "Import, merging." msgstr "" -#: ../dgit:7058 +#: ../dgit:7082 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "" -#: ../dgit:7067 +#: ../dgit:7091 #, perl-format msgid "results are in git ref %s" msgstr "" -#: ../dgit:7074 +#: ../dgit:7098 msgid "need only 1 subpath argument" msgstr "" -#: ../dgit:7080 +#: ../dgit:7104 #, perl-format msgid "exec curl: %s\n" msgstr "" -#: ../dgit:7094 +#: ../dgit:7118 msgid "need destination argument" msgstr "" -#: ../dgit:7099 +#: ../dgit:7123 #, perl-format msgid "exec git clone: %s\n" msgstr "" -#: ../dgit:7107 +#: ../dgit:7131 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url" msgstr "" -#: ../dgit:7118 +#: ../dgit:7142 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "" -#: ../dgit:7124 +#: ../dgit:7148 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "" -#: ../dgit:7131 ../dgit:7137 +#: ../dgit:7155 ../dgit:7161 msgid "no arguments allowed to dgit setup-useremail" msgstr "" -#: ../dgit:7143 +#: ../dgit:7167 msgid "no arguments allowed to dgit setup-tree" msgstr "" -#: ../dgit:7190 +#: ../dgit:7214 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." msgstr "" -#: ../dgit:7229 +#: ../dgit:7253 #, perl-format msgid "%s needs a value" msgstr "" -#: ../dgit:7233 +#: ../dgit:7257 #, perl-format msgid "bad value `%s' for %s" msgstr "" -#: ../dgit:7324 +#: ../dgit:7348 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "" -#: ../dgit:7344 +#: ../dgit:7368 #, perl-format msgid "unknown long option `%s'" msgstr "" -#: ../dgit:7399 +#: ../dgit:7423 #, perl-format msgid "unknown short option `%s'" msgstr "" -#: ../dgit:7414 +#: ../dgit:7438 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "" -#: ../dgit:7418 +#: ../dgit:7442 #, perl-format msgid "%s is blocked\n" msgstr "" -#: ../dgit:7424 +#: ../dgit:7448 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -1994,44 +1989,44 @@ msgid "" "Giving up.\n" msgstr "" -#: ../dgit:7441 +#: ../dgit:7465 #, perl-format msgid "cannot set command for %s" msgstr "" -#: ../dgit:7454 +#: ../dgit:7478 #, perl-format msgid "cannot configure options for %s" msgstr "" -#: ../dgit:7474 +#: ../dgit:7498 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "" -#: ../dgit:7484 +#: ../dgit:7508 #, perl-format msgid "unknown %s setting `%s'" msgstr "" -#: ../dgit:7489 +#: ../dgit:7513 msgid "dgit: --include-dirty is not supported in split view quilt mode" msgstr "" -#: ../dgit:7500 +#: ../dgit:7524 #, perl-format msgid "unknown clean-mode `%s'" msgstr "" -#: ../dgit:7521 +#: ../dgit:7545 msgid "DRY RUN ONLY\n" msgstr "" -#: ../dgit:7522 +#: ../dgit:7546 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" -#: ../dgit:7541 +#: ../dgit:7565 #, perl-format msgid "unknown operation %s" msgstr "" @@ -2335,7 +2330,7 @@ msgstr "" msgid "No ffq-prev to stitch." msgstr "" -#: ../git-debrebase:2016 +#: ../git-debrebase:2017 #, perl-format msgid "" "Could not determine appropriate upstream commitish.\n" @@ -2343,201 +2338,201 @@ msgid "" " Check version, and specify upstream commitish explicitly." msgstr "" -#: ../git-debrebase:2033 +#: ../git-debrebase:2036 msgid "need NEW-VERSION [UPS-COMMITTISH]" msgstr "" -#: ../git-debrebase:2038 +#: ../git-debrebase:2041 #, perl-format msgid "bad version number `%s'" msgstr "" -#: ../git-debrebase:2055 +#: ../git-debrebase:2059 #, perl-format msgid "upstream piece `%s'" msgstr "" -#: ../git-debrebase:2056 +#: ../git-debrebase:2060 msgid "upstream (main piece" msgstr "" -#: ../git-debrebase:2076 +#: ../git-debrebase:2080 msgid "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH" msgstr "" -#: ../git-debrebase:2094 +#: ../git-debrebase:2098 msgid "old anchor is recognised due to --anchor, cannot check upstream" msgstr "old anchor is recognized due to --anchor, cannot check upstream" -#: ../git-debrebase:2110 +#: ../git-debrebase:2114 #, perl-format msgid "" "previous upstream combine %s mentions %d pieces (each implying one parent) " "but has %d parents (one per piece plus maybe a previous combine)" msgstr "" -#: ../git-debrebase:2119 +#: ../git-debrebase:2123 #, perl-format msgid "previous upstream combine %s first piece is not `.'" msgstr "" -#: ../git-debrebase:2132 +#: ../git-debrebase:2136 #, perl-format msgid "" "previous upstream %s is from git-debrebase but not an `upstream-combine' " "commit" msgstr "" -#: ../git-debrebase:2143 +#: ../git-debrebase:2147 #, perl-format msgid "introducing upstream piece `%s'" msgstr "" -#: ../git-debrebase:2146 +#: ../git-debrebase:2150 #, perl-format msgid "dropping upstream piece `%s'" msgstr "" -#: ../git-debrebase:2149 +#: ../git-debrebase:2153 #, perl-format msgid "not fast forward: %s %s" msgstr "" -#: ../git-debrebase:2260 +#: ../git-debrebase:2264 msgid "Previous head already recorded\n" msgstr "" -#: ../git-debrebase:2264 +#: ../git-debrebase:2268 #, perl-format msgid "Could not preserve: %s" msgstr "" -#: ../git-debrebase:2269 ../git-debrebase:2275 ../git-debrebase:2281 -#: ../git-debrebase:2371 ../git-debrebase:2380 ../git-debrebase:2404 -#: ../git-debrebase:2468 +#: ../git-debrebase:2273 ../git-debrebase:2279 ../git-debrebase:2285 +#: ../git-debrebase:2375 ../git-debrebase:2384 ../git-debrebase:2408 +#: ../git-debrebase:2472 msgid "no arguments allowed" msgstr "" -#: ../git-debrebase:2303 +#: ../git-debrebase:2307 msgid "branch contains furniture (not laundered)" msgstr "" -#: ../git-debrebase:2304 +#: ../git-debrebase:2308 msgid "branch is unlaundered" msgstr "" -#: ../git-debrebase:2305 +#: ../git-debrebase:2309 msgid "branch needs laundering" msgstr "" -#: ../git-debrebase:2306 +#: ../git-debrebase:2310 msgid "branch not in git-debrebase form" msgstr "" -#: ../git-debrebase:2316 +#: ../git-debrebase:2320 msgid "current branch contents, in git-debrebase terms:\n" msgstr "" -#: ../git-debrebase:2318 +#: ../git-debrebase:2322 msgid " branch is laundered\n" msgstr "" -#: ../git-debrebase:2334 +#: ../git-debrebase:2338 #, perl-format msgid " %s is not well-defined\n" msgstr "" -#: ../git-debrebase:2340 +#: ../git-debrebase:2344 msgid "key git-debrebase commits:\n" msgstr "" -#: ../git-debrebase:2341 +#: ../git-debrebase:2345 msgid "anchor" msgstr "" -#: ../git-debrebase:2342 +#: ../git-debrebase:2346 msgid "breakwater" msgstr "" -#: ../git-debrebase:2347 +#: ../git-debrebase:2351 msgid "branch and ref status, in git-debrebase terms:\n" msgstr "" -#: ../git-debrebase:2354 +#: ../git-debrebase:2358 msgid " unstitched; previous tip was:\n" msgstr "" -#: ../git-debrebase:2357 +#: ../git-debrebase:2361 msgid " stitched? (no record of git-debrebase work)\n" msgstr "" -#: ../git-debrebase:2359 +#: ../git-debrebase:2363 msgid " stitched\n" msgstr "" -#: ../git-debrebase:2361 +#: ../git-debrebase:2365 msgid " not git-debrebase (diverged since last stitch)\n" msgstr "" -#: ../git-debrebase:2364 +#: ../git-debrebase:2368 msgid "you are currently rebasing\n" msgstr "" -#: ../git-debrebase:2381 ../git-debrebase:2394 +#: ../git-debrebase:2385 ../git-debrebase:2398 msgid "launder for git-debrebase quick" msgstr "" -#: ../git-debrebase:2388 ../git-debrebase:2418 +#: ../git-debrebase:2392 ../git-debrebase:2422 msgid "No ongoing git-debrebase session." msgstr "" -#: ../git-debrebase:2457 +#: ../git-debrebase:2461 msgid "Commit patch queue (exported by git-debrebase)" msgstr "" -#: ../git-debrebase:2474 +#: ../git-debrebase:2478 msgid "No (more) patches to export." msgstr "" -#: ../git-debrebase:2481 +#: ../git-debrebase:2485 #, perl-format msgid "" "Patch export produced patch amendments (abandoned output commit %s). Try " "laundering first." msgstr "" -#: ../git-debrebase:2501 +#: ../git-debrebase:2505 #, perl-format msgid "%s contains comments, which will be discarded" msgstr "" -#: ../git-debrebase:2506 +#: ../git-debrebase:2510 #, perl-format msgid "patch %s repeated in %s !" msgstr "" -#: ../git-debrebase:2513 +#: ../git-debrebase:2517 #, perl-format msgid "Unused patch file %s will be discarded" msgstr "" -#: ../git-debrebase:2521 +#: ../git-debrebase:2525 msgid "ffq-prev exists, this is already managed by git-debrebase!" msgstr "" -#: ../git-debrebase:2526 +#: ../git-debrebase:2530 msgid "ahead of debrebase-last, this is already managed by git-debrebase!" msgstr "" -#: ../git-debrebase:2542 +#: ../git-debrebase:2546 msgid "want only 1 optional argument, the upstream git commitish" msgstr "" -#: ../git-debrebase:2547 +#: ../git-debrebase:2551 msgid "missing Version from changelog\n" msgstr "" -#: ../git-debrebase:2563 +#: ../git-debrebase:2567 #, perl-format msgid "" "upstream (%s) and HEAD are not\n" @@ -2545,58 +2540,58 @@ msgid "" " git diff %s HEAD -- :!/debian :/\n" msgstr "" -#: ../git-debrebase:2571 +#: ../git-debrebase:2575 #, perl-format msgid "upstream (%s) is not an ancestor of HEAD" msgstr "" -#: ../git-debrebase:2578 +#: ../git-debrebase:2582 #, perl-format msgid "" "history between upstream (%s) and HEAD contains direct changes to upstream " "files - are you sure this is a gbp (patches-unapplied) branch?" msgstr "" -#: ../git-debrebase:2580 +#: ../git-debrebase:2584 #, perl-format msgid "list expected changes with: %s\n" msgstr "" -#: ../git-debrebase:2587 +#: ../git-debrebase:2591 #, perl-format msgid "upstream (%s) contains debian/ directory" msgstr "" -#: ../git-debrebase:2605 +#: ../git-debrebase:2609 msgid "neither of the first two changelog entries are released\n" msgstr "" -#: ../git-debrebase:2611 +#: ../git-debrebase:2615 #, perl-format msgid "could not find suitable maintainer view tag %s\n" msgstr "" -#: ../git-debrebase:2614 +#: ../git-debrebase:2618 #, perl-format msgid "HEAD is not FF from maintainer tag %s!" msgstr "" -#: ../git-debrebase:2617 +#: ../git-debrebase:2621 #, perl-format msgid "dgit view tag %s not found\n" msgstr "" -#: ../git-debrebase:2619 +#: ../git-debrebase:2623 #, perl-format msgid "dgit view tag %s is not FF from maintainer tag %s\n" msgstr "" -#: ../git-debrebase:2621 +#: ../git-debrebase:2625 #, perl-format msgid "will stitch in dgit view, %s\n" msgstr "" -#: ../git-debrebase:2628 +#: ../git-debrebase:2632 #, perl-format msgid "" "Cannot confirm dgit view: %s\n" @@ -2604,12 +2599,12 @@ msgid "" "dgit --overwrite will be needed on the first dgit push after conversion.\n" msgstr "" -#: ../git-debrebase:2674 +#: ../git-debrebase:2678 #, perl-format msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n" msgstr "" -#: ../git-debrebase:2703 +#: ../git-debrebase:2707 #, perl-format msgid "" "%s: converted to git-buildpackage branch format\n" @@ -2617,16 +2612,16 @@ msgid "" "%s: WARNING: doing so would drop all upstream patches!\n" msgstr "" -#: ../git-debrebase:2724 +#: ../git-debrebase:2728 msgid "takes 1 optional argument, the upstream commitish" msgstr "" -#: ../git-debrebase:2732 +#: ../git-debrebase:2736 #, perl-format msgid "%s, from command line" msgstr "" -#: ../git-debrebase:2746 +#: ../git-debrebase:2750 #, perl-format msgid "" "%s: Branch already seems to be in git-debrebase format!\n" @@ -2634,84 +2629,84 @@ msgid "" "%s: but is probably a bad idea. Probably, you wanted to do nothing.\n" msgstr "" -#: ../git-debrebase:2750 +#: ../git-debrebase:2754 msgid "Branch already in git-debrebase format." msgstr "" -#: ../git-debrebase:2762 +#: ../git-debrebase:2766 msgid "Considering possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2769 +#: ../git-debrebase:2773 #, perl-format msgid "git tag %s" msgstr "" -#: ../git-debrebase:2775 +#: ../git-debrebase:2779 #, perl-format msgid " git tag: no suitable tag found (tried %s)\n" msgstr "" -#: ../git-debrebase:2784 +#: ../git-debrebase:2788 #, perl-format msgid "opendir build-products-dir %s: %s" msgstr "" -#: ../git-debrebase:2790 +#: ../git-debrebase:2794 #, perl-format msgid " orig: found what looks like a .orig, %s\n" msgstr "" -#: ../git-debrebase:2821 +#: ../git-debrebase:2825 #, perl-format msgid " orig: no suitable origs found (looked for %s in %s)\n" msgstr "" -#: ../git-debrebase:2830 +#: ../git-debrebase:2834 msgid "Evaluating possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2867 +#: ../git-debrebase:2871 #, perl-format msgid " %s: couldn't apply patches: gbp pq %s" msgstr "" -#: ../git-debrebase:2876 +#: ../git-debrebase:2880 #, perl-format msgid " %s: applying patches gives different tree\n" msgstr "" -#: ../git-debrebase:2890 +#: ../git-debrebase:2894 msgid "" "Could not find or construct a suitable upstream commit.\n" "Rerun adding --diagnose after convert-from-dgit-view, or pass a\n" "upstream commmit explicitly or provide suitable origs.\n" msgstr "" -#: ../git-debrebase:2896 +#: ../git-debrebase:2900 #, perl-format msgid "Yes, will base new branch on %s\n" msgstr "" -#: ../git-debrebase:2903 +#: ../git-debrebase:2907 msgid "forget-was-ever-debrebase takes no further arguments" msgstr "" -#: ../git-debrebase:2907 +#: ../git-debrebase:2911 #, perl-format msgid "Not suitable for recording git-debrebaseness anyway: %s" msgstr "" -#: ../git-debrebase:3009 +#: ../git-debrebase:3013 msgid "bad options\n" msgstr "" -#: ../git-debrebase:3019 +#: ../git-debrebase:3023 #, perl-format msgid "%s: no cuddling to -i for git-rebase" msgstr "" -#: ../git-debrebase:3049 +#: ../git-debrebase:3053 #, perl-format msgid "unknown git-debrebase sub-operation %s" msgstr "" diff --git a/po/messages.pot b/po/messages.pot index 840de39..69096f0 100644 --- a/po/messages.pot +++ b/po/messages.pot @@ -6,9 +6,32 @@ #, fuzzy msgid "" msgstr "" +"#-#-#-#-# .dgit.pot (dgit ongoing) #-#-#-#-#\n" "Project-Id-Version: dgit ongoing\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-06 17:50+0000\n" +"POT-Creation-Date: 2019-03-01 21:54+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"#-#-#-#-# .git-debrebase.pot (dgit ongoing) #-#-#-#-#\n" +"Project-Id-Version: dgit ongoing\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-03-01 21:54+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"#-#-#-#-# .common.pot (dgit ongoing) #-#-#-#-#\n" +"Project-Id-Version: dgit ongoing\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-03-01 15:31+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,78 +40,78 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../dgit:240 +#: ../dgit:242 #, perl-format msgid "%s: invalid configuration: %s\n" msgstr "" -#: ../dgit:247 +#: ../dgit:249 msgid "warning: overriding problem due to --force:\n" msgstr "" -#: ../dgit:255 +#: ../dgit:257 #, perl-format msgid "warning: skipping checks or functionality due to --force-%s\n" msgstr "" -#: ../dgit:260 +#: ../dgit:262 #, perl-format msgid "%s: source package %s does not exist in suite %s\n" msgstr "" -#: ../dgit:483 +#: ../dgit:487 #, perl-format msgid "build host child %s" msgstr "" -#: ../dgit:488 ../dgit:494 +#: ../dgit:492 ../dgit:498 #, perl-format msgid "connection lost: %s" msgstr "" -#: ../dgit:489 +#: ../dgit:493 #, perl-format msgid "protocol violation; %s not expected" msgstr "" -#: ../dgit:497 +#: ../dgit:501 #, perl-format msgid "eof (reading %s)" msgstr "" -#: ../dgit:504 +#: ../dgit:508 msgid "protocol message" msgstr "" -#: ../dgit:512 +#: ../dgit:516 #, perl-format msgid "`%s'" msgstr "" -#: ../dgit:533 +#: ../dgit:537 msgid "bad byte count" msgstr "" -#: ../dgit:536 +#: ../dgit:540 msgid "data block" msgstr "" -#: ../dgit:617 +#: ../dgit:621 #, perl-format msgid "failed to fetch %s: %s" msgstr "" -#: ../dgit:629 +#: ../dgit:633 #, perl-format msgid "%s ok: %s" msgstr "" -#: ../dgit:631 +#: ../dgit:635 #, perl-format msgid "would be ok: %s (but dry run only)" msgstr "" -#: ../dgit:656 +#: ../dgit:660 msgid "" "main usages:\n" " dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n" @@ -109,141 +132,141 @@ msgid "" " -c<name>=<value> set git config option (used directly by dgit too)\n" msgstr "" -#: ../dgit:675 +#: ../dgit:679 msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n" msgstr "" -#: ../dgit:679 +#: ../dgit:683 #, perl-format msgid "" "%s: %s\n" "%s" msgstr "" -#: ../dgit:684 +#: ../dgit:688 msgid "too few arguments" msgstr "" -#: ../dgit:795 +#: ../dgit:799 #, perl-format msgid "multiple values for %s (in %s git config)" msgstr "" -#: ../dgit:798 +#: ../dgit:802 #, perl-format msgid "value for config option %s (in %s git config) contains newline(s)!" msgstr "" -#: ../dgit:818 +#: ../dgit:822 #, perl-format msgid "" "need value for one of: %s\n" "%s: distro or suite appears not to be (properly) supported" msgstr "" -#: ../dgit:859 +#: ../dgit:863 #, perl-format msgid "bad syntax for (nominal) distro `%s' (does not match %s)" msgstr "" -#: ../dgit:874 +#: ../dgit:878 #, perl-format msgid "backports-quirk needs % or ( )" msgstr "" -#: ../dgit:890 +#: ../dgit:894 #, perl-format msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'" msgstr "" -#: ../dgit:910 +#: ../dgit:914 msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)" msgstr "" -#: ../dgit:919 ../git-debrebase:1586 ../Debian/Dgit.pm:201 +#: ../dgit:923 ../git-debrebase:1586 ../Debian/Dgit.pm:201 msgid "internal error" msgstr "" -#: ../dgit:921 +#: ../dgit:925 msgid "pushing but distro is configured readonly" msgstr "" -#: ../dgit:925 +#: ../dgit:929 msgid "" "Push failed, before we got started.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:1090 +#: ../dgit:1094 msgid "this operation does not support multiple comma-separated suites" msgstr "" -#: ../dgit:1136 +#: ../dgit:1140 #, perl-format msgid "" "config requested specific TLS key but do not know how to get curl to use " "exactly that EE key (%s)" msgstr "" -#: ../dgit:1157 +#: ../dgit:1161 msgid "ftpmasterapi archive query method takes no data part" msgstr "" -#: ../dgit:1165 +#: ../dgit:1169 msgid "curl failed to print 3-digit HTTP code" msgstr "" -#: ../dgit:1169 +#: ../dgit:1173 #, perl-format msgid "fetch of %s gave HTTP code %s" msgstr "" -#: ../dgit:1185 +#: ../dgit:1189 #, perl-format msgid "unknown suite %s, maybe -d would help" msgstr "" -#: ../dgit:1189 +#: ../dgit:1193 #, perl-format msgid "multiple matches for suite %s\n" msgstr "" -#: ../dgit:1191 +#: ../dgit:1195 #, perl-format msgid "suite %s info has no codename\n" msgstr "" -#: ../dgit:1193 +#: ../dgit:1197 #, perl-format msgid "suite %s maps to bad codename\n" msgstr "" -#: ../dgit:1195 ../dgit:1220 +#: ../dgit:1199 ../dgit:1224 msgid "bad ftpmaster api response: " msgstr "" -#: ../dgit:1209 +#: ../dgit:1213 #, perl-format msgid "bad version: %s\n" msgstr "" -#: ../dgit:1211 +#: ../dgit:1215 msgid "bad component" msgstr "" -#: ../dgit:1214 +#: ../dgit:1218 msgid "bad filename" msgstr "" -#: ../dgit:1216 +#: ../dgit:1220 msgid "bad sha256sum" msgstr "" -#: ../dgit:1267 +#: ../dgit:1271 msgid "aptget archive query method takes no data part" msgstr "" -#: ../dgit:1351 +#: ../dgit:1355 #, perl-format msgid "" "apt seemed to not to update dgit's cached Release files for %s.\n" @@ -251,163 +274,163 @@ msgid "" " is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n" msgstr "" -#: ../dgit:1373 +#: ../dgit:1377 #, perl-format msgid "Release file (%s) specifies intolerable %s" msgstr "" -#: ../dgit:1401 +#: ../dgit:1405 msgid "apt-get source did not produce a .dsc" msgstr "" -#: ../dgit:1402 +#: ../dgit:1406 #, perl-format msgid "apt-get source produced several .dscs (%s)" msgstr "" -#: ../dgit:1507 +#: ../dgit:1511 #, perl-format msgid "" "unable to canonicalise suite using package %s which does not appear to exist " "in suite %s; --existing-package may help" msgstr "" -#: ../dgit:1698 +#: ../dgit:1702 #, perl-format msgid "cannot operate on %s suite" msgstr "" -#: ../dgit:1701 +#: ../dgit:1705 #, perl-format msgid "canonical suite name for %s is %s" msgstr "" -#: ../dgit:1703 +#: ../dgit:1707 #, perl-format msgid "canonical suite name is %s" msgstr "" -#: ../dgit:1723 +#: ../dgit:1727 #, perl-format msgid "%s has hash %s but archive told us to expect %s" msgstr "" -#: ../dgit:1729 +#: ../dgit:1733 #, perl-format msgid "unsupported source format %s, sorry" msgstr "" -#: ../dgit:1756 +#: ../dgit:1760 #, perl-format msgid "diverting to %s (using config for %s)" msgstr "" -#: ../dgit:1773 +#: ../dgit:1777 msgid "unexpected results from git check query - " msgstr "" -#: ../dgit:1788 +#: ../dgit:1792 #, perl-format msgid "unknown git-check `%s'" msgstr "" -#: ../dgit:1803 +#: ../dgit:1807 #, perl-format msgid "unknown git-create `%s'" msgstr "" -#: ../dgit:1840 +#: ../dgit:1844 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "" -#: ../dgit:1886 +#: ../dgit:1890 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "" -#: ../dgit:1897 +#: ../dgit:1901 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "" -#: ../dgit:1943 +#: ../dgit:1947 #, perl-format msgid "hash or size of %s varies in %s fields (between: %s)" msgstr "" -#: ../dgit:1952 +#: ../dgit:1956 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "" -#: ../dgit:1956 +#: ../dgit:1960 #, perl-format msgid "%s has no files list field(s)" msgstr "" -#: ../dgit:1962 +#: ../dgit:1966 #, perl-format msgid "no file appears in all file lists (looked in: %s)" msgstr "" -#: ../dgit:2002 +#: ../dgit:2006 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "" -#: ../dgit:2015 +#: ../dgit:2019 msgid "cannot find section/priority from .changes Files field" msgstr "" -#: ../dgit:2028 +#: ../dgit:2032 msgid "" "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n" msgstr "" -#: ../dgit:2044 +#: ../dgit:2048 #, perl-format msgid ".dsc %s missing entry for %s" msgstr "" -#: ../dgit:2049 +#: ../dgit:2053 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "" -#: ../dgit:2057 +#: ../dgit:2061 #, perl-format msgid "archive %s: %s" msgstr "" -#: ../dgit:2064 +#: ../dgit:2068 #, perl-format msgid "archive contains %s with different checksum" msgstr "" -#: ../dgit:2092 +#: ../dgit:2096 #, perl-format msgid "edited .changes for archive .orig contents: %s %s" msgstr "" -#: ../dgit:2100 +#: ../dgit:2104 #, perl-format msgid "[new .changes left in %s]" msgstr "" -#: ../dgit:2103 +#: ../dgit:2107 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "" -#: ../dgit:2127 +#: ../dgit:2131 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " "Maintainer field)" msgstr "" -#: ../dgit:2150 +#: ../dgit:2154 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -422,113 +445,113 @@ msgid "" "\n" msgstr "" -#: ../dgit:2162 +#: ../dgit:2166 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" msgstr "" -#: ../dgit:2193 +#: ../dgit:2197 msgid "Dpkg::Vendor `current vendor'" msgstr "" -#: ../dgit:2195 +#: ../dgit:2199 msgid "(base) distro being accessed" msgstr "" -#: ../dgit:2197 +#: ../dgit:2201 msgid "(nominal) distro being accessed" msgstr "" -#: ../dgit:2202 +#: ../dgit:2206 #, perl-format msgid "build-products-dir %s is not accessible: %s\n" msgstr "" -#: ../dgit:2227 +#: ../dgit:2231 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" msgstr "" -#: ../dgit:2231 +#: ../dgit:2235 #, perl-format msgid "check orig file %s in bpd %s: %s" msgstr "" -#: ../dgit:2233 +#: ../dgit:2237 #, perl-format msgid "check orig file %s in ..: %s" msgstr "" -#: ../dgit:2236 +#: ../dgit:2240 #, perl-format -msgid "check targe of orig symlink %s in ..: %s" +msgid "check target of orig symlink %s in ..: %s" msgstr "" -#: ../dgit:2245 +#: ../dgit:2249 #, perl-format msgid "%s: cloned orig symlink from ..: %s\n" msgstr "" -#: ../dgit:2249 +#: ../dgit:2253 #, perl-format msgid "%s: hardlinked orig from ..: %s\n" msgstr "" -#: ../dgit:2252 +#: ../dgit:2256 #, perl-format msgid "failed to make %s a hardlink to %s: %s" msgstr "" -#: ../dgit:2258 +#: ../dgit:2262 #, perl-format msgid "%s: symmlinked orig from .. on other filesystem: %s\n" msgstr "" -#: ../dgit:2290 ../dgit:2295 +#: ../dgit:2294 ../dgit:2299 #, perl-format msgid "accessing %s: %s" msgstr "" -#: ../dgit:2310 ../dgit:2317 +#: ../dgit:2314 ../dgit:2321 #, perl-format msgid "saving %s: %s" msgstr "" -#: ../dgit:2382 +#: ../dgit:2386 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "" -#: ../dgit:2446 ../dgit:5970 +#: ../dgit:2450 ../dgit:5974 msgid "source package" msgstr "" -#: ../dgit:2464 +#: ../dgit:2468 msgid "package changelog" msgstr "" -#: ../dgit:2504 +#: ../dgit:2508 msgid "package changelog has no entries!" msgstr "" -#: ../dgit:2523 +#: ../dgit:2527 #, perl-format msgid "Import %s" msgstr "" -#: ../dgit:2604 +#: ../dgit:2608 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "" -#: ../dgit:2623 +#: ../dgit:2627 #, perl-format msgid "%s failed: %s\n" msgstr "" -#: ../dgit:2632 +#: ../dgit:2636 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -537,21 +560,21 @@ msgid "" " dpkg-source --before-build gave tree %s\n" msgstr "" -#: ../dgit:2647 +#: ../dgit:2651 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "" -#: ../dgit:2651 +#: ../dgit:2655 msgid "Import of source package" msgstr "" -#: ../dgit:2664 +#: ../dgit:2668 #, perl-format msgid "Record %s (%s) in archive suite %s\n" msgstr "" -#: ../dgit:2668 +#: ../dgit:2672 #, perl-format msgid "" "\n" @@ -560,51 +583,51 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:2710 +#: ../dgit:2714 #, perl-format msgid "using existing %s" msgstr "" -#: ../dgit:2714 +#: ../dgit:2718 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " "file?)" msgstr "" -#: ../dgit:2718 +#: ../dgit:2722 #, perl-format msgid "need to fetch correct version of %s" msgstr "" -#: ../dgit:2734 +#: ../dgit:2738 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" msgstr "" -#: ../dgit:2829 +#: ../dgit:2833 msgid "too many iterations trying to get sane fetch!" msgstr "" -#: ../dgit:2844 +#: ../dgit:2848 #, perl-format msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n" msgstr "" -#: ../dgit:2888 +#: ../dgit:2892 #, perl-format msgid "warning: git fetch %s created %s; this is silly, deleting it.\n" msgstr "" -#: ../dgit:2903 +#: ../dgit:2907 msgid "" "--dry-run specified but we actually wanted the results of git fetch,\n" "so this is not going to work. Try running dgit fetch first,\n" "or using --damp-run instead of --dry-run.\n" msgstr "" -#: ../dgit:2908 +#: ../dgit:2912 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -614,49 +637,49 @@ msgid "" "warning: Will try again...\n" msgstr "" -#: ../dgit:2975 +#: ../dgit:2979 #, perl-format msgid "Not updating %s from %s to %s.\n" msgstr "" -#: ../dgit:3024 +#: ../dgit:3028 #, perl-format msgid "%s: NO git hash" msgstr "" -#: ../dgit:3028 +#: ../dgit:3032 #, perl-format msgid "%s: specified git info (%s)" msgstr "" -#: ../dgit:3035 +#: ../dgit:3039 #, perl-format msgid "%s: specified git hash" msgstr "" -#: ../dgit:3037 +#: ../dgit:3041 #, perl-format msgid "%s: invalid Dgit info" msgstr "" -#: ../dgit:3059 +#: ../dgit:3063 #, perl-format msgid "not chasing .dsc distro %s: not fetching %s" msgstr "" -#: ../dgit:3064 +#: ../dgit:3068 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr "" -#: ../dgit:3069 +#: ../dgit:3073 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" "for which we have no configured url and .dsc provides no hint\n" msgstr "" -#: ../dgit:3079 +#: ../dgit:3083 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -665,54 +688,54 @@ msgid "" "(can be overridden by config - consult documentation)\n" msgstr "" -#: ../dgit:3099 +#: ../dgit:3103 msgid "rewrite map" msgstr "" -#: ../dgit:3106 +#: ../dgit:3110 msgid "server's git history rewrite map contains a relevant entry!" msgstr "" -#: ../dgit:3110 +#: ../dgit:3114 msgid "using rewritten git hash in place of .dsc value" msgstr "" -#: ../dgit:3112 +#: ../dgit:3116 msgid "server data says .dsc hash is to be disregarded" msgstr "" -#: ../dgit:3119 +#: ../dgit:3123 msgid "additional commits" msgstr "" -#: ../dgit:3122 +#: ../dgit:3126 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" "but we could not obtain that object anywhere.\n" msgstr "" -#: ../dgit:3147 +#: ../dgit:3151 msgid "last upload to archive" msgstr "" -#: ../dgit:3151 +#: ../dgit:3155 msgid "no version available from the archive" msgstr "" -#: ../dgit:3234 +#: ../dgit:3238 msgid "dgit suite branch on dgit git server" msgstr "" -#: ../dgit:3241 +#: ../dgit:3245 msgid "dgit client's archive history view" msgstr "" -#: ../dgit:3246 +#: ../dgit:3250 msgid "Dgit field in .dsc from archive" msgstr "" -#: ../dgit:3274 +#: ../dgit:3278 #, perl-format msgid "" "\n" @@ -722,15 +745,15 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3287 +#: ../dgit:3291 msgid "archive .dsc names newer git commit" msgstr "" -#: ../dgit:3290 +#: ../dgit:3294 msgid "archive .dsc names other git commit, fixing up" msgstr "" -#: ../dgit:3311 +#: ../dgit:3315 #, perl-format msgid "" "\n" @@ -738,7 +761,7 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3320 +#: ../dgit:3324 #, perl-format msgid "" "\n" @@ -748,7 +771,7 @@ msgid "" "\n" msgstr "" -#: ../dgit:3405 +#: ../dgit:3409 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -756,19 +779,19 @@ msgid "" "Record that\n" msgstr "" -#: ../dgit:3418 +#: ../dgit:3422 msgid "should be treated as descended from\n" msgstr "" -#: ../dgit:3436 +#: ../dgit:3440 msgid "dgit repo server tip (last push)" msgstr "" -#: ../dgit:3438 +#: ../dgit:3442 msgid "local tracking tip (last fetch)" msgstr "" -#: ../dgit:3449 +#: ../dgit:3453 #, perl-format msgid "" "\n" @@ -778,30 +801,30 @@ msgid "" "\n" msgstr "" -#: ../dgit:3464 +#: ../dgit:3468 msgid "fetched source tree" msgstr "" -#: ../dgit:3500 +#: ../dgit:3504 msgid "debian/changelog merge driver" msgstr "" -#: ../dgit:3565 +#: ../dgit:3569 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" msgstr "" -#: ../dgit:3579 +#: ../dgit:3583 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n" msgstr "" -#: ../dgit:3594 +#: ../dgit:3598 #, perl-format msgid "install %s: %s" msgstr "" -#: ../dgit:3621 +#: ../dgit:3625 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -809,30 +832,30 @@ msgid "" "tree.\n" msgstr "" -#: ../dgit:3643 +#: ../dgit:3647 #, perl-format msgid "fetching %s..." msgstr "" -#: ../dgit:3651 +#: ../dgit:3655 #, perl-format msgid "failed to obtain %s: %s" msgstr "" -#: ../dgit:3690 +#: ../dgit:3694 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "" -#: ../dgit:3722 +#: ../dgit:3726 msgid "local combined tracking branch" msgstr "" -#: ../dgit:3724 +#: ../dgit:3728 msgid "archive seems to have rewound: local tracking branch is ahead!" msgstr "" -#: ../dgit:3763 +#: ../dgit:3767 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -840,7 +863,7 @@ msgid "" "Input branches:\n" msgstr "" -#: ../dgit:3777 +#: ../dgit:3781 msgid "" "\n" "Key\n" @@ -849,248 +872,248 @@ msgid "" "\n" msgstr "" -#: ../dgit:3792 +#: ../dgit:3796 #, perl-format msgid "calculated combined tracking suite %s" msgstr "" -#: ../dgit:3810 +#: ../dgit:3814 #, perl-format msgid "ready for work in %s" msgstr "" -#: ../dgit:3818 +#: ../dgit:3822 msgid "dry run makes no sense with clone" msgstr "" -#: ../dgit:3833 +#: ../dgit:3837 #, perl-format msgid "create `%s': %s" msgstr "" -#: ../dgit:3849 +#: ../dgit:3853 msgid "fetching existing git history" msgstr "" -#: ../dgit:3853 +#: ../dgit:3857 msgid "starting new git history" msgstr "" -#: ../dgit:3879 +#: ../dgit:3883 #, perl-format msgid "" "FYI: Vcs-Git in %s has different url to your vcs-git remote.\n" " Your vcs-git remote url may be out of date. Use dgit update-vcs-git ?\n" msgstr "" -#: ../dgit:3884 +#: ../dgit:3888 #, perl-format msgid "fetched into %s" msgstr "" -#: ../dgit:3896 +#: ../dgit:3900 #, perl-format msgid "Merge from %s [dgit]" msgstr "" -#: ../dgit:3898 +#: ../dgit:3902 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "" -#: ../dgit:3906 +#: ../dgit:3910 #, perl-format msgid "git tree contains %s" msgstr "" -#: ../dgit:3917 +#: ../dgit:3921 msgid "you have uncommitted changes to critical files, cannot continue:\n" msgstr "" -#: ../dgit:3936 +#: ../dgit:3940 #, perl-format msgid "" "quilt fixup required but quilt mode is `nofix'\n" "HEAD commit%s differs from tree implied by debian/patches%s" msgstr "" -#: ../dgit:3953 +#: ../dgit:3957 msgid "nothing quilty to commit, ok." msgstr "" -#: ../dgit:3956 +#: ../dgit:3960 msgid " (wanted to commit patch update)" msgstr "" -#: ../dgit:3960 +#: ../dgit:3964 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" msgstr "" -#: ../dgit:4003 +#: ../dgit:4007 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" msgstr "" -#: ../dgit:4008 +#: ../dgit:4012 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "" -#: ../dgit:4018 +#: ../dgit:4022 #, perl-format msgid "commit id %s" msgstr "" -#: ../dgit:4024 +#: ../dgit:4028 #, perl-format msgid "and left in %s" msgstr "" -#: ../dgit:4050 +#: ../dgit:4054 #, perl-format msgid "Wanted tag %s (%s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4053 +#: ../dgit:4057 #, perl-format msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4061 +#: ../dgit:4065 #, perl-format msgid "%s (%s) .. %s (%s) is not fast forward\n" msgstr "" -#: ../dgit:4070 +#: ../dgit:4074 msgid "version currently in archive" msgstr "" -#: ../dgit:4079 +#: ../dgit:4083 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" -#: ../dgit:4087 +#: ../dgit:4091 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "" -#: ../dgit:4097 +#: ../dgit:4101 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "" -#: ../dgit:4100 +#: ../dgit:4104 #, perl-format msgid "" "%s is %s\n" "Your tree seems to based on earlier (not uploaded) %s.\n" msgstr "" -#: ../dgit:4114 +#: ../dgit:4118 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "" -#: ../dgit:4170 +#: ../dgit:4174 msgid "Checking that HEAD includes all changes in archive..." msgstr "" -#: ../dgit:4179 +#: ../dgit:4183 msgid "maintainer view tag" msgstr "" -#: ../dgit:4181 +#: ../dgit:4185 msgid "dgit view tag" msgstr "" -#: ../dgit:4182 +#: ../dgit:4186 msgid "current archive contents" msgstr "" -#: ../dgit:4195 +#: ../dgit:4199 msgid "" "| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n" msgstr "" -#: ../dgit:4205 +#: ../dgit:4209 #, perl-format msgid "Declare fast forward from %s\n" msgstr "" -#: ../dgit:4206 +#: ../dgit:4210 #, perl-format msgid "Make fast forward from %s\n" msgstr "" -#: ../dgit:4210 +#: ../dgit:4214 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "" -#: ../dgit:4223 +#: ../dgit:4227 #, perl-format msgid "Declare fast forward from %s" msgstr "" -#: ../dgit:4231 +#: ../dgit:4235 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "" -#: ../dgit:4243 +#: ../dgit:4247 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "" -#: ../dgit:4265 +#: ../dgit:4269 #, perl-format msgid "%s is for %s %s but debian/changelog is for %s %s" msgstr "" -#: ../dgit:4326 +#: ../dgit:4330 #, perl-format msgid "changes field %s `%s' does not match changelog `%s'" msgstr "" -#: ../dgit:4354 +#: ../dgit:4358 #, perl-format msgid "%s release %s for %s (%s) [dgit]\n" msgstr "" -#: ../dgit:4367 +#: ../dgit:4371 #, perl-format msgid "" "%s release %s for %s (%s)\n" "(maintainer view tag generated by dgit --quilt=%s)\n" msgstr "" -#: ../dgit:4419 +#: ../dgit:4423 msgid "" "Push failed, while checking state of the archive.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:4428 +#: ../dgit:4432 msgid "" "package appears to be new in this suite; if this is intentional, use --new" msgstr "" -#: ../dgit:4433 +#: ../dgit:4437 msgid "" "Push failed, while preparing your push.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:4456 +#: ../dgit:4460 #, perl-format msgid "looked for .dsc %s, but %s; maybe you forgot to build" msgstr "" -#: ../dgit:4473 +#: ../dgit:4477 #, perl-format msgid "" "Branch is managed by git-debrebase (%s\n" @@ -1099,14 +1122,14 @@ msgid "" "Or, maybe, run git-debrebase forget-was-ever-debrebase.\n" msgstr "" -#: ../dgit:4497 +#: ../dgit:4501 #, perl-format msgid "" "--quilt=%s but no cached dgit view:\n" " perhaps HEAD changed since dgit build[-source] ?" msgstr "" -#: ../dgit:4528 +#: ../dgit:4532 msgid "" "dgit push: HEAD is not a descendant of the archive's version.\n" "To overwrite the archive's contents, pass --overwrite[=VERSION].\n" @@ -1114,24 +1137,24 @@ msgid "" "forward." msgstr "" -#: ../dgit:4538 +#: ../dgit:4542 #, perl-format msgid "checking that %s corresponds to HEAD" msgstr "" -#: ../dgit:4572 ../dgit:4584 +#: ../dgit:4576 ../dgit:4588 #, perl-format msgid "HEAD specifies a different tree to %s:\n" msgstr "" -#: ../dgit:4578 +#: ../dgit:4582 #, perl-format msgid "" "There is a problem with your source tree (see dgit(7) for some hints).\n" "To see a full diff, run git diff %s %s\n" msgstr "" -#: ../dgit:4588 +#: ../dgit:4592 #, perl-format msgid "" "Perhaps you forgot to build. Or perhaps there is a problem with your\n" @@ -1139,52 +1162,52 @@ msgid "" " git diff %s %s\n" msgstr "" -#: ../dgit:4599 +#: ../dgit:4603 #, perl-format msgid "" "failed to find unique changes file (looked for %s in %s); perhaps you need " "to use dgit -C" msgstr "" -#: ../dgit:4621 +#: ../dgit:4625 msgid "uploading binaries, although distro policy is source only" msgstr "" -#: ../dgit:4625 +#: ../dgit:4629 msgid "source-only upload, although distro policy requires .debs" msgstr "" -#: ../dgit:4629 +#: ../dgit:4633 #, perl-format msgid "" "source-only upload, even though package is entirely NEW\n" "(this is contrary to policy in %s)" msgstr "" -#: ../dgit:4636 +#: ../dgit:4640 #, perl-format msgid "unknown source-only-uploads policy `%s'" msgstr "" -#: ../dgit:4680 +#: ../dgit:4684 msgid "" "Push failed, while signing the tag.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:4693 +#: ../dgit:4697 msgid "" "Push failed, *after* signing the tag.\n" "If you want to try again, you should use a new version number.\n" msgstr "" -#: ../dgit:4710 +#: ../dgit:4714 msgid "" "Push failed, while updating the remote git repository - see messages above.\n" "If you want to try again, you should use a new version number.\n" msgstr "" -#: ../dgit:4727 +#: ../dgit:4731 msgid "" "Push failed, while obtaining signatures on the .changes and .dsc.\n" "If it was just that the signature failed, you may try again by using\n" @@ -1193,155 +1216,155 @@ msgid "" "If you need to change the package, you must use a new version number.\n" msgstr "" -#: ../dgit:4758 +#: ../dgit:4762 #, perl-format msgid "pushed and uploaded %s" msgstr "" -#: ../dgit:4770 +#: ../dgit:4774 msgid "-p is not allowed with clone; specify as argument instead" msgstr "" -#: ../dgit:4781 +#: ../dgit:4785 msgid "incorrect arguments to dgit clone" msgstr "" -#: ../dgit:4787 ../git-debrebase:1839 +#: ../dgit:4791 ../git-debrebase:1839 #, perl-format msgid "%s already exists" msgstr "" -#: ../dgit:4801 +#: ../dgit:4805 #, perl-format msgid "remove %s: %s\n" msgstr "" -#: ../dgit:4805 +#: ../dgit:4809 #, perl-format msgid "check whether to remove %s: %s\n" msgstr "" -#: ../dgit:4843 +#: ../dgit:4847 msgid "incorrect arguments to dgit fetch or dgit pull" msgstr "" -#: ../dgit:4860 +#: ../dgit:4864 #, perl-format msgid "dgit pull not yet supported in split view mode (--quilt=%s)\n" msgstr "" -#: ../dgit:4869 +#: ../dgit:4873 msgid "dgit checkout needs a suite argument" msgstr "" -#: ../dgit:4931 +#: ../dgit:4935 #, perl-format msgid "setting up vcs-git: %s\n" msgstr "" -#: ../dgit:4934 +#: ../dgit:4938 #, perl-format msgid "vcs git already configured: %s\n" msgstr "" -#: ../dgit:4936 +#: ../dgit:4940 #, perl-format msgid "changing vcs-git url to: %s\n" msgstr "" -#: ../dgit:4941 +#: ../dgit:4945 #, perl-format msgid "fetching (%s)\n" msgstr "" -#: ../dgit:4956 +#: ../dgit:4960 #, perl-format msgid "incorrect arguments to dgit %s" msgstr "" -#: ../dgit:4967 +#: ../dgit:4971 #, perl-format msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s" msgstr "" -#: ../dgit:5005 +#: ../dgit:5009 #, perl-format msgid "" "build host has dgit rpush protocol versions %s but invocation host has %s" msgstr "" -#: ../dgit:5085 +#: ../dgit:5089 #, perl-format msgid "create %s: %s" msgstr "" -#: ../dgit:5122 +#: ../dgit:5126 #, perl-format msgid "build host child failed: %s" msgstr "" -#: ../dgit:5125 +#: ../dgit:5129 msgid "all done\n" msgstr "" -#: ../dgit:5134 +#: ../dgit:5138 #, perl-format msgid "file %s (%s) twice" msgstr "" -#: ../dgit:5142 +#: ../dgit:5146 msgid "bad param spec" msgstr "" -#: ../dgit:5148 +#: ../dgit:5152 msgid "bad previously spec" msgstr "" -#: ../dgit:5167 +#: ../dgit:5171 #, perl-format msgid "" "rpush negotiated protocol version %s which does not support quilt mode %s" msgstr "" -#: ../dgit:5212 +#: ../dgit:5216 #, perl-format msgid "buildinfo mismatch in field %s" msgstr "" -#: ../dgit:5215 +#: ../dgit:5219 #, perl-format msgid "buildinfo contains forbidden field %s" msgstr "" -#: ../dgit:5256 +#: ../dgit:5260 msgid "remote changes file" msgstr "" -#: ../dgit:5331 +#: ../dgit:5335 msgid "not a plain file or symlink\n" msgstr "" -#: ../dgit:5337 +#: ../dgit:5341 msgid "mode or type changed\n" msgstr "" -#: ../dgit:5338 +#: ../dgit:5342 msgid "modified symlink\n" msgstr "" -#: ../dgit:5341 +#: ../dgit:5345 msgid "deletion of symlink\n" msgstr "" -#: ../dgit:5345 +#: ../dgit:5349 msgid "creation with non-default mode\n" msgstr "" -#: ../dgit:5375 +#: ../dgit:5379 msgid "dgit view: changes are required..." msgstr "" -#: ../dgit:5404 +#: ../dgit:5408 #, perl-format msgid "" "\n" @@ -1349,31 +1372,31 @@ msgid "" " %s\n" msgstr "" -#: ../dgit:5411 +#: ../dgit:5415 #, perl-format msgid "" "--quilt=%s specified, implying patches-unapplied git tree\n" " but git tree differs from orig in upstream files." msgstr "" -#: ../dgit:5417 +#: ../dgit:5421 msgid "" "\n" " ... debian/patches is missing; perhaps this is a patch queue branch?" msgstr "" -#: ../dgit:5424 +#: ../dgit:5428 #, perl-format msgid "" "--quilt=%s specified, implying patches-applied git tree\n" " but git tree differs from result of applying debian/patches to upstream\n" msgstr "" -#: ../dgit:5431 +#: ../dgit:5435 msgid "dgit view: creating patches-applied version using gbp pq" msgstr "" -#: ../dgit:5440 +#: ../dgit:5444 #, perl-format msgid "" "--quilt=%s specified, implying that HEAD is for use with a\n" @@ -1381,16 +1404,16 @@ msgid "" " .gitignores: but, such patches exist in debian/patches.\n" msgstr "" -#: ../dgit:5449 +#: ../dgit:5453 msgid "dgit view: creating patch to represent .gitignore changes" msgstr "" -#: ../dgit:5454 +#: ../dgit:5458 #, perl-format msgid "%s already exists; but want to create it to record .gitignore changes" msgstr "" -#: ../dgit:5459 +#: ../dgit:5463 msgid "" "Subject: Update .gitignore from Debian packaging branch\n" "\n" @@ -1399,63 +1422,63 @@ msgid "" "updates to users of the official Debian archive view of the package.\n" msgstr "" -#: ../dgit:5481 +#: ../dgit:5485 msgid "Commit patch to update .gitignore\n" msgstr "" -#: ../dgit:5495 +#: ../dgit:5499 msgid "converted" msgstr "" -#: ../dgit:5496 +#: ../dgit:5500 #, perl-format msgid "dgit view: created (%s)" msgstr "" -#: ../dgit:5561 +#: ../dgit:5565 msgid "maximum search space exceeded" msgstr "" -#: ../dgit:5579 +#: ../dgit:5583 #, perl-format msgid "has %s not %s" msgstr "" -#: ../dgit:5588 +#: ../dgit:5592 msgid "root commit" msgstr "" -#: ../dgit:5594 +#: ../dgit:5598 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "" -#: ../dgit:5606 +#: ../dgit:5610 #, perl-format msgid "changed %s" msgstr "" -#: ../dgit:5625 +#: ../dgit:5629 #, perl-format msgid "" "\n" "%s: error: quilt fixup cannot be linear. Stopped at:\n" msgstr "" -#: ../dgit:5632 +#: ../dgit:5636 #, perl-format msgid "%s: %s: %s\n" msgstr "" -#: ../dgit:5644 +#: ../dgit:5648 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" -#: ../dgit:5647 +#: ../dgit:5651 msgid "quilt fixup cannot be linear, smashing..." msgstr "" -#: ../dgit:5659 +#: ../dgit:5663 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1463,68 +1486,68 @@ msgid "" "\n" msgstr "" -#: ../dgit:5666 +#: ../dgit:5670 msgid "quiltify linearisation planning successful, executing..." msgstr "" -#: ../dgit:5700 +#: ../dgit:5704 msgid "contains unexpected slashes\n" msgstr "" -#: ../dgit:5701 +#: ../dgit:5705 msgid "contains leading punctuation\n" msgstr "" -#: ../dgit:5702 +#: ../dgit:5706 msgid "contains bad character(s)\n" msgstr "" -#: ../dgit:5703 +#: ../dgit:5707 msgid "is series file\n" msgstr "" -#: ../dgit:5704 +#: ../dgit:5708 msgid "too long\n" msgstr "" -#: ../dgit:5708 +#: ../dgit:5712 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" -#: ../dgit:5737 +#: ../dgit:5741 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "" -#: ../dgit:5880 +#: ../dgit:5884 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" -#: ../dgit:5890 +#: ../dgit:5894 msgid "starting quiltify (single-debian-patch)" msgstr "" -#: ../dgit:5992 +#: ../dgit:5996 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" -#: ../dgit:6023 +#: ../dgit:6027 #, perl-format msgid "dgit view: found cached (%s)" msgstr "" -#: ../dgit:6028 +#: ../dgit:6032 msgid "dgit view: found cached, no changes required" msgstr "" -#: ../dgit:6039 +#: ../dgit:6043 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "" -#: ../dgit:6130 +#: ../dgit:6134 msgid "" "failed to apply your git tree's patch stack (from debian/patches/) to\n" " the corresponding upstream tarball(s). Your source tree and .orig\n" @@ -1532,58 +1555,58 @@ msgid "" " anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n" msgstr "" -#: ../dgit:6144 +#: ../dgit:6148 msgid "Tree already contains .pc - will use it then delete it." msgstr "" -#: ../dgit:6181 +#: ../dgit:6185 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "" -#: ../dgit:6184 +#: ../dgit:6188 #, perl-format msgid "" "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n" "%s: quilt differences: HEAD %s o+d/p HEAD %s o+d/p" msgstr "" -#: ../dgit:6190 +#: ../dgit:6194 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "" -#: ../dgit:6194 +#: ../dgit:6198 msgid "" "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" msgstr "" -#: ../dgit:6201 +#: ../dgit:6205 msgid "This might be a patches-unapplied branch." msgstr "" -#: ../dgit:6204 +#: ../dgit:6208 msgid "This might be a patches-applied branch." msgstr "" -#: ../dgit:6207 +#: ../dgit:6211 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" -#: ../dgit:6210 +#: ../dgit:6214 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" -#: ../dgit:6214 +#: ../dgit:6218 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" -#: ../dgit:6223 +#: ../dgit:6227 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "" -#: ../dgit:6261 +#: ../dgit:6265 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1592,102 +1615,102 @@ msgid "" "\n" msgstr "" -#: ../dgit:6273 +#: ../dgit:6277 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" -#: ../dgit:6302 +#: ../dgit:6306 msgid "" "If this is just missing .gitignore entries, use a different clean\n" "mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them\n" "or --clean=git (-wg/-wgf) to use `git clean' instead.\n" msgstr "" -#: ../dgit:6314 +#: ../dgit:6318 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" -#: ../dgit:6317 +#: ../dgit:6321 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" -#: ../dgit:6320 +#: ../dgit:6324 msgid "" "tree contains uncommited, untracked, unignored files\n" "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." msgstr "" -#: ../dgit:6338 +#: ../dgit:6342 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" -#: ../dgit:6352 +#: ../dgit:6356 msgid "clean takes no additional arguments" msgstr "" -#: ../dgit:6365 +#: ../dgit:6369 #, perl-format msgid "-p is not allowed with dgit %s" msgstr "" -#: ../dgit:6404 +#: ../dgit:6408 #, perl-format msgid "remove old changes file %s: %s" msgstr "" -#: ../dgit:6406 +#: ../dgit:6410 #, perl-format msgid "would remove %s" msgstr "" -#: ../dgit:6432 +#: ../dgit:6436 msgid "archive query failed (queried because --since-version not specified)" msgstr "" -#: ../dgit:6438 +#: ../dgit:6442 #, perl-format msgid "changelog will contain changes since %s" msgstr "" -#: ../dgit:6441 +#: ../dgit:6445 msgid "package seems new, not specifying -v<version>" msgstr "" -#: ../dgit:6484 +#: ../dgit:6488 msgid "Wanted to build nothing!" msgstr "" -#: ../dgit:6522 +#: ../dgit:6526 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "" -#: ../dgit:6529 +#: ../dgit:6533 #, perl-format msgid "%s found in binaries changes file %s" msgstr "" -#: ../dgit:6536 +#: ../dgit:6540 #, perl-format msgid "%s unexpectedly not created by build" msgstr "" -#: ../dgit:6540 +#: ../dgit:6544 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "" -#: ../dgit:6545 +#: ../dgit:6549 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "" -#: ../dgit:6548 +#: ../dgit:6552 #, perl-format msgid "build successful, results in %s\n" msgstr "" -#: ../dgit:6561 +#: ../dgit:6565 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1695,136 +1718,136 @@ msgid "" "Suggest you delete %s.\n" msgstr "" -#: ../dgit:6579 +#: ../dgit:6583 msgid "build successful\n" msgstr "" -#: ../dgit:6586 +#: ../dgit:6590 #, perl-format msgid "" "%s: warning: build-products-dir set, but not supported by dpkg-buildpackage\n" "%s: warning: build-products-dir will be ignored; files will go to ..\n" msgstr "" -#: ../dgit:6696 +#: ../dgit:6700 #, perl-format msgid "remove %s: %s" msgstr "" -#: ../dgit:6731 +#: ../dgit:6735 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "" -#: ../dgit:6751 +#: ../dgit:6755 #, perl-format msgid "put in place new built file (%s): %s" msgstr "" -#: ../dgit:6764 +#: ../dgit:6768 msgid "build-source takes no additional arguments" msgstr "" -#: ../dgit:6768 +#: ../dgit:6772 #, perl-format msgid "source built, results in %s and %s" msgstr "" -#: ../dgit:6775 +#: ../dgit:6779 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" msgstr "" -#: ../dgit:6781 +#: ../dgit:6785 msgid "source changes file" msgstr "" -#: ../dgit:6783 +#: ../dgit:6787 msgid "user-specified changes file is not source-only" msgstr "" -#: ../dgit:6803 ../dgit:6805 +#: ../dgit:6807 ../dgit:6809 #, perl-format msgid "%s (in build products dir): %s" msgstr "" -#: ../dgit:6818 +#: ../dgit:6822 msgid "" "perhaps you need to pass -A ? (sbuild's default is to build only\n" "arch-specific binaries; dgit 1.4 used to override that.)\n" msgstr "" -#: ../dgit:6830 +#: ../dgit:6834 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" msgstr "" -#: ../dgit:6834 +#: ../dgit:6838 msgid "" "we must build a .dsc to pass to the builder but your debbuiltopts forbids " "the building of a source package; cannot continue" msgstr "" -#: ../dgit:6864 +#: ../dgit:6868 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "" -#: ../dgit:6886 +#: ../dgit:6890 msgid "source tree" msgstr "" -#: ../dgit:6888 +#: ../dgit:6892 #, perl-format msgid "dgit: import-dsc: %s" msgstr "" -#: ../dgit:6901 +#: ../dgit:6905 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "" -#: ../dgit:6905 +#: ../dgit:6909 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "" -#: ../dgit:6909 +#: ../dgit:6913 msgid "dry run makes no sense with import-dsc" msgstr "" -#: ../dgit:6926 +#: ../dgit:6930 #, perl-format msgid "%s is checked out - will not update it" msgstr "" -#: ../dgit:6931 +#: ../dgit:6935 #, perl-format msgid "open import .dsc (%s): %s" msgstr "" -#: ../dgit:6933 +#: ../dgit:6937 #, perl-format msgid "read %s: %s" msgstr "" -#: ../dgit:6944 +#: ../dgit:6948 msgid "import-dsc signature check failed" msgstr "" -#: ../dgit:6947 +#: ../dgit:6951 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "" -#: ../dgit:6958 +#: ../dgit:6962 msgid "Dgit metadata in .dsc" msgstr "" -#: ../dgit:6969 +#: ../dgit:6973 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "" -#: ../dgit:6978 +#: ../dgit:6982 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -1832,21 +1855,21 @@ msgid "" "plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n" msgstr "" -#: ../dgit:6985 +#: ../dgit:6989 msgid "Not fast forward, forced update." msgstr "" -#: ../dgit:6987 +#: ../dgit:6991 #, perl-format msgid "Not fast forward to %s" msgstr "" -#: ../dgit:6992 +#: ../dgit:6996 #, perl-format msgid "updated git ref %s" msgstr "" -#: ../dgit:6997 +#: ../dgit:7001 #, perl-format msgid "" "Branch %s already exists\n" @@ -1854,139 +1877,134 @@ msgid "" "Specify +%s to overwrite, discarding existing history\n" msgstr "" -#: ../dgit:7009 +#: ../dgit:7021 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "" -#: ../dgit:7011 +#: ../dgit:7023 #, perl-format msgid "stat %s: %s" msgstr "" -#: ../dgit:7019 -#, perl-format -msgid "cannot import %s which seems to be inside working tree!" -msgstr "" - -#: ../dgit:7023 +#: ../dgit:7031 #, perl-format -msgid "import %s requires .../%s, but it does not exist" +msgid "import %s requires %s, but: %s" msgstr "" -#: ../dgit:7028 +#: ../dgit:7050 #, perl-format -msgid "import %s requires %s, but: %s" +msgid "cannot import %s which seems to be inside working tree!" msgstr "" -#: ../dgit:7030 +#: ../dgit:7054 #, perl-format msgid "symlink %s to %s: %s" msgstr "" -#: ../dgit:7031 +#: ../dgit:7055 #, perl-format msgid "made symlink %s -> %s" msgstr "" -#: ../dgit:7042 +#: ../dgit:7066 msgid "Import, forced update - synthetic orphan git history." msgstr "" -#: ../dgit:7044 +#: ../dgit:7068 msgid "Import, merging." msgstr "" -#: ../dgit:7058 +#: ../dgit:7082 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "" -#: ../dgit:7067 +#: ../dgit:7091 #, perl-format msgid "results are in git ref %s" msgstr "" -#: ../dgit:7074 +#: ../dgit:7098 msgid "need only 1 subpath argument" msgstr "" -#: ../dgit:7080 +#: ../dgit:7104 #, perl-format msgid "exec curl: %s\n" msgstr "" -#: ../dgit:7094 +#: ../dgit:7118 msgid "need destination argument" msgstr "" -#: ../dgit:7099 +#: ../dgit:7123 #, perl-format msgid "exec git clone: %s\n" msgstr "" -#: ../dgit:7107 +#: ../dgit:7131 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url" msgstr "" -#: ../dgit:7118 +#: ../dgit:7142 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "" -#: ../dgit:7124 +#: ../dgit:7148 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "" -#: ../dgit:7131 ../dgit:7137 +#: ../dgit:7155 ../dgit:7161 msgid "no arguments allowed to dgit setup-useremail" msgstr "" -#: ../dgit:7143 +#: ../dgit:7167 msgid "no arguments allowed to dgit setup-tree" msgstr "" -#: ../dgit:7190 +#: ../dgit:7214 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." msgstr "" -#: ../dgit:7229 +#: ../dgit:7253 #, perl-format msgid "%s needs a value" msgstr "" -#: ../dgit:7233 +#: ../dgit:7257 #, perl-format msgid "bad value `%s' for %s" msgstr "" -#: ../dgit:7324 +#: ../dgit:7348 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "" -#: ../dgit:7344 +#: ../dgit:7368 #, perl-format msgid "unknown long option `%s'" msgstr "" -#: ../dgit:7399 +#: ../dgit:7423 #, perl-format msgid "unknown short option `%s'" msgstr "" -#: ../dgit:7414 +#: ../dgit:7438 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "" -#: ../dgit:7418 +#: ../dgit:7442 #, perl-format msgid "%s is blocked\n" msgstr "" -#: ../dgit:7424 +#: ../dgit:7448 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -1994,44 +2012,44 @@ msgid "" "Giving up.\n" msgstr "" -#: ../dgit:7441 +#: ../dgit:7465 #, perl-format msgid "cannot set command for %s" msgstr "" -#: ../dgit:7454 +#: ../dgit:7478 #, perl-format msgid "cannot configure options for %s" msgstr "" -#: ../dgit:7474 +#: ../dgit:7498 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "" -#: ../dgit:7484 +#: ../dgit:7508 #, perl-format msgid "unknown %s setting `%s'" msgstr "" -#: ../dgit:7489 +#: ../dgit:7513 msgid "dgit: --include-dirty is not supported in split view quilt mode" msgstr "" -#: ../dgit:7500 +#: ../dgit:7524 #, perl-format msgid "unknown clean-mode `%s'" msgstr "" -#: ../dgit:7521 +#: ../dgit:7545 msgid "DRY RUN ONLY\n" msgstr "" -#: ../dgit:7522 +#: ../dgit:7546 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" -#: ../dgit:7541 +#: ../dgit:7565 #, perl-format msgid "unknown operation %s" msgstr "" @@ -2335,7 +2353,7 @@ msgstr "" msgid "No ffq-prev to stitch." msgstr "" -#: ../git-debrebase:2016 +#: ../git-debrebase:2017 #, perl-format msgid "" "Could not determine appropriate upstream commitish.\n" @@ -2343,201 +2361,201 @@ msgid "" " Check version, and specify upstream commitish explicitly." msgstr "" -#: ../git-debrebase:2033 +#: ../git-debrebase:2036 msgid "need NEW-VERSION [UPS-COMMITTISH]" msgstr "" -#: ../git-debrebase:2038 +#: ../git-debrebase:2041 #, perl-format msgid "bad version number `%s'" msgstr "" -#: ../git-debrebase:2055 +#: ../git-debrebase:2059 #, perl-format msgid "upstream piece `%s'" msgstr "" -#: ../git-debrebase:2056 +#: ../git-debrebase:2060 msgid "upstream (main piece" msgstr "" -#: ../git-debrebase:2076 +#: ../git-debrebase:2080 msgid "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH" msgstr "" -#: ../git-debrebase:2094 +#: ../git-debrebase:2098 msgid "old anchor is recognised due to --anchor, cannot check upstream" msgstr "" -#: ../git-debrebase:2110 +#: ../git-debrebase:2114 #, perl-format msgid "" "previous upstream combine %s mentions %d pieces (each implying one parent) " "but has %d parents (one per piece plus maybe a previous combine)" msgstr "" -#: ../git-debrebase:2119 +#: ../git-debrebase:2123 #, perl-format msgid "previous upstream combine %s first piece is not `.'" msgstr "" -#: ../git-debrebase:2132 +#: ../git-debrebase:2136 #, perl-format msgid "" "previous upstream %s is from git-debrebase but not an `upstream-combine' " "commit" msgstr "" -#: ../git-debrebase:2143 +#: ../git-debrebase:2147 #, perl-format msgid "introducing upstream piece `%s'" msgstr "" -#: ../git-debrebase:2146 +#: ../git-debrebase:2150 #, perl-format msgid "dropping upstream piece `%s'" msgstr "" -#: ../git-debrebase:2149 +#: ../git-debrebase:2153 #, perl-format msgid "not fast forward: %s %s" msgstr "" -#: ../git-debrebase:2260 +#: ../git-debrebase:2264 msgid "Previous head already recorded\n" msgstr "" -#: ../git-debrebase:2264 +#: ../git-debrebase:2268 #, perl-format msgid "Could not preserve: %s" msgstr "" -#: ../git-debrebase:2269 ../git-debrebase:2275 ../git-debrebase:2281 -#: ../git-debrebase:2371 ../git-debrebase:2380 ../git-debrebase:2404 -#: ../git-debrebase:2468 +#: ../git-debrebase:2273 ../git-debrebase:2279 ../git-debrebase:2285 +#: ../git-debrebase:2375 ../git-debrebase:2384 ../git-debrebase:2408 +#: ../git-debrebase:2472 msgid "no arguments allowed" msgstr "" -#: ../git-debrebase:2303 +#: ../git-debrebase:2307 msgid "branch contains furniture (not laundered)" msgstr "" -#: ../git-debrebase:2304 +#: ../git-debrebase:2308 msgid "branch is unlaundered" msgstr "" -#: ../git-debrebase:2305 +#: ../git-debrebase:2309 msgid "branch needs laundering" msgstr "" -#: ../git-debrebase:2306 +#: ../git-debrebase:2310 msgid "branch not in git-debrebase form" msgstr "" -#: ../git-debrebase:2316 +#: ../git-debrebase:2320 msgid "current branch contents, in git-debrebase terms:\n" msgstr "" -#: ../git-debrebase:2318 +#: ../git-debrebase:2322 msgid " branch is laundered\n" msgstr "" -#: ../git-debrebase:2334 +#: ../git-debrebase:2338 #, perl-format msgid " %s is not well-defined\n" msgstr "" -#: ../git-debrebase:2340 +#: ../git-debrebase:2344 msgid "key git-debrebase commits:\n" msgstr "" -#: ../git-debrebase:2341 +#: ../git-debrebase:2345 msgid "anchor" msgstr "" -#: ../git-debrebase:2342 +#: ../git-debrebase:2346 msgid "breakwater" msgstr "" -#: ../git-debrebase:2347 +#: ../git-debrebase:2351 msgid "branch and ref status, in git-debrebase terms:\n" msgstr "" -#: ../git-debrebase:2354 +#: ../git-debrebase:2358 msgid " unstitched; previous tip was:\n" msgstr "" -#: ../git-debrebase:2357 +#: ../git-debrebase:2361 msgid " stitched? (no record of git-debrebase work)\n" msgstr "" -#: ../git-debrebase:2359 +#: ../git-debrebase:2363 msgid " stitched\n" msgstr "" -#: ../git-debrebase:2361 +#: ../git-debrebase:2365 msgid " not git-debrebase (diverged since last stitch)\n" msgstr "" -#: ../git-debrebase:2364 +#: ../git-debrebase:2368 msgid "you are currently rebasing\n" msgstr "" -#: ../git-debrebase:2381 ../git-debrebase:2394 +#: ../git-debrebase:2385 ../git-debrebase:2398 msgid "launder for git-debrebase quick" msgstr "" -#: ../git-debrebase:2388 ../git-debrebase:2418 +#: ../git-debrebase:2392 ../git-debrebase:2422 msgid "No ongoing git-debrebase session." msgstr "" -#: ../git-debrebase:2457 +#: ../git-debrebase:2461 msgid "Commit patch queue (exported by git-debrebase)" msgstr "" -#: ../git-debrebase:2474 +#: ../git-debrebase:2478 msgid "No (more) patches to export." msgstr "" -#: ../git-debrebase:2481 +#: ../git-debrebase:2485 #, perl-format msgid "" "Patch export produced patch amendments (abandoned output commit %s). Try " "laundering first." msgstr "" -#: ../git-debrebase:2501 +#: ../git-debrebase:2505 #, perl-format msgid "%s contains comments, which will be discarded" msgstr "" -#: ../git-debrebase:2506 +#: ../git-debrebase:2510 #, perl-format msgid "patch %s repeated in %s !" msgstr "" -#: ../git-debrebase:2513 +#: ../git-debrebase:2517 #, perl-format msgid "Unused patch file %s will be discarded" msgstr "" -#: ../git-debrebase:2521 +#: ../git-debrebase:2525 msgid "ffq-prev exists, this is already managed by git-debrebase!" msgstr "" -#: ../git-debrebase:2526 +#: ../git-debrebase:2530 msgid "ahead of debrebase-last, this is already managed by git-debrebase!" msgstr "" -#: ../git-debrebase:2542 +#: ../git-debrebase:2546 msgid "want only 1 optional argument, the upstream git commitish" msgstr "" -#: ../git-debrebase:2547 +#: ../git-debrebase:2551 msgid "missing Version from changelog\n" msgstr "" -#: ../git-debrebase:2563 +#: ../git-debrebase:2567 #, perl-format msgid "" "upstream (%s) and HEAD are not\n" @@ -2545,58 +2563,58 @@ msgid "" " git diff %s HEAD -- :!/debian :/\n" msgstr "" -#: ../git-debrebase:2571 +#: ../git-debrebase:2575 #, perl-format msgid "upstream (%s) is not an ancestor of HEAD" msgstr "" -#: ../git-debrebase:2578 +#: ../git-debrebase:2582 #, perl-format msgid "" "history between upstream (%s) and HEAD contains direct changes to upstream " "files - are you sure this is a gbp (patches-unapplied) branch?" msgstr "" -#: ../git-debrebase:2580 +#: ../git-debrebase:2584 #, perl-format msgid "list expected changes with: %s\n" msgstr "" -#: ../git-debrebase:2587 +#: ../git-debrebase:2591 #, perl-format msgid "upstream (%s) contains debian/ directory" msgstr "" -#: ../git-debrebase:2605 +#: ../git-debrebase:2609 msgid "neither of the first two changelog entries are released\n" msgstr "" -#: ../git-debrebase:2611 +#: ../git-debrebase:2615 #, perl-format msgid "could not find suitable maintainer view tag %s\n" msgstr "" -#: ../git-debrebase:2614 +#: ../git-debrebase:2618 #, perl-format msgid "HEAD is not FF from maintainer tag %s!" msgstr "" -#: ../git-debrebase:2617 +#: ../git-debrebase:2621 #, perl-format msgid "dgit view tag %s not found\n" msgstr "" -#: ../git-debrebase:2619 +#: ../git-debrebase:2623 #, perl-format msgid "dgit view tag %s is not FF from maintainer tag %s\n" msgstr "" -#: ../git-debrebase:2621 +#: ../git-debrebase:2625 #, perl-format msgid "will stitch in dgit view, %s\n" msgstr "" -#: ../git-debrebase:2628 +#: ../git-debrebase:2632 #, perl-format msgid "" "Cannot confirm dgit view: %s\n" @@ -2604,12 +2622,12 @@ msgid "" "dgit --overwrite will be needed on the first dgit push after conversion.\n" msgstr "" -#: ../git-debrebase:2674 +#: ../git-debrebase:2678 #, perl-format msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n" msgstr "" -#: ../git-debrebase:2703 +#: ../git-debrebase:2707 #, perl-format msgid "" "%s: converted to git-buildpackage branch format\n" @@ -2617,16 +2635,16 @@ msgid "" "%s: WARNING: doing so would drop all upstream patches!\n" msgstr "" -#: ../git-debrebase:2724 +#: ../git-debrebase:2728 msgid "takes 1 optional argument, the upstream commitish" msgstr "" -#: ../git-debrebase:2732 +#: ../git-debrebase:2736 #, perl-format msgid "%s, from command line" msgstr "" -#: ../git-debrebase:2746 +#: ../git-debrebase:2750 #, perl-format msgid "" "%s: Branch already seems to be in git-debrebase format!\n" @@ -2634,84 +2652,84 @@ msgid "" "%s: but is probably a bad idea. Probably, you wanted to do nothing.\n" msgstr "" -#: ../git-debrebase:2750 +#: ../git-debrebase:2754 msgid "Branch already in git-debrebase format." msgstr "" -#: ../git-debrebase:2762 +#: ../git-debrebase:2766 msgid "Considering possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2769 +#: ../git-debrebase:2773 #, perl-format msgid "git tag %s" msgstr "" -#: ../git-debrebase:2775 +#: ../git-debrebase:2779 #, perl-format msgid " git tag: no suitable tag found (tried %s)\n" msgstr "" -#: ../git-debrebase:2784 +#: ../git-debrebase:2788 #, perl-format msgid "opendir build-products-dir %s: %s" msgstr "" -#: ../git-debrebase:2790 +#: ../git-debrebase:2794 #, perl-format msgid " orig: found what looks like a .orig, %s\n" msgstr "" -#: ../git-debrebase:2821 +#: ../git-debrebase:2825 #, perl-format msgid " orig: no suitable origs found (looked for %s in %s)\n" msgstr "" -#: ../git-debrebase:2830 +#: ../git-debrebase:2834 msgid "Evaluating possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2867 +#: ../git-debrebase:2871 #, perl-format msgid " %s: couldn't apply patches: gbp pq %s" msgstr "" -#: ../git-debrebase:2876 +#: ../git-debrebase:2880 #, perl-format msgid " %s: applying patches gives different tree\n" msgstr "" -#: ../git-debrebase:2890 +#: ../git-debrebase:2894 msgid "" "Could not find or construct a suitable upstream commit.\n" "Rerun adding --diagnose after convert-from-dgit-view, or pass a\n" "upstream commmit explicitly or provide suitable origs.\n" msgstr "" -#: ../git-debrebase:2896 +#: ../git-debrebase:2900 #, perl-format msgid "Yes, will base new branch on %s\n" msgstr "" -#: ../git-debrebase:2903 +#: ../git-debrebase:2907 msgid "forget-was-ever-debrebase takes no further arguments" msgstr "" -#: ../git-debrebase:2907 +#: ../git-debrebase:2911 #, perl-format msgid "Not suitable for recording git-debrebaseness anyway: %s" msgstr "" -#: ../git-debrebase:3009 +#: ../git-debrebase:3013 msgid "bad options\n" msgstr "" -#: ../git-debrebase:3019 +#: ../git-debrebase:3023 #, perl-format msgid "%s: no cuddling to -i for git-rebase" msgstr "" -#: ../git-debrebase:3049 +#: ../git-debrebase:3053 #, perl-format msgid "unknown git-debrebase sub-operation %s" msgstr "" @@ -2,14 +2,14 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the dgit package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2018. +# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2018, 2019. # msgid "" msgstr "" -"Project-Id-Version: dgit_8.1\n" +"Project-Id-Version: dgit_8.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-06 17:50+0000\n" -"PO-Revision-Date: 2018-12-05 20:40+0100\n" +"POT-Creation-Date: 2019-03-01 21:54+0000\n" +"PO-Revision-Date: 2019-01-19 20:58+0100\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n" "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n" "Language: nl\n" @@ -19,80 +19,79 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Gtranslator 2.91.7\n" -#: ../dgit:240 +#: ../dgit:242 #, perl-format msgid "%s: invalid configuration: %s\n" msgstr "%s: ongeldige configuratie: %s\n" -#: ../dgit:247 +#: ../dgit:249 msgid "warning: overriding problem due to --force:\n" msgstr "waarschuwing: overschrijvingsprobleem wegens --force:\n" -#: ../dgit:255 +#: ../dgit:257 #, perl-format msgid "warning: skipping checks or functionality due to --force-%s\n" msgstr "" "waarschuwing: controles of functionaliteit overgeslagen wegens --force-%s\n" -#: ../dgit:260 -#, fuzzy, perl-format -#| msgid "%s: package %s does not exist in suite %s\n" +#: ../dgit:262 +#, perl-format msgid "%s: source package %s does not exist in suite %s\n" -msgstr "%s: pakket %s bestaat niet in suite %s\n" +msgstr "%s: broncodepakket %s bestaat niet in suite %s\n" -#: ../dgit:483 +#: ../dgit:487 #, perl-format msgid "build host child %s" msgstr "bouwcomputer-dochter %s" -#: ../dgit:488 ../dgit:494 +#: ../dgit:492 ../dgit:498 #, perl-format msgid "connection lost: %s" msgstr "verbinding verbroken: %s" -#: ../dgit:489 +#: ../dgit:493 #, perl-format msgid "protocol violation; %s not expected" msgstr "protocolschending; %s werd niet verwacht" -#: ../dgit:497 +#: ../dgit:501 #, perl-format msgid "eof (reading %s)" msgstr "eof (bij het lezen van %s)" -#: ../dgit:504 +#: ../dgit:508 msgid "protocol message" msgstr "protocolbericht" -#: ../dgit:512 +#: ../dgit:516 #, perl-format msgid "`%s'" msgstr "`%s'" -#: ../dgit:533 +#: ../dgit:537 msgid "bad byte count" msgstr "aantal slechte bytes" -#: ../dgit:536 +#: ../dgit:540 msgid "data block" msgstr "gegevensblok" -#: ../dgit:617 +#: ../dgit:621 #, perl-format msgid "failed to fetch %s: %s" msgstr "ophalen (fetch) van %s mislukt: %s" -#: ../dgit:629 +#: ../dgit:633 #, perl-format msgid "%s ok: %s" msgstr "%s oké: %s" -#: ../dgit:631 +#: ../dgit:635 #, perl-format msgid "would be ok: %s (but dry run only)" msgstr "zou oké zijn: %s (maar slechts een testuitvoering)" -#: ../dgit:656 +#: ../dgit:660 msgid "" "main usages:\n" " dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n" @@ -132,13 +131,13 @@ msgstr "" " -c<naam>=<waarde> configuratieoptie instellen voor git\n" " (ook rechtstreeks gebruikt door dgit)\n" -#: ../dgit:675 +#: ../dgit:679 msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n" msgstr "" "Misschien zit de upload vast in incoming. De versie van git wordt " "gebruikt.\n" -#: ../dgit:679 +#: ../dgit:683 #, perl-format msgid "" "%s: %s\n" @@ -147,22 +146,22 @@ msgstr "" "%s: %s\n" "%s" -#: ../dgit:684 +#: ../dgit:688 msgid "too few arguments" msgstr "te weinig argumenten" -#: ../dgit:795 +#: ../dgit:799 #, perl-format msgid "multiple values for %s (in %s git config)" msgstr "verschillende waarden voor %s (in %s git config)" -#: ../dgit:798 +#: ../dgit:802 #, perl-format msgid "value for config option %s (in %s git config) contains newline(s)!" msgstr "" "waarde voor configuratieoptie %s (in %s git config) bevat regeleinde(s)!" -#: ../dgit:818 +#: ../dgit:822 #, perl-format msgid "" "need value for one of: %s\n" @@ -171,39 +170,39 @@ msgstr "" "heb waarde nodig voor één van: %s\n" "%s: distributie of suite lijkt niet (behoorlijk) ondersteund te worden" -#: ../dgit:859 +#: ../dgit:863 #, perl-format msgid "bad syntax for (nominal) distro `%s' (does not match %s)" msgstr "" "slechte syntaxis voor (nominale) distributie `%s' (komt niet overeen met %s)" -#: ../dgit:874 +#: ../dgit:878 #, perl-format msgid "backports-quirk needs % or ( )" msgstr "backports-spitsvondigheid vereist % of ( )" -#: ../dgit:890 +#: ../dgit:894 #, perl-format msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'" msgstr "%s vereist t (true, y, 1) of f (false, n, 0) en niet `%s'" -#: ../dgit:910 +#: ../dgit:914 msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)" msgstr "" "alleen-lezen (readonly) vereist t (true, y, 1) of f (false, n, 0) of een " "(auto)" -#: ../dgit:919 ../git-debrebase:1586 ../Debian/Dgit.pm:201 +#: ../dgit:923 ../git-debrebase:1586 ../Debian/Dgit.pm:201 msgid "internal error" msgstr "interne fout" -#: ../dgit:921 +#: ../dgit:925 msgid "pushing but distro is configured readonly" msgstr "" "bezig een push uit te voeren, maar de distributie is voor alleen-lezen " "geconfigureerd" -#: ../dgit:925 +#: ../dgit:929 msgid "" "Push failed, before we got started.\n" "You can retry the push, after fixing the problem, if you like.\n" @@ -212,13 +211,13 @@ msgstr "" "Als u wilt, kunt u de push opnieuw proberen nadat het probleem opgelost " "werd.\n" -#: ../dgit:1090 +#: ../dgit:1094 msgid "this operation does not support multiple comma-separated suites" msgstr "" "meerdere met een komma van elkaar gescheiden suites worden door deze " "bewerking niet ondersteund" -#: ../dgit:1136 +#: ../dgit:1140 #, perl-format msgid "" "config requested specific TLS key but do not know how to get curl to use " @@ -227,68 +226,68 @@ msgstr "" "de configuratie vereiste een specifieke TLS-sleutel, maar weet niet hoe curl " "ertoe te brengen exact die EE-sleutel (%s) te gebruiken" -#: ../dgit:1157 +#: ../dgit:1161 msgid "ftpmasterapi archive query method takes no data part" msgstr "" "de methode ftpmasterapi voor een verzoek aan het archief kent geen data-" "onderdeel" -#: ../dgit:1165 +#: ../dgit:1169 msgid "curl failed to print 3-digit HTTP code" msgstr "curl slaagde niet in het weergeven van een 3-cijferige HTTP-code" -#: ../dgit:1169 +#: ../dgit:1173 #, perl-format msgid "fetch of %s gave HTTP code %s" msgstr "een fetch van %s gaf HTTP-code %s" -#: ../dgit:1185 +#: ../dgit:1189 #, perl-format msgid "unknown suite %s, maybe -d would help" msgstr "onbekende suite %s, misschien is -d nuttig" -#: ../dgit:1189 +#: ../dgit:1193 #, perl-format msgid "multiple matches for suite %s\n" msgstr "meerdere overeenkomsten met suite %s\n" -#: ../dgit:1191 +#: ../dgit:1195 #, perl-format msgid "suite %s info has no codename\n" msgstr "info over suite %s bevat geen codenaam\n" -#: ../dgit:1193 +#: ../dgit:1197 #, perl-format msgid "suite %s maps to bad codename\n" msgstr "suite %s is gekoppeld aan een verkeerde codenaam\n" -#: ../dgit:1195 ../dgit:1220 +#: ../dgit:1199 ../dgit:1224 msgid "bad ftpmaster api response: " msgstr "verkeerd antwoord van de ftpmaster api:" -#: ../dgit:1209 +#: ../dgit:1213 #, perl-format msgid "bad version: %s\n" msgstr "verkeerde versie: %s\n" -#: ../dgit:1211 +#: ../dgit:1215 msgid "bad component" msgstr "verkeerde component" -#: ../dgit:1214 +#: ../dgit:1218 msgid "bad filename" msgstr "verkeerde bestandsnaam" -#: ../dgit:1216 +#: ../dgit:1220 msgid "bad sha256sum" msgstr "verkeerde sha256sum" -#: ../dgit:1267 +#: ../dgit:1271 msgid "aptget archive query method takes no data part" msgstr "" "de methode aptget voor een verzoek aan het archief kent geen data-onderdeel" -#: ../dgit:1351 +#: ../dgit:1355 #, perl-format msgid "" "apt seemed to not to update dgit's cached Release files for %s.\n" @@ -301,21 +300,21 @@ msgstr "" " zich op een bestandssysteem dat met `noatime' aangekoppeld is; mocht dit " "het geval zijn, gebruik dan `relatime'.)\n" -#: ../dgit:1373 +#: ../dgit:1377 #, perl-format msgid "Release file (%s) specifies intolerable %s" msgstr "Release-bestand (%s) vermeldt ontoelaatbaar %s" -#: ../dgit:1401 +#: ../dgit:1405 msgid "apt-get source did not produce a .dsc" msgstr "apt-get source produceerde geen .dsc-bestand" -#: ../dgit:1402 +#: ../dgit:1406 #, perl-format msgid "apt-get source produced several .dscs (%s)" msgstr "apt-get source produceerde verschillende .dsc-bestanden (%s)" -#: ../dgit:1507 +#: ../dgit:1511 #, perl-format msgid "" "unable to canonicalise suite using package %s which does not appear to exist " @@ -324,138 +323,138 @@ msgstr "" "niet in staat de suite ondubbelzinnig te bepalen met pakket %s dat blijkbaar " "niet bestaat in suite %s; --existing-package kan behulpzaam zijn" -#: ../dgit:1698 +#: ../dgit:1702 #, perl-format msgid "cannot operate on %s suite" msgstr "kan geen acties uitvoeren op suite %s" -#: ../dgit:1701 +#: ../dgit:1705 #, perl-format msgid "canonical suite name for %s is %s" msgstr "de gebruikelijke suitenaam voor %s is %s" -#: ../dgit:1703 +#: ../dgit:1707 #, perl-format msgid "canonical suite name is %s" msgstr "de gebruikelijke suitenaam is %s" -#: ../dgit:1723 +#: ../dgit:1727 #, perl-format msgid "%s has hash %s but archive told us to expect %s" msgstr "%s heeft hash %s maar volgens het archief moesten we %s verwachten" -#: ../dgit:1729 +#: ../dgit:1733 #, perl-format msgid "unsupported source format %s, sorry" msgstr "niet-ondersteunde broncode-indeling %s, sorry" -#: ../dgit:1756 +#: ../dgit:1760 #, perl-format msgid "diverting to %s (using config for %s)" msgstr "er wordt omgeschakeld naar %s (de configuratie voor %s wordt gebruikt)" -#: ../dgit:1773 +#: ../dgit:1777 msgid "unexpected results from git check query - " msgstr "het verzoek git check leverde onverwachte resultaten op - " -#: ../dgit:1788 +#: ../dgit:1792 #, perl-format msgid "unknown git-check `%s'" msgstr "onbekende git-check `%s'" -#: ../dgit:1803 +#: ../dgit:1807 #, perl-format msgid "unknown git-create `%s'" msgstr "onbekende git-create `%s'" -#: ../dgit:1840 +#: ../dgit:1844 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "%s: waarschuwing: wordt verwijderd van %s: %s\n" -#: ../dgit:1886 +#: ../dgit:1890 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "kon .dsc %s regel `%s' niet ontleden" -#: ../dgit:1897 +#: ../dgit:1901 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "een ondersteund Checksums-* of Files-veld ontbreekt in %s" -#: ../dgit:1943 +#: ../dgit:1947 #, perl-format msgid "hash or size of %s varies in %s fields (between: %s)" msgstr "hash of grootte van %s varieert in %s-velden (tussen: %s)" -#: ../dgit:1952 +#: ../dgit:1956 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "bestandenlijst in %s varieert tussen hash-velden!" -#: ../dgit:1956 +#: ../dgit:1960 #, perl-format msgid "%s has no files list field(s)" msgstr "%s bevat geen veld(en) met een bestandenlijst" -#: ../dgit:1962 +#: ../dgit:1966 #, perl-format msgid "no file appears in all file lists (looked in: %s)" msgstr "in geen enkele bestandenlijst komt een bestand voor (gezocht in: %s)" -#: ../dgit:2002 +#: ../dgit:2006 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "ogenschijnlijke source-only wijzigingen vervuild door %s\n" -#: ../dgit:2015 +#: ../dgit:2019 msgid "cannot find section/priority from .changes Files field" msgstr "" "kan sectie/prioriteit niet vinden in het veld Files van het .changes-bestand" -#: ../dgit:2028 +#: ../dgit:2032 msgid "" "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n" msgstr "" "archief ondersteunt controle van .orig niet; hopelijk gebruikte u zo nodig --" "ch:--sa/-sd\n" -#: ../dgit:2044 +#: ../dgit:2048 #, perl-format msgid ".dsc %s missing entry for %s" msgstr ".dsc %s mist een item voor %s" -#: ../dgit:2049 +#: ../dgit:2053 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "%s: %s (archief) != %s (lokale .dsc)" -#: ../dgit:2057 +#: ../dgit:2061 #, perl-format msgid "archive %s: %s" msgstr "archief %s: %s" -#: ../dgit:2064 +#: ../dgit:2068 #, perl-format msgid "archive contains %s with different checksum" msgstr "archief bevat %s met een andere checksum" -#: ../dgit:2092 +#: ../dgit:2096 #, perl-format msgid "edited .changes for archive .orig contents: %s %s" msgstr "bewerkte .changes voor de inhoud van .orig van het archief: %s %s" -#: ../dgit:2100 +#: ../dgit:2104 #, perl-format msgid "[new .changes left in %s]" msgstr "[nieuwe .changes achtergelaten in %s]" -#: ../dgit:2103 +#: ../dgit:2107 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "%s heeft reeds passende .orig(s) (indien van toepassing)" -#: ../dgit:2127 +#: ../dgit:2131 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " @@ -464,7 +463,7 @@ msgstr "" "onverwachte indeling `%s' van de auteursregel van de commit (werd " "gegenereerd uit het Maintainer-veld in changelog)" -#: ../dgit:2150 +#: ../dgit:2154 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -491,7 +490,7 @@ msgstr "" "dat verschillende distributies andere broncode hebben).\n" "\n" -#: ../dgit:2162 +#: ../dgit:2166 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" @@ -499,112 +498,110 @@ msgstr "" "Vond een actief distributiespecifiek series-bestand voor %s (%s): %s, kan " "niet voortgaan" -#: ../dgit:2193 +#: ../dgit:2197 msgid "Dpkg::Vendor `current vendor'" msgstr "Dpkg::Vendor `current vendor'" -#: ../dgit:2195 +#: ../dgit:2199 msgid "(base) distro being accessed" msgstr "(basis)-distributie wordt benaderd" -#: ../dgit:2197 +#: ../dgit:2201 msgid "(nominal) distro being accessed" msgstr "(nominale) distributie wordt benaderd" -#: ../dgit:2202 -#, fuzzy, perl-format -#| msgid "opendir build-products-dir %s: %s" +#: ../dgit:2206 +#, perl-format msgid "build-products-dir %s is not accessible: %s\n" -msgstr "opendir build-products-dir %s: %s" +msgstr "build-products-dir %s is niet toegankelijk: %s\n" -#: ../dgit:2227 +#: ../dgit:2231 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" msgstr "" +"%s: orig(s) gevonden in .. welke ontbreken in build-products-dir, bezig met " +"overbrengen:\n" -#: ../dgit:2231 +#: ../dgit:2235 #, perl-format msgid "check orig file %s in bpd %s: %s" -msgstr "" +msgstr "controleer orig-bestand %s in bpd %s: %s" -#: ../dgit:2233 -#, fuzzy, perl-format -#| msgid "missing field %s in %s" +#: ../dgit:2237 +#, perl-format msgid "check orig file %s in ..: %s" -msgstr "ontbrekend veld %s in %s" +msgstr "controleer orig-bestand %s in ..: %s" -#: ../dgit:2236 +#: ../dgit:2240 #, perl-format -msgid "check targe of orig symlink %s in ..: %s" -msgstr "" +msgid "check target of orig symlink %s in ..: %s" +msgstr "controleer doel van orig-symbolische koppeling %s in ..: %s" -#: ../dgit:2245 -#, fuzzy, perl-format -#| msgid "%s: warning: removing from %s: %s\n" +#: ../dgit:2249 +#, perl-format msgid "%s: cloned orig symlink from ..: %s\n" -msgstr "%s: waarschuwing: wordt verwijderd van %s: %s\n" +msgstr "%s: orig-symbolische koppeling gekloond van ..: %s\n" -#: ../dgit:2249 -#, fuzzy, perl-format -#| msgid "%s: warning: removing from %s: %s\n" +#: ../dgit:2253 +#, perl-format msgid "%s: hardlinked orig from ..: %s\n" -msgstr "%s: waarschuwing: wordt verwijderd van %s: %s\n" +msgstr "%s: vast gekoppelde orig van ..: %s\n" -#: ../dgit:2252 -#, fuzzy, perl-format -#| msgid "failed to mkdir a playground %s: %s" +#: ../dgit:2256 +#, perl-format msgid "failed to make %s a hardlink to %s: %s" -msgstr "mkdir van een speelplaats %s mislukte: %s" +msgstr "niet gelukt om %s een vaste koppeling naar %s te maken: %s" -#: ../dgit:2258 +#: ../dgit:2262 #, perl-format msgid "%s: symmlinked orig from .. on other filesystem: %s\n" msgstr "" +"%s: symbolisch gekoppelde orig van .. op een ander bestandssysteem: %s\n" -#: ../dgit:2290 ../dgit:2295 +#: ../dgit:2294 ../dgit:2299 #, perl-format msgid "accessing %s: %s" msgstr "bezig met benaderen van %s: %s" -#: ../dgit:2310 ../dgit:2317 +#: ../dgit:2314 ../dgit:2321 #, perl-format msgid "saving %s: %s" msgstr "bezig met opslaan van %s: %s" -#: ../dgit:2382 +#: ../dgit:2386 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "dgit (dochter): exec %s: %s" -#: ../dgit:2446 ../dgit:5970 +#: ../dgit:2450 ../dgit:5974 msgid "source package" msgstr "broncodepakket" -#: ../dgit:2464 +#: ../dgit:2468 msgid "package changelog" msgstr "changelog van het pakket" -#: ../dgit:2504 +#: ../dgit:2508 msgid "package changelog has no entries!" msgstr "het changelog-bestand van het pakket bevat geen vermeldingen!" -#: ../dgit:2523 +#: ../dgit:2527 #, perl-format msgid "Import %s" msgstr "Importeren van %s" -#: ../dgit:2604 +#: ../dgit:2608 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "%s: langzame absurd-git-apply wordt gebruikt..." -#: ../dgit:2623 +#: ../dgit:2627 #, perl-format msgid "%s failed: %s\n" msgstr "%s mislukte: %s\n" -#: ../dgit:2632 +#: ../dgit:2636 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -617,21 +614,21 @@ msgstr "" " gbp-pq import gaf boom %s\n" " dpkg-source --before-build gaf boom %s\n" -#: ../dgit:2647 +#: ../dgit:2651 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "git commit samengesteld vanuit .dsc %s" -#: ../dgit:2651 +#: ../dgit:2655 msgid "Import of source package" msgstr "Importeren van broncodepakket" -#: ../dgit:2664 +#: ../dgit:2668 #, perl-format msgid "Record %s (%s) in archive suite %s\n" msgstr "Gegeven %s (%s) uit archiefsuite %s\n" -#: ../dgit:2668 +#: ../dgit:2672 #, perl-format msgid "" "\n" @@ -644,12 +641,12 @@ msgstr "" "Laatste versie die met dgit gepusht werd : %s (recentere of dezelfde)\n" "%s\n" -#: ../dgit:2710 +#: ../dgit:2714 #, perl-format msgid "using existing %s" msgstr "bestaande %s wordt gebruikt" -#: ../dgit:2714 +#: ../dgit:2718 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " @@ -658,12 +655,12 @@ msgstr "" "bestand %s heeft hash %s maar .dsc vereist hash %s (moet u misschien dit " "bestand verwijderen?)" -#: ../dgit:2718 +#: ../dgit:2722 #, perl-format msgid "need to fetch correct version of %s" msgstr "moet de juiste versie van %s ophalen met fetch" -#: ../dgit:2734 +#: ../dgit:2738 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" @@ -671,24 +668,24 @@ msgstr "" "bestand %s heeft hash %s maar .dsc vereist hash %s (verkreeg een verkeerd " "bestand van het archief!)" -#: ../dgit:2829 +#: ../dgit:2833 msgid "too many iterations trying to get sane fetch!" msgstr "te veel pogingen om een foutloze fetch te bekomen!" -#: ../dgit:2844 +#: ../dgit:2848 #, perl-format msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n" msgstr "" "waarschuwing: git ls-remote %s rapporteerde %s; dit is onzinnig, wordt " "genegeerd.\n" -#: ../dgit:2888 +#: ../dgit:2892 #, perl-format msgid "warning: git fetch %s created %s; this is silly, deleting it.\n" msgstr "" "waarschuwing: git fetch %s creëerde %s; dit is onzinnig, wordt verwijderd.\n" -#: ../dgit:2903 +#: ../dgit:2907 msgid "" "--dry-run specified but we actually wanted the results of git fetch,\n" "so this is not going to work. Try running dgit fetch first,\n" @@ -698,7 +695,7 @@ msgstr "" "git fetch, dus dit zal niet werken. Probeer eerst git fetch uit te voeren,\n" "of --damp-run te gebruiken in plaats van --dry-run.\n" -#: ../dgit:2908 +#: ../dgit:2912 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -714,44 +711,44 @@ msgstr "" "waarschuwing: Is mogelijk te wijten aan een race met iemand die de server\n" "waarschuwing: bijwerkt. Zal later opnieuw proberen...\n" -#: ../dgit:2975 +#: ../dgit:2979 #, perl-format msgid "Not updating %s from %s to %s.\n" msgstr "%s wordt niet opgewaardeerd van %s naar %s.\n" -#: ../dgit:3024 +#: ../dgit:3028 #, perl-format msgid "%s: NO git hash" msgstr "%s: GEEN hash van git" -#: ../dgit:3028 +#: ../dgit:3032 #, perl-format msgid "%s: specified git info (%s)" msgstr "%s: git info werd opgegeven (%s)" -#: ../dgit:3035 +#: ../dgit:3039 #, perl-format msgid "%s: specified git hash" msgstr "%s: git hash werd opgegeven" -#: ../dgit:3037 +#: ../dgit:3041 #, perl-format msgid "%s: invalid Dgit info" msgstr "%s: ongeldige Dgit info" -#: ../dgit:3059 +#: ../dgit:3063 #, perl-format msgid "not chasing .dsc distro %s: not fetching %s" msgstr "" "ben niet bezig met achter .dsc van distributie %s aan te gaan: %s wordt niet " "gehaald" -#: ../dgit:3064 +#: ../dgit:3068 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr ".dsc vernoemt distributie %s: %s wordt opgehaald" -#: ../dgit:3069 +#: ../dgit:3073 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -760,7 +757,7 @@ msgstr "" "De Dgit-metadata van .dsc zijn in de context van distributie %s\n" "waarvoor we geen geconfigureerde url hebben en .dsc geeft geen aanwijzing\n" -#: ../dgit:3079 +#: ../dgit:3083 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -773,30 +770,30 @@ msgstr "" ".dsc geeft een aanduiding voor een url met het onveilige protocol %s.\n" "(kan door de configuratie overschreven worden - raadpleeg de documentatie)\n" -#: ../dgit:3099 +#: ../dgit:3103 msgid "rewrite map" -msgstr "modificatieplan (rewrite map) " +msgstr "modificatieplan (rewrite map)" -#: ../dgit:3106 +#: ../dgit:3110 msgid "server's git history rewrite map contains a relevant entry!" msgstr "" "het modificatieplan (rewrite map) van de git-geschiedenis op de server bevat " "een relevant element!" -#: ../dgit:3110 +#: ../dgit:3114 msgid "using rewritten git hash in place of .dsc value" msgstr "de gemodificeerde git hash wordt gebruikt in plaats van de .dsc-waarde" -#: ../dgit:3112 +#: ../dgit:3116 msgid "server data says .dsc hash is to be disregarded" msgstr "" "de gegevens van de server zeggen dat de .dsc-hash genegeerd moet worden" -#: ../dgit:3119 +#: ../dgit:3123 msgid "additional commits" msgstr "extra vastleggingen (commits)" -#: ../dgit:3122 +#: ../dgit:3126 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" @@ -805,27 +802,27 @@ msgstr "" "De Dgit-metadata uit .dsc vereist commit %s\n" "maar we konden dat object nergens bekomen.\n" -#: ../dgit:3147 +#: ../dgit:3151 msgid "last upload to archive" msgstr "laatste upload naar het archief" -#: ../dgit:3151 +#: ../dgit:3155 msgid "no version available from the archive" msgstr "geen versie beschikbaar uit het archief" -#: ../dgit:3234 +#: ../dgit:3238 msgid "dgit suite branch on dgit git server" msgstr "dgit suite-tak op dgit git-server" -#: ../dgit:3241 +#: ../dgit:3245 msgid "dgit client's archive history view" msgstr "dgit - weergave geschiedenis van cliëntarchief" -#: ../dgit:3246 +#: ../dgit:3250 msgid "Dgit field in .dsc from archive" msgstr "Dgit-veld in het .dsc uit het archief" -#: ../dgit:3274 +#: ../dgit:3278 #, perl-format msgid "" "\n" @@ -841,15 +838,15 @@ msgstr "" "Laatste versie die met dgit gepusht werd: %s\n" "%s\n" -#: ../dgit:3287 +#: ../dgit:3291 msgid "archive .dsc names newer git commit" msgstr ".dsc van het archief vermeldt een recentere git commit" -#: ../dgit:3290 +#: ../dgit:3294 msgid "archive .dsc names other git commit, fixing up" msgstr ".dsc van het archief vermeldt een andere git commit, wordt gerepareerd" -#: ../dgit:3311 +#: ../dgit:3315 #, perl-format msgid "" "\n" @@ -861,7 +858,7 @@ msgstr "" "dgit.\n" "%s\n" -#: ../dgit:3320 +#: ../dgit:3324 #, perl-format msgid "" "\n" @@ -876,7 +873,7 @@ msgstr "" "Maar we konden geen enkele versie bekomen uit het archief of uit git.\n" "\n" -#: ../dgit:3405 +#: ../dgit:3409 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -887,19 +884,19 @@ msgstr "" "\n" "Gegeven dat\n" -#: ../dgit:3418 +#: ../dgit:3422 msgid "should be treated as descended from\n" msgstr "behandeld zou moeten worden als afstammend van\n" -#: ../dgit:3436 +#: ../dgit:3440 msgid "dgit repo server tip (last push)" msgstr "tip van de dgit-opslagplaats op de server (laatste push)" -#: ../dgit:3438 +#: ../dgit:3442 msgid "local tracking tip (last fetch)" msgstr "tip van de lokale kopie (laatste fetch)" -#: ../dgit:3449 +#: ../dgit:3453 #, perl-format msgid "" "\n" @@ -915,15 +912,15 @@ msgstr "" "We waren slechts in staat om %s te bekomen\n" "\n" -#: ../dgit:3464 +#: ../dgit:3468 msgid "fetched source tree" msgstr "broncodeboom opgehaald" -#: ../dgit:3500 +#: ../dgit:3504 msgid "debian/changelog merge driver" msgstr "stuurprogramma voor samenvoeging van debian/changelog" -#: ../dgit:3565 +#: ../dgit:3569 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" @@ -931,16 +928,16 @@ msgstr "" "[attr]dgit-defuse-attrs reeds gevonden in .git/info/attributes, en geschikt\n" " gitattributes wordt niet verder ingesteld\n" -#: ../dgit:3579 +#: ../dgit:3583 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n" msgstr "# ^ zie GITATTRIBUTES in dgit(7) en dgit setup-new-tree in dgit(1)\n" -#: ../dgit:3594 +#: ../dgit:3598 #, perl-format msgid "install %s: %s" msgstr "installeren van %s: %s" -#: ../dgit:3621 +#: ../dgit:3625 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -951,32 +948,32 @@ msgstr "" "dgit: .gitattributes niet (volledig) geneutraliseerd. Aanbevolen: dgit " "setup-new-tree.\n" -#: ../dgit:3643 +#: ../dgit:3647 #, perl-format msgid "fetching %s..." msgstr "ophalen van %s..." -#: ../dgit:3651 +#: ../dgit:3655 #, perl-format msgid "failed to obtain %s: %s" msgstr "verkrijgen van %s mislukte: %s" -#: ../dgit:3690 +#: ../dgit:3694 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "pakket %s ontbreekt in (basissuite) %s" -#: ../dgit:3722 +#: ../dgit:3726 msgid "local combined tracking branch" msgstr "lokale gecombineerde navolgende tak (tracking branch)" -#: ../dgit:3724 +#: ../dgit:3728 msgid "archive seems to have rewound: local tracking branch is ahead!" msgstr "" "het archief lijkt teruggespoeld te hebben: de lokale navolgende tak loopt " "voorop!" -#: ../dgit:3763 +#: ../dgit:3767 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -987,7 +984,7 @@ msgstr "" "\n" "Invoertakken:\n" -#: ../dgit:3777 +#: ../dgit:3781 msgid "" "\n" "Key\n" @@ -1001,34 +998,34 @@ msgstr "" " + markeert elke tak die niet reeds een voorouder was\n" "\n" -#: ../dgit:3792 +#: ../dgit:3796 #, perl-format msgid "calculated combined tracking suite %s" msgstr "berekende gecombineerde navolgende suite %s" -#: ../dgit:3810 +#: ../dgit:3814 #, perl-format msgid "ready for work in %s" msgstr "klaar om te werken in %s" -#: ../dgit:3818 +#: ../dgit:3822 msgid "dry run makes no sense with clone" msgstr "dry run is zinloos met clone" -#: ../dgit:3833 +#: ../dgit:3837 #, perl-format msgid "create `%s': %s" msgstr "creëren van `%s': %s" -#: ../dgit:3849 +#: ../dgit:3853 msgid "fetching existing git history" msgstr "ophalen van bestaande git-geschiedenis" -#: ../dgit:3853 +#: ../dgit:3857 msgid "starting new git history" msgstr "starten van een nieuwe git-geschiedenis" -#: ../dgit:3879 +#: ../dgit:3883 #, perl-format msgid "" "FYI: Vcs-Git in %s has different url to your vcs-git remote.\n" @@ -1038,33 +1035,33 @@ msgstr "" " De url voor uw externe vcs-git zou verouderd kunnen zijn. Misschien dgit " "update-vcs-git gebruiken?\n" -#: ../dgit:3884 +#: ../dgit:3888 #, perl-format msgid "fetched into %s" msgstr "opgehaald naar %s" -#: ../dgit:3896 +#: ../dgit:3900 #, perl-format msgid "Merge from %s [dgit]" msgstr "Samenvoegen vanuit %s [dgit]" -#: ../dgit:3898 +#: ../dgit:3902 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "opgehaald naar %s samengevoegd naar HEAD" -#: ../dgit:3906 +#: ../dgit:3910 #, perl-format msgid "git tree contains %s" msgstr "git-boom bevat %s" -#: ../dgit:3917 +#: ../dgit:3921 msgid "you have uncommitted changes to critical files, cannot continue:\n" msgstr "" "u heeft niet-vastgelegde wijzigingen in cruciale bestanden, kan niet " "voortgaan:\n" -#: ../dgit:3936 +#: ../dgit:3940 #, perl-format msgid "" "quilt fixup required but quilt mode is `nofix'\n" @@ -1073,15 +1070,15 @@ msgstr "" "er is een quilt fixup vereist, maar de quilt-modus is `nofix'\n" "HEAD commit%s verschilt van de boom die uit debian/patches%s volgt" -#: ../dgit:3953 +#: ../dgit:3957 msgid "nothing quilty to commit, ok." msgstr "niets quilt-achtig vast te leggen, oké." -#: ../dgit:3956 +#: ../dgit:3960 msgid " (wanted to commit patch update)" msgstr " (wilde een patch-update vastleggen)" -#: ../dgit:3960 +#: ../dgit:3964 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" @@ -1089,7 +1086,7 @@ msgstr "" "Vastleggen van (commit) Debian 3.0 (quilt) metadata\n" "\n" -#: ../dgit:4003 +#: ../dgit:4007 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" @@ -1097,60 +1094,60 @@ msgstr "" "Opknappen van `%s' wordt niet gedaan, wegens ----no-quilt-fixup of --" "quilt=nocheck" -#: ../dgit:4008 +#: ../dgit:4012 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "Indeling `%s', moet de patch-stack nakijken/bijwerken" -#: ../dgit:4018 +#: ../dgit:4022 #, perl-format msgid "commit id %s" msgstr "vastleggings-id (commit id) %s" -#: ../dgit:4024 +#: ../dgit:4028 #, perl-format msgid "and left in %s" msgstr "en achtergelaten in %s" -#: ../dgit:4050 +#: ../dgit:4054 #, perl-format msgid "Wanted tag %s (%s) on dgit server, but not found\n" msgstr "Wenste tag %s (%s) op de dgit-server, maar niet gevonden\n" -#: ../dgit:4053 +#: ../dgit:4057 #, perl-format msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n" msgstr "Wenste tag %s (één van: %s) op de dgit-server, maar niet gevonden\n" -#: ../dgit:4061 +#: ../dgit:4065 #, perl-format msgid "%s (%s) .. %s (%s) is not fast forward\n" msgstr "" "%s (%s) .. %s (%s) is niet fast forward (geen lineaire " "veranderingsgeschiedenis)\n" -#: ../dgit:4070 +#: ../dgit:4074 msgid "version currently in archive" msgstr "momenteel in het archief aanwezige versie" -#: ../dgit:4079 +#: ../dgit:4083 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" "Het changlog-bestand van het pakket wordt gecontroleerd op archiefversie " "%s ..." -#: ../dgit:4087 +#: ../dgit:4091 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "veld %s van dpkg-parsechangelog %s" -#: ../dgit:4097 +#: ../dgit:4101 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "Vermeldt debian/changelog misschien %s niet?" -#: ../dgit:4100 +#: ../dgit:4104 #, perl-format msgid "" "%s is %s\n" @@ -1159,81 +1156,81 @@ msgstr "" "%s is %s\n" "Uw boom lijkt gebaseerd op een eerdere (niet geüploade) %s.\n" -#: ../dgit:4114 +#: ../dgit:4118 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "Bezig te verklaren dat HEAD alle wijzigingen uit %s omvat..." -#: ../dgit:4170 +#: ../dgit:4174 msgid "Checking that HEAD includes all changes in archive..." msgstr "" "Bezig te controleren dat HEAD alle wijzigingen uit het archief omvat..." -#: ../dgit:4179 +#: ../dgit:4183 msgid "maintainer view tag" msgstr "tag weergave pakketonderhouder" -#: ../dgit:4181 +#: ../dgit:4185 msgid "dgit view tag" msgstr "tag weergave dgit" -#: ../dgit:4182 +#: ../dgit:4186 msgid "current archive contents" msgstr "huidige inhoud van het archief" -#: ../dgit:4195 +#: ../dgit:4199 msgid "" "| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n" msgstr "" "| Niet fast forward (geen lineaire geschiedenis); is misschien --overwrite " "nodig? Raadpleeg dgit(1).\n" -#: ../dgit:4205 +#: ../dgit:4209 #, perl-format msgid "Declare fast forward from %s\n" msgstr "Lineair (fast forward) declareren vanuit %s\n" -#: ../dgit:4206 +#: ../dgit:4210 #, perl-format msgid "Make fast forward from %s\n" msgstr "Lineair (fast forward) maken vanuit %s\n" -#: ../dgit:4210 +#: ../dgit:4214 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "Maakte een pseudo-samenvoeging van %s in de dgit-weergave." -#: ../dgit:4223 +#: ../dgit:4227 #, perl-format msgid "Declare fast forward from %s" msgstr "Lineair (fast forward) declareren vanuit %s" -#: ../dgit:4231 +#: ../dgit:4235 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "Pseudo-samenvoeging maken van %s naar uw HEAD." -#: ../dgit:4243 +#: ../dgit:4247 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "-p gaf %s op, maar het changelog-bestand vermeldde %s" -#: ../dgit:4265 +#: ../dgit:4269 #, perl-format msgid "%s is for %s %s but debian/changelog is for %s %s" msgstr "%s is voor %s %s maar debian/changelog is voor %s %s" -#: ../dgit:4326 +#: ../dgit:4330 #, perl-format msgid "changes field %s `%s' does not match changelog `%s'" msgstr "het changes-veld %s `%s' komt niet overeen met `%s' uit changelog" -#: ../dgit:4354 +#: ../dgit:4358 #, perl-format msgid "%s release %s for %s (%s) [dgit]\n" msgstr "%s release %s voor %s (%s) [dgit]\n" -#: ../dgit:4367 +#: ../dgit:4371 #, perl-format msgid "" "%s release %s for %s (%s)\n" @@ -1242,7 +1239,7 @@ msgstr "" "%s release %s voor %s (%s)\n" "(tag 'maintainer view' gegenereerd door dgit --quilt=%s)\n" -#: ../dgit:4419 +#: ../dgit:4423 msgid "" "Push failed, while checking state of the archive.\n" "You can retry the push, after fixing the problem, if you like.\n" @@ -1251,14 +1248,14 @@ msgstr "" "Indien u wenst, kunt u de push opnieuw proberen, na het oplossen van het " "probleem.\n" -#: ../dgit:4428 +#: ../dgit:4432 msgid "" "package appears to be new in this suite; if this is intentional, use --new" msgstr "" "het pakket lijkt in deze suite nieuw te zijn; als dit ook de bedoeling is, " "gebruik dan --new" -#: ../dgit:4433 +#: ../dgit:4437 msgid "" "Push failed, while preparing your push.\n" "You can retry the push, after fixing the problem, if you like.\n" @@ -1267,12 +1264,12 @@ msgstr "" "Indien u wenst, kunt u de push opnieuw proberen, na het oplossen van het " "probleem.\n" -#: ../dgit:4456 +#: ../dgit:4460 #, perl-format msgid "looked for .dsc %s, but %s; maybe you forgot to build" msgstr "zocht naar .dsc %s, maar %s; misschien vergat u te bouwen" -#: ../dgit:4473 +#: ../dgit:4477 #, perl-format msgid "" "Branch is managed by git-debrebase (%s\n" @@ -1285,7 +1282,7 @@ msgstr "" "Gebruik de juiste --quilt-optie of pas uw git config aan.\n" "Of voer misschien git-debrebase forget-was-ever-debrebase uit.\n" -#: ../dgit:4497 +#: ../dgit:4501 #, perl-format msgid "" "--quilt=%s but no cached dgit view:\n" @@ -1294,7 +1291,7 @@ msgstr "" "--quilt=%s maar geen gecachete dgit-weergave:\n" " werd HEAD misschien gewijzigd sinds dgit build[-source]?" -#: ../dgit:4528 +#: ../dgit:4532 msgid "" "dgit push: HEAD is not a descendant of the archive's version.\n" "To overwrite the archive's contents, pass --overwrite[=VERSION].\n" @@ -1307,17 +1304,17 @@ msgstr "" "Om de geschiedenis terug te spoelen, als het archief dat toestaat, gebruikt " "u --deliberately-not-fast-forward." -#: ../dgit:4538 +#: ../dgit:4542 #, perl-format msgid "checking that %s corresponds to HEAD" msgstr "bezig na te gaan dat %s overeenkomt met HEAD" -#: ../dgit:4572 ../dgit:4584 +#: ../dgit:4576 ../dgit:4588 #, perl-format msgid "HEAD specifies a different tree to %s:\n" msgstr "HEAD geeft een andere boom op aan %s:\n" -#: ../dgit:4578 +#: ../dgit:4582 #, perl-format msgid "" "There is a problem with your source tree (see dgit(7) for some hints).\n" @@ -1326,7 +1323,7 @@ msgstr "" "Er is een probleem met uw broncodeboom (zie dgit(7) voor suggesties).\n" "Om alle verschillen te zien, gebruikt u git diff %s %s\n" -#: ../dgit:4588 +#: ../dgit:4592 #, perl-format msgid "" "Perhaps you forgot to build. Or perhaps there is a problem with your\n" @@ -1338,7 +1335,7 @@ msgstr "" "zien,\n" " gebruikt u git diff %s %s\n" -#: ../dgit:4599 +#: ../dgit:4603 #, perl-format msgid "" "failed to find unique changes file (looked for %s in %s); perhaps you need " @@ -1347,19 +1344,19 @@ msgstr "" "kon geen uniek changes-bestand vinden (zocht naar %s in %s); misschien moet " "u dgit -C gebruiken" -#: ../dgit:4621 +#: ../dgit:4625 msgid "uploading binaries, although distro policy is source only" msgstr "" "bezig met uploaden van binaire pakketten, hoewel het beleid van de " "distributie uitsluitend broncode (source only) voorschrijft" -#: ../dgit:4625 +#: ../dgit:4629 msgid "source-only upload, although distro policy requires .debs" msgstr "" "upload van uitsluitend broncode (source-only), hoewel het beleid van de " "distributie .deb's vereist" -#: ../dgit:4629 +#: ../dgit:4633 #, perl-format msgid "" "source-only upload, even though package is entirely NEW\n" @@ -1369,12 +1366,12 @@ msgstr "" "is\n" "(dit is in tegenspraak met de beleidsrichtlijnen in %s)" -#: ../dgit:4636 +#: ../dgit:4640 #, perl-format msgid "unknown source-only-uploads policy `%s'" msgstr "onbekende source-only-uploads beleidsrichtlijn `%s'" -#: ../dgit:4680 +#: ../dgit:4684 msgid "" "Push failed, while signing the tag.\n" "You can retry the push, after fixing the problem, if you like.\n" @@ -1383,7 +1380,7 @@ msgstr "" "Indien u dit wenst, kunt u de push opnieuw proberen na het oplossen van het " "probleem.\n" -#: ../dgit:4693 +#: ../dgit:4697 msgid "" "Push failed, *after* signing the tag.\n" "If you want to try again, you should use a new version number.\n" @@ -1392,7 +1389,7 @@ msgstr "" "Indien u opnieuw wenst te proberen, moet u een nieuw versienummer " "gebruiken.\n" -#: ../dgit:4710 +#: ../dgit:4714 msgid "" "Push failed, while updating the remote git repository - see messages above.\n" "If you want to try again, you should use a new version number.\n" @@ -1402,7 +1399,7 @@ msgstr "" "Indien u opnieuw wenst te proberen, moet u een nieuw versienummer " "gebruiken.\n" -#: ../dgit:4727 +#: ../dgit:4731 msgid "" "Push failed, while obtaining signatures on the .changes and .dsc.\n" "If it was just that the signature failed, you may try again by using\n" @@ -1420,84 +1417,84 @@ msgstr "" "Indien u het pakket moet aanpassen, moet u een nieuw versienummer " "gebruiken.\n" -#: ../dgit:4758 +#: ../dgit:4762 #, perl-format msgid "pushed and uploaded %s" msgstr "%s gepusht en geüpload" -#: ../dgit:4770 +#: ../dgit:4774 msgid "-p is not allowed with clone; specify as argument instead" msgstr "" "-p mag niet met clone gebruikt worden; geef het in de plaats daarvan op als " "argument" -#: ../dgit:4781 +#: ../dgit:4785 msgid "incorrect arguments to dgit clone" msgstr "incorrecte argumenten voor dgit clone" -#: ../dgit:4787 ../git-debrebase:1839 +#: ../dgit:4791 ../git-debrebase:1839 #, perl-format msgid "%s already exists" msgstr "%s bestaat reeds" -#: ../dgit:4801 +#: ../dgit:4805 #, perl-format msgid "remove %s: %s\n" msgstr "verwijder %s: %s\n" -#: ../dgit:4805 +#: ../dgit:4809 #, perl-format msgid "check whether to remove %s: %s\n" msgstr "controleer of %s moet verwijderd worden: %s\n" -#: ../dgit:4843 +#: ../dgit:4847 msgid "incorrect arguments to dgit fetch or dgit pull" msgstr "incorrecte argumenten voor dgit fetch of dgit pull" -#: ../dgit:4860 +#: ../dgit:4864 #, perl-format msgid "dgit pull not yet supported in split view mode (--quilt=%s)\n" msgstr "" "dgit pull wordt in gesplitste weergavemodus (--quilt=%s) nog niet " "ondersteund\n" -#: ../dgit:4869 +#: ../dgit:4873 msgid "dgit checkout needs a suite argument" msgstr "dgit checkout heeft een suite nodig als argument" -#: ../dgit:4931 +#: ../dgit:4935 #, perl-format msgid "setting up vcs-git: %s\n" msgstr "bezig met opzetten van vcs-git: %s\n" -#: ../dgit:4934 +#: ../dgit:4938 #, perl-format msgid "vcs git already configured: %s\n" msgstr "vcs git is reeds geconfigureerd: %s\n" -#: ../dgit:4936 +#: ../dgit:4940 #, perl-format msgid "changing vcs-git url to: %s\n" msgstr "url van vcs-git wordt veranderd naar: %s\n" -#: ../dgit:4941 +#: ../dgit:4945 #, perl-format msgid "fetching (%s)\n" msgstr "bezig met ophalen (%s)\n" -#: ../dgit:4956 +#: ../dgit:4960 #, perl-format msgid "incorrect arguments to dgit %s" msgstr "incorrecte argumenten voor dgit %s" -#: ../dgit:4967 +#: ../dgit:4971 #, perl-format msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s" msgstr "" "dgit %s: het changelog-bestand vermeldt %s (%s), maar op de commandoregel " "wordt %s opgegeven" -#: ../dgit:5005 +#: ../dgit:5009 #, perl-format msgid "" "build host has dgit rpush protocol versions %s but invocation host has %s" @@ -1505,34 +1502,34 @@ msgstr "" "de protocolversies van dgit rpush op de bouwcomputer zijn %s, maar die van " "de aanroepende computer zijn %s" -#: ../dgit:5085 +#: ../dgit:5089 #, perl-format msgid "create %s: %s" msgstr "maak %s aan: %s" -#: ../dgit:5122 +#: ../dgit:5126 #, perl-format msgid "build host child failed: %s" msgstr "dochterproces op de bouwcomputer faalde: %s" -#: ../dgit:5125 +#: ../dgit:5129 msgid "all done\n" msgstr "alles klaar\n" -#: ../dgit:5134 +#: ../dgit:5138 #, perl-format msgid "file %s (%s) twice" msgstr "bestand %s (%s) tweemaal" -#: ../dgit:5142 +#: ../dgit:5146 msgid "bad param spec" msgstr "slechte parameter-spec" -#: ../dgit:5148 +#: ../dgit:5152 msgid "bad previously spec" msgstr "slechte vroegere spec" -#: ../dgit:5167 +#: ../dgit:5171 #, perl-format msgid "" "rpush negotiated protocol version %s which does not support quilt mode %s" @@ -1540,45 +1537,45 @@ msgstr "" "de onderhandeling van rpush leverde protocolversie %s op, welke quilt-modus " "%s niet ondersteunt" -#: ../dgit:5212 +#: ../dgit:5216 #, perl-format msgid "buildinfo mismatch in field %s" msgstr "buildinfo-incongruentie in veld %s" -#: ../dgit:5215 +#: ../dgit:5219 #, perl-format msgid "buildinfo contains forbidden field %s" msgstr "buildinfo bevat ongeoorloofd veld %s" -#: ../dgit:5256 +#: ../dgit:5260 msgid "remote changes file" msgstr "extern changes-bestand" -#: ../dgit:5331 +#: ../dgit:5335 msgid "not a plain file or symlink\n" msgstr "geen echt bestand of symbolische koppeling\n" -#: ../dgit:5337 +#: ../dgit:5341 msgid "mode or type changed\n" msgstr "modus of type gewijzigd\n" -#: ../dgit:5338 +#: ../dgit:5342 msgid "modified symlink\n" msgstr "symbolische koppeling gewijzigd\n" -#: ../dgit:5341 +#: ../dgit:5345 msgid "deletion of symlink\n" msgstr "verwijdering van symbolische koppeling\n" -#: ../dgit:5345 +#: ../dgit:5349 msgid "creation with non-default mode\n" msgstr "creatie met een niet-standaard modus\n" -#: ../dgit:5375 +#: ../dgit:5379 msgid "dgit view: changes are required..." msgstr "dgit-weergave: er zijn wijzigingen vereist..." -#: ../dgit:5404 +#: ../dgit:5408 #, perl-format msgid "" "\n" @@ -1589,7 +1586,7 @@ msgstr "" "Voor een volledige diff die het/de probl(e)em(en) laat zien, typt u:\n" " %s\n" -#: ../dgit:5411 +#: ../dgit:5415 #, perl-format msgid "" "--quilt=%s specified, implying patches-unapplied git tree\n" @@ -1599,7 +1596,7 @@ msgstr "" " (een git-boom zonder dat de patches toegepast worden)\n" " maar de git-boom verschilt van orig in de toeleveraarsbestanden." -#: ../dgit:5417 +#: ../dgit:5421 msgid "" "\n" " ... debian/patches is missing; perhaps this is a patch queue branch?" @@ -1608,7 +1605,7 @@ msgstr "" " ... debian/patches ontbreekt; is dit misschien een tak met een patch-" "wachtrij?" -#: ../dgit:5424 +#: ../dgit:5428 #, perl-format msgid "" "--quilt=%s specified, implying patches-applied git tree\n" @@ -1619,12 +1616,12 @@ msgstr "" " maar de git-boom verschilt van het resultaat van het toepassen van\n" " debian/patches op de broncode van de toeleveraar.\n" -#: ../dgit:5431 +#: ../dgit:5435 msgid "dgit view: creating patches-applied version using gbp pq" msgstr "" "dgit-weergave: met gbp pq wordt een versie met toegepaste patches gemaakt" -#: ../dgit:5440 +#: ../dgit:5444 #, perl-format msgid "" "--quilt=%s specified, implying that HEAD is for use with a\n" @@ -1635,20 +1632,20 @@ msgstr "" " te worden met een hulpmiddel dat geen patches maakt om .gitignores van de\n" " toeleveraar te wijzigen: maar debian/patches heeft wel dergelijke patches.\n" -#: ../dgit:5449 +#: ../dgit:5453 msgid "dgit view: creating patch to represent .gitignore changes" msgstr "" "dgit-weergave: een patch wordt gemaakt om de wijzigingen aan .gitignore te " "representeren" -#: ../dgit:5454 +#: ../dgit:5458 #, perl-format msgid "%s already exists; but want to create it to record .gitignore changes" msgstr "" "%s bestaat reeds; maar wil het aanmaken om de wijzigingen aan .gitignore op " "te tekenen" -#: ../dgit:5459 +#: ../dgit:5463 msgid "" "Subject: Update .gitignore from Debian packaging branch\n" "\n" @@ -1663,43 +1660,43 @@ msgstr "" "gegenereerd om deze updates ter beschikking te stellen van gebruikers van\n" "de weergave van het pakket uit het officiële Debian-archief.\n" -#: ../dgit:5481 +#: ../dgit:5485 msgid "Commit patch to update .gitignore\n" msgstr "Commit (vastleggen) van patch om .gitignore bij te werken\n" -#: ../dgit:5495 +#: ../dgit:5499 msgid "converted" msgstr "omgezet" -#: ../dgit:5496 +#: ../dgit:5500 #, perl-format msgid "dgit view: created (%s)" msgstr "dgit-weergave: gecreëerd: (%s)" -#: ../dgit:5561 +#: ../dgit:5565 msgid "maximum search space exceeded" msgstr "maximale zoekruimte overschreden" -#: ../dgit:5579 +#: ../dgit:5583 #, perl-format msgid "has %s not %s" msgstr "bevat %s, niet %s" -#: ../dgit:5588 +#: ../dgit:5592 msgid "root commit" msgstr "beginvastlegging (root commit)" -#: ../dgit:5594 +#: ../dgit:5598 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "samenvoeging (merge) (%s niet-triviale ouders)" -#: ../dgit:5606 +#: ../dgit:5610 #, perl-format msgid "changed %s" msgstr "gewijzigd: %s" -#: ../dgit:5625 +#: ../dgit:5629 #, perl-format msgid "" "\n" @@ -1708,23 +1705,23 @@ msgstr "" "\n" "%s: fout: een quilt fixup kan niet lineair zijn. Gestopt bij:\n" -#: ../dgit:5632 +#: ../dgit:5636 #, perl-format msgid "%s: %s: %s\n" msgstr "%s: %s: %s\n" -#: ../dgit:5644 +#: ../dgit:5648 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" "lineair maken van de quilt-geschiedenis mislukte. Zoek naar `quilt fixup' in " "dgit(7).\n" -#: ../dgit:5647 +#: ../dgit:5651 msgid "quilt fixup cannot be linear, smashing..." msgstr "" "de quilt fixup kan niet lineair zijn, de smash strategie wordt gebruikt..." -#: ../dgit:5659 +#: ../dgit:5663 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1735,72 +1732,72 @@ msgstr "" "Laatste (tot en met) %s git-wijzigingen, ter informatie:\n" "\n" -#: ../dgit:5666 +#: ../dgit:5670 msgid "quiltify linearisation planning successful, executing..." msgstr "linearisatieplanning voor quiltify was succesvol, wordt uitgevoerd..." -#: ../dgit:5700 +#: ../dgit:5704 msgid "contains unexpected slashes\n" msgstr "bevat onverwachte slashes\n" -#: ../dgit:5701 +#: ../dgit:5705 msgid "contains leading punctuation\n" msgstr "bevat leestekens aan het begin\n" -#: ../dgit:5702 +#: ../dgit:5706 msgid "contains bad character(s)\n" msgstr "bevat foutieve teken(s)\n" -#: ../dgit:5703 +#: ../dgit:5707 msgid "is series file\n" msgstr "is een series-bestand\n" -#: ../dgit:5704 +#: ../dgit:5708 msgid "too long\n" msgstr "te lang\n" -#: ../dgit:5708 +#: ../dgit:5712 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" "quiltifying commit (quiltificerende vastlegging) %s: Gbp-Pq %s wordt " "genegeerd/weggelaten: %s" -#: ../dgit:5737 +#: ../dgit:5741 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "dgit: fout bij de transliteratie van de patch-titel: %s" -#: ../dgit:5880 +#: ../dgit:5884 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" "Vastleggingsverwijdering (commit removal) van .pc (quilt-seriegegevens)\n" -#: ../dgit:5890 +#: ../dgit:5894 msgid "starting quiltify (single-debian-patch)" msgstr "quiltify wordt gestart (één enkele debian-patch)" -#: ../dgit:5992 +#: ../dgit:5996 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" "dgit: gespleten brein (aparte dgit-weergave) is mogelijk nodig (--quilt=%s)." -#: ../dgit:6023 +#: ../dgit:6027 #, perl-format msgid "dgit view: found cached (%s)" msgstr "dgit-weergave: gecachete (%s) aangetroffen" -#: ../dgit:6028 +#: ../dgit:6032 msgid "dgit view: found cached, no changes required" msgstr "dgit-weergave: gecachete aangetroffen, geen wijzigingen vereist" -#: ../dgit:6039 +#: ../dgit:6043 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "toestand van quilt wordt nagegaan (meerdere patches, %s-modus)" -#: ../dgit:6130 +#: ../dgit:6134 msgid "" "failed to apply your git tree's patch stack (from debian/patches/) to\n" " the corresponding upstream tarball(s). Your source tree and .orig\n" @@ -1814,16 +1811,16 @@ msgstr "" " dgit can enkel bepaalde soorten anomalieën repareren\n" " (afhankelijk van de quilt-modus). Raadpleeg --quilt= in dgit(1).\n" -#: ../dgit:6144 +#: ../dgit:6148 msgid "Tree already contains .pc - will use it then delete it." msgstr "Boom bevat reeds een .pc - zal dit gebruiken en dan verwijderen." -#: ../dgit:6181 +#: ../dgit:6185 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "%s: van de basisbomen zijn orig=%.20s en o+d/p=%.20s" -#: ../dgit:6184 +#: ../dgit:6188 #, perl-format msgid "" "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n" @@ -1832,49 +1829,49 @@ msgstr "" "%s: quilt-verschillen: src: %s orig %s gitignores: %s orig %s\n" "%s: quilt-verschillen: HEAD %s o+d/p HEAD %s o+d/p" -#: ../dgit:6190 +#: ../dgit:6194 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "dgit: kan wijziging niet representeren: %s: %s\n" -#: ../dgit:6194 +#: ../dgit:6198 msgid "" "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" msgstr "" "HEAD bevat wijzigingen aan .orig[s] welke niet door `3.0 (quilt)' vertolkt " "kunnen worden\n" -#: ../dgit:6201 +#: ../dgit:6205 msgid "This might be a patches-unapplied branch." msgstr "Dit is mogelijk een tak zonder toepassing van patches." -#: ../dgit:6204 +#: ../dgit:6208 msgid "This might be a patches-applied branch." msgstr "Dit is mogelijk een tak met toegepaste patches." -#: ../dgit:6207 +#: ../dgit:6211 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" "Heeft u mogelijk een van de volgende opties nodig: --[quilt=]gbp --" "[quilt=]dpm --quilt=unapplied ?" -#: ../dgit:6210 +#: ../dgit:6214 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" "Waarschuwing: Boom bevat .gitattributes. Zie GITATTRIBUTES in dgit(7)." -#: ../dgit:6214 +#: ../dgit:6218 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" "Is/zijn het/de orig-tararchie(f)(ven) misschien niet identiek aan de " "representatie ervan door git?" -#: ../dgit:6223 +#: ../dgit:6227 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "quiltify wordt gestart (meerdere patches, %s-modus)" -#: ../dgit:6261 +#: ../dgit:6265 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1889,122 +1886,117 @@ msgstr "" "dgit: (Overweeg het gebruik van --clean=git en (of) dgit sbuild.)\n" "\n" -#: ../dgit:6273 +#: ../dgit:6277 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" "dgit: Bezig toepassen van patches terug ongedaan te maken om de boom op te " "schonen." -#: ../dgit:6302 -#, fuzzy -#| msgid "" -#| "%s\n" -#| "If this is just missing .gitignore entries, use a different clean\n" -#| "mode, eg --clean=dpkg-source,no-check (-wdu/-wddu) to ignore them\n" -#| "or --clean=git (-wg/-wgf) to use `git clean' instead.\n" +#: ../dgit:6306 msgid "" "If this is just missing .gitignore entries, use a different clean\n" "mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them\n" "or --clean=git (-wg/-wgf) to use `git clean' instead.\n" msgstr "" -"%s\n" "Indien het enkel ontbrekende .gitignore-items betreft, gebruik dan een " "andere\n" -"clean-modus, bijv. --clean=dpkg-source,no-check (-wdu/-wddu) om deze te\n" +"clean-modus, bijv. --clean=dpkg-source,no-check (-wdn/-wddn) om deze te\n" "negeren, of --clean=git (-wg/-wgf) om in de plaats `git clean' te " "gebruiken.\n" -#: ../dgit:6314 +#: ../dgit:6318 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" "de boom bevat niet-vastgelegde bestanden en --clean=check werd opgegeven" -#: ../dgit:6317 +#: ../dgit:6321 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" "de boom bevat niet-vastgelegde bestanden (NB dgit voerde geen rules clean " "uit)" -#: ../dgit:6320 +#: ../dgit:6324 msgid "" "tree contains uncommited, untracked, unignored files\n" "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." msgstr "" +"de boom bevat niet-vastgelegde, niet-gevolgde, niet-genegeerde bestanden\n" +"U kunt --clean=git[-ff],always (-wga/-wgfa) gebruiken om ze te verwijderen." -#: ../dgit:6338 +#: ../dgit:6342 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" "de boom bevat niet-vastgelegde bestanden (na het uitvoeren van rules clean)" -#: ../dgit:6352 +#: ../dgit:6356 msgid "clean takes no additional arguments" msgstr "met clean kunnen geen extra argumenten opgegeven worden" -#: ../dgit:6365 +#: ../dgit:6369 #, perl-format msgid "-p is not allowed with dgit %s" msgstr "-p is niet toegestaan met dgit %s" -#: ../dgit:6404 +#: ../dgit:6408 #, perl-format msgid "remove old changes file %s: %s" msgstr "verwijder oud changes-bestand %s: %s" -#: ../dgit:6406 +#: ../dgit:6410 #, perl-format msgid "would remove %s" msgstr "zou %s verwijderen" -#: ../dgit:6432 +#: ../dgit:6436 msgid "archive query failed (queried because --since-version not specified)" msgstr "" "mislukt verzoek aan het archief (verzoek gedaan omdat --since-version niet " "opgegeven werd)" -#: ../dgit:6438 +#: ../dgit:6442 #, perl-format msgid "changelog will contain changes since %s" msgstr "changelog zal wijzigingen sinds %s bevatten" -#: ../dgit:6441 +#: ../dgit:6445 msgid "package seems new, not specifying -v<version>" msgstr "pakket lijkt nieuw te zijn, geen vermelding van -v<versie>" -#: ../dgit:6484 +#: ../dgit:6488 msgid "Wanted to build nothing!" msgstr "Wilde niets bouwen!" -#: ../dgit:6522 +#: ../dgit:6526 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "slechts één changes-bestand van bouw (%s)\n" -#: ../dgit:6529 +#: ../dgit:6533 #, perl-format msgid "%s found in binaries changes file %s" msgstr "%s aangetroffen in changes-bestand %s van de binaire pakketten" -#: ../dgit:6536 +#: ../dgit:6540 #, perl-format msgid "%s unexpectedly not created by build" msgstr "%s tegen de verwachtingen in niet gecreëerd door de bouw" -#: ../dgit:6540 +#: ../dgit:6544 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "installeer nieuw changes %s{,.inmulti}: %s" -#: ../dgit:6545 +#: ../dgit:6549 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "fout nummer van verschillende changes-bestanden (%s)" -#: ../dgit:6548 +#: ../dgit:6552 #, perl-format msgid "build successful, results in %s\n" msgstr "bouw was succesvol, resultaten in %s\n" -#: ../dgit:6561 +#: ../dgit:6565 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -2016,11 +2008,11 @@ msgstr "" "resultaat.\n" "De suggestie is dat u %s verwijdert.\n" -#: ../dgit:6579 +#: ../dgit:6583 msgid "build successful\n" msgstr "de bouw was succesvol\n" -#: ../dgit:6586 +#: ../dgit:6590 #, perl-format msgid "" "%s: warning: build-products-dir set, but not supported by dpkg-buildpackage\n" @@ -2031,30 +2023,30 @@ msgstr "" "%s: waarschuwing: build-products-dir zal genegeerd worden; bestanden zullen " "gaan naar ..\n" -#: ../dgit:6696 +#: ../dgit:6700 #, perl-format msgid "remove %s: %s" msgstr "verwijder %s: %s" -#: ../dgit:6731 +#: ../dgit:6735 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "--include-dirty niet ondersteund met --build-products-dir, sorry" -#: ../dgit:6751 +#: ../dgit:6755 #, perl-format msgid "put in place new built file (%s): %s" msgstr "zet nieuw gebouwd bestand (%s) op zijn plaats: %s" -#: ../dgit:6764 +#: ../dgit:6768 msgid "build-source takes no additional arguments" msgstr "build-source moet zonder bijkomende argumenten gebruikt worden" -#: ../dgit:6768 +#: ../dgit:6772 #, perl-format msgid "source built, results in %s and %s" msgstr "broncodepakket is gebouwd, resultaten in %s en %s" -#: ../dgit:6775 +#: ../dgit:6779 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" @@ -2062,21 +2054,21 @@ msgstr "" "dgit push-source: --include-dirty/--ignore-dirty zijn zinloos met push-" "source!" -#: ../dgit:6781 +#: ../dgit:6785 msgid "source changes file" msgstr "broncode-changes-bestand" -#: ../dgit:6783 +#: ../dgit:6787 msgid "user-specified changes file is not source-only" msgstr "" "door de gebruiker opgegeven changes-bestand is niet 'uitsluitend broncode'" -#: ../dgit:6803 ../dgit:6805 +#: ../dgit:6807 ../dgit:6809 #, perl-format msgid "%s (in build products dir): %s" msgstr "%s (in bouwproductenmap): %s" -#: ../dgit:6818 +#: ../dgit:6822 msgid "" "perhaps you need to pass -A ? (sbuild's default is to build only\n" "arch-specific binaries; dgit 1.4 used to override that.)\n" @@ -2085,7 +2077,7 @@ msgstr "" "specifieke\n" "binaire pakketten te bouwen; dgit 1.4 was gewend dit te overschrijven.)\n" -#: ../dgit:6830 +#: ../dgit:6834 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" @@ -2093,7 +2085,7 @@ msgstr "" "u vroeg een bouwprogramma maar uw debbuildopts vroeg geen enkel binair " "pakket - is dit echt wat u bedoelde?" -#: ../dgit:6834 +#: ../dgit:6838 msgid "" "we must build a .dsc to pass to the builder but your debbuiltopts forbids " "the building of a source package; cannot continue" @@ -2102,65 +2094,65 @@ msgstr "" "debbuiltopts verbiedt het bouwen van een broncodepakket; voortgaan is " "onmogelijk" -#: ../dgit:6864 +#: ../dgit:6868 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "foutieve argumenten voor dgit print-unapplied-treeish" -#: ../dgit:6886 +#: ../dgit:6890 msgid "source tree" msgstr "broncodeboom" -#: ../dgit:6888 +#: ../dgit:6892 #, perl-format msgid "dgit: import-dsc: %s" msgstr "dgit: import-dsc: %s" -#: ../dgit:6901 +#: ../dgit:6905 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "onbekende onderliggende optie `%s' voor dgit import-dsc" -#: ../dgit:6905 +#: ../dgit:6909 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "gebruik: dgit import-dsc .../PAD/NAAR/.DSC TAK" -#: ../dgit:6909 +#: ../dgit:6913 msgid "dry run makes no sense with import-dsc" msgstr "testuitvoering (dry run) is zinloos met import-dsc" -#: ../dgit:6926 +#: ../dgit:6930 #, perl-format msgid "%s is checked out - will not update it" msgstr "%s is binnengehaald (checked out) - zal het niet bijwerken" -#: ../dgit:6931 +#: ../dgit:6935 #, perl-format msgid "open import .dsc (%s): %s" msgstr "open import-.dsc (%s): %s" -#: ../dgit:6933 +#: ../dgit:6937 #, perl-format msgid "read %s: %s" msgstr "lees %s: %s" -#: ../dgit:6944 +#: ../dgit:6948 msgid "import-dsc signature check failed" msgstr "controle ondertekening van import-dsc mislukte" -#: ../dgit:6947 +#: ../dgit:6951 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "%s: waarschuwing: niet-ondertekend .dsc wordt geïmporteerd\n" -#: ../dgit:6958 +#: ../dgit:6962 msgid "Dgit metadata in .dsc" msgstr "Dgit-metadata in .dsc" -#: ../dgit:6969 +#: ../dgit:6973 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "dgit: import-dsc van .dsc met Dgit-veld, met behulp van git hash" -#: ../dgit:6978 +#: ../dgit:6982 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -2171,21 +2163,21 @@ msgstr "" "Uw git-boom bevat dat object niet. Gebruik `git fetch' van een aannemelijke\n" "server (browse.dgit.d.o? salsa?) en probeer import-dsc opnieuw.\n" -#: ../dgit:6985 +#: ../dgit:6989 msgid "Not fast forward, forced update." msgstr "Niet lineair (fast forward), gedwongen update." -#: ../dgit:6987 +#: ../dgit:6991 #, perl-format msgid "Not fast forward to %s" msgstr "Niet lineair (fast forward) naar %s" -#: ../dgit:6992 +#: ../dgit:6996 #, perl-format msgid "updated git ref %s" msgstr "git ref %s geüpdatet" -#: ../dgit:6997 +#: ../dgit:7001 #, perl-format msgid "" "Branch %s already exists\n" @@ -2197,98 +2189,93 @@ msgstr "" "geschiedenis\n" "Geef +%s op om te overschrijven en bestaande geschiedenis te verwijderen\n" -#: ../dgit:7009 +#: ../dgit:7021 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "lstat %s werkt maar stat geeft %s !" -#: ../dgit:7011 +#: ../dgit:7023 #, perl-format msgid "stat %s: %s" msgstr "stat %s: %s" -#: ../dgit:7019 -#, perl-format -msgid "cannot import %s which seems to be inside working tree!" -msgstr "kan %s niet importeren, het lijkt in de werkboom te zitten!" - -#: ../dgit:7023 -#, perl-format -msgid "import %s requires .../%s, but it does not exist" -msgstr "importeren van %s vereist .../%s, maar dit bestaat niet" - -#: ../dgit:7028 +#: ../dgit:7031 #, perl-format msgid "import %s requires %s, but: %s" msgstr "importeren van %s vereist %s, maar: %s" -#: ../dgit:7030 +#: ../dgit:7050 +#, perl-format +msgid "cannot import %s which seems to be inside working tree!" +msgstr "kan %s niet importeren, het lijkt in de werkboom te zitten!" + +#: ../dgit:7054 #, perl-format msgid "symlink %s to %s: %s" msgstr "symbolische koppeling %s naar %s: %s" -#: ../dgit:7031 +#: ../dgit:7055 #, perl-format msgid "made symlink %s -> %s" msgstr "maakte symbolische koppeling %s -> %s" -#: ../dgit:7042 +#: ../dgit:7066 msgid "Import, forced update - synthetic orphan git history." msgstr "Import, gedwongen update - kunstmatige verweesde git-geschiedenis." -#: ../dgit:7044 +#: ../dgit:7068 msgid "Import, merging." msgstr "Import, bezig met samenvoegen." -#: ../dgit:7058 +#: ../dgit:7082 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "Invoegen van import %s (%s) in %s\n" -#: ../dgit:7067 +#: ../dgit:7091 #, perl-format msgid "results are in git ref %s" msgstr "resultaten staan in git ref %s" -#: ../dgit:7074 +#: ../dgit:7098 msgid "need only 1 subpath argument" msgstr "slechts 1 argument met een onderliggend pad nodig" -#: ../dgit:7080 +#: ../dgit:7104 #, perl-format msgid "exec curl: %s\n" msgstr "exec curl: %s\n" -#: ../dgit:7094 +#: ../dgit:7118 msgid "need destination argument" msgstr "bestemmingsargument nodig" -#: ../dgit:7099 +#: ../dgit:7123 #, perl-format msgid "exec git clone: %s\n" msgstr "exec git clone: %s\n" -#: ../dgit:7107 +#: ../dgit:7131 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url" msgstr "geen argumenten toegelaten bij dgit print-dgit-repos-server-source-url" -#: ../dgit:7118 +#: ../dgit:7142 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "geen argumenten toegelaten bij dgit print-dpkg-source-ignores" -#: ../dgit:7124 +#: ../dgit:7148 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "geen argumenten toegelaten bij dgit setup-mergechangelogs" -#: ../dgit:7131 ../dgit:7137 +#: ../dgit:7155 ../dgit:7161 msgid "no arguments allowed to dgit setup-useremail" msgstr "geen argumenten toegelaten bij dgit setup-useremail" -#: ../dgit:7143 +#: ../dgit:7167 msgid "no arguments allowed to dgit setup-tree" msgstr "geen argumenten toegelaten bij dgit setup-tree" -#: ../dgit:7190 +#: ../dgit:7214 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." @@ -2296,42 +2283,42 @@ msgstr "" "--initiator-tempdir moet gebruikt worden om een absolute, geen relatieve map " "op te geven." -#: ../dgit:7229 +#: ../dgit:7253 #, perl-format msgid "%s needs a value" msgstr "%s moet een waarde hebben" -#: ../dgit:7233 +#: ../dgit:7257 #, perl-format msgid "bad value `%s' for %s" msgstr "foute waarde `%s' voor %s" -#: ../dgit:7324 +#: ../dgit:7348 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "%s: waarschuwing: onbekende force-optie %s wordt genegeerd\n" -#: ../dgit:7344 +#: ../dgit:7368 #, perl-format msgid "unknown long option `%s'" msgstr "onbekende lange optie `%s'" -#: ../dgit:7399 +#: ../dgit:7423 #, perl-format msgid "unknown short option `%s'" msgstr "onbekende korte optie `%s'" -#: ../dgit:7414 +#: ../dgit:7438 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "%s staat ingesteld op iets anders dan SIG_DFL\n" -#: ../dgit:7418 +#: ../dgit:7442 #, perl-format msgid "%s is blocked\n" msgstr "%s is geblokkeerd\n" -#: ../dgit:7424 +#: ../dgit:7448 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -2342,65 +2329,53 @@ msgstr "" "Dit is een bug die veroorzaakt wordt door iets in uw uitvoeringsomgeving.\n" "Er wordt opgegeven.\n" -#: ../dgit:7441 +#: ../dgit:7465 #, perl-format msgid "cannot set command for %s" msgstr "kan commando voor %s niet instellen" -#: ../dgit:7454 +#: ../dgit:7478 #, perl-format msgid "cannot configure options for %s" msgstr "kan opties voor %s niet configureren" -#: ../dgit:7474 +#: ../dgit:7498 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "onbekende quilt-modus `%s'" -#: ../dgit:7484 +#: ../dgit:7508 #, perl-format msgid "unknown %s setting `%s'" msgstr "onbekende %s dat `%s' instelt" -#: ../dgit:7489 +#: ../dgit:7513 msgid "dgit: --include-dirty is not supported in split view quilt mode" msgstr "" "dgit: --include-dirty wordt niet ondersteund in de quilt-modus gesplitste " "weergave" -#: ../dgit:7500 +#: ../dgit:7524 #, perl-format msgid "unknown clean-mode `%s'" msgstr "onbekende clean-modus `%s'" -#: ../dgit:7521 +#: ../dgit:7545 msgid "DRY RUN ONLY\n" msgstr "ENKEL TESTUITVOERING (DRY RUN)\n" -#: ../dgit:7522 +#: ../dgit:7546 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" "GETEMPERDE UITVOERING (DAMP RUN) - ZAL LOKALE (NIET-ONDERTEKENDE) " "WIJZIGINGEN MAKEN\n" -#: ../dgit:7541 +#: ../dgit:7565 #, perl-format msgid "unknown operation %s" msgstr "onbekende bewerking %s" #: ../git-debrebase:44 -#, fuzzy -#| msgid "" -#| "usages:\n" -#| " git-debrebase [<options>] [--|-i <git rebase options...>]\n" -#| " git-debrebase [<options>] status\n" -#| " git-debrebase [<options>] prepush [--prose=...]\n" -#| " git-debrebase [<options>] quick|conclude\n" -#| " git-debrebase [<options>] new-upstream <new-version> [<details ...>]\n" -#| " git-debrebase [<options>] convert-from-gbp [<upstream-commitish>]\n" -#| " ...\n" -#| "See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in " -#| "dgit).\n" msgid "" "usages:\n" " git-debrebase [<options>] [--|-i <git rebase options...>]\n" @@ -2418,7 +2393,7 @@ msgstr "" " git-debrebase [<opties>] prepush [--prose=...]\n" " git-debrebase [<opties>] quick|conclude\n" " git-debrebase [<opties>] new-upstream <nieuwe-versie> [<details ...>]\n" -" git-debrebase [<opties>] convert-from-gbp [<toeleveraars-commitish>]\n" +" git-debrebase [<opties>] convert-from-* ...\n" " ...\n" "Zie git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit).\n" @@ -2730,7 +2705,7 @@ msgstr "Afkondigen lineair (fast forward) / optekenen vorig werk" msgid "No ffq-prev to stitch." msgstr "Geen ffq-prev om te borduren." -#: ../git-debrebase:2016 +#: ../git-debrebase:2017 #, perl-format msgid "" "Could not determine appropriate upstream commitish.\n" @@ -2741,35 +2716,35 @@ msgstr "" " (Probeerde deze tags: %s)\n" " Controleer versie en geef toeleveraar-commitish expliciet op." -#: ../git-debrebase:2033 +#: ../git-debrebase:2036 msgid "need NEW-VERSION [UPS-COMMITTISH]" msgstr "heb NIEUWE-VERSIE [TOEL-COMMITTISH] nodig" -#: ../git-debrebase:2038 +#: ../git-debrebase:2041 #, perl-format msgid "bad version number `%s'" msgstr "fout versienummer `%s'" -#: ../git-debrebase:2055 +#: ../git-debrebase:2059 #, perl-format msgid "upstream piece `%s'" msgstr "toeleveraarsstuk `%s'" -#: ../git-debrebase:2056 +#: ../git-debrebase:2060 msgid "upstream (main piece" msgstr "van de toeleveraar (belangrijkste stuk" -#: ../git-debrebase:2076 +#: ../git-debrebase:2080 msgid "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH" msgstr "voor elke EXTRA-TOEL-NAAM is een EXTRA-TOEL-COMMITISH nodig" -#: ../git-debrebase:2094 +#: ../git-debrebase:2098 msgid "old anchor is recognised due to --anchor, cannot check upstream" msgstr "" "oud anker werd herkend omwille van --anchor, kan niet controleren bij " "toeleveraar" -#: ../git-debrebase:2110 +#: ../git-debrebase:2114 #, perl-format msgid "" "previous upstream combine %s mentions %d pieces (each implying one parent) " @@ -2779,14 +2754,14 @@ msgstr "" "(hetgeen voor elk ervan één ouder impliceert) maar heeft %d ouders (één per " "stuk plus misschien een eerdere combinatie)" -#: ../git-debrebase:2119 +#: ../git-debrebase:2123 #, perl-format msgid "previous upstream combine %s first piece is not `.'" msgstr "" "eerste stuk van vorige toeleveraarscombinatie (upstream combine) %s is niet " "`.'" -#: ../git-debrebase:2132 +#: ../git-debrebase:2136 #, perl-format msgid "" "previous upstream %s is from git-debrebase but not an `upstream-combine' " @@ -2795,118 +2770,118 @@ msgstr "" "vorige toeleveraarsvastlegging %s is van git-debrebase maar geen `upstream-" "combine'-vastlegging" -#: ../git-debrebase:2143 +#: ../git-debrebase:2147 #, perl-format msgid "introducing upstream piece `%s'" msgstr "toeleveraarsstuk `%s' wordt ingevoerd" -#: ../git-debrebase:2146 +#: ../git-debrebase:2150 #, perl-format msgid "dropping upstream piece `%s'" msgstr "toeleveraarsstuk `%s' wordt weggelaten" -#: ../git-debrebase:2149 +#: ../git-debrebase:2153 #, perl-format msgid "not fast forward: %s %s" msgstr "niet lineair (fast forward): %s %s" -#: ../git-debrebase:2260 +#: ../git-debrebase:2264 msgid "Previous head already recorded\n" msgstr "Vorige head reeds opgenomen\n" -#: ../git-debrebase:2264 +#: ../git-debrebase:2268 #, perl-format msgid "Could not preserve: %s" msgstr "Niet in staat te behouden: %s" -#: ../git-debrebase:2269 ../git-debrebase:2275 ../git-debrebase:2281 -#: ../git-debrebase:2371 ../git-debrebase:2380 ../git-debrebase:2404 -#: ../git-debrebase:2468 +#: ../git-debrebase:2273 ../git-debrebase:2279 ../git-debrebase:2285 +#: ../git-debrebase:2375 ../git-debrebase:2384 ../git-debrebase:2408 +#: ../git-debrebase:2472 msgid "no arguments allowed" msgstr "geen argumenten toegelaten" -#: ../git-debrebase:2303 +#: ../git-debrebase:2307 msgid "branch contains furniture (not laundered)" msgstr "tak bevat stoffering (niet gewassen)" -#: ../git-debrebase:2304 +#: ../git-debrebase:2308 msgid "branch is unlaundered" msgstr "tak is ongewassen (unlaundered)" -#: ../git-debrebase:2305 +#: ../git-debrebase:2309 msgid "branch needs laundering" msgstr "tak heeft wasbeurt nodig" -#: ../git-debrebase:2306 +#: ../git-debrebase:2310 msgid "branch not in git-debrebase form" msgstr "tak is niet in git-debrebase-indeling" -#: ../git-debrebase:2316 +#: ../git-debrebase:2320 msgid "current branch contents, in git-debrebase terms:\n" msgstr "inhoud van de huidige tak, in git-debrebase-terminologie:\n" -#: ../git-debrebase:2318 +#: ../git-debrebase:2322 msgid " branch is laundered\n" msgstr " tak is gewassen\n" -#: ../git-debrebase:2334 +#: ../git-debrebase:2338 #, perl-format msgid " %s is not well-defined\n" msgstr " %s is niet goed gedefinieerd\n" -#: ../git-debrebase:2340 +#: ../git-debrebase:2344 msgid "key git-debrebase commits:\n" msgstr "kern-git-debrebase-vastleggingen:\n" -#: ../git-debrebase:2341 +#: ../git-debrebase:2345 msgid "anchor" msgstr "anker" -#: ../git-debrebase:2342 +#: ../git-debrebase:2346 msgid "breakwater" msgstr "golfbreker (breakwater)" -#: ../git-debrebase:2347 +#: ../git-debrebase:2351 msgid "branch and ref status, in git-debrebase terms:\n" msgstr "toestand van tak en ref, in git-debrebase-terminologie:\n" -#: ../git-debrebase:2354 +#: ../git-debrebase:2358 msgid " unstitched; previous tip was:\n" msgstr " borduursel losgemaakt; vorige tip was:\n" -#: ../git-debrebase:2357 +#: ../git-debrebase:2361 msgid " stitched? (no record of git-debrebase work)\n" msgstr " geborduurd? (geen registratie van git-debrebase-werk)\n" -#: ../git-debrebase:2359 +#: ../git-debrebase:2363 msgid " stitched\n" msgstr " geborduurd\n" -#: ../git-debrebase:2361 +#: ../git-debrebase:2365 msgid " not git-debrebase (diverged since last stitch)\n" msgstr " geen git-debrebase (uiteengelopen sinds laatste borduursel)\n" -#: ../git-debrebase:2364 +#: ../git-debrebase:2368 msgid "you are currently rebasing\n" msgstr "u bent momenteel aan het rebasen\n" -#: ../git-debrebase:2381 ../git-debrebase:2394 +#: ../git-debrebase:2385 ../git-debrebase:2398 msgid "launder for git-debrebase quick" msgstr "wassen voor git-debrebase quick" -#: ../git-debrebase:2388 ../git-debrebase:2418 +#: ../git-debrebase:2392 ../git-debrebase:2422 msgid "No ongoing git-debrebase session." msgstr "Geen lopende git-debrebase-sessie." -#: ../git-debrebase:2457 +#: ../git-debrebase:2461 msgid "Commit patch queue (exported by git-debrebase)" msgstr "Vastlegging patch-wachtrij (geëxporteerd door git-debrebase)" -#: ../git-debrebase:2474 +#: ../git-debrebase:2478 msgid "No (more) patches to export." msgstr "Geen (andere) patches die geëxporteerd moeten worden." -#: ../git-debrebase:2481 +#: ../git-debrebase:2485 #, perl-format msgid "" "Patch export produced patch amendments (abandoned output commit %s). Try " @@ -2915,39 +2890,39 @@ msgstr "" "De patch-export produceerde patch-herzieningen (vastlegging van uitvoer %s " "gestaakt). Probeer eerst een wasbeurt te doen." -#: ../git-debrebase:2501 +#: ../git-debrebase:2505 #, perl-format msgid "%s contains comments, which will be discarded" msgstr "%s bevat commentaar die verwijderd zal worden" -#: ../git-debrebase:2506 +#: ../git-debrebase:2510 #, perl-format msgid "patch %s repeated in %s !" msgstr "patch %s herhaald in %s !" -#: ../git-debrebase:2513 +#: ../git-debrebase:2517 #, perl-format msgid "Unused patch file %s will be discarded" msgstr "Niet gebruikt patch-bestand %s zal verwijderd worden" -#: ../git-debrebase:2521 +#: ../git-debrebase:2525 msgid "ffq-prev exists, this is already managed by git-debrebase!" msgstr "ffq-prev bestaat; dit wordt reeds beheerd door git-debrebase!" -#: ../git-debrebase:2526 +#: ../git-debrebase:2530 msgid "ahead of debrebase-last, this is already managed by git-debrebase!" msgstr "voorop op debrebase-last; dit wordt reeds beheerd door git-debrebase!" -#: ../git-debrebase:2542 +#: ../git-debrebase:2546 msgid "want only 1 optional argument, the upstream git commitish" msgstr "" "wil slechts 1 facultatief argument, de git commitish van de toeleveraar" -#: ../git-debrebase:2547 +#: ../git-debrebase:2551 msgid "missing Version from changelog\n" msgstr "Version vanuit de changelog wordt gemist\n" -#: ../git-debrebase:2563 +#: ../git-debrebase:2567 #, perl-format msgid "" "upstream (%s) and HEAD are not\n" @@ -2959,12 +2934,12 @@ msgstr "" "commando uit:\n" " git diff %s HEAD -- :!/debian :/\n" -#: ../git-debrebase:2571 +#: ../git-debrebase:2575 #, perl-format msgid "upstream (%s) is not an ancestor of HEAD" msgstr "upstream (%s) is geen voorouder van HEAD" -#: ../git-debrebase:2578 +#: ../git-debrebase:2582 #, perl-format msgid "" "history between upstream (%s) and HEAD contains direct changes to upstream " @@ -2974,47 +2949,47 @@ msgstr "" "aan toeleveraarsbestanden - bent u zeker dat dit een gbp-tak (patches-" "unapplied)(geen toepassing van patches) is?" -#: ../git-debrebase:2580 +#: ../git-debrebase:2584 #, perl-format msgid "list expected changes with: %s\n" msgstr "toon verwachte wijzigingen met: %s\n" -#: ../git-debrebase:2587 +#: ../git-debrebase:2591 #, perl-format msgid "upstream (%s) contains debian/ directory" msgstr "upstream (%s) bevat een map debian/" -#: ../git-debrebase:2605 +#: ../git-debrebase:2609 msgid "neither of the first two changelog entries are released\n" msgstr "" "geen van de eerste twee items uit het changelog-bestand werd uitgebracht\n" -#: ../git-debrebase:2611 +#: ../git-debrebase:2615 #, perl-format msgid "could not find suitable maintainer view tag %s\n" msgstr "kon geen geschikte maintainer-weergavetag %s vinden\n" -#: ../git-debrebase:2614 +#: ../git-debrebase:2618 #, perl-format msgid "HEAD is not FF from maintainer tag %s!" msgstr "HEAD is niet FF (lineair) vanaf maintainer-tag %s!" -#: ../git-debrebase:2617 +#: ../git-debrebase:2621 #, perl-format msgid "dgit view tag %s not found\n" msgstr "dgit-weergavetag %s niet gevonden\n" -#: ../git-debrebase:2619 +#: ../git-debrebase:2623 #, perl-format msgid "dgit view tag %s is not FF from maintainer tag %s\n" msgstr "dgit-weergavetag %s is niet FF (lineair) vanaf maintainer-tag %s\n" -#: ../git-debrebase:2621 +#: ../git-debrebase:2625 #, perl-format msgid "will stitch in dgit view, %s\n" msgstr "zal borduren in de dgit-weergave, %s\n" -#: ../git-debrebase:2628 +#: ../git-debrebase:2632 #, perl-format msgid "" "Cannot confirm dgit view: %s\n" @@ -3025,14 +3000,14 @@ msgstr "" "Borduren in dgit-weergave mislukte (zie bovenstaande berichten).\n" "dgit --overwrite zal nodig zijn bij de eerste dgit push na de omzetting.\n" -#: ../git-debrebase:2674 +#: ../git-debrebase:2678 #, perl-format msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n" msgstr "" "%s: omgezet vanuit de indeling van de tak zonder toepassing van patches " "(patched-unapplied) (gbp), Oké\n" -#: ../git-debrebase:2703 +#: ../git-debrebase:2707 #, perl-format msgid "" "%s: converted to git-buildpackage branch format\n" @@ -3043,17 +3018,17 @@ msgstr "" "%s: WAARSCHUWING: voer \"git-debrebase\" nu niet meer uit\n" "%s: WAARSCHUWING: dat doen zou alle toeleveraarspatches doen wegvallen!\n" -#: ../git-debrebase:2724 +#: ../git-debrebase:2728 msgid "takes 1 optional argument, the upstream commitish" msgstr "" "heeft 1 facultatief argument, de toeleveraar-commitish (upstream commitish)" -#: ../git-debrebase:2732 +#: ../git-debrebase:2736 #, perl-format msgid "%s, from command line" msgstr "%s, van de commandoregel" -#: ../git-debrebase:2746 +#: ../git-debrebase:2750 #, perl-format msgid "" "%s: Branch already seems to be in git-debrebase format!\n" @@ -3064,58 +3039,58 @@ msgstr "" "%s: --always-convert-anyway zou de omzettingsbewerking toch uitvoeren,\n" "%s: maar is wellicht geen goed idee. Vermoedelijk wilde u niets doen.\n" -#: ../git-debrebase:2750 +#: ../git-debrebase:2754 msgid "Branch already in git-debrebase format." msgstr "Tak is reeds in git-debrebase-indeling." -#: ../git-debrebase:2762 +#: ../git-debrebase:2766 msgid "Considering possible commits corresponding to upstream:\n" msgstr "" "Bezig vastleggingen na te gaan die mogelijk overeenkomen met die van de " "toeleveraar:\n" -#: ../git-debrebase:2769 +#: ../git-debrebase:2773 #, perl-format msgid "git tag %s" msgstr "git tag %s" -#: ../git-debrebase:2775 +#: ../git-debrebase:2779 #, perl-format msgid " git tag: no suitable tag found (tried %s)\n" msgstr " git tag: geen geschikte tag gevonden (probeerde %s)\n" -#: ../git-debrebase:2784 +#: ../git-debrebase:2788 #, perl-format msgid "opendir build-products-dir %s: %s" msgstr "opendir build-products-dir %s: %s" -#: ../git-debrebase:2790 +#: ../git-debrebase:2794 #, perl-format msgid " orig: found what looks like a .orig, %s\n" msgstr " orig: iets wat op een .orig lijkt gevonden, %s\n" -#: ../git-debrebase:2821 +#: ../git-debrebase:2825 #, perl-format msgid " orig: no suitable origs found (looked for %s in %s)\n" msgstr " orig: geen geschikte origs gevonden (gezocht naar %s in %s)\n" -#: ../git-debrebase:2830 +#: ../git-debrebase:2834 msgid "Evaluating possible commits corresponding to upstream:\n" msgstr "" "Bezig vastleggingen te evalueren die mogelijk overeenkomen met die van de " "toeleveraar:\n" -#: ../git-debrebase:2867 +#: ../git-debrebase:2871 #, perl-format msgid " %s: couldn't apply patches: gbp pq %s" msgstr " %s: kon patches niet toepassen: gbp pq %s" -#: ../git-debrebase:2876 +#: ../git-debrebase:2880 #, perl-format msgid " %s: applying patches gives different tree\n" msgstr " %s: patches toepassen geeft een afwijkende boom\n" -#: ../git-debrebase:2890 +#: ../git-debrebase:2894 msgid "" "Could not find or construct a suitable upstream commit.\n" "Rerun adding --diagnose after convert-from-dgit-view, or pass a\n" @@ -3126,31 +3101,31 @@ msgstr "" "of geef expliciet een vastlegging van de toeleveraar op,\n" "of bezorg geschikte origs.\n" -#: ../git-debrebase:2896 +#: ../git-debrebase:2900 #, perl-format msgid "Yes, will base new branch on %s\n" msgstr "Ja, zal nieuwe tak baseren op %s\n" -#: ../git-debrebase:2903 +#: ../git-debrebase:2907 msgid "forget-was-ever-debrebase takes no further arguments" msgstr "forget-was-ever-debrebase wordt zonder verdere argumenten gebruikt" -#: ../git-debrebase:2907 +#: ../git-debrebase:2911 #, perl-format msgid "Not suitable for recording git-debrebaseness anyway: %s" msgstr "" "Hoe dan ook niet geschikt om de git-debrebase-toestand te registreren: %s" -#: ../git-debrebase:3009 +#: ../git-debrebase:3013 msgid "bad options\n" msgstr "foute opties\n" -#: ../git-debrebase:3019 +#: ../git-debrebase:3023 #, perl-format msgid "%s: no cuddling to -i for git-rebase" msgstr "%s: niet gek van -i voor git-rebase" -#: ../git-debrebase:3049 +#: ../git-debrebase:3053 #, perl-format msgid "unknown git-debrebase sub-operation %s" msgstr "onbekende onderliggende bewerking van git-debrebase: %s" @@ -3299,3 +3274,6 @@ msgstr "mkdir van een speelplaats %s mislukte: %s" #, perl-format msgid "failed to mkdir the playground %s: %s" msgstr "mkdir van de speelplaats %s mislukte: %s" + +#~ msgid "import %s requires .../%s, but it does not exist" +#~ msgstr "importeren van %s vereist .../%s, maar dit bestaat niet" diff --git a/po4a/dgit-downstream-dsc_7.pot b/po4a/dgit-downstream-dsc_7.pot index 3bf1687..d13ce20 100644 --- a/po4a/dgit-downstream-dsc_7.pot +++ b/po4a/dgit-downstream-dsc_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2018-10-04 01:04+0100\n" +"POT-Creation-Date: 2019-03-01 16:59+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -27,29 +27,29 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1184 ../dgit-downstream-dsc.7.pod:150 +#: ../dgit.1:1253 ../dgit-downstream-dsc.7.pod:150 #, no-wrap msgid "CONFIGURATION" msgstr "" #. type: =item -#: ../dgit.1:1198 ../dgit-downstream-dsc.7.pod:286 +#: ../dgit.1:1267 ../dgit-downstream-dsc.7.pod:286 #, no-wrap msgid "B<dgit-suite.>I<suite>B<.distro> I<distro>" msgstr "" #. type: =item -#: ../dgit.1:1245 ../dgit-downstream-dsc.7.pod:242 +#: ../dgit.1:1320 ../dgit-downstream-dsc.7.pod:242 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.upload-host>" msgstr "" #. type: =head1 -#: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:722 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:601 +#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619 #: ../git-debrebase.5.pod:678 #, no-wrap msgid "SEE ALSO" @@ -241,9 +241,9 @@ msgid "" "B<dgit-repos-server> and B<dgit-repos-policy-debian> in the package B<dgit-" "infrastructure>. but in most installations this is not needed. If there is " "no or little distinction between (i) developers who are entitled to upload " -"(push) and (ii) repository administrators, then a it is sufficient to " -"provide a git server with a unix account for each user who will pushing, " -"perhaps using ssh restricted commands." +"(push) and (ii) repository administrators, then it is sufficient to provide " +"a git server with a unix account for each user who will be pushing, perhaps " +"using ssh restricted commands." msgstr "" #. type: =item @@ -407,7 +407,7 @@ msgstr "" #: ../dgit-downstream-dsc.7.pod:217 msgid "" "If you always have a git repository for every package in your archive, " -"perhaps because you never use dput/dupload, and always dgit push, Set C<git-" +"perhaps because you never use dput/dupload, and always dgit push, set C<git-" "check> to B<true>." msgstr "" @@ -564,8 +564,9 @@ msgstr "" #. type: textblock #: ../dgit-downstream-dsc.7.pod:315 msgid "" -"To make ssh restricted command easier, and for the benefit of dgit-repos-" -"server, dgit's ssh commands each start with a parseable commentish rune." +"To make use of ssh restricted command easier, and for the benefit of dgit-" +"repos-server, dgit's ssh commands each start with a parseable commentish " +"rune." msgstr "" #. type: textblock diff --git a/po4a/dgit-maint-debrebase_7.pot b/po4a/dgit-maint-debrebase_7.pot index b937feb..71969f4 100644 --- a/po4a/dgit-maint-debrebase_7.pot +++ b/po4a/dgit-maint-debrebase_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-01-06 17:50+0000\n" +"POT-Creation-Date: 2019-03-01 16:59+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -27,7 +27,7 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1469 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 #: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 @@ -695,8 +695,8 @@ msgstr "" #: ../dgit-maint-debrebase.7.pod:378 msgid "" "Pass I<--stat> just to see the list of changed files, which is useful to " -"determine whether there are any new or deleted files to may need accounting " -"for in your copyright file." +"determine whether there are any new or deleted files that may need " +"accounting for in your copyright file." msgstr "" #. type: =head1 @@ -815,7 +815,7 @@ msgid "" "last upload, it is not possible for dgit to make your history fast-" "forwarding from the history on B<dgit-repos>. In such cases you will have " "to pass I<--overwrite> to dgit. git-debrebase will normally tell you if " -"this is will be needed." +"this will be needed." msgstr "" #. type: textblock @@ -983,7 +983,7 @@ msgstr "" #. type: textblock #: ../dgit-maint-debrebase.7.pod:562 msgid "" -"If that fails, because your branch and the NMUers work represent divergent " +"If that fails, because your branch and the NMUers' work represent divergent " "branches of development, you have a number of options. Here we describe the " "two simplest." msgstr "" diff --git a/po4a/dgit-maint-native_7.pot b/po4a/dgit-maint-native_7.pot index da22681..43d7d51 100644 --- a/po4a/dgit-maint-native_7.pot +++ b/po4a/dgit-maint-native_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2018-10-04 01:04+0100\n" +"POT-Creation-Date: 2019-03-01 16:59+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -27,11 +27,11 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:722 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:601 +#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619 #: ../git-debrebase.5.pod:678 #, no-wrap msgid "SEE ALSO" @@ -163,7 +163,7 @@ msgstr "" #: ../dgit-maint-native.7.pod:85 msgid "" "Alternatively, if this was the first ever dgit push of the package, you can " -"avoid this merge commit by passing C<--deliberately-not-fast-forward>. " +"avoid this merge commit by passing C<--deliberately-not-fast-forward> " "instead of C<--overwrite>. This avoids introducing a new origin commit into " "your git history." msgstr "" diff --git a/po4a/dgit-sponsorship_7.pot b/po4a/dgit-sponsorship_7.pot index 16d8859..08bc8f7 100644 --- a/po4a/dgit-sponsorship_7.pot +++ b/po4a/dgit-sponsorship_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2018-10-13 20:41+0100\n" +"POT-Creation-Date: 2019-03-01 16:59+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -27,11 +27,11 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1445 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:722 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:598 +#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619 #: ../git-debrebase.5.pod:678 #, no-wrap msgid "SEE ALSO" @@ -65,9 +65,9 @@ msgstr "" #. type: textblock #: ../dgit-sponsorship.7.pod:12 msgid "" -"The sponsor must to be intending to use dgit for the upload. (If the " -"sponsor does not use dgit, it is not possible to properly publish a " -"sponsee's git branch.)" +"The sponsor must be intending to use dgit for the upload. (If the sponsor " +"does not use dgit, it is not possible to properly publish a sponsee's git " +"branch.)" msgstr "" #. type: textblock diff --git a/po4a/dgit-user_7.nl.po b/po4a/dgit-user_7.nl.po index 15166a7..7ecf7f1 100644 --- a/po4a/dgit-user_7.nl.po +++ b/po4a/dgit-user_7.nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dgit-user_7\n" -"POT-Creation-Date: 2019-01-06 17:14+0000\n" +"POT-Creation-Date: 2019-03-01 16:59+0000\n" "PO-Revision-Date: 2018-11-14 21:22+0100\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n" "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n" @@ -29,7 +29,7 @@ msgid "NAME" msgstr "NAAM" #. type: =head1 -#: ../dgit.1:1469 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 #: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 @@ -804,7 +804,7 @@ msgstr "" msgid "" "If neither of those are an option, your desperate last resort is to try " "using the same version number as the official package for your own package. " -"(The version is controlled by C<debian/changelog> - see above). This is not " +"(The version is controlled by C<debian/changelog> - see above.) This is not " "ideal because it makes it hard to tell what is installed, and because it " "will mislead and confuse apt." msgstr "" diff --git a/po4a/dgit-user_7.pot b/po4a/dgit-user_7.pot index 5426aef..d5a8fef 100644 --- a/po4a/dgit-user_7.pot +++ b/po4a/dgit-user_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-01-06 17:14+0000\n" +"POT-Creation-Date: 2019-03-01 16:59+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -27,7 +27,7 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1469 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 #: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 @@ -602,7 +602,7 @@ msgstr "" msgid "" "If neither of those are an option, your desperate last resort is to try " "using the same version number as the official package for your own package. " -"(The version is controlled by C<debian/changelog> - see above). This is not " +"(The version is controlled by C<debian/changelog> - see above.) This is not " "ideal because it makes it hard to tell what is installed, and because it " "will mislead and confuse apt." msgstr "" diff --git a/po4a/dgit_1.pot b/po4a/dgit_1.pot index 97cbcd7..052904f 100644 --- a/po4a/dgit_1.pot +++ b/po4a/dgit_1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-01-06 17:50+0000\n" +"POT-Creation-Date: 2019-03-01 16:59+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -738,7 +738,7 @@ msgstr "" msgid "" "Set up the working tree's B<.git/info/attributes> to disable all " "transforming attributes for all files. This is done by defining a macro " -"attribute B<dgit-defuse-attrs> and applying it to B<*>. For why, see " +"attribute, B<dgit-defuse-attrs,> and applying it to B<*>. For why, see " "B<GITATTRIBUTES> in B<dgit(7)>. Note that only attributes affecting the " "working tree are suppressed. git-archive may remain exciting." msgstr "" @@ -749,7 +749,7 @@ msgid "" "If there is an existing macro attribute line B<[attr]dgit-defuse-attrs> in ." "git/info/attributes, but it is insufficient, because it was made by an " "earlier version of dgit and git has since introduced new transforming " -"attributes, modifies the macro to disable the newer transformations." +"attributes, this modifies the macro to disable the newer transformations." msgstr "" #. type: Plain text @@ -863,7 +863,7 @@ msgid "" "prefixed with B<..> then if it already exists and dgit actually imports the " "dsc (rather than simply reading the git commit out of the Dgit field), dgit " "will make a pseudomerge so that the result is necessarily fast forward from " -"the existing branch. Otherwise, if branch already exists, dgit will stop " +"the existing branch. Otherwise, if I<branch> already exists, dgit will stop " "with an error message." msgstr "" @@ -1411,7 +1411,7 @@ msgid "" "override safety catches, including safety catches which relate to distro-" "specific policies. The use of --deliberately is declared and published in " "the signed tags generated for you by dgit, so that the archive software can " -"give effect to your intent, and for the benefit humans looking at the " +"give effect to your intent, and for the benefit of humans looking at the " "history. The meanings of I<something>s understood in the context of Debian " "are discussed below:" msgstr "" @@ -1557,9 +1557,9 @@ msgstr "" #. type: Plain text #: ../dgit.1:858 msgid "" -"Do not check whether up source format `3.0 (quilt)' metadata needs fixing " -"up. If you use this option and the metadata did in fact need fixing up, " -"dgit push will fail." +"Do not check whether source format `3.0 (quilt)' metadata needs fixing up. " +"If you use this option and the metadata did in fact need fixing up, dgit " +"push will fail." msgstr "" #. type: TP @@ -1668,7 +1668,7 @@ msgstr "" #: ../dgit.1:938 msgid "" "Specifies the .changes file which is to be uploaded. By default dgit push " -"looks for single .changes file in the parent directory whose filename " +"looks for a single .changes file in the parent directory whose filename " "suggests it is for the right package and version." msgstr "" @@ -2281,9 +2281,9 @@ msgstr "" #. type: Plain text #: ../dgit.1:1296 msgid "" -"Like .clean-mode, but ignored if the value does not make sense to this " -"version of dgit. Setting both .clean-mode and .clean-mode-newer is useful " -"to provide a single git config compatible with different dgit versions." +"Like .clean-mode, but ignored if the value is unknown to this version of " +"dgit. Setting both .clean-mode and .clean-mode-newer is useful to provide a " +"single git config compatible with different dgit versions." msgstr "" #. type: TP @@ -2390,7 +2390,7 @@ msgstr "" #: ../dgit.1:1332 msgid "" "Whether to set user.name and user.email in new git trees. True by default. " -"Ignored for dgit setup-setup-useremail, which does it anyway." +"Ignored for dgit setup-useremail, which does it anyway." msgstr "" #. type: TP @@ -2402,7 +2402,7 @@ msgstr "" #. type: Plain text #: ../dgit.1:1337 msgid "" -"Whether to setup a merge driver which uses dpkg-mergechangelogs for debian/" +"Whether to set up a merge driver which uses dpkg-mergechangelogs for debian/" "changelog. True by default. Ignored for dgit setup-mergechangelogs, which " "does it anyway." msgstr "" @@ -2439,23 +2439,23 @@ msgid "B<dgit-distro.>I<distro>B<.opts->I<cmd>" msgstr "" #. type: Plain text -#: ../dgit.1:1360 +#: ../dgit.1:1361 msgid "" "Extra options to pass to I<cmd>. Works like B<-->I<cmd>B<:>... . To pass " "several options, configure multiple values in git config (with git config --" -"add). The options for B<dgit.default.opts->I<cmd> B<dgit-distro." -">I<distro>B</push.opts->I<cmd> and are all used, followed by options from " -"dgit's command line." +"add). The options for B<dgit.default.opts->I<cmd> and B<dgit-distro." +">I<distro>B</push.opts->I<cmd> are all used, followed by options from dgit's " +"command line." msgstr "" #. type: SH -#: ../dgit.1:1360 +#: ../dgit.1:1361 #, no-wrap msgid "ACCESS CONFIGURATION" msgstr "" #. type: Plain text -#: ../dgit.1:1365 +#: ../dgit.1:1366 msgid "" "There are many other settings which specify how a particular distro's " "services (archive and git) are provided. These should not normally be " @@ -2464,204 +2464,204 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1365 +#: ../dgit.1:1366 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.nominal-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1368 +#: ../dgit.1:1369 msgid "Shown in git tags, Dgit fields, and so on." msgstr "" #. type: TP -#: ../dgit.1:1368 +#: ../dgit.1:1369 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.alias-canon>" msgstr "" #. type: Plain text -#: ../dgit.1:1371 +#: ../dgit.1:1372 msgid "Used for all access configuration lookup." msgstr "" #. type: TP -#: ../dgit.1:1371 +#: ../dgit.1:1372 #, no-wrap msgid "B<dgit-distro.>I<distro>B</push.>*" msgstr "" #. type: Plain text -#: ../dgit.1:1377 +#: ../dgit.1:1378 msgid "" "If set, overrides corresponding non B</push> config when B<readonly=false>, " "or when pushing and B<readonly=auto>." msgstr "" #. type: TP -#: ../dgit.1:1377 +#: ../dgit.1:1378 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-url>" msgstr "" #. type: TP -#: ../dgit.1:1379 +#: ../dgit.1:1380 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-url>[B<-suffix>]" msgstr "" #. type: TP -#: ../dgit.1:1381 +#: ../dgit.1:1382 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-proto>" msgstr "" #. type: TP -#: ../dgit.1:1383 +#: ../dgit.1:1384 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-path>" msgstr "" #. type: TP -#: ../dgit.1:1385 +#: ../dgit.1:1386 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-check> B<true>|B<false>|B<url>|B<ssh-cmd>" msgstr "" #. type: TP -#: ../dgit.1:1387 +#: ../dgit.1:1388 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-check-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1389 +#: ../dgit.1:1390 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.diverts.divert> B<new-distro>|B</>I<distro-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1391 +#: ../dgit.1:1392 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-create>I< >B<ssh-cmd>I<|>B<true>" msgstr "" #. type: TP -#: ../dgit.1:1393 +#: ../dgit.1:1394 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query> B<ftpmasterapi:> | B<madison:>I<distro> | B<dummycat:>I</path> | B<sshpsql:>I<user>B<@>I<host>B<:>I<dbname>" msgstr "" #. type: TP -#: ../dgit.1:1395 +#: ../dgit.1:1396 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query->(B<url>|B<tls-key>|B<curl-ca-args>)" msgstr "" #. type: TP -#: ../dgit.1:1397 +#: ../dgit.1:1398 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.madison-distro>" msgstr "" #. type: TP -#: ../dgit.1:1399 +#: ../dgit.1:1400 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query-default-component>" msgstr "" #. type: TP -#: ../dgit.1:1401 +#: ../dgit.1:1402 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.dgit-tag-format>" msgstr "" #. type: TP -#: ../dgit.1:1403 +#: ../dgit.1:1404 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.dep14tag> B<want>|B<no>|B<always>" msgstr "" #. type: TP -#: ../dgit.1:1405 +#: ../dgit.1:1406 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.ssh>" msgstr "" #. type: TP -#: ../dgit.1:1407 +#: ../dgit.1:1408 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.sshpsql-dbname>" msgstr "" #. type: TP -#: ../dgit.1:1409 +#: ../dgit.1:1410 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.>(B<git>|B<sshpsql>)B<->(B<user>|B<host>|B<user-force>)" msgstr "" #. type: TP -#: ../dgit.1:1411 +#: ../dgit.1:1412 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.backports-quirk>" msgstr "" #. type: TP -#: ../dgit.1:1413 +#: ../dgit.1:1414 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.rewrite-map-enable>" msgstr "" #. type: TP -#: ../dgit.1:1415 +#: ../dgit.1:1416 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.source-only-uploads> B<ok>|B<always>|B<never>|B<not-wholly-new>" msgstr "" #. type: TP -#: ../dgit.1:1417 +#: ../dgit.1:1418 #, no-wrap msgid "B<dgit.default.old-dsc-distro>" msgstr "" #. type: TP -#: ../dgit.1:1419 +#: ../dgit.1:1420 #, no-wrap msgid "B<dgit.dsc-url-proto-ok.>I<protocol>" msgstr "" #. type: TP -#: ../dgit.1:1421 +#: ../dgit.1:1422 #, no-wrap msgid "B<dgit.dsc-url-proto-ok.bad-syntax>" msgstr "" #. type: TP -#: ../dgit.1:1423 +#: ../dgit.1:1424 #, no-wrap msgid "B<dgit.default.dsc-url-proto-ok>" msgstr "" #. type: TP -#: ../dgit.1:1425 +#: ../dgit.1:1426 #, no-wrap msgid "B<dgit.vcs-git.suites> I<suite>[B<;>...]" msgstr "" #. type: SH -#: ../dgit.1:1427 +#: ../dgit.1:1428 #, no-wrap msgid "ENVIRONMENT VARIABLES" msgstr "" #. type: TP -#: ../dgit.1:1428 +#: ../dgit.1:1429 #, no-wrap msgid "B<DGIT_SSH>, B<GIT_SSH>" msgstr "" #. type: Plain text -#: ../dgit.1:1437 +#: ../dgit.1:1438 msgid "" "specify an alternative default program (and perhaps arguments) to use " "instead of ssh. DGIT_SSH is consulted first and may contain arguments; if " @@ -2671,26 +2671,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1437 +#: ../dgit.1:1438 #, no-wrap msgid "B<DEBEMAIL>, B<DEBFULLNAME>" msgstr "" #. type: Plain text -#: ../dgit.1:1441 +#: ../dgit.1:1442 msgid "" "Default git user.email and user.name for new trees. See B<dgit setup-new-" "tree>." msgstr "" #. type: TP -#: ../dgit.1:1441 +#: ../dgit.1:1442 #, no-wrap msgid "B<gpg>, B<dpkg->..., B<debsign>, B<git>, B<curl>, B<dput>, B<LWP::UserAgent>" msgstr "" #. type: Plain text -#: ../dgit.1:1446 +#: ../dgit.1:1447 msgid "" "and other subprograms and modules used by dgit are affected by various " "environment variables. Consult the documentation for those programs for " @@ -2698,13 +2698,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.1:1446 +#: ../dgit.1:1447 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: ../dgit.1:1453 +#: ../dgit.1:1454 msgid "" "There should be a `dgit rebase-prep' command or some such to turn a fast-" "forwarding branch containing pseudo-merges back into a rebasing patch " @@ -2712,7 +2712,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1459 +#: ../dgit.1:1460 msgid "" "If the dgit push fails halfway through, it is not necessarily restartable " "and idempotent. It would be good to check that the proposed signing key is " @@ -2720,7 +2720,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1464 +#: ../dgit.1:1465 msgid "" "dgit's build functions, and dgit push, may make changes to your current " "HEAD. Sadly this is necessary for packages in the `3.0 (quilt)' source " @@ -2729,7 +2729,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1469 +#: ../dgit.1:1470 msgid "" "--dry-run does not always work properly, as not doing some of the git " "fetches may result in subsequent actions being different. Doing a non-dry-" @@ -2737,7 +2737,7 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit.1:1469 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 #: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 @@ -2748,13 +2748,13 @@ msgid "SEE ALSO" msgstr "" #. type: Plain text -#: ../dgit.1:1478 +#: ../dgit.1:1479 msgid "" "B<dgit>(7), B<dgit-*>(7), B<curl>(1), B<dput>(1), B<debsign>(1), B<git-" "config>(1), B<git-buildpackage>(1), B<dpkg-buildpackage>(1)," msgstr "" #. type: Plain text -#: ../dgit.1:1479 +#: ../dgit.1:1480 msgid "https://browse.dgit.debian.org/" msgstr "" diff --git a/po4a/dgit_7.pot b/po4a/dgit_7.pot index 78ed743..1329e77 100644 --- a/po4a/dgit_7.pot +++ b/po4a/dgit_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2018-10-13 20:41+0100\n" +"POT-Creation-Date: 2019-03-01 16:59+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -39,11 +39,11 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1445 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:722 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:598 +#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619 #: ../git-debrebase.5.pod:678 #, no-wrap msgid "SEE ALSO" @@ -292,7 +292,7 @@ msgstr "" #: ../dgit.7:166 msgid "" "When using this facility, it is important to always specify the same suites " -"in the same order: dgit will not be make a coherent fast-forwarding history " +"in the same order: dgit will not make a coherent fast-forwarding history " "view otherwise." msgstr "" @@ -611,7 +611,7 @@ msgstr "" #: ../dgit.7:371 msgid "" "In the error message, 696c9bd5..84ae8f96 is the first commit child-parent " -"edge which cannot be sensibly be either ignored, or turned into a patch in " +"edge which cannot sensibly be either ignored, or turned into a patch in " "debian/patches. In this example, this is because it itself changes files in " "debian/patches, indicating that something unusual is going on and that " "continuing is not safe. But you might also see other kinds of troublesome " diff --git a/po4a/git-debrebase_1.pot b/po4a/git-debrebase_1.pot index 630039b..0697082 100644 --- a/po4a/git-debrebase_1.pot +++ b/po4a/git-debrebase_1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-01-06 17:50+0000\n" +"POT-Creation-Date: 2019-03-01 16:59+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -33,7 +33,7 @@ msgid "OPTIONS" msgstr "" #. type: =head1 -#: ../dgit.1:1469 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 #: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 @@ -88,7 +88,7 @@ msgstr "" #. type: textblock #: ../git-debrebase.1.pod:22 msgid "" -"You should read this manpage in cojnunction with L<git-debrebase(5)/" +"You should read this manpage in conjunction with L<git-debrebase(5)/" "TERMINOLOGY>, which defines many important terms used here." msgstr "" @@ -157,7 +157,7 @@ msgstr "" msgid "" "It is hazardous to use plain git-rebase on a git-debrebase branch, because " "git-rebase has a tendency to start the rebase too far back in history, and " -"then drop important commits. Soo L<git-debrebase(5)/ILLEGAL OPERATIONS>" +"then drop important commits. See L<git-debrebase(5)/ILLEGAL OPERATIONS>" msgstr "" #. type: =item @@ -325,7 +325,7 @@ msgstr "" #. type: textblock #: ../git-debrebase.1.pod:157 msgid "" -"<new-version> may be whole new Debian version, including revision, or just " +"<new-version> may be a whole new Debian version, including revision, or just " "the upstream part, in which case -1 will be appended to make the new Debian " "version." msgstr "" @@ -461,7 +461,7 @@ msgstr "" msgid "" "If the patches implied by the current branch are not a simple superset of " "those already in debian/patches, make-patches will fail with exit status 7, " -"and an error message. (The message can be suppress with --quiet-would-" +"and an error message. (The message can be suppressed with --quiet-would-" "amend.) If the problem is simply that the existing patches were not made by " "git-debrebase, using dgit quilt-fixup instead should succeed." msgstr "" @@ -478,7 +478,7 @@ msgstr "" #. type: textblock #: ../git-debrebase.1.pod:261 -msgid "Cnnverts any of the following into a git-debrebase interchange branch:" +msgid "Converts any of the following into a git-debrebase interchange branch:" msgstr "" #. type: textblock @@ -651,7 +651,7 @@ msgstr "" #: ../git-debrebase.1.pod:371 msgid "" "This is provided mostly for the test suite and for unusual situations. It " -"should only be used with a care and with a proper understanding of the " +"should only be used with care and with a proper understanding of the " "underlying theory." msgstr "" diff --git a/po4a/git-debrebase_5.pot b/po4a/git-debrebase_5.pot index f5c7df7..71601b1 100644 --- a/po4a/git-debrebase_5.pot +++ b/po4a/git-debrebase_5.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2018-10-04 01:04+0100\n" +"POT-Creation-Date: 2019-03-01 16:59+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -27,11 +27,11 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:722 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:601 +#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619 #: ../git-debrebase.5.pod:678 #, no-wrap msgid "SEE ALSO" @@ -312,7 +312,7 @@ msgstr "" #: ../git-debrebase.5.pod:147 msgid "" "git-debrebase has one primary branch, the B<interchange branch>. This " -"branch is found on Debian contributor's workstations (typically, a " +"branch is found on Debian contributors' workstations (typically, a " "maintainer would call it B<master>), in the Debian dgit git server as the " "suite branch (B<dgit/dgit/sid>) and on other git servers which support " "Debian work (eg B<master> on salsa)." @@ -349,7 +349,7 @@ msgid "" "C<debian/> directory that may be in the upstream commits). The breakwater " "does not contain any representation of the delta queue (not even debian/" "patches). The part of the breakwater processed by git-debrebase is the part " -"since the most reecent B<anchor>, which is usually a special merge generated " +"since the most recent B<anchor>, which is usually a special merge generated " "by git-debrebase." msgstr "" @@ -446,8 +446,7 @@ msgstr "" #. type: textblock #: ../git-debrebase.5.pod:257 msgid "" -"Zero or more single-parent commits contaioning only changes to upstream " -"files." +"Zero or more single-parent commits containing only changes to upstream files." msgstr "" #. type: textblock @@ -455,8 +454,7 @@ msgstr "" msgid "" "The merely B<unstitched> (ie, unstitched but unlaundered) branch state is " "also B<rebasing>. It has the same contents as the laundered state, except " -"that it may contain, additionally, in B<in any order but after the " -"breakwater>:" +"that it may contain, additionally, B<in any order but after the breakwater>:" msgstr "" #. type: =item @@ -601,8 +599,8 @@ msgstr "" msgid "" "When ffq-prev is not present, C<refs/debrebase-last/B> records some ancestor " "of refs/B, (usually, the result of last stitch). This is used for status " -"printing and some error error checks - especially for printing guesses what " -"a problem is. To determine whether a branch is is being maintained in git-" +"printing and some error error checks - especially for printing guesses about " +"what a problem is. To determine whether a branch is being maintained in git-" "debrebase form it is necessary to walk its history." msgstr "" @@ -666,7 +664,7 @@ msgstr "" #. type: textblock #: ../git-debrebase.5.pod:422 msgid "" -"The following basic operations follows from this model (refer to the diagram " +"The following basic operations follow from this model (refer to the diagram " "above):" msgstr "" @@ -762,11 +760,11 @@ msgstr "" #. type: textblock #: ../git-debrebase.5.pod:474 msgid "" -"Make a pseudomerge, whose contributing parent to is the unstitched branch " -"and whose overwritten parent is ffq-prev, consuming ffq-prev in the process " -"(and writing debrebase-last instead). Ideally the contributing parent would " -"be a laundered branch, or perhaps a laundered branch with a quilt patch " -"addition commit." +"Make a pseudomerge, whose contributing parent is the unstitched branch and " +"whose overwritten parent is ffq-prev, consuming ffq-prev in the process (and " +"writing debrebase-last instead). Ideally the contributing parent would be a " +"laundered branch, or perhaps a laundered branch with a quilt patch addition " +"commit." msgstr "" #. type: =item @@ -778,7 +776,7 @@ msgstr "" #: ../git-debrebase.5.pod:485 msgid "" "To generate a tree which can be represented as a 3.0 (quilt) .dsc source " -"packages, the delta queue must be reified inside the git tree in B<debian/" +"package, the delta queue must be reified inside the git tree in B<debian/" "patches/>. These patch files can be stripped out and/or regenerated as " "needed." msgstr "" @@ -827,7 +825,7 @@ msgstr "" #: ../git-debrebase.5.pod:514 msgid "" "For these reasons, it is better to use git-debrebase and let it choose the " -"base for your rebase. If you do realise you have make this mistake, it is " +"base for your rebase. If you do realise you have made this mistake, it is " "best to use the reflog to recover to a suitable good previous state." msgstr "" diff --git a/tests/tests/import-dsc b/tests/tests/import-dsc index bdd849c..4a8d876 100755 --- a/tests/tests/import-dsc +++ b/tests/tests/import-dsc @@ -79,7 +79,7 @@ dsc=$troot/pkg-srcs/${p}_${v}.dsc cd $p.2 cp $dsc .. -t-expect-fail 'it does not exist' \ +t-expect-fail 'No such file or directory' \ check-import .. $v mkdir ../enoents diff --git a/tests/tests/import-linkorigs b/tests/tests/import-linkorigs new file mode 100755 index 0000000..815f960 --- /dev/null +++ b/tests/tests/import-linkorigs @@ -0,0 +1,60 @@ +#!/bin/bash +set -e +. tests/lib +. $troot/lib-import-chk + +t-tstunt-parsechangelog + +t-archive-none example +v=1.0-1 + +link_src_files () { + mkdir $1 + cp $troot/pkg-srcs/${p}_* $1 + dscfn=$1/$dscleaf +} + +combo () { + case $bpdhow in + none) bpd=.. ;; + abs) bpd=$tmp/$subdir/bpd ;; + rel) bpd=../bpd ;; + *) x-unknown-bpdhow $bpdhow ;; + esac + + mkdir -p $bpd + git config --local dgit.default.build-products-dir $bpd + + dscleaf=${p}_${v}.dsc + dscfn=$troot/pkg-srcs/$dscleaf + + case $dschow in + abs) ;; + rel) link_src_files ../copies ;; + bpd) link_src_files $bpd ;; + *) x-unknown-dschow $dschow ;; + esac + + t-dgit import-dsc $dscfn +import + git reset --hard import + + t-dch-commit -v$v.1 -m 'New version' + t-dch-commit-r + t-dgit build-source +} + +for bpdhow in none rel abs; do + for dschow in rel abs; do + + subdir=$bpdhow-$dschow + mkdir $subdir + cd $subdir + + mkdir $p + cd $p + + git init + combo + cd ../.. + done +done |