diff -pruN 13.12/.gitlab-ci.yml 13.13/.gitlab-ci.yml --- 13.12/.gitlab-ci.yml 2025-08-15 09:05:44.000000000 +0000 +++ 13.13/.gitlab-ci.yml 2025-08-24 10:43:28.000000000 +0000 @@ -15,7 +15,13 @@ variables: SALSA_CI_AUTOPKGTEST_ARGS: --test-name t2u-email # We build no arch-specific packages; thse are just wasted faff SALSA_CI_DISABLE_BUILD_PACKAGE_ANY: 1 + SALSA_CI_DISABLE_BUILD_PACKAGE_I386: 1 SALSA_CI_DISABLE_CROSSBUILD_ARM64: 1 + # We don't compile executables, so we don't care about hardening flags. + SALSA_CI_DISABLE_BLHC: 1 + # Our rules file doesn't do anything different for all vs any + # and we just rely on debhelper. Rebuilding the package again isn't useful. + SALSA_CI_DISABLE_BUILD_PACKAGE_ALL: 1 # Doesn't work with unfinalised changelogs SALSA_CI_DISABLE_REPROTEST: 1 # Doesn't like git-debpush having a Replaces without a Breaks. @@ -81,6 +87,12 @@ t2u-integration-bookworm: # Don't set DGIT_TEST_CURRENT_SUITE just in case that might suppress the # very test case(s) we care about. +t2u-integration-trixie: + extends: t2u-integration + image: debian:trixie + # Don't set DGIT_TEST_CURRENT_SUITE just in case that might suppress the + # very test case(s) we care about. + blocking-todos: stage: test needs: [] diff -pruN 13.12/Debian/Dgit/Core.pm 13.13/Debian/Dgit/Core.pm --- 13.12/Debian/Dgit/Core.pm 2025-08-15 09:05:44.000000000 +0000 +++ 13.13/Debian/Dgit/Core.pm 2025-08-24 10:43:28.000000000 +0000 @@ -24,6 +24,9 @@ use strict; use warnings; use Carp; +use POSIX; +use Config; +use Data::Dumper; use Debian::Dgit::I18n; BEGIN { @@ -31,7 +34,79 @@ BEGIN { our (@ISA, @EXPORT); @ISA = qw(Exporter); - @EXPORT = qw(shellquote); + @EXPORT = qw(fail failmsg + waitstatusmsg failedcmd_waitstatus + failedcmd_report_cmd failedcmd + runcmd runcmd_quieten + shell_cmd cmdoutput cmdoutput_errok + git_for_each_ref + $failmsg_prefix + initdebug enabledebug enabledebuglevel + printdebug debugcmd + $printdebug_when_debuglevel $debugcmd_when_debuglevel + $debugprefix *debuglevel *DEBUG + shellquote printcmd messagequote); +} + +our $printdebug_when_debuglevel = 1; +our $debugcmd_when_debuglevel = 1; + +# Set this variable (locally) at the top of an `eval { }` when +# - general code within the eval might call fail +# - these errors are nonfatal and maybe not even errors +# This replaces `dgit: error: ` at the start of the message. +our $failmsg_prefix; + +our $debugprefix; +our $debuglevel = 0; + +sub initdebug ($) { + ($debugprefix) = @_; + open DEBUG, ">/dev/null" or confess "$!"; +} + +sub enabledebug () { + open DEBUG, ">&STDERR" or confess "$!"; + DEBUG->autoflush(1); + $debuglevel ||= 1; +} + +sub enabledebuglevel ($) { + my ($newlevel) = @_; # may be undef (eg from env var) + confess if $debuglevel; + $newlevel //= 0; + $newlevel += 0; + return unless $newlevel; + $debuglevel = $newlevel; + enabledebug(); +} + +sub printdebug { + # Prints a prefix, and @_, to DEBUG. @_ should normally contain + # a trailing \n. + + # With no (or only empty) arguments just prints the prefix and + # leaves the caller to do more with DEBUG. The caller should make + # sure then to call printdebug with something ending in "\n" to + # get the prefix right in subsequent calls. + + return unless $debuglevel >= $printdebug_when_debuglevel; + our $printdebug_noprefix; + print DEBUG $debugprefix unless $printdebug_noprefix; + pop @_ while @_ and !length $_[-1]; + return unless @_; + print DEBUG @_ or confess "$!"; + $printdebug_noprefix = $_[-1] !~ m{\n$}; +} + +sub messagequote ($) { + local ($_) = @_; + s{\\}{\\\\}g; + s{\n}{\\n}g; + s{\x08}{\\b}g; + s{\t}{\\t}g; + s{[\000-\037\177]}{ sprintf "\\x%02x", ord $& }ge; + $_; } sub shellquote { @@ -63,4 +138,165 @@ sub shellquote { return join ' ', @out; } +sub printcmd { + my $fh = shift @_; + my $intro = shift @_; + print $fh $intro." ".(shellquote @_)."\n" or confess "$!"; +} + +sub debugcmd { + my $extraprefix = shift @_; + printcmd(\*DEBUG,$debugprefix.$extraprefix,@_) + if $debuglevel >= $debugcmd_when_debuglevel; +} + +sub _us () { + $::us // ($0 =~ m#[^/]*$#, $&); +} + +sub failmsg { + my $s = "@_"; + $s =~ s/\n\n$/\n/g; + my $prefix; + my $prefixnl; + if (defined $failmsg_prefix) { + $prefixnl = ''; + $prefix = $failmsg_prefix; + $s .= "\n"; + } else { + $prefixnl = "\n"; + $s = f_ "error: %s\n", "$s"; + $prefix = _us().": "; + } + $s =~ s/^/$prefix/gm; + return $prefixnl.$s; +} + +sub fail { + die failmsg @_; +} + +our @signames = split / /, $Config{sig_name}; + +sub waitstatusmsg () { + if (!$?) { + return __ "terminated, reporting successful completion"; + } elsif (!($? & 255)) { + return f_ "failed with error exit status %s", WEXITSTATUS($?); + } elsif (WIFSIGNALED($?)) { + my $signum=WTERMSIG($?); + return f_ "died due to fatal signal %s", + ($signames[$signum] // "number $signum"). + ($? & 128 ? " (core dumped)" : ""); # POSIX(3pm) has no WCOREDUMP + } else { + return f_ "failed with unknown wait status %s", $?; + } +} + +sub failedcmd_report_cmd { + my $intro = shift @_; + $intro //= __ "failed command"; + { local ($!); printcmd \*STDERR, _us().": $intro:", @_ or confess "$!"; }; +} + +sub failedcmd_waitstatus { + if ($? < 0) { + return f_ "failed to fork/exec: %s", $!; + } elsif ($?) { + return f_ "subprocess %s", waitstatusmsg(); + } else { + return __ "subprocess produced invalid output"; + } +} + +sub failedcmd { + # Expects $!,$? as set by close - see below. + # To use with system(), set $?=-1 first. + # + # Actual behaviour of perl operations: + # success $!==0 $?==0 close of piped open + # program failed $!==0 $? >0 close of piped open + # syscall failure $! >0 $?=-1 close of piped open + # failure $! >0 unchanged close of something else + # success trashed $?==0 system + # program failed trashed $? >0 system + # syscall failure $! >0 unchanged system + failedcmd_report_cmd undef, @_; + fail failedcmd_waitstatus(); +} + +sub runcmd { + debugcmd "+",@_; + $!=0; $?=-1; + failedcmd @_ if system @_; +} + +sub shell_cmd { + my ($first_shell, @cmd) = @_; + return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd; +} + +# Runs the command in @_, but capturing its stdout and stderr. +# Prints those to our stderr only if the command fails. +sub runcmd_quieten { + debugcmd "+",@_; + $!=0; $?=-1; + my @real_cmd = shell_cmd <<'END', @_; + set +e; output=$("$@" 2>&1); rc=$?; set -e + if [ $rc = 0 ]; then exit 0; fi + printf >&2 "%s\n" "$output" + exit $rc +END + failedcmd @_ if system @real_cmd; +} + +sub cmdoutput_errok { + confess Dumper(\@_)." ?" if grep { !defined } @_; + local $printdebug_when_debuglevel = $debugcmd_when_debuglevel; + debugcmd "|",@_; + open P, "-|", @_ or confess "$_[0] $!"; + my $d; + $!=0; $?=0; + { local $/ = undef; $d =

; } + confess "$!" if P->error; + if (!close P) { printdebug "=>!$?\n"; return undef; } + chomp $d; + if ($debuglevel > 0) { + $d =~ m/^.*/; + my $dd = $&; + my $more = (length $' ? '...' : ''); #'); + $dd =~ s{[^\n -~]|\\}{ sprintf "\\x%02x", ord $& }ge; + printdebug "=> \`$dd'",$more,"\n"; + } + return $d; +} + +sub cmdoutput { + my $d = cmdoutput_errok @_; + defined $d or failedcmd @_; + return $d; +} + +sub git_for_each_ref ($$;$) { + my ($pattern,$func,$gitdir) = @_; + # calls $func->($objid,$objtype,$fullrefname,$reftail); + # $reftail is RHS of ref after refs/[^/]+/ + # breaks if $pattern matches any ref `refs/blah' where blah has no `/' + # $pattern may be an array ref to mean multiple patterns + $pattern = [ $pattern ] unless ref $pattern; + my @cmd = (qw(git for-each-ref), @$pattern); + if (defined $gitdir) { + @cmd = ('sh','-ec','cd "$1"; shift; exec "$@"','x', $gitdir, @cmd); + } + open GFER, "-|", @cmd or confess "$!"; + debugcmd "|", @cmd; + while () { + chomp or confess "$_ ?"; + printdebug "|> ", $_, "\n"; + m#^(\w+)\s+(\w+)\s+(refs/[^/]+/(\S+))$# or confess "$_ ?"; + $func->($1,$2,$3,$4); + } + $!=0; $?=0; close GFER or confess "$pattern $? $!"; +} + 1; diff -pruN 13.12/Debian/Dgit.pm 13.13/Debian/Dgit.pm --- 13.12/Debian/Dgit.pm 2025-08-15 09:05:44.000000000 +0000 +++ 13.13/Debian/Dgit.pm 2025-08-24 10:43:28.000000000 +0000 @@ -26,7 +26,6 @@ use warnings; use Carp; use POSIX; use IO::Handle; -use Config; use Digest::SHA; use Data::Dumper; use IPC::Open2; @@ -119,8 +118,6 @@ our $orig_f_tail_re = qr{$orig_f_comp_re our $git_null_obj = '0' x 40; our $ffq_refprefix = 'ffq-prev'; our $gdrlast_refprefix = 'debrebase-last'; -our $printdebug_when_debuglevel = 1; -our $debugcmd_when_debuglevel = 1; # This is RFC 5322's 'atext'. our $atext_re = qr([[:alnum:]!#$%&'*+\-/=?^_`{|}~])a; @@ -146,15 +143,6 @@ sub NOFFCHECK () { return 0x2; } sub FRESHREPO () { return 0x4; } sub NOCOMMITCHECK () { return 0x8; } -# Set this variable (locally) at the top of an `eval { }` when -# - general code within the eval might call fail -# - these errors are nonfatal and maybe not even errors -# This replaces `dgit: error: ` at the start of the message. -our $failmsg_prefix; - -our $debugprefix; -our $debuglevel = 0; - our $negate_harmful_gitattrs = "-text -eol -crlf -ident -filter -working-tree-encoding"; # ^ when updating this, alter the regexp in dgit:is_gitattrs_setup @@ -188,67 +176,6 @@ sub setup_sigwarn () { }; } -sub initdebug ($) { - ($debugprefix) = @_; - open DEBUG, ">/dev/null" or confess "$!"; -} - -sub enabledebug () { - open DEBUG, ">&STDERR" or confess "$!"; - DEBUG->autoflush(1); - $debuglevel ||= 1; -} - -sub enabledebuglevel ($) { - my ($newlevel) = @_; # may be undef (eg from env var) - confess if $debuglevel; - $newlevel //= 0; - $newlevel += 0; - return unless $newlevel; - $debuglevel = $newlevel; - enabledebug(); -} - -sub printdebug { - # Prints a prefix, and @_, to DEBUG. @_ should normally contain - # a trailing \n. - - # With no (or only empty) arguments just prints the prefix and - # leaves the caller to do more with DEBUG. The caller should make - # sure then to call printdebug with something ending in "\n" to - # get the prefix right in subsequent calls. - - return unless $debuglevel >= $printdebug_when_debuglevel; - our $printdebug_noprefix; - print DEBUG $debugprefix unless $printdebug_noprefix; - pop @_ while @_ and !length $_[-1]; - return unless @_; - print DEBUG @_ or confess "$!"; - $printdebug_noprefix = $_[-1] !~ m{\n$}; -} - -sub messagequote ($) { - local ($_) = @_; - s{\\}{\\\\}g; - s{\n}{\\n}g; - s{\x08}{\\b}g; - s{\t}{\\t}g; - s{[\000-\037\177]}{ sprintf "\\x%02x", ord $& }ge; - $_; -} - -sub printcmd { - my $fh = shift @_; - my $intro = shift @_; - print $fh $intro." ".(shellquote @_)."\n" or confess "$!"; -} - -sub debugcmd { - my $extraprefix = shift @_; - printcmd(\*DEBUG,$debugprefix.$extraprefix,@_) - if $debuglevel >= $debugcmd_when_debuglevel; -} - sub dep14_version_mangle ($) { my ($v) = @_; # DEP-14 patch proposed 2016-11-09 "Version Mangling" @@ -306,31 +233,7 @@ sub stat_exists ($) { confess "stat $f: $!"; } -sub _us () { - $::us // ($0 =~ m#[^/]*$#, $&); -} - -sub failmsg { - my $s = "@_"; - $s =~ s/\n\n$/\n/g; - my $prefix; - my $prefixnl; - if (defined $failmsg_prefix) { - $prefixnl = ''; - $prefix = $failmsg_prefix; - $s .= "\n"; - } else { - $prefixnl = "\n"; - $s = f_ "error: %s\n", "$s"; - $prefix = _us().": "; - } - $s =~ s/^/$prefix/gm; - return $prefixnl.$s; -} - -sub fail { - die failmsg @_; -} +*_us = *Debian::Dgit::Core::_us; sub ensuredir ($) { my ($dir) = @_; # does not create parents @@ -362,107 +265,6 @@ sub executable_on_path ($) { return undef; } -our @signames = split / /, $Config{sig_name}; - -sub waitstatusmsg () { - if (!$?) { - return __ "terminated, reporting successful completion"; - } elsif (!($? & 255)) { - return f_ "failed with error exit status %s", WEXITSTATUS($?); - } elsif (WIFSIGNALED($?)) { - my $signum=WTERMSIG($?); - return f_ "died due to fatal signal %s", - ($signames[$signum] // "number $signum"). - ($? & 128 ? " (core dumped)" : ""); # POSIX(3pm) has no WCOREDUMP - } else { - return f_ "failed with unknown wait status %s", $?; - } -} - -sub failedcmd_report_cmd { - my $intro = shift @_; - $intro //= __ "failed command"; - { local ($!); printcmd \*STDERR, _us().": $intro:", @_ or confess "$!"; }; -} - -sub failedcmd_waitstatus { - if ($? < 0) { - return f_ "failed to fork/exec: %s", $!; - } elsif ($?) { - return f_ "subprocess %s", waitstatusmsg(); - } else { - return __ "subprocess produced invalid output"; - } -} - -sub failedcmd { - # Expects $!,$? as set by close - see below. - # To use with system(), set $?=-1 first. - # - # Actual behaviour of perl operations: - # success $!==0 $?==0 close of piped open - # program failed $!==0 $? >0 close of piped open - # syscall failure $! >0 $?=-1 close of piped open - # failure $! >0 unchanged close of something else - # success trashed $?==0 system - # program failed trashed $? >0 system - # syscall failure $! >0 unchanged system - failedcmd_report_cmd undef, @_; - fail failedcmd_waitstatus(); -} - -sub runcmd { - debugcmd "+",@_; - $!=0; $?=-1; - failedcmd @_ if system @_; -} - -sub shell_cmd { - my ($first_shell, @cmd) = @_; - return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd; -} - -# Runs the command in @_, but capturing its stdout and stderr. -# Prints those to our stderr only if the command fails. -sub runcmd_quieten { - debugcmd "+",@_; - $!=0; $?=-1; - my @real_cmd = shell_cmd <<'END', @_; - set +e; output=$("$@" 2>&1); rc=$?; set -e - if [ $rc = 0 ]; then exit 0; fi - printf >&2 "%s\n" "$output" - exit $rc -END - failedcmd @_ if system @real_cmd; -} - -sub cmdoutput_errok { - confess Dumper(\@_)." ?" if grep { !defined } @_; - local $printdebug_when_debuglevel = $debugcmd_when_debuglevel; - debugcmd "|",@_; - open P, "-|", @_ or confess "$_[0] $!"; - my $d; - $!=0; $?=0; - { local $/ = undef; $d =

; } - confess "$!" if P->error; - if (!close P) { printdebug "=>!$?\n"; return undef; } - chomp $d; - if ($debuglevel > 0) { - $d =~ m/^.*/; - my $dd = $&; - my $more = (length $' ? '...' : ''); #'); - $dd =~ s{[^\n -~]|\\}{ sprintf "\\x%02x", ord $& }ge; - printdebug "=> \`$dd'",$more,"\n"; - } - return $d; -} - -sub cmdoutput { - my $d = cmdoutput_errok @_; - defined $d or failedcmd @_; - return $d; -} - sub link_ltarget ($$) { my ($old,$new) = @_; lstat $old or return undef; @@ -607,28 +409,6 @@ sub git_get_symref (;$) { return $branch; } -sub git_for_each_ref ($$;$) { - my ($pattern,$func,$gitdir) = @_; - # calls $func->($objid,$objtype,$fullrefname,$reftail); - # $reftail is RHS of ref after refs/[^/]+/ - # breaks if $pattern matches any ref `refs/blah' where blah has no `/' - # $pattern may be an array ref to mean multiple patterns - $pattern = [ $pattern ] unless ref $pattern; - my @cmd = (qw(git for-each-ref), @$pattern); - if (defined $gitdir) { - @cmd = ('sh','-ec','cd "$1"; shift; exec "$@"','x', $gitdir, @cmd); - } - open GFER, "-|", @cmd or confess "$!"; - debugcmd "|", @cmd; - while () { - chomp or confess "$_ ?"; - printdebug "|> ", $_, "\n"; - m#^(\w+)\s+(\w+)\s+(refs/[^/]+/(\S+))$# or confess "$_ ?"; - $func->($1,$2,$3,$4); - } - $!=0; $?=0; close GFER or confess "$pattern $? $!"; -} - sub git_get_ref ($) { # => '' if no such ref my ($refname) = @_; diff -pruN 13.12/Makefile 13.13/Makefile --- 13.12/Makefile 2025-08-15 09:05:44.000000000 +0000 +++ 13.13/Makefile 2025-08-24 10:43:28.000000000 +0000 @@ -71,7 +71,8 @@ GDR_MAN5PAGES=git-debrebase.5 GDP_PROGRAMS=git-debpush git-deborig GDP_PERLMODULES= \ Debian/Dgit/Core.pm \ - Debian/Dgit/GDP.pm + Debian/Dgit/GDP.pm \ + Debian/Dgit/I18n.pm GDP_MAN1PAGES=git-debpush.1 git-deborig.1 GDP_MAN5PAGES=tag2upload.5 diff -pruN 13.12/debian/changelog 13.13/debian/changelog --- 13.12/debian/changelog 2025-08-15 09:05:44.000000000 +0000 +++ 13.13/debian/changelog 2025-08-24 10:43:28.000000000 +0000 @@ -1,3 +1,45 @@ +dgit (13.13) unstable; urgency=medium + + tag2upload: + * git-debpush: Don't become confused and warn about nonexistent pristine-tar + metadata. Closes: #1111504. [Sean Whitton; report from Birger Schacht] + * git-debpush: Make submodule check precise. + Closes: #1111194. [Report from Simon McVittie] + * dgit, t2u: --quilt=gbp no longer minds patches editing .gitignore + Closes: #1111696. [Report from Simon Josefsson] + * dgit: Reject --quilt=baredebian+barball in tag2upload builder mode. + + i18n [Américo Monteiro]: + * dgit-user(7) manpage: Provide Portuguese translation. + * git-deborig(1): Update Portuguese translation. Closes: #1111527. + + Documentation: + * git-debpush(1): Fix link markup. [Sean Whitton] + * git-debpush(1): Add references to other tag2upload docs. [Sean Whitton] + * dgit(7): Give advice for if upstream source relies on gitattributes. + * dgit-nmu-simple(7): Document this as the best way to do a git-based NMU. + * git-debpush(1): Document --quilt=unapplied, not just --quilt=gbp. + * changelog: 13.12: Add missing Closes for #1108181. [Sean Whitton] + + dgit bugfix: + * dgit: baredebian: Fix diff instruction if upstream files discrepant. + + Packaging improvements: + * git-deborig: Replace several Perl module dependencies + with inline code and/or use of Dgit::Core. [Sean Whitton] + + Testing: + * git-deborig: New tests. [Sean Whitton] + * git-debpush: Test that we push the upstream tag. Re #1111305. + * CI: Disable some more useless jobs. + * CI: add t2u-integration-trixie job. + + Other changes: + * git-deborig: Improve an error message. [Sean Whitton] + * Internal tidying and refactoring. [Sean Whitton and Ian Jackson] + + -- Ian Jackson Sun, 24 Aug 2025 11:43:28 +0100 + dgit (13.12) unstable; urgency=medium dgit changes [Ian Jackson]: @@ -16,7 +58,8 @@ dgit (13.12) unstable; urgency=medium [Ian Jackson] New program: - * git-deborig, moved from 'devscripts' package. See #1105759. + * git-deborig, moved from 'devscripts' package. Closes: #1108181. + See also #1105759. * Declare that bin:git-debpush replaces bin:devscripts <<2.25.18. tag2upload service: diff -pruN 13.12/debian/control 13.13/debian/control --- 13.12/debian/control 2025-08-15 09:05:44.000000000 +0000 +++ 13.13/debian/control 2025-08-24 10:43:28.000000000 +0000 @@ -44,10 +44,7 @@ Description: rebasing git workflow tool gbp pq, and direct use of quilt patches. Package: git-debpush -Depends: git, gnupg, ${misc:Depends}, -# git-deborig: - libgit-wrapper-perl, libdpkg-perl, - liblist-compare-perl, libstring-shellquote-perl, libtry-tiny-perl, +Depends: git, gnupg, libdpkg-perl, ${misc:Depends} Replaces: devscripts (<< 2.25.18) # No "Breaks: devscripts (<< 2.25.18)" because: # - devscripts doesn't hard-depend on git-deborig diff -pruN 13.12/debian/tests/control 13.13/debian/tests/control --- 13.12/debian/tests/control 2025-08-15 09:05:44.000000000 +0000 +++ 13.13/debian/tests/control 2025-08-24 10:43:28.000000000 +0000 @@ -40,6 +40,10 @@ Tests: gdr-newupstream gdr-viagit Tests-Directory: tests/tests Depends: chiark-utils-bin, faketime, git-debrebase, git-buildpackage +Tests: git-deborig +Tests-Directory: tests/tests +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, git-debpush + Tests: gitattributes Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, bsdgames, man-db, git-man diff -pruN 13.12/dgit 13.13/dgit --- 13.12/dgit 2025-08-15 09:05:44.000000000 +0000 +++ 13.13/dgit 2025-08-24 10:43:28.000000000 +0000 @@ -82,7 +82,7 @@ our $bpd_glob; our $new_package = 0; our $includedirty = 0; our $t2u_bmode = 0; -our $t2u_upstream; +our $t2u_upstreamt; # tag name excluding refs/tags/ our $t2u_upstreamc; our $rmonerror = 1; our @deliberatelies; @@ -6054,7 +6054,12 @@ sub quiltify_splitting ($$$$$$$) { "--quilt=%s specified, implying patches-unapplied git tree\n". " but git tree differs from orig in upstream files.", $quilt_mode; - $msg .= $fulldiffhint->($unapplied, 'HEAD'); + $msg .= $fulldiffhint->( + $unapplied, + # With baredebian, we must compare with the upstream tag. + # (This should be unreachable with baredebian+tarball.) + $quilt_mode =~ m/baredebian/ ? $quilt_upstream_commitish : 'HEAD', + ); if (!stat_exists "debian/patches" and $quilt_mode !~ m/baredebian/) { $msg .= __ "\n ... debian/patches is missing; perhaps this is a patch queue branch?"; @@ -6094,7 +6099,7 @@ ENDU runcmd @git, qw(update-ref refs/heads/dgit-view HEAD); runcmd @git, qw(checkout -q dgit-view); } - if ($quilt_mode =~ m/gbp|dpm/ && + if ($quilt_mode =~ m/dpm/ && # not sure if we need this for git-dpm ($diffbits->{O2A} & 02)) { fail f_ <save("../$binfofn") or confess "$!"; my @cmd = (@mgtf, qw(--prepare --distro), access_nomdistro); - push @cmd, "--upstream=$t2u_upstream", - "--upstream-commit=$t2u_upstreamc" if $t2u_upstream; + push @cmd, "--upstream=$t2u_upstreamt", + "--upstream-commit=$t2u_upstreamc" if $t2u_upstreamt; runcmd @cmd; runcmd @gencmd; @@ -8443,7 +8451,7 @@ defvalopt '--expect-suite','', $suit defvalopt '--expect-version','', '.+', \$expected_version; defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode; # See comment next to --tag2upload-builder-mode option impl, below. -defvalopt '--t2u-upstream','','.+', \$t2u_upstream; +defvalopt '--t2u-upstream','','.+', \$t2u_upstreamt; defvalopt '--t2u-upstream-commit','','.+', \$t2u_upstreamc; defvalopt '', '-C', '.+', sub { diff -pruN 13.12/dgit-nmu-simple.7.pod 13.13/dgit-nmu-simple.7.pod --- 13.12/dgit-nmu-simple.7.pod 2025-08-15 09:05:44.000000000 +0000 +++ 13.13/dgit-nmu-simple.7.pod 2025-08-24 10:43:28.000000000 +0000 @@ -6,7 +6,7 @@ dgit-nmu-simple - tutorial for DDs wanti This tutorial describes how a Debian Developer can do a straightforward NMU -of a package in Debian, using dgit. +of a package in Debian, working (only) in git. This document won't help you decide whether an NMU is a good idea or diff -pruN 13.12/dgit.7 13.13/dgit.7 --- 13.12/dgit.7 2025-08-15 09:05:44.000000000 +0000 +++ 13.13/dgit.7 2025-08-24 10:43:28.000000000 +0000 @@ -260,6 +260,10 @@ so .origs you generate by hand can be wr You should consider using .B git-deborig (1) which gets this right, suppressing the attributes. + +If upstream relies on gitattributes for anything important, +you must reproduce the effect in debian/rules and/or +a Debian-specific patch. .SH PACKAGE SOURCE FORMATS If you are not the maintainer, you do not need to worry about the source format of the package. You can just make changes as you like diff -pruN 13.12/git-deborig 13.13/git-deborig --- 13.12/git-deborig 2025-08-15 09:05:44.000000000 +0000 +++ 13.13/git-deborig 2025-08-24 10:43:28.000000000 +0000 @@ -2,7 +2,7 @@ # git-deborig -- try to produce Debian orig.tar using git-archive(1) -# Copyright (C) 2016-2019 Sean Whitton +# Copyright (C) 2016-2019, 2025 Sean Whitton # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,38 +17,28 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +use Debian::Dgit::GDP; + use strict; use warnings; use Getopt::Long; -use Git::Wrapper; +use Debian::Dgit::Core; use Dpkg::Changelog::Parse; use Dpkg::IPC; use Dpkg::Version; -use List::Compare; -use String::ShellQuote; -use Try::Tiny; - -my $git = Git::Wrapper->new("."); # Sanity check #1 -try { - $git->rev_parse({ git_dir => 1 }); -} catch { - die "pwd doesn't look like a git repository ..\n"; -}; +(cmdoutput_errok qw(git rev-parse --git-dir)) + // die "pwd doesn't look like a git repository ..\n"; # Sanity check #2 die "pwd doesn't look like a Debian source package ..\n" - unless (-e "debian/changelog"); + unless -e "debian/changelog"; # Process command line args -my $orig_args = join(" ", map { shell_quote($_) } ("git", "deborig", @ARGV)); -my $overwrite = ''; -my $user_version = ''; -my $user_ref = ''; -my $just_print = ''; -my $just_print_tag_names = ''; +my $orig_args = shellquote qw(git deborig), @ARGV; +my ($overwrite, $user_version, $user_ref, $just_print, $just_print_tag_names); GetOptions( 'force|f' => \$overwrite, 'just-print' => \$just_print, @@ -56,35 +46,31 @@ GetOptions( 'version=s' => \$user_version ) || usage(); -if (scalar @ARGV == 1) { +if (@ARGV == 1) { $user_ref = shift @ARGV; -} elsif (scalar @ARGV >= 2 - || ($just_print && $just_print_tag_names)) { +} elsif (@ARGV >= 2 || $just_print && $just_print_tag_names) { usage(); } # Extract source package name from d/changelog and either extract # version too, or parse user-supplied version -my $version; my $changelog = Dpkg::Changelog::Parse->changelog_parse({}); -if ($user_version) { - $version = Dpkg::Version->new($user_version); -} else { - $version = $changelog->{Version}; -} +my $version = $user_version + ? Dpkg::Version->new($user_version) + : $changelog->{Version}; # Sanity check #3 -die "version number $version is not valid ..\n" unless $version->is_valid(); +die "version number $version is not valid ..\n" unless $version->is_valid; my $source = $changelog->{Source}; -my $upstream_version = $version->version(); +my $upstream_version = $version->version; # Sanity check #4 # Only complain if the user didn't supply a version, because the user # is not required to include a Debian revision when they pass # --version -die "this looks like a native package .." - if (!$user_version && $version->is_native()); +die "this looks like a native package ..\n" + if !$user_version && $version->is_native; # Convert the upstream version according to DEP-14 rules my $git_upstream_version = $upstream_version; @@ -99,9 +85,7 @@ my @candidate_tags = ( # Handle the --just-print-tag-names option if ($just_print_tag_names) { - for my $candidate_tag (@candidate_tags) { - print "$candidate_tag\n"; - } + print "$_\n" for @candidate_tags; exit 0; } @@ -110,7 +94,7 @@ my $compressor = "gzip -cn"; my $compression = "gz"; # Now check if we can use xz if (-e "debian/source/format") { - open(my $format_fh, '<', "debian/source/format") + open my $format_fh, "; chomp($format) if defined $format; @@ -123,7 +107,7 @@ if (-e "debian/source/format") { my $orig = "../${source}_$upstream_version.orig.tar.$compression"; die "$orig already exists: not overwriting without --force\n" - if (-e $orig && !$overwrite && !$just_print); + if -e $orig && !$overwrite && !$just_print; if ($user_ref) { # User told us the tag/branch to archive # We leave it to git-archive(1) to determine whether or not this @@ -131,29 +115,30 @@ if ($user_ref) { # User told us the t archive_ref_or_just_print($user_ref); } else { # User didn't specify a tag/branch to archive # Get available git tags - my @all_tags = $git->tag(); + my %all_tags; + git_for_each_ref("refs/tags", sub { + $_[2] =~ m#^refs/tags/#; $all_tags{$'}++; + }); # See which candidate version tags are present in the repo - my $lc = List::Compare->new(\@all_tags, \@candidate_tags); - my @version_tags = $lc->get_intersection(); + my @version_tags = grep $all_tags{$_}, @candidate_tags; # If there is only one candidate version tag, we're good to go. # Otherwise, let the user know they can tell us which one to use - if (scalar @version_tags > 1) { + if (@version_tags > 1) { print STDERR "tags ", join(", ", @version_tags), " all exist in this repository\n"; print STDERR "tell me which one you want to make an orig.tar from: $orig_args TAG\n"; exit 1; - } elsif (scalar @version_tags < 1) { + } elsif (@version_tags < 1) { print STDERR "couldn't find any of the following tags: ", join(", ", @candidate_tags), "\n"; print STDERR "tell me a tag or branch head to make an orig.tar from: $orig_args COMMITTISH\n"; exit 1; } else { - my $tag = shift @version_tags; - archive_ref_or_just_print($tag); + archive_ref_or_just_print(shift @version_tags); } } @@ -168,26 +153,24 @@ sub archive_ref_or_just_print { if ($just_print) { print "$ref\n"; print "$orig\n"; - my @cmd_mapped = map { shell_quote($_) } @$cmd; - print "@cmd_mapped\n"; + print shellquote(@$cmd)."\n"; } else { - my ($info_dir) = $git->rev_parse(qw|--git-path info/|); - my ($info_attributes) - = $git->rev_parse(qw|--git-path info/attributes|); - my ($deborig_attributes) - = $git->rev_parse(qw|--git-path info/attributes-deborig|); + my $info_dir = cmdoutput qw(git rev-parse --git-path info/); + my $info_attributes + = cmdoutput qw(git rev-parse --git-path info/attributes); + my $deborig_attributes + = cmdoutput qw(git rev-parse --git-path info/attributes-deborig); # sometimes the info/ dir may not exist - mkdir $info_dir unless (-e $info_dir); + -e or mkdir for $info_dir; # For compatibility with dgit, we have to override any # export-subst and export-ignore git attributes that might be set - rename $info_attributes, $deborig_attributes - if (-e $info_attributes); + rename $info_attributes, $deborig_attributes if -e $info_attributes; my $attributes_fh; - unless (open($attributes_fh, '>', $info_attributes)) { + unless (open $attributes_fh, ">", $info_attributes) { rename $deborig_attributes, $info_attributes - if (-e $deborig_attributes); + if -e $deborig_attributes; die "could not open $info_attributes for writing"; } print $attributes_fh "* -export-subst\n"; diff -pruN 13.12/git-debpush 13.13/git-debpush --- 13.12/git-debpush 2025-08-15 09:05:44.000000000 +0000 +++ 13.13/git-debpush 2025-08-24 10:43:28.000000000 +0000 @@ -543,10 +543,10 @@ case "$version" in uversion="${version%-*}" tb="${source}_${uversion}.orig.tar." if git rev-parse --verify --quiet refs/heads/pristine-tar >/dev/null \ - && { set +o pipefail # perl will SIGPIPE git-ls-tree(1) + && ( set +o pipefail # perl will SIGPIPE git-ls-tree(1) git ls-tree -z --name-only refs/heads/pristine-tar \ | perl -wn0e'exit 0 if /^\Q'"$tb"'\E/; exit 1 if eof' - set -o pipefail; }; then + ); then fail_check pristine-tar \ "pristine-tar data present for $uversion, but this will be ignored (#1106071)" fi @@ -556,7 +556,8 @@ esac # Per gitmodules(7) "FORMS", .gitmodules is always present at the # top-level of the tree if there are submodules. -[ -n "$(git ls-tree --full-tree "$branch" -- .gitmodules)" ] \ +[ -n "$(git ls-tree -r HEAD: --format='%(objecttype)' \ + | grep -Fx commit || test $? = 1)" ] \ && fail_check submodule \ "git submodule(s) detected; these are not supported" diff -pruN 13.12/git-debpush.1.pod 13.13/git-debpush.1.pod --- 13.12/git-debpush.1.pod 2025-08-15 09:05:44.000000000 +0000 +++ 13.13/git-debpush.1.pod 2025-08-24 10:43:28.000000000 +0000 @@ -121,7 +121,7 @@ tarballs.) =item B<--quilt=gbp>|B<--gbp> -You are using the 'unapplied' branch format, typically used with +You are using the patches-unapplied branch format, as typically used with gbp(1) or quilt(1). =item B<--quilt=dpm>|B<--dpm> @@ -152,6 +152,14 @@ squashed into a single patch in debian/p Tell the intermediary service to try B<--quilt=linear>, and if that cannot succeed, fall back to B<--quilt=smash>. +=item B<--quilt=unapplied> + +You're using the patched-unapplied format, and have all changes to upstream +C<.gitignore> files represented in C. + +Workflows based on git-buildpackage often don't make such patches, +so require C<--quilt=gbp> aka C<--gbp>. + =item B<--quilt=nofix> You are using the 'manually maintained applied' branch format or @@ -340,8 +348,10 @@ the failure. Passing this option disabl =head1 SEE ALSO +L, L + Git branch formats in use by Debian maintainers: - +L =head1 AUTHOR diff -pruN 13.12/mini-git-tag-fsck 13.13/mini-git-tag-fsck --- 13.12/mini-git-tag-fsck 2025-08-15 09:05:44.000000000 +0000 +++ 13.13/mini-git-tag-fsck 2025-08-24 10:43:28.000000000 +0000 @@ -288,10 +288,10 @@ def prepare(repo, distro, out_tar, deepe if utag_name: fetch_tag(utag_name, 1) - udepth = ancestry_depth(f"{utag_name}..{dtag_name}") + udepth = ancestry_depth(f"refs/tags/{utag_name}..{dtag_name}") if udepth > 0: required_depth = udepth - elif ancestry_depth(f"{dtag_name}..{utag_name}") > 0: + elif ancestry_depth(f"{dtag_name}..refs/tags/{utag_name}") > 0: raise Exception("Upstream tag is descendant of dep14 tag?!") if deepen_to: diff -pruN 13.12/po/en_US.po 13.13/po/en_US.po --- 13.12/po/en_US.po 2025-08-15 09:05:44.000000000 +0000 +++ 13.13/po/en_US.po 2025-08-24 10:43:28.000000000 +0000 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dgit ongoing\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-08-15 13:02+0000\n" +"POT-Creation-Date: 2025-08-23 09:54+0000\n" "PO-Revision-Date: 2018-08-26 16:55+0100\n" "Last-Translator: Ian Jackson \n" "Language-Team: dgit developrs \n" @@ -128,7 +128,7 @@ msgstr "" msgid "unknown %s `%s'" msgstr "" -#: ../dgit:981 ../git-debrebase:1548 ../Debian/Dgit/Core.pm:53 +#: ../dgit:981 ../git-debrebase:1548 ../Debian/Dgit/Core.pm:128 msgid "internal error" msgstr "" @@ -500,7 +500,7 @@ msgstr "" msgid "saving %s: %s" msgstr "" -#: ../dgit:2679 ../dgit:6753 +#: ../dgit:2679 ../dgit:6758 msgid "source package" msgstr "" @@ -1433,29 +1433,29 @@ msgid "" " but git tree differs from orig in upstream files." msgstr "" -#: ../dgit:6060 +#: ../dgit:6065 msgid "" "\n" " ... debian/patches is missing; perhaps this is a patch queue branch?" msgstr "" -#: ../dgit:6067 +#: ../dgit:6072 #, 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:6081 +#: ../dgit:6086 #, perl-format msgid "Combine debian/ with upstream source for %s\n" msgstr "" -#: ../dgit:6089 +#: ../dgit:6094 msgid "dgit view: creating patches-applied version using gbp pq" msgstr "" -#: ../dgit:6100 +#: ../dgit:6105 #, perl-format msgid "" "--quilt=%s specified, implying that HEAD is for use with a\n" @@ -1463,16 +1463,16 @@ msgid "" " .gitignores: but, such patches exist in debian/patches.\n" msgstr "" -#: ../dgit:6108 +#: ../dgit:6113 msgid "dgit view: creating patch to represent .gitignore changes" msgstr "" -#: ../dgit:6113 +#: ../dgit:6118 #, perl-format msgid "%s already exists; but want to create it to record .gitignore changes" msgstr "" -#: ../dgit:6119 +#: ../dgit:6124 msgid "" "Subject: Update .gitignore from Debian packaging branch\n" "\n" @@ -1481,54 +1481,54 @@ msgid "" "updates to users of the official Debian archive view of the package.\n" msgstr "" -#: ../dgit:6142 +#: ../dgit:6147 msgid "Commit patch to update .gitignore\n" msgstr "" -#: ../dgit:6212 +#: ../dgit:6217 msgid "maximum search space exceeded" msgstr "" -#: ../dgit:6230 +#: ../dgit:6235 #, perl-format msgid "has %s not %s" msgstr "" -#: ../dgit:6239 +#: ../dgit:6244 msgid "root commit" msgstr "" -#: ../dgit:6245 +#: ../dgit:6250 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "" -#: ../dgit:6257 +#: ../dgit:6262 #, perl-format msgid "changed %s" msgstr "" -#: ../dgit:6276 +#: ../dgit:6281 #, perl-format msgid "" "\n" "%s: error: quilt fixup cannot be linear. Stopped at:\n" msgstr "" -#: ../dgit:6283 +#: ../dgit:6288 #, perl-format msgid "%s: %s: %s\n" msgstr "" -#: ../dgit:6295 +#: ../dgit:6300 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" -#: ../dgit:6298 +#: ../dgit:6303 msgid "quilt fixup cannot be linear, smashing..." msgstr "" -#: ../dgit:6312 +#: ../dgit:6317 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1536,115 +1536,115 @@ msgid "" "\n" msgstr "" -#: ../dgit:6319 +#: ../dgit:6324 msgid "quiltify linearisation planning successful, executing..." msgstr "" -#: ../dgit:6353 +#: ../dgit:6358 msgid "contains unexpected slashes\n" msgstr "" -#: ../dgit:6354 +#: ../dgit:6359 msgid "contains leading punctuation\n" msgstr "" -#: ../dgit:6355 +#: ../dgit:6360 msgid "contains bad character(s)\n" msgstr "" -#: ../dgit:6356 +#: ../dgit:6361 msgid "is series file\n" msgstr "" -#: ../dgit:6357 +#: ../dgit:6362 msgid "too long\n" msgstr "" -#: ../dgit:6361 +#: ../dgit:6366 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" -#: ../dgit:6390 +#: ../dgit:6395 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "" -#: ../dgit:6465 +#: ../dgit:6470 #, perl-format msgid "" "quilt mode %s does not make sense (or is not supported) with single-debian-" "patch" msgstr "" -#: ../dgit:6490 +#: ../dgit:6495 msgid "converted" msgstr "" -#: ../dgit:6491 +#: ../dgit:6496 #, perl-format msgid "dgit view: created (%s)" msgstr "" -#: ../dgit:6547 +#: ../dgit:6552 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" -#: ../dgit:6557 +#: ../dgit:6562 msgid "starting quiltify (single-debian-patch)" msgstr "" -#: ../dgit:6593 +#: ../dgit:6598 #, perl-format msgid "regenerating patch using git diff (--quilt=%s)" msgstr "" -#: ../dgit:6687 +#: ../dgit:6692 msgid "" "warning: package uses dpkg-source include-binaries feature - not all changes " "are visible in patches!\n" msgstr "" -#: ../dgit:6696 +#: ../dgit:6701 #, perl-format msgid "warning: ignoring bad include-binaries file %s: %s\n" msgstr "" -#: ../dgit:6699 +#: ../dgit:6704 #, perl-format msgid "forbidden path component '%s'" msgstr "" -#: ../dgit:6709 +#: ../dgit:6714 #, perl-format msgid "path starts with '%s'" msgstr "" -#: ../dgit:6719 +#: ../dgit:6724 #, perl-format msgid "path to '%s' not a plain file or directory" msgstr "" -#: ../dgit:6777 +#: ../dgit:6782 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" -#: ../dgit:6809 +#: ../dgit:6814 #, perl-format msgid "dgit view: found cached (%s)" msgstr "" -#: ../dgit:6814 +#: ../dgit:6819 msgid "dgit view: found cached, no changes required" msgstr "" -#: ../dgit:6849 +#: ../dgit:6854 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "" -#: ../dgit:6942 +#: ../dgit:6947 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" @@ -1652,74 +1652,78 @@ msgid "" " anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n" msgstr "" -#: ../dgit:6956 +#: ../dgit:6961 msgid "Tree already contains .pc - will delete it." msgstr "" -#: ../dgit:6990 +#: ../dgit:6987 +msgid "baredebian+tarball is not meaningful with tag2upload" +msgstr "" + +#: ../dgit:6998 msgid "baredebian quilt fixup: could not find any origs" msgstr "" -#: ../dgit:7003 +#: ../dgit:7011 msgid "tarball" msgstr "" -#: ../dgit:7021 +#: ../dgit:7029 #, perl-format msgid "Combine orig tarballs for %s %s" msgstr "" -#: ../dgit:7037 +#: ../dgit:7045 msgid "tarballs" msgstr "" -#: ../dgit:7051 +#: ../dgit:7059 msgid "upstream" msgstr "" -#: ../dgit:7075 +#: ../dgit:7083 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "" -#: ../dgit:7085 +#: ../dgit:7093 #, perl-format msgid "" "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n" "%s: quilt differences: %9.00009s %s o+d/p %9.00009s %s o+d/p" msgstr "" -#: ../dgit:7095 +#: ../dgit:7103 msgid "" "This has only a debian/ directory; you probably want --quilt=bare debian." msgstr "" -#: ../dgit:7099 +#: ../dgit:7107 msgid "This might be a patches-unapplied branch." msgstr "" -#: ../dgit:7102 +#: ../dgit:7110 msgid "This might be a patches-applied branch." msgstr "" -#: ../dgit:7105 +#: ../dgit:7113 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" -#: ../dgit:7108 +#: ../dgit:7116 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" -#: ../dgit:7112 +#: ../dgit:7120 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" -#: ../dgit:7123 +#: ../dgit:7131 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "" -#: ../dgit:7162 +#: ../dgit:7170 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1728,96 +1732,96 @@ msgid "" "\n" msgstr "" -#: ../dgit:7174 +#: ../dgit:7182 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" -#: ../dgit:7203 +#: ../dgit:7211 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:7215 +#: ../dgit:7223 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" -#: ../dgit:7218 +#: ../dgit:7226 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" -#: ../dgit:7221 +#: ../dgit:7229 msgid "" "tree contains uncommitted, untracked, unignored files\n" "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them.\n" "To include them in the build, it is usually best to just commit them." msgstr "" -#: ../dgit:7235 +#: ../dgit:7243 #, perl-format msgid "" "quilt mode %s (generally needs untracked upstream files)\n" "contradicts clean mode %s (which would delete them)\n" msgstr "" -#: ../dgit:7252 +#: ../dgit:7260 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" -#: ../dgit:7266 +#: ../dgit:7274 msgid "clean takes no additional arguments" msgstr "" -#: ../dgit:7285 +#: ../dgit:7293 #, perl-format msgid "-p specified package %s, but changelog says %s" msgstr "" -#: ../dgit:7295 +#: ../dgit:7303 msgid "" "dgit: --include-dirty is not supported with split view (including with view-" "splitting quilt modes)" msgstr "" -#: ../dgit:7303 +#: ../dgit:7311 msgid "" "tree has .gitignore(s) but debian/source/options has 'tar-ignore'\n" "Try 'tar-ignore=.git' in d/s/options instead. (See #908747.)\n" msgstr "" -#: ../dgit:7308 +#: ../dgit:7316 #, perl-format msgid "" "%s: warning: debian/source/options contains bare 'tar-ignore'\n" "This can cause .gitignore files to be improperly omitted. See #908747.\n" msgstr "" -#: ../dgit:7319 +#: ../dgit:7327 #, perl-format msgid "dgit: --quilt=%s, %s" msgstr "" -#: ../dgit:7323 +#: ../dgit:7331 msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian" msgstr "" -#: ../dgit:7358 +#: ../dgit:7366 #, perl-format msgid "remove old changes file %s: %s" msgstr "" -#: ../dgit:7360 +#: ../dgit:7368 #, perl-format msgid "would remove %s" msgstr "" -#: ../dgit:7378 +#: ../dgit:7386 #, perl-format msgid "warning: dgit option %s must be passed before %s on dgit command line\n" msgstr "" -#: ../dgit:7385 +#: ../dgit:7393 #, perl-format msgid "" "warning: option %s should probably be passed to dgit before %s sub-command " @@ -1825,54 +1829,54 @@ msgid "" "to %s\n" msgstr "" -#: ../dgit:7411 +#: ../dgit:7419 msgid "archive query failed (queried because --since-version not specified)" msgstr "" -#: ../dgit:7417 +#: ../dgit:7425 #, perl-format msgid "changelog will contain changes since %s" msgstr "" -#: ../dgit:7420 +#: ../dgit:7428 msgid "package seems new, not specifying -v" msgstr "" -#: ../dgit:7463 +#: ../dgit:7471 msgid "Wanted to build nothing!" msgstr "" -#: ../dgit:7501 +#: ../dgit:7509 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "" -#: ../dgit:7508 +#: ../dgit:7516 #, perl-format msgid "%s found in binaries changes file %s" msgstr "" -#: ../dgit:7515 +#: ../dgit:7523 #, perl-format msgid "%s unexpectedly not created by build" msgstr "" -#: ../dgit:7519 +#: ../dgit:7527 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "" -#: ../dgit:7524 +#: ../dgit:7532 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "" -#: ../dgit:7527 +#: ../dgit:7535 #, perl-format msgid "build successful, results in %s\n" msgstr "" -#: ../dgit:7540 +#: ../dgit:7548 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1880,156 +1884,156 @@ msgid "" "Suggest you delete %s.\n" msgstr "" -#: ../dgit:7558 +#: ../dgit:7566 msgid "build successful\n" msgstr "" -#: ../dgit:7566 +#: ../dgit:7574 #, 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:7677 +#: ../dgit:7685 #, perl-format msgid "remove %s: %s" msgstr "" -#: ../dgit:7684 +#: ../dgit:7692 msgid "--tag2upload-builder-mode needs split-brain mode" msgstr "" -#: ../dgit:7689 +#: ../dgit:7697 msgid "upstream tag and not commit, or vice-versa" msgstr "" -#: ../dgit:7745 +#: ../dgit:7753 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "" -#: ../dgit:7770 +#: ../dgit:7778 msgid "--include-dirty not supported with --tag2upload-builder-mode" msgstr "" -#: ../dgit:7783 +#: ../dgit:7791 msgid "source-only buildinfo" msgstr "" -#: ../dgit:7812 +#: ../dgit:7820 #, perl-format msgid "put in place new built file (%s): %s" msgstr "" -#: ../dgit:7840 +#: ../dgit:7848 msgid "build-source takes no additional arguments" msgstr "" -#: ../dgit:7845 +#: ../dgit:7853 #, perl-format msgid "source built, results in %s and %s" msgstr "" -#: ../dgit:7852 +#: ../dgit:7860 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" msgstr "" -#: ../dgit:7857 +#: ../dgit:7865 msgid "--tag2upload-builder-mode not supported with -C" msgstr "" -#: ../dgit:7860 +#: ../dgit:7868 msgid "source changes file" msgstr "" -#: ../dgit:7862 +#: ../dgit:7870 msgid "user-specified changes file is not source-only" msgstr "" -#: ../dgit:7882 ../dgit:7884 +#: ../dgit:7890 ../dgit:7892 #, perl-format msgid "%s (in build products dir): %s" msgstr "" -#: ../dgit:7898 +#: ../dgit:7906 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:7911 +#: ../dgit:7919 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" msgstr "" -#: ../dgit:7915 +#: ../dgit:7923 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:7945 +#: ../dgit:7953 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "" -#: ../dgit:7966 +#: ../dgit:7974 msgid "source tree" msgstr "" -#: ../dgit:7968 +#: ../dgit:7976 #, perl-format msgid "dgit: import-dsc: %s" msgstr "" -#: ../dgit:7981 +#: ../dgit:7989 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "" -#: ../dgit:7985 +#: ../dgit:7993 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "" -#: ../dgit:7989 +#: ../dgit:7997 msgid "dry run makes no sense with import-dsc" msgstr "" -#: ../dgit:8006 +#: ../dgit:8014 #, perl-format msgid "%s is checked out - will not update it" msgstr "" -#: ../dgit:8011 +#: ../dgit:8019 #, perl-format msgid "open import .dsc (%s): %s" msgstr "" -#: ../dgit:8013 +#: ../dgit:8021 #, perl-format msgid "read %s: %s" msgstr "" -#: ../dgit:8024 +#: ../dgit:8032 msgid "import-dsc signature check failed" msgstr "" -#: ../dgit:8027 +#: ../dgit:8035 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "" -#: ../dgit:8038 +#: ../dgit:8046 msgid "Dgit metadata in .dsc" msgstr "" -#: ../dgit:8049 +#: ../dgit:8057 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "" -#: ../dgit:8058 +#: ../dgit:8066 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -2037,21 +2041,21 @@ msgid "" "plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n" msgstr "" -#: ../dgit:8065 +#: ../dgit:8073 msgid "Not fast forward, forced update." msgstr "" -#: ../dgit:8067 +#: ../dgit:8075 #, perl-format msgid "Not fast forward to %s" msgstr "" -#: ../dgit:8072 +#: ../dgit:8080 #, perl-format msgid "updated git ref %s" msgstr "" -#: ../dgit:8077 +#: ../dgit:8085 #, perl-format msgid "" "Branch %s already exists\n" @@ -2059,179 +2063,179 @@ msgid "" "Specify +%s to overwrite, discarding existing history\n" msgstr "" -#: ../dgit:8097 +#: ../dgit:8105 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "" -#: ../dgit:8099 +#: ../dgit:8107 #, perl-format msgid "stat %s: %s" msgstr "" -#: ../dgit:8107 +#: ../dgit:8115 #, perl-format msgid "import %s requires %s, but: %s" msgstr "" -#: ../dgit:8126 +#: ../dgit:8134 #, perl-format msgid "cannot import %s which seems to be inside working tree!" msgstr "" -#: ../dgit:8130 +#: ../dgit:8138 #, perl-format msgid "symlink %s to %s: %s" msgstr "" -#: ../dgit:8131 +#: ../dgit:8139 #, perl-format msgid "made symlink %s -> %s" msgstr "" -#: ../dgit:8142 +#: ../dgit:8150 msgid "Import, forced update - synthetic orphan git history." msgstr "" -#: ../dgit:8144 +#: ../dgit:8152 msgid "Import, merging." msgstr "" -#: ../dgit:8158 +#: ../dgit:8166 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "" -#: ../dgit:8167 +#: ../dgit:8175 #, perl-format msgid "results are in git ref %s" msgstr "" -#: ../dgit:8174 +#: ../dgit:8182 msgid "need only 1 subpath argument" msgstr "" -#: ../dgit:8192 +#: ../dgit:8200 msgid "need destination argument" msgstr "" -#: ../dgit:8197 +#: ../dgit:8205 #, perl-format msgid "exec git clone: %s\n" msgstr "" -#: ../dgit:8205 +#: ../dgit:8213 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url" msgstr "" -#: ../dgit:8217 +#: ../dgit:8225 msgid "package does not exist in target suite, looking in whole archive\n" msgstr "" -#: ../dgit:8224 +#: ../dgit:8232 #, perl-format msgid "package in target suite is different upstream version, %s\n" msgstr "" -#: ../dgit:8236 +#: ../dgit:8244 msgid "suite has this upstream version, but no origs\n" msgstr "" -#: ../dgit:8240 +#: ../dgit:8248 msgid "suite has origs for this upstream version\n" msgstr "" -#: ../dgit:8266 +#: ../dgit:8274 #, perl-format msgid "no .origs for package %s upstream version %s\n" msgstr "" -#: ../dgit:8298 +#: ../dgit:8306 #, perl-format msgid "multiple possibilities for orig component %s:\n" msgstr "" -#: ../dgit:8311 +#: ../dgit:8319 msgid "failed to resolve, unambiguously, which .origs are intended\n" msgstr "" -#: ../dgit:8329 +#: ../dgit:8337 #, perl-format msgid "unknown long option to download-unfetched-origs `%s'" msgstr "" -#: ../dgit:8332 +#: ../dgit:8340 msgid "download-unfetched-origs takes no non-option arguments" msgstr "" -#: ../dgit:8362 +#: ../dgit:8370 #, perl-format msgid "orig file is missing (404) at archive mirror: %s\n" msgstr "" -#: ../dgit:8369 +#: ../dgit:8377 #, perl-format msgid "%d orig file(s) could not be obtained\n" msgstr "" -#: ../dgit:8379 +#: ../dgit:8387 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "" -#: ../dgit:8385 +#: ../dgit:8393 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "" -#: ../dgit:8392 ../dgit:8398 +#: ../dgit:8400 ../dgit:8406 msgid "no arguments allowed to dgit setup-useremail" msgstr "" -#: ../dgit:8404 +#: ../dgit:8412 msgid "no arguments allowed to dgit setup-tree" msgstr "" -#: ../dgit:8459 +#: ../dgit:8467 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." msgstr "" -#: ../dgit:8501 +#: ../dgit:8509 #, perl-format msgid "%s needs a value" msgstr "" -#: ../dgit:8505 +#: ../dgit:8513 #, perl-format msgid "bad value `%s' for %s" msgstr "" -#: ../dgit:8614 +#: ../dgit:8622 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "" -#: ../dgit:8648 +#: ../dgit:8656 #, perl-format msgid "unknown long option `%s'" msgstr "" -#: ../dgit:8705 +#: ../dgit:8713 #, perl-format msgid "unknown short option `%s'" msgstr "" -#: ../dgit:8728 +#: ../dgit:8736 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "" -#: ../dgit:8732 +#: ../dgit:8740 #, perl-format msgid "%s is blocked\n" msgstr "" -#: ../dgit:8738 +#: ../dgit:8746 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -2239,64 +2243,64 @@ msgid "" "Giving up.\n" msgstr "" -#: ../dgit:8785 +#: ../dgit:8793 #, perl-format msgid "" "unsupported option `%s', cannot set command for %s (can only provide options)" msgstr "" -#: ../dgit:8790 +#: ../dgit:8798 #, perl-format msgid "" "unsupported option `%s', cannot provide additional options for %s (can only " "provide replacement command)" msgstr "" -#: ../dgit:8797 +#: ../dgit:8805 #, perl-format msgid "" "unsupported option `%s', cannot adjust options for %s (can only provide " "replacement command)" msgstr "" -#: ../dgit:8829 +#: ../dgit:8837 #, perl-format msgid "cannot set command for %s (can only provide options)" msgstr "" -#: ../dgit:8850 +#: ../dgit:8858 #, perl-format msgid "cannot configure options for %s (can only provide replacement command)" msgstr "" -#: ../dgit:8869 +#: ../dgit:8877 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "" -#: ../dgit:8881 +#: ../dgit:8889 #, perl-format msgid "unknown %s setting `%s'" msgstr "" -#: ../dgit:8894 +#: ../dgit:8902 msgid "--tag2upload-builder-mode implies --dep14tag-reuse=must" msgstr "" -#: ../dgit:8901 +#: ../dgit:8909 #, perl-format msgid "unknown dep14tag-reuse mode `%s'" msgstr "" -#: ../dgit:8924 +#: ../dgit:8932 msgid "DRY RUN ONLY\n" msgstr "" -#: ../dgit:8925 +#: ../dgit:8933 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" -#: ../dgit:8945 +#: ../dgit:8953 #, perl-format msgid "unknown operation %s" msgstr "" @@ -3017,93 +3021,93 @@ msgstr "" msgid "data block" msgstr "" -#: ../Debian/Dgit.pm:324 +#: ../Debian/Dgit/Core.pm:168 #, perl-format msgid "error: %s\n" msgstr "" -#: ../Debian/Dgit.pm:350 -#, perl-format -msgid "getcwd failed: %s\n" -msgstr "" - -#: ../Debian/Dgit.pm:369 +#: ../Debian/Dgit/Core.pm:183 msgid "terminated, reporting successful completion" msgstr "" -#: ../Debian/Dgit.pm:371 +#: ../Debian/Dgit/Core.pm:185 #, perl-format msgid "failed with error exit status %s" msgstr "" -#: ../Debian/Dgit.pm:374 +#: ../Debian/Dgit/Core.pm:188 #, perl-format msgid "died due to fatal signal %s" msgstr "" -#: ../Debian/Dgit.pm:378 +#: ../Debian/Dgit/Core.pm:192 #, perl-format msgid "failed with unknown wait status %s" msgstr "" -#: ../Debian/Dgit.pm:384 +#: ../Debian/Dgit/Core.pm:198 msgid "failed command" msgstr "" -#: ../Debian/Dgit.pm:390 +#: ../Debian/Dgit/Core.pm:204 #, perl-format msgid "failed to fork/exec: %s" msgstr "" -#: ../Debian/Dgit.pm:392 +#: ../Debian/Dgit/Core.pm:206 #, perl-format msgid "subprocess %s" msgstr "" -#: ../Debian/Dgit.pm:394 +#: ../Debian/Dgit/Core.pm:208 msgid "subprocess produced invalid output" msgstr "" -#: ../Debian/Dgit.pm:499 +#: ../Debian/Dgit.pm:253 +#, perl-format +msgid "getcwd failed: %s\n" +msgstr "" + +#: ../Debian/Dgit.pm:301 msgid "stat source file: %S" msgstr "" -#: ../Debian/Dgit.pm:509 +#: ../Debian/Dgit.pm:311 msgid "stat destination file: %S" msgstr "" -#: ../Debian/Dgit.pm:528 +#: ../Debian/Dgit.pm:330 msgid "finally install file after cp: %S" msgstr "" -#: ../Debian/Dgit.pm:534 +#: ../Debian/Dgit.pm:336 msgid "delete old file after cp: %S" msgstr "" -#: ../Debian/Dgit.pm:557 +#: ../Debian/Dgit.pm:359 msgid "" "not in a git working tree?\n" "(git rev-parse --show-toplevel produced no output)\n" msgstr "" -#: ../Debian/Dgit.pm:560 +#: ../Debian/Dgit.pm:362 #, perl-format msgid "chdir toplevel %s: %s\n" msgstr "" -#: ../Debian/Dgit.pm:668 +#: ../Debian/Dgit.pm:448 msgid "git index contains changes (does not match HEAD)" msgstr "" -#: ../Debian/Dgit.pm:669 +#: ../Debian/Dgit.pm:449 msgid "working tree is dirty (does not match HEAD)" msgstr "" -#: ../Debian/Dgit.pm:694 +#: ../Debian/Dgit.pm:474 msgid "using specified upstream commitish" msgstr "" -#: ../Debian/Dgit.pm:701 +#: ../Debian/Dgit.pm:481 #, perl-format msgid "" "Could not determine appropriate upstream commitish.\n" @@ -3111,103 +3115,103 @@ msgid "" " Check version, and specify upstream commitish explicitly." msgstr "" -#: ../Debian/Dgit.pm:706 ../Debian/Dgit.pm:708 +#: ../Debian/Dgit.pm:486 ../Debian/Dgit.pm:488 #, perl-format msgid "using upstream from git tag %s" msgstr "" -#: ../Debian/Dgit.pm:822 +#: ../Debian/Dgit.pm:602 #, perl-format msgid "failed to remove directory tree %s: rm -rf: %s; %s\n" msgstr "" -#: ../Debian/Dgit.pm:857 +#: ../Debian/Dgit.pm:637 msgid "detached HEAD" msgstr "" -#: ../Debian/Dgit.pm:858 +#: ../Debian/Dgit.pm:638 msgid "HEAD symref is not to refs/" msgstr "" -#: ../Debian/Dgit.pm:874 +#: ../Debian/Dgit.pm:654 #, perl-format msgid "parsing of %s failed" msgstr "" -#: ../Debian/Dgit.pm:883 +#: ../Debian/Dgit.pm:663 #, perl-format msgid "" "control file %s is (already) PGP-signed. Note that dgit push needs to " "modify the .dsc and then do the signature itself" msgstr "" -#: ../Debian/Dgit.pm:897 +#: ../Debian/Dgit.pm:677 #, perl-format msgid "open %s (%s): %s" msgstr "" -#: ../Debian/Dgit.pm:922 +#: ../Debian/Dgit.pm:702 #, perl-format msgid "missing field %s in %s" msgstr "" -#: ../Debian/Dgit.pm:1008 +#: ../Debian/Dgit.pm:788 msgid "Dummy commit - do not use\n" msgstr "" -#: ../Debian/Dgit.pm:1029 +#: ../Debian/Dgit.pm:809 #, perl-format msgid "exec %s: %s\n" msgstr "" -#: ../Debian/Dgit.pm:1057 +#: ../Debian/Dgit.pm:837 #, perl-format msgid "Taint recorded at time %s for package %s" msgstr "" -#: ../Debian/Dgit.pm:1059 +#: ../Debian/Dgit.pm:839 #, perl-format msgid "Taint recorded at time %s for any package" msgstr "" -#: ../Debian/Dgit.pm:1061 +#: ../Debian/Dgit.pm:841 #, perl-format msgid "Taint recorded for package %s" msgstr "" -#: ../Debian/Dgit.pm:1063 +#: ../Debian/Dgit.pm:843 msgid "Taint recorded for any package" msgstr "" -#: ../Debian/Dgit.pm:1075 +#: ../Debian/Dgit.pm:855 msgid "Uncorrectable error. If confused, consult administrator.\n" msgstr "" -#: ../Debian/Dgit.pm:1078 +#: ../Debian/Dgit.pm:858 msgid "Could perhaps be forced using --deliberately. Consult documentation.\n" msgstr "" -#: ../Debian/Dgit.pm:1081 +#: ../Debian/Dgit.pm:861 #, perl-format msgid "Forcing due to %s\n" msgstr "" -#: ../Debian/Dgit.pm:1146 +#: ../Debian/Dgit.pm:926 #, perl-format msgid "cannot stat %s/.git: %s" msgstr "" -#: ../Debian/Dgit.pm:1169 +#: ../Debian/Dgit.pm:949 #, perl-format msgid "failed to mkdir playground parent %s: %s" msgstr "" -#: ../Debian/Dgit.pm:1177 +#: ../Debian/Dgit.pm:957 #, perl-format msgid "failed to mkdir a playground %s: %s" msgstr "" -#: ../Debian/Dgit.pm:1186 +#: ../Debian/Dgit.pm:966 #, perl-format msgid "failed to mkdir the playground %s: %s" msgstr "" diff -pruN 13.12/po/messages.pot 13.13/po/messages.pot --- 13.12/po/messages.pot 2025-08-15 09:05:44.000000000 +0000 +++ 13.13/po/messages.pot 2025-08-24 10:43:28.000000000 +0000 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dgit ongoing\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-08-15 13:02+0000\n" +"POT-Creation-Date: 2025-08-23 09:54+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -128,7 +128,7 @@ msgstr "" msgid "unknown %s `%s'" msgstr "" -#: ../dgit:981 ../git-debrebase:1548 ../Debian/Dgit/Core.pm:53 +#: ../dgit:981 ../git-debrebase:1548 ../Debian/Dgit/Core.pm:128 msgid "internal error" msgstr "" @@ -500,7 +500,7 @@ msgstr "" msgid "saving %s: %s" msgstr "" -#: ../dgit:2679 ../dgit:6753 +#: ../dgit:2679 ../dgit:6758 msgid "source package" msgstr "" @@ -1433,29 +1433,29 @@ msgid "" " but git tree differs from orig in upstream files." msgstr "" -#: ../dgit:6060 +#: ../dgit:6065 msgid "" "\n" " ... debian/patches is missing; perhaps this is a patch queue branch?" msgstr "" -#: ../dgit:6067 +#: ../dgit:6072 #, 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:6081 +#: ../dgit:6086 #, perl-format msgid "Combine debian/ with upstream source for %s\n" msgstr "" -#: ../dgit:6089 +#: ../dgit:6094 msgid "dgit view: creating patches-applied version using gbp pq" msgstr "" -#: ../dgit:6100 +#: ../dgit:6105 #, perl-format msgid "" "--quilt=%s specified, implying that HEAD is for use with a\n" @@ -1463,16 +1463,16 @@ msgid "" " .gitignores: but, such patches exist in debian/patches.\n" msgstr "" -#: ../dgit:6108 +#: ../dgit:6113 msgid "dgit view: creating patch to represent .gitignore changes" msgstr "" -#: ../dgit:6113 +#: ../dgit:6118 #, perl-format msgid "%s already exists; but want to create it to record .gitignore changes" msgstr "" -#: ../dgit:6119 +#: ../dgit:6124 msgid "" "Subject: Update .gitignore from Debian packaging branch\n" "\n" @@ -1481,54 +1481,54 @@ msgid "" "updates to users of the official Debian archive view of the package.\n" msgstr "" -#: ../dgit:6142 +#: ../dgit:6147 msgid "Commit patch to update .gitignore\n" msgstr "" -#: ../dgit:6212 +#: ../dgit:6217 msgid "maximum search space exceeded" msgstr "" -#: ../dgit:6230 +#: ../dgit:6235 #, perl-format msgid "has %s not %s" msgstr "" -#: ../dgit:6239 +#: ../dgit:6244 msgid "root commit" msgstr "" -#: ../dgit:6245 +#: ../dgit:6250 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "" -#: ../dgit:6257 +#: ../dgit:6262 #, perl-format msgid "changed %s" msgstr "" -#: ../dgit:6276 +#: ../dgit:6281 #, perl-format msgid "" "\n" "%s: error: quilt fixup cannot be linear. Stopped at:\n" msgstr "" -#: ../dgit:6283 +#: ../dgit:6288 #, perl-format msgid "%s: %s: %s\n" msgstr "" -#: ../dgit:6295 +#: ../dgit:6300 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" -#: ../dgit:6298 +#: ../dgit:6303 msgid "quilt fixup cannot be linear, smashing..." msgstr "" -#: ../dgit:6312 +#: ../dgit:6317 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1536,115 +1536,115 @@ msgid "" "\n" msgstr "" -#: ../dgit:6319 +#: ../dgit:6324 msgid "quiltify linearisation planning successful, executing..." msgstr "" -#: ../dgit:6353 +#: ../dgit:6358 msgid "contains unexpected slashes\n" msgstr "" -#: ../dgit:6354 +#: ../dgit:6359 msgid "contains leading punctuation\n" msgstr "" -#: ../dgit:6355 +#: ../dgit:6360 msgid "contains bad character(s)\n" msgstr "" -#: ../dgit:6356 +#: ../dgit:6361 msgid "is series file\n" msgstr "" -#: ../dgit:6357 +#: ../dgit:6362 msgid "too long\n" msgstr "" -#: ../dgit:6361 +#: ../dgit:6366 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" -#: ../dgit:6390 +#: ../dgit:6395 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "" -#: ../dgit:6465 +#: ../dgit:6470 #, perl-format msgid "" "quilt mode %s does not make sense (or is not supported) with single-debian-" "patch" msgstr "" -#: ../dgit:6490 +#: ../dgit:6495 msgid "converted" msgstr "" -#: ../dgit:6491 +#: ../dgit:6496 #, perl-format msgid "dgit view: created (%s)" msgstr "" -#: ../dgit:6547 +#: ../dgit:6552 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" -#: ../dgit:6557 +#: ../dgit:6562 msgid "starting quiltify (single-debian-patch)" msgstr "" -#: ../dgit:6593 +#: ../dgit:6598 #, perl-format msgid "regenerating patch using git diff (--quilt=%s)" msgstr "" -#: ../dgit:6687 +#: ../dgit:6692 msgid "" "warning: package uses dpkg-source include-binaries feature - not all changes " "are visible in patches!\n" msgstr "" -#: ../dgit:6696 +#: ../dgit:6701 #, perl-format msgid "warning: ignoring bad include-binaries file %s: %s\n" msgstr "" -#: ../dgit:6699 +#: ../dgit:6704 #, perl-format msgid "forbidden path component '%s'" msgstr "" -#: ../dgit:6709 +#: ../dgit:6714 #, perl-format msgid "path starts with '%s'" msgstr "" -#: ../dgit:6719 +#: ../dgit:6724 #, perl-format msgid "path to '%s' not a plain file or directory" msgstr "" -#: ../dgit:6777 +#: ../dgit:6782 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" -#: ../dgit:6809 +#: ../dgit:6814 #, perl-format msgid "dgit view: found cached (%s)" msgstr "" -#: ../dgit:6814 +#: ../dgit:6819 msgid "dgit view: found cached, no changes required" msgstr "" -#: ../dgit:6849 +#: ../dgit:6854 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "" -#: ../dgit:6942 +#: ../dgit:6947 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" @@ -1652,74 +1652,78 @@ msgid "" " anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n" msgstr "" -#: ../dgit:6956 +#: ../dgit:6961 msgid "Tree already contains .pc - will delete it." msgstr "" -#: ../dgit:6990 +#: ../dgit:6987 +msgid "baredebian+tarball is not meaningful with tag2upload" +msgstr "" + +#: ../dgit:6998 msgid "baredebian quilt fixup: could not find any origs" msgstr "" -#: ../dgit:7003 +#: ../dgit:7011 msgid "tarball" msgstr "" -#: ../dgit:7021 +#: ../dgit:7029 #, perl-format msgid "Combine orig tarballs for %s %s" msgstr "" -#: ../dgit:7037 +#: ../dgit:7045 msgid "tarballs" msgstr "" -#: ../dgit:7051 +#: ../dgit:7059 msgid "upstream" msgstr "" -#: ../dgit:7075 +#: ../dgit:7083 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "" -#: ../dgit:7085 +#: ../dgit:7093 #, perl-format msgid "" "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n" "%s: quilt differences: %9.00009s %s o+d/p %9.00009s %s o+d/p" msgstr "" -#: ../dgit:7095 +#: ../dgit:7103 msgid "" "This has only a debian/ directory; you probably want --quilt=bare debian." msgstr "" -#: ../dgit:7099 +#: ../dgit:7107 msgid "This might be a patches-unapplied branch." msgstr "" -#: ../dgit:7102 +#: ../dgit:7110 msgid "This might be a patches-applied branch." msgstr "" -#: ../dgit:7105 +#: ../dgit:7113 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" -#: ../dgit:7108 +#: ../dgit:7116 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" -#: ../dgit:7112 +#: ../dgit:7120 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" -#: ../dgit:7123 +#: ../dgit:7131 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "" -#: ../dgit:7162 +#: ../dgit:7170 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1728,96 +1732,96 @@ msgid "" "\n" msgstr "" -#: ../dgit:7174 +#: ../dgit:7182 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" -#: ../dgit:7203 +#: ../dgit:7211 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:7215 +#: ../dgit:7223 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" -#: ../dgit:7218 +#: ../dgit:7226 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" -#: ../dgit:7221 +#: ../dgit:7229 msgid "" "tree contains uncommitted, untracked, unignored files\n" "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them.\n" "To include them in the build, it is usually best to just commit them." msgstr "" -#: ../dgit:7235 +#: ../dgit:7243 #, perl-format msgid "" "quilt mode %s (generally needs untracked upstream files)\n" "contradicts clean mode %s (which would delete them)\n" msgstr "" -#: ../dgit:7252 +#: ../dgit:7260 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" -#: ../dgit:7266 +#: ../dgit:7274 msgid "clean takes no additional arguments" msgstr "" -#: ../dgit:7285 +#: ../dgit:7293 #, perl-format msgid "-p specified package %s, but changelog says %s" msgstr "" -#: ../dgit:7295 +#: ../dgit:7303 msgid "" "dgit: --include-dirty is not supported with split view (including with view-" "splitting quilt modes)" msgstr "" -#: ../dgit:7303 +#: ../dgit:7311 msgid "" "tree has .gitignore(s) but debian/source/options has 'tar-ignore'\n" "Try 'tar-ignore=.git' in d/s/options instead. (See #908747.)\n" msgstr "" -#: ../dgit:7308 +#: ../dgit:7316 #, perl-format msgid "" "%s: warning: debian/source/options contains bare 'tar-ignore'\n" "This can cause .gitignore files to be improperly omitted. See #908747.\n" msgstr "" -#: ../dgit:7319 +#: ../dgit:7327 #, perl-format msgid "dgit: --quilt=%s, %s" msgstr "" -#: ../dgit:7323 +#: ../dgit:7331 msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian" msgstr "" -#: ../dgit:7358 +#: ../dgit:7366 #, perl-format msgid "remove old changes file %s: %s" msgstr "" -#: ../dgit:7360 +#: ../dgit:7368 #, perl-format msgid "would remove %s" msgstr "" -#: ../dgit:7378 +#: ../dgit:7386 #, perl-format msgid "warning: dgit option %s must be passed before %s on dgit command line\n" msgstr "" -#: ../dgit:7385 +#: ../dgit:7393 #, perl-format msgid "" "warning: option %s should probably be passed to dgit before %s sub-command " @@ -1825,54 +1829,54 @@ msgid "" "to %s\n" msgstr "" -#: ../dgit:7411 +#: ../dgit:7419 msgid "archive query failed (queried because --since-version not specified)" msgstr "" -#: ../dgit:7417 +#: ../dgit:7425 #, perl-format msgid "changelog will contain changes since %s" msgstr "" -#: ../dgit:7420 +#: ../dgit:7428 msgid "package seems new, not specifying -v" msgstr "" -#: ../dgit:7463 +#: ../dgit:7471 msgid "Wanted to build nothing!" msgstr "" -#: ../dgit:7501 +#: ../dgit:7509 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "" -#: ../dgit:7508 +#: ../dgit:7516 #, perl-format msgid "%s found in binaries changes file %s" msgstr "" -#: ../dgit:7515 +#: ../dgit:7523 #, perl-format msgid "%s unexpectedly not created by build" msgstr "" -#: ../dgit:7519 +#: ../dgit:7527 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "" -#: ../dgit:7524 +#: ../dgit:7532 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "" -#: ../dgit:7527 +#: ../dgit:7535 #, perl-format msgid "build successful, results in %s\n" msgstr "" -#: ../dgit:7540 +#: ../dgit:7548 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1880,156 +1884,156 @@ msgid "" "Suggest you delete %s.\n" msgstr "" -#: ../dgit:7558 +#: ../dgit:7566 msgid "build successful\n" msgstr "" -#: ../dgit:7566 +#: ../dgit:7574 #, 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:7677 +#: ../dgit:7685 #, perl-format msgid "remove %s: %s" msgstr "" -#: ../dgit:7684 +#: ../dgit:7692 msgid "--tag2upload-builder-mode needs split-brain mode" msgstr "" -#: ../dgit:7689 +#: ../dgit:7697 msgid "upstream tag and not commit, or vice-versa" msgstr "" -#: ../dgit:7745 +#: ../dgit:7753 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "" -#: ../dgit:7770 +#: ../dgit:7778 msgid "--include-dirty not supported with --tag2upload-builder-mode" msgstr "" -#: ../dgit:7783 +#: ../dgit:7791 msgid "source-only buildinfo" msgstr "" -#: ../dgit:7812 +#: ../dgit:7820 #, perl-format msgid "put in place new built file (%s): %s" msgstr "" -#: ../dgit:7840 +#: ../dgit:7848 msgid "build-source takes no additional arguments" msgstr "" -#: ../dgit:7845 +#: ../dgit:7853 #, perl-format msgid "source built, results in %s and %s" msgstr "" -#: ../dgit:7852 +#: ../dgit:7860 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" msgstr "" -#: ../dgit:7857 +#: ../dgit:7865 msgid "--tag2upload-builder-mode not supported with -C" msgstr "" -#: ../dgit:7860 +#: ../dgit:7868 msgid "source changes file" msgstr "" -#: ../dgit:7862 +#: ../dgit:7870 msgid "user-specified changes file is not source-only" msgstr "" -#: ../dgit:7882 ../dgit:7884 +#: ../dgit:7890 ../dgit:7892 #, perl-format msgid "%s (in build products dir): %s" msgstr "" -#: ../dgit:7898 +#: ../dgit:7906 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:7911 +#: ../dgit:7919 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" msgstr "" -#: ../dgit:7915 +#: ../dgit:7923 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:7945 +#: ../dgit:7953 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "" -#: ../dgit:7966 +#: ../dgit:7974 msgid "source tree" msgstr "" -#: ../dgit:7968 +#: ../dgit:7976 #, perl-format msgid "dgit: import-dsc: %s" msgstr "" -#: ../dgit:7981 +#: ../dgit:7989 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "" -#: ../dgit:7985 +#: ../dgit:7993 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "" -#: ../dgit:7989 +#: ../dgit:7997 msgid "dry run makes no sense with import-dsc" msgstr "" -#: ../dgit:8006 +#: ../dgit:8014 #, perl-format msgid "%s is checked out - will not update it" msgstr "" -#: ../dgit:8011 +#: ../dgit:8019 #, perl-format msgid "open import .dsc (%s): %s" msgstr "" -#: ../dgit:8013 +#: ../dgit:8021 #, perl-format msgid "read %s: %s" msgstr "" -#: ../dgit:8024 +#: ../dgit:8032 msgid "import-dsc signature check failed" msgstr "" -#: ../dgit:8027 +#: ../dgit:8035 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "" -#: ../dgit:8038 +#: ../dgit:8046 msgid "Dgit metadata in .dsc" msgstr "" -#: ../dgit:8049 +#: ../dgit:8057 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "" -#: ../dgit:8058 +#: ../dgit:8066 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -2037,21 +2041,21 @@ msgid "" "plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n" msgstr "" -#: ../dgit:8065 +#: ../dgit:8073 msgid "Not fast forward, forced update." msgstr "" -#: ../dgit:8067 +#: ../dgit:8075 #, perl-format msgid "Not fast forward to %s" msgstr "" -#: ../dgit:8072 +#: ../dgit:8080 #, perl-format msgid "updated git ref %s" msgstr "" -#: ../dgit:8077 +#: ../dgit:8085 #, perl-format msgid "" "Branch %s already exists\n" @@ -2059,179 +2063,179 @@ msgid "" "Specify +%s to overwrite, discarding existing history\n" msgstr "" -#: ../dgit:8097 +#: ../dgit:8105 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "" -#: ../dgit:8099 +#: ../dgit:8107 #, perl-format msgid "stat %s: %s" msgstr "" -#: ../dgit:8107 +#: ../dgit:8115 #, perl-format msgid "import %s requires %s, but: %s" msgstr "" -#: ../dgit:8126 +#: ../dgit:8134 #, perl-format msgid "cannot import %s which seems to be inside working tree!" msgstr "" -#: ../dgit:8130 +#: ../dgit:8138 #, perl-format msgid "symlink %s to %s: %s" msgstr "" -#: ../dgit:8131 +#: ../dgit:8139 #, perl-format msgid "made symlink %s -> %s" msgstr "" -#: ../dgit:8142 +#: ../dgit:8150 msgid "Import, forced update - synthetic orphan git history." msgstr "" -#: ../dgit:8144 +#: ../dgit:8152 msgid "Import, merging." msgstr "" -#: ../dgit:8158 +#: ../dgit:8166 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "" -#: ../dgit:8167 +#: ../dgit:8175 #, perl-format msgid "results are in git ref %s" msgstr "" -#: ../dgit:8174 +#: ../dgit:8182 msgid "need only 1 subpath argument" msgstr "" -#: ../dgit:8192 +#: ../dgit:8200 msgid "need destination argument" msgstr "" -#: ../dgit:8197 +#: ../dgit:8205 #, perl-format msgid "exec git clone: %s\n" msgstr "" -#: ../dgit:8205 +#: ../dgit:8213 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url" msgstr "" -#: ../dgit:8217 +#: ../dgit:8225 msgid "package does not exist in target suite, looking in whole archive\n" msgstr "" -#: ../dgit:8224 +#: ../dgit:8232 #, perl-format msgid "package in target suite is different upstream version, %s\n" msgstr "" -#: ../dgit:8236 +#: ../dgit:8244 msgid "suite has this upstream version, but no origs\n" msgstr "" -#: ../dgit:8240 +#: ../dgit:8248 msgid "suite has origs for this upstream version\n" msgstr "" -#: ../dgit:8266 +#: ../dgit:8274 #, perl-format msgid "no .origs for package %s upstream version %s\n" msgstr "" -#: ../dgit:8298 +#: ../dgit:8306 #, perl-format msgid "multiple possibilities for orig component %s:\n" msgstr "" -#: ../dgit:8311 +#: ../dgit:8319 msgid "failed to resolve, unambiguously, which .origs are intended\n" msgstr "" -#: ../dgit:8329 +#: ../dgit:8337 #, perl-format msgid "unknown long option to download-unfetched-origs `%s'" msgstr "" -#: ../dgit:8332 +#: ../dgit:8340 msgid "download-unfetched-origs takes no non-option arguments" msgstr "" -#: ../dgit:8362 +#: ../dgit:8370 #, perl-format msgid "orig file is missing (404) at archive mirror: %s\n" msgstr "" -#: ../dgit:8369 +#: ../dgit:8377 #, perl-format msgid "%d orig file(s) could not be obtained\n" msgstr "" -#: ../dgit:8379 +#: ../dgit:8387 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "" -#: ../dgit:8385 +#: ../dgit:8393 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "" -#: ../dgit:8392 ../dgit:8398 +#: ../dgit:8400 ../dgit:8406 msgid "no arguments allowed to dgit setup-useremail" msgstr "" -#: ../dgit:8404 +#: ../dgit:8412 msgid "no arguments allowed to dgit setup-tree" msgstr "" -#: ../dgit:8459 +#: ../dgit:8467 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." msgstr "" -#: ../dgit:8501 +#: ../dgit:8509 #, perl-format msgid "%s needs a value" msgstr "" -#: ../dgit:8505 +#: ../dgit:8513 #, perl-format msgid "bad value `%s' for %s" msgstr "" -#: ../dgit:8614 +#: ../dgit:8622 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "" -#: ../dgit:8648 +#: ../dgit:8656 #, perl-format msgid "unknown long option `%s'" msgstr "" -#: ../dgit:8705 +#: ../dgit:8713 #, perl-format msgid "unknown short option `%s'" msgstr "" -#: ../dgit:8728 +#: ../dgit:8736 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "" -#: ../dgit:8732 +#: ../dgit:8740 #, perl-format msgid "%s is blocked\n" msgstr "" -#: ../dgit:8738 +#: ../dgit:8746 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -2239,64 +2243,64 @@ msgid "" "Giving up.\n" msgstr "" -#: ../dgit:8785 +#: ../dgit:8793 #, perl-format msgid "" "unsupported option `%s', cannot set command for %s (can only provide options)" msgstr "" -#: ../dgit:8790 +#: ../dgit:8798 #, perl-format msgid "" "unsupported option `%s', cannot provide additional options for %s (can only " "provide replacement command)" msgstr "" -#: ../dgit:8797 +#: ../dgit:8805 #, perl-format msgid "" "unsupported option `%s', cannot adjust options for %s (can only provide " "replacement command)" msgstr "" -#: ../dgit:8829 +#: ../dgit:8837 #, perl-format msgid "cannot set command for %s (can only provide options)" msgstr "" -#: ../dgit:8850 +#: ../dgit:8858 #, perl-format msgid "cannot configure options for %s (can only provide replacement command)" msgstr "" -#: ../dgit:8869 +#: ../dgit:8877 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "" -#: ../dgit:8881 +#: ../dgit:8889 #, perl-format msgid "unknown %s setting `%s'" msgstr "" -#: ../dgit:8894 +#: ../dgit:8902 msgid "--tag2upload-builder-mode implies --dep14tag-reuse=must" msgstr "" -#: ../dgit:8901 +#: ../dgit:8909 #, perl-format msgid "unknown dep14tag-reuse mode `%s'" msgstr "" -#: ../dgit:8924 +#: ../dgit:8932 msgid "DRY RUN ONLY\n" msgstr "" -#: ../dgit:8925 +#: ../dgit:8933 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" -#: ../dgit:8945 +#: ../dgit:8953 #, perl-format msgid "unknown operation %s" msgstr "" @@ -3017,93 +3021,93 @@ msgstr "" msgid "data block" msgstr "" -#: ../Debian/Dgit.pm:324 +#: ../Debian/Dgit/Core.pm:168 #, perl-format msgid "error: %s\n" msgstr "" -#: ../Debian/Dgit.pm:350 -#, perl-format -msgid "getcwd failed: %s\n" -msgstr "" - -#: ../Debian/Dgit.pm:369 +#: ../Debian/Dgit/Core.pm:183 msgid "terminated, reporting successful completion" msgstr "" -#: ../Debian/Dgit.pm:371 +#: ../Debian/Dgit/Core.pm:185 #, perl-format msgid "failed with error exit status %s" msgstr "" -#: ../Debian/Dgit.pm:374 +#: ../Debian/Dgit/Core.pm:188 #, perl-format msgid "died due to fatal signal %s" msgstr "" -#: ../Debian/Dgit.pm:378 +#: ../Debian/Dgit/Core.pm:192 #, perl-format msgid "failed with unknown wait status %s" msgstr "" -#: ../Debian/Dgit.pm:384 +#: ../Debian/Dgit/Core.pm:198 msgid "failed command" msgstr "" -#: ../Debian/Dgit.pm:390 +#: ../Debian/Dgit/Core.pm:204 #, perl-format msgid "failed to fork/exec: %s" msgstr "" -#: ../Debian/Dgit.pm:392 +#: ../Debian/Dgit/Core.pm:206 #, perl-format msgid "subprocess %s" msgstr "" -#: ../Debian/Dgit.pm:394 +#: ../Debian/Dgit/Core.pm:208 msgid "subprocess produced invalid output" msgstr "" -#: ../Debian/Dgit.pm:499 +#: ../Debian/Dgit.pm:253 +#, perl-format +msgid "getcwd failed: %s\n" +msgstr "" + +#: ../Debian/Dgit.pm:301 msgid "stat source file: %S" msgstr "" -#: ../Debian/Dgit.pm:509 +#: ../Debian/Dgit.pm:311 msgid "stat destination file: %S" msgstr "" -#: ../Debian/Dgit.pm:528 +#: ../Debian/Dgit.pm:330 msgid "finally install file after cp: %S" msgstr "" -#: ../Debian/Dgit.pm:534 +#: ../Debian/Dgit.pm:336 msgid "delete old file after cp: %S" msgstr "" -#: ../Debian/Dgit.pm:557 +#: ../Debian/Dgit.pm:359 msgid "" "not in a git working tree?\n" "(git rev-parse --show-toplevel produced no output)\n" msgstr "" -#: ../Debian/Dgit.pm:560 +#: ../Debian/Dgit.pm:362 #, perl-format msgid "chdir toplevel %s: %s\n" msgstr "" -#: ../Debian/Dgit.pm:668 +#: ../Debian/Dgit.pm:448 msgid "git index contains changes (does not match HEAD)" msgstr "" -#: ../Debian/Dgit.pm:669 +#: ../Debian/Dgit.pm:449 msgid "working tree is dirty (does not match HEAD)" msgstr "" -#: ../Debian/Dgit.pm:694 +#: ../Debian/Dgit.pm:474 msgid "using specified upstream commitish" msgstr "" -#: ../Debian/Dgit.pm:701 +#: ../Debian/Dgit.pm:481 #, perl-format msgid "" "Could not determine appropriate upstream commitish.\n" @@ -3111,103 +3115,103 @@ msgid "" " Check version, and specify upstream commitish explicitly." msgstr "" -#: ../Debian/Dgit.pm:706 ../Debian/Dgit.pm:708 +#: ../Debian/Dgit.pm:486 ../Debian/Dgit.pm:488 #, perl-format msgid "using upstream from git tag %s" msgstr "" -#: ../Debian/Dgit.pm:822 +#: ../Debian/Dgit.pm:602 #, perl-format msgid "failed to remove directory tree %s: rm -rf: %s; %s\n" msgstr "" -#: ../Debian/Dgit.pm:857 +#: ../Debian/Dgit.pm:637 msgid "detached HEAD" msgstr "" -#: ../Debian/Dgit.pm:858 +#: ../Debian/Dgit.pm:638 msgid "HEAD symref is not to refs/" msgstr "" -#: ../Debian/Dgit.pm:874 +#: ../Debian/Dgit.pm:654 #, perl-format msgid "parsing of %s failed" msgstr "" -#: ../Debian/Dgit.pm:883 +#: ../Debian/Dgit.pm:663 #, perl-format msgid "" "control file %s is (already) PGP-signed. Note that dgit push needs to " "modify the .dsc and then do the signature itself" msgstr "" -#: ../Debian/Dgit.pm:897 +#: ../Debian/Dgit.pm:677 #, perl-format msgid "open %s (%s): %s" msgstr "" -#: ../Debian/Dgit.pm:922 +#: ../Debian/Dgit.pm:702 #, perl-format msgid "missing field %s in %s" msgstr "" -#: ../Debian/Dgit.pm:1008 +#: ../Debian/Dgit.pm:788 msgid "Dummy commit - do not use\n" msgstr "" -#: ../Debian/Dgit.pm:1029 +#: ../Debian/Dgit.pm:809 #, perl-format msgid "exec %s: %s\n" msgstr "" -#: ../Debian/Dgit.pm:1057 +#: ../Debian/Dgit.pm:837 #, perl-format msgid "Taint recorded at time %s for package %s" msgstr "" -#: ../Debian/Dgit.pm:1059 +#: ../Debian/Dgit.pm:839 #, perl-format msgid "Taint recorded at time %s for any package" msgstr "" -#: ../Debian/Dgit.pm:1061 +#: ../Debian/Dgit.pm:841 #, perl-format msgid "Taint recorded for package %s" msgstr "" -#: ../Debian/Dgit.pm:1063 +#: ../Debian/Dgit.pm:843 msgid "Taint recorded for any package" msgstr "" -#: ../Debian/Dgit.pm:1075 +#: ../Debian/Dgit.pm:855 msgid "Uncorrectable error. If confused, consult administrator.\n" msgstr "" -#: ../Debian/Dgit.pm:1078 +#: ../Debian/Dgit.pm:858 msgid "Could perhaps be forced using --deliberately. Consult documentation.\n" msgstr "" -#: ../Debian/Dgit.pm:1081 +#: ../Debian/Dgit.pm:861 #, perl-format msgid "Forcing due to %s\n" msgstr "" -#: ../Debian/Dgit.pm:1146 +#: ../Debian/Dgit.pm:926 #, perl-format msgid "cannot stat %s/.git: %s" msgstr "" -#: ../Debian/Dgit.pm:1169 +#: ../Debian/Dgit.pm:949 #, perl-format msgid "failed to mkdir playground parent %s: %s" msgstr "" -#: ../Debian/Dgit.pm:1177 +#: ../Debian/Dgit.pm:957 #, perl-format msgid "failed to mkdir a playground %s: %s" msgstr "" -#: ../Debian/Dgit.pm:1186 +#: ../Debian/Dgit.pm:966 #, perl-format msgid "failed to mkdir the playground %s: %s" msgstr "" diff -pruN 13.12/po/nl.po 13.13/po/nl.po --- 13.12/po/nl.po 2025-08-15 09:05:44.000000000 +0000 +++ 13.13/po/nl.po 2025-08-24 10:43:28.000000000 +0000 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dgit_12.12\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-08-15 13:02+0000\n" +"POT-Creation-Date: 2025-08-23 09:54+0000\n" "PO-Revision-Date: 2025-05-12 22:05+0200\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" @@ -161,7 +161,7 @@ msgstr "" msgid "unknown %s `%s'" msgstr "onbekend %s `%s'" -#: ../dgit:981 ../git-debrebase:1548 ../Debian/Dgit/Core.pm:53 +#: ../dgit:981 ../git-debrebase:1548 ../Debian/Dgit/Core.pm:128 msgid "internal error" msgstr "interne fout" @@ -580,7 +580,7 @@ msgstr "benaderen van %s: %s" msgid "saving %s: %s" msgstr "opslaan van %s: %s" -#: ../dgit:2679 ../dgit:6753 +#: ../dgit:2679 ../dgit:6758 msgid "source package" msgstr "broncodepakket" @@ -1697,7 +1697,7 @@ msgstr "" "--quilt=%s opgegeven, wat een patches-unapplied git boom impliceert\n" " maar de git boom verschilt van orig in bovenstroomse bestanden." -#: ../dgit:6060 +#: ../dgit:6065 msgid "" "\n" " ... debian/patches is missing; perhaps this is a patch queue branch?" @@ -1705,7 +1705,7 @@ msgstr "" "\n" " ... debian/patches ontbreekt; is dit misschien een patchwachtrijtak?" -#: ../dgit:6067 +#: ../dgit:6072 #, perl-format msgid "" "--quilt=%s specified, implying patches-applied git tree\n" @@ -1715,16 +1715,16 @@ msgstr "" " maar de git-boom verschilt van wat het toepassen van debian/patches op " "bovenstroom oplevert\n" -#: ../dgit:6081 +#: ../dgit:6086 #, perl-format msgid "Combine debian/ with upstream source for %s\n" msgstr "Combinatie maken van debian/ met bovenstroomse bron van %s\n" -#: ../dgit:6089 +#: ../dgit:6094 msgid "dgit view: creating patches-applied version using gbp pq" msgstr "dgit view: een patches-applied versie creëren met gbp pq" -#: ../dgit:6100 +#: ../dgit:6105 #, perl-format msgid "" "--quilt=%s specified, implying that HEAD is for use with a\n" @@ -1735,17 +1735,17 @@ msgstr "" " gebruik met gereedschap dat geen patches maakt voor wijzigingen in\n" " bovenstroomse .gitignores: maar zulke patches bestaan in debian/patches.\n" -#: ../dgit:6108 +#: ../dgit:6113 msgid "dgit view: creating patch to represent .gitignore changes" msgstr "dgit view: patch maken om .gitignore-wijzigingen weer te geven" -#: ../dgit:6113 +#: ../dgit:6118 #, perl-format msgid "%s already exists; but want to create it to record .gitignore changes" msgstr "" "%s bestaat reeds; maar wil het maken om .gitignore-wijzigingen op te nemen" -#: ../dgit:6119 +#: ../dgit:6124 msgid "" "Subject: Update .gitignore from Debian packaging branch\n" "\n" @@ -1760,34 +1760,34 @@ msgstr "" "bijwerkingen te verstrekken aan gebruikers van de weergave van het pakket\n" "in het officiële Debian-archief.\n" -#: ../dgit:6142 +#: ../dgit:6147 msgid "Commit patch to update .gitignore\n" msgstr "Patch om .gitignore bij te werken vastleggen\n" -#: ../dgit:6212 +#: ../dgit:6217 msgid "maximum search space exceeded" msgstr "maximale zoekruimte overschreden" -#: ../dgit:6230 +#: ../dgit:6235 #, perl-format msgid "has %s not %s" msgstr "bevat %s, niet %s" -#: ../dgit:6239 +#: ../dgit:6244 msgid "root commit" msgstr "beginvastlegging (root commit)" -#: ../dgit:6245 +#: ../dgit:6250 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "samenvoeging (merge) (%s niet-triviale ouders)" -#: ../dgit:6257 +#: ../dgit:6262 #, perl-format msgid "changed %s" msgstr "gewijzigd: %s" -#: ../dgit:6276 +#: ../dgit:6281 #, perl-format msgid "" "\n" @@ -1796,23 +1796,23 @@ msgstr "" "\n" "%s: fout: een quilt fixup kan niet lineair zijn. Gestopt bij:\n" -#: ../dgit:6283 +#: ../dgit:6288 #, perl-format msgid "%s: %s: %s\n" msgstr "%s: %s: %s\n" -#: ../dgit:6295 +#: ../dgit:6300 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:6298 +#: ../dgit:6303 msgid "quilt fixup cannot be linear, smashing..." msgstr "" "de quilt fixup kan niet lineair zijn, de smash strategie wordt gebruikt..." -#: ../dgit:6312 +#: ../dgit:6317 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1823,43 +1823,43 @@ msgstr "" "Laatste (tot en met) %s git-wijzigingen, ter informatie:\n" "\n" -#: ../dgit:6319 +#: ../dgit:6324 msgid "quiltify linearisation planning successful, executing..." msgstr "linearisatieplanning voor quiltify was succesvol, wordt uitgevoerd..." -#: ../dgit:6353 +#: ../dgit:6358 msgid "contains unexpected slashes\n" msgstr "bevat onverwachte slashes\n" -#: ../dgit:6354 +#: ../dgit:6359 msgid "contains leading punctuation\n" msgstr "bevat leestekens aan het begin\n" -#: ../dgit:6355 +#: ../dgit:6360 msgid "contains bad character(s)\n" msgstr "bevat foutieve teken(s)\n" -#: ../dgit:6356 +#: ../dgit:6361 msgid "is series file\n" msgstr "is een series-bestand\n" -#: ../dgit:6357 +#: ../dgit:6362 msgid "too long\n" msgstr "te lang\n" -#: ../dgit:6361 +#: ../dgit:6366 #, 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:6390 +#: ../dgit:6395 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "dgit: fout bij de transliteratie van de patch-titel: %s" -#: ../dgit:6465 +#: ../dgit:6470 #, perl-format msgid "" "quilt mode %s does not make sense (or is not supported) with single-debian-" @@ -1867,30 +1867,30 @@ msgid "" msgstr "" "quilt modus %s is zinloos (of wordt niet ondersteund) met single-debian-patch" -#: ../dgit:6490 +#: ../dgit:6495 msgid "converted" msgstr "omgezet" -#: ../dgit:6491 +#: ../dgit:6496 #, perl-format msgid "dgit view: created (%s)" msgstr "dgit-weergave: gecreëerd: (%s)" -#: ../dgit:6547 +#: ../dgit:6552 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" "Vastleggingsverwijdering (commit removal) van .pc (quilt-seriegegevens)\n" -#: ../dgit:6557 +#: ../dgit:6562 msgid "starting quiltify (single-debian-patch)" msgstr "quiltify wordt gestart (één enkele debian-patch)" -#: ../dgit:6593 +#: ../dgit:6598 #, perl-format msgid "regenerating patch using git diff (--quilt=%s)" msgstr "patch opnieuw genereren met git diff (--quilt=%s)" -#: ../dgit:6687 +#: ../dgit:6692 msgid "" "warning: package uses dpkg-source include-binaries feature - not all changes " "are visible in patches!\n" @@ -1898,47 +1898,47 @@ msgstr "" "opgelet: pakket gebruikt de functie include-binaries van dpkg-source - niet " "alle wijzigingen zijn zichtbaar in patches!\n" -#: ../dgit:6696 +#: ../dgit:6701 #, perl-format msgid "warning: ignoring bad include-binaries file %s: %s\n" msgstr "opgelet: slecht nclude-binaries-bestand %s wordt genegeerd: %s\n" -#: ../dgit:6699 +#: ../dgit:6704 #, perl-format msgid "forbidden path component '%s'" msgstr "niet toegelaten pad-component '%s'" -#: ../dgit:6709 +#: ../dgit:6714 #, perl-format msgid "path starts with '%s'" msgstr "pad begint met '%s'" -#: ../dgit:6719 +#: ../dgit:6724 #, perl-format msgid "path to '%s' not a plain file or directory" msgstr "pad naar '%s' geen gewoon bestand of map" -#: ../dgit:6777 +#: ../dgit:6782 #, 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:6809 +#: ../dgit:6814 #, perl-format msgid "dgit view: found cached (%s)" msgstr "dgit-weergave: gecachete (%s) aangetroffen" -#: ../dgit:6814 +#: ../dgit:6819 msgid "dgit view: found cached, no changes required" msgstr "dgit-weergave: gecachete aangetroffen, geen wijzigingen vereist" -#: ../dgit:6849 +#: ../dgit:6854 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "toestand van quilt wordt nagegaan (meerdere patches, %s-modus)" -#: ../dgit:6942 +#: ../dgit:6947 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" @@ -1952,37 +1952,41 @@ msgstr "" " dgit can enkel bepaalde soorten anomalieën repareren\n" " (afhankelijk van de quilt-modus). Raadpleeg --quilt= in dgit(1).\n" -#: ../dgit:6956 +#: ../dgit:6961 msgid "Tree already contains .pc - will delete it." msgstr "Boom bevat reeds een .pc - zal dit verwijderen." -#: ../dgit:6990 +#: ../dgit:6987 +msgid "baredebian+tarball is not meaningful with tag2upload" +msgstr "" + +#: ../dgit:6998 msgid "baredebian quilt fixup: could not find any origs" msgstr "baredebian quilt reparatie: kon geen origs vinden" -#: ../dgit:7003 +#: ../dgit:7011 msgid "tarball" msgstr "tar-archief" -#: ../dgit:7021 +#: ../dgit:7029 #, perl-format msgid "Combine orig tarballs for %s %s" msgstr "Combineren van orig tar-archieven voor %s %s" -#: ../dgit:7037 +#: ../dgit:7045 msgid "tarballs" msgstr "tar-archieven" -#: ../dgit:7051 +#: ../dgit:7059 msgid "upstream" msgstr "bovenstroom" -#: ../dgit:7075 +#: ../dgit:7083 #, 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:7085 +#: ../dgit:7093 #, perl-format msgid "" "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n" @@ -1991,42 +1995,42 @@ msgstr "" "%s: quilt-verschillen: src: %s orig %s gitignores: %s orig %s\n" "%s: quilt-verschillen: %9.00009s %s o+d/p %9.00009s %s o+d/p" -#: ../dgit:7095 +#: ../dgit:7103 msgid "" "This has only a debian/ directory; you probably want --quilt=bare debian." msgstr "Dit bevat enkel een map debian/; wellicht wilt u --quilt=bare debian." -#: ../dgit:7099 +#: ../dgit:7107 msgid "This might be a patches-unapplied branch." msgstr "Dit is mogelijk een tak zonder toepassing van patches." -#: ../dgit:7102 +#: ../dgit:7110 msgid "This might be a patches-applied branch." msgstr "Dit is mogelijk een tak met toegepaste patches." -#: ../dgit:7105 +#: ../dgit:7113 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:7108 +#: ../dgit:7116 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" "Waarschuwing: Boom bevat .gitattributes. Zie GITATTRIBUTES in dgit(7)." -#: ../dgit:7112 +#: ../dgit:7120 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:7123 +#: ../dgit:7131 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "quiltify wordt gestart (meerdere patches, %s-modus)" -#: ../dgit:7162 +#: ../dgit:7170 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -2040,12 +2044,12 @@ msgstr "" "dgit: (Overweeg het gebruik van --clean=git en (of) dgit sbuild.)\n" "\n" -#: ../dgit:7174 +#: ../dgit:7182 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" "dgit: Toepassen van patches terug ongedaan maken om de boom op te schonen." -#: ../dgit:7203 +#: ../dgit:7211 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" @@ -2057,18 +2061,18 @@ msgstr "" "negeren, of --clean=git (-wg/-wgf) om in de plaats `git clean' te " "gebruiken.\n" -#: ../dgit:7215 +#: ../dgit:7223 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" "de boom bevat niet-vastgelegde bestanden en --clean=check werd opgegeven" -#: ../dgit:7218 +#: ../dgit:7226 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:7221 +#: ../dgit:7229 msgid "" "tree contains uncommitted, untracked, unignored files\n" "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them.\n" @@ -2079,7 +2083,7 @@ msgstr "" "Om ze in de bouw op te nemen, is het gewoonlijk best om ze gewoon vast te " "leggen." -#: ../dgit:7235 +#: ../dgit:7243 #, perl-format msgid "" "quilt mode %s (generally needs untracked upstream files)\n" @@ -2088,21 +2092,21 @@ msgstr "" "quilt modus %s (heeft meestal niet gevolgde bovenstroomse bestanden nodig)\n" "is in strijd met clean modus %s (welke deze zou verwijderen)\n" -#: ../dgit:7252 +#: ../dgit:7260 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" "de boom bevat niet-vastgelegde bestanden (na het uitvoeren van rules clean)" -#: ../dgit:7266 +#: ../dgit:7274 msgid "clean takes no additional arguments" msgstr "met clean kunnen geen extra argumenten opgegeven worden" -#: ../dgit:7285 +#: ../dgit:7293 #, perl-format msgid "-p specified package %s, but changelog says %s" msgstr "-p specificeerde pakket %s, maar het changelog-bestand vermeldt %s" -#: ../dgit:7295 +#: ../dgit:7303 msgid "" "dgit: --include-dirty is not supported with split view (including with view-" "splitting quilt modes)" @@ -2110,7 +2114,7 @@ msgstr "" "dgit: --include-dirty wordt niet ondersteund bij gesplitste weergave (met " "inbegrip van quilt-modi welke de weergave splitsen)" -#: ../dgit:7303 +#: ../dgit:7311 msgid "" "tree has .gitignore(s) but debian/source/options has 'tar-ignore'\n" "Try 'tar-ignore=.git' in d/s/options instead. (See #908747.)\n" @@ -2119,7 +2123,7 @@ msgstr "" "ignore'\n" "Gebruik in de plaats 'tar-ignore=.git' in d/s/options. (Zie #908747.)\n" -#: ../dgit:7308 +#: ../dgit:7316 #, perl-format msgid "" "%s: warning: debian/source/options contains bare 'tar-ignore'\n" @@ -2129,33 +2133,33 @@ msgstr "" "Hierdoor kunnen .gitignore-bestanden ten onrechte worden overgeslagen. Zie " "#908747.\n" -#: ../dgit:7319 +#: ../dgit:7327 #, perl-format msgid "dgit: --quilt=%s, %s" msgstr "dgit: --quilt=%s, %s" -#: ../dgit:7323 +#: ../dgit:7331 msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian" msgstr "dgit: --upstream-commitish is enkel zinvol met --quilt=baredebian" -#: ../dgit:7358 +#: ../dgit:7366 #, perl-format msgid "remove old changes file %s: %s" msgstr "verwijder oud changes-bestand %s: %s" -#: ../dgit:7360 +#: ../dgit:7368 #, perl-format msgid "would remove %s" msgstr "zou %s verwijderen" -#: ../dgit:7378 +#: ../dgit:7386 #, perl-format msgid "warning: dgit option %s must be passed before %s on dgit command line\n" msgstr "" "waarschuwing: aan de commandoregel van dgit moet de optie %s van dgit " "opgegeven worden voor %s\n" -#: ../dgit:7385 +#: ../dgit:7393 #, perl-format msgid "" "warning: option %s should probably be passed to dgit before %s sub-command " @@ -2166,56 +2170,56 @@ msgstr "" "worden aan dgit voor het sub-commando %s, zodat het door dgit gezien wordt " "en niet enkel meegegeven wordt aan %s\n" -#: ../dgit:7411 +#: ../dgit:7419 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:7417 +#: ../dgit:7425 #, perl-format msgid "changelog will contain changes since %s" msgstr "changelog zal wijzigingen sinds %s bevatten" -#: ../dgit:7420 +#: ../dgit:7428 msgid "package seems new, not specifying -v" msgstr "pakket lijkt nieuw te zijn, geen vermelding van -v" -#: ../dgit:7463 +#: ../dgit:7471 msgid "Wanted to build nothing!" msgstr "Wilde niets bouwen!" -#: ../dgit:7501 +#: ../dgit:7509 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "slechts één changes-bestand van bouw (%s)\n" -#: ../dgit:7508 +#: ../dgit:7516 #, perl-format msgid "%s found in binaries changes file %s" msgstr "%s aangetroffen in changes-bestand %s van de binaire pakketten" -#: ../dgit:7515 +#: ../dgit:7523 #, perl-format msgid "%s unexpectedly not created by build" msgstr "%s tegen de verwachtingen in niet gecreëerd door de bouw" -#: ../dgit:7519 +#: ../dgit:7527 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "installeer nieuw changes %s{,.inmulti}: %s" -#: ../dgit:7524 +#: ../dgit:7532 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "fout nummer van verschillende changes-bestanden (%s)" -#: ../dgit:7527 +#: ../dgit:7535 #, perl-format msgid "build successful, results in %s\n" msgstr "bouw was succesvol, resultaten in %s\n" -#: ../dgit:7540 +#: ../dgit:7548 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -2227,11 +2231,11 @@ msgstr "" "resultaat.\n" "De suggestie is dat u %s verwijdert.\n" -#: ../dgit:7558 +#: ../dgit:7566 msgid "build successful\n" msgstr "de bouw was succesvol\n" -#: ../dgit:7566 +#: ../dgit:7574 #, perl-format msgid "" "%s: warning: build-products-dir set, but not supported by dpkg-buildpackage\n" @@ -2242,46 +2246,46 @@ msgstr "" "%s: waarschuwing: build-products-dir zal genegeerd worden; bestanden zullen " "gaan naar ..\n" -#: ../dgit:7677 +#: ../dgit:7685 #, perl-format msgid "remove %s: %s" msgstr "verwijder %s: %s" -#: ../dgit:7684 +#: ../dgit:7692 msgid "--tag2upload-builder-mode needs split-brain mode" msgstr "--tag2upload-builder-mode heeft de modus split-brain nodig" -#: ../dgit:7689 +#: ../dgit:7697 msgid "upstream tag and not commit, or vice-versa" msgstr "upstream-tag en geen vastlegging (commit), of omgekeerd" -#: ../dgit:7745 +#: ../dgit:7753 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "--include-dirty niet ondersteund met --build-products-dir, sorry" -#: ../dgit:7770 +#: ../dgit:7778 msgid "--include-dirty not supported with --tag2upload-builder-mode" msgstr "--include-dirty niet ondersteund met --tag2upload-builder-mode" -#: ../dgit:7783 +#: ../dgit:7791 msgid "source-only buildinfo" msgstr "uitsluitend broncode bouwinfo" -#: ../dgit:7812 +#: ../dgit:7820 #, perl-format msgid "put in place new built file (%s): %s" msgstr "zet nieuw gebouwd bestand (%s) op zijn plaats: %s" -#: ../dgit:7840 +#: ../dgit:7848 msgid "build-source takes no additional arguments" msgstr "build-source moet zonder bijkomende argumenten gebruikt worden" -#: ../dgit:7845 +#: ../dgit:7853 #, perl-format msgid "source built, results in %s and %s" msgstr "broncodepakket is gebouwd, resultaten in %s en %s" -#: ../dgit:7852 +#: ../dgit:7860 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" @@ -2289,25 +2293,25 @@ msgstr "" "dgit push-source: --include-dirty/--ignore-dirty zijn zinloos met push-" "source!" -#: ../dgit:7857 +#: ../dgit:7865 msgid "--tag2upload-builder-mode not supported with -C" msgstr "--tag2upload-builder-mode niet ondersteund met -C" -#: ../dgit:7860 +#: ../dgit:7868 msgid "source changes file" msgstr "broncode-changes-bestand" -#: ../dgit:7862 +#: ../dgit:7870 msgid "user-specified changes file is not source-only" msgstr "" "door de gebruiker opgegeven changes-bestand is niet 'uitsluitend broncode'" -#: ../dgit:7882 ../dgit:7884 +#: ../dgit:7890 ../dgit:7892 #, perl-format msgid "%s (in build products dir): %s" msgstr "%s (in bouwproductenmap): %s" -#: ../dgit:7898 +#: ../dgit:7906 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" @@ -2316,7 +2320,7 @@ msgstr "" "specifieke\n" "binaire pakketten te bouwen; dgit 1.4 was gewend dit te overschrijven.)\n" -#: ../dgit:7911 +#: ../dgit:7919 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" @@ -2324,7 +2328,7 @@ msgstr "" "u vroeg een bouwprogramma maar uw debbuildopts vroeg geen enkel binair " "pakket - is dit echt wat u bedoelde?" -#: ../dgit:7915 +#: ../dgit:7923 msgid "" "we must build a .dsc to pass to the builder but your debbuiltopts forbids " "the building of a source package; cannot continue" @@ -2333,65 +2337,65 @@ msgstr "" "debbuiltopts verbiedt het bouwen van een broncodepakket; voortgaan is " "onmogelijk" -#: ../dgit:7945 +#: ../dgit:7953 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "foutieve argumenten voor dgit print-unapplied-treeish" -#: ../dgit:7966 +#: ../dgit:7974 msgid "source tree" msgstr "broncodeboom" -#: ../dgit:7968 +#: ../dgit:7976 #, perl-format msgid "dgit: import-dsc: %s" msgstr "dgit: import-dsc: %s" -#: ../dgit:7981 +#: ../dgit:7989 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "onbekende onderliggende optie `%s' voor dgit import-dsc" -#: ../dgit:7985 +#: ../dgit:7993 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "gebruik: dgit import-dsc .../PAD/NAAR/.DSC TAK" -#: ../dgit:7989 +#: ../dgit:7997 msgid "dry run makes no sense with import-dsc" msgstr "testuitvoering (dry run) is zinloos met import-dsc" -#: ../dgit:8006 +#: ../dgit:8014 #, perl-format msgid "%s is checked out - will not update it" msgstr "%s is binnengehaald (checked out) - zal het niet bijwerken" -#: ../dgit:8011 +#: ../dgit:8019 #, perl-format msgid "open import .dsc (%s): %s" msgstr "open import-.dsc (%s): %s" -#: ../dgit:8013 +#: ../dgit:8021 #, perl-format msgid "read %s: %s" msgstr "lees %s: %s" -#: ../dgit:8024 +#: ../dgit:8032 msgid "import-dsc signature check failed" msgstr "controle ondertekening van import-dsc mislukte" -#: ../dgit:8027 +#: ../dgit:8035 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "%s: waarschuwing: niet-ondertekend .dsc wordt geïmporteerd\n" -#: ../dgit:8038 +#: ../dgit:8046 msgid "Dgit metadata in .dsc" msgstr "Dgit-metadata in .dsc" -#: ../dgit:8049 +#: ../dgit:8057 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:8058 +#: ../dgit:8066 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -2402,21 +2406,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:8065 +#: ../dgit:8073 msgid "Not fast forward, forced update." msgstr "Niet lineair (fast forward), gedwongen update." -#: ../dgit:8067 +#: ../dgit:8075 #, perl-format msgid "Not fast forward to %s" msgstr "Niet lineair (fast forward) naar %s" -#: ../dgit:8072 +#: ../dgit:8080 #, perl-format msgid "updated git ref %s" msgstr "git ref %s geüpdatet" -#: ../dgit:8077 +#: ../dgit:8085 #, perl-format msgid "" "Branch %s already exists\n" @@ -2428,142 +2432,142 @@ msgstr "" "geschiedenis\n" "Geef +%s op om te overschrijven en bestaande geschiedenis te verwijderen\n" -#: ../dgit:8097 +#: ../dgit:8105 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "lstat %s werkt maar stat geeft %s !" -#: ../dgit:8099 +#: ../dgit:8107 #, perl-format msgid "stat %s: %s" msgstr "stat %s: %s" -#: ../dgit:8107 +#: ../dgit:8115 #, perl-format msgid "import %s requires %s, but: %s" msgstr "importeren van %s vereist %s, maar: %s" -#: ../dgit:8126 +#: ../dgit:8134 #, 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:8130 +#: ../dgit:8138 #, perl-format msgid "symlink %s to %s: %s" msgstr "symbolische koppeling %s naar %s: %s" -#: ../dgit:8131 +#: ../dgit:8139 #, perl-format msgid "made symlink %s -> %s" msgstr "maakte symbolische koppeling %s -> %s" -#: ../dgit:8142 +#: ../dgit:8150 msgid "Import, forced update - synthetic orphan git history." msgstr "Importeren, gedwongen update - kunstmatige verweesde git-geschiedenis." -#: ../dgit:8144 +#: ../dgit:8152 msgid "Import, merging." msgstr "Importeren, samenvoegen." -#: ../dgit:8158 +#: ../dgit:8166 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "Invoegen van import %s (%s) in %s\n" -#: ../dgit:8167 +#: ../dgit:8175 #, perl-format msgid "results are in git ref %s" msgstr "resultaten staan in git ref %s" -#: ../dgit:8174 +#: ../dgit:8182 msgid "need only 1 subpath argument" msgstr "slechts 1 argument met een onderliggend pad nodig" -#: ../dgit:8192 +#: ../dgit:8200 msgid "need destination argument" msgstr "bestemmingsargument nodig" -#: ../dgit:8197 +#: ../dgit:8205 #, perl-format msgid "exec git clone: %s\n" msgstr "exec git clone: %s\n" -#: ../dgit:8205 +#: ../dgit:8213 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:8217 +#: ../dgit:8225 msgid "package does not exist in target suite, looking in whole archive\n" msgstr "" -#: ../dgit:8224 +#: ../dgit:8232 #, perl-format msgid "package in target suite is different upstream version, %s\n" msgstr "" -#: ../dgit:8236 +#: ../dgit:8244 msgid "suite has this upstream version, but no origs\n" msgstr "" -#: ../dgit:8240 +#: ../dgit:8248 msgid "suite has origs for this upstream version\n" msgstr "" -#: ../dgit:8266 +#: ../dgit:8274 #, perl-format msgid "no .origs for package %s upstream version %s\n" msgstr "" -#: ../dgit:8298 +#: ../dgit:8306 #, fuzzy, perl-format #| msgid "multiple matches for suite %s\n" msgid "multiple possibilities for orig component %s:\n" msgstr "meerdere overeenkomsten met suite %s\n" -#: ../dgit:8311 +#: ../dgit:8319 msgid "failed to resolve, unambiguously, which .origs are intended\n" msgstr "" -#: ../dgit:8329 +#: ../dgit:8337 #, fuzzy, perl-format #| msgid "unknown long option `%s'" msgid "unknown long option to download-unfetched-origs `%s'" msgstr "onbekende lange optie `%s'" -#: ../dgit:8332 +#: ../dgit:8340 #, fuzzy #| msgid "build-source takes no additional arguments" msgid "download-unfetched-origs takes no non-option arguments" msgstr "build-source moet zonder bijkomende argumenten gebruikt worden" -#: ../dgit:8362 +#: ../dgit:8370 #, perl-format msgid "orig file is missing (404) at archive mirror: %s\n" msgstr "" -#: ../dgit:8369 +#: ../dgit:8377 #, perl-format msgid "%d orig file(s) could not be obtained\n" msgstr "" -#: ../dgit:8379 +#: ../dgit:8387 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "geen argumenten toegelaten bij dgit print-dpkg-source-ignores" -#: ../dgit:8385 +#: ../dgit:8393 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "geen argumenten toegelaten bij dgit setup-mergechangelogs" -#: ../dgit:8392 ../dgit:8398 +#: ../dgit:8400 ../dgit:8406 msgid "no arguments allowed to dgit setup-useremail" msgstr "geen argumenten toegelaten bij dgit setup-useremail" -#: ../dgit:8404 +#: ../dgit:8412 msgid "no arguments allowed to dgit setup-tree" msgstr "geen argumenten toegelaten bij dgit setup-tree" -#: ../dgit:8459 +#: ../dgit:8467 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." @@ -2571,42 +2575,42 @@ msgstr "" "--initiator-tempdir moet gebruikt worden om een absolute, geen relatieve map " "op te geven." -#: ../dgit:8501 +#: ../dgit:8509 #, perl-format msgid "%s needs a value" msgstr "%s moet een waarde hebben" -#: ../dgit:8505 +#: ../dgit:8513 #, perl-format msgid "bad value `%s' for %s" msgstr "foute waarde `%s' voor %s" -#: ../dgit:8614 +#: ../dgit:8622 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "%s: waarschuwing: onbekende force-optie %s wordt genegeerd\n" -#: ../dgit:8648 +#: ../dgit:8656 #, perl-format msgid "unknown long option `%s'" msgstr "onbekende lange optie `%s'" -#: ../dgit:8705 +#: ../dgit:8713 #, perl-format msgid "unknown short option `%s'" msgstr "onbekende korte optie `%s'" -#: ../dgit:8728 +#: ../dgit:8736 #, 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:8732 +#: ../dgit:8740 #, perl-format msgid "%s is blocked\n" msgstr "%s is geblokkeerd\n" -#: ../dgit:8738 +#: ../dgit:8746 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -2617,7 +2621,7 @@ msgstr "" "Dit is een bug die veroorzaakt wordt door iets in uw uitvoeringsomgeving.\n" "Er wordt opgegeven.\n" -#: ../dgit:8785 +#: ../dgit:8793 #, perl-format msgid "" "unsupported option `%s', cannot set command for %s (can only provide options)" @@ -2625,7 +2629,7 @@ msgstr "" "niet-ondersteunde optie \"%s', kan commando voor %s niet instellen (kan " "alleen opties opgeven)" -#: ../dgit:8790 +#: ../dgit:8798 #, perl-format msgid "" "unsupported option `%s', cannot provide additional options for %s (can only " @@ -2634,7 +2638,7 @@ msgstr "" "niet-ondersteunde optie `%s', kan geen extra opties voor %s bieden (kan " "alleen vervangend commando opgeven)" -#: ../dgit:8797 +#: ../dgit:8805 #, perl-format msgid "" "unsupported option `%s', cannot adjust options for %s (can only provide " @@ -2643,47 +2647,47 @@ msgstr "" "niet-ondersteunde optie `%s', kan opties voor %s niet aanpassen (kan alleen " "vervangend commando opgeven)" -#: ../dgit:8829 +#: ../dgit:8837 #, perl-format msgid "cannot set command for %s (can only provide options)" msgstr "kan commando voor %s niet instellen (kan alleen opties opgeven)" -#: ../dgit:8850 +#: ../dgit:8858 #, perl-format msgid "cannot configure options for %s (can only provide replacement command)" msgstr "" "kan opties voor %s niet configureren (kan alleen vervangend commando opgeven)" -#: ../dgit:8869 +#: ../dgit:8877 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "onbekende quilt-modus `%s'" -#: ../dgit:8881 +#: ../dgit:8889 #, perl-format msgid "unknown %s setting `%s'" msgstr "onbekende %s dat `%s' instelt" -#: ../dgit:8894 +#: ../dgit:8902 msgid "--tag2upload-builder-mode implies --dep14tag-reuse=must" msgstr "--tag2upload-builder-mode veronderstelt --dep14tag-reuse=must" -#: ../dgit:8901 +#: ../dgit:8909 #, perl-format msgid "unknown dep14tag-reuse mode `%s'" msgstr "onbekende dep14tag-reuse-modus `%s'" -#: ../dgit:8924 +#: ../dgit:8932 msgid "DRY RUN ONLY\n" msgstr "ENKEL TESTUITVOERING (DRY RUN)\n" -#: ../dgit:8925 +#: ../dgit:8933 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" "GETEMPERDE UITVOERING (DAMP RUN) - ZAL LOKALE (NIET-ONDERTEKENDE) " "WIJZIGINGEN MAKEN\n" -#: ../dgit:8945 +#: ../dgit:8953 #, perl-format msgid "unknown operation %s" msgstr "onbekende bewerking %s" @@ -3475,70 +3479,70 @@ msgstr "aantal slechte bytes" msgid "data block" msgstr "gegevensblok" -#: ../Debian/Dgit.pm:324 +#: ../Debian/Dgit/Core.pm:168 #, perl-format msgid "error: %s\n" msgstr "fout: %s\n" -#: ../Debian/Dgit.pm:350 -#, perl-format -msgid "getcwd failed: %s\n" -msgstr "getcwd mislukte: %s\n" - -#: ../Debian/Dgit.pm:369 +#: ../Debian/Dgit/Core.pm:183 msgid "terminated, reporting successful completion" msgstr "beëindigd, met de melding van een succesvolle voltooiing" -#: ../Debian/Dgit.pm:371 +#: ../Debian/Dgit/Core.pm:185 #, perl-format msgid "failed with error exit status %s" msgstr "mislukt met de foutmelding %s" -#: ../Debian/Dgit.pm:374 +#: ../Debian/Dgit/Core.pm:188 #, perl-format msgid "died due to fatal signal %s" msgstr "gestorven vanwege fataal signaal %s" -#: ../Debian/Dgit.pm:378 +#: ../Debian/Dgit/Core.pm:192 #, perl-format msgid "failed with unknown wait status %s" msgstr "mislukt met ongekende wachttoestand %s" -#: ../Debian/Dgit.pm:384 +#: ../Debian/Dgit/Core.pm:198 msgid "failed command" msgstr "mislukt commando" -#: ../Debian/Dgit.pm:390 +#: ../Debian/Dgit/Core.pm:204 #, perl-format msgid "failed to fork/exec: %s" msgstr "fork/exec is mislukt: %s" -#: ../Debian/Dgit.pm:392 +#: ../Debian/Dgit/Core.pm:206 #, perl-format msgid "subprocess %s" msgstr "onderliggend proces %s" -#: ../Debian/Dgit.pm:394 +#: ../Debian/Dgit/Core.pm:208 msgid "subprocess produced invalid output" msgstr "onderliggend proces produceerde ongeldige uitvoer" -#: ../Debian/Dgit.pm:499 +#: ../Debian/Dgit.pm:253 +#, perl-format +msgid "getcwd failed: %s\n" +msgstr "getcwd mislukte: %s\n" + +#: ../Debian/Dgit.pm:301 msgid "stat source file: %S" msgstr "stat bronbestand: %S" -#: ../Debian/Dgit.pm:509 +#: ../Debian/Dgit.pm:311 msgid "stat destination file: %S" msgstr "stat doelbestand: %S" -#: ../Debian/Dgit.pm:528 +#: ../Debian/Dgit.pm:330 msgid "finally install file after cp: %S" msgstr "tot slot, installeer bestand na cp: %S" -#: ../Debian/Dgit.pm:534 +#: ../Debian/Dgit.pm:336 msgid "delete old file after cp: %S" msgstr "verwijder oud bestand na cp: %S" -#: ../Debian/Dgit.pm:557 +#: ../Debian/Dgit.pm:359 msgid "" "not in a git working tree?\n" "(git rev-parse --show-toplevel produced no output)\n" @@ -3546,24 +3550,24 @@ msgstr "" "niet in een git werkboom?\n" "(git rev-parse --show-toplevel gaf geen uitvoer)\n" -#: ../Debian/Dgit.pm:560 +#: ../Debian/Dgit.pm:362 #, perl-format msgid "chdir toplevel %s: %s\n" msgstr "chdir naar hoogste niveau %s: %s\n" -#: ../Debian/Dgit.pm:668 +#: ../Debian/Dgit.pm:448 msgid "git index contains changes (does not match HEAD)" msgstr "de index van git bevat wijzigingen (komt niet overeen met HEAD)" -#: ../Debian/Dgit.pm:669 +#: ../Debian/Dgit.pm:449 msgid "working tree is dirty (does not match HEAD)" msgstr "werkboom is bevuild (komt niet overeen met HEAD)" -#: ../Debian/Dgit.pm:694 +#: ../Debian/Dgit.pm:474 msgid "using specified upstream commitish" msgstr "opgegeven bovenstroomse commitish wordt gebruikt" -#: ../Debian/Dgit.pm:701 +#: ../Debian/Dgit.pm:481 #, perl-format msgid "" "Could not determine appropriate upstream commitish.\n" @@ -3574,30 +3578,30 @@ msgstr "" " (Probeerde deze tags: %s)\n" " Controleer versie en geef bovenstroomse commitish expliciet op." -#: ../Debian/Dgit.pm:706 ../Debian/Dgit.pm:708 +#: ../Debian/Dgit.pm:486 ../Debian/Dgit.pm:488 #, perl-format msgid "using upstream from git tag %s" msgstr "bovenstroom van git tag %s wordt gebruikt" -#: ../Debian/Dgit.pm:822 +#: ../Debian/Dgit.pm:602 #, perl-format msgid "failed to remove directory tree %s: rm -rf: %s; %s\n" msgstr "verwijderen van de mapstructuur %s is mislukt: rm -rf: %s; %s\n" -#: ../Debian/Dgit.pm:857 +#: ../Debian/Dgit.pm:637 msgid "detached HEAD" msgstr "vrijstaande HEAD (detached HEAD)" -#: ../Debian/Dgit.pm:858 +#: ../Debian/Dgit.pm:638 msgid "HEAD symref is not to refs/" msgstr "symbolische referentie HEAD is geen referentie naar refs/" -#: ../Debian/Dgit.pm:874 +#: ../Debian/Dgit.pm:654 #, perl-format msgid "parsing of %s failed" msgstr "ontleden van %s mislukte" -#: ../Debian/Dgit.pm:883 +#: ../Debian/Dgit.pm:663 #, perl-format msgid "" "control file %s is (already) PGP-signed. Note that dgit push needs to " @@ -3606,76 +3610,76 @@ msgstr "" "controlebestand %s heeft (reeds) een PGP-ondertekening. Merk op dat dgit " "push het .dsc moet aanpassen en het dan zelf moet ondertekenen" -#: ../Debian/Dgit.pm:897 +#: ../Debian/Dgit.pm:677 #, perl-format msgid "open %s (%s): %s" msgstr "open %s (%s): %s" -#: ../Debian/Dgit.pm:922 +#: ../Debian/Dgit.pm:702 #, perl-format msgid "missing field %s in %s" msgstr "ontbrekend veld %s in %s" -#: ../Debian/Dgit.pm:1008 +#: ../Debian/Dgit.pm:788 msgid "Dummy commit - do not use\n" msgstr "Voorbeeldvastlegging - niet gebruiken\n" -#: ../Debian/Dgit.pm:1029 +#: ../Debian/Dgit.pm:809 #, perl-format msgid "exec %s: %s\n" msgstr "exec %s: %s\n" -#: ../Debian/Dgit.pm:1057 +#: ../Debian/Dgit.pm:837 #, perl-format msgid "Taint recorded at time %s for package %s" msgstr "Bezoedeling geregistreerd op tijdstip %s voor pakket %s" -#: ../Debian/Dgit.pm:1059 +#: ../Debian/Dgit.pm:839 #, perl-format msgid "Taint recorded at time %s for any package" msgstr "Bezoedeling geregistreerd op tijdstip %s voor willekeurig pakket" -#: ../Debian/Dgit.pm:1061 +#: ../Debian/Dgit.pm:841 #, perl-format msgid "Taint recorded for package %s" msgstr "Bezoedeling geregistreerd voor pakket %s" -#: ../Debian/Dgit.pm:1063 +#: ../Debian/Dgit.pm:843 msgid "Taint recorded for any package" msgstr "Bezoedeling geregistreerd voor willekeurig pakket" -#: ../Debian/Dgit.pm:1075 +#: ../Debian/Dgit.pm:855 msgid "Uncorrectable error. If confused, consult administrator.\n" msgstr "" "Niet-corrigeerbare fout. Neem bij verwarring contact op met de beheerder.\n" -#: ../Debian/Dgit.pm:1078 +#: ../Debian/Dgit.pm:858 msgid "Could perhaps be forced using --deliberately. Consult documentation.\n" msgstr "" "Kan misschien geforceerd worden door --deliberately te gebruiken. Raadpleeg " "de documentatie.\n" -#: ../Debian/Dgit.pm:1081 +#: ../Debian/Dgit.pm:861 #, perl-format msgid "Forcing due to %s\n" msgstr "Forceren vanwege %s\n" -#: ../Debian/Dgit.pm:1146 +#: ../Debian/Dgit.pm:926 #, perl-format msgid "cannot stat %s/.git: %s" msgstr "kan status van %s/.git niet verkrijgen: %s" -#: ../Debian/Dgit.pm:1169 +#: ../Debian/Dgit.pm:949 #, perl-format msgid "failed to mkdir playground parent %s: %s" msgstr "mkdir van speelplaatsouder %s mislukte: %s" -#: ../Debian/Dgit.pm:1177 +#: ../Debian/Dgit.pm:957 #, perl-format msgid "failed to mkdir a playground %s: %s" msgstr "mkdir van een speelplaats %s mislukte: %s" -#: ../Debian/Dgit.pm:1186 +#: ../Debian/Dgit.pm:966 #, perl-format msgid "failed to mkdir the playground %s: %s" msgstr "mkdir van de speelplaats %s mislukte: %s" diff -pruN 13.12/po4a/dgit-nmu-simple_7.pot 13.13/po4a/dgit-nmu-simple_7.pot --- 13.12/po4a/dgit-nmu-simple_7.pot 2025-08-15 09:05:44.000000000 +0000 +++ 13.13/po4a/dgit-nmu-simple_7.pot 2025-08-24 10:43:28.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2025-08-15 11:11+0100\n" +"POT-Creation-Date: 2025-08-23 10:54+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,7 +28,7 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1890 ../dgit.7:23 ../dgit-user.7.pod:446 +#: ../dgit.1:1920 ../dgit.7:23 ../dgit-user.7.pod:446 #: ../dgit-nmu-simple.7.pod:158 ../dgit-maint-native.7.pod:125 #: ../dgit-maint-merge.7.pod:509 ../dgit-maint-gbp.7.pod:139 #: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 @@ -59,7 +59,7 @@ msgstr "" #: ../dgit-nmu-simple.7.pod:7 msgid "" "This tutorial describes how a Debian Developer can do a straightforward NMU " -"of a package in Debian, using dgit." +"of a package in Debian, working (only) in git." msgstr "" #. type: textblock diff -pruN 13.12/po4a/dgit-user_7.pt.po 13.13/po4a/dgit-user_7.pt.po --- 13.12/po4a/dgit-user_7.pt.po 1970-01-01 00:00:00.000000000 +0000 +++ 13.13/po4a/dgit-user_7.pt.po 2025-08-24 10:43:28.000000000 +0000 @@ -0,0 +1,926 @@ +# Translation of dgit dgit-user_7 manpage to European Portuguese +# +# Copyright (C) 2025 Free Software Foundation, Inc. +# This file is distributed under the same license as the dgit package. +# +# SPDX-FileCopyrightText: 2025 Américo Monteiro +msgid "" +msgstr "" +"Project-Id-Version: dgit 3.12_dgit-user_7\n" +"POT-Creation-Date: 2025-08-15 11:11+0100\n" +"PO-Revision-Date: 2025-08-23 01:18+0100\n" +"Last-Translator: Américo Monteiro \n" +"Language-Team: Portuguese <>\n" +"Language: pt\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Lokalize 25.04.0\n" + +#. type: =head1 +#: ../dgit.1:3 ../dgit.7:2 ../dgit-user.7.pod:1 ../dgit-nmu-simple.7.pod:1 +#: ../dgit-maint-native.7.pod:1 ../dgit-maint-merge.7.pod:1 +#: ../dgit-maint-gbp.7.pod:1 ../dgit-maint-debrebase.7.pod:1 +#: ../dgit-downstream-dsc.7.pod:1 ../dgit-sponsorship.7.pod:1 +#: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../git-debpush.1.pod:1 ../git-deborig.1.pod:1 ../tag2upload.5.pod:1 +#, no-wrap +msgid "NAME" +msgstr "NOME" + +#. type: =head1 +#: ../dgit.1:1890 ../dgit.7:23 ../dgit-user.7.pod:446 +#: ../dgit-nmu-simple.7.pod:158 ../dgit-maint-native.7.pod:125 +#: ../dgit-maint-merge.7.pod:509 ../dgit-maint-gbp.7.pod:139 +#: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:326 ../dgit-maint-bpo.7.pod:140 +#: ../git-debrebase.1.pod:629 ../git-debrebase.5.pod:677 +#: ../git-debpush.1.pod:341 ../git-deborig.1.pod:60 ../tag2upload.5.pod:307 +#, no-wrap +msgid "SEE ALSO" +msgstr "VEJA TAMBÉM" + +#. type: =head1 +#: ../dgit.7:4 ../dgit-user.7.pod:27 ../dgit-nmu-simple.7.pod:35 +#, no-wrap +msgid "SUMMARY" +msgstr "SUMÁRIO" + +#. type: textblock +#: ../dgit-user.7.pod:3 +msgid "dgit-user - making and sharing changes to Debian packages, with git" +msgstr "dgit-user - fazer e partilhar alterações a pacotes Debian, com o git" + +#. type: =head1 +#: ../dgit-user.7.pod:5 ../dgit-maint-native.7.pod:5 +#: ../dgit-maint-merge.7.pod:5 ../dgit-maint-gbp.7.pod:5 +#: ../dgit-maint-debrebase.7.pod:5 ../dgit-downstream-dsc.7.pod:5 +#: ../dgit-maint-bpo.7.pod:5 ../git-debrebase.5.pod:5 ../tag2upload.5.pod:5 +msgid "INTRODUCTION" +msgstr "INTRODUÇÃO" + +#. type: textblock +#: ../dgit-user.7.pod:7 +msgid "" +"dgit lets you fetch the source code to every package on your system as if " +"your distro used git to maintain all of it." +msgstr "" +"git permite-lhe obter o código fonte para cada pacote no seu sistema como se " +"a sua distribuição usasse git para os manter todos lá." + +#. type: textblock +#: ../dgit-user.7.pod:11 +msgid "" +"You can then edit it, build updated binary packages (.debs) and install and " +"run them. You can also share your work with others." +msgstr "" +"Você pode depois edita-los, compilar pacotes binários actualizados (.debs) e " +"instala-los e corre-os. Você pode também partilhar o seu trabalho com " +"outros." + +#. type: textblock +#: ../dgit-user.7.pod:16 +msgid "" +"This tutorial gives some recipes and hints for this. It assumes you have " +"basic familiarity with git. It does not assume any initial familiarity with " +"Debian's packaging processes." +msgstr "" +"Este tutorial fornece algumas receitas e dicas para isto. Ele assume que " +"você está basicamente familiarizado com o git. Não assume nenhuma " +"familiarização inicial com os processos de empacotamento de Debian." + +#. type: textblock +#: ../dgit-user.7.pod:21 +msgid "" +"If you are a package maintainer within Debian; a DM or DD; and/or a sponsee: " +"this tutorial is not for you. Try L, L, or L and L." +msgstr "" +"Se você é um maintainer de pacotes com Debian; um DM ou DD; e/ou um " +"apadrinhado: este tutorial não é para si. Tente L, " +"L, ou L e L." + +#. type: textblock +#: ../dgit-user.7.pod:29 +msgid "(These runes will be discussed later.)" +msgstr "(Estas runas serão discutidas mais tarde.)" + +#. type: verbatim +#: ../dgit-user.7.pod:33 +#, no-wrap +msgid "" +" % dgit clone glibc bookworm,-security\n" +" % cd glibc\n" +" % curl 'https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=28250;mbox=yes;msg=89' | patch -p1 -u\n" +" % git commit -a -m 'Fix libc lost output bug'\n" +" % gbp dch -S --since=dgit/dgit/sid --ignore-branch --commit\n" +" % sudo apt-get build-dep .\n" +" % dpkg-buildpackage -uc -b\n" +" % sudo dpkg -i ../libc6_*.deb\n" +"\n" +msgstr "" +" % dgit clone glibc bookworm,-security\n" +" % cd glibc\n" +" % curl 'https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=28250;mbox=yes;msg=89' | patch -p1 -u\n" +" % git commit -a -m 'Fix libc lost output bug'\n" +" % gbp dch -S --since=dgit/dgit/sid --ignore-branch --commit\n" +" % sudo apt-get build-dep .\n" +" % dpkg-buildpackage -uc -b\n" +" % sudo dpkg -i ../libc6_*.deb\n" +"\n" + +#. type: textblock +#: ../dgit-user.7.pod:44 +msgid "Occasionally:" +msgstr "Ocasionalmente:" + +#. type: verbatim +#: ../dgit-user.7.pod:48 ../dgit-user.7.pod:235 +#, no-wrap +msgid "" +" % git clean -xdf\n" +" % git reset --hard\n" +"\n" +msgstr "" +" % git clean -xdf\n" +" % git reset --hard\n" +"\n" + +#. type: textblock +#: ../dgit-user.7.pod:53 +msgid "Later:" +msgstr "Depois:" + +#. type: verbatim +#: ../dgit-user.7.pod:57 +#, no-wrap +msgid "" +" % cd glibc\n" +" % dgit pull bookworm,-security\n" +" % gbp dch -S --since=dgit/dgit/sid --ignore-branch --commit\n" +" % dpkg-buildpackage -uc -b\n" +" % sudo dpkg -i ../libc6_*.deb\n" +"\n" +msgstr "" +" % cd glibc\n" +" % dgit pull bookworm,-security\n" +" % gbp dch -S --since=dgit/dgit/sid --ignore-branch --commit\n" +" % dpkg-buildpackage -uc -b\n" +" % sudo dpkg -i ../libc6_*.deb\n" +"\n" + +#. type: =head1 +#: ../dgit-user.7.pod:65 +msgid "FINDING THE RIGHT SOURCE CODE - DGIT CLONE" +msgstr "ENCONTRAR O CÓDIGO FONTE CERTO - CLONE DO DGIT" + +#. type: verbatim +#: ../dgit-user.7.pod:69 +#, no-wrap +msgid "" +" % dgit clone glibc bookworm,-security\n" +" % cd glibc\n" +"\n" +msgstr "" +" % dgit clone glibc bookworm,-security\n" +" % cd glibc\n" +"\n" + +#. type: textblock +#: ../dgit-user.7.pod:74 +msgid "" +"dgit clone needs to be told the source package name (which might be " +"different to the binary package name, which was the name you passed to \"apt-" +"get install\") and the codename or alias of the Debian release (this is " +"called the \"suite\")." +msgstr "" +"o clone do dgit precisa que lhe digam o nome do pacote fonte (que pode ser " +"diferente do nome do pacote binário, o qual foi o nome que você passou ao " +"\"apt-get install\") e o nome de código ou nome alternativo do lançamento " +"Debian (isto é chamado a \"suite\")." + +#. type: =head2 +#: ../dgit-user.7.pod:80 +msgid "Finding the source package name" +msgstr "Encontrar o nome do pacote fonte" + +#. type: textblock +#: ../dgit-user.7.pod:82 +msgid "" +"For many packages, the source package name is obvious. Otherwise, if you " +"know a file that's in the package, you can look it up with dpkg:" +msgstr "" +"Para muitos pacotes, o nome de pacote fonte é óbvio. Caso contrário, se " +"você souber de um ficheiro que está no pacote, você pode procura-lo com o " +"dpkg:" + +#. type: verbatim +#: ../dgit-user.7.pod:88 +#, no-wrap +msgid "" +" % dpkg -S /lib/i386-linux-gnu/libc.so.6 \n" +" libc6:i386: /lib/i386-linux-gnu/libc.so.6\n" +" % dpkg -s libc6:i386\n" +" Package: libc6\n" +" Status: install ok installed\n" +" ...\n" +" Source: glibc\n" +"\n" +msgstr "" +" % dpkg -S /lib/i386-linux-gnu/libc.so.6 \n" +" libc6:i386: /lib/i386-linux-gnu/libc.so.6\n" +" % dpkg -s libc6:i386\n" +" Package: libc6\n" +" Status: install ok installed\n" +" ...\n" +" Source: glibc\n" +"\n" + +#. type: textblock +#: ../dgit-user.7.pod:98 +msgid "" +"(In this example, libc6 is a \"multi-arch: allowed\" package, which means " +"that it exists in several different builds for different architectures. " +"That's where C<:i386> comes from.)" +msgstr "" +"(Neste exemplo, libc6 é um pacote \"multi-arch: allowed\", o que significa " +"que ele existe em várias compilações diferentes para arquitecturas " +"diferentes. É daí que C<:i386> vem.)" + +#. type: =head2 +#: ../dgit-user.7.pod:104 +msgid "Finding the Debian release (the \"suite\")" +msgstr "Encontrar o lançamento Debian (a \"suite\")" + +#. type: textblock +#: ../dgit-user.7.pod:106 +msgid "" +"Internally, Debian (and derived) distros normally refer to their releases by " +"codenames. Debian also has aliases which refer to the current stable " +"release etc. So for example, at the time of writing Debian C " +"(Debian 12) is Debian C; and the current version of Ubuntu is " +"C (Plucky Puffin, 25.04). You can specify either the codename " +"C or the alias C. If you don't say, you get C, which " +"is Debian C - the main work-in progress branch." +msgstr "" +"Internamente, as distribuições Debian (e derivadas) normalmente referem os " +"seus lançamentos por nomes de código. Debian também tem nomes alternativos " +"que referem o lançamento estável actual, etc. Assim por exemplo, na altura " +"da escrita de Debian C (Debian 12) é Debian C; e a versão " +"atual de Ubuntu é C (Plucky Puffin, 25.04). Você pode especificar " +"seja o nome de código C ou o nome alternativo C. Se você " +"não o disser, vai obter C, o que é Debian C - o principal " +"ramo de trabalho em progresso." + +#. type: textblock +#: ../dgit-user.7.pod:117 +msgid "" +"If you don't know what you're running, please refer to your apt " +"configuration in /etc/apt/sources* or in /etc/debian_version" +msgstr "" +"Se você não sabe o que está a usar, por favor consulte a sua configuração do " +"apt em /etc/apt/sources* ou em /etc/debian_version" + +#. type: textblock +#: ../dgit-user.7.pod:121 +msgid "" +"For Debian, you should add C<,-security> to the end of the suite name, " +"unless you're on unstable or testing. Hence, in our example C " +"becomes C. (Yes, with a comma.)" +msgstr "" +"Para Debian, você deve adicionar C<,-security> ao final do nome de suite , a " +"menos que esteja em unstable ou testing. Assim, no seu exemplo C " +"torna-se C. (Sim, com uma vírgula.)" + +#. type: =head1 +#: ../dgit-user.7.pod:128 +msgid "WHAT DGIT CLONE PRODUCES" +msgstr "O QUE O CLONE DO DGIT PRODUZ" + +#. type: =head2 +#: ../dgit-user.7.pod:130 +msgid "What branches are there" +msgstr "Que ramos existem" + +#. type: textblock +#: ../dgit-user.7.pod:132 +msgid "" +"dgit clone will give you a new working tree, and arrange for you to be on a " +"branch named like C (yes, with a comma in the " +"branch name)." +msgstr "" +"dgit clone irá dar-lhe uma nova árvore de trabalho, e arrumar para si para " +"ficar num ramo chamado algo como C (sim, com uma " +"vírgula no nome de ramo)." + +#. type: textblock +#: ../dgit-user.7.pod:136 +msgid "" +"For each release (like C) there is a tracking branch for the " +"contents of the archive, called C (and similarly " +"for other suites). This can be updated with C. This, " +"the I, is synthesized by your local copy of dgit. It " +"is fast forwarding." +msgstr "" +"Para cada lançamento (como C) existe um ramo de acompanhamento " +"para os conteúdos do arquivo, chamado C (e " +"semelhante para outras suites). Isto pode ser atualizado com C. Isto, o I, é sintetizado pela sua cópia " +"local do dgit. É um avanço rápido." + +#. type: textblock +#: ../dgit-user.7.pod:145 +msgid "" +"Debian separates out the security updates, into C<*-security>. Telling dgit " +"C means that it should include any updates available in " +"C. The comma notation is a request to dgit to track " +"bookworm, or bookworm-security if there is an update for the package there." +msgstr "" +"Debian separa as atualizações de segurança, em C<*-security>. Dizer ao dgit " +"C significa que deve incluir quaisquer atualizações " +"disponíveis em C. A notação com a vírgula é um pedido ao " +"dgit para acompanhar bookworm, ou bookworm-security para ver se há " +"atualização para o pacote lá." + +#. type: textblock +#: ../dgit-user.7.pod:151 +msgid "" +"(You can also dgit fetch in a tree that wasn't made by dgit clone. If " +"there's no C you'll have to supply a C<-p>I " +"option to dgit fetch.)" +msgstr "" +"(Você também pode fazer o dgit procurar numa árvore que não foi feita pelo " +"dgit clone. Se não existir um C você tem de fornecer uma " +"opção C<-p>I para o dgit procurar.)" + +#. type: =head2 +#: ../dgit-user.7.pod:155 +msgid "What kind of source tree do you get" +msgstr "Que tipo de árvore fonte você obtém" + +#. type: textblock +#: ../dgit-user.7.pod:157 +msgid "" +"If the Debian package is based on some upstream release, the code layout " +"should be like the upstream version. You should find C helpful to " +"find where to edit." +msgstr "" +"Se o pacote Debian for baseado em algum lançamento do autor, a disposição do " +"código estará parecida com a versão do autor. Você vai achar C " +"uma boa ajuda para descobrir onde editar." + +#. type: textblock +#: ../dgit-user.7.pod:161 +msgid "" +"The package's Debian metadata and the scripts for building binary packages " +"are under C. C, C and C are the starting points. The Debian Policy Manual has most of the in-" +"depth technical details." +msgstr "" +"Os metadados do pacote Debian e os scripts para compilar pacotes binário " +"estão sob C. C, C e C são os pontos de partida. O Manual de Política Debian tem a maioria " +"dos detalhes mais profundos." + +#. type: textblock +#: ../dgit-user.7.pod:168 +msgid "" +"For many Debian packages, there will also be some things in C. It is best to ignore these. Insofar as they are relevant the changes " +"there will have been applied to the actual files, probably by means of " +"actual commits in the git history. The contents of debian/patches are " +"ignored when building binaries from dgitish git branches." +msgstr "" +"Para a maioria dos pacotes, vão estar também algumas coisas em C. É melhor ignorar estas. Na medida que são relevantes nas " +"alterações que vão ser aplicadas aos ficheiros, provavelmente por meio de " +"coisas cometidas no histórico do git. O conteúdo debian/patches é ignorado " +"quando se compila binários a partir de ramos git feitos à dgit." + +#. type: textblock +#: ../dgit-user.7.pod:178 +msgid "" +"(For Debian afficionados: the git trees that come out of dgit are \"patches-" +"applied packaging branches without a .pc directory\".)" +msgstr "" +"(Para os aficionados de Debian: as árvores git que saem do dgit são \"ramos " +"de empacotamento com patches-aplicada sem um directório .pc\".)" + +#. type: =head2 +#: ../dgit-user.7.pod:183 +msgid "What kind of history you get" +msgstr "Que tipo de história você obtém" + +#. type: textblock +#: ../dgit-user.7.pod:185 +msgid "" +"If you're lucky, the history will be a version of, or based on, the Debian " +"maintainer's own git history, or upstream's git history." +msgstr "" +"Se estiver com sorte, o histórico será uma versão de, ou baseada em, do " +"histórico git do próprio maintainer Debian, ou do histórico git do autor." + +#. type: textblock +#: ../dgit-user.7.pod:190 +msgid "" +"But for many packages the real git history does not exist, or has not been " +"published in a dgitish form. So you may find that the history is a rather " +"short history invented by dgit." +msgstr "" +"Mas para muitos pacotes o histórico git real não existe, ou não foi " +"publicado num formato à dgit. Assim você pode descobrir que o histórico é " +"um histórico bastante curto inventado pelo dgit." + +#. type: textblock +#: ../dgit-user.7.pod:196 +msgid "" +"dgit histories often contain automatically-generated commits, including " +"commits which make no changes but just serve to make a rebasing branch fast-" +"forward. This is particularly true of combining branches like C." +msgstr "" +"os históricos do dgit muitas vezes contém commits gerados automaticamente, " +"incluindo commits que não fizeram nenhumas alterações mas serviram para " +"criar um ramo re-baseado de avanço rápido. Isto é particularmente verdade " +"de se combinar ramos como C." + +#. type: textblock +#: ../dgit-user.7.pod:203 +msgid "" +"If the package maintainer is using git then after dgit clone you may find " +"that there is a useful C remote referring to the Debian package " +"maintainer's repository for the package. You can see what's there with " +"C. But use what you find there with care: Debian " +"maintainers' git repositories often have contents which are very confusing " +"and idiosyncratic. In particular, you may need to manually apply the " +"patches that are in debian/patches before you do anything else!" +msgstr "" +"Se o maintainer do pacote está a usar git após dgit clone você pode " +"descobrir que existe um C remoto útil que refere ao repositório do " +"maintainer do pacote Debian. Você pode ver o que lá está com C. Mas use o que lá encontrar com cuidado: os repositórios de " +"maintainers Debian muitas vezes têm conteúdos que são muito confusos e " +"idiossincráticos. Em particular, você pode precisar de aplicar manualmente " +"as patches que estão em debian/patches antes de fazer qualquer outra coisa." + +#. type: =head1 +#: ../dgit-user.7.pod:215 ../dgit-maint-gbp.7.pod:56 +msgid "BUILDING" +msgstr "COMPILAÇÃO" + +#. type: =head2 +#: ../dgit-user.7.pod:217 +msgid "Always commit before building" +msgstr "Cometa sempre antes de compilar" + +#. type: verbatim +#: ../dgit-user.7.pod:221 +#, no-wrap +msgid "" +" % wget 'https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=28250;mbox=yes;msg=89' | patch -p1 -u\n" +" % git commit -a -m 'Fix libc lost output bug'\n" +"\n" +msgstr "" +" % wget 'https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=28250;mbox=yes;msg=89' | patch -p1 -u\n" +" % git commit -a -m 'Fix libc lost output bug'\n" +"\n" + +#. type: textblock +#: ../dgit-user.7.pod:226 +msgid "" +"Debian package builds are often quite messy: they may modify files which are " +"also committed to git, or leave outputs and temporary files not covered by " +"C<.gitignore>." +msgstr "" +"Compilações de pacote Debian são muitas vezes bastantes desarrumadas: elas " +"podem modificar ficheiros que são também cometidos para o git, ou deixar " +"resultados e ficheiros temporários não cobertos pelo C<.gitignore>." + +#. type: textblock +#: ../dgit-user.7.pod:230 +msgid "If you always commit, you can use" +msgstr "Se você cometer sempre, você pode usar" + +#. type: textblock +#: ../dgit-user.7.pod:240 +msgid "" +"to tidy up after a build. (If you forgot to commit, don't use those " +"commands; instead, you may find that you can use C to help " +"commit what you actually wanted to keep.)" +msgstr "" +"para arrumar tudo após um compilação. (Se você se esqueceu de cometer, não " +"use esses comandos; em vez disso, saiba que pode usar C para " +"ajudar a cometer aquilo que realmente quer manter.)" + +#. type: textblock +#: ../dgit-user.7.pod:245 +msgid "" +"These are destructive commands which delete all new files (so you B " +"remember to say C) and throw away edits to every file (so you " +"B remember to commit)." +msgstr "" +"Estes são comandos destrutivos que apagam todos os novos ficheiros (assim " +"você B de se lembrar de dizer C) e deitam fora as edições de " +"cada ficheiro (assim você B de se lembrar de cometer)." + +#. type: =head2 +#: ../dgit-user.7.pod:250 +msgid "Update the changelog (at least once) before building" +msgstr "Atualize o changelog (pelo menos uma vez) antes de compilar" + +#. type: verbatim +#: ../dgit-user.7.pod:254 +#, no-wrap +msgid "" +" % gbp dch -S --since=dgit/dgit/sid --ignore-branch --commit\n" +"\n" +msgstr "" +" % gbp dch -S --since=dgit/dgit/sid --ignore-branch --commit\n" +"\n" + +#. type: textblock +#: ../dgit-user.7.pod:258 +msgid "" +"The binaries you build will have a version number which ultimately comes " +"from the C. You want to be able to tell your binaries " +"apart from your distro's." +msgstr "" +"Os binários que você compilar irão ter um número de versão que em última " +"análise vem de C. Você vai querer ser capaz de distinguir " +"os seus binários dos da sua distribuição." + +#. type: textblock +#: ../dgit-user.7.pod:263 +msgid "" +"So you should update C to add a new stanza at the top, for " +"your build." +msgstr "" +"Assim você deve atualizar C para adicionar uma nova " +"estrofe no topo, para a sua compilação." + +#. type: textblock +#: ../dgit-user.7.pod:267 +msgid "" +"This rune provides an easy way to do this. It adds a new changelog entry " +"with an uninformative message and a plausible version number (containing a " +"bit of your git commit id)." +msgstr "" +"Esta runa fornece uma maneira fácil de fazer isto. Adiciona uma nova " +"entrada no changelog com uma mensagem pouco informativa e um número de " +"versão plausível (contendo um bocadinho do seu id de cometido ao git)." + +#. type: textblock +#: ../dgit-user.7.pod:272 +msgid "" +"If you want to be more sophisticated, the package C has a good " +"Emacs mode for editing changelogs. Alternatively, you could edit the " +"changelog with another text editor, or run C or C with " +"different options. Choosing a good version number is slightly tricky and a " +"complete treatment is beyond the scope of this tutorial." +msgstr "" +"Se desejar ser mais sofisticado, o pacote C tem um bom modo " +"Emacs para editar changelogs. Em alternativa, você pode editar o changelog " +"com outro editor de texto, ou correr C ou C com opções " +"diferentes. Escolher um bom número de versão é um pouco complicado e um " +"tratamento completo está para lá do escopo deste tutorial." + +#. type: =head2 +#: ../dgit-user.7.pod:280 +msgid "Actually building" +msgstr "Realmente compilar" + +#. type: verbatim +#: ../dgit-user.7.pod:284 +#, no-wrap +msgid "" +" % sudo apt-get build-dep .\n" +" % dpkg-buildpackage -uc -b\n" +"\n" +msgstr "" +" % sudo apt-get build-dep .\n" +" % dpkg-buildpackage -uc -b\n" +"\n" + +#. type: textblock +#: ../dgit-user.7.pod:289 +msgid "" +"dpkg-buildpackage is the primary tool for building a Debian source package. " +"C<-uc> means not to pgp-sign the results. C<-b> means build all binary " +"packages, but not to build a source package." +msgstr "" +"dpkg-buildpackage é a ferramenta principal para compilar um pacote fonte " +"Debian. C<-uc> significa não assinar com pgp os resultados. C<-b> " +"significa compilar todos os pacotes binário, mas não compilar um pacote " +"fonte." + +#. type: =head2 +#: ../dgit-user.7.pod:295 +msgid "Using sbuild" +msgstr "Usar o sbuild" + +#. type: textblock +#: ../dgit-user.7.pod:297 +msgid "" +"You can build in an schroot chroot, with sbuild, instead of in your main " +"environment. (sbuild is used by the Debian build daemons.)" +msgstr "" +"Você pode compilar numa chroot de schroot, com o sbuild, em vez de o fazer " +"no seu ambiente principal. (sbuild é usado pelos daemons de compilação de " +"Debian.)" + +#. type: verbatim +#: ../dgit-user.7.pod:302 +#, no-wrap +msgid "" +" % git clean -xdf\n" +" % sbuild -d trixie -A --no-clean-source \\\n" +" --dpkg-source-opts='-Zgzip -z1 --format=1.0 -sn'\n" +"\n" +msgstr "" +" % git clean -xdf\n" +" % sbuild -d trixie -A --no-clean-source \\\n" +" --dpkg-source-opts='-Zgzip -z1 --format=1.0 -sn'\n" +"\n" + +#. type: textblock +#: ../dgit-user.7.pod:308 +msgid "" +"Note that this will seem to leave a \"source package\" (.dsc and .tar.gz) " +"in the parent directory, but that source package should not be used. It is " +"likely to be broken. For more information see Debian bug #868527." +msgstr "" +"Note que isto vai parecer deixar um \"pacote fonte\" (.dsc e .tar.gz) no " +"directório pai, mas esse pacote fonte não deve ser usado. Estará " +"provavelmente estragado. Para mais informação veja bug Debian #868527." + +#. type: =head1 +#: ../dgit-user.7.pod:315 +msgid "INSTALLING" +msgstr "INSTALAÇÃO" + +#. type: verbatim +#: ../dgit-user.7.pod:319 +#, no-wrap +msgid "" +" % sudo apt install ../libc6_*.deb\n" +"\n" +msgstr "" +" % sudo apt install ../libc6_*.deb\n" +"\n" + +#. type: textblock +#: ../dgit-user.7.pod:323 +msgid "" +"You can use C to install the .debs that came out of your package." +msgstr "" +"Você pode usar C para instalar os .debs que saíram do seu pacote." + +#. type: textblock +#: ../dgit-user.7.pod:326 +msgid "" +"If the dependencies aren't installed, you will get an error, which can " +"usually be fixed with C." +msgstr "" +"Se as dependências não estiverem instaladas, vai receber um erro, o que pode " +"ser geralmente corrigido com C." + +#. type: =head1 +#: ../dgit-user.7.pod:330 +msgid "Multiarch" +msgstr "Multi-arquitectura" + +#. type: textblock +#: ../dgit-user.7.pod:332 +msgid "" +"If you're working on a library package and your system has multiple " +"architectures enabled, you may see something like this:" +msgstr "" +"Se você está a trabalhar num pacote biblioteca e o seu sistema tem várias " +"arquitecturas activas, você pode ver algo como isto:" + +#. type: verbatim +#: ../dgit-user.7.pod:338 +#, no-wrap +msgid "" +" dpkg: error processing package libpcre3-dev:amd64 (--configure):\n" +" package libpcre3-dev:amd64 2:8.39-3~3.gbp8f25f5 cannot be configured because libpcre3-dev:i386 is at a different version (2:8.39-2)\n" +"\n" +msgstr "" +" dpkg: error processing package libpcre3-dev:amd64 (--configure):\n" +" package libpcre3-dev:amd64 2:8.39-3~3.gbp8f25f5 cannot be configured because libpcre3-dev:i386 is at a different version (2:8.39-2)\n" +"\n" + +#. type: textblock +#: ../dgit-user.7.pod:343 +msgid "" +"The multiarch system used by Debian requires each package which is present " +"for multiple architectures to be exactly the same across all the " +"architectures for which it is installed." +msgstr "" +"O sistema de multi-arquitectura usado por Debian requer que cada pacote que " +"esteja presente para múltiplas arquitecturas seja exatamente o mesmo entre " +"todas as arquitecturas para quais está instalado." + +#. type: textblock +#: ../dgit-user.7.pod:347 +msgid "" +"The proper solution is to build the package for all the architectures you " +"have enabled. You'll need a chroot for each of the secondary " +"architectures. This is somewhat tiresome, even though Debian has excellent " +"tools for managing chroots. C from the " +"package of the same name and C from the C " +"package are good starting points." +msgstr "" +"A solução apropriada é compilar o pacote para todas as arquitecturas que tem " +"activas. Você vai precisar duma chroot para cada uma das arquitecturas " +"secundárias. Isto é um pouco cansativo, mesmo apesar de Debian ter " +"ferramentas excelentes para gerir chroots. C " +"do pacote com o mesmo nome e C do pacote C são " +"bons pontos de partida." + +#. type: textblock +#: ../dgit-user.7.pod:357 +msgid "" +"Otherwise you could deinstall the packages of interest for those other " +"architectures with something like C." +msgstr "" +"Caso contrário você pode desinstalar os pacotes que interessam para as " +"outras arquitecturas com algo como C." + +#. type: textblock +#: ../dgit-user.7.pod:361 +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 - 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 "" +"Se nenhuma destas for opção, o seu último recurso desesperado é tentar usar " +"o mesmo número de versão que o pacote oficial para o seu próprio pacote. (A " +"versão é controlada por C -veja em cima.) Isto não é " +"ideal porque torna difícil de perceber o que está instalado, e porque irá " +"confundir e induzir em erro o apt." + +#. type: textblock +#: ../dgit-user.7.pod:369 +msgid "With the \"same number\" approach you may still get errors like" +msgstr "Com a abordagem \"mesmo número\" ainda pode ter erros do tipo" + +#. type: textblock +#: ../dgit-user.7.pod:373 +msgid "" +"trying to overwrite shared '/usr/include/pcreposix.h', which is different " +"from other instances of package libpcre3-dev" +msgstr "" +"a tentar sobrescreve '/usr/include/pcreposix.h' partilhado, o qual é " +"diferente de outras instâncias do pacote libpcre3-dev" + +#. type: textblock +#: ../dgit-user.7.pod:377 +msgid "" +"but passing C<--force-overwrite> to dpkg will help - assuming you know what " +"you're doing." +msgstr "" +"mas passar C<--force-overwrite> ao dpkg vai ajudar - assumindo que você sabe " +"o que faz." + +#. type: =head1 +#: ../dgit-user.7.pod:380 +msgid "SHARING YOUR WORK" +msgstr "PARTILHAR O SEU TRABALHO" + +#. type: textblock +#: ../dgit-user.7.pod:382 +msgid "" +"The C branch (or whatever) is a normal git branch. " +"You can use C to publish it on any suitable git server." +msgstr "" +"O ramo C (ou qualquer outra coisa) é um ramo git " +"normal. Você pode usar C para o publicar em qualquer servidor git " +"apropriado." + +#. type: textblock +#: ../dgit-user.7.pod:385 +msgid "" +"Anyone who gets that git branch from you will be able to build binary " +"packages (.deb) just as you did." +msgstr "" +"Qualquer pessoa que obtenha esse ramo git de si será capaz de compilar " +"pacotes (.deb) binário tal como você fez." + +#. type: textblock +#: ../dgit-user.7.pod:389 +msgid "" +"If you want to contribute your changes back to Debian, you should probably " +"send them as attachments to an email to the L (either a followup to an existing bug, or a new bug). " +"Patches in C format are usually very welcome." +msgstr "" +"Se você deseja contribuir as suas alterações de volta para Debian, deve " +"provavelmente envia-las com o anexos em um email para o L (seja no seguimento de um bug existente, ou num " +"novo bug). Patches em formato C são geralmente bem " +"recebidas." + +#. type: =head2 +#: ../dgit-user.7.pod:396 +msgid "Source packages" +msgstr "Pacotes fonte" + +#. type: textblock +#: ../dgit-user.7.pod:398 +msgid "" +"The git branch is not sufficient to build a source package the way Debian " +"does. Source packages are somewhat awkward to work with. Indeed many " +"plausible git histories or git trees cannot be converted into a suitable " +"source package. So I recommend you share your git branch instead." +msgstr "" +"O ramo git não é suficiente para compilar um pacote fonte da maneira que " +"Debian faz. Os pacotes fonte são um pouco desajeitados para se trabalhar. " +"Na verdade muitos históricos git plausíveis ou árvores git não podem ser " +"convertidos num pacote fonte apropriado. Assim Eu recomendo que você " +"partilhe o seu ramo git em vez disto." + +#. type: textblock +#: ../dgit-user.7.pod:406 +msgid "" +"If a git branch is not enough, and you need to provide a source package but " +"don't care about its format/layout (for example because some software you " +"have consumes source packages, not git histories) you can use this recipe " +"to generate a C<3.0 (native)> source package, which is just a tarball with " +"accompanying .dsc metadata file:" +msgstr "" +"Se um ramo git não for suficiente, e precisar de fornecer um pacote fonte " +"mas não se interessa pelo seu formato/disposição (por exemplo porque algum " +"software que tem consome pacotes fonte, e não históricos git) você pode " +"usar esta receita para gerar um pacote fonte C<3.0 (nativo)>, o que é apenas " +"um tarball com acompanhado dum ficheiro de metadados .dsc:" + +#. type: verbatim +#: ../dgit-user.7.pod:417 +#, no-wrap +msgid "" +" % echo '3.0 (native)' >debian/source/format\n" +" % git commit -m 'switch to native source format' debian/source/format\n" +" % dgit -wgf build-source\n" +"\n" +msgstr "" +" % echo '3.0 (native)' >debian/source/format\n" +" % git commit -m 'switch to native source format' debian/source/format\n" +" % dgit -wgf build-source\n" +"\n" + +#. type: textblock +#: ../dgit-user.7.pod:423 +msgid "" +"If you need to provide a good-looking source package, be prepared for a lot " +"more work. You will need to read much more, perhaps starting with L, L or L" +msgstr "" +"Se você precisar de fornecer um pacote fonte bonito, esteja preparado para " +"muito mais trabalho. Vai precisar de ler muito mais, talvez começando com " +"L, L ou L" + +#. type: =head1 +#: ../dgit-user.7.pod:430 +msgid "INSTALLING NEWER DGIT ON OLDER DISTROS" +msgstr "INSTALAR O NOVO DGIT EM DISTRIBUIÇÕES ANTIGAS" + +#. type: textblock +#: ../dgit-user.7.pod:432 +msgid "" +"If dgit breaks with the source package you are working with, this might be " +"due to a bug which would be fixed by upgrading." +msgstr "" +"Se o dgit quebrar com o pacote fonte em que está a trabalhar, isto pode ser " +"devido a um bug que deveria ser corrigido por uma atualização." + +#. type: textblock +#: ../dgit-user.7.pod:435 +msgid "" +"You can probably directly C the latest version of dgit.deb from " +"Debian stable, or Debian testing." +msgstr "" +"Você pode provavelmente C diretamente a versão mais recente do " +"dgit.deb de Debian stable, ou Debian testing." + +#. type: textblock +#: ../dgit-user.7.pod:440 +msgid "" +"Versions of dgit from Debian 13 (trixie) onwards document their " +"installability on old releases in the manpage. For example, for current " +"Debian testing, see L, and look in the section SUPPORT ON OLD DISTRIBUTIONS." +msgstr "" +"Versões do dgit a partir de Debian 13 (trixie) daqui em diante documentam a " +"sua instabilidade dos lançamentos antigos no manual. Por exemplo, para " +"Debian testing atual, veja L, e consulte a secção SUPORTE EM DISTRIBUIÇÕES ANTIGAS." + +#. type: textblock +#: ../dgit-user.7.pod:448 ../dgit-maint-native.7.pod:127 +#: ../dgit-maint-gbp.7.pod:141 +msgid "dgit(1), dgit(7)" +msgstr "dgit(1), dgit(7)" diff -pruN 13.12/po4a/dgit_7.pot 13.13/po4a/dgit_7.pot --- 13.12/po4a/dgit_7.pot 2025-08-15 09:05:44.000000000 +0000 +++ 13.13/po4a/dgit_7.pot 2025-08-24 10:43:28.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2025-08-15 11:11+0100\n" +"POT-Creation-Date: 2025-08-23 10:54+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -40,7 +40,7 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1890 ../dgit.7:23 ../dgit-user.7.pod:446 +#: ../dgit.1:1920 ../dgit.7:23 ../dgit-user.7.pod:446 #: ../dgit-nmu-simple.7.pod:158 ../dgit-maint-native.7.pod:125 #: ../dgit-maint-merge.7.pod:509 ../dgit-maint-gbp.7.pod:139 #: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 @@ -422,14 +422,21 @@ msgid "" "right, suppressing the attributes." msgstr "" +#. type: Plain text +#: ../dgit.7:267 +msgid "" +"If upstream relies on gitattributes for anything important, you must " +"reproduce the effect in debian/rules and/or a Debian-specific patch." +msgstr "" + #. type: SH -#: ../dgit.7:263 +#: ../dgit.7:267 #, no-wrap msgid "PACKAGE SOURCE FORMATS" msgstr "" #. type: Plain text -#: ../dgit.7:268 +#: ../dgit.7:272 msgid "" "If you are not the maintainer, you do not need to worry about the source " "format of the package. You can just make changes as you like in git. If " @@ -438,13 +445,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.7:268 +#: ../dgit.7:272 #, no-wrap msgid "FILE EXECUTABILITY" msgstr "" #. type: Plain text -#: ../dgit.7:275 +#: ../dgit.7:279 msgid "" "Debian source package formats do not always faithfully reproduce changes to " "executability. But dgit insists that the result of dgit clone is identical " @@ -453,7 +460,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:281 +#: ../dgit.7:285 msgid "" "So files that are executable in your git tree must be executable in the " "result of dpkg-source -x (but often aren't). If a package has such " @@ -462,20 +469,20 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.7:281 +#: ../dgit.7:285 #, no-wrap msgid "FORMAT 3.0 (QUILT)" msgstr "" #. type: Plain text -#: ../dgit.7:285 +#: ../dgit.7:289 msgid "" "For a format `3.0 (quilt)' source package, dgit may have to make a commit on " "your current branch to contain metadata used by quilt and dpkg-source." msgstr "" #. type: Plain text -#: ../dgit.7:292 +#: ../dgit.7:296 msgid "" "This is because `3.0 (quilt)' source format represents the patch stack as " "files in debian/patches/ actually inside the source tree. This means that, " @@ -485,7 +492,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:297 +#: ../dgit.7:301 msgid "" "dgit will automatically work around this for you when building and pushing. " "The only thing you need to know is that dgit build, sbuild, etc., may make " @@ -494,7 +501,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:304 +#: ../dgit.7:308 msgid "" "Simply committing to source files (whether in debian/ or not, but not to " "patches) will result in a branch that dgit quilt-fixup can linearise. " @@ -503,14 +510,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:307 +#: ../dgit.7:311 msgid "" "You can explicitly request that dgit do just this fixup, by running dgit " "quilt-fixup." msgstr "" #. type: Plain text -#: ../dgit.7:314 +#: ../dgit.7:318 msgid "" "If you are a quilt user you need to know that dgit's git trees are `patches " "applied packaging branches' and do not contain the .pc directory (which is " @@ -520,18 +527,18 @@ msgid "" msgstr "" #. type: SS -#: ../dgit.7:315 +#: ../dgit.7:319 #, no-wrap msgid "quilt fixup error messages" msgstr "" #. type: Plain text -#: ../dgit.7:317 +#: ../dgit.7:321 msgid "When dgit's quilt fixup fails, it prints messages like this:" msgstr "" #. type: Plain text -#: ../dgit.7:323 +#: ../dgit.7:327 #, no-wrap msgid "" "dgit: base trees orig=5531f03d8456b702eab6 o+d/p=135338e9cc253cc85f84\n" @@ -541,7 +548,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:326 +#: ../dgit.7:330 #, no-wrap msgid "" "dgit: error: quilt fixup cannot be linear. Stopped at:\n" @@ -549,13 +556,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.7:328 +#: ../dgit.7:332 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: ../dgit.7:334 +#: ../dgit.7:338 msgid "" "is an import of the .orig tarballs dgit found, with the debian/ directory " "from your HEAD substituted. This is a git tree object, not a commit: you " @@ -563,37 +570,37 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.7:335 +#: ../dgit.7:339 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: ../dgit.7:340 +#: ../dgit.7:344 msgid "" "is another tree object, which is the same as orig but with the patches from " "debian/patches applied." msgstr "" #. type: TP -#: ../dgit.7:341 +#: ../dgit.7:345 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: ../dgit.7:344 +#: ../dgit.7:348 msgid "is of course your own git HEAD." msgstr "" #. type: TP -#: ../dgit.7:345 +#: ../dgit.7:349 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: ../dgit.7:354 +#: ../dgit.7:358 msgid "" "shows whether each of the these trees differs from the others (i) in " "upstream files excluding .gitignore files; (ii) in upstream .gitignore " @@ -601,7 +608,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:361 +#: ../dgit.7:365 msgid "" "dgit quilt-fixup --quilt=linear walks commits backwards from your HEAD " "trying to construct a linear set of additional patches, starting at the " @@ -610,7 +617,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:372 +#: ../dgit.7:376 msgid "" "In the error message, 696c9bd5..84ae8f96 is the first commit child-parent " "edge which cannot sensibly be either ignored, or turned into a patch in " @@ -621,7 +628,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:391 +#: ../dgit.7:395 msgid "" "Your appropriate response depends on the cause and the context. If you have " "been freely merging your git branch and do not need need a pretty linear " @@ -634,7 +641,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:397 +#: ../dgit.7:401 msgid "" "Finally, this problem can occur if you have provided Debian git tooling such " "as git-debrebase, git-dpm or git-buildpackage with upstream git commit(s) or " @@ -642,13 +649,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.7:397 +#: ../dgit.7:401 #, no-wrap msgid "SPLIT VIEW AND SPLITTING QUILT MODES" msgstr "" #. type: Plain text -#: ../dgit.7:404 +#: ../dgit.7:408 msgid "" "When working with git branches intended for use with the `3.0 (quilt)' " "source format dgit can automatically convert a suitable maintainer-provided " @@ -656,7 +663,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:411 +#: ../dgit.7:415 msgid "" "When a splitting quilt mode is selected dgit build commands and dgit push-* " "will, on each invocation, convert the user's HEAD into the dgit view, so " @@ -664,14 +671,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:417 +#: ../dgit.7:421 msgid "" "Split view mode can also be enabled explicitly with the --split-view command " "line option and the .split-view access configuration key." msgstr "" #. type: Plain text -#: ../dgit.7:430 +#: ../dgit.7:434 msgid "" "When split view is in operation, regardless of the quilt mode, any dgit-" "generated pseudomerges and any quilt fixup commits will appear only in the " @@ -682,7 +689,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:438 +#: ../dgit.7:442 msgid "" "Splitting quilt modes must be enabled explicitly (by the use of the " "applicable command line options, subcommands, or configuration). This is " @@ -692,27 +699,27 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:442 +#: ../dgit.7:446 msgid "" "Split view conversions are cached in the ref dgit-intern/quilt-cache. This " "should not be manipulated directly." msgstr "" #. type: SH -#: ../dgit.7:442 +#: ../dgit.7:446 #, no-wrap msgid "FILES IN THE ORIG TARBALL BUT NOT IN GIT - AUTOTOOLS ETC." msgstr "" #. type: Plain text -#: ../dgit.7:445 +#: ../dgit.7:449 msgid "" "This section is mainly of interest to maintainers who want to use dgit with " "their existing git history for the Debian package." msgstr "" #. type: Plain text -#: ../dgit.7:451 +#: ../dgit.7:455 msgid "" "Some developers like to have an extra-clean git tree which lacks files which " "are normally found in source tarballs and therefore in Debian source " @@ -722,7 +729,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:457 +#: ../dgit.7:461 msgid "" "dgit requires that the source package unpacks to exactly the same files as " "are in the git commit on which dgit push-* operates. So if you just try to " @@ -731,18 +738,18 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:459 +#: ../dgit.7:463 msgid "As the maintainer you therefore have the following options:" msgstr "" #. type: TP -#: ../dgit.7:459 ../dgit.7:470 ../dgit.7:519 ../dgit.7:527 +#: ../dgit.7:463 ../dgit.7:474 ../dgit.7:523 ../dgit.7:531 #, no-wrap msgid "\\(bu" msgstr "" #. type: Plain text -#: ../dgit.7:470 +#: ../dgit.7:474 msgid "" "Delete the files from your git branches, and your Debian source packages, " "and carry the deletion as a delta from upstream. (With `3.0 (quilt)' this " @@ -753,7 +760,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:476 +#: ../dgit.7:480 msgid "" "Persuade upstream that the source code in their git history and the source " "they ship as tarballs should be identical. Of course simply removing the " @@ -761,7 +768,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:482 +#: ../dgit.7:486 msgid "" "One answer is to commit the (maybe autogenerated) files, perhaps with some " "simple automation to deal with conflicts and spurious changes. This has the " @@ -770,7 +777,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:487 +#: ../dgit.7:491 msgid "" "Of course it may also be that the differences are due to build system bugs, " "which cause unintended files to end up in the source package. dgit will " @@ -779,13 +786,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.7:488 +#: ../dgit.7:492 #, no-wrap msgid "FILES IN THE SOURCE PACKAGE BUT NOT IN GIT - DOCS, BINARIES ETC." msgstr "" #. type: Plain text -#: ../dgit.7:492 +#: ../dgit.7:496 msgid "" "Some upstream tarballs contain build artifacts which upstream expects some " "users not to want to rebuild (or indeed to find hard to rebuild), but which " @@ -793,7 +800,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:502 +#: ../dgit.7:506 msgid "" "Examples sometimes include crossbuild firmware binaries and documentation. " "To avoid problems when building updated source packages (in particular, to " @@ -803,7 +810,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:510 +#: ../dgit.7:514 msgid "" "dpkg-source does not (with any of the commonly used source formats) " "represent deletion of binaries (outside debian/) present in upstream. Thus " @@ -813,7 +820,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:516 +#: ../dgit.7:520 msgid "" "However, git does always properly record file deletion. Since dgit's " "principle is that the dgit git tree is the same of dpkg-source -x, that " @@ -821,14 +828,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:519 +#: ../dgit.7:523 msgid "" "For the non-maintainer, this can be observed in the following suboptimal " "occurrences:" msgstr "" #. type: Plain text -#: ../dgit.7:527 +#: ../dgit.7:531 msgid "" "The package clean target often deletes these files, making the git tree " "dirty trying to build the source package, etc. This can be fixed by using " @@ -837,7 +844,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:534 +#: ../dgit.7:538 msgid "" "The package build modifies these files, so that builds make the git tree " "dirty. This can be worked around by using `git reset --hard' after each " @@ -845,7 +852,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:544 +#: ../dgit.7:548 msgid "" "From the maintainer's point of view, the main consequence is that to make a " "dgit-compatible git branch it is necessary to commit these files to git. " @@ -856,13 +863,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.7:544 +#: ../dgit.7:548 #, no-wrap msgid "PROBLEMS WITH PACKAGE CLEAN TARGETS ETC." msgstr "" #. type: Plain text -#: ../dgit.7:552 +#: ../dgit.7:556 msgid "" "A related problem is other unexpected behaviour by a package's B " "target. If a package's rules modify files which are distributed in the " @@ -871,7 +878,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:560 +#: ../dgit.7:564 msgid "" "Again, the solution is to use B aka B<--clean=git>, which " "instructs dgit to use git clean instead of the package's build target, along " @@ -879,7 +886,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:564 +#: ../dgit.7:568 msgid "" "This is 100% reliable, but has the downside that if you forget to git add or " "to commit, and then use B or B, your changes may " diff -pruN 13.12/po4a/git-deborig_1.pt.po 13.13/po4a/git-deborig_1.pt.po --- 13.12/po4a/git-deborig_1.pt.po 2025-08-15 09:05:44.000000000 +0000 +++ 13.13/po4a/git-deborig_1.pt.po 2025-08-24 10:43:28.000000000 +0000 @@ -2,12 +2,12 @@ # Copyright (C) 2020 Free Software Foundation, Inc. # This file is distributed under the same license as the dgit package. # -# Américo Monteiro , 2020 - 2025. +# SPDX-FileCopyrightText: 2020 - 2025 Américo Monteiro msgid "" msgstr "" -"Project-Id-Version: po 4a\n" +"Project-Id-Version: dgit 13.12_git-deborig_1\n" "POT-Creation-Date: 2025-08-15 11:11+0100\n" -"PO-Revision-Date: 2025-08-15 11:11+0100\n" +"PO-Revision-Date: 2025-08-19 03:58+0100\n" "Last-Translator: Américo Monteiro \n" "Language-Team: Portuguese <>\n" "Language: pt\n" @@ -15,6 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Lokalize 25.04.0\n" #. type: =head1 #: ../dgit.1:3 ../dgit.7:2 ../dgit-user.7.pod:1 ../dgit-nmu-simple.7.pod:1 @@ -25,26 +26,26 @@ msgstr "" #: ../git-debpush.1.pod:1 ../git-deborig.1.pod:1 ../tag2upload.5.pod:1 #, no-wrap msgid "NAME" -msgstr "" +msgstr "NOME" #. type: =head1 #: ../dgit.1:6 ../git-debrebase.1.pod:5 ../git-debpush.1.pod:5 #: ../git-deborig.1.pod:5 #, no-wrap msgid "SYNOPSIS" -msgstr "" +msgstr "RESUMO" #. type: =head1 #: ../dgit.1:33 ../git-debpush.1.pod:9 ../git-deborig.1.pod:9 #, no-wrap msgid "DESCRIPTION" -msgstr "" +msgstr "DESCRIÇÃO" #. type: =head1 #: ../dgit.1:583 ../git-debrebase.1.pod:473 ../git-deborig.1.pod:28 #, no-wrap msgid "OPTIONS" -msgstr "" +msgstr "OPÇÕES" #. type: =head1 #: ../dgit.1:1890 ../dgit.7:23 ../dgit-user.7.pod:446 @@ -56,14 +57,14 @@ msgstr "" #: ../git-debpush.1.pod:341 ../git-deborig.1.pod:60 ../tag2upload.5.pod:307 #, no-wrap msgid "SEE ALSO" -msgstr "" +msgstr "VEJA TAMBÉM" #. type: =head1 #: ../dgit-maint-merge.7.pod:513 ../dgit-maint-gbp.7.pod:143 #: ../dgit-maint-debrebase.7.pod:796 ../dgit-maint-bpo.7.pod:144 #: ../git-debpush.1.pod:346 ../git-deborig.1.pod:64 msgid "AUTHOR" -msgstr "" +msgstr "AUTOR" #. type: textblock #: ../git-deborig.1.pod:3 @@ -77,7 +78,7 @@ msgid "" "names>] [B<--version=>I] [I]" msgstr "" "B [B<--force>|B<-f>] [B<--just-print>|B<--just-print-tag-" -"names>] [B<--version=>I] [I]" +"names>] [B<--version=>I] [I]" #. type: textblock #: ../git-deborig.1.pod:11 @@ -88,9 +89,9 @@ msgid "" "other workflows." msgstr "" "B tenta produzir o orig.tar que você precisa para o seu envio " -"ao chamar git-archive(1) numa etiqueta git ou cabeça de ramo existentes. Foi " -"escrito com o fluxo de trabalho do dgit-maint-merge(7) em mente, mas pode " -"ser usado com outros workflows." +"ao chamar git-archive(1) numa etiqueta git ou cabeça de ramo existentes. " +"Foi escrito com o fluxo de trabalho do dgit-maint-merge(7) em mente, mas " +"pode ser usado com outros fluxos de trabalho." #. type: textblock #: ../git-deborig.1.pod:16 @@ -146,7 +147,7 @@ msgid "" "would be invoked. Ignores I<--force>." msgstr "" "Em vez de na realidade invocar git-archive(1), escreve informação sobre como " -"este seria invocado. Ignora I<--force>." +"este seria invocado. Ignora I<--force>." #. type: textblock #: ../git-deborig.1.pod:41 @@ -156,7 +157,7 @@ msgid "" "to disables git attributes otherwise heeded by git-archive(1), as detailed " "above." msgstr "" -"Note ao correr a invocação do git-archive(1) com esta opção pode não " +"Note que ao correr a invocação do git-archive(1) com esta opção pode não " "produzir os mesmos resultados. Isto porque B trata de " "desactivar atributos git que caso contrário são precisos pelo git-" "archive(1), como detalhado em cima." @@ -176,13 +177,13 @@ msgid "" msgstr "" "Em vez de na realidade invocar git-archive(1), ou mesmo verificar quais " "etiquetas existem, escreve os nomes de etiquetas que iríamos considerar para " -"o número de versão do autor na primeira entrada no registo de alterações " +"o número de versão do autor na primeira entrada no registo de alterações " "Debian, ou isso fornecido com B<--version>." #. type: =item #: ../git-deborig.1.pod:53 msgid "B<--version=>I" -msgstr "B<--version=>I" +msgstr "B<--version=>I" #. type: textblock #: ../git-deborig.1.pod:55 @@ -191,7 +192,7 @@ msgid "" "Debian changelog, use I." msgstr "" "Em vez de ler a nova versão de autor a partir da primeira entrada no registo " -"de alterações Debian, usa I." +"de alterações Debian, usa I." #. type: textblock #: ../git-deborig.1.pod:62 diff -pruN 13.12/po4a/git-debpush_1.pot 13.13/po4a/git-debpush_1.pot --- 13.12/po4a/git-debpush_1.pot 2025-08-15 09:05:44.000000000 +0000 +++ 13.13/po4a/git-debpush_1.pot 2025-08-24 10:43:28.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2025-08-15 11:11+0100\n" +"POT-Creation-Date: 2025-08-23 10:54+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -41,31 +41,31 @@ msgid "DESCRIPTION" msgstr "" #. type: =item -#: ../dgit.1:951 ../git-debpush.1.pod:138 +#: ../dgit.1:962 ../git-debpush.1.pod:138 #, no-wrap msgid "B<--quilt=linear>" msgstr "" #. type: =item -#: ../dgit.1:963 ../git-debpush.1.pod:150 +#: ../dgit.1:974 ../git-debpush.1.pod:150 #, no-wrap msgid "B<--quilt=try-linear>" msgstr "" #. type: =item -#: ../dgit.1:973 ../git-debpush.1.pod:144 +#: ../dgit.1:984 ../git-debpush.1.pod:144 #, no-wrap msgid "B<--quilt=smash>" msgstr "" #. type: =item -#: ../dgit.1:1001 ../git-debpush.1.pod:155 +#: ../dgit.1:1012 ../git-debpush.1.pod:155 #, no-wrap msgid "B<--quilt=nofix>" msgstr "" #. type: =head1 -#: ../dgit.1:1890 ../dgit.7:23 ../dgit-user.7.pod:446 +#: ../dgit.1:1920 ../dgit.7:23 ../dgit-user.7.pod:446 #: ../dgit-nmu-simple.7.pod:158 ../dgit-maint-native.7.pod:125 #: ../dgit-maint-merge.7.pod:509 ../dgit-maint-gbp.7.pod:139 #: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 @@ -79,7 +79,7 @@ msgstr "" #. type: =head1 #: ../dgit-maint-merge.7.pod:513 ../dgit-maint-gbp.7.pod:143 #: ../dgit-maint-debrebase.7.pod:796 ../dgit-maint-bpo.7.pod:144 -#: ../git-debpush.1.pod:346 ../git-deborig.1.pod:64 +#: ../git-debpush.1.pod:348 ../git-deborig.1.pod:64 msgid "AUTHOR" msgstr "" @@ -724,13 +724,18 @@ msgstr "" #. type: textblock #: ../git-debpush.1.pod:343 +msgid "L, L" +msgstr "" + +#. type: textblock +#: ../git-debpush.1.pod:345 msgid "" -"Git branch formats in use by Debian maintainers: " msgstr "" #. type: textblock -#: ../git-debpush.1.pod:348 +#: ../git-debpush.1.pod:350 msgid "" "B and this manpage were written by Sean Whitton " " with much input from Ian Jackson " diff -pruN 13.12/tests/tests/git-deborig 13.13/tests/tests/git-deborig --- 13.12/tests/tests/git-deborig 1970-01-01 00:00:00.000000000 +0000 +++ 13.13/tests/tests/git-deborig 2025-08-24 10:43:28.000000000 +0000 @@ -0,0 +1,71 @@ +#!/bin/bash +set -e +. tests/lib + +t-dependencies DEBORIG + +t-setup-import gbp + +# TODO Test defusing of export-subst and export-ignore Git attributes. + +uv=${v%-*} +otz=../${p}_${uv}.orig.tar.xz + +cd $p + +mv debian/changelog debian/change +t-expect-fail "pwd doesn't look like a Debian source package" \ +t-git-deborig +mv debian/change debian/changelog + +t-git-deborig +test -e $otz + +rm debian/source/format +t-git-deborig +test -e ../${p}_${uv}.orig.tar.gz +git checkout debian/source/format + +t-dch-commit -v2.0 bump +t-expect-fail "this looks like a native package" \ +t-git-deborig +t-git-deborig HEAD~ --version=2.0 +test -e ../${p}_2.0.orig.tar.xz +git revert --no-edit HEAD + +t-expect-fail "already exists" \ +t-git-deborig +t-git-deborig -f +test -e $otz + +t-git-deborig --just-print >../just-print-actual +cat <../just-print-expected +upstream/$uv +$otz +git -c 'tar.tar.xz.command=xz -c' archive --prefix=$p-$uv/ -o $otz upstream/$uv +EOF +diff -u ../just-print-{expected,actual} + +t-git-deborig --just-print-tag-names >../just-print-tag-names-actual +cat <../just-print-tag-names-expected +$uv +v$uv +upstream/$uv +EOF +diff -u ../just-print-tag-names-{expected,actual} + +t-expect-fail "version number 1 2 is not valid" \ +t-git-deborig --version="1 2" + +t-expect-fail "couldn't find any of the following tags: 14%15_16, " \ +t-git-deborig --version="13:14:15~16" + +rm ../${p}_${uv}.orig.tar.* + +git tag -a -m v$uv v$uv +t-expect-fail "all exist in this repository" \ +t-git-deborig + +git tag -d v$uv upstream/$uv +t-expect-fail "couldn't find any of the following tags: $uv, v$uv, upstream/$uv" \ +t-git-deborig diff -pruN 13.12/tests/tests/quilt-splitbrains 13.13/tests/tests/quilt-splitbrains --- 13.12/tests/tests/quilt-splitbrains 2025-08-15 09:05:44.000000000 +0000 +++ 13.13/tests/tests/quilt-splitbrains 2025-08-24 10:43:28.000000000 +0000 @@ -68,12 +68,13 @@ gitigncommit=`git rev-parse HEAD` t-commit unapplied 1.0-3 -echo "----- testing tree suitable for --quilt=unapplied (only) -----" +echo "----- testing tree suitable for --quilt=gbp or unapplied -----" + +# (This has .gitignore patches) t-expect-fail 'git tree differs from result of applying' \ t-dgit -wgf --quilt=dpm build-source -t-expect-fail 'gitignores: but, such patches exist' \ t-dgit -wgf --quilt=gbp build-source t-expect-fail 'This might be a patches-unapplied branch' \ diff -pruN 13.12/tests/tests/t2u 13.13/tests/tests/t2u --- 13.12/tests/tests/t2u 2025-08-15 09:05:44.000000000 +0000 +++ 13.13/tests/tests/t2u 2025-08-24 10:43:28.000000000 +0000 @@ -54,6 +54,11 @@ t-t2u-test --quilt=gbp --force=upstream- --upstream=$upstreamtag git branch -D pristine-tar +# Add dummy data to test that it is ignored (#1111504). +cp ../${p}_${uv}.orig.tar.xz ../${p}_${uv}.1.orig.tar.xz +git tag ${upstreamtag}.1 ${upstreamtag} +pristine-tar commit ../${p}_${uv}.1.orig.tar.xz ${upstreamtag}.1 + echo foo >>src.c t-expect-fail "there are uncommitted changes" \ t-t2u-test --quilt=gbp --upstream=$upstreamtag diff -pruN 13.12/tests/tests/t2u-baredebian 13.13/tests/tests/t2u-baredebian --- 13.12/tests/tests/t2u-baredebian 2025-08-15 09:05:44.000000000 +0000 +++ 13.13/tests/tests/t2u-baredebian 2025-08-24 10:43:28.000000000 +0000 @@ -46,4 +46,23 @@ t-t2u-gittarxz-unpack t-dgit -wn --quilt=$quiltmode --dgit-view-save=split.t quilt-fixup t-t2u-gittarxz-reproduced +t-archive-process-incoming sid + +: 'test mismatching upstream tag' + +git worktree add ../example2 +cd ../example2 +git checkout -b broken-upstream v1.0 +echo discrepancy >upstream-discrepancy +git add upstream-discrepancy +git commit -m discrepancy +git tag broken-upstream-1.0 +cd ../example + +t-dch-commit-bump mismatch-in-upstream +t-refs-same-start +t-t2u-test-core irrecoverable --upstream=broken-upstream-1.0 +grep -P 'git tree differs from orig in upstream files' \ + ../t2u/worker-cwd/w0/dgit-tmp/t2u.log + t-ok diff -pruN 13.12/tests/tests/t2u-debpush-gbp 13.13/tests/tests/t2u-debpush-gbp --- 13.12/tests/tests/t2u-debpush-gbp 2025-08-15 09:05:44.000000000 +0000 +++ 13.13/tests/tests/t2u-debpush-gbp 2025-08-24 10:43:28.000000000 +0000 @@ -114,5 +114,12 @@ refs/tags/upstream/1.0 END diff -u ../tags-{expected,actual} +: 'check that we *push* the upstream tag' + +t-dch-commit-bump debpush-success-push-upstream-tag +git push salsa :refs/tags/upstream/1.0 +t-git-debpush +git ls-remote salsa | grep refs/tags/upstream/1.0 + t-ok