diff -pruN 13.11+exp1/.gitignore 13.12/.gitignore --- 13.11+exp1/.gitignore 2025-08-10 18:58:53.000000000 +0000 +++ 13.12/.gitignore 2025-08-15 09:05:44.000000000 +0000 @@ -10,6 +10,7 @@ debian/*.substvars debian/*.log debian/debhelper-build-stamp debian/.debhelper +debian/*.debhelper dgit-user.7 dgit-nmu-simple.7 dgit-maint-native.7 @@ -21,6 +22,7 @@ dgit-sponsorship.7 dgit-downstream-dsc.7 git-debrebase.1 git-debrebase.5 +git-deborig.1 git-debpush.1 tag2upload.5 substituted diff -pruN 13.11+exp1/.gitlab-ci.yml 13.12/.gitlab-ci.yml --- 13.11+exp1/.gitlab-ci.yml 2025-08-10 18:58:53.000000000 +0000 +++ 13.12/.gitlab-ci.yml 2025-08-15 09:05:44.000000000 +0000 @@ -10,13 +10,17 @@ variables: # See: # https://salsa.debian.org/salsa-ci-team/pipeline#skipping-a-job # Skipping a job - # Very slow and resource-intensive - SALSA_CI_DISABLE_AUTOPKGTEST: 1 + # Very slow and resource-intensive. Do only the test(s) + # that are particularly likely to fail *only* in autopkgtest. + 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_CROSSBUILD_ARM64: 1 # Doesn't work with unfinalised changelogs SALSA_CI_DISABLE_REPROTEST: 1 + # Doesn't like git-debpush having a Replaces without a Breaks. + # See . + SALSA_CI_DISABLE_MISSING_BREAKS: 1 SALSA_CI_LINTIAN_SUPPRESS_TAGS: changelog-empty-entry # t2usm project T2USM_EXECUTABLE_URL: https://salsa.debian.org/dgit-team/tag2upload-service-manager/-/jobs/artifacts/main/raw/artifacts/tag2upload-service-manager?job=build diff -pruN 13.11+exp1/Debian/Dgit/Core.pm 13.12/Debian/Dgit/Core.pm --- 13.11+exp1/Debian/Dgit/Core.pm 1970-01-01 00:00:00.000000000 +0000 +++ 13.12/Debian/Dgit/Core.pm 2025-08-15 09:05:44.000000000 +0000 @@ -0,0 +1,66 @@ +# -*- perl -*- +# dgit +# Debian::Dgit::Core: functions common to programs from all binary packages +# +# Copyright (C)2015-2020,2022,2023,2025 Ian Jackson +# Copyright (C)2020,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 +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +package Debian::Dgit::Core; + +use strict; +use warnings; + +use Carp; +use Debian::Dgit::I18n; + +BEGIN { + use Exporter (); + our (@ISA, @EXPORT); + + @ISA = qw(Exporter); + @EXPORT = qw(shellquote); +} + +sub shellquote { + # Quote an argument list for use as a fragment of shell text. + # + # Shell quoting doctrine in dgit.git: + # * perl lists are always unquoted argument lists + # * perl scalars are always individual arguments, + # or if being passed to a shell, quoted shell text. + # + # So shellquote returns a scalar. + # + # When invoking ssh-like programs, that concatenate the arguments + # with spaces and then treat the result as a shell command, we never + # use the concatenation. We pass the intended script as a single + # parameter (which is in accordance with the above doctrine). + my @out; + local $_; + defined or confess __ 'internal error' foreach @_; + foreach my $a (@_) { + $_ = $a; + if (!length || m{[^-=_./:0-9a-z]}i) { + s{['\\]}{'\\$&'}g; + push @out, "'$_'"; + } else { + push @out, $_; + } + } + return join ' ', @out; +} + +1; diff -pruN 13.11+exp1/Debian/Dgit/GDP.pm 13.12/Debian/Dgit/GDP.pm --- 13.11+exp1/Debian/Dgit/GDP.pm 1970-01-01 00:00:00.000000000 +0000 +++ 13.12/Debian/Dgit/GDP.pm 2025-08-15 09:05:44.000000000 +0000 @@ -0,0 +1,26 @@ +# -*- perl -*- + +package Debian::Dgit::GDP; + +use strict; +use warnings; + +# Scripts and programs which are going to `use Debian::Dgit' but which +# live in git-debpush (ie are installed with install-gdp) +# should `use Debian::Dgit::GDP' first. All this module does is +# adjust @INC so that the script gets the version of the script from +# the git-debpush package (which is installed in a different +# location and may be a different version). + +# To use this with ExitStatus, put at the top (before use strict, even): +# +# END { $? = $Debian::Dgit::ExitStatus::desired // -1; }; +# use Debian::Dgit::GDP; +# use Debian::Dgit::ExitStatus; +# +# and then replace every call to `exit' with `finish'. +# Add a `finish 0' to the end of the program. + +# unshift @INC, q{/usr/share/dgit/gdp/perl5}; ###substituted### + +1; diff -pruN 13.11+exp1/Debian/Dgit.pm 13.12/Debian/Dgit.pm --- 13.11+exp1/Debian/Dgit.pm 2025-08-10 18:58:53.000000000 +0000 +++ 13.12/Debian/Dgit.pm 2025-08-15 09:05:44.000000000 +0000 @@ -2,8 +2,8 @@ # dgit # Debian::Dgit: functions common to dgit and its helpers and servers # -# Copyright (C)2015-2020,2022-2023 Ian Jackson -# Copyright (C)2020 Sean Whitton +# Copyright (C)2015-2020,2022,2023,2025 Ian Jackson +# Copyright (C)2020,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 @@ -35,6 +35,7 @@ use File::Basename; use Dpkg::Control::Hash; use Debian::Dgit::ExitStatus; use Debian::Dgit::I18n; +use Debian::Dgit::Core; BEGIN { use Exporter (); @@ -236,35 +237,6 @@ sub messagequote ($) { $_; } -sub shellquote { - # Quote an argument list for use as a fragment of shell text. - # - # Shell quoting doctrine in dgit.git: - # * perl lists are always unquoted argument lists - # * perl scalars are always individual arguments, - # or if being passed to a shell, quoted shell text. - # - # So shellquote returns a scalar. - # - # When invoking ssh-like programs, that concatenate the arguments - # with spaces and then treat the result as a shell command, we never - # use the concatenation. We pass the intended script as a single - # parameter (which is in accordance with the above doctrine). - my @out; - local $_; - defined or confess __ 'internal error' foreach @_; - foreach my $a (@_) { - $_ = $a; - if (!length || m{[^-=_./:0-9a-z]}i) { - s{['\\]}{'\\$&'}g; - push @out, "'$_'"; - } else { - push @out, $_; - } - } - return join ' ', @out; -} - sub printcmd { my $fh = shift @_; my $intro = shift @_; diff -pruN 13.11+exp1/HACKING 13.12/HACKING --- 13.11+exp1/HACKING 2025-08-10 18:58:53.000000000 +0000 +++ 13.12/HACKING 2025-08-15 09:05:44.000000000 +0000 @@ -6,7 +6,9 @@ Program and source code layout Most stuff is in the toplevel. Debian/ contains Perl modules, notably Debian/Dgit.pm. -That module contains much shared code and is used by every package. +That module contains much shared code. +There is also Debian/Dgit/Core.pm which has less code, as yet, but is +available in every binary package. The test suite is very useful for ad-hoc work, so see "Tests" below. diff -pruN 13.11+exp1/Makefile 13.12/Makefile --- 13.11+exp1/Makefile 2025-08-10 18:58:53.000000000 +0000 +++ 13.12/Makefile 2025-08-15 09:05:44.000000000 +0000 @@ -22,6 +22,8 @@ INSTALL_DIR=$(INSTALL) -d INSTALL_PROGRAM=$(INSTALL) -m 755 INSTALL_DATA=$(INSTALL) -m 644 +POD2MAN = pod2man --release="Debian Project" --date="dgit+tag2upload team" + prefix?=/usr/local bindir=$(prefix)/bin @@ -50,6 +52,7 @@ MAN7PAGES=dgit.7 \ TXTDOCS=README.dsc-import PERLMODULES= \ Debian/Dgit.pm \ + Debian/Dgit/Core.pm \ Debian/Dgit/ExitStatus.pm \ Debian/Dgit/I18n.pm \ Debian/Dgit/ProtoConn.pm @@ -58,14 +61,18 @@ ABSURDITIES=git GDR_PROGRAMS=git-debrebase GDR_PERLMODULES= \ Debian/Dgit.pm \ + Debian/Dgit/Core.pm \ Debian/Dgit/GDR.pm \ Debian/Dgit/ExitStatus.pm \ Debian/Dgit/I18n.pm GDR_MAN1PAGES=git-debrebase.1 GDR_MAN5PAGES=git-debrebase.5 -GDP_PROGRAMS=git-debpush -GDP_MAN1PAGES=git-debpush.1 +GDP_PROGRAMS=git-debpush git-deborig +GDP_PERLMODULES= \ + Debian/Dgit/Core.pm \ + Debian/Dgit/GDP.pm +GDP_MAN1PAGES=git-debpush.1 git-deborig.1 GDP_MAN5PAGES=tag2upload.5 INFRA_PROGRAMS=dgit-repos-server dgit-ssh-dispatch dgit-mirror-ssh-wrap \ @@ -77,6 +84,7 @@ INFRA_DEBIAN=get-dm-txt tag2upload-build tag2upload-oracle-crontab tag2upload-builder-crontab INFRA_PERLMODULES= \ Debian/Dgit.pm \ + Debian/Dgit/Core.pm \ Debian/Dgit/Infra.pm \ Debian/Dgit/Policy/Debian.pm \ Debian/Dgit/ProtoConn.pm @@ -115,6 +123,9 @@ install-gdp: installdirs-gdp $(INSTALL_PROGRAM) $(GDP_PROGRAMS) $(DESTDIR)$(bindir) $(INSTALL_DATA) $(GDP_MAN1PAGES) $(DESTDIR)$(man1dir) $(INSTALL_DATA) $(GDP_MAN5PAGES) $(DESTDIR)$(man5dir) + set -e; for m in $(GDP_PERLMODULES); do \ + $(INSTALL_DATA) $$m $(DESTDIR)$(perldir)/$${m%/*}; \ + done install-gdr: installdirs-gdr $(INSTALL_PROGRAM) $(GDR_PROGRAMS) $(DESTDIR)$(bindir) @@ -137,7 +148,8 @@ install-infra: installdirs-infra installdirs-gdp: $(INSTALL_DIR) $(DESTDIR)$(bindir) \ - $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) + $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \ + $(addprefix $(DESTDIR)$(perldir)/, $(dir $(GDR_PERLMODULES))) installdirs-gdr: $(INSTALL_DIR) $(DESTDIR)$(bindir) \ @@ -156,9 +168,12 @@ i18n i18n-update: $(MAKE) -C po update $(MAKE) -C po4a update +# When tests/tests/i18n-po4a-uptodate fails, this target will usually fix it. i18n-commit: set -e; x=$$(git status --porcelain); set -x; test "x$$x" = x $(MAKE) i18n-update + git add po4a/*_[0-9].pot + git clean -xdff po4a/\*.po git commit -a -m 'i18n-commit - autogenerated' check installcheck: @@ -170,23 +185,17 @@ clean distclean mostlyclean maintainer-c done dgit%: dgit%.pod - m=$@; pod2man --section=$${m##*.} --date="Debian Project" \ - --center="dgit" --name=$${m%.*} \ - $^ $@ - -git-debrebase.%: git-debrebase.%.pod - pod2man --section=$* --date="Debian Project" --center="git-debrebase" \ - --name=$(subst .$*,,$@) \ - $^ $@ - -git-debpush.1: git-debpush.1.pod - pod2man --section=1 --date="Debian Project" --center="git-debpush" \ - --name git-debpush \ + m="$(notdir $@)"; $(POD2MAN) \ + --center=dgit \ + --name="$${m%.[0-9]}" \ + --section="$${m##*.}" \ $^ $@ -tag2upload.5: tag2upload.5.pod - pod2man --section=5 --date="Debian Project" --center="tag2upload" \ - --name tag2upload \ +%: %.pod + m="$(notdir $@)"; $(POD2MAN) \ + --center="$${m%.[0-9]}" \ + --name="$${m%.[0-9]}" \ + --section="$${m##*.}" \ $^ $@ %.view: % diff -pruN 13.11+exp1/debian/changelog 13.12/debian/changelog --- 13.11+exp1/debian/changelog 2025-08-10 18:58:53.000000000 +0000 +++ 13.12/debian/changelog 2025-08-15 09:05:44.000000000 +0000 @@ -1,3 +1,72 @@ +dgit (13.12) unstable; urgency=medium + + dgit changes [Ian Jackson]: + * build-source now checks for git vs dsc discrepancies. + Other build subcommands are unchanged. Closes: #1110907. + - New dgit-distro.DISTRO.build-source-check-correspondence option. + You can use this to restore build-source's old behaviour of + deferring discrepency checking to the push phase. + * Report git vs dsc discrepancies with exit status 6. + + git-debpush fixes: + * Hide output from git-tag(1) run in the playtree. + * Move checks depending on quilt mode autodetection later. + Closes: #1111109. + * Pass --no-pager when failing a check with a git diff. + [Ian Jackson] + + New program: + * git-deborig, moved from 'devscripts' package. See #1105759. + * Declare that bin:git-debpush replaces bin:devscripts <<2.25.18. + + tag2upload service: + * tag2upload-builder-crontab: Move the job from 03:00 to 03:55. + * tag2upload-builder-rebuild: Revert to installing from testing. + * tag2upload-builder-rebuild: Rebuild only once (!). + [Ian Jackson] + + Documentation: + * git-debpush(1): New "Mistakes" section. + * git-debpush: Additional design notes. + * i18n: Import de, fr, pt translations for git-deborig(1). + Closes: #1110822. + + Internationalisation [Ian Jackson]: + * 'make i18n-commit' adds new potfiles and cleans up old pofiles. + * Rename old po4a/list-documents to po4a/generate-po4a.cfg. + - Fix for when there are multiple languages (!). + * New po4a/list-documents script. + * Test that we have all the potfiles we expect. + * po/README: Give more translation priority advice. + * po/README: Other updates. + * Makefile: Replace the various pod2man targets with pattern rules. + * Fix titles of translated manpages. + + Test suite: + * t2u-debpush-gbp: Make an edit to debian/, not the upstream. + [Ian Jackson] + * t2u-debpush-gbp: Test git-debpush's 'upstream-nonidentical' check. + [Ian Jackson] + * Use in-tree git-deborig. + * Disable missing-breaks Salsa CI job. + + Miscellaneous/internal: + * Give the git-debpush package a private /usr/share/dgit/gdp/perl5. + - Move git-debpush's copy of git-playtree-setup there. + * New Debian::Dgit::Core module installed into all binary packages. + * git-debpush: Rework some code sectioning. + * Don't show the version of Perl in manpage footers. [Ian Jackson] + * Some copyright notice updates. + * Adjustments for trunk branch name change. [Ian Jackson] + + -- Sean Whitton Fri, 15 Aug 2025 10:05:44 +0100 + +dgit (13.11) unstable; urgency=medium + + * No change upload, targeting mainline to unstable. + + -- Ian Jackson Sun, 10 Aug 2025 20:18:45 +0100 + dgit (13.11+exp1) experimental; urgency=medium git-debpush UX improvements: diff -pruN 13.11+exp1/debian/control 13.12/debian/control --- 13.11+exp1/debian/control 2025-08-10 18:58:53.000000000 +0000 +++ 13.12/debian/control 2025-08-15 09:05:44.000000000 +0000 @@ -44,10 +44,17 @@ Description: rebasing git workflow tool gbp pq, and direct use of quilt patches. Package: git-debpush -Depends: devscripts, git, gnupg, libgit-wrapper-perl, libdpkg-perl, -# devscripts git-deborig: +Depends: git, gnupg, ${misc:Depends}, +# git-deborig: + libgit-wrapper-perl, libdpkg-perl, liblist-compare-perl, libstring-shellquote-perl, libtry-tiny-perl, - ${misc:Depends} +Replaces: devscripts (<< 2.25.18) +# No "Breaks: devscripts (<< 2.25.18)" because: +# - devscripts doesn't hard-depend on git-deborig +# - it would break installability of this .deb on anything older than +# forky, and we try to support installability on older Debian stable +# releases as much as possible. +# Also cf. . Architecture: all Description: client script for git pushing to Debian-style archives git-debpush is a script to create and push a specially formatted @@ -58,6 +65,10 @@ Description: client script for git pushi which performs any conversion that's needed (such as producing and signing a .dsc and .changes), and then uploads the result to the Debian-style archive on your behalf. + . + This package also ships git-deborig, a program which tries to produce + Debian orig.tar using git-archive(1). (This program used to be in the + 'devscripts' package.) Package: dgit-infrastructure Depends: ${misc:Depends}, perl, git-core, gpgv, chiark-utils-bin, diff -pruN 13.11+exp1/debian/git-debpush.install 13.12/debian/git-debpush.install --- 13.11+exp1/debian/git-debpush.install 2025-08-10 18:58:53.000000000 +0000 +++ 13.12/debian/git-debpush.install 2025-08-15 09:05:44.000000000 +0000 @@ -1 +1,2 @@ -git-playtree-setup /usr/share/git-debpush +usr/share/man/*/man*/git-deborig.[1-9] +# ^ translated manpages. This has to be commented if they should go away. diff -pruN 13.11+exp1/debian/rules 13.12/debian/rules --- 13.11+exp1/debian/rules 2025-08-10 18:58:53.000000000 +0000 +++ 13.12/debian/rules 2025-08-15 09:05:44.000000000 +0000 @@ -62,20 +62,6 @@ specpkg_install_infra: pm=Infra define specpkg_install_common make install-$(tok) prefix=/usr DESTDIR=debian/$(p) perldir=$(specperl) -endef - -specpkg_install_gdp: tok=gdp -specpkg_install_gdp: specperl=/usr/share/dgit/gdp/perl5 -specpkg_install_gdp: - $(specpkg_install_common) - set -x; perl -i -pe 'next unless m/###substituted###/;' \ - -e 's{^(git_playtree_setup)=.*}{$$1=/usr/share/$p/git-playtree-setup};' \ - debian/$(p)/usr/bin/* - -specpkg_install_%: tok=$* -specpkg_install_%: specperl=/usr/share/dgit/$(tok)/perl5 -specpkg_install_%: - $(specpkg_install_common) # # Most of the Perl modules in this package live in # # $(specperl). The exception is Debian::Dgit::Infra, which # # lives in $(globalperl) and adds $(specperl) to @INC. @@ -93,6 +79,21 @@ specpkg_install_%: -e 'next unless s/^# (?=unshift \@INC,)//;' \ -e 'die unless s{q\{\S+\}}{q{$(specperl)}};' \ $$dst +endef + +specpkg_install_%: tok=$* +specpkg_install_%: specperl=/usr/share/dgit/$(tok)/perl5 +specpkg_install_%: + $(specpkg_install_common) + +specpkg_install_gdp: tok=gdp +specpkg_install_gdp: pm=GDP +specpkg_install_gdp: specperl=/usr/share/dgit/gdp/perl5 +specpkg_install_gdp: + $(specpkg_install_common) + set -x; perl -i -pe 'next unless m/###substituted###/;' \ + -e 's{^(git_playtree_setup)=.*}{$$1=$(specperl)/git-playtree-setup};' \ + debian/$(p)/usr/bin/* debian/tests/control: tests/enumerate-tests debian/tests/control.in $< gencontrol >$@.new && mv -f $@.new $@ diff -pruN 13.11+exp1/debian/tests/control 13.12/debian/tests/control --- 13.11+exp1/debian/tests/control 2025-08-10 18:58:53.000000000 +0000 +++ 13.12/debian/tests/control 2025-08-15 09:05:44.000000000 +0000 @@ -1,6 +1,6 @@ Tests: baredebian-multitar baredebian-plusgit baredebian-push baredebian-tarball Tests-Directory: tests/tests -Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, quilt, git-debrebase, git-buildpackage, libdpkg-perl, libgit-wrapper-perl, liblist-compare-perl, libstring-shellquote-perl, libtry-tiny-perl +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, quilt, git-debpush, git-debrebase, git-buildpackage Tests: build-modes-gbp Tests-Directory: tests/tests @@ -86,11 +86,11 @@ Restrictions: x-dgit-git-only Tests: t2u Tests-Directory: tests/tests -Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, git-debpush, autopkgtest, python3-pygit2, netcat-openbsd, libdpkg-perl, libgit-wrapper-perl, liblist-compare-perl, libstring-shellquote-perl, libtry-tiny-perl, mpack, pristine-tar +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, git-debpush, autopkgtest, python3-pygit2, netcat-openbsd, mpack, pristine-tar Tests: t2u-baredebian Tests-Directory: tests/tests -Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, git-debpush, autopkgtest, python3-pygit2, netcat-openbsd, quilt, git-debrebase, git-buildpackage, libdpkg-perl, libgit-wrapper-perl, liblist-compare-perl, libstring-shellquote-perl, libtry-tiny-perl +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, git-debpush, autopkgtest, python3-pygit2, netcat-openbsd, quilt, git-debrebase, git-buildpackage Tests: t2u-debpush-gbp Tests-Directory: tests/tests @@ -100,26 +100,22 @@ Tests: t2u-debpush-minimal Tests-Directory: tests/tests Depends: git-debpush -Tests: t2u-gbp -Tests-Directory: tests/tests -Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, git-debpush, autopkgtest, python3-pygit2, netcat-openbsd, libdpkg-perl, libgit-wrapper-perl, liblist-compare-perl, libstring-shellquote-perl, libtry-tiny-perl - Tests: t2u-gdr Tests-Directory: tests/tests -Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, git-debpush, autopkgtest, python3-pygit2, netcat-openbsd, libdpkg-perl, libgit-wrapper-perl, liblist-compare-perl, libstring-shellquote-perl, libtry-tiny-perl, git-debrebase, git-buildpackage +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, git-debpush, autopkgtest, python3-pygit2, netcat-openbsd, git-debrebase, git-buildpackage Tests: t2u-integration Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, git-debpush, autopkgtest, python3-pygit2, netcat-openbsd, jq Restrictions: x-tag2upload-service-manager -Tests: t2u-native +Tests: t2u-gbp t2u-native Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, git-debpush, autopkgtest, python3-pygit2, netcat-openbsd Tests: t2u-email t2u-origs Tests-Directory: tests/tests -Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, git-debpush, autopkgtest, python3-pygit2, netcat-openbsd, libdpkg-perl, libgit-wrapper-perl, liblist-compare-perl, libstring-shellquote-perl, libtry-tiny-perl, mpack +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, git-debpush, autopkgtest, python3-pygit2, netcat-openbsd, mpack Tests: tag2upload-oracled Tests-Directory: tests/tests diff -pruN 13.11+exp1/dgit 13.12/dgit --- 13.11+exp1/dgit 2025-08-10 18:58:53.000000000 +0000 +++ 13.12/dgit 2025-08-15 09:05:44.000000000 +0000 @@ -2,9 +2,9 @@ # dgit # Integration between git and Debian-style archives # -# Copyright (C)2013-2024 Ian Jackson +# Copyright (C)2013-2024 Ian Jackson # Copyright (C)2017-2019,2023-2025 Sean Whitton -# Copyright (C)2019 Matthew Vernon / Genome Research Limited +# Copyright (C)2019 Matthew Vernon / Genome Research Limited # # 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 @@ -101,6 +101,7 @@ our $quilt_options_re = 'gbp|dpm|baredeb our $quilt_modes_re = "linear|smash|try-linear|auto|single|nofix|nocheck|unapplied|$quilt_options_re"; our $splitview_mode; our $splitview_modes_re = qr{auto|always|never}; +our $dgitview_saved; our $dodep14tag; our $dep14tag_reuse; our $dep14tag_reuse_re = qr{replace|replace-unsuitable|if-exists|must}; @@ -1907,15 +1908,11 @@ sub remove_stray_gits ($) { $!=0; $?=0; close GITS or failedcmd @gitscmd; } -sub mktree_in_ud_from_only_subdir ($;$) { +sub mktree_in_ud_from_unpacked ($;$) { my ($what,$raw) = @_; - # changes into the subdir + # changes into the `unpacked` subdir - my (@dirs) = <*/.>; - confess "expected one subdir but found @dirs ?" unless @dirs==1; - $dirs[0] =~ m#^([^/]+)/\.$# or die; - my $dir = $1; - changedir $dir; + changedir 'unpacked'; remove_stray_gits($what); mktree_in_ud_here(); @@ -1927,7 +1924,7 @@ sub mktree_in_ud_from_only_subdir ($;$) } my $tree=git_add_write_tree(); - return ($tree,$dir); + return $tree; } our @files_csum_info_fields = @@ -2676,10 +2673,10 @@ sub generate_commits_from_dsc () { push @cmd, '--skip-patches'; $treeimporthow = 'unpatched'; } - push @cmd, qw(-x --), $dscfn; + push @cmd, qw(-x --), $dscfn, qw(unpacked); runcmd @cmd; - my ($tree,$dir) = mktree_in_ud_from_only_subdir(__ "source package"); + my $tree = mktree_in_ud_from_unpacked(__ "source package"); if (madformat $dsc->{format}) { check_for_vendor_patches(); } @@ -4239,6 +4236,7 @@ sub maybe_split_brain_save ($$$) { my ($headref, $dgitview, $msg) = @_; # => message fragment "$saved" describing disposition of $dgitview # (used inside parens, in the English texts) + $dgitview_saved = $dgitview; my $save = $internal_object_save{'dgit-view'}; return f_ "commit id %s", $dgitview unless defined $save; my @cmd = (shell_cmd 'cd "$1"; shift', $maindir, @@ -4651,6 +4649,75 @@ sub push_tagwants ($$$$) { return @tagwants; } +sub check_dsc_vs_git ($$) { + my ($dscfn, $dgithead) = @_; + my $dscpath = "$buildproductsdir/$dscfn"; + # call in $playground + progress f_ "checking that %s corresponds to HEAD", $dscfn; + runcmd qw(dpkg-source -x --), + ($dscpath =~ m#^/# ? $dscpath : "$maindir/$dscpath"), + qw(unpacked); + my $tree = mktree_in_ud_from_unpacked("source package"); + check_for_vendor_patches() if madformat($dsc->{format}); + changedir $maindir; + my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead); + debugcmd "+",@diffcmd; + $!=0; $?=-1; + my $r = system @diffcmd; + if ($r) { + if ($r==256) { + my $referent = $made_splitbrain_playtree ? $dgithead : 'HEAD'; + my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead; + + my @mode_changes; + my $raw = cmdoutput @git, + qw(diff --no-renames -z -r --raw), $tree, $dgithead; + my $changed; + foreach (split /\0/, $raw) { + if (defined $changed) { + push @mode_changes, "$changed: $_\n" if $changed; + $changed = undef; + next; + } elsif (m/^:0+ 0+ /) { + $changed = ''; + } elsif (m/^:(?:10*)?(\d+) (?:10*)?(\d+) /) { + $changed = "Mode change from $1 to $2" + } else { + die "$_ ?"; + } + } + my $fail = sub { + print STDERR failmsg @_; + finish 6; + }; + if (@mode_changes) { + $fail->((f_ <((f_ <{format}); - changedir $maindir; - my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead); - debugcmd "+",@diffcmd; - $!=0; $?=-1; - my $r = system @diffcmd; - if ($r) { - if ($r==256) { - my $referent = $made_splitbrain_playtree ? $dgithead : 'HEAD'; - my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead; - - my @mode_changes; - my $raw = cmdoutput @git, - qw(diff --no-renames -z -r --raw), $tree, $dgithead; - my $changed; - foreach (split /\0/, $raw) { - if (defined $changed) { - push @mode_changes, "$changed: $_\n" if $changed; - $changed = undef; - next; - } elsif (m/^:0+ 0+ /) { - $changed = ''; - } elsif (m/^:(?:10*)?(\d+) (?:10*)?(\d+) /) { - $changed = "Mode change from $1 to $2" - } else { - die "$_ ?"; - } - } - if (@mode_changes) { - fail +(f_ < +# +# 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 +# the Free Software Foundation, either version 3 of the License, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +use strict; +use warnings; + +use Getopt::Long; +use Git::Wrapper; +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"; +}; + +# Sanity check #2 +die "pwd doesn't look like a Debian source package ..\n" + 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 = ''; +GetOptions( + 'force|f' => \$overwrite, + 'just-print' => \$just_print, + 'just-print-tag-names' => \$just_print_tag_names, + 'version=s' => \$user_version +) || usage(); + +if (scalar @ARGV == 1) { + $user_ref = shift @ARGV; +} elsif (scalar @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}; +} + +# Sanity check #3 +die "version number $version is not valid ..\n" unless $version->is_valid(); + +my $source = $changelog->{Source}; +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()); + +# Convert the upstream version according to DEP-14 rules +my $git_upstream_version = $upstream_version; +$git_upstream_version =~ y/:~/%_/; +$git_upstream_version =~ s/\.(?=\.|$|lock$)/.#/g; + +# This list could be expanded if new conventions come into use +my @candidate_tags = ( + "$git_upstream_version", "v$git_upstream_version", + "upstream/$git_upstream_version" +); + +# Handle the --just-print-tag-names option +if ($just_print_tag_names) { + for my $candidate_tag (@candidate_tags) { + print "$candidate_tag\n"; + } + exit 0; +} + +# Default to gzip +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") + or die "couldn't open debian/source/format for reading"; + my $format = <$format_fh>; + chomp($format) if defined $format; + if ($format eq "3.0 (quilt)") { + $compressor = "xz -c"; + $compression = "xz"; + } + close $format_fh; +} + +my $orig = "../${source}_$upstream_version.orig.tar.$compression"; +die "$orig already exists: not overwriting without --force\n" + 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 + # ref exists; this keeps us forward-compatible + 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(); + + # 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(); + + # 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) { + 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) { + 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); + } +} + +sub archive_ref_or_just_print { + my $ref = shift; + + my $cmd = [ + 'git', '-c', "tar.tar.${compression}.command=${compressor}", + 'archive', "--prefix=${source}-${upstream_version}/", + '-o', $orig, $ref + ]; + if ($just_print) { + print "$ref\n"; + print "$orig\n"; + my @cmd_mapped = map { shell_quote($_) } @$cmd; + print "@cmd_mapped\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|); + + # sometimes the info/ dir may not exist + mkdir $info_dir unless (-e $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); + my $attributes_fh; + unless (open($attributes_fh, '>', $info_attributes)) { + rename $deborig_attributes, $info_attributes + if (-e $deborig_attributes); + die "could not open $info_attributes for writing"; + } + print $attributes_fh "* -export-subst\n"; + print $attributes_fh "* -export-ignore\n"; + close $attributes_fh; + + spawn( + exec => $cmd, + wait_child => 1, + nocheck => 1 + ); + + # Restore situation before we messed around with git attributes + if (-e $deborig_attributes) { + rename $deborig_attributes, $info_attributes; + } else { + unlink $info_attributes; + } + } +} + +sub usage { + die +"usage: git deborig [--force|-f] [--just-print|--just-print-tag-names] [--version=VERSION] [COMMITTISH]\n"; +} diff -pruN 13.11+exp1/git-deborig.1.pod 13.12/git-deborig.1.pod --- 13.11+exp1/git-deborig.1.pod 1970-01-01 00:00:00.000000000 +0000 +++ 13.12/git-deborig.1.pod 2025-08-15 09:05:44.000000000 +0000 @@ -0,0 +1,66 @@ +=head1 NAME + +git-deborig - try to produce Debian orig.tar using git-archive(1) + +=head1 SYNOPSIS + +B [B<--force>|B<-f>] [B<--just-print>|B<--just-print-tag-names>] [B<--version=>I] [I] + +=head1 DESCRIPTION + +B tries to produce the orig.tar you need for your upload +by calling git-archive(1) on an existing git tag or branch head. It +was written with the dgit-maint-merge(7) workflow in mind, but can be +used with other workflows. + +B will try several common tag names. If this fails, or +if more than one of those common tags are present, you can specify the +tag or branch head to archive on the command line (I above). + +B will override gitattributes(5) that would cause the +contents of the tarball generated by git-archive(1) not to be +identical with the commitish archived: the B and +B attributes. + +B should be invoked from the root of the git repository, +which should contain I. + +=head1 OPTIONS + +=over 4 + +=item B<-f>|B<--force> + +Overwrite any existing orig.tar in the parent directory. + +=item B<--just-print> + +Instead of actually invoking git-archive(1), output information about +how it would be invoked. Ignores I<--force>. + +Note that running the git-archive(1) invocation outputted with this +option may not produce the same output. This is because +B takes care to disables git attributes otherwise heeded +by git-archive(1), as detailed above. + +=item B<--just-print-tag-names> + +Instead of actually invoking git-archive(1), or even checking which +tags exist, print the tag names we would consider for the upstream +version number in the first entry in the Debian changelog, or that +supplied with B<--version>. + +=item B<--version=>I + +Instead of reading the new upstream version from the first entry in +the Debian changelog, use I. + +=back + +=head1 SEE ALSO + +git-archive(1), dgit-maint-merge(7), dgit-maint-debrebase(7) + +=head1 AUTHOR + +B was written by Sean Whitton . diff -pruN 13.11+exp1/git-debpush 13.12/git-debpush --- 13.11+exp1/git-debpush 2025-08-10 18:58:53.000000000 +0000 +++ 13.12/git-debpush 2025-08-15 09:05:44.000000000 +0000 @@ -54,6 +54,11 @@ shopt -s inherit_errexit # #514862, wtf # mode; if there is a previous tag, and no quilt mode provided, assume # same quilt mode as in previous tag created by this script. # +# - For consistency, we unconditionally fail only when we are in a situation +# where we can't make a tag, or where what tag to make would be ambiguous, +# or equivalent. Otherwise it's just a failed check, even if we know that +# conversion at the tag2upload service will fail. +# # PROGRAMMING CONVENTIONS # # - Guard all binary string comparisons like this: '[ "x$foo" = xblah ]'. @@ -156,7 +161,7 @@ check_treesame () { # show the user what the difference was if [ $git_diff_rc = 1 ]; then - git diff --compact-summary "$first".."$second" -- . "$@" + git --no-pager diff --compact-summary "$first".."$second" -- . "$@" fi if [ $git_diff_rc -le 1 ]; then @@ -310,7 +315,9 @@ case "$quilt_mode" in *) badusage "invalid quilt mode: $quilt_mode" ;; esac -#**** Early sanity check **** +#**** Very early sanity checks **** + +#---- Detached HEAD set +e headref="$(git symbolic-ref --quiet HEAD)" @@ -398,26 +405,6 @@ cd "$playtree" "$git_playtree_setup" . cd "$pwd" -#**** Second early sanity check **** - -# || and && have equal precedence in shell. -if [ "x$branch" = xHEAD ] \ - || { ! $detached && [ "x$branch" = "x$headref" ]; }; then - git_status_uno="$(git status -uno --porcelain)" - [ -n "$git_status_uno" ] && fail_check uncommitted \ - "there are uncommitted changes, which won't be uploaded" - - if [ "x$quilt_mode" = xbaredebian ]; then - untracked="$(untracked_in /debian)" - [ -n "$untracked" ] && fail_check untracked \ - "there are untracked files in debian/, which won't be uploaded" - else - untracked="$(untracked_in /)" - [ -n "$untracked" ] && fail_check untracked \ - "there are untracked files, which won't be uploaded" - fi -fi - #**** Gather source package information **** temp=$(mktemp -d) @@ -491,8 +478,8 @@ upstream_info="" if $upstream; then if [ -z "$upstream_tag" ]; then existing_gdo_tags=() - for gdo_tag - in $(git deborig --just-print-tag-names --version="$version"); do + for gdo_tag in $(${DGIT_DEBORIG_TEST-git deborig} \ + --just-print-tag-names --version="$version"); do if [ -n "$gdo_tag" ] \ && [ -n "$(git for-each-ref --format='%(objectname)' \ "[r]efs/tags/$gdo_tag")" ]; then @@ -514,7 +501,7 @@ if $upstream; then to_push+=("$upstream_tag") fi -#**** Useful sanity checks **** +#**** Early sanity checks **** #---- UNRELEASED suite @@ -535,36 +522,6 @@ if [ -n "$last_debian_tag" ] && [ -n "$l fi fi -#---- Upstream tag is not ancestor of $branch - -if [ -n "$upstream_tag" ] \ - && ! git merge-base --is-ancestor "$upstream_tag" "$branch" \ - && [ "x$quilt_mode" != xbaredebian ]; then - fail_check upstream-nonancestor \ - "upstream tag $upstream_tag is not an ancestor of $branch; probably a mistake" -fi - -#---- Quilt mode-specific checks - -case "$quilt_mode" in - gbp) - check_treesame "$upstream_tag" "$branch" ':!debian' ':!**.gitignore' \ - || fail_check_upstream_nonidentical - check_patches_apply false - ;; - unapplied) - check_treesame "$upstream_tag" "$branch" ':!debian' \ - || fail_check_upstream_nonidentical - check_patches_apply false - ;; - baredebian) - check_patches_apply false - ;; - dpm|nofix) - check_patches_apply true - ;; -esac - #---- git-debrebase branch format checks # only check branches, since you can't run `git debrebase conclude` on @@ -609,7 +566,7 @@ esac && fail_check local-options \ "debian/source/local-options detected; this file is not supported" -#**** fetch from the remote **** +#**** Fetch from the remote **** # This is fiddly. We want to check for the existence of various # remote refs and/or fetch from them: @@ -867,12 +824,9 @@ last_archive_tag=$(find_last_tag "archiv cd "$pwd" -#**** Create the git tag text **** +#**** Calculate the default quilt mode **** to_push+=("$debian_tag") - -#---- calculate the default quilt mode - last_quilt_mode= quilt_mode_text= @@ -884,10 +838,10 @@ if [ "x$format" = "x3.0 (quilt)" ] && [ /(?:^\[dgit|\G.*?)\s--quilt=([a-z+]+)(?=(?:\s.+)?\]$)/g')) # If the tag contained more than one (syntactically valid) quilt mode, # treat that as a failure to find a quilt mode in the last tag. - [ ${#last_quilt_modes[*]} = 1 ] && last_quilt_mode=${last_quilt_modes[0]} + [ ${#last_quilt_modes[*]} -eq 1 ] \ + && last_quilt_mode=${last_quilt_modes[0]} fi -quilt_mode_text= if [ "x$format" = "x3.0 (quilt)" ]; then if [ -n "$quilt_mode" ] && [ -n "$last_quilt_mode" ]; then if [ "x$quilt_mode" = "x$last_quilt_mode" ]; then @@ -922,6 +876,61 @@ if [ "x$format" = "x3.0 (quilt)" ]; then quilt_mode_text=" --quilt=$quilt_mode" fi +#**** Remaining sanity checks **** +# (these depend on $quilt_mode autodetection) + +#---- Uncommitted changes + +# || and && have equal precedence in shell. +if [ "x$branch" = xHEAD ] \ + || { ! $detached && [ "x$branch" = "x$headref" ]; }; then + git_status_uno="$(git status -uno --porcelain)" + [ -n "$git_status_uno" ] && fail_check uncommitted \ + "there are uncommitted changes, which won't be uploaded" + + if [ "x$quilt_mode" = xbaredebian ]; then + untracked="$(untracked_in /debian)" + [ -n "$untracked" ] && fail_check untracked \ + "there are untracked files in debian/, which won't be uploaded" + else + untracked="$(untracked_in /)" + [ -n "$untracked" ] && fail_check untracked \ + "there are untracked files, which won't be uploaded" + fi +fi + +#---- Upstream tag is not ancestor of $branch + +if [ -n "$upstream_tag" ] \ + && ! git merge-base --is-ancestor "$upstream_tag" "$branch" \ + && [ "x$quilt_mode" != xbaredebian ]; then + fail_check upstream-nonancestor \ + "upstream tag $upstream_tag is not an ancestor of $branch; probably a mistake" +fi + +#---- Quilt mode-specific checks + +case "$quilt_mode" in + gbp) + check_treesame "$upstream_tag" "$branch" ':!debian' ':!**.gitignore' \ + || fail_check_upstream_nonidentical + check_patches_apply false + ;; + unapplied) + check_treesame "$upstream_tag" "$branch" ':!debian' \ + || fail_check_upstream_nonidentical + check_patches_apply false + ;; + baredebian) + check_patches_apply false + ;; + dpm|nofix) + check_patches_apply true + ;; +esac + +#**** Create the git tag text **** + tagmessage="$source release $version for $target [dgit distro=$distro split$quilt_mode_text] @@ -930,7 +939,7 @@ tagmessage="$source release $version for git_tag_main_opts_args=(-m "$tagmessage" "$debian_tag" "$branch_commit") -#---- Do we have this tag already? +#**** Do we have this tag already? **** existing_tag_objid=$( git for-each-ref --format='%(objectname)' "[r]efs/tags/$debian_tag" @@ -945,9 +954,9 @@ if [ -n "$existing_tag_objid" ]; then # Don't pass "${git_tag_sign_opts[@]}" because -u causes git tag # to make the signature, which we don't want. # Sadly this replicates some of the actual git tag rune, below, - git tag -f "${git_tag_main_opts_args[@]}" + git tag -f "${git_tag_main_opts_args[@]}" >/dev/null git cat-file tag "$debian_tag" >../tag-we-will-make - git tag -d "$debian_tag" # don't leave this confusing decoy lying about + git tag -d "$debian_tag" >/dev/null # don't leave this confusing decoy lying about tagger_date_filter_perl=(-pe ' next if !m/\S/..0; s/^(tagger .* )\d+ [-+0-9]+/${1}[date]/ diff -pruN 13.11+exp1/git-debpush.1.pod 13.12/git-debpush.1.pod --- 13.11+exp1/git-debpush.1.pod 2025-08-10 18:58:53.000000000 +0000 +++ 13.12/git-debpush.1.pod 2025-08-15 09:05:44.000000000 +0000 @@ -54,6 +54,30 @@ out of the tag generated by B to make a tag but haven't pushed it yet, either +because you used B<--tag-only>|B<-t> or because the push failed, it is okay to +delete it and make another. (In the case that the push failed you can just +run B again I deleting the tag, and it will retry just +the push.) + +However, if a tag made by this script has been pushed, then B + +=over 4 + +=item * delete the tag, locally or remotely; + +=item * rewind (force push) the branch the tag is on; or + +=item * remove any entries from debian/changelog. + +=back + +The intermediary service won't let you reuse the version number anyway, and +taking any of these actions may make it unnecessarily difficult to try another +upload. Instead, add a new changelog stanza and run B again. + =head1 SETUP FOR SOURCE FORMAT 1.0 B needs to tell the intermediary git service whether this diff -pruN 13.11+exp1/infra/tag2upload-builder-crontab 13.12/infra/tag2upload-builder-crontab --- 13.11+exp1/infra/tag2upload-builder-crontab 2025-08-10 18:58:53.000000000 +0000 +++ 13.12/infra/tag2upload-builder-crontab 2025-08-15 09:05:44.000000000 +0000 @@ -8,4 +8,4 @@ MAILTO=dgit-owner@debian.org -0 3 * * 4 chronic /usr/share/dgit-infrastructure/debian/tag2upload-builder-rebuild +55 3 * * 4 chronic /usr/share/dgit-infrastructure/debian/tag2upload-builder-rebuild diff -pruN 13.11+exp1/infra/tag2upload-builder-rebuild 13.12/infra/tag2upload-builder-rebuild --- 13.11+exp1/infra/tag2upload-builder-rebuild 2025-08-10 18:58:53.000000000 +0000 +++ 13.12/infra/tag2upload-builder-rebuild 2025-08-15 09:05:44.000000000 +0000 @@ -53,8 +53,8 @@ late_pkgs=( # # It also deletes our /etc/apt/sources.list.d/*.list and rewrites # mmdebstrap's /etc/apt/sources.list - dgit/experimental - git-debrebase/experimental + dgit/testing + git-debrebase/testing ) savelog_options=( # Default is to save 7 logfiles files, which seems OK. @@ -67,6 +67,7 @@ if [ "x$TAG2UPLOAD_BUILDER_REBUILD_REINV TAG2UPLOAD_BUILDER_REBUILD_REINVOKED=1 \ exec "$0" "$@" 2>&1 \ | tee image-rebuild.log + exit 0 fi mkdir -p ~/.local/share/containers @@ -105,12 +106,6 @@ mmdebstrap \ "Pin-Priority: -10" \ && printf "%s\n" >/etc/apt/sources.list.d/testing.list \ "deb '$mirror' testing main" \ - && printf "%s\n" >/etc/apt/preferences.d/20experimental.pref \ - "Package: *" \ - "Pin: release a=experimental" \ - "Pin-Priority: -10" \ - && printf "%s\n" >/etc/apt/sources.list.d/experimental.list \ - "deb '$mirror' experimental main" \ && apt-get update \ && apt-get -y install '"${late_pkgs[*]}" \ -- --network=host diff -pruN 13.11+exp1/po/README 13.12/po/README --- 13.11+exp1/po/README 2025-08-10 18:58:53.000000000 +0000 +++ 13.12/po/README 2025-08-15 09:05:44.000000000 +0000 @@ -4,7 +4,8 @@ NOTES FOR TRANSLATORS Introduction ------------ -The dgit source package contains dgit and git-debrebase. +The dgit source package builds several binary packages: +dgit, git-debrebase, git-debpush, and dgit-infrastructure. These are useful for a variety of different users and in different situations. So there are various documents aimed at various users. @@ -13,9 +14,7 @@ situations. So there are various docume * Documentation translation is handled via po4a, in the po4a directory. The documeents are all manpages. -* git-debrebase is currently mostly useful within the Debian project, - but this will change and its document translations will then be more - important. +* git-debrebase is currently mostly useful within the Debian project. The en_US message translation is slightly special. It is used for testing the translation machinery, and since the source native @@ -36,19 +35,21 @@ Translatation priorities MEDIUM - po/messages.pot All the messages for both programs + po/messages.pot All the messages for all programs po4a/dgit_1 po4a/dgit-downstream-dsc_7 po4a/dgit-sponshorship_7 po4a/dgit_7 + po4a/git-deborig_1 - LOW + LOW - For work within Debian, where one needs good English anyway: - po4a/dgit-maint-* } For work within the Debian project - po4a/dgit-nmu-simple_7 } (where one needs good English anyway) - - po4a/git-debrebase_* Currently low priority but this will change + po4a/dgit-maint-* + po4a/dgit-nmu-simple_7 + po4a/git-debpush_1 + po4a/git-debrebase_* + po4a/tag2upload_5 Translation organisation diff -pruN 13.11+exp1/po/en_US.po 13.12/po/en_US.po --- 13.11+exp1/po/en_US.po 2025-08-10 18:58:53.000000000 +0000 +++ 13.12/po/en_US.po 2025-08-15 09:05:44.000000000 +0000 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dgit ongoing\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-05-07 18:40+0000\n" +"POT-Creation-Date: 2025-08-15 13:02+0000\n" "PO-Revision-Date: 2018-08-26 16:55+0100\n" "Last-Translator: Ian Jackson \n" "Language-Team: dgit developrs \n" @@ -17,41 +17,41 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../dgit:296 +#: ../dgit:297 #, perl-format msgid "%s: invalid configuration: %s\n" msgstr "" -#: ../dgit:303 +#: ../dgit:304 msgid "warning: overriding problem due to --force:\n" msgstr "" -#: ../dgit:311 +#: ../dgit:313 #, perl-format msgid "warning: skipping checks or functionality due to --force-%s\n" msgstr "" -#: ../dgit:316 +#: ../dgit:318 #, perl-format msgid "%s: source package %s does not exist in suite %s\n" msgstr "" -#: ../dgit:589 +#: ../dgit:591 #, perl-format msgid "build host child %s" msgstr "" -#: ../dgit:648 +#: ../dgit:650 #, perl-format msgid "%s ok: %s" msgstr "" -#: ../dgit:650 +#: ../dgit:652 #, perl-format msgid "would be ok: %s (but dry run only)" msgstr "" -#: ../dgit:675 +#: ../dgit:677 msgid "" "main usages:\n" " dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n" @@ -72,147 +72,147 @@ msgid "" " -c= set git config option (used directly by dgit too)\n" msgstr "" -#: ../dgit:694 +#: ../dgit:696 msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n" msgstr "" -#: ../dgit:698 +#: ../dgit:700 #, perl-format msgid "" "%s: %s\n" "%s" msgstr "" -#: ../dgit:703 +#: ../dgit:705 msgid "too few arguments" msgstr "" -#: ../dgit:825 +#: ../dgit:827 #, perl-format msgid "multiple values for %s (in %s git config)" msgstr "" -#: ../dgit:828 +#: ../dgit:830 #, perl-format msgid "value for config option %s (in %s git config) contains newline(s)!" msgstr "" -#: ../dgit:848 +#: ../dgit:850 #, perl-format msgid "" "need value for one of: %s\n" "%s: distro or suite appears not to be (properly) supported" msgstr "" -#: ../dgit:905 +#: ../dgit:907 #, perl-format msgid "bad syntax for (nominal) distro `%s' (does not match %s)" msgstr "" -#: ../dgit:920 +#: ../dgit:922 #, perl-format msgid "backports-quirk needs % or ( )" msgstr "" -#: ../dgit:936 +#: ../dgit:938 #, perl-format msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'" msgstr "" -#: ../dgit:956 +#: ../dgit:958 msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)" msgstr "" -#: ../dgit:974 +#: ../dgit:976 #, perl-format msgid "unknown %s `%s'" msgstr "" -#: ../dgit:979 ../git-debrebase:1548 ../Debian/Dgit.pm:255 +#: ../dgit:981 ../git-debrebase:1548 ../Debian/Dgit/Core.pm:53 msgid "internal error" msgstr "" -#: ../dgit:981 +#: ../dgit:983 msgid "pushing but distro is configured readonly" msgstr "" -#: ../dgit:985 +#: ../dgit:987 msgid "" "Push failed, before we got started.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:1008 +#: ../dgit:1010 #, perl-format msgid "" "dgit: quilt mode `%s' (for format `%s') implies split view, but split-view " "set to `%s'" msgstr "" -#: ../dgit:1169 +#: ../dgit:1171 msgid "this operation does not support multiple comma-separated suites" msgstr "" -#: ../dgit:1237 +#: ../dgit:1250 #, perl-format msgid "fetch of %s failed (%s): %s" msgstr "" -#: ../dgit:1244 +#: ../dgit:1257 #, perl-format msgid "fetch of %s gave HTTP code %s" msgstr "" -#: ../dgit:1265 +#: ../dgit:1282 msgid "ftpmasterapi archive query method takes no data part" msgstr "" -#: ../dgit:1283 +#: ../dgit:1300 #, perl-format msgid "unknown suite %s, maybe -d would help" msgstr "" -#: ../dgit:1287 +#: ../dgit:1304 #, perl-format msgid "multiple matches for suite %s\n" msgstr "" -#: ../dgit:1289 +#: ../dgit:1306 #, perl-format msgid "suite %s info has no codename\n" msgstr "" -#: ../dgit:1291 +#: ../dgit:1308 #, perl-format msgid "suite %s maps to bad codename\n" msgstr "" -#: ../dgit:1293 ../dgit:1318 +#: ../dgit:1310 ../dgit:1335 msgid "bad ftpmaster api response: " msgstr "" -#: ../dgit:1307 +#: ../dgit:1324 #, perl-format msgid "bad version: %s\n" msgstr "" -#: ../dgit:1309 +#: ../dgit:1326 msgid "bad component" msgstr "" -#: ../dgit:1312 +#: ../dgit:1329 msgid "bad filename" msgstr "" -#: ../dgit:1314 +#: ../dgit:1331 msgid "bad sha256sum" msgstr "" -#: ../dgit:1365 +#: ../dgit:1384 msgid "aptget archive query method takes no data part" msgstr "" -#: ../dgit:1449 +#: ../dgit:1468 #, perl-format msgid "" "apt seemed to not to update dgit's cached Release files for %s.\n" @@ -220,164 +220,164 @@ msgid "" " is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n" msgstr "" -#: ../dgit:1473 +#: ../dgit:1492 #, perl-format msgid "Release file (%s) specifies intolerable %s" msgstr "" -#: ../dgit:1499 +#: ../dgit:1518 msgid "apt-get source did not produce a .dsc" msgstr "" -#: ../dgit:1500 +#: ../dgit:1519 #, perl-format msgid "apt-get source produced several .dscs (%s)" msgstr "" -#: ../dgit:1605 +#: ../dgit:1624 #, perl-format msgid "" "unable to canonicalise suite using package %s which does not appear to exist " "in suite %s; --existing-package may help" msgstr "" -#: ../dgit:1744 +#: ../dgit:1763 #, perl-format msgid "cannot operate on %s suite" msgstr "" -#: ../dgit:1747 +#: ../dgit:1766 #, perl-format msgid "canonical suite name for %s is %s" msgstr "" -#: ../dgit:1749 +#: ../dgit:1768 #, perl-format msgid "canonical suite name is %s" msgstr "" -#: ../dgit:1769 +#: ../dgit:1788 #, perl-format msgid "%s has hash %s but archive told us to expect %s" msgstr "" -#: ../dgit:1775 +#: ../dgit:1794 #, perl-format msgid "unsupported source format %s, sorry" msgstr "" -#: ../dgit:1802 +#: ../dgit:1821 #, perl-format msgid "diverting to %s (using config for %s)" msgstr "" -#: ../dgit:1825 +#: ../dgit:1844 #, perl-format msgid "unknown git-check `%s'" msgstr "" -#: ../dgit:1840 +#: ../dgit:1859 #, perl-format msgid "unknown git-create `%s'" msgstr "" -#: ../dgit:1884 +#: ../dgit:1903 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "" -#: ../dgit:1930 +#: ../dgit:1945 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "" -#: ../dgit:1941 +#: ../dgit:1957 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "" -#: ../dgit:1987 +#: ../dgit:2003 #, perl-format msgid "hash or size of %s varies in %s fields (between: %s)" msgstr "" -#: ../dgit:1996 +#: ../dgit:2012 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "" -#: ../dgit:2000 +#: ../dgit:2016 #, perl-format msgid "%s has no files list field(s)" msgstr "" -#: ../dgit:2006 +#: ../dgit:2022 #, perl-format msgid "no file appears in all file lists (looked in: %s)" msgstr "" -#: ../dgit:2046 +#: ../dgit:2062 #, perl-format msgid "purportedly source-only changes has Architecture: %s\n" msgstr "" -#: ../dgit:2057 +#: ../dgit:2073 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "" -#: ../dgit:2069 +#: ../dgit:2085 msgid "cannot find section/priority from .changes Files field" msgstr "" -#: ../dgit:2082 +#: ../dgit:2098 msgid "" "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n" msgstr "" -#: ../dgit:2098 +#: ../dgit:2114 #, perl-format msgid ".dsc %s missing entry for %s" msgstr "" -#: ../dgit:2103 +#: ../dgit:2119 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "" -#: ../dgit:2111 +#: ../dgit:2127 #, perl-format msgid "archive %s: %s" msgstr "" -#: ../dgit:2118 +#: ../dgit:2134 #, perl-format msgid "archive contains %s with different checksum" msgstr "" -#: ../dgit:2146 +#: ../dgit:2162 #, perl-format msgid "edited .changes for archive .orig contents: %s %s" msgstr "" -#: ../dgit:2154 +#: ../dgit:2170 #, perl-format msgid "[new .changes left in %s]" msgstr "" -#: ../dgit:2157 +#: ../dgit:2173 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "" -#: ../dgit:2179 +#: ../dgit:2195 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " "Maintainer field)" msgstr "" -#: ../dgit:2202 +#: ../dgit:2218 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -392,129 +392,129 @@ msgid "" "\n" msgstr "" -#: ../dgit:2214 +#: ../dgit:2230 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" msgstr "" -#: ../dgit:2245 +#: ../dgit:2261 msgid "Dpkg::Vendor `current vendor'" msgstr "" -#: ../dgit:2247 +#: ../dgit:2263 msgid "(base) distro being accessed" msgstr "" -#: ../dgit:2249 +#: ../dgit:2265 msgid "(nominal) distro being accessed" msgstr "" -#: ../dgit:2254 +#: ../dgit:2270 #, perl-format msgid "build-products-dir %s is not accessible: %s\n" msgstr "" -#: ../dgit:2292 +#: ../dgit:2308 #, perl-format msgid "%s: multiple representations of similar orig %s:\n" msgstr "" -#: ../dgit:2296 +#: ../dgit:2312 #, perl-format msgid " %s: in %s (%s)\n" msgstr "" -#: ../dgit:2301 +#: ../dgit:2317 msgid "Duplicate/inconsistent orig tarballs. Delete the spurious ones." msgstr "" -#: ../dgit:2318 +#: ../dgit:2334 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" msgstr "" -#: ../dgit:2322 +#: ../dgit:2338 #, perl-format msgid "check orig file %s in bpd %s: %s" msgstr "" -#: ../dgit:2324 +#: ../dgit:2340 #, perl-format msgid "check orig file %s in ..: %s" msgstr "" -#: ../dgit:2327 +#: ../dgit:2343 #, perl-format msgid "check target of orig symlink %s in ..: %s" msgstr "" -#: ../dgit:2336 +#: ../dgit:2352 #, perl-format msgid "%s: cloned orig symlink from ..: %s\n" msgstr "" -#: ../dgit:2340 +#: ../dgit:2356 #, perl-format msgid "%s: hardlinked orig from ..: %s\n" msgstr "" -#: ../dgit:2343 +#: ../dgit:2359 #, perl-format msgid "failed to make %s a hardlink to %s: %s" msgstr "" -#: ../dgit:2349 +#: ../dgit:2365 #, perl-format msgid "%s: symmlinked orig from .. on other filesystem: %s\n" msgstr "" -#: ../dgit:2364 +#: ../dgit:2380 msgid "package changelog" msgstr "" -#: ../dgit:2469 +#: ../dgit:2485 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "" -#: ../dgit:2532 +#: ../dgit:2548 msgid "package changelog has no entries!" msgstr "" -#: ../dgit:2537 +#: ../dgit:2553 #, perl-format msgid "" "warning: unable to find/parse changelog entry for first import of %s:\n" "%s\n" msgstr "" -#: ../dgit:2608 ../dgit:2613 +#: ../dgit:2624 ../dgit:2629 #, perl-format msgid "accessing %s: %s" msgstr "" -#: ../dgit:2630 ../dgit:2637 +#: ../dgit:2646 ../dgit:2653 #, perl-format msgid "saving %s: %s" msgstr "" -#: ../dgit:2663 ../dgit:6701 +#: ../dgit:2679 ../dgit:6753 msgid "source package" msgstr "" -#: ../dgit:2743 +#: ../dgit:2759 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "" -#: ../dgit:2796 +#: ../dgit:2812 #, perl-format msgid "%s failed: %s\n" msgstr "" -#: ../dgit:2814 +#: ../dgit:2830 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -523,16 +523,16 @@ msgid "" " dpkg-source --before-build gave tree %s\n" msgstr "" -#: ../dgit:2834 +#: ../dgit:2850 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "" -#: ../dgit:2838 +#: ../dgit:2854 msgid "Import of source package" msgstr "" -#: ../dgit:2858 +#: ../dgit:2874 #, perl-format msgid "" "\n" @@ -541,44 +541,43 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:2900 +#: ../dgit:2924 #, perl-format msgid "using existing %s" msgstr "" -#: ../dgit:2904 +#: ../dgit:2928 #, perl-format msgid "" -"file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " +"file %s has hash %s but we need hash %s (perhaps you should delete this " "file?)" msgstr "" -#: ../dgit:2908 +#: ../dgit:2932 #, perl-format msgid "need to fetch correct version of %s" msgstr "" -#: ../dgit:2924 +#: ../dgit:2958 #, perl-format -msgid "" -"file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" +msgid "file %s has hash %s but we need hash %s (got wrong file from archive!)" msgstr "" -#: ../dgit:3019 +#: ../dgit:3055 msgid "too many iterations trying to get sane fetch!" msgstr "" -#: ../dgit:3034 +#: ../dgit:3070 #, perl-format msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n" msgstr "" -#: ../dgit:3078 +#: ../dgit:3114 #, perl-format msgid "warning: git fetch %s created %s; this is silly, deleting it.\n" msgstr "" -#: ../dgit:3093 +#: ../dgit:3129 #, perl-format msgid "" "--dry-run specified but we actually wanted the results of git fetch,\n" @@ -586,7 +585,7 @@ msgid "" "or using --damp-run instead of --dry-run. (Wanted: %s.)\n" msgstr "" -#: ../dgit:3098 +#: ../dgit:3134 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -596,24 +595,24 @@ msgid "" "warning: Will try again...\n" msgstr "" -#: ../dgit:3245 +#: ../dgit:3281 #, perl-format msgid "not chasing .dsc distro %s: not fetching %s" msgstr "" -#: ../dgit:3250 +#: ../dgit:3286 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr "" -#: ../dgit:3255 +#: ../dgit:3291 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" "for which we have no configured url and .dsc provides no hint\n" msgstr "" -#: ../dgit:3265 +#: ../dgit:3301 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -622,54 +621,54 @@ msgid "" "(can be overridden by config - consult documentation)\n" msgstr "" -#: ../dgit:3285 +#: ../dgit:3321 msgid "rewrite map" msgstr "" -#: ../dgit:3292 +#: ../dgit:3328 msgid "server's git history rewrite map contains a relevant entry!" msgstr "" -#: ../dgit:3296 +#: ../dgit:3332 msgid "using rewritten git hash in place of .dsc value" msgstr "" -#: ../dgit:3298 +#: ../dgit:3334 msgid "server data says .dsc hash is to be disregarded" msgstr "" -#: ../dgit:3305 +#: ../dgit:3341 msgid "additional commits" msgstr "" -#: ../dgit:3308 +#: ../dgit:3344 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" "but we could not obtain that object anywhere.\n" msgstr "" -#: ../dgit:3333 +#: ../dgit:3369 msgid "last upload to archive" msgstr "" -#: ../dgit:3337 +#: ../dgit:3373 msgid "no version available from the archive" msgstr "" -#: ../dgit:3420 +#: ../dgit:3456 msgid "dgit suite branch on dgit git server" msgstr "" -#: ../dgit:3427 +#: ../dgit:3463 msgid "dgit client's archive history view" msgstr "" -#: ../dgit:3432 +#: ../dgit:3468 msgid "Dgit field in .dsc from archive" msgstr "" -#: ../dgit:3460 +#: ../dgit:3496 #, perl-format msgid "" "\n" @@ -679,15 +678,15 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3473 +#: ../dgit:3509 msgid "archive .dsc names newer git commit" msgstr "" -#: ../dgit:3476 +#: ../dgit:3512 msgid "archive .dsc names other git commit, fixing up" msgstr "" -#: ../dgit:3497 +#: ../dgit:3533 #, perl-format msgid "" "\n" @@ -695,7 +694,7 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3506 +#: ../dgit:3542 #, perl-format msgid "" "\n" @@ -705,7 +704,7 @@ msgid "" "\n" msgstr "" -#: ../dgit:3591 +#: ../dgit:3627 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -713,19 +712,19 @@ msgid "" "Record that\n" msgstr "" -#: ../dgit:3604 +#: ../dgit:3640 msgid "should be treated as descended from\n" msgstr "" -#: ../dgit:3622 +#: ../dgit:3658 msgid "dgit repo server tip (last push)" msgstr "" -#: ../dgit:3624 +#: ../dgit:3660 msgid "local tracking tip (last fetch)" msgstr "" -#: ../dgit:3635 +#: ../dgit:3671 #, perl-format msgid "" "\n" @@ -735,30 +734,30 @@ msgid "" "\n" msgstr "" -#: ../dgit:3650 +#: ../dgit:3686 msgid "fetched source tree" msgstr "" -#: ../dgit:3686 +#: ../dgit:3722 msgid "debian/changelog merge driver" msgstr "" -#: ../dgit:3751 +#: ../dgit:3787 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" msgstr "" -#: ../dgit:3765 +#: ../dgit:3801 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n" msgstr "" -#: ../dgit:3780 +#: ../dgit:3816 #, perl-format msgid "install %s: %s" msgstr "" -#: ../dgit:3807 +#: ../dgit:3843 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -766,30 +765,30 @@ msgid "" "tree.\n" msgstr "" -#: ../dgit:3829 +#: ../dgit:3865 #, perl-format msgid "fetching %s..." msgstr "" -#: ../dgit:3837 +#: ../dgit:3873 #, perl-format msgid "failed to obtain %s: %s" msgstr "" -#: ../dgit:3876 +#: ../dgit:3912 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "" -#: ../dgit:3908 +#: ../dgit:3944 msgid "local combined tracking branch" msgstr "" -#: ../dgit:3910 +#: ../dgit:3946 msgid "archive seems to have rewound: local tracking branch is ahead!" msgstr "" -#: ../dgit:3949 +#: ../dgit:3985 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -797,7 +796,7 @@ msgid "" "Input branches:\n" msgstr "" -#: ../dgit:3963 +#: ../dgit:3999 msgid "" "\n" "Key\n" @@ -806,300 +805,325 @@ msgid "" "\n" msgstr "" -#: ../dgit:3978 +#: ../dgit:4014 #, perl-format msgid "calculated combined tracking suite %s" msgstr "" -#: ../dgit:3996 +#: ../dgit:4032 #, perl-format msgid "ready for work in %s" msgstr "" -#: ../dgit:4014 +#: ../dgit:4050 msgid "dry run makes no sense with clone" msgstr "" -#: ../dgit:4029 +#: ../dgit:4065 #, perl-format msgid "create `%s': %s" msgstr "" -#: ../dgit:4041 +#: ../dgit:4077 msgid "fetching existing git history" msgstr "" -#: ../dgit:4044 +#: ../dgit:4080 msgid "starting new git history" msgstr "" -#: ../dgit:4069 +#: ../dgit:4105 #, perl-format msgid "" "FYI: Vcs-Git in %s has different url to your vcs-git remote.\n" " Your vcs-git remote url may be out of date. Use dgit update-vcs-git ?\n" msgstr "" -#: ../dgit:4074 +#: ../dgit:4110 #, perl-format msgid "fetched into %s" msgstr "" -#: ../dgit:4087 +#: ../dgit:4123 #, perl-format msgid "Merge from %s [dgit]" msgstr "" -#: ../dgit:4089 +#: ../dgit:4125 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "" -#: ../dgit:4097 +#: ../dgit:4133 #, perl-format msgid "git tree contains %s" msgstr "" -#: ../dgit:4108 +#: ../dgit:4144 msgid "you have uncommitted changes to critical files, cannot continue:\n" msgstr "" -#: ../dgit:4127 +#: ../dgit:4163 #, perl-format msgid "" "quilt fixup required but quilt mode is `nofix'\n" "HEAD commit%s differs from tree implied by debian/patches%s" msgstr "" -#: ../dgit:4144 +#: ../dgit:4180 msgid "nothing quilty to commit, ok." msgstr "" -#: ../dgit:4147 +#: ../dgit:4183 msgid " (wanted to commit patch update)" msgstr "" -#: ../dgit:4151 +#: ../dgit:4187 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" msgstr "" -#: ../dgit:4189 +#: ../dgit:4225 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" msgstr "" -#: ../dgit:4194 +#: ../dgit:4230 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "" -#: ../dgit:4204 +#: ../dgit:4241 #, perl-format msgid "commit id %s" msgstr "" -#: ../dgit:4210 +#: ../dgit:4247 #, perl-format msgid "and left in %s" msgstr "" -#: ../dgit:4236 +#: ../dgit:4273 #, perl-format msgid "Wanted tag %s (%s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4239 +#: ../dgit:4276 #, perl-format msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4247 +#: ../dgit:4284 #, perl-format msgid "%s (%s) .. %s (%s) is not fast forward\n" msgstr "" -#: ../dgit:4256 +#: ../dgit:4293 msgid "version currently in archive" msgstr "" -#: ../dgit:4265 +#: ../dgit:4302 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" -#: ../dgit:4274 +#: ../dgit:4311 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "" -#: ../dgit:4285 +#: ../dgit:4322 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "" -#: ../dgit:4288 +#: ../dgit:4325 #, perl-format msgid "" "%s is %s\n" "Your tree seems to based on earlier (not uploaded) %s.\n" msgstr "" -#: ../dgit:4293 +#: ../dgit:4330 #, perl-format msgid "" "d/changelog entry for %s is unfinalised!\n" "Your tree seems to based on earlier (not uploaded) %s.\n" msgstr "" -#: ../dgit:4307 +#: ../dgit:4344 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "" -#: ../dgit:4363 +#: ../dgit:4400 msgid "Checking that HEAD includes all changes in archive..." msgstr "" -#: ../dgit:4372 +#: ../dgit:4409 msgid "maintainer view tag" msgstr "" -#: ../dgit:4374 +#: ../dgit:4411 msgid "dgit view tag" msgstr "" -#: ../dgit:4375 +#: ../dgit:4412 msgid "current archive contents" msgstr "" -#: ../dgit:4388 +#: ../dgit:4425 msgid "" "| Not fast forward; maybe --trust-changelog is needed ? Please see " "dgit(1).\n" msgstr "" -#: ../dgit:4398 +#: ../dgit:4435 #, perl-format msgid "Declare fast forward from %s\n" msgstr "" -#: ../dgit:4399 +#: ../dgit:4436 #, perl-format msgid "Make fast forward from %s\n" msgstr "" -#: ../dgit:4403 +#: ../dgit:4440 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "" -#: ../dgit:4416 +#: ../dgit:4453 #, perl-format msgid "Declare fast forward from %s" msgstr "" -#: ../dgit:4424 +#: ../dgit:4461 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "" -#: ../dgit:4439 +#: ../dgit:4476 #, perl-format msgid "%s field `%s' is not expected `%s'" msgstr "" -#: ../dgit:4471 +#: ../dgit:4508 #, perl-format msgid "%s is for %s %s but debian/changelog is for %s %s" msgstr "" -#: ../dgit:4514 +#: ../dgit:4551 #, perl-format msgid "DEP-14 tag %s does not exist (--dep14tag-reuse=%s)" msgstr "" -#: ../dgit:4528 +#: ../dgit:4565 #, perl-format msgid "" "%s: making fresh DEP-14 tag %s (--dep14tag-reuse=%s), since existing tag " "unsuitable: %s" msgstr "" -#: ../dgit:4538 +#: ../dgit:4575 #, perl-format msgid "existing DEP-14 tag %s is unsuitable (--dep14tag-reuse=%s): %s" msgstr "" -#: ../dgit:4559 +#: ../dgit:4596 #, perl-format msgid "refers to commit %s, not %s" msgstr "" -#: ../dgit:4569 +#: ../dgit:4606 #, perl-format msgid "verification failed: git verify-tag: %s" msgstr "" -#: ../dgit:4623 +#: ../dgit:4656 +#, perl-format +msgid "checking that %s corresponds to HEAD" +msgstr "" + +#: ../dgit:4695 ../dgit:4707 +#, perl-format +msgid "HEAD specifies a different tree to %s:\n" +msgstr "" + +#: ../dgit:4701 +#, perl-format +msgid "" +"There is a problem with your source tree (see dgit(7) for some hints).\n" +"To see a full diff, run git diff %s %s\n" +msgstr "" + +#: ../dgit:4711 +#, perl-format +msgid "" +"Perhaps you forgot to build. Or perhaps there is a problem with your\n" +" source tree (see dgit(7) for some hints). To see a full diff, run\n" +" git diff %s %s\n" +msgstr "" + +#: ../dgit:4730 #, perl-format msgid "%s already contains field %s" msgstr "" -#: ../dgit:4655 +#: ../dgit:4763 #, perl-format msgid "changes field %s `%s' does not match changelog `%s'" msgstr "" -#: ../dgit:4711 +#: ../dgit:4819 #, perl-format msgid "(maintainer view tag generated by dgit --quilt=%s)\n" msgstr "" -#: ../dgit:4784 +#: ../dgit:4892 #, perl-format msgid "" "warning: server says object %s type %s is tainted, but here it has type %s\n" msgstr "" -#: ../dgit:4817 +#: ../dgit:4925 msgid "commit" msgstr "" -#: ../dgit:4819 +#: ../dgit:4927 #, perl-format msgid "object within commit %s" msgstr "" -#: ../dgit:4827 +#: ../dgit:4935 msgid "pushing tainted objects (which server would reject)" msgstr "" -#: ../dgit:4835 +#: ../dgit:4943 msgid "" "Push failed, while checking state of the archive.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:4845 +#: ../dgit:4953 msgid "" "package appears to be new in this suite; if this is intentional, use --new" msgstr "" -#: ../dgit:4850 +#: ../dgit:4958 msgid "" "Push failed, while preparing your push.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:4869 +#: ../dgit:4977 #, perl-format msgid "looked for .dsc %s, but %s; maybe you forgot to build" msgstr "" -#: ../dgit:4885 +#: ../dgit:4993 #, perl-format msgid "" "Branch is managed by git-debrebase (%s\n" @@ -1108,7 +1132,7 @@ msgid "" "Or, maybe, run git-debrebase forget-was-ever-debrebase.\n" msgstr "" -#: ../dgit:4904 +#: ../dgit:5012 #, perl-format msgid "" "You seem to be trying to push an old version.\n" @@ -1116,14 +1140,14 @@ msgid "" "Version you are trying to upload: %s\n" msgstr "" -#: ../dgit:4918 +#: ../dgit:5026 #, perl-format msgid "" "--quilt=%s but no cached dgit view:\n" " perhaps HEAD changed since dgit build[-source] ?" msgstr "" -#: ../dgit:4954 +#: ../dgit:5062 msgid "" "dgit push: HEAD is not a descendant of the archive's version.\n" "To overwrite the archive's contents, pass --trust-changelog, or --" @@ -1132,7 +1156,7 @@ msgid "" "forward." msgstr "" -#: ../dgit:4969 +#: ../dgit:5077 #, perl-format msgid "" "\n" @@ -1141,87 +1165,62 @@ msgid "" "add a new changelog stanza for a new version number and try again.\n" msgstr "" -#: ../dgit:4975 +#: ../dgit:5083 #, perl-format msgid "Tag %s already exists.\n" msgstr "" -#: ../dgit:4980 -#, perl-format -msgid "checking that %s corresponds to HEAD" -msgstr "" - -#: ../dgit:5014 ../dgit:5026 -#, perl-format -msgid "HEAD specifies a different tree to %s:\n" -msgstr "" - -#: ../dgit:5020 -#, perl-format -msgid "" -"There is a problem with your source tree (see dgit(7) for some hints).\n" -"To see a full diff, run git diff %s %s\n" -msgstr "" - -#: ../dgit:5030 -#, perl-format -msgid "" -"Perhaps you forgot to build. Or perhaps there is a problem with your\n" -" source tree (see dgit(7) for some hints). To see a full diff, run\n" -" git diff %s %s\n" -msgstr "" - -#: ../dgit:5041 +#: ../dgit:5093 #, perl-format msgid "" "failed to find unique changes file (looked for %s in %s); perhaps you need " "to use dgit -C" msgstr "" -#: ../dgit:5063 +#: ../dgit:5115 msgid "uploading binaries, although distro policy is source only" msgstr "" -#: ../dgit:5067 +#: ../dgit:5119 msgid "source-only upload, although distro policy requires .debs" msgstr "" -#: ../dgit:5071 +#: ../dgit:5123 #, perl-format msgid "" "source-only upload, though package appears entirely NEW\n" "(this is probably contrary to policy in %s)" msgstr "" -#: ../dgit:5078 +#: ../dgit:5130 #, perl-format msgid "unknown source-only-uploads policy `%s'" msgstr "" -#: ../dgit:5085 +#: ../dgit:5137 #, perl-format msgid "policy-query-supported-ssh value '%s' must be false/true/unknown" msgstr "" -#: ../dgit:5148 +#: ../dgit:5200 msgid "" "Push failed, while signing the tag.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:5175 +#: ../dgit:5227 msgid "" "Push failed, *after* signing the tag.\n" "If you want to try again, you should use a new version number.\n" msgstr "" -#: ../dgit:5194 +#: ../dgit:5246 msgid "" "Push failed, while updating the remote git repository - see messages above.\n" "If you want to try again, you should use a new version number.\n" msgstr "" -#: ../dgit:5211 +#: ../dgit:5263 msgid "" "Push failed, while obtaining signatures on the .changes and .dsc.\n" "If it was just that the signature failed, you may try again by using\n" @@ -1230,12 +1229,12 @@ msgid "" "If you need to change the package, you must use a new version number.\n" msgstr "" -#: ../dgit:5229 +#: ../dgit:5281 #, perl-format msgid "[new .dsc & .changes left in %s.tmp, %s.tmp]" msgstr "" -#: ../dgit:5236 +#: ../dgit:5288 #, perl-format msgid "" "Push failed, while uploading package(s) to the archive server.\n" @@ -1245,181 +1244,181 @@ msgid "" "number for your next attempt at the upload.\n" msgstr "" -#: ../dgit:5245 +#: ../dgit:5297 #, perl-format msgid "pushed and uploaded %s" msgstr "" -#: ../dgit:5257 +#: ../dgit:5309 msgid "-p is not allowed with clone; specify as argument instead" msgstr "" -#: ../dgit:5268 +#: ../dgit:5320 msgid "incorrect arguments to dgit clone" msgstr "" -#: ../dgit:5274 ../git-debrebase:1811 +#: ../dgit:5326 ../git-debrebase:1811 #, perl-format msgid "%s already exists" msgstr "" -#: ../dgit:5288 +#: ../dgit:5340 #, perl-format msgid "remove %s: %s\n" msgstr "" -#: ../dgit:5292 +#: ../dgit:5344 #, perl-format msgid "check whether to remove %s: %s\n" msgstr "" -#: ../dgit:5330 +#: ../dgit:5382 msgid "incorrect arguments to dgit fetch or dgit pull" msgstr "" -#: ../dgit:5348 +#: ../dgit:5400 msgid "" "dgit pull not yet supported in split view mode (including with view-" "splitting quilt modes)\n" msgstr "" -#: ../dgit:5357 +#: ../dgit:5409 msgid "dgit checkout needs a suite argument" msgstr "" -#: ../dgit:5420 +#: ../dgit:5472 #, perl-format msgid "setting up vcs-git: %s\n" msgstr "" -#: ../dgit:5423 +#: ../dgit:5475 #, perl-format msgid "vcs git unchanged: %s\n" msgstr "" -#: ../dgit:5425 +#: ../dgit:5477 #, perl-format msgid "changing vcs-git url to: %s\n" msgstr "" -#: ../dgit:5430 +#: ../dgit:5482 #, perl-format msgid "fetching (%s)\n" msgstr "" -#: ../dgit:5446 +#: ../dgit:5498 #, perl-format msgid "incorrect arguments to dgit %s" msgstr "" -#: ../dgit:5457 +#: ../dgit:5509 #, perl-format msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s" msgstr "" -#: ../dgit:5481 +#: ../dgit:5533 #, perl-format msgid "dgit push, but dgit.default.push-subcmd set to %s" msgstr "" -#: ../dgit:5489 +#: ../dgit:5541 #, perl-format msgid "dgit rpush, but dgit.default.[r]push-subcmd set to %s" msgstr "" -#: ../dgit:5502 +#: ../dgit:5554 #, perl-format msgid "" "warning: \"dgit %s\" currently means \"dgit %s-built\" (by default)\n" "warning: but is going to change to \"dgit %s-source\". See dgit!(1).\n" msgstr "" -#: ../dgit:5542 +#: ../dgit:5594 #, perl-format msgid "" "build host has dgit rpush protocol versions %s but invocation host has %s" msgstr "" -#: ../dgit:5626 +#: ../dgit:5678 #, perl-format msgid "create %s: %s" msgstr "" -#: ../dgit:5672 +#: ../dgit:5724 #, perl-format msgid "build host child failed: %s" msgstr "" -#: ../dgit:5675 +#: ../dgit:5727 msgid "all done\n" msgstr "" -#: ../dgit:5684 +#: ../dgit:5736 #, perl-format msgid "file %s (%s) twice" msgstr "" -#: ../dgit:5690 +#: ../dgit:5742 msgid "bad param spec" msgstr "" -#: ../dgit:5696 +#: ../dgit:5748 msgid "bad previously spec" msgstr "" -#: ../dgit:5768 +#: ../dgit:5820 #, perl-format msgid "buildinfo mismatch in field %s" msgstr "" -#: ../dgit:5771 +#: ../dgit:5823 msgid "buildinfo mismatch in field Architecture" msgstr "" -#: ../dgit:5773 +#: ../dgit:5825 #, perl-format msgid "buildinfo contains forbidden field %s" msgstr "" -#: ../dgit:5795 +#: ../dgit:5847 msgid "build-host-supplied changes file is not source-only" msgstr "" -#: ../dgit:5825 +#: ../dgit:5877 msgid "remote changes file" msgstr "" -#: ../dgit:5908 +#: ../dgit:5960 msgid "not a plain file\n" msgstr "" -#: ../dgit:5914 +#: ../dgit:5966 msgid "mode or type changed in unsupported way\n" msgstr "" -#: ../dgit:5917 +#: ../dgit:5969 msgid "modified symlink\n" msgstr "" -#: ../dgit:5920 +#: ../dgit:5972 msgid "deletion of symlink\n" msgstr "" -#: ../dgit:5924 +#: ../dgit:5976 msgid "creation with non-default mode, or symlink\n" msgstr "" -#: ../dgit:5952 +#: ../dgit:6004 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "" -#: ../dgit:5957 +#: ../dgit:6009 msgid "" "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" msgstr "" -#: ../dgit:5995 +#: ../dgit:6047 #, perl-format msgid "" "\n" @@ -1427,36 +1426,36 @@ msgid "" " %s\n" msgstr "" -#: ../dgit:6002 +#: ../dgit:6054 #, perl-format msgid "" "--quilt=%s specified, implying patches-unapplied git tree\n" " but git tree differs from orig in upstream files." msgstr "" -#: ../dgit:6008 +#: ../dgit:6060 msgid "" "\n" " ... debian/patches is missing; perhaps this is a patch queue branch?" msgstr "" -#: ../dgit:6015 +#: ../dgit:6067 #, 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:6029 +#: ../dgit:6081 #, perl-format msgid "Combine debian/ with upstream source for %s\n" msgstr "" -#: ../dgit:6037 +#: ../dgit:6089 msgid "dgit view: creating patches-applied version using gbp pq" msgstr "" -#: ../dgit:6048 +#: ../dgit:6100 #, perl-format msgid "" "--quilt=%s specified, implying that HEAD is for use with a\n" @@ -1464,16 +1463,16 @@ msgid "" " .gitignores: but, such patches exist in debian/patches.\n" msgstr "" -#: ../dgit:6056 +#: ../dgit:6108 msgid "dgit view: creating patch to represent .gitignore changes" msgstr "" -#: ../dgit:6061 +#: ../dgit:6113 #, perl-format msgid "%s already exists; but want to create it to record .gitignore changes" msgstr "" -#: ../dgit:6067 +#: ../dgit:6119 msgid "" "Subject: Update .gitignore from Debian packaging branch\n" "\n" @@ -1482,54 +1481,54 @@ msgid "" "updates to users of the official Debian archive view of the package.\n" msgstr "" -#: ../dgit:6090 +#: ../dgit:6142 msgid "Commit patch to update .gitignore\n" msgstr "" -#: ../dgit:6160 +#: ../dgit:6212 msgid "maximum search space exceeded" msgstr "" -#: ../dgit:6178 +#: ../dgit:6230 #, perl-format msgid "has %s not %s" msgstr "" -#: ../dgit:6187 +#: ../dgit:6239 msgid "root commit" msgstr "" -#: ../dgit:6193 +#: ../dgit:6245 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "" -#: ../dgit:6205 +#: ../dgit:6257 #, perl-format msgid "changed %s" msgstr "" -#: ../dgit:6224 +#: ../dgit:6276 #, perl-format msgid "" "\n" "%s: error: quilt fixup cannot be linear. Stopped at:\n" msgstr "" -#: ../dgit:6231 +#: ../dgit:6283 #, perl-format msgid "%s: %s: %s\n" msgstr "" -#: ../dgit:6243 +#: ../dgit:6295 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" -#: ../dgit:6246 +#: ../dgit:6298 msgid "quilt fixup cannot be linear, smashing..." msgstr "" -#: ../dgit:6260 +#: ../dgit:6312 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1537,115 +1536,115 @@ msgid "" "\n" msgstr "" -#: ../dgit:6267 +#: ../dgit:6319 msgid "quiltify linearisation planning successful, executing..." msgstr "" -#: ../dgit:6301 +#: ../dgit:6353 msgid "contains unexpected slashes\n" msgstr "" -#: ../dgit:6302 +#: ../dgit:6354 msgid "contains leading punctuation\n" msgstr "" -#: ../dgit:6303 +#: ../dgit:6355 msgid "contains bad character(s)\n" msgstr "" -#: ../dgit:6304 +#: ../dgit:6356 msgid "is series file\n" msgstr "" -#: ../dgit:6305 +#: ../dgit:6357 msgid "too long\n" msgstr "" -#: ../dgit:6309 +#: ../dgit:6361 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" -#: ../dgit:6338 +#: ../dgit:6390 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "" -#: ../dgit:6413 +#: ../dgit:6465 #, perl-format msgid "" "quilt mode %s does not make sense (or is not supported) with single-debian-" "patch" msgstr "" -#: ../dgit:6438 +#: ../dgit:6490 msgid "converted" msgstr "" -#: ../dgit:6439 +#: ../dgit:6491 #, perl-format msgid "dgit view: created (%s)" msgstr "" -#: ../dgit:6495 +#: ../dgit:6547 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" -#: ../dgit:6505 +#: ../dgit:6557 msgid "starting quiltify (single-debian-patch)" msgstr "" -#: ../dgit:6541 +#: ../dgit:6593 #, perl-format msgid "regenerating patch using git diff (--quilt=%s)" msgstr "" -#: ../dgit:6635 +#: ../dgit:6687 msgid "" "warning: package uses dpkg-source include-binaries feature - not all changes " "are visible in patches!\n" msgstr "" -#: ../dgit:6644 +#: ../dgit:6696 #, perl-format msgid "warning: ignoring bad include-binaries file %s: %s\n" msgstr "" -#: ../dgit:6647 +#: ../dgit:6699 #, perl-format msgid "forbidden path component '%s'" msgstr "" -#: ../dgit:6657 +#: ../dgit:6709 #, perl-format msgid "path starts with '%s'" msgstr "" -#: ../dgit:6667 +#: ../dgit:6719 #, perl-format msgid "path to '%s' not a plain file or directory" msgstr "" -#: ../dgit:6725 +#: ../dgit:6777 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" -#: ../dgit:6757 +#: ../dgit:6809 #, perl-format msgid "dgit view: found cached (%s)" msgstr "" -#: ../dgit:6762 +#: ../dgit:6814 msgid "dgit view: found cached, no changes required" msgstr "" -#: ../dgit:6797 +#: ../dgit:6849 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "" -#: ../dgit:6890 +#: ../dgit:6942 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" @@ -1653,74 +1652,74 @@ msgid "" " anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n" msgstr "" -#: ../dgit:6904 +#: ../dgit:6956 msgid "Tree already contains .pc - will delete it." msgstr "" -#: ../dgit:6938 +#: ../dgit:6990 msgid "baredebian quilt fixup: could not find any origs" msgstr "" -#: ../dgit:6951 +#: ../dgit:7003 msgid "tarball" msgstr "" -#: ../dgit:6969 +#: ../dgit:7021 #, perl-format msgid "Combine orig tarballs for %s %s" msgstr "" -#: ../dgit:6985 +#: ../dgit:7037 msgid "tarballs" msgstr "" -#: ../dgit:6999 +#: ../dgit:7051 msgid "upstream" msgstr "" -#: ../dgit:7023 +#: ../dgit:7075 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "" -#: ../dgit:7033 +#: ../dgit:7085 #, 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:7043 +#: ../dgit:7095 msgid "" "This has only a debian/ directory; you probably want --quilt=bare debian." msgstr "" -#: ../dgit:7047 +#: ../dgit:7099 msgid "This might be a patches-unapplied branch." msgstr "" -#: ../dgit:7050 +#: ../dgit:7102 msgid "This might be a patches-applied branch." msgstr "" -#: ../dgit:7053 +#: ../dgit:7105 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" -#: ../dgit:7056 +#: ../dgit:7108 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" -#: ../dgit:7060 +#: ../dgit:7112 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" -#: ../dgit:7071 +#: ../dgit:7123 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "" -#: ../dgit:7110 +#: ../dgit:7162 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1729,96 +1728,96 @@ msgid "" "\n" msgstr "" -#: ../dgit:7122 +#: ../dgit:7174 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" -#: ../dgit:7151 +#: ../dgit:7203 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:7163 +#: ../dgit:7215 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" -#: ../dgit:7166 +#: ../dgit:7218 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" -#: ../dgit:7169 +#: ../dgit:7221 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:7183 +#: ../dgit:7235 #, perl-format msgid "" "quilt mode %s (generally needs untracked upstream files)\n" "contradicts clean mode %s (which would delete them)\n" msgstr "" -#: ../dgit:7200 +#: ../dgit:7252 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" -#: ../dgit:7214 +#: ../dgit:7266 msgid "clean takes no additional arguments" msgstr "" -#: ../dgit:7233 +#: ../dgit:7285 #, perl-format msgid "-p specified package %s, but changelog says %s" msgstr "" -#: ../dgit:7243 +#: ../dgit:7295 msgid "" "dgit: --include-dirty is not supported with split view (including with view-" "splitting quilt modes)" msgstr "" -#: ../dgit:7251 +#: ../dgit:7303 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:7256 +#: ../dgit:7308 #, 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:7267 +#: ../dgit:7319 #, perl-format msgid "dgit: --quilt=%s, %s" msgstr "" -#: ../dgit:7271 +#: ../dgit:7323 msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian" msgstr "" -#: ../dgit:7306 +#: ../dgit:7358 #, perl-format msgid "remove old changes file %s: %s" msgstr "" -#: ../dgit:7308 +#: ../dgit:7360 #, perl-format msgid "would remove %s" msgstr "" -#: ../dgit:7326 +#: ../dgit:7378 #, perl-format msgid "warning: dgit option %s must be passed before %s on dgit command line\n" msgstr "" -#: ../dgit:7333 +#: ../dgit:7385 #, perl-format msgid "" "warning: option %s should probably be passed to dgit before %s sub-command " @@ -1826,54 +1825,54 @@ msgid "" "to %s\n" msgstr "" -#: ../dgit:7359 +#: ../dgit:7411 msgid "archive query failed (queried because --since-version not specified)" msgstr "" -#: ../dgit:7365 +#: ../dgit:7417 #, perl-format msgid "changelog will contain changes since %s" msgstr "" -#: ../dgit:7368 +#: ../dgit:7420 msgid "package seems new, not specifying -v" msgstr "" -#: ../dgit:7411 +#: ../dgit:7463 msgid "Wanted to build nothing!" msgstr "" -#: ../dgit:7449 +#: ../dgit:7501 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "" -#: ../dgit:7456 +#: ../dgit:7508 #, perl-format msgid "%s found in binaries changes file %s" msgstr "" -#: ../dgit:7463 +#: ../dgit:7515 #, perl-format msgid "%s unexpectedly not created by build" msgstr "" -#: ../dgit:7467 +#: ../dgit:7519 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "" -#: ../dgit:7472 +#: ../dgit:7524 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "" -#: ../dgit:7475 +#: ../dgit:7527 #, perl-format msgid "build successful, results in %s\n" msgstr "" -#: ../dgit:7488 +#: ../dgit:7540 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1881,156 +1880,156 @@ msgid "" "Suggest you delete %s.\n" msgstr "" -#: ../dgit:7506 +#: ../dgit:7558 msgid "build successful\n" msgstr "" -#: ../dgit:7514 +#: ../dgit:7566 #, 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:7625 +#: ../dgit:7677 #, perl-format msgid "remove %s: %s" msgstr "" -#: ../dgit:7632 +#: ../dgit:7684 msgid "--tag2upload-builder-mode needs split-brain mode" msgstr "" -#: ../dgit:7637 +#: ../dgit:7689 msgid "upstream tag and not commit, or vice-versa" msgstr "" -#: ../dgit:7693 +#: ../dgit:7745 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "" -#: ../dgit:7718 +#: ../dgit:7770 msgid "--include-dirty not supported with --tag2upload-builder-mode" msgstr "" -#: ../dgit:7731 +#: ../dgit:7783 msgid "source-only buildinfo" msgstr "" -#: ../dgit:7760 +#: ../dgit:7812 #, perl-format msgid "put in place new built file (%s): %s" msgstr "" -#: ../dgit:7777 +#: ../dgit:7840 msgid "build-source takes no additional arguments" msgstr "" -#: ../dgit:7781 +#: ../dgit:7845 #, perl-format msgid "source built, results in %s and %s" msgstr "" -#: ../dgit:7788 +#: ../dgit:7852 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" msgstr "" -#: ../dgit:7793 +#: ../dgit:7857 msgid "--tag2upload-builder-mode not supported with -C" msgstr "" -#: ../dgit:7796 +#: ../dgit:7860 msgid "source changes file" msgstr "" -#: ../dgit:7798 +#: ../dgit:7862 msgid "user-specified changes file is not source-only" msgstr "" -#: ../dgit:7818 ../dgit:7820 +#: ../dgit:7882 ../dgit:7884 #, perl-format msgid "%s (in build products dir): %s" msgstr "" -#: ../dgit:7834 +#: ../dgit:7898 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:7847 +#: ../dgit:7911 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" msgstr "" -#: ../dgit:7851 +#: ../dgit:7915 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:7881 +#: ../dgit:7945 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "" -#: ../dgit:7902 +#: ../dgit:7966 msgid "source tree" msgstr "" -#: ../dgit:7904 +#: ../dgit:7968 #, perl-format msgid "dgit: import-dsc: %s" msgstr "" -#: ../dgit:7917 +#: ../dgit:7981 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "" -#: ../dgit:7921 +#: ../dgit:7985 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "" -#: ../dgit:7925 +#: ../dgit:7989 msgid "dry run makes no sense with import-dsc" msgstr "" -#: ../dgit:7942 +#: ../dgit:8006 #, perl-format msgid "%s is checked out - will not update it" msgstr "" -#: ../dgit:7947 +#: ../dgit:8011 #, perl-format msgid "open import .dsc (%s): %s" msgstr "" -#: ../dgit:7949 +#: ../dgit:8013 #, perl-format msgid "read %s: %s" msgstr "" -#: ../dgit:7960 +#: ../dgit:8024 msgid "import-dsc signature check failed" msgstr "" -#: ../dgit:7963 +#: ../dgit:8027 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "" -#: ../dgit:7974 +#: ../dgit:8038 msgid "Dgit metadata in .dsc" msgstr "" -#: ../dgit:7985 +#: ../dgit:8049 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "" -#: ../dgit:7994 +#: ../dgit:8058 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -2038,21 +2037,21 @@ msgid "" "plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n" msgstr "" -#: ../dgit:8001 +#: ../dgit:8065 msgid "Not fast forward, forced update." msgstr "" -#: ../dgit:8003 +#: ../dgit:8067 #, perl-format msgid "Not fast forward to %s" msgstr "" -#: ../dgit:8008 +#: ../dgit:8072 #, perl-format msgid "updated git ref %s" msgstr "" -#: ../dgit:8013 +#: ../dgit:8077 #, perl-format msgid "" "Branch %s already exists\n" @@ -2060,129 +2059,179 @@ msgid "" "Specify +%s to overwrite, discarding existing history\n" msgstr "" -#: ../dgit:8033 +#: ../dgit:8097 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "" -#: ../dgit:8035 +#: ../dgit:8099 #, perl-format msgid "stat %s: %s" msgstr "" -#: ../dgit:8043 +#: ../dgit:8107 #, perl-format msgid "import %s requires %s, but: %s" msgstr "" -#: ../dgit:8062 +#: ../dgit:8126 #, perl-format msgid "cannot import %s which seems to be inside working tree!" msgstr "" -#: ../dgit:8066 +#: ../dgit:8130 #, perl-format msgid "symlink %s to %s: %s" msgstr "" -#: ../dgit:8067 +#: ../dgit:8131 #, perl-format msgid "made symlink %s -> %s" msgstr "" -#: ../dgit:8078 +#: ../dgit:8142 msgid "Import, forced update - synthetic orphan git history." msgstr "" -#: ../dgit:8080 +#: ../dgit:8144 msgid "Import, merging." msgstr "" -#: ../dgit:8094 +#: ../dgit:8158 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "" -#: ../dgit:8103 +#: ../dgit:8167 #, perl-format msgid "results are in git ref %s" msgstr "" -#: ../dgit:8110 +#: ../dgit:8174 msgid "need only 1 subpath argument" msgstr "" -#: ../dgit:8128 +#: ../dgit:8192 msgid "need destination argument" msgstr "" -#: ../dgit:8133 +#: ../dgit:8197 #, perl-format msgid "exec git clone: %s\n" msgstr "" -#: ../dgit:8141 +#: ../dgit:8205 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url" msgstr "" -#: ../dgit:8152 +#: ../dgit:8217 +msgid "package does not exist in target suite, looking in whole archive\n" +msgstr "" + +#: ../dgit:8224 +#, perl-format +msgid "package in target suite is different upstream version, %s\n" +msgstr "" + +#: ../dgit:8236 +msgid "suite has this upstream version, but no origs\n" +msgstr "" + +#: ../dgit:8240 +msgid "suite has origs for this upstream version\n" +msgstr "" + +#: ../dgit:8266 +#, perl-format +msgid "no .origs for package %s upstream version %s\n" +msgstr "" + +#: ../dgit:8298 +#, perl-format +msgid "multiple possibilities for orig component %s:\n" +msgstr "" + +#: ../dgit:8311 +msgid "failed to resolve, unambiguously, which .origs are intended\n" +msgstr "" + +#: ../dgit:8329 +#, perl-format +msgid "unknown long option to download-unfetched-origs `%s'" +msgstr "" + +#: ../dgit:8332 +msgid "download-unfetched-origs takes no non-option arguments" +msgstr "" + +#: ../dgit:8362 +#, perl-format +msgid "orig file is missing (404) at archive mirror: %s\n" +msgstr "" + +#: ../dgit:8369 +#, perl-format +msgid "%d orig file(s) could not be obtained\n" +msgstr "" + +#: ../dgit:8379 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "" -#: ../dgit:8158 +#: ../dgit:8385 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "" -#: ../dgit:8165 ../dgit:8171 +#: ../dgit:8392 ../dgit:8398 msgid "no arguments allowed to dgit setup-useremail" msgstr "" -#: ../dgit:8177 +#: ../dgit:8404 msgid "no arguments allowed to dgit setup-tree" msgstr "" -#: ../dgit:8228 +#: ../dgit:8459 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." msgstr "" -#: ../dgit:8267 +#: ../dgit:8501 #, perl-format msgid "%s needs a value" msgstr "" -#: ../dgit:8271 +#: ../dgit:8505 #, perl-format msgid "bad value `%s' for %s" msgstr "" -#: ../dgit:8380 +#: ../dgit:8614 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "" -#: ../dgit:8404 +#: ../dgit:8648 #, perl-format msgid "unknown long option `%s'" msgstr "" -#: ../dgit:8461 +#: ../dgit:8705 #, perl-format msgid "unknown short option `%s'" msgstr "" -#: ../dgit:8484 +#: ../dgit:8728 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "" -#: ../dgit:8488 +#: ../dgit:8732 #, perl-format msgid "%s is blocked\n" msgstr "" -#: ../dgit:8494 +#: ../dgit:8738 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -2190,64 +2239,64 @@ msgid "" "Giving up.\n" msgstr "" -#: ../dgit:8541 +#: ../dgit:8785 #, perl-format msgid "" "unsupported option `%s', cannot set command for %s (can only provide options)" msgstr "" -#: ../dgit:8546 +#: ../dgit:8790 #, perl-format msgid "" "unsupported option `%s', cannot provide additional options for %s (can only " "provide replacement command)" msgstr "" -#: ../dgit:8553 +#: ../dgit:8797 #, perl-format msgid "" "unsupported option `%s', cannot adjust options for %s (can only provide " "replacement command)" msgstr "" -#: ../dgit:8585 +#: ../dgit:8829 #, perl-format msgid "cannot set command for %s (can only provide options)" msgstr "" -#: ../dgit:8606 +#: ../dgit:8850 #, perl-format msgid "cannot configure options for %s (can only provide replacement command)" msgstr "" -#: ../dgit:8625 +#: ../dgit:8869 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "" -#: ../dgit:8637 +#: ../dgit:8881 #, perl-format msgid "unknown %s setting `%s'" msgstr "" -#: ../dgit:8650 +#: ../dgit:8894 msgid "--tag2upload-builder-mode implies --dep14tag-reuse=must" msgstr "" -#: ../dgit:8657 +#: ../dgit:8901 #, perl-format msgid "unknown dep14tag-reuse mode `%s'" msgstr "" -#: ../dgit:8680 +#: ../dgit:8924 msgid "DRY RUN ONLY\n" msgstr "" -#: ../dgit:8681 +#: ../dgit:8925 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" -#: ../dgit:8701 +#: ../dgit:8945 #, perl-format msgid "unknown operation %s" msgstr "" @@ -2968,93 +3017,93 @@ msgstr "" msgid "data block" msgstr "" -#: ../Debian/Dgit.pm:352 +#: ../Debian/Dgit.pm:324 #, perl-format msgid "error: %s\n" msgstr "" -#: ../Debian/Dgit.pm:378 +#: ../Debian/Dgit.pm:350 #, perl-format msgid "getcwd failed: %s\n" msgstr "" -#: ../Debian/Dgit.pm:397 +#: ../Debian/Dgit.pm:369 msgid "terminated, reporting successful completion" msgstr "" -#: ../Debian/Dgit.pm:399 +#: ../Debian/Dgit.pm:371 #, perl-format msgid "failed with error exit status %s" msgstr "" -#: ../Debian/Dgit.pm:402 +#: ../Debian/Dgit.pm:374 #, perl-format msgid "died due to fatal signal %s" msgstr "" -#: ../Debian/Dgit.pm:406 +#: ../Debian/Dgit.pm:378 #, perl-format msgid "failed with unknown wait status %s" msgstr "" -#: ../Debian/Dgit.pm:412 +#: ../Debian/Dgit.pm:384 msgid "failed command" msgstr "" -#: ../Debian/Dgit.pm:418 +#: ../Debian/Dgit.pm:390 #, perl-format msgid "failed to fork/exec: %s" msgstr "" -#: ../Debian/Dgit.pm:420 +#: ../Debian/Dgit.pm:392 #, perl-format msgid "subprocess %s" msgstr "" -#: ../Debian/Dgit.pm:422 +#: ../Debian/Dgit.pm:394 msgid "subprocess produced invalid output" msgstr "" -#: ../Debian/Dgit.pm:527 +#: ../Debian/Dgit.pm:499 msgid "stat source file: %S" msgstr "" -#: ../Debian/Dgit.pm:537 +#: ../Debian/Dgit.pm:509 msgid "stat destination file: %S" msgstr "" -#: ../Debian/Dgit.pm:556 +#: ../Debian/Dgit.pm:528 msgid "finally install file after cp: %S" msgstr "" -#: ../Debian/Dgit.pm:562 +#: ../Debian/Dgit.pm:534 msgid "delete old file after cp: %S" msgstr "" -#: ../Debian/Dgit.pm:585 +#: ../Debian/Dgit.pm:557 msgid "" "not in a git working tree?\n" "(git rev-parse --show-toplevel produced no output)\n" msgstr "" -#: ../Debian/Dgit.pm:588 +#: ../Debian/Dgit.pm:560 #, perl-format msgid "chdir toplevel %s: %s\n" msgstr "" -#: ../Debian/Dgit.pm:696 +#: ../Debian/Dgit.pm:668 msgid "git index contains changes (does not match HEAD)" msgstr "" -#: ../Debian/Dgit.pm:697 +#: ../Debian/Dgit.pm:669 msgid "working tree is dirty (does not match HEAD)" msgstr "" -#: ../Debian/Dgit.pm:722 +#: ../Debian/Dgit.pm:694 msgid "using specified upstream commitish" msgstr "" -#: ../Debian/Dgit.pm:729 +#: ../Debian/Dgit.pm:701 #, perl-format msgid "" "Could not determine appropriate upstream commitish.\n" @@ -3062,103 +3111,103 @@ msgid "" " Check version, and specify upstream commitish explicitly." msgstr "" -#: ../Debian/Dgit.pm:734 ../Debian/Dgit.pm:736 +#: ../Debian/Dgit.pm:706 ../Debian/Dgit.pm:708 #, perl-format msgid "using upstream from git tag %s" msgstr "" -#: ../Debian/Dgit.pm:850 +#: ../Debian/Dgit.pm:822 #, perl-format msgid "failed to remove directory tree %s: rm -rf: %s; %s\n" msgstr "" -#: ../Debian/Dgit.pm:885 +#: ../Debian/Dgit.pm:857 msgid "detached HEAD" msgstr "" -#: ../Debian/Dgit.pm:886 +#: ../Debian/Dgit.pm:858 msgid "HEAD symref is not to refs/" msgstr "" -#: ../Debian/Dgit.pm:902 +#: ../Debian/Dgit.pm:874 #, perl-format msgid "parsing of %s failed" msgstr "" -#: ../Debian/Dgit.pm:911 +#: ../Debian/Dgit.pm:883 #, 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:925 +#: ../Debian/Dgit.pm:897 #, perl-format msgid "open %s (%s): %s" msgstr "" -#: ../Debian/Dgit.pm:950 +#: ../Debian/Dgit.pm:922 #, perl-format msgid "missing field %s in %s" msgstr "" -#: ../Debian/Dgit.pm:1036 +#: ../Debian/Dgit.pm:1008 msgid "Dummy commit - do not use\n" msgstr "" -#: ../Debian/Dgit.pm:1057 +#: ../Debian/Dgit.pm:1029 #, perl-format msgid "exec %s: %s\n" msgstr "" -#: ../Debian/Dgit.pm:1085 +#: ../Debian/Dgit.pm:1057 #, perl-format msgid "Taint recorded at time %s for package %s" msgstr "" -#: ../Debian/Dgit.pm:1087 +#: ../Debian/Dgit.pm:1059 #, perl-format msgid "Taint recorded at time %s for any package" msgstr "" -#: ../Debian/Dgit.pm:1089 +#: ../Debian/Dgit.pm:1061 #, perl-format msgid "Taint recorded for package %s" msgstr "" -#: ../Debian/Dgit.pm:1091 +#: ../Debian/Dgit.pm:1063 msgid "Taint recorded for any package" msgstr "" -#: ../Debian/Dgit.pm:1103 +#: ../Debian/Dgit.pm:1075 msgid "Uncorrectable error. If confused, consult administrator.\n" msgstr "" -#: ../Debian/Dgit.pm:1106 +#: ../Debian/Dgit.pm:1078 msgid "Could perhaps be forced using --deliberately. Consult documentation.\n" msgstr "" -#: ../Debian/Dgit.pm:1109 +#: ../Debian/Dgit.pm:1081 #, perl-format msgid "Forcing due to %s\n" msgstr "" -#: ../Debian/Dgit.pm:1174 +#: ../Debian/Dgit.pm:1146 #, perl-format msgid "cannot stat %s/.git: %s" msgstr "" -#: ../Debian/Dgit.pm:1197 +#: ../Debian/Dgit.pm:1169 #, perl-format msgid "failed to mkdir playground parent %s: %s" msgstr "" -#: ../Debian/Dgit.pm:1205 +#: ../Debian/Dgit.pm:1177 #, perl-format msgid "failed to mkdir a playground %s: %s" msgstr "" -#: ../Debian/Dgit.pm:1214 +#: ../Debian/Dgit.pm:1186 #, perl-format msgid "failed to mkdir the playground %s: %s" msgstr "" diff -pruN 13.11+exp1/po/messages.pot 13.12/po/messages.pot --- 13.11+exp1/po/messages.pot 2025-08-10 18:58:53.000000000 +0000 +++ 13.12/po/messages.pot 2025-08-15 09:05:44.000000000 +0000 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dgit ongoing\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-05-07 18:40+0000\n" +"POT-Creation-Date: 2025-08-15 13:02+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,41 +17,41 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../dgit:296 +#: ../dgit:297 #, perl-format msgid "%s: invalid configuration: %s\n" msgstr "" -#: ../dgit:303 +#: ../dgit:304 msgid "warning: overriding problem due to --force:\n" msgstr "" -#: ../dgit:311 +#: ../dgit:313 #, perl-format msgid "warning: skipping checks or functionality due to --force-%s\n" msgstr "" -#: ../dgit:316 +#: ../dgit:318 #, perl-format msgid "%s: source package %s does not exist in suite %s\n" msgstr "" -#: ../dgit:589 +#: ../dgit:591 #, perl-format msgid "build host child %s" msgstr "" -#: ../dgit:648 +#: ../dgit:650 #, perl-format msgid "%s ok: %s" msgstr "" -#: ../dgit:650 +#: ../dgit:652 #, perl-format msgid "would be ok: %s (but dry run only)" msgstr "" -#: ../dgit:675 +#: ../dgit:677 msgid "" "main usages:\n" " dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n" @@ -72,147 +72,147 @@ msgid "" " -c= set git config option (used directly by dgit too)\n" msgstr "" -#: ../dgit:694 +#: ../dgit:696 msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n" msgstr "" -#: ../dgit:698 +#: ../dgit:700 #, perl-format msgid "" "%s: %s\n" "%s" msgstr "" -#: ../dgit:703 +#: ../dgit:705 msgid "too few arguments" msgstr "" -#: ../dgit:825 +#: ../dgit:827 #, perl-format msgid "multiple values for %s (in %s git config)" msgstr "" -#: ../dgit:828 +#: ../dgit:830 #, perl-format msgid "value for config option %s (in %s git config) contains newline(s)!" msgstr "" -#: ../dgit:848 +#: ../dgit:850 #, perl-format msgid "" "need value for one of: %s\n" "%s: distro or suite appears not to be (properly) supported" msgstr "" -#: ../dgit:905 +#: ../dgit:907 #, perl-format msgid "bad syntax for (nominal) distro `%s' (does not match %s)" msgstr "" -#: ../dgit:920 +#: ../dgit:922 #, perl-format msgid "backports-quirk needs % or ( )" msgstr "" -#: ../dgit:936 +#: ../dgit:938 #, perl-format msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'" msgstr "" -#: ../dgit:956 +#: ../dgit:958 msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)" msgstr "" -#: ../dgit:974 +#: ../dgit:976 #, perl-format msgid "unknown %s `%s'" msgstr "" -#: ../dgit:979 ../git-debrebase:1548 ../Debian/Dgit.pm:255 +#: ../dgit:981 ../git-debrebase:1548 ../Debian/Dgit/Core.pm:53 msgid "internal error" msgstr "" -#: ../dgit:981 +#: ../dgit:983 msgid "pushing but distro is configured readonly" msgstr "" -#: ../dgit:985 +#: ../dgit:987 msgid "" "Push failed, before we got started.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:1008 +#: ../dgit:1010 #, perl-format msgid "" "dgit: quilt mode `%s' (for format `%s') implies split view, but split-view " "set to `%s'" msgstr "" -#: ../dgit:1169 +#: ../dgit:1171 msgid "this operation does not support multiple comma-separated suites" msgstr "" -#: ../dgit:1237 +#: ../dgit:1250 #, perl-format msgid "fetch of %s failed (%s): %s" msgstr "" -#: ../dgit:1244 +#: ../dgit:1257 #, perl-format msgid "fetch of %s gave HTTP code %s" msgstr "" -#: ../dgit:1265 +#: ../dgit:1282 msgid "ftpmasterapi archive query method takes no data part" msgstr "" -#: ../dgit:1283 +#: ../dgit:1300 #, perl-format msgid "unknown suite %s, maybe -d would help" msgstr "" -#: ../dgit:1287 +#: ../dgit:1304 #, perl-format msgid "multiple matches for suite %s\n" msgstr "" -#: ../dgit:1289 +#: ../dgit:1306 #, perl-format msgid "suite %s info has no codename\n" msgstr "" -#: ../dgit:1291 +#: ../dgit:1308 #, perl-format msgid "suite %s maps to bad codename\n" msgstr "" -#: ../dgit:1293 ../dgit:1318 +#: ../dgit:1310 ../dgit:1335 msgid "bad ftpmaster api response: " msgstr "" -#: ../dgit:1307 +#: ../dgit:1324 #, perl-format msgid "bad version: %s\n" msgstr "" -#: ../dgit:1309 +#: ../dgit:1326 msgid "bad component" msgstr "" -#: ../dgit:1312 +#: ../dgit:1329 msgid "bad filename" msgstr "" -#: ../dgit:1314 +#: ../dgit:1331 msgid "bad sha256sum" msgstr "" -#: ../dgit:1365 +#: ../dgit:1384 msgid "aptget archive query method takes no data part" msgstr "" -#: ../dgit:1449 +#: ../dgit:1468 #, perl-format msgid "" "apt seemed to not to update dgit's cached Release files for %s.\n" @@ -220,164 +220,164 @@ msgid "" " is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n" msgstr "" -#: ../dgit:1473 +#: ../dgit:1492 #, perl-format msgid "Release file (%s) specifies intolerable %s" msgstr "" -#: ../dgit:1499 +#: ../dgit:1518 msgid "apt-get source did not produce a .dsc" msgstr "" -#: ../dgit:1500 +#: ../dgit:1519 #, perl-format msgid "apt-get source produced several .dscs (%s)" msgstr "" -#: ../dgit:1605 +#: ../dgit:1624 #, perl-format msgid "" "unable to canonicalise suite using package %s which does not appear to exist " "in suite %s; --existing-package may help" msgstr "" -#: ../dgit:1744 +#: ../dgit:1763 #, perl-format msgid "cannot operate on %s suite" msgstr "" -#: ../dgit:1747 +#: ../dgit:1766 #, perl-format msgid "canonical suite name for %s is %s" msgstr "" -#: ../dgit:1749 +#: ../dgit:1768 #, perl-format msgid "canonical suite name is %s" msgstr "" -#: ../dgit:1769 +#: ../dgit:1788 #, perl-format msgid "%s has hash %s but archive told us to expect %s" msgstr "" -#: ../dgit:1775 +#: ../dgit:1794 #, perl-format msgid "unsupported source format %s, sorry" msgstr "" -#: ../dgit:1802 +#: ../dgit:1821 #, perl-format msgid "diverting to %s (using config for %s)" msgstr "" -#: ../dgit:1825 +#: ../dgit:1844 #, perl-format msgid "unknown git-check `%s'" msgstr "" -#: ../dgit:1840 +#: ../dgit:1859 #, perl-format msgid "unknown git-create `%s'" msgstr "" -#: ../dgit:1884 +#: ../dgit:1903 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "" -#: ../dgit:1930 +#: ../dgit:1945 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "" -#: ../dgit:1941 +#: ../dgit:1957 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "" -#: ../dgit:1987 +#: ../dgit:2003 #, perl-format msgid "hash or size of %s varies in %s fields (between: %s)" msgstr "" -#: ../dgit:1996 +#: ../dgit:2012 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "" -#: ../dgit:2000 +#: ../dgit:2016 #, perl-format msgid "%s has no files list field(s)" msgstr "" -#: ../dgit:2006 +#: ../dgit:2022 #, perl-format msgid "no file appears in all file lists (looked in: %s)" msgstr "" -#: ../dgit:2046 +#: ../dgit:2062 #, perl-format msgid "purportedly source-only changes has Architecture: %s\n" msgstr "" -#: ../dgit:2057 +#: ../dgit:2073 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "" -#: ../dgit:2069 +#: ../dgit:2085 msgid "cannot find section/priority from .changes Files field" msgstr "" -#: ../dgit:2082 +#: ../dgit:2098 msgid "" "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n" msgstr "" -#: ../dgit:2098 +#: ../dgit:2114 #, perl-format msgid ".dsc %s missing entry for %s" msgstr "" -#: ../dgit:2103 +#: ../dgit:2119 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "" -#: ../dgit:2111 +#: ../dgit:2127 #, perl-format msgid "archive %s: %s" msgstr "" -#: ../dgit:2118 +#: ../dgit:2134 #, perl-format msgid "archive contains %s with different checksum" msgstr "" -#: ../dgit:2146 +#: ../dgit:2162 #, perl-format msgid "edited .changes for archive .orig contents: %s %s" msgstr "" -#: ../dgit:2154 +#: ../dgit:2170 #, perl-format msgid "[new .changes left in %s]" msgstr "" -#: ../dgit:2157 +#: ../dgit:2173 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "" -#: ../dgit:2179 +#: ../dgit:2195 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " "Maintainer field)" msgstr "" -#: ../dgit:2202 +#: ../dgit:2218 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -392,129 +392,129 @@ msgid "" "\n" msgstr "" -#: ../dgit:2214 +#: ../dgit:2230 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" msgstr "" -#: ../dgit:2245 +#: ../dgit:2261 msgid "Dpkg::Vendor `current vendor'" msgstr "" -#: ../dgit:2247 +#: ../dgit:2263 msgid "(base) distro being accessed" msgstr "" -#: ../dgit:2249 +#: ../dgit:2265 msgid "(nominal) distro being accessed" msgstr "" -#: ../dgit:2254 +#: ../dgit:2270 #, perl-format msgid "build-products-dir %s is not accessible: %s\n" msgstr "" -#: ../dgit:2292 +#: ../dgit:2308 #, perl-format msgid "%s: multiple representations of similar orig %s:\n" msgstr "" -#: ../dgit:2296 +#: ../dgit:2312 #, perl-format msgid " %s: in %s (%s)\n" msgstr "" -#: ../dgit:2301 +#: ../dgit:2317 msgid "Duplicate/inconsistent orig tarballs. Delete the spurious ones." msgstr "" -#: ../dgit:2318 +#: ../dgit:2334 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" msgstr "" -#: ../dgit:2322 +#: ../dgit:2338 #, perl-format msgid "check orig file %s in bpd %s: %s" msgstr "" -#: ../dgit:2324 +#: ../dgit:2340 #, perl-format msgid "check orig file %s in ..: %s" msgstr "" -#: ../dgit:2327 +#: ../dgit:2343 #, perl-format msgid "check target of orig symlink %s in ..: %s" msgstr "" -#: ../dgit:2336 +#: ../dgit:2352 #, perl-format msgid "%s: cloned orig symlink from ..: %s\n" msgstr "" -#: ../dgit:2340 +#: ../dgit:2356 #, perl-format msgid "%s: hardlinked orig from ..: %s\n" msgstr "" -#: ../dgit:2343 +#: ../dgit:2359 #, perl-format msgid "failed to make %s a hardlink to %s: %s" msgstr "" -#: ../dgit:2349 +#: ../dgit:2365 #, perl-format msgid "%s: symmlinked orig from .. on other filesystem: %s\n" msgstr "" -#: ../dgit:2364 +#: ../dgit:2380 msgid "package changelog" msgstr "" -#: ../dgit:2469 +#: ../dgit:2485 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "" -#: ../dgit:2532 +#: ../dgit:2548 msgid "package changelog has no entries!" msgstr "" -#: ../dgit:2537 +#: ../dgit:2553 #, perl-format msgid "" "warning: unable to find/parse changelog entry for first import of %s:\n" "%s\n" msgstr "" -#: ../dgit:2608 ../dgit:2613 +#: ../dgit:2624 ../dgit:2629 #, perl-format msgid "accessing %s: %s" msgstr "" -#: ../dgit:2630 ../dgit:2637 +#: ../dgit:2646 ../dgit:2653 #, perl-format msgid "saving %s: %s" msgstr "" -#: ../dgit:2663 ../dgit:6701 +#: ../dgit:2679 ../dgit:6753 msgid "source package" msgstr "" -#: ../dgit:2743 +#: ../dgit:2759 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "" -#: ../dgit:2796 +#: ../dgit:2812 #, perl-format msgid "%s failed: %s\n" msgstr "" -#: ../dgit:2814 +#: ../dgit:2830 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -523,16 +523,16 @@ msgid "" " dpkg-source --before-build gave tree %s\n" msgstr "" -#: ../dgit:2834 +#: ../dgit:2850 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "" -#: ../dgit:2838 +#: ../dgit:2854 msgid "Import of source package" msgstr "" -#: ../dgit:2858 +#: ../dgit:2874 #, perl-format msgid "" "\n" @@ -541,44 +541,43 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:2900 +#: ../dgit:2924 #, perl-format msgid "using existing %s" msgstr "" -#: ../dgit:2904 +#: ../dgit:2928 #, perl-format msgid "" -"file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " +"file %s has hash %s but we need hash %s (perhaps you should delete this " "file?)" msgstr "" -#: ../dgit:2908 +#: ../dgit:2932 #, perl-format msgid "need to fetch correct version of %s" msgstr "" -#: ../dgit:2924 +#: ../dgit:2958 #, perl-format -msgid "" -"file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" +msgid "file %s has hash %s but we need hash %s (got wrong file from archive!)" msgstr "" -#: ../dgit:3019 +#: ../dgit:3055 msgid "too many iterations trying to get sane fetch!" msgstr "" -#: ../dgit:3034 +#: ../dgit:3070 #, perl-format msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n" msgstr "" -#: ../dgit:3078 +#: ../dgit:3114 #, perl-format msgid "warning: git fetch %s created %s; this is silly, deleting it.\n" msgstr "" -#: ../dgit:3093 +#: ../dgit:3129 #, perl-format msgid "" "--dry-run specified but we actually wanted the results of git fetch,\n" @@ -586,7 +585,7 @@ msgid "" "or using --damp-run instead of --dry-run. (Wanted: %s.)\n" msgstr "" -#: ../dgit:3098 +#: ../dgit:3134 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -596,24 +595,24 @@ msgid "" "warning: Will try again...\n" msgstr "" -#: ../dgit:3245 +#: ../dgit:3281 #, perl-format msgid "not chasing .dsc distro %s: not fetching %s" msgstr "" -#: ../dgit:3250 +#: ../dgit:3286 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr "" -#: ../dgit:3255 +#: ../dgit:3291 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" "for which we have no configured url and .dsc provides no hint\n" msgstr "" -#: ../dgit:3265 +#: ../dgit:3301 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -622,54 +621,54 @@ msgid "" "(can be overridden by config - consult documentation)\n" msgstr "" -#: ../dgit:3285 +#: ../dgit:3321 msgid "rewrite map" msgstr "" -#: ../dgit:3292 +#: ../dgit:3328 msgid "server's git history rewrite map contains a relevant entry!" msgstr "" -#: ../dgit:3296 +#: ../dgit:3332 msgid "using rewritten git hash in place of .dsc value" msgstr "" -#: ../dgit:3298 +#: ../dgit:3334 msgid "server data says .dsc hash is to be disregarded" msgstr "" -#: ../dgit:3305 +#: ../dgit:3341 msgid "additional commits" msgstr "" -#: ../dgit:3308 +#: ../dgit:3344 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" "but we could not obtain that object anywhere.\n" msgstr "" -#: ../dgit:3333 +#: ../dgit:3369 msgid "last upload to archive" msgstr "" -#: ../dgit:3337 +#: ../dgit:3373 msgid "no version available from the archive" msgstr "" -#: ../dgit:3420 +#: ../dgit:3456 msgid "dgit suite branch on dgit git server" msgstr "" -#: ../dgit:3427 +#: ../dgit:3463 msgid "dgit client's archive history view" msgstr "" -#: ../dgit:3432 +#: ../dgit:3468 msgid "Dgit field in .dsc from archive" msgstr "" -#: ../dgit:3460 +#: ../dgit:3496 #, perl-format msgid "" "\n" @@ -679,15 +678,15 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3473 +#: ../dgit:3509 msgid "archive .dsc names newer git commit" msgstr "" -#: ../dgit:3476 +#: ../dgit:3512 msgid "archive .dsc names other git commit, fixing up" msgstr "" -#: ../dgit:3497 +#: ../dgit:3533 #, perl-format msgid "" "\n" @@ -695,7 +694,7 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3506 +#: ../dgit:3542 #, perl-format msgid "" "\n" @@ -705,7 +704,7 @@ msgid "" "\n" msgstr "" -#: ../dgit:3591 +#: ../dgit:3627 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -713,19 +712,19 @@ msgid "" "Record that\n" msgstr "" -#: ../dgit:3604 +#: ../dgit:3640 msgid "should be treated as descended from\n" msgstr "" -#: ../dgit:3622 +#: ../dgit:3658 msgid "dgit repo server tip (last push)" msgstr "" -#: ../dgit:3624 +#: ../dgit:3660 msgid "local tracking tip (last fetch)" msgstr "" -#: ../dgit:3635 +#: ../dgit:3671 #, perl-format msgid "" "\n" @@ -735,30 +734,30 @@ msgid "" "\n" msgstr "" -#: ../dgit:3650 +#: ../dgit:3686 msgid "fetched source tree" msgstr "" -#: ../dgit:3686 +#: ../dgit:3722 msgid "debian/changelog merge driver" msgstr "" -#: ../dgit:3751 +#: ../dgit:3787 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" msgstr "" -#: ../dgit:3765 +#: ../dgit:3801 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n" msgstr "" -#: ../dgit:3780 +#: ../dgit:3816 #, perl-format msgid "install %s: %s" msgstr "" -#: ../dgit:3807 +#: ../dgit:3843 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -766,30 +765,30 @@ msgid "" "tree.\n" msgstr "" -#: ../dgit:3829 +#: ../dgit:3865 #, perl-format msgid "fetching %s..." msgstr "" -#: ../dgit:3837 +#: ../dgit:3873 #, perl-format msgid "failed to obtain %s: %s" msgstr "" -#: ../dgit:3876 +#: ../dgit:3912 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "" -#: ../dgit:3908 +#: ../dgit:3944 msgid "local combined tracking branch" msgstr "" -#: ../dgit:3910 +#: ../dgit:3946 msgid "archive seems to have rewound: local tracking branch is ahead!" msgstr "" -#: ../dgit:3949 +#: ../dgit:3985 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -797,7 +796,7 @@ msgid "" "Input branches:\n" msgstr "" -#: ../dgit:3963 +#: ../dgit:3999 msgid "" "\n" "Key\n" @@ -806,300 +805,325 @@ msgid "" "\n" msgstr "" -#: ../dgit:3978 +#: ../dgit:4014 #, perl-format msgid "calculated combined tracking suite %s" msgstr "" -#: ../dgit:3996 +#: ../dgit:4032 #, perl-format msgid "ready for work in %s" msgstr "" -#: ../dgit:4014 +#: ../dgit:4050 msgid "dry run makes no sense with clone" msgstr "" -#: ../dgit:4029 +#: ../dgit:4065 #, perl-format msgid "create `%s': %s" msgstr "" -#: ../dgit:4041 +#: ../dgit:4077 msgid "fetching existing git history" msgstr "" -#: ../dgit:4044 +#: ../dgit:4080 msgid "starting new git history" msgstr "" -#: ../dgit:4069 +#: ../dgit:4105 #, perl-format msgid "" "FYI: Vcs-Git in %s has different url to your vcs-git remote.\n" " Your vcs-git remote url may be out of date. Use dgit update-vcs-git ?\n" msgstr "" -#: ../dgit:4074 +#: ../dgit:4110 #, perl-format msgid "fetched into %s" msgstr "" -#: ../dgit:4087 +#: ../dgit:4123 #, perl-format msgid "Merge from %s [dgit]" msgstr "" -#: ../dgit:4089 +#: ../dgit:4125 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "" -#: ../dgit:4097 +#: ../dgit:4133 #, perl-format msgid "git tree contains %s" msgstr "" -#: ../dgit:4108 +#: ../dgit:4144 msgid "you have uncommitted changes to critical files, cannot continue:\n" msgstr "" -#: ../dgit:4127 +#: ../dgit:4163 #, perl-format msgid "" "quilt fixup required but quilt mode is `nofix'\n" "HEAD commit%s differs from tree implied by debian/patches%s" msgstr "" -#: ../dgit:4144 +#: ../dgit:4180 msgid "nothing quilty to commit, ok." msgstr "" -#: ../dgit:4147 +#: ../dgit:4183 msgid " (wanted to commit patch update)" msgstr "" -#: ../dgit:4151 +#: ../dgit:4187 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" msgstr "" -#: ../dgit:4189 +#: ../dgit:4225 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" msgstr "" -#: ../dgit:4194 +#: ../dgit:4230 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "" -#: ../dgit:4204 +#: ../dgit:4241 #, perl-format msgid "commit id %s" msgstr "" -#: ../dgit:4210 +#: ../dgit:4247 #, perl-format msgid "and left in %s" msgstr "" -#: ../dgit:4236 +#: ../dgit:4273 #, perl-format msgid "Wanted tag %s (%s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4239 +#: ../dgit:4276 #, perl-format msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4247 +#: ../dgit:4284 #, perl-format msgid "%s (%s) .. %s (%s) is not fast forward\n" msgstr "" -#: ../dgit:4256 +#: ../dgit:4293 msgid "version currently in archive" msgstr "" -#: ../dgit:4265 +#: ../dgit:4302 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" -#: ../dgit:4274 +#: ../dgit:4311 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "" -#: ../dgit:4285 +#: ../dgit:4322 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "" -#: ../dgit:4288 +#: ../dgit:4325 #, perl-format msgid "" "%s is %s\n" "Your tree seems to based on earlier (not uploaded) %s.\n" msgstr "" -#: ../dgit:4293 +#: ../dgit:4330 #, perl-format msgid "" "d/changelog entry for %s is unfinalised!\n" "Your tree seems to based on earlier (not uploaded) %s.\n" msgstr "" -#: ../dgit:4307 +#: ../dgit:4344 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "" -#: ../dgit:4363 +#: ../dgit:4400 msgid "Checking that HEAD includes all changes in archive..." msgstr "" -#: ../dgit:4372 +#: ../dgit:4409 msgid "maintainer view tag" msgstr "" -#: ../dgit:4374 +#: ../dgit:4411 msgid "dgit view tag" msgstr "" -#: ../dgit:4375 +#: ../dgit:4412 msgid "current archive contents" msgstr "" -#: ../dgit:4388 +#: ../dgit:4425 msgid "" "| Not fast forward; maybe --trust-changelog is needed ? Please see " "dgit(1).\n" msgstr "" -#: ../dgit:4398 +#: ../dgit:4435 #, perl-format msgid "Declare fast forward from %s\n" msgstr "" -#: ../dgit:4399 +#: ../dgit:4436 #, perl-format msgid "Make fast forward from %s\n" msgstr "" -#: ../dgit:4403 +#: ../dgit:4440 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "" -#: ../dgit:4416 +#: ../dgit:4453 #, perl-format msgid "Declare fast forward from %s" msgstr "" -#: ../dgit:4424 +#: ../dgit:4461 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "" -#: ../dgit:4439 +#: ../dgit:4476 #, perl-format msgid "%s field `%s' is not expected `%s'" msgstr "" -#: ../dgit:4471 +#: ../dgit:4508 #, perl-format msgid "%s is for %s %s but debian/changelog is for %s %s" msgstr "" -#: ../dgit:4514 +#: ../dgit:4551 #, perl-format msgid "DEP-14 tag %s does not exist (--dep14tag-reuse=%s)" msgstr "" -#: ../dgit:4528 +#: ../dgit:4565 #, perl-format msgid "" "%s: making fresh DEP-14 tag %s (--dep14tag-reuse=%s), since existing tag " "unsuitable: %s" msgstr "" -#: ../dgit:4538 +#: ../dgit:4575 #, perl-format msgid "existing DEP-14 tag %s is unsuitable (--dep14tag-reuse=%s): %s" msgstr "" -#: ../dgit:4559 +#: ../dgit:4596 #, perl-format msgid "refers to commit %s, not %s" msgstr "" -#: ../dgit:4569 +#: ../dgit:4606 #, perl-format msgid "verification failed: git verify-tag: %s" msgstr "" -#: ../dgit:4623 +#: ../dgit:4656 +#, perl-format +msgid "checking that %s corresponds to HEAD" +msgstr "" + +#: ../dgit:4695 ../dgit:4707 +#, perl-format +msgid "HEAD specifies a different tree to %s:\n" +msgstr "" + +#: ../dgit:4701 +#, perl-format +msgid "" +"There is a problem with your source tree (see dgit(7) for some hints).\n" +"To see a full diff, run git diff %s %s\n" +msgstr "" + +#: ../dgit:4711 +#, perl-format +msgid "" +"Perhaps you forgot to build. Or perhaps there is a problem with your\n" +" source tree (see dgit(7) for some hints). To see a full diff, run\n" +" git diff %s %s\n" +msgstr "" + +#: ../dgit:4730 #, perl-format msgid "%s already contains field %s" msgstr "" -#: ../dgit:4655 +#: ../dgit:4763 #, perl-format msgid "changes field %s `%s' does not match changelog `%s'" msgstr "" -#: ../dgit:4711 +#: ../dgit:4819 #, perl-format msgid "(maintainer view tag generated by dgit --quilt=%s)\n" msgstr "" -#: ../dgit:4784 +#: ../dgit:4892 #, perl-format msgid "" "warning: server says object %s type %s is tainted, but here it has type %s\n" msgstr "" -#: ../dgit:4817 +#: ../dgit:4925 msgid "commit" msgstr "" -#: ../dgit:4819 +#: ../dgit:4927 #, perl-format msgid "object within commit %s" msgstr "" -#: ../dgit:4827 +#: ../dgit:4935 msgid "pushing tainted objects (which server would reject)" msgstr "" -#: ../dgit:4835 +#: ../dgit:4943 msgid "" "Push failed, while checking state of the archive.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:4845 +#: ../dgit:4953 msgid "" "package appears to be new in this suite; if this is intentional, use --new" msgstr "" -#: ../dgit:4850 +#: ../dgit:4958 msgid "" "Push failed, while preparing your push.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:4869 +#: ../dgit:4977 #, perl-format msgid "looked for .dsc %s, but %s; maybe you forgot to build" msgstr "" -#: ../dgit:4885 +#: ../dgit:4993 #, perl-format msgid "" "Branch is managed by git-debrebase (%s\n" @@ -1108,7 +1132,7 @@ msgid "" "Or, maybe, run git-debrebase forget-was-ever-debrebase.\n" msgstr "" -#: ../dgit:4904 +#: ../dgit:5012 #, perl-format msgid "" "You seem to be trying to push an old version.\n" @@ -1116,14 +1140,14 @@ msgid "" "Version you are trying to upload: %s\n" msgstr "" -#: ../dgit:4918 +#: ../dgit:5026 #, perl-format msgid "" "--quilt=%s but no cached dgit view:\n" " perhaps HEAD changed since dgit build[-source] ?" msgstr "" -#: ../dgit:4954 +#: ../dgit:5062 msgid "" "dgit push: HEAD is not a descendant of the archive's version.\n" "To overwrite the archive's contents, pass --trust-changelog, or --" @@ -1132,7 +1156,7 @@ msgid "" "forward." msgstr "" -#: ../dgit:4969 +#: ../dgit:5077 #, perl-format msgid "" "\n" @@ -1141,87 +1165,62 @@ msgid "" "add a new changelog stanza for a new version number and try again.\n" msgstr "" -#: ../dgit:4975 +#: ../dgit:5083 #, perl-format msgid "Tag %s already exists.\n" msgstr "" -#: ../dgit:4980 -#, perl-format -msgid "checking that %s corresponds to HEAD" -msgstr "" - -#: ../dgit:5014 ../dgit:5026 -#, perl-format -msgid "HEAD specifies a different tree to %s:\n" -msgstr "" - -#: ../dgit:5020 -#, perl-format -msgid "" -"There is a problem with your source tree (see dgit(7) for some hints).\n" -"To see a full diff, run git diff %s %s\n" -msgstr "" - -#: ../dgit:5030 -#, perl-format -msgid "" -"Perhaps you forgot to build. Or perhaps there is a problem with your\n" -" source tree (see dgit(7) for some hints). To see a full diff, run\n" -" git diff %s %s\n" -msgstr "" - -#: ../dgit:5041 +#: ../dgit:5093 #, perl-format msgid "" "failed to find unique changes file (looked for %s in %s); perhaps you need " "to use dgit -C" msgstr "" -#: ../dgit:5063 +#: ../dgit:5115 msgid "uploading binaries, although distro policy is source only" msgstr "" -#: ../dgit:5067 +#: ../dgit:5119 msgid "source-only upload, although distro policy requires .debs" msgstr "" -#: ../dgit:5071 +#: ../dgit:5123 #, perl-format msgid "" "source-only upload, though package appears entirely NEW\n" "(this is probably contrary to policy in %s)" msgstr "" -#: ../dgit:5078 +#: ../dgit:5130 #, perl-format msgid "unknown source-only-uploads policy `%s'" msgstr "" -#: ../dgit:5085 +#: ../dgit:5137 #, perl-format msgid "policy-query-supported-ssh value '%s' must be false/true/unknown" msgstr "" -#: ../dgit:5148 +#: ../dgit:5200 msgid "" "Push failed, while signing the tag.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:5175 +#: ../dgit:5227 msgid "" "Push failed, *after* signing the tag.\n" "If you want to try again, you should use a new version number.\n" msgstr "" -#: ../dgit:5194 +#: ../dgit:5246 msgid "" "Push failed, while updating the remote git repository - see messages above.\n" "If you want to try again, you should use a new version number.\n" msgstr "" -#: ../dgit:5211 +#: ../dgit:5263 msgid "" "Push failed, while obtaining signatures on the .changes and .dsc.\n" "If it was just that the signature failed, you may try again by using\n" @@ -1230,12 +1229,12 @@ msgid "" "If you need to change the package, you must use a new version number.\n" msgstr "" -#: ../dgit:5229 +#: ../dgit:5281 #, perl-format msgid "[new .dsc & .changes left in %s.tmp, %s.tmp]" msgstr "" -#: ../dgit:5236 +#: ../dgit:5288 #, perl-format msgid "" "Push failed, while uploading package(s) to the archive server.\n" @@ -1245,181 +1244,181 @@ msgid "" "number for your next attempt at the upload.\n" msgstr "" -#: ../dgit:5245 +#: ../dgit:5297 #, perl-format msgid "pushed and uploaded %s" msgstr "" -#: ../dgit:5257 +#: ../dgit:5309 msgid "-p is not allowed with clone; specify as argument instead" msgstr "" -#: ../dgit:5268 +#: ../dgit:5320 msgid "incorrect arguments to dgit clone" msgstr "" -#: ../dgit:5274 ../git-debrebase:1811 +#: ../dgit:5326 ../git-debrebase:1811 #, perl-format msgid "%s already exists" msgstr "" -#: ../dgit:5288 +#: ../dgit:5340 #, perl-format msgid "remove %s: %s\n" msgstr "" -#: ../dgit:5292 +#: ../dgit:5344 #, perl-format msgid "check whether to remove %s: %s\n" msgstr "" -#: ../dgit:5330 +#: ../dgit:5382 msgid "incorrect arguments to dgit fetch or dgit pull" msgstr "" -#: ../dgit:5348 +#: ../dgit:5400 msgid "" "dgit pull not yet supported in split view mode (including with view-" "splitting quilt modes)\n" msgstr "" -#: ../dgit:5357 +#: ../dgit:5409 msgid "dgit checkout needs a suite argument" msgstr "" -#: ../dgit:5420 +#: ../dgit:5472 #, perl-format msgid "setting up vcs-git: %s\n" msgstr "" -#: ../dgit:5423 +#: ../dgit:5475 #, perl-format msgid "vcs git unchanged: %s\n" msgstr "" -#: ../dgit:5425 +#: ../dgit:5477 #, perl-format msgid "changing vcs-git url to: %s\n" msgstr "" -#: ../dgit:5430 +#: ../dgit:5482 #, perl-format msgid "fetching (%s)\n" msgstr "" -#: ../dgit:5446 +#: ../dgit:5498 #, perl-format msgid "incorrect arguments to dgit %s" msgstr "" -#: ../dgit:5457 +#: ../dgit:5509 #, perl-format msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s" msgstr "" -#: ../dgit:5481 +#: ../dgit:5533 #, perl-format msgid "dgit push, but dgit.default.push-subcmd set to %s" msgstr "" -#: ../dgit:5489 +#: ../dgit:5541 #, perl-format msgid "dgit rpush, but dgit.default.[r]push-subcmd set to %s" msgstr "" -#: ../dgit:5502 +#: ../dgit:5554 #, perl-format msgid "" "warning: \"dgit %s\" currently means \"dgit %s-built\" (by default)\n" "warning: but is going to change to \"dgit %s-source\". See dgit!(1).\n" msgstr "" -#: ../dgit:5542 +#: ../dgit:5594 #, perl-format msgid "" "build host has dgit rpush protocol versions %s but invocation host has %s" msgstr "" -#: ../dgit:5626 +#: ../dgit:5678 #, perl-format msgid "create %s: %s" msgstr "" -#: ../dgit:5672 +#: ../dgit:5724 #, perl-format msgid "build host child failed: %s" msgstr "" -#: ../dgit:5675 +#: ../dgit:5727 msgid "all done\n" msgstr "" -#: ../dgit:5684 +#: ../dgit:5736 #, perl-format msgid "file %s (%s) twice" msgstr "" -#: ../dgit:5690 +#: ../dgit:5742 msgid "bad param spec" msgstr "" -#: ../dgit:5696 +#: ../dgit:5748 msgid "bad previously spec" msgstr "" -#: ../dgit:5768 +#: ../dgit:5820 #, perl-format msgid "buildinfo mismatch in field %s" msgstr "" -#: ../dgit:5771 +#: ../dgit:5823 msgid "buildinfo mismatch in field Architecture" msgstr "" -#: ../dgit:5773 +#: ../dgit:5825 #, perl-format msgid "buildinfo contains forbidden field %s" msgstr "" -#: ../dgit:5795 +#: ../dgit:5847 msgid "build-host-supplied changes file is not source-only" msgstr "" -#: ../dgit:5825 +#: ../dgit:5877 msgid "remote changes file" msgstr "" -#: ../dgit:5908 +#: ../dgit:5960 msgid "not a plain file\n" msgstr "" -#: ../dgit:5914 +#: ../dgit:5966 msgid "mode or type changed in unsupported way\n" msgstr "" -#: ../dgit:5917 +#: ../dgit:5969 msgid "modified symlink\n" msgstr "" -#: ../dgit:5920 +#: ../dgit:5972 msgid "deletion of symlink\n" msgstr "" -#: ../dgit:5924 +#: ../dgit:5976 msgid "creation with non-default mode, or symlink\n" msgstr "" -#: ../dgit:5952 +#: ../dgit:6004 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "" -#: ../dgit:5957 +#: ../dgit:6009 msgid "" "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" msgstr "" -#: ../dgit:5995 +#: ../dgit:6047 #, perl-format msgid "" "\n" @@ -1427,36 +1426,36 @@ msgid "" " %s\n" msgstr "" -#: ../dgit:6002 +#: ../dgit:6054 #, perl-format msgid "" "--quilt=%s specified, implying patches-unapplied git tree\n" " but git tree differs from orig in upstream files." msgstr "" -#: ../dgit:6008 +#: ../dgit:6060 msgid "" "\n" " ... debian/patches is missing; perhaps this is a patch queue branch?" msgstr "" -#: ../dgit:6015 +#: ../dgit:6067 #, 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:6029 +#: ../dgit:6081 #, perl-format msgid "Combine debian/ with upstream source for %s\n" msgstr "" -#: ../dgit:6037 +#: ../dgit:6089 msgid "dgit view: creating patches-applied version using gbp pq" msgstr "" -#: ../dgit:6048 +#: ../dgit:6100 #, perl-format msgid "" "--quilt=%s specified, implying that HEAD is for use with a\n" @@ -1464,16 +1463,16 @@ msgid "" " .gitignores: but, such patches exist in debian/patches.\n" msgstr "" -#: ../dgit:6056 +#: ../dgit:6108 msgid "dgit view: creating patch to represent .gitignore changes" msgstr "" -#: ../dgit:6061 +#: ../dgit:6113 #, perl-format msgid "%s already exists; but want to create it to record .gitignore changes" msgstr "" -#: ../dgit:6067 +#: ../dgit:6119 msgid "" "Subject: Update .gitignore from Debian packaging branch\n" "\n" @@ -1482,54 +1481,54 @@ msgid "" "updates to users of the official Debian archive view of the package.\n" msgstr "" -#: ../dgit:6090 +#: ../dgit:6142 msgid "Commit patch to update .gitignore\n" msgstr "" -#: ../dgit:6160 +#: ../dgit:6212 msgid "maximum search space exceeded" msgstr "" -#: ../dgit:6178 +#: ../dgit:6230 #, perl-format msgid "has %s not %s" msgstr "" -#: ../dgit:6187 +#: ../dgit:6239 msgid "root commit" msgstr "" -#: ../dgit:6193 +#: ../dgit:6245 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "" -#: ../dgit:6205 +#: ../dgit:6257 #, perl-format msgid "changed %s" msgstr "" -#: ../dgit:6224 +#: ../dgit:6276 #, perl-format msgid "" "\n" "%s: error: quilt fixup cannot be linear. Stopped at:\n" msgstr "" -#: ../dgit:6231 +#: ../dgit:6283 #, perl-format msgid "%s: %s: %s\n" msgstr "" -#: ../dgit:6243 +#: ../dgit:6295 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" -#: ../dgit:6246 +#: ../dgit:6298 msgid "quilt fixup cannot be linear, smashing..." msgstr "" -#: ../dgit:6260 +#: ../dgit:6312 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1537,115 +1536,115 @@ msgid "" "\n" msgstr "" -#: ../dgit:6267 +#: ../dgit:6319 msgid "quiltify linearisation planning successful, executing..." msgstr "" -#: ../dgit:6301 +#: ../dgit:6353 msgid "contains unexpected slashes\n" msgstr "" -#: ../dgit:6302 +#: ../dgit:6354 msgid "contains leading punctuation\n" msgstr "" -#: ../dgit:6303 +#: ../dgit:6355 msgid "contains bad character(s)\n" msgstr "" -#: ../dgit:6304 +#: ../dgit:6356 msgid "is series file\n" msgstr "" -#: ../dgit:6305 +#: ../dgit:6357 msgid "too long\n" msgstr "" -#: ../dgit:6309 +#: ../dgit:6361 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" -#: ../dgit:6338 +#: ../dgit:6390 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "" -#: ../dgit:6413 +#: ../dgit:6465 #, perl-format msgid "" "quilt mode %s does not make sense (or is not supported) with single-debian-" "patch" msgstr "" -#: ../dgit:6438 +#: ../dgit:6490 msgid "converted" msgstr "" -#: ../dgit:6439 +#: ../dgit:6491 #, perl-format msgid "dgit view: created (%s)" msgstr "" -#: ../dgit:6495 +#: ../dgit:6547 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" -#: ../dgit:6505 +#: ../dgit:6557 msgid "starting quiltify (single-debian-patch)" msgstr "" -#: ../dgit:6541 +#: ../dgit:6593 #, perl-format msgid "regenerating patch using git diff (--quilt=%s)" msgstr "" -#: ../dgit:6635 +#: ../dgit:6687 msgid "" "warning: package uses dpkg-source include-binaries feature - not all changes " "are visible in patches!\n" msgstr "" -#: ../dgit:6644 +#: ../dgit:6696 #, perl-format msgid "warning: ignoring bad include-binaries file %s: %s\n" msgstr "" -#: ../dgit:6647 +#: ../dgit:6699 #, perl-format msgid "forbidden path component '%s'" msgstr "" -#: ../dgit:6657 +#: ../dgit:6709 #, perl-format msgid "path starts with '%s'" msgstr "" -#: ../dgit:6667 +#: ../dgit:6719 #, perl-format msgid "path to '%s' not a plain file or directory" msgstr "" -#: ../dgit:6725 +#: ../dgit:6777 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" -#: ../dgit:6757 +#: ../dgit:6809 #, perl-format msgid "dgit view: found cached (%s)" msgstr "" -#: ../dgit:6762 +#: ../dgit:6814 msgid "dgit view: found cached, no changes required" msgstr "" -#: ../dgit:6797 +#: ../dgit:6849 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "" -#: ../dgit:6890 +#: ../dgit:6942 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" @@ -1653,74 +1652,74 @@ msgid "" " anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n" msgstr "" -#: ../dgit:6904 +#: ../dgit:6956 msgid "Tree already contains .pc - will delete it." msgstr "" -#: ../dgit:6938 +#: ../dgit:6990 msgid "baredebian quilt fixup: could not find any origs" msgstr "" -#: ../dgit:6951 +#: ../dgit:7003 msgid "tarball" msgstr "" -#: ../dgit:6969 +#: ../dgit:7021 #, perl-format msgid "Combine orig tarballs for %s %s" msgstr "" -#: ../dgit:6985 +#: ../dgit:7037 msgid "tarballs" msgstr "" -#: ../dgit:6999 +#: ../dgit:7051 msgid "upstream" msgstr "" -#: ../dgit:7023 +#: ../dgit:7075 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "" -#: ../dgit:7033 +#: ../dgit:7085 #, 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:7043 +#: ../dgit:7095 msgid "" "This has only a debian/ directory; you probably want --quilt=bare debian." msgstr "" -#: ../dgit:7047 +#: ../dgit:7099 msgid "This might be a patches-unapplied branch." msgstr "" -#: ../dgit:7050 +#: ../dgit:7102 msgid "This might be a patches-applied branch." msgstr "" -#: ../dgit:7053 +#: ../dgit:7105 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" -#: ../dgit:7056 +#: ../dgit:7108 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" -#: ../dgit:7060 +#: ../dgit:7112 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" -#: ../dgit:7071 +#: ../dgit:7123 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "" -#: ../dgit:7110 +#: ../dgit:7162 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1729,96 +1728,96 @@ msgid "" "\n" msgstr "" -#: ../dgit:7122 +#: ../dgit:7174 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" -#: ../dgit:7151 +#: ../dgit:7203 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:7163 +#: ../dgit:7215 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" -#: ../dgit:7166 +#: ../dgit:7218 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" -#: ../dgit:7169 +#: ../dgit:7221 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:7183 +#: ../dgit:7235 #, perl-format msgid "" "quilt mode %s (generally needs untracked upstream files)\n" "contradicts clean mode %s (which would delete them)\n" msgstr "" -#: ../dgit:7200 +#: ../dgit:7252 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" -#: ../dgit:7214 +#: ../dgit:7266 msgid "clean takes no additional arguments" msgstr "" -#: ../dgit:7233 +#: ../dgit:7285 #, perl-format msgid "-p specified package %s, but changelog says %s" msgstr "" -#: ../dgit:7243 +#: ../dgit:7295 msgid "" "dgit: --include-dirty is not supported with split view (including with view-" "splitting quilt modes)" msgstr "" -#: ../dgit:7251 +#: ../dgit:7303 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:7256 +#: ../dgit:7308 #, 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:7267 +#: ../dgit:7319 #, perl-format msgid "dgit: --quilt=%s, %s" msgstr "" -#: ../dgit:7271 +#: ../dgit:7323 msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian" msgstr "" -#: ../dgit:7306 +#: ../dgit:7358 #, perl-format msgid "remove old changes file %s: %s" msgstr "" -#: ../dgit:7308 +#: ../dgit:7360 #, perl-format msgid "would remove %s" msgstr "" -#: ../dgit:7326 +#: ../dgit:7378 #, perl-format msgid "warning: dgit option %s must be passed before %s on dgit command line\n" msgstr "" -#: ../dgit:7333 +#: ../dgit:7385 #, perl-format msgid "" "warning: option %s should probably be passed to dgit before %s sub-command " @@ -1826,54 +1825,54 @@ msgid "" "to %s\n" msgstr "" -#: ../dgit:7359 +#: ../dgit:7411 msgid "archive query failed (queried because --since-version not specified)" msgstr "" -#: ../dgit:7365 +#: ../dgit:7417 #, perl-format msgid "changelog will contain changes since %s" msgstr "" -#: ../dgit:7368 +#: ../dgit:7420 msgid "package seems new, not specifying -v" msgstr "" -#: ../dgit:7411 +#: ../dgit:7463 msgid "Wanted to build nothing!" msgstr "" -#: ../dgit:7449 +#: ../dgit:7501 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "" -#: ../dgit:7456 +#: ../dgit:7508 #, perl-format msgid "%s found in binaries changes file %s" msgstr "" -#: ../dgit:7463 +#: ../dgit:7515 #, perl-format msgid "%s unexpectedly not created by build" msgstr "" -#: ../dgit:7467 +#: ../dgit:7519 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "" -#: ../dgit:7472 +#: ../dgit:7524 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "" -#: ../dgit:7475 +#: ../dgit:7527 #, perl-format msgid "build successful, results in %s\n" msgstr "" -#: ../dgit:7488 +#: ../dgit:7540 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1881,156 +1880,156 @@ msgid "" "Suggest you delete %s.\n" msgstr "" -#: ../dgit:7506 +#: ../dgit:7558 msgid "build successful\n" msgstr "" -#: ../dgit:7514 +#: ../dgit:7566 #, 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:7625 +#: ../dgit:7677 #, perl-format msgid "remove %s: %s" msgstr "" -#: ../dgit:7632 +#: ../dgit:7684 msgid "--tag2upload-builder-mode needs split-brain mode" msgstr "" -#: ../dgit:7637 +#: ../dgit:7689 msgid "upstream tag and not commit, or vice-versa" msgstr "" -#: ../dgit:7693 +#: ../dgit:7745 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "" -#: ../dgit:7718 +#: ../dgit:7770 msgid "--include-dirty not supported with --tag2upload-builder-mode" msgstr "" -#: ../dgit:7731 +#: ../dgit:7783 msgid "source-only buildinfo" msgstr "" -#: ../dgit:7760 +#: ../dgit:7812 #, perl-format msgid "put in place new built file (%s): %s" msgstr "" -#: ../dgit:7777 +#: ../dgit:7840 msgid "build-source takes no additional arguments" msgstr "" -#: ../dgit:7781 +#: ../dgit:7845 #, perl-format msgid "source built, results in %s and %s" msgstr "" -#: ../dgit:7788 +#: ../dgit:7852 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" msgstr "" -#: ../dgit:7793 +#: ../dgit:7857 msgid "--tag2upload-builder-mode not supported with -C" msgstr "" -#: ../dgit:7796 +#: ../dgit:7860 msgid "source changes file" msgstr "" -#: ../dgit:7798 +#: ../dgit:7862 msgid "user-specified changes file is not source-only" msgstr "" -#: ../dgit:7818 ../dgit:7820 +#: ../dgit:7882 ../dgit:7884 #, perl-format msgid "%s (in build products dir): %s" msgstr "" -#: ../dgit:7834 +#: ../dgit:7898 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:7847 +#: ../dgit:7911 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" msgstr "" -#: ../dgit:7851 +#: ../dgit:7915 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:7881 +#: ../dgit:7945 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "" -#: ../dgit:7902 +#: ../dgit:7966 msgid "source tree" msgstr "" -#: ../dgit:7904 +#: ../dgit:7968 #, perl-format msgid "dgit: import-dsc: %s" msgstr "" -#: ../dgit:7917 +#: ../dgit:7981 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "" -#: ../dgit:7921 +#: ../dgit:7985 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "" -#: ../dgit:7925 +#: ../dgit:7989 msgid "dry run makes no sense with import-dsc" msgstr "" -#: ../dgit:7942 +#: ../dgit:8006 #, perl-format msgid "%s is checked out - will not update it" msgstr "" -#: ../dgit:7947 +#: ../dgit:8011 #, perl-format msgid "open import .dsc (%s): %s" msgstr "" -#: ../dgit:7949 +#: ../dgit:8013 #, perl-format msgid "read %s: %s" msgstr "" -#: ../dgit:7960 +#: ../dgit:8024 msgid "import-dsc signature check failed" msgstr "" -#: ../dgit:7963 +#: ../dgit:8027 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "" -#: ../dgit:7974 +#: ../dgit:8038 msgid "Dgit metadata in .dsc" msgstr "" -#: ../dgit:7985 +#: ../dgit:8049 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "" -#: ../dgit:7994 +#: ../dgit:8058 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -2038,21 +2037,21 @@ msgid "" "plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n" msgstr "" -#: ../dgit:8001 +#: ../dgit:8065 msgid "Not fast forward, forced update." msgstr "" -#: ../dgit:8003 +#: ../dgit:8067 #, perl-format msgid "Not fast forward to %s" msgstr "" -#: ../dgit:8008 +#: ../dgit:8072 #, perl-format msgid "updated git ref %s" msgstr "" -#: ../dgit:8013 +#: ../dgit:8077 #, perl-format msgid "" "Branch %s already exists\n" @@ -2060,129 +2059,179 @@ msgid "" "Specify +%s to overwrite, discarding existing history\n" msgstr "" -#: ../dgit:8033 +#: ../dgit:8097 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "" -#: ../dgit:8035 +#: ../dgit:8099 #, perl-format msgid "stat %s: %s" msgstr "" -#: ../dgit:8043 +#: ../dgit:8107 #, perl-format msgid "import %s requires %s, but: %s" msgstr "" -#: ../dgit:8062 +#: ../dgit:8126 #, perl-format msgid "cannot import %s which seems to be inside working tree!" msgstr "" -#: ../dgit:8066 +#: ../dgit:8130 #, perl-format msgid "symlink %s to %s: %s" msgstr "" -#: ../dgit:8067 +#: ../dgit:8131 #, perl-format msgid "made symlink %s -> %s" msgstr "" -#: ../dgit:8078 +#: ../dgit:8142 msgid "Import, forced update - synthetic orphan git history." msgstr "" -#: ../dgit:8080 +#: ../dgit:8144 msgid "Import, merging." msgstr "" -#: ../dgit:8094 +#: ../dgit:8158 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "" -#: ../dgit:8103 +#: ../dgit:8167 #, perl-format msgid "results are in git ref %s" msgstr "" -#: ../dgit:8110 +#: ../dgit:8174 msgid "need only 1 subpath argument" msgstr "" -#: ../dgit:8128 +#: ../dgit:8192 msgid "need destination argument" msgstr "" -#: ../dgit:8133 +#: ../dgit:8197 #, perl-format msgid "exec git clone: %s\n" msgstr "" -#: ../dgit:8141 +#: ../dgit:8205 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url" msgstr "" -#: ../dgit:8152 +#: ../dgit:8217 +msgid "package does not exist in target suite, looking in whole archive\n" +msgstr "" + +#: ../dgit:8224 +#, perl-format +msgid "package in target suite is different upstream version, %s\n" +msgstr "" + +#: ../dgit:8236 +msgid "suite has this upstream version, but no origs\n" +msgstr "" + +#: ../dgit:8240 +msgid "suite has origs for this upstream version\n" +msgstr "" + +#: ../dgit:8266 +#, perl-format +msgid "no .origs for package %s upstream version %s\n" +msgstr "" + +#: ../dgit:8298 +#, perl-format +msgid "multiple possibilities for orig component %s:\n" +msgstr "" + +#: ../dgit:8311 +msgid "failed to resolve, unambiguously, which .origs are intended\n" +msgstr "" + +#: ../dgit:8329 +#, perl-format +msgid "unknown long option to download-unfetched-origs `%s'" +msgstr "" + +#: ../dgit:8332 +msgid "download-unfetched-origs takes no non-option arguments" +msgstr "" + +#: ../dgit:8362 +#, perl-format +msgid "orig file is missing (404) at archive mirror: %s\n" +msgstr "" + +#: ../dgit:8369 +#, perl-format +msgid "%d orig file(s) could not be obtained\n" +msgstr "" + +#: ../dgit:8379 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "" -#: ../dgit:8158 +#: ../dgit:8385 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "" -#: ../dgit:8165 ../dgit:8171 +#: ../dgit:8392 ../dgit:8398 msgid "no arguments allowed to dgit setup-useremail" msgstr "" -#: ../dgit:8177 +#: ../dgit:8404 msgid "no arguments allowed to dgit setup-tree" msgstr "" -#: ../dgit:8228 +#: ../dgit:8459 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." msgstr "" -#: ../dgit:8267 +#: ../dgit:8501 #, perl-format msgid "%s needs a value" msgstr "" -#: ../dgit:8271 +#: ../dgit:8505 #, perl-format msgid "bad value `%s' for %s" msgstr "" -#: ../dgit:8380 +#: ../dgit:8614 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "" -#: ../dgit:8404 +#: ../dgit:8648 #, perl-format msgid "unknown long option `%s'" msgstr "" -#: ../dgit:8461 +#: ../dgit:8705 #, perl-format msgid "unknown short option `%s'" msgstr "" -#: ../dgit:8484 +#: ../dgit:8728 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "" -#: ../dgit:8488 +#: ../dgit:8732 #, perl-format msgid "%s is blocked\n" msgstr "" -#: ../dgit:8494 +#: ../dgit:8738 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -2190,64 +2239,64 @@ msgid "" "Giving up.\n" msgstr "" -#: ../dgit:8541 +#: ../dgit:8785 #, perl-format msgid "" "unsupported option `%s', cannot set command for %s (can only provide options)" msgstr "" -#: ../dgit:8546 +#: ../dgit:8790 #, perl-format msgid "" "unsupported option `%s', cannot provide additional options for %s (can only " "provide replacement command)" msgstr "" -#: ../dgit:8553 +#: ../dgit:8797 #, perl-format msgid "" "unsupported option `%s', cannot adjust options for %s (can only provide " "replacement command)" msgstr "" -#: ../dgit:8585 +#: ../dgit:8829 #, perl-format msgid "cannot set command for %s (can only provide options)" msgstr "" -#: ../dgit:8606 +#: ../dgit:8850 #, perl-format msgid "cannot configure options for %s (can only provide replacement command)" msgstr "" -#: ../dgit:8625 +#: ../dgit:8869 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "" -#: ../dgit:8637 +#: ../dgit:8881 #, perl-format msgid "unknown %s setting `%s'" msgstr "" -#: ../dgit:8650 +#: ../dgit:8894 msgid "--tag2upload-builder-mode implies --dep14tag-reuse=must" msgstr "" -#: ../dgit:8657 +#: ../dgit:8901 #, perl-format msgid "unknown dep14tag-reuse mode `%s'" msgstr "" -#: ../dgit:8680 +#: ../dgit:8924 msgid "DRY RUN ONLY\n" msgstr "" -#: ../dgit:8681 +#: ../dgit:8925 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" -#: ../dgit:8701 +#: ../dgit:8945 #, perl-format msgid "unknown operation %s" msgstr "" @@ -2968,93 +3017,93 @@ msgstr "" msgid "data block" msgstr "" -#: ../Debian/Dgit.pm:352 +#: ../Debian/Dgit.pm:324 #, perl-format msgid "error: %s\n" msgstr "" -#: ../Debian/Dgit.pm:378 +#: ../Debian/Dgit.pm:350 #, perl-format msgid "getcwd failed: %s\n" msgstr "" -#: ../Debian/Dgit.pm:397 +#: ../Debian/Dgit.pm:369 msgid "terminated, reporting successful completion" msgstr "" -#: ../Debian/Dgit.pm:399 +#: ../Debian/Dgit.pm:371 #, perl-format msgid "failed with error exit status %s" msgstr "" -#: ../Debian/Dgit.pm:402 +#: ../Debian/Dgit.pm:374 #, perl-format msgid "died due to fatal signal %s" msgstr "" -#: ../Debian/Dgit.pm:406 +#: ../Debian/Dgit.pm:378 #, perl-format msgid "failed with unknown wait status %s" msgstr "" -#: ../Debian/Dgit.pm:412 +#: ../Debian/Dgit.pm:384 msgid "failed command" msgstr "" -#: ../Debian/Dgit.pm:418 +#: ../Debian/Dgit.pm:390 #, perl-format msgid "failed to fork/exec: %s" msgstr "" -#: ../Debian/Dgit.pm:420 +#: ../Debian/Dgit.pm:392 #, perl-format msgid "subprocess %s" msgstr "" -#: ../Debian/Dgit.pm:422 +#: ../Debian/Dgit.pm:394 msgid "subprocess produced invalid output" msgstr "" -#: ../Debian/Dgit.pm:527 +#: ../Debian/Dgit.pm:499 msgid "stat source file: %S" msgstr "" -#: ../Debian/Dgit.pm:537 +#: ../Debian/Dgit.pm:509 msgid "stat destination file: %S" msgstr "" -#: ../Debian/Dgit.pm:556 +#: ../Debian/Dgit.pm:528 msgid "finally install file after cp: %S" msgstr "" -#: ../Debian/Dgit.pm:562 +#: ../Debian/Dgit.pm:534 msgid "delete old file after cp: %S" msgstr "" -#: ../Debian/Dgit.pm:585 +#: ../Debian/Dgit.pm:557 msgid "" "not in a git working tree?\n" "(git rev-parse --show-toplevel produced no output)\n" msgstr "" -#: ../Debian/Dgit.pm:588 +#: ../Debian/Dgit.pm:560 #, perl-format msgid "chdir toplevel %s: %s\n" msgstr "" -#: ../Debian/Dgit.pm:696 +#: ../Debian/Dgit.pm:668 msgid "git index contains changes (does not match HEAD)" msgstr "" -#: ../Debian/Dgit.pm:697 +#: ../Debian/Dgit.pm:669 msgid "working tree is dirty (does not match HEAD)" msgstr "" -#: ../Debian/Dgit.pm:722 +#: ../Debian/Dgit.pm:694 msgid "using specified upstream commitish" msgstr "" -#: ../Debian/Dgit.pm:729 +#: ../Debian/Dgit.pm:701 #, perl-format msgid "" "Could not determine appropriate upstream commitish.\n" @@ -3062,103 +3111,103 @@ msgid "" " Check version, and specify upstream commitish explicitly." msgstr "" -#: ../Debian/Dgit.pm:734 ../Debian/Dgit.pm:736 +#: ../Debian/Dgit.pm:706 ../Debian/Dgit.pm:708 #, perl-format msgid "using upstream from git tag %s" msgstr "" -#: ../Debian/Dgit.pm:850 +#: ../Debian/Dgit.pm:822 #, perl-format msgid "failed to remove directory tree %s: rm -rf: %s; %s\n" msgstr "" -#: ../Debian/Dgit.pm:885 +#: ../Debian/Dgit.pm:857 msgid "detached HEAD" msgstr "" -#: ../Debian/Dgit.pm:886 +#: ../Debian/Dgit.pm:858 msgid "HEAD symref is not to refs/" msgstr "" -#: ../Debian/Dgit.pm:902 +#: ../Debian/Dgit.pm:874 #, perl-format msgid "parsing of %s failed" msgstr "" -#: ../Debian/Dgit.pm:911 +#: ../Debian/Dgit.pm:883 #, 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:925 +#: ../Debian/Dgit.pm:897 #, perl-format msgid "open %s (%s): %s" msgstr "" -#: ../Debian/Dgit.pm:950 +#: ../Debian/Dgit.pm:922 #, perl-format msgid "missing field %s in %s" msgstr "" -#: ../Debian/Dgit.pm:1036 +#: ../Debian/Dgit.pm:1008 msgid "Dummy commit - do not use\n" msgstr "" -#: ../Debian/Dgit.pm:1057 +#: ../Debian/Dgit.pm:1029 #, perl-format msgid "exec %s: %s\n" msgstr "" -#: ../Debian/Dgit.pm:1085 +#: ../Debian/Dgit.pm:1057 #, perl-format msgid "Taint recorded at time %s for package %s" msgstr "" -#: ../Debian/Dgit.pm:1087 +#: ../Debian/Dgit.pm:1059 #, perl-format msgid "Taint recorded at time %s for any package" msgstr "" -#: ../Debian/Dgit.pm:1089 +#: ../Debian/Dgit.pm:1061 #, perl-format msgid "Taint recorded for package %s" msgstr "" -#: ../Debian/Dgit.pm:1091 +#: ../Debian/Dgit.pm:1063 msgid "Taint recorded for any package" msgstr "" -#: ../Debian/Dgit.pm:1103 +#: ../Debian/Dgit.pm:1075 msgid "Uncorrectable error. If confused, consult administrator.\n" msgstr "" -#: ../Debian/Dgit.pm:1106 +#: ../Debian/Dgit.pm:1078 msgid "Could perhaps be forced using --deliberately. Consult documentation.\n" msgstr "" -#: ../Debian/Dgit.pm:1109 +#: ../Debian/Dgit.pm:1081 #, perl-format msgid "Forcing due to %s\n" msgstr "" -#: ../Debian/Dgit.pm:1174 +#: ../Debian/Dgit.pm:1146 #, perl-format msgid "cannot stat %s/.git: %s" msgstr "" -#: ../Debian/Dgit.pm:1197 +#: ../Debian/Dgit.pm:1169 #, perl-format msgid "failed to mkdir playground parent %s: %s" msgstr "" -#: ../Debian/Dgit.pm:1205 +#: ../Debian/Dgit.pm:1177 #, perl-format msgid "failed to mkdir a playground %s: %s" msgstr "" -#: ../Debian/Dgit.pm:1214 +#: ../Debian/Dgit.pm:1186 #, perl-format msgid "failed to mkdir the playground %s: %s" msgstr "" diff -pruN 13.11+exp1/po/nl.po 13.12/po/nl.po --- 13.11+exp1/po/nl.po 2025-08-10 18:58:53.000000000 +0000 +++ 13.12/po/nl.po 2025-08-15 09:05:44.000000000 +0000 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dgit_12.12\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-05-07 18:40+0000\n" +"POT-Creation-Date: 2025-08-15 13:02+0000\n" "PO-Revision-Date: 2025-05-12 22:05+0200\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" @@ -19,42 +19,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 3.2.2\n" -#: ../dgit:296 +#: ../dgit:297 #, perl-format msgid "%s: invalid configuration: %s\n" msgstr "%s: ongeldige configuratie: %s\n" -#: ../dgit:303 +#: ../dgit:304 msgid "warning: overriding problem due to --force:\n" msgstr "waarschuwing: overschrijvingsprobleem wegens --force:\n" -#: ../dgit:311 +#: ../dgit:313 #, perl-format msgid "warning: skipping checks or functionality due to --force-%s\n" msgstr "" "waarschuwing: controles of functionaliteit overgeslagen wegens --force-%s\n" -#: ../dgit:316 +#: ../dgit:318 #, perl-format msgid "%s: source package %s does not exist in suite %s\n" msgstr "%s: broncodepakket %s bestaat niet in suite %s\n" -#: ../dgit:589 +#: ../dgit:591 #, perl-format msgid "build host child %s" msgstr "bouwcomputer-dochter %s" -#: ../dgit:648 +#: ../dgit:650 #, perl-format msgid "%s ok: %s" msgstr "%s oké: %s" -#: ../dgit:650 +#: ../dgit:652 #, perl-format msgid "would be ok: %s (but dry run only)" msgstr "zou oké zijn: %s (maar slechts een testuitvoering)" -#: ../dgit:675 +#: ../dgit:677 msgid "" "main usages:\n" " dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n" @@ -95,13 +95,13 @@ msgstr "" " -c= configuratieoptie instellen voor git\n" " (ook rechtstreeks gebruikt door dgit)\n" -#: ../dgit:694 +#: ../dgit:696 msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n" msgstr "" "Misschien zit de upload vast in incoming. De versie van git wordt " "gebruikt.\n" -#: ../dgit:698 +#: ../dgit:700 #, perl-format msgid "" "%s: %s\n" @@ -110,22 +110,22 @@ msgstr "" "%s: %s\n" "%s" -#: ../dgit:703 +#: ../dgit:705 msgid "too few arguments" msgstr "te weinig argumenten" -#: ../dgit:825 +#: ../dgit:827 #, perl-format msgid "multiple values for %s (in %s git config)" msgstr "verschillende waarden voor %s (in %s git config)" -#: ../dgit:828 +#: ../dgit:830 #, perl-format msgid "value for config option %s (in %s git config) contains newline(s)!" msgstr "" "waarde voor configuratieoptie %s (in %s git config) bevat regeleinde(s)!" -#: ../dgit:848 +#: ../dgit:850 #, perl-format msgid "" "need value for one of: %s\n" @@ -134,44 +134,44 @@ msgstr "" "heb waarde nodig voor één van: %s\n" "%s: distributie of suite lijkt niet (behoorlijk) ondersteund te worden" -#: ../dgit:905 +#: ../dgit:907 #, perl-format msgid "bad syntax for (nominal) distro `%s' (does not match %s)" msgstr "" "slechte syntaxis voor (nominale) distributie `%s' (komt niet overeen met %s)" -#: ../dgit:920 +#: ../dgit:922 #, perl-format msgid "backports-quirk needs % or ( )" msgstr "backports-spitsvondigheid vereist % of ( )" -#: ../dgit:936 +#: ../dgit:938 #, perl-format msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'" msgstr "%s vereist t (true, y, 1) of f (false, n, 0) en niet `%s'" -#: ../dgit:956 +#: ../dgit:958 msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)" msgstr "" "alleen-lezen (readonly) vereist t (true, y, 1) of f (false, n, 0) of een " "(auto)" -#: ../dgit:974 +#: ../dgit:976 #, perl-format msgid "unknown %s `%s'" msgstr "onbekend %s `%s'" -#: ../dgit:979 ../git-debrebase:1548 ../Debian/Dgit.pm:255 +#: ../dgit:981 ../git-debrebase:1548 ../Debian/Dgit/Core.pm:53 msgid "internal error" msgstr "interne fout" -#: ../dgit:981 +#: ../dgit:983 msgid "pushing but distro is configured readonly" msgstr "" "een push aan het uitvoeren, maar de distributie is voor alleen-lezen " "geconfigureerd" -#: ../dgit:985 +#: ../dgit:987 msgid "" "Push failed, before we got started.\n" "You can retry the push, after fixing the problem, if you like.\n" @@ -180,7 +180,7 @@ msgstr "" "Als u wilt, kunt u de push opnieuw proberen nadat het probleem opgelost " "werd.\n" -#: ../dgit:1008 +#: ../dgit:1010 #, perl-format msgid "" "dgit: quilt mode `%s' (for format `%s') implies split view, but split-view " @@ -189,75 +189,75 @@ msgstr "" "dgit: quilt modus `%s' (voor indeling `%s') impliceert gesplitste weergave, " "maar gesplitste weergave staat ingesteld op `%s'" -#: ../dgit:1169 +#: ../dgit:1171 msgid "this operation does not support multiple comma-separated suites" msgstr "" "meerdere met een komma van elkaar gescheiden suites worden door deze " "bewerking niet ondersteund" -#: ../dgit:1237 +#: ../dgit:1250 #, perl-format msgid "fetch of %s failed (%s): %s" msgstr "ophalen (fetch) van %s mislukte (%s): %s" -#: ../dgit:1244 +#: ../dgit:1257 #, perl-format msgid "fetch of %s gave HTTP code %s" msgstr "een fetch van %s gaf HTTP-code %s" -#: ../dgit:1265 +#: ../dgit:1282 msgid "ftpmasterapi archive query method takes no data part" msgstr "" "de methode ftpmasterapi voor een verzoek aan het archief kent geen data-" "onderdeel" -#: ../dgit:1283 +#: ../dgit:1300 #, perl-format msgid "unknown suite %s, maybe -d would help" msgstr "onbekende suite %s, misschien is -d nuttig" -#: ../dgit:1287 +#: ../dgit:1304 #, perl-format msgid "multiple matches for suite %s\n" msgstr "meerdere overeenkomsten met suite %s\n" -#: ../dgit:1289 +#: ../dgit:1306 #, perl-format msgid "suite %s info has no codename\n" msgstr "info over suite %s bevat geen codenaam\n" -#: ../dgit:1291 +#: ../dgit:1308 #, perl-format msgid "suite %s maps to bad codename\n" msgstr "suite %s is gekoppeld aan een verkeerde codenaam\n" -#: ../dgit:1293 ../dgit:1318 +#: ../dgit:1310 ../dgit:1335 msgid "bad ftpmaster api response: " msgstr "verkeerd antwoord van de ftpmaster api: " -#: ../dgit:1307 +#: ../dgit:1324 #, perl-format msgid "bad version: %s\n" msgstr "verkeerde versie: %s\n" -#: ../dgit:1309 +#: ../dgit:1326 msgid "bad component" msgstr "verkeerde component" -#: ../dgit:1312 +#: ../dgit:1329 msgid "bad filename" msgstr "verkeerde bestandsnaam" -#: ../dgit:1314 +#: ../dgit:1331 msgid "bad sha256sum" msgstr "verkeerde sha256sum" -#: ../dgit:1365 +#: ../dgit:1384 msgid "aptget archive query method takes no data part" msgstr "" "de methode aptget voor een verzoek aan het archief kent geen data-onderdeel" -#: ../dgit:1449 +#: ../dgit:1468 #, perl-format msgid "" "apt seemed to not to update dgit's cached Release files for %s.\n" @@ -270,21 +270,21 @@ msgstr "" " zich op een bestandssysteem dat met `noatime' aangekoppeld is; mocht dit " "het geval zijn, gebruik dan `relatime'.)\n" -#: ../dgit:1473 +#: ../dgit:1492 #, perl-format msgid "Release file (%s) specifies intolerable %s" msgstr "Release-bestand (%s) vermeldt ontoelaatbaar %s" -#: ../dgit:1499 +#: ../dgit:1518 msgid "apt-get source did not produce a .dsc" msgstr "apt-get source produceerde geen .dsc-bestand" -#: ../dgit:1500 +#: ../dgit:1519 #, perl-format msgid "apt-get source produced several .dscs (%s)" msgstr "apt-get source produceerde verschillende .dsc-bestanden (%s)" -#: ../dgit:1605 +#: ../dgit:1624 #, perl-format msgid "" "unable to canonicalise suite using package %s which does not appear to exist " @@ -293,142 +293,142 @@ msgstr "" "niet in staat de suite ondubbelzinnig te bepalen met pakket %s dat blijkbaar " "niet bestaat in suite %s; --existing-package kan behulpzaam zijn" -#: ../dgit:1744 +#: ../dgit:1763 #, perl-format msgid "cannot operate on %s suite" msgstr "kan geen acties uitvoeren op suite %s" -#: ../dgit:1747 +#: ../dgit:1766 #, perl-format msgid "canonical suite name for %s is %s" msgstr "de gebruikelijke suitenaam voor %s is %s" -#: ../dgit:1749 +#: ../dgit:1768 #, perl-format msgid "canonical suite name is %s" msgstr "de gebruikelijke suitenaam is %s" -#: ../dgit:1769 +#: ../dgit:1788 #, perl-format msgid "%s has hash %s but archive told us to expect %s" msgstr "%s heeft hash %s maar volgens het archief moesten we %s verwachten" -#: ../dgit:1775 +#: ../dgit:1794 #, perl-format msgid "unsupported source format %s, sorry" msgstr "niet-ondersteunde broncode-indeling %s, sorry" -#: ../dgit:1802 +#: ../dgit:1821 #, perl-format msgid "diverting to %s (using config for %s)" msgstr "er wordt omgeschakeld naar %s (de configuratie voor %s wordt gebruikt)" -#: ../dgit:1825 +#: ../dgit:1844 #, perl-format msgid "unknown git-check `%s'" msgstr "onbekende git-check `%s'" -#: ../dgit:1840 +#: ../dgit:1859 #, perl-format msgid "unknown git-create `%s'" msgstr "onbekende git-create `%s'" -#: ../dgit:1884 +#: ../dgit:1903 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "%s: waarschuwing: wordt verwijderd van %s: %s\n" -#: ../dgit:1930 +#: ../dgit:1945 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "kon .dsc %s regel `%s' niet ontleden" -#: ../dgit:1941 +#: ../dgit:1957 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "een ondersteund Checksums-* of Files-veld ontbreekt in %s" -#: ../dgit:1987 +#: ../dgit:2003 #, perl-format msgid "hash or size of %s varies in %s fields (between: %s)" msgstr "hash of grootte van %s varieert in %s-velden (tussen: %s)" -#: ../dgit:1996 +#: ../dgit:2012 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "bestandenlijst in %s varieert tussen hash-velden!" -#: ../dgit:2000 +#: ../dgit:2016 #, perl-format msgid "%s has no files list field(s)" msgstr "%s bevat geen veld(en) met een bestandenlijst" -#: ../dgit:2006 +#: ../dgit:2022 #, perl-format msgid "no file appears in all file lists (looked in: %s)" msgstr "in geen enkele bestandenlijst komt een bestand voor (gezocht in: %s)" -#: ../dgit:2046 +#: ../dgit:2062 #, perl-format msgid "purportedly source-only changes has Architecture: %s\n" msgstr "" "ogenschijnlijke wijzigingen in uitsluitend de broncode hebben als " "architectuur: %s\n" -#: ../dgit:2057 +#: ../dgit:2073 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "" "ogenschijnlijke wijzigingen in uitsluitend de broncode vervuild door %s\n" -#: ../dgit:2069 +#: ../dgit:2085 msgid "cannot find section/priority from .changes Files field" msgstr "" "kan sectie/prioriteit niet vinden in het veld Files van het .changes-bestand" -#: ../dgit:2082 +#: ../dgit:2098 msgid "" "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n" msgstr "" "archief ondersteunt controle van .orig niet; hopelijk gebruikte u zo nodig --" "ch:--sa/-sd\n" -#: ../dgit:2098 +#: ../dgit:2114 #, perl-format msgid ".dsc %s missing entry for %s" msgstr ".dsc %s mist een item voor %s" -#: ../dgit:2103 +#: ../dgit:2119 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "%s: %s (archief) != %s (lokale .dsc)" -#: ../dgit:2111 +#: ../dgit:2127 #, perl-format msgid "archive %s: %s" msgstr "archief %s: %s" -#: ../dgit:2118 +#: ../dgit:2134 #, perl-format msgid "archive contains %s with different checksum" msgstr "archief bevat %s met een andere checksum" -#: ../dgit:2146 +#: ../dgit:2162 #, perl-format msgid "edited .changes for archive .orig contents: %s %s" msgstr "bewerkte .changes voor de inhoud van .orig van het archief: %s %s" -#: ../dgit:2154 +#: ../dgit:2170 #, perl-format msgid "[new .changes left in %s]" msgstr "[nieuwe .changes achtergelaten in %s]" -#: ../dgit:2157 +#: ../dgit:2173 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "%s heeft reeds passende .orig(s) (indien van toepassing)" -#: ../dgit:2179 +#: ../dgit:2195 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " @@ -437,7 +437,7 @@ msgstr "" "onverwachte indeling `%s' van de auteursregel van de commit (werd " "gegenereerd uit het Maintainer-veld in changelog)" -#: ../dgit:2202 +#: ../dgit:2218 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -464,7 +464,7 @@ msgstr "" "dat verschillende distributies andere broncode hebben).\n" "\n" -#: ../dgit:2214 +#: ../dgit:2230 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" @@ -472,38 +472,38 @@ msgstr "" "Vond een actief distributiespecifiek series-bestand voor %s (%s): %s, kan " "niet voortgaan" -#: ../dgit:2245 +#: ../dgit:2261 msgid "Dpkg::Vendor `current vendor'" msgstr "Dpkg::Vendor `current vendor'" -#: ../dgit:2247 +#: ../dgit:2263 msgid "(base) distro being accessed" msgstr "(basis)-distributie wordt benaderd" -#: ../dgit:2249 +#: ../dgit:2265 msgid "(nominal) distro being accessed" msgstr "(nominale) distributie wordt benaderd" -#: ../dgit:2254 +#: ../dgit:2270 #, perl-format msgid "build-products-dir %s is not accessible: %s\n" msgstr "build-products-dir %s is niet toegankelijk: %s\n" -#: ../dgit:2292 +#: ../dgit:2308 #, perl-format msgid "%s: multiple representations of similar orig %s:\n" msgstr "%s: meerdere weergaven van soortgelijke oorsprong %s:\n" -#: ../dgit:2296 +#: ../dgit:2312 #, perl-format msgid " %s: in %s (%s)\n" msgstr " %s: in %s (%s)\n" -#: ../dgit:2301 +#: ../dgit:2317 msgid "Duplicate/inconsistent orig tarballs. Delete the spurious ones." msgstr "Dubbele/inconsistente orig-tar-archieven. Verwijder de ongewenste." -#: ../dgit:2318 +#: ../dgit:2334 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" @@ -511,56 +511,56 @@ msgstr "" "%s: orig(s) gevonden in .. welke ontbreken in build-products-dir, aan het " "overbrengen:\n" -#: ../dgit:2322 +#: ../dgit:2338 #, perl-format msgid "check orig file %s in bpd %s: %s" msgstr "controleer orig-bestand %s in bpd %s: %s" -#: ../dgit:2324 +#: ../dgit:2340 #, perl-format msgid "check orig file %s in ..: %s" msgstr "controleer orig-bestand %s in ..: %s" -#: ../dgit:2327 +#: ../dgit:2343 #, perl-format msgid "check target of orig symlink %s in ..: %s" msgstr "controleer doel van orig-symbolische koppeling %s in ..: %s" -#: ../dgit:2336 +#: ../dgit:2352 #, perl-format msgid "%s: cloned orig symlink from ..: %s\n" msgstr "%s: orig-symbolische koppeling gekloond van ..: %s\n" -#: ../dgit:2340 +#: ../dgit:2356 #, perl-format msgid "%s: hardlinked orig from ..: %s\n" msgstr "%s: vast gekoppelde orig van ..: %s\n" -#: ../dgit:2343 +#: ../dgit:2359 #, perl-format msgid "failed to make %s a hardlink to %s: %s" msgstr "niet gelukt om %s een vaste koppeling naar %s te maken: %s" -#: ../dgit:2349 +#: ../dgit:2365 #, perl-format msgid "%s: symmlinked orig from .. on other filesystem: %s\n" msgstr "" "%s: symbolisch gekoppelde orig van .. op een ander bestandssysteem: %s\n" -#: ../dgit:2364 +#: ../dgit:2380 msgid "package changelog" msgstr "changelog van het pakket" -#: ../dgit:2469 +#: ../dgit:2485 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "dgit (dochter): exec %s: %s" -#: ../dgit:2532 +#: ../dgit:2548 msgid "package changelog has no entries!" msgstr "het changelog-bestand van het pakket bevat geen vermeldingen!" -#: ../dgit:2537 +#: ../dgit:2553 #, perl-format msgid "" "warning: unable to find/parse changelog entry for first import of %s:\n" @@ -570,31 +570,31 @@ msgstr "" "vinden/ontleden:\n" "%s\n" -#: ../dgit:2608 ../dgit:2613 +#: ../dgit:2624 ../dgit:2629 #, perl-format msgid "accessing %s: %s" msgstr "benaderen van %s: %s" -#: ../dgit:2630 ../dgit:2637 +#: ../dgit:2646 ../dgit:2653 #, perl-format msgid "saving %s: %s" msgstr "opslaan van %s: %s" -#: ../dgit:2663 ../dgit:6701 +#: ../dgit:2679 ../dgit:6753 msgid "source package" msgstr "broncodepakket" -#: ../dgit:2743 +#: ../dgit:2759 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "%s: langzame absurd-git-apply wordt gebruikt..." -#: ../dgit:2796 +#: ../dgit:2812 #, perl-format msgid "%s failed: %s\n" msgstr "%s mislukte: %s\n" -#: ../dgit:2814 +#: ../dgit:2830 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -607,16 +607,16 @@ msgstr "" " gbp-pq import gaf boom %s\n" " dpkg-source --before-build gaf boom %s\n" -#: ../dgit:2834 +#: ../dgit:2850 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "git commit samengesteld vanuit .dsc %s" -#: ../dgit:2838 +#: ../dgit:2854 msgid "Import of source package" msgstr "Importeren van broncodepakket" -#: ../dgit:2858 +#: ../dgit:2874 #, perl-format msgid "" "\n" @@ -629,51 +629,56 @@ msgstr "" "Laatste versie die met dgit gepusht werd : %s (recentere of dezelfde)\n" "%s\n" -#: ../dgit:2900 +#: ../dgit:2924 #, perl-format msgid "using existing %s" msgstr "bestaande %s wordt gebruikt" -#: ../dgit:2904 -#, perl-format +#: ../dgit:2928 +#, fuzzy, perl-format +#| msgid "" +#| "file %s has hash %s but .dsc demands hash %s (perhaps you should delete " +#| "this file?)" msgid "" -"file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " +"file %s has hash %s but we need hash %s (perhaps you should delete this " "file?)" msgstr "" "bestand %s heeft hash %s maar .dsc vereist hash %s (moet u misschien dit " "bestand verwijderen?)" -#: ../dgit:2908 +#: ../dgit:2932 #, perl-format msgid "need to fetch correct version of %s" msgstr "moet de juiste versie van %s ophalen met fetch" -#: ../dgit:2924 -#, perl-format -msgid "" -"file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" +#: ../dgit:2958 +#, fuzzy, perl-format +#| msgid "" +#| "file %s has hash %s but .dsc demands hash %s (got wrong file from " +#| "archive!)" +msgid "file %s has hash %s but we need hash %s (got wrong file from archive!)" msgstr "" "bestand %s heeft hash %s maar .dsc vereist hash %s (verkreeg een verkeerd " "bestand van het archief!)" -#: ../dgit:3019 +#: ../dgit:3055 msgid "too many iterations trying to get sane fetch!" msgstr "te veel pogingen om een foutloze fetch te bekomen!" -#: ../dgit:3034 +#: ../dgit:3070 #, perl-format msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n" msgstr "" "waarschuwing: git ls-remote %s rapporteerde %s; dit is onzinnig, wordt " "genegeerd.\n" -#: ../dgit:3078 +#: ../dgit:3114 #, perl-format msgid "warning: git fetch %s created %s; this is silly, deleting it.\n" msgstr "" "waarschuwing: git fetch %s creëerde %s; dit is onzinnig, wordt verwijderd.\n" -#: ../dgit:3093 +#: ../dgit:3129 #, perl-format msgid "" "--dry-run specified but we actually wanted the results of git fetch,\n" @@ -684,7 +689,7 @@ msgstr "" "git fetch, dus dit zal niet werken. Probeer eerst git fetch uit te voeren,\n" "of --damp-run te gebruiken in plaats van --dry-run. (Gewenst: %s.)\n" -#: ../dgit:3098 +#: ../dgit:3134 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -700,19 +705,19 @@ msgstr "" "waarschuwing: Is mogelijk te wijten aan een race met iemand die de server\n" "waarschuwing: bijwerkt. Zal later opnieuw proberen...\n" -#: ../dgit:3245 +#: ../dgit:3281 #, perl-format msgid "not chasing .dsc distro %s: not fetching %s" msgstr "" "ben niet bezig met achter .dsc van distributie %s aan te gaan: %s wordt niet " "gehaald" -#: ../dgit:3250 +#: ../dgit:3286 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr ".dsc vernoemt distributie %s: %s wordt opgehaald" -#: ../dgit:3255 +#: ../dgit:3291 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -721,7 +726,7 @@ msgstr "" "De Dgit-metadata van .dsc zijn in de context van distributie %s\n" "waarvoor we geen geconfigureerde url hebben en .dsc geeft geen aanwijzing\n" -#: ../dgit:3265 +#: ../dgit:3301 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -734,30 +739,30 @@ msgstr "" ".dsc geeft een aanduiding voor een url met het onveilige protocol %s.\n" "(kan door de configuratie overschreven worden - raadpleeg de documentatie)\n" -#: ../dgit:3285 +#: ../dgit:3321 msgid "rewrite map" msgstr "modificatieplan (rewrite map)" -#: ../dgit:3292 +#: ../dgit:3328 msgid "server's git history rewrite map contains a relevant entry!" msgstr "" "het modificatieplan (rewrite map) van de git-geschiedenis op de server bevat " "een relevant element!" -#: ../dgit:3296 +#: ../dgit:3332 msgid "using rewritten git hash in place of .dsc value" msgstr "de gemodificeerde git hash wordt gebruikt in plaats van de .dsc-waarde" -#: ../dgit:3298 +#: ../dgit:3334 msgid "server data says .dsc hash is to be disregarded" msgstr "" "de gegevens van de server zeggen dat de .dsc-hash genegeerd moet worden" -#: ../dgit:3305 +#: ../dgit:3341 msgid "additional commits" msgstr "extra vastleggingen (commits)" -#: ../dgit:3308 +#: ../dgit:3344 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" @@ -766,27 +771,27 @@ msgstr "" "De Dgit-metadata uit .dsc vereist commit %s\n" "maar we konden dat object nergens bekomen.\n" -#: ../dgit:3333 +#: ../dgit:3369 msgid "last upload to archive" msgstr "laatste upload naar het archief" -#: ../dgit:3337 +#: ../dgit:3373 msgid "no version available from the archive" msgstr "geen versie beschikbaar uit het archief" -#: ../dgit:3420 +#: ../dgit:3456 msgid "dgit suite branch on dgit git server" msgstr "dgit suite-tak op dgit git-server" -#: ../dgit:3427 +#: ../dgit:3463 msgid "dgit client's archive history view" msgstr "dgit - weergave geschiedenis van cliëntarchief" -#: ../dgit:3432 +#: ../dgit:3468 msgid "Dgit field in .dsc from archive" msgstr "Dgit-veld in het .dsc uit het archief" -#: ../dgit:3460 +#: ../dgit:3496 #, perl-format msgid "" "\n" @@ -802,15 +807,15 @@ msgstr "" "Laatste versie die met dgit gepusht werd: %s\n" "%s\n" -#: ../dgit:3473 +#: ../dgit:3509 msgid "archive .dsc names newer git commit" msgstr ".dsc van het archief vermeldt een recentere git commit" -#: ../dgit:3476 +#: ../dgit:3512 msgid "archive .dsc names other git commit, fixing up" msgstr ".dsc van het archief vermeldt een andere git commit, wordt gerepareerd" -#: ../dgit:3497 +#: ../dgit:3533 #, perl-format msgid "" "\n" @@ -822,7 +827,7 @@ msgstr "" "dgit.\n" "%s\n" -#: ../dgit:3506 +#: ../dgit:3542 #, perl-format msgid "" "\n" @@ -837,7 +842,7 @@ msgstr "" "Maar we konden geen enkele versie bekomen uit het archief of uit git.\n" "\n" -#: ../dgit:3591 +#: ../dgit:3627 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -848,19 +853,19 @@ msgstr "" "\n" "Gegeven dat\n" -#: ../dgit:3604 +#: ../dgit:3640 msgid "should be treated as descended from\n" msgstr "behandeld zou moeten worden als afstammend van\n" -#: ../dgit:3622 +#: ../dgit:3658 msgid "dgit repo server tip (last push)" msgstr "tip van de dgit-opslagplaats op de server (laatste push)" -#: ../dgit:3624 +#: ../dgit:3660 msgid "local tracking tip (last fetch)" msgstr "tip van de lokale kopie (laatste fetch)" -#: ../dgit:3635 +#: ../dgit:3671 #, perl-format msgid "" "\n" @@ -876,15 +881,15 @@ msgstr "" "We waren slechts in staat om %s te bekomen\n" "\n" -#: ../dgit:3650 +#: ../dgit:3686 msgid "fetched source tree" msgstr "broncodeboom opgehaald" -#: ../dgit:3686 +#: ../dgit:3722 msgid "debian/changelog merge driver" msgstr "stuurprogramma voor samenvoeging van debian/changelog" -#: ../dgit:3751 +#: ../dgit:3787 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" @@ -892,16 +897,16 @@ msgstr "" "[attr]dgit-defuse-attrs reeds gevonden in .git/info/attributes, en geschikt\n" " gitattributes wordt niet verder ingesteld\n" -#: ../dgit:3765 +#: ../dgit:3801 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n" msgstr "# ^ zie GITATTRIBUTES in dgit(7) en dgit setup-new-tree in dgit(1)\n" -#: ../dgit:3780 +#: ../dgit:3816 #, perl-format msgid "install %s: %s" msgstr "installeren van %s: %s" -#: ../dgit:3807 +#: ../dgit:3843 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -912,32 +917,32 @@ msgstr "" "dgit: .gitattributes niet (volledig) geneutraliseerd. Aanbevolen: dgit " "setup-new-tree.\n" -#: ../dgit:3829 +#: ../dgit:3865 #, perl-format msgid "fetching %s..." msgstr "ophalen van %s..." -#: ../dgit:3837 +#: ../dgit:3873 #, perl-format msgid "failed to obtain %s: %s" msgstr "verkrijgen van %s mislukte: %s" -#: ../dgit:3876 +#: ../dgit:3912 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "pakket %s ontbreekt in (basissuite) %s" -#: ../dgit:3908 +#: ../dgit:3944 msgid "local combined tracking branch" msgstr "lokale gecombineerde navolgende tak (tracking branch)" -#: ../dgit:3910 +#: ../dgit:3946 msgid "archive seems to have rewound: local tracking branch is ahead!" msgstr "" "het archief lijkt teruggespoeld te hebben: de lokale navolgende tak loopt " "voorop!" -#: ../dgit:3949 +#: ../dgit:3985 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -948,7 +953,7 @@ msgstr "" "\n" "Invoertakken:\n" -#: ../dgit:3963 +#: ../dgit:3999 msgid "" "\n" "Key\n" @@ -962,34 +967,34 @@ msgstr "" " + markeert elke tak die niet reeds een voorouder was\n" "\n" -#: ../dgit:3978 +#: ../dgit:4014 #, perl-format msgid "calculated combined tracking suite %s" msgstr "berekende gecombineerde navolgende suite %s" -#: ../dgit:3996 +#: ../dgit:4032 #, perl-format msgid "ready for work in %s" msgstr "klaar om te werken in %s" -#: ../dgit:4014 +#: ../dgit:4050 msgid "dry run makes no sense with clone" msgstr "dry run is zinloos met clone" -#: ../dgit:4029 +#: ../dgit:4065 #, perl-format msgid "create `%s': %s" msgstr "creëren van `%s': %s" -#: ../dgit:4041 +#: ../dgit:4077 msgid "fetching existing git history" msgstr "ophalen van bestaande git-geschiedenis" -#: ../dgit:4044 +#: ../dgit:4080 msgid "starting new git history" msgstr "starten van een nieuwe git-geschiedenis" -#: ../dgit:4069 +#: ../dgit:4105 #, perl-format msgid "" "FYI: Vcs-Git in %s has different url to your vcs-git remote.\n" @@ -999,33 +1004,33 @@ msgstr "" " De url voor uw externe vcs-git zou verouderd kunnen zijn. Misschien dgit " "update-vcs-git gebruiken?\n" -#: ../dgit:4074 +#: ../dgit:4110 #, perl-format msgid "fetched into %s" msgstr "opgehaald naar %s" -#: ../dgit:4087 +#: ../dgit:4123 #, perl-format msgid "Merge from %s [dgit]" msgstr "Samenvoegen vanuit %s [dgit]" -#: ../dgit:4089 +#: ../dgit:4125 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "opgehaald naar %s samengevoegd naar HEAD" -#: ../dgit:4097 +#: ../dgit:4133 #, perl-format msgid "git tree contains %s" msgstr "git-boom bevat %s" -#: ../dgit:4108 +#: ../dgit:4144 msgid "you have uncommitted changes to critical files, cannot continue:\n" msgstr "" "u heeft niet-vastgelegde wijzigingen in cruciale bestanden, kan niet " "voortgaan:\n" -#: ../dgit:4127 +#: ../dgit:4163 #, perl-format msgid "" "quilt fixup required but quilt mode is `nofix'\n" @@ -1034,15 +1039,15 @@ msgstr "" "er is een quilt fixup vereist, maar de quilt-modus is `nofix'\n" "HEAD commit%s verschilt van de boom die uit debian/patches%s volgt" -#: ../dgit:4144 +#: ../dgit:4180 msgid "nothing quilty to commit, ok." msgstr "niets quilt-achtig vast te leggen, oké." -#: ../dgit:4147 +#: ../dgit:4183 msgid " (wanted to commit patch update)" msgstr " (wilde een patch-update vastleggen)" -#: ../dgit:4151 +#: ../dgit:4187 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" @@ -1050,7 +1055,7 @@ msgstr "" "Vastleggen van (commit) Debian 3.0 (quilt) metadata\n" "\n" -#: ../dgit:4189 +#: ../dgit:4225 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" @@ -1058,60 +1063,60 @@ msgstr "" "Opknappen van `%s' wordt niet gedaan, wegens ----no-quilt-fixup of --" "quilt=nocheck" -#: ../dgit:4194 +#: ../dgit:4230 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "Indeling `%s', moet de patch-stack nakijken/bijwerken" -#: ../dgit:4204 +#: ../dgit:4241 #, perl-format msgid "commit id %s" msgstr "vastleggings-id (commit id) %s" -#: ../dgit:4210 +#: ../dgit:4247 #, perl-format msgid "and left in %s" msgstr "en achtergelaten in %s" -#: ../dgit:4236 +#: ../dgit:4273 #, perl-format msgid "Wanted tag %s (%s) on dgit server, but not found\n" msgstr "Wenste tag %s (%s) op de dgit-server, maar niet gevonden\n" -#: ../dgit:4239 +#: ../dgit:4276 #, perl-format msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n" msgstr "Wenste tag %s (één van: %s) op de dgit-server, maar niet gevonden\n" -#: ../dgit:4247 +#: ../dgit:4284 #, perl-format msgid "%s (%s) .. %s (%s) is not fast forward\n" msgstr "" "%s (%s) .. %s (%s) is niet fast forward (geen lineaire " "veranderingsgeschiedenis)\n" -#: ../dgit:4256 +#: ../dgit:4293 msgid "version currently in archive" msgstr "momenteel in het archief aanwezige versie" -#: ../dgit:4265 +#: ../dgit:4302 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" "Het changlog-bestand van het pakket wordt gecontroleerd op archiefversie " "%s ..." -#: ../dgit:4274 +#: ../dgit:4311 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "veld %s van dpkg-parsechangelog %s" -#: ../dgit:4285 +#: ../dgit:4322 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "Vermeldt debian/changelog misschien %s niet?" -#: ../dgit:4288 +#: ../dgit:4325 #, perl-format msgid "" "%s is %s\n" @@ -1120,7 +1125,7 @@ msgstr "" "%s is %s\n" "Uw boom lijkt gebaseerd op een eerdere (niet geüploade) %s.\n" -#: ../dgit:4293 +#: ../dgit:4330 #, perl-format msgid "" "d/changelog entry for %s is unfinalised!\n" @@ -1129,28 +1134,28 @@ msgstr "" "d/changelog-item voor %s is niet afgerond!\n" "Uw boom lijkt gebaseerd op een eerdere (niet geüploade) %s.\n" -#: ../dgit:4307 +#: ../dgit:4344 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "Verklaren dat HEAD alle wijzigingen uit %s omvat..." -#: ../dgit:4363 +#: ../dgit:4400 msgid "Checking that HEAD includes all changes in archive..." msgstr "Controleren dat HEAD alle wijzigingen uit het archief omvat..." -#: ../dgit:4372 +#: ../dgit:4409 msgid "maintainer view tag" msgstr "tag weergave pakketonderhouder" -#: ../dgit:4374 +#: ../dgit:4411 msgid "dgit view tag" msgstr "tag weergave dgit" -#: ../dgit:4375 +#: ../dgit:4412 msgid "current archive contents" msgstr "huidige inhoud van het archief" -#: ../dgit:4388 +#: ../dgit:4425 msgid "" "| Not fast forward; maybe --trust-changelog is needed ? Please see " "dgit(1).\n" @@ -1158,47 +1163,47 @@ msgstr "" "| Niet fast forward; is misschien --trust-changelog nodig? Raadpleeg " "dgit(1).\n" -#: ../dgit:4398 +#: ../dgit:4435 #, perl-format msgid "Declare fast forward from %s\n" msgstr "Lineair (fast forward) declareren vanuit %s\n" -#: ../dgit:4399 +#: ../dgit:4436 #, perl-format msgid "Make fast forward from %s\n" msgstr "Lineair (fast forward) maken vanuit %s\n" -#: ../dgit:4403 +#: ../dgit:4440 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "Maakte een pseudo-samenvoeging van %s in de dgit-weergave." -#: ../dgit:4416 +#: ../dgit:4453 #, perl-format msgid "Declare fast forward from %s" msgstr "Lineair (fast forward) declareren vanuit %s" -#: ../dgit:4424 +#: ../dgit:4461 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "Pseudo-samenvoeging maken van %s naar uw HEAD." -#: ../dgit:4439 +#: ../dgit:4476 #, perl-format msgid "%s field `%s' is not expected `%s'" msgstr "%s-veld `%s' wordt niet verwacht `%s'" -#: ../dgit:4471 +#: ../dgit:4508 #, perl-format msgid "%s is for %s %s but debian/changelog is for %s %s" msgstr "%s is voor %s %s maar debian/changelog is voor %s %s" -#: ../dgit:4514 +#: ../dgit:4551 #, perl-format msgid "DEP-14 tag %s does not exist (--dep14tag-reuse=%s)" msgstr "DEP-14 tag %s bestaat niet (--dep14tag-reuse=%s)" -#: ../dgit:4528 +#: ../dgit:4565 #, perl-format msgid "" "%s: making fresh DEP-14 tag %s (--dep14tag-reuse=%s), since existing tag " @@ -1207,37 +1212,68 @@ msgstr "" "%s: er wordt een verse DEP-14 tag %s (--dep14tag-reuse=%s) gemaakt, omdat de " "bestaande tag ongeschikt is: %s" -#: ../dgit:4538 +#: ../dgit:4575 #, perl-format msgid "existing DEP-14 tag %s is unsuitable (--dep14tag-reuse=%s): %s" msgstr "de bestaande DEP-14 tag %s is ongeschikt (--dep14tag-reuse=%s): %s" -#: ../dgit:4559 +#: ../dgit:4596 #, perl-format msgid "refers to commit %s, not %s" msgstr "verwijst naar vastlegging (commit) %s, niet %s" -#: ../dgit:4569 +#: ../dgit:4606 #, perl-format msgid "verification failed: git verify-tag: %s" msgstr "verificatie mislukte: git verify-tag: %s" -#: ../dgit:4623 +#: ../dgit:4656 +#, perl-format +msgid "checking that %s corresponds to HEAD" +msgstr "controleren of %s overeenkomt met HEAD" + +#: ../dgit:4695 ../dgit:4707 +#, perl-format +msgid "HEAD specifies a different tree to %s:\n" +msgstr "HEAD geeft een andere boom aan dan %s:\n" + +#: ../dgit:4701 +#, perl-format +msgid "" +"There is a problem with your source tree (see dgit(7) for some hints).\n" +"To see a full diff, run git diff %s %s\n" +msgstr "" +"Er is een probleem met uw broncodeboom (zie dgit(7) voor enkele hints).\n" +"Voer git diff %s %s uit om een volledige diff te zien\n" + +#: ../dgit:4711 +#, perl-format +msgid "" +"Perhaps you forgot to build. Or perhaps there is a problem with your\n" +" source tree (see dgit(7) for some hints). To see a full diff, run\n" +" git diff %s %s\n" +msgstr "" +"Misschien vergat u te bouwen. Of misschien is er een probleem met uw\n" +"broncodeboom (zie dgit(7) voor enkele hints).\n" +"\n" +"Voer git diff %s %s uit om een volledige diff te zien\n" + +#: ../dgit:4730 #, perl-format msgid "%s already contains field %s" msgstr "%s bevat reeds veld %s" -#: ../dgit:4655 +#: ../dgit:4763 #, perl-format msgid "changes field %s `%s' does not match changelog `%s'" msgstr "het changes-veld %s `%s' komt niet overeen met `%s' uit changelog" -#: ../dgit:4711 +#: ../dgit:4819 #, perl-format msgid "(maintainer view tag generated by dgit --quilt=%s)\n" msgstr "(beheerdersweergave-tag gegenereerd door dgit --quilt=%s)\n" -#: ../dgit:4784 +#: ../dgit:4892 #, perl-format msgid "" "warning: server says object %s type %s is tainted, but here it has type %s\n" @@ -1245,20 +1281,20 @@ msgstr "" "waarschuwing: de server zegt dat object %s type %s beschadigd is, maar hier " "heeft het type %s\n" -#: ../dgit:4817 +#: ../dgit:4925 msgid "commit" msgstr "vastlegging (commit)" -#: ../dgit:4819 +#: ../dgit:4927 #, perl-format msgid "object within commit %s" msgstr "object binnen vastlegging (commit) %s" -#: ../dgit:4827 +#: ../dgit:4935 msgid "pushing tainted objects (which server would reject)" msgstr "pushen van beschadigde objecten (die de server zou weigeren)" -#: ../dgit:4835 +#: ../dgit:4943 msgid "" "Push failed, while checking state of the archive.\n" "You can retry the push, after fixing the problem, if you like.\n" @@ -1267,14 +1303,14 @@ msgstr "" "Als u wilt, kunt u het pushen opnieuw proberen nadat het probleem opgelost " "werd.\n" -#: ../dgit:4845 +#: ../dgit:4953 msgid "" "package appears to be new in this suite; if this is intentional, use --new" msgstr "" "pakket lijkt nieuw te zijn in deze suite; als dit opzettelijk is, gebruik " "dan --new" -#: ../dgit:4850 +#: ../dgit:4958 msgid "" "Push failed, while preparing your push.\n" "You can retry the push, after fixing the problem, if you like.\n" @@ -1283,12 +1319,12 @@ msgstr "" "Als u wilt, kunt u het pushen opnieuw proberen nadat het probleem opgelost " "werd.\n" -#: ../dgit:4869 +#: ../dgit:4977 #, perl-format msgid "looked for .dsc %s, but %s; maybe you forgot to build" msgstr "zocht naar .dsc %s, maar %s; misschien bent u vergeten te bouwen" -#: ../dgit:4885 +#: ../dgit:4993 #, perl-format msgid "" "Branch is managed by git-debrebase (%s\n" @@ -1301,7 +1337,7 @@ msgstr "" "Geef de juiste --quilt-optie door of pas je git-configuratie aan.\n" "Of voer misschien git-debrebase forget-was-ever-debrebase uit.\n" -#: ../dgit:4904 +#: ../dgit:5012 #, perl-format msgid "" "You seem to be trying to push an old version.\n" @@ -1312,7 +1348,7 @@ msgstr "" "Huidige versie in het archief: %s (in suite %s)\n" "Versie die u probeert te uploaden: %s\n" -#: ../dgit:4918 +#: ../dgit:5026 #, perl-format msgid "" "--quilt=%s but no cached dgit view:\n" @@ -1321,7 +1357,7 @@ msgstr "" "--quilt=%s maar geen dgit-weergave in de cache:\n" " veranderde HEAD misschien sinds dgit build[-source] ?" -#: ../dgit:4954 +#: ../dgit:5062 msgid "" "dgit push: HEAD is not a descendant of the archive's version.\n" "To overwrite the archive's contents, pass --trust-changelog, or --" @@ -1335,7 +1371,7 @@ msgstr "" "Gebruik --deliberately-not-fast-forward om de geschiedenis te herschrijven, " "indien dit toegestaan wordt door het archief." -#: ../dgit:4969 +#: ../dgit:5077 #, perl-format msgid "" "\n" @@ -1349,43 +1385,12 @@ msgstr "" " van u was, voeg dan gewoon een nieuw changelog-item toe\n" "voor een nieuw versienummer en probeer het opnieuw.\n" -#: ../dgit:4975 +#: ../dgit:5083 #, perl-format msgid "Tag %s already exists.\n" msgstr "Tag %s bestaat reeds.\n" -#: ../dgit:4980 -#, perl-format -msgid "checking that %s corresponds to HEAD" -msgstr "controleren of %s overeenkomt met HEAD" - -#: ../dgit:5014 ../dgit:5026 -#, perl-format -msgid "HEAD specifies a different tree to %s:\n" -msgstr "HEAD geeft een andere boom aan dan %s:\n" - -#: ../dgit:5020 -#, perl-format -msgid "" -"There is a problem with your source tree (see dgit(7) for some hints).\n" -"To see a full diff, run git diff %s %s\n" -msgstr "" -"Er is een probleem met uw broncodeboom (zie dgit(7) voor enkele hints).\n" -"Voer git diff %s %s uit om een volledige diff te zien\n" - -#: ../dgit:5030 -#, perl-format -msgid "" -"Perhaps you forgot to build. Or perhaps there is a problem with your\n" -" source tree (see dgit(7) for some hints). To see a full diff, run\n" -" git diff %s %s\n" -msgstr "" -"Misschien vergat u te bouwen. Of misschien is er een probleem met uw\n" -"broncodeboom (zie dgit(7) voor enkele hints).\n" -"\n" -"Voer git diff %s %s uit om een volledige diff te zien\n" - -#: ../dgit:5041 +#: ../dgit:5093 #, perl-format msgid "" "failed to find unique changes file (looked for %s in %s); perhaps you need " @@ -1394,18 +1399,18 @@ msgstr "" "het unieke changes-bestand werd niet gevonden (gezocht naar %s in %s); " "misschien moet u dgit -C gebruiken" -#: ../dgit:5063 +#: ../dgit:5115 msgid "uploading binaries, although distro policy is source only" msgstr "" "uploaden van binaire bestanden, hoewel het distributiebeleid alleen broncode " "is" -#: ../dgit:5067 +#: ../dgit:5119 msgid "source-only upload, although distro policy requires .debs" msgstr "" "upload van uitsluitend broncode, hoewel het distributiebeleid .debs vereist" -#: ../dgit:5071 +#: ../dgit:5123 #, perl-format msgid "" "source-only upload, though package appears entirely NEW\n" @@ -1414,18 +1419,18 @@ msgstr "" "upload van uitsluitend broncode, hoewel het pakket volledig NIEUW lijkt\n" "(dit is waarschijnlijk in strijd met het beleid in %s)" -#: ../dgit:5078 +#: ../dgit:5130 #, perl-format msgid "unknown source-only-uploads policy `%s'" msgstr "onbekend source-only-uploads-beleid `%s'" -#: ../dgit:5085 +#: ../dgit:5137 #, perl-format msgid "policy-query-supported-ssh value '%s' must be false/true/unknown" msgstr "" "waarde '%s' van policy-query-supported-ssh moet false/true/unknown zijn" -#: ../dgit:5148 +#: ../dgit:5200 msgid "" "Push failed, while signing the tag.\n" "You can retry the push, after fixing the problem, if you like.\n" @@ -1434,7 +1439,7 @@ msgstr "" "Als u wilt, kunt u het pushen opnieuw proberen nadat het probleem opgelost " "werd.\n" -#: ../dgit:5175 +#: ../dgit:5227 msgid "" "Push failed, *after* signing the tag.\n" "If you want to try again, you should use a new version number.\n" @@ -1442,7 +1447,7 @@ msgstr "" "Het pushen mislukte *na* het ondertekenen van de tag. Indien u\n" "opnieuw wenst te proberen, moet u een nieuw versienummer gebruiken.\n" -#: ../dgit:5194 +#: ../dgit:5246 msgid "" "Push failed, while updating the remote git repository - see messages above.\n" "If you want to try again, you should use a new version number.\n" @@ -1451,7 +1456,7 @@ msgstr "" "git-opslagplaats - zie berichten hierboven. Indien u\n" "opnieuw wenst te proberen, moet u een nieuw versienummer gebruiken.\n" -#: ../dgit:5211 +#: ../dgit:5263 msgid "" "Push failed, while obtaining signatures on the .changes and .dsc.\n" "If it was just that the signature failed, you may try again by using\n" @@ -1459,20 +1464,20 @@ msgid "" "above), and then dput that changes file to complete the upload.\n" "If you need to change the package, you must use a new version number.\n" msgstr "" -"Het pushen mislukte tijdens het zetten van handtekeningen op .changes en ." -"dsc.\n" +"Het pushen mislukte tijdens het zetten van handtekeningen op .changes " +"en .dsc.\n" "Als alleen de handtekening fout liep, kunt u het opnieuw proberen door\n" "debsign handmatig te gebruiken om het changes-bestand te ondertekenen\n" "(zie hierboven voor het door dgit gebruikte commando)\n" "en dput daarna dat changes-bestand om de upload te voltooien.\n" "Indien u het pakket moet wijzigen, moet u een nieuw versienummer gebruiken.\n" -#: ../dgit:5229 +#: ../dgit:5281 #, perl-format msgid "[new .dsc & .changes left in %s.tmp, %s.tmp]" msgstr "[nieuw .dsc & .changes achtergelaten in %s.tmp, %s.tmp]" -#: ../dgit:5236 +#: ../dgit:5288 #, perl-format msgid "" "Push failed, while uploading package(s) to the archive server.\n" @@ -1488,40 +1493,40 @@ msgstr "" "Als dat .changes-bestand beschadigd is, moet u een nieuw\n" "versienummer gebruiken voor uw volgende uploadpoging.\n" -#: ../dgit:5245 +#: ../dgit:5297 #, perl-format msgid "pushed and uploaded %s" msgstr "%s gepusht en geüpload" -#: ../dgit:5257 +#: ../dgit:5309 msgid "-p is not allowed with clone; specify as argument instead" msgstr "" "-p niet toegestaan met clone; geef dit in plaats daarvan door als argument" -#: ../dgit:5268 +#: ../dgit:5320 msgid "incorrect arguments to dgit clone" msgstr "foutieve argumenten voor dgit clone" -#: ../dgit:5274 ../git-debrebase:1811 +#: ../dgit:5326 ../git-debrebase:1811 #, perl-format msgid "%s already exists" msgstr "%s bestaat reeds" -#: ../dgit:5288 +#: ../dgit:5340 #, perl-format msgid "remove %s: %s\n" msgstr "verwijderen van %s: %s\n" -#: ../dgit:5292 +#: ../dgit:5344 #, perl-format msgid "check whether to remove %s: %s\n" msgstr "controleren of %s moet worden verwijderd: %s\n" -#: ../dgit:5330 +#: ../dgit:5382 msgid "incorrect arguments to dgit fetch or dgit pull" msgstr "foutieve argumenten voor dgit fetch of dgit pull" -#: ../dgit:5348 +#: ../dgit:5400 msgid "" "dgit pull not yet supported in split view mode (including with view-" "splitting quilt modes)\n" @@ -1529,51 +1534,51 @@ msgstr "" "dgit pull wordt nog niet ondersteund bij gesplitste weergave (met inbegrip " "van quilt-modi welke de weergave splitsen)\n" -#: ../dgit:5357 +#: ../dgit:5409 msgid "dgit checkout needs a suite argument" msgstr "dgit checkout vereist een suite-argument" -#: ../dgit:5420 +#: ../dgit:5472 #, perl-format msgid "setting up vcs-git: %s\n" msgstr "vcs-git instellen: %s\n" -#: ../dgit:5423 +#: ../dgit:5475 #, perl-format msgid "vcs git unchanged: %s\n" msgstr "vcs git onveranderd: %s\n" -#: ../dgit:5425 +#: ../dgit:5477 #, perl-format msgid "changing vcs-git url to: %s\n" msgstr "vcs-git-url wijzigen in: %s\n" -#: ../dgit:5430 +#: ../dgit:5482 #, perl-format msgid "fetching (%s)\n" msgstr "(%s) ophalen\n" -#: ../dgit:5446 +#: ../dgit:5498 #, perl-format msgid "incorrect arguments to dgit %s" msgstr "foutieve argumenten voor dgit %s" -#: ../dgit:5457 +#: ../dgit:5509 #, perl-format msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s" msgstr "dgit %s: changelog vermeldt %s (%s) maar commandoregel vermeldt %s" -#: ../dgit:5481 +#: ../dgit:5533 #, perl-format msgid "dgit push, but dgit.default.push-subcmd set to %s" msgstr "dgit push, maar dgit.default.push-subcmd ingesteld op %s" -#: ../dgit:5489 +#: ../dgit:5541 #, perl-format msgid "dgit rpush, but dgit.default.[r]push-subcmd set to %s" msgstr "dgit rpush, maar dgit.default.[r]push-subcmd ingesteld op %s" -#: ../dgit:5502 +#: ../dgit:5554 #, perl-format msgid "" "warning: \"dgit %s\" currently means \"dgit %s-built\" (by default)\n" @@ -1582,7 +1587,7 @@ msgstr "" "aandacht: \"dgit %s\" betekent momenteel \"dgit %s-built\" (standaard)\n" "aandacht: maar zal veranderen naar \"dgit %s-source\". Zie dgit!(1).\n" -#: ../dgit:5542 +#: ../dgit:5594 #, perl-format msgid "" "build host has dgit rpush protocol versions %s but invocation host has %s" @@ -1590,89 +1595,89 @@ msgstr "" "bouwcomputer heeft dgit rpush protocolversies %s maar aanroepcomputer heeft " "%s" -#: ../dgit:5626 +#: ../dgit:5678 #, perl-format msgid "create %s: %s" msgstr "%s creëren: %s" -#: ../dgit:5672 +#: ../dgit:5724 #, perl-format msgid "build host child failed: %s" msgstr "bouwcomputer-dochter mislukte: %s" -#: ../dgit:5675 +#: ../dgit:5727 msgid "all done\n" msgstr "helemaal klaar\n" -#: ../dgit:5684 +#: ../dgit:5736 #, perl-format msgid "file %s (%s) twice" msgstr "bestand %s (%s) tweemaal" -#: ../dgit:5690 +#: ../dgit:5742 msgid "bad param spec" msgstr "slechte param spec" -#: ../dgit:5696 +#: ../dgit:5748 msgid "bad previously spec" msgstr "slechte vroegere spec" -#: ../dgit:5768 +#: ../dgit:5820 #, perl-format msgid "buildinfo mismatch in field %s" msgstr "bouwinfo in veld %s komt niet overeen" -#: ../dgit:5771 +#: ../dgit:5823 msgid "buildinfo mismatch in field Architecture" msgstr "bouwinfo komt niet overeen in veld Architecture" -#: ../dgit:5773 +#: ../dgit:5825 #, perl-format msgid "buildinfo contains forbidden field %s" msgstr "bouwinfo bevat verboden veld %s" -#: ../dgit:5795 +#: ../dgit:5847 msgid "build-host-supplied changes file is not source-only" msgstr "" "door bouwcomputer geleverd changes-bestand is niet uitsluitend broncode" -#: ../dgit:5825 +#: ../dgit:5877 msgid "remote changes file" msgstr "extern changes-bestand" -#: ../dgit:5908 +#: ../dgit:5960 msgid "not a plain file\n" msgstr "is geen gewoon bestand\n" -#: ../dgit:5914 +#: ../dgit:5966 msgid "mode or type changed in unsupported way\n" msgstr "modus of type gewijzigd op niet-ondersteunde manier\n" -#: ../dgit:5917 +#: ../dgit:5969 msgid "modified symlink\n" msgstr "symbolische koppeling gewijzigd\n" -#: ../dgit:5920 +#: ../dgit:5972 msgid "deletion of symlink\n" msgstr "verwijdering van symbolische koppeling\n" -#: ../dgit:5924 +#: ../dgit:5976 msgid "creation with non-default mode, or symlink\n" msgstr "aanmaken met niet-standaardmodus, of symbolische koppeling\n" -#: ../dgit:5952 +#: ../dgit:6004 #, perl-format msgid "dgit: cannot represent change: %s: %s\n" msgstr "dgit: kan wijziging niet representeren: %s: %s\n" -#: ../dgit:5957 +#: ../dgit:6009 msgid "" "HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" msgstr "" "HEAD bevat wijzigingen aan .orig[s] welke niet door `3.0 (quilt)' vertolkt " "kunnen worden\n" -#: ../dgit:5995 +#: ../dgit:6047 #, perl-format msgid "" "\n" @@ -1683,7 +1688,7 @@ msgstr "" "Voor een volledig diff met de problemen, typ::\n" " %s\n" -#: ../dgit:6002 +#: ../dgit:6054 #, perl-format msgid "" "--quilt=%s specified, implying patches-unapplied git tree\n" @@ -1692,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:6008 +#: ../dgit:6060 msgid "" "\n" " ... debian/patches is missing; perhaps this is a patch queue branch?" @@ -1700,7 +1705,7 @@ msgstr "" "\n" " ... debian/patches ontbreekt; is dit misschien een patchwachtrijtak?" -#: ../dgit:6015 +#: ../dgit:6067 #, perl-format msgid "" "--quilt=%s specified, implying patches-applied git tree\n" @@ -1710,16 +1715,16 @@ msgstr "" " maar de git-boom verschilt van wat het toepassen van debian/patches op " "bovenstroom oplevert\n" -#: ../dgit:6029 +#: ../dgit:6081 #, perl-format msgid "Combine debian/ with upstream source for %s\n" msgstr "Combinatie maken van debian/ met bovenstroomse bron van %s\n" -#: ../dgit:6037 +#: ../dgit:6089 msgid "dgit view: creating patches-applied version using gbp pq" msgstr "dgit view: een patches-applied versie creëren met gbp pq" -#: ../dgit:6048 +#: ../dgit:6100 #, perl-format msgid "" "--quilt=%s specified, implying that HEAD is for use with a\n" @@ -1730,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:6056 +#: ../dgit:6108 msgid "dgit view: creating patch to represent .gitignore changes" msgstr "dgit view: patch maken om .gitignore-wijzigingen weer te geven" -#: ../dgit:6061 +#: ../dgit:6113 #, 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:6067 +#: ../dgit:6119 msgid "" "Subject: Update .gitignore from Debian packaging branch\n" "\n" @@ -1755,34 +1760,34 @@ msgstr "" "bijwerkingen te verstrekken aan gebruikers van de weergave van het pakket\n" "in het officiële Debian-archief.\n" -#: ../dgit:6090 +#: ../dgit:6142 msgid "Commit patch to update .gitignore\n" msgstr "Patch om .gitignore bij te werken vastleggen\n" -#: ../dgit:6160 +#: ../dgit:6212 msgid "maximum search space exceeded" msgstr "maximale zoekruimte overschreden" -#: ../dgit:6178 +#: ../dgit:6230 #, perl-format msgid "has %s not %s" msgstr "bevat %s, niet %s" -#: ../dgit:6187 +#: ../dgit:6239 msgid "root commit" msgstr "beginvastlegging (root commit)" -#: ../dgit:6193 +#: ../dgit:6245 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "samenvoeging (merge) (%s niet-triviale ouders)" -#: ../dgit:6205 +#: ../dgit:6257 #, perl-format msgid "changed %s" msgstr "gewijzigd: %s" -#: ../dgit:6224 +#: ../dgit:6276 #, perl-format msgid "" "\n" @@ -1791,23 +1796,23 @@ msgstr "" "\n" "%s: fout: een quilt fixup kan niet lineair zijn. Gestopt bij:\n" -#: ../dgit:6231 +#: ../dgit:6283 #, perl-format msgid "%s: %s: %s\n" msgstr "%s: %s: %s\n" -#: ../dgit:6243 +#: ../dgit:6295 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:6246 +#: ../dgit:6298 msgid "quilt fixup cannot be linear, smashing..." msgstr "" "de quilt fixup kan niet lineair zijn, de smash strategie wordt gebruikt..." -#: ../dgit:6260 +#: ../dgit:6312 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1818,43 +1823,43 @@ msgstr "" "Laatste (tot en met) %s git-wijzigingen, ter informatie:\n" "\n" -#: ../dgit:6267 +#: ../dgit:6319 msgid "quiltify linearisation planning successful, executing..." msgstr "linearisatieplanning voor quiltify was succesvol, wordt uitgevoerd..." -#: ../dgit:6301 +#: ../dgit:6353 msgid "contains unexpected slashes\n" msgstr "bevat onverwachte slashes\n" -#: ../dgit:6302 +#: ../dgit:6354 msgid "contains leading punctuation\n" msgstr "bevat leestekens aan het begin\n" -#: ../dgit:6303 +#: ../dgit:6355 msgid "contains bad character(s)\n" msgstr "bevat foutieve teken(s)\n" -#: ../dgit:6304 +#: ../dgit:6356 msgid "is series file\n" msgstr "is een series-bestand\n" -#: ../dgit:6305 +#: ../dgit:6357 msgid "too long\n" msgstr "te lang\n" -#: ../dgit:6309 +#: ../dgit:6361 #, 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:6338 +#: ../dgit:6390 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "dgit: fout bij de transliteratie van de patch-titel: %s" -#: ../dgit:6413 +#: ../dgit:6465 #, perl-format msgid "" "quilt mode %s does not make sense (or is not supported) with single-debian-" @@ -1862,30 +1867,30 @@ msgid "" msgstr "" "quilt modus %s is zinloos (of wordt niet ondersteund) met single-debian-patch" -#: ../dgit:6438 +#: ../dgit:6490 msgid "converted" msgstr "omgezet" -#: ../dgit:6439 +#: ../dgit:6491 #, perl-format msgid "dgit view: created (%s)" msgstr "dgit-weergave: gecreëerd: (%s)" -#: ../dgit:6495 +#: ../dgit:6547 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" "Vastleggingsverwijdering (commit removal) van .pc (quilt-seriegegevens)\n" -#: ../dgit:6505 +#: ../dgit:6557 msgid "starting quiltify (single-debian-patch)" msgstr "quiltify wordt gestart (één enkele debian-patch)" -#: ../dgit:6541 +#: ../dgit:6593 #, perl-format msgid "regenerating patch using git diff (--quilt=%s)" msgstr "patch opnieuw genereren met git diff (--quilt=%s)" -#: ../dgit:6635 +#: ../dgit:6687 msgid "" "warning: package uses dpkg-source include-binaries feature - not all changes " "are visible in patches!\n" @@ -1893,47 +1898,47 @@ msgstr "" "opgelet: pakket gebruikt de functie include-binaries van dpkg-source - niet " "alle wijzigingen zijn zichtbaar in patches!\n" -#: ../dgit:6644 +#: ../dgit:6696 #, perl-format msgid "warning: ignoring bad include-binaries file %s: %s\n" msgstr "opgelet: slecht nclude-binaries-bestand %s wordt genegeerd: %s\n" -#: ../dgit:6647 +#: ../dgit:6699 #, perl-format msgid "forbidden path component '%s'" msgstr "niet toegelaten pad-component '%s'" -#: ../dgit:6657 +#: ../dgit:6709 #, perl-format msgid "path starts with '%s'" msgstr "pad begint met '%s'" -#: ../dgit:6667 +#: ../dgit:6719 #, perl-format msgid "path to '%s' not a plain file or directory" msgstr "pad naar '%s' geen gewoon bestand of map" -#: ../dgit:6725 +#: ../dgit:6777 #, 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:6757 +#: ../dgit:6809 #, perl-format msgid "dgit view: found cached (%s)" msgstr "dgit-weergave: gecachete (%s) aangetroffen" -#: ../dgit:6762 +#: ../dgit:6814 msgid "dgit view: found cached, no changes required" msgstr "dgit-weergave: gecachete aangetroffen, geen wijzigingen vereist" -#: ../dgit:6797 +#: ../dgit:6849 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "toestand van quilt wordt nagegaan (meerdere patches, %s-modus)" -#: ../dgit:6890 +#: ../dgit:6942 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" @@ -1947,37 +1952,37 @@ msgstr "" " dgit can enkel bepaalde soorten anomalieën repareren\n" " (afhankelijk van de quilt-modus). Raadpleeg --quilt= in dgit(1).\n" -#: ../dgit:6904 +#: ../dgit:6956 msgid "Tree already contains .pc - will delete it." msgstr "Boom bevat reeds een .pc - zal dit verwijderen." -#: ../dgit:6938 +#: ../dgit:6990 msgid "baredebian quilt fixup: could not find any origs" msgstr "baredebian quilt reparatie: kon geen origs vinden" -#: ../dgit:6951 +#: ../dgit:7003 msgid "tarball" msgstr "tar-archief" -#: ../dgit:6969 +#: ../dgit:7021 #, perl-format msgid "Combine orig tarballs for %s %s" msgstr "Combineren van orig tar-archieven voor %s %s" -#: ../dgit:6985 +#: ../dgit:7037 msgid "tarballs" msgstr "tar-archieven" -#: ../dgit:6999 +#: ../dgit:7051 msgid "upstream" msgstr "bovenstroom" -#: ../dgit:7023 +#: ../dgit:7075 #, 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:7033 +#: ../dgit:7085 #, perl-format msgid "" "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n" @@ -1986,42 +1991,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:7043 +#: ../dgit:7095 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:7047 +#: ../dgit:7099 msgid "This might be a patches-unapplied branch." msgstr "Dit is mogelijk een tak zonder toepassing van patches." -#: ../dgit:7050 +#: ../dgit:7102 msgid "This might be a patches-applied branch." msgstr "Dit is mogelijk een tak met toegepaste patches." -#: ../dgit:7053 +#: ../dgit:7105 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:7056 +#: ../dgit:7108 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" "Waarschuwing: Boom bevat .gitattributes. Zie GITATTRIBUTES in dgit(7)." -#: ../dgit:7060 +#: ../dgit:7112 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:7071 +#: ../dgit:7123 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "quiltify wordt gestart (meerdere patches, %s-modus)" -#: ../dgit:7110 +#: ../dgit:7162 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -2035,12 +2040,12 @@ msgstr "" "dgit: (Overweeg het gebruik van --clean=git en (of) dgit sbuild.)\n" "\n" -#: ../dgit:7122 +#: ../dgit:7174 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:7151 +#: ../dgit:7203 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" @@ -2052,18 +2057,18 @@ msgstr "" "negeren, of --clean=git (-wg/-wgf) om in de plaats `git clean' te " "gebruiken.\n" -#: ../dgit:7163 +#: ../dgit:7215 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" "de boom bevat niet-vastgelegde bestanden en --clean=check werd opgegeven" -#: ../dgit:7166 +#: ../dgit:7218 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:7169 +#: ../dgit:7221 msgid "" "tree contains uncommitted, untracked, unignored files\n" "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them.\n" @@ -2074,7 +2079,7 @@ msgstr "" "Om ze in de bouw op te nemen, is het gewoonlijk best om ze gewoon vast te " "leggen." -#: ../dgit:7183 +#: ../dgit:7235 #, perl-format msgid "" "quilt mode %s (generally needs untracked upstream files)\n" @@ -2083,21 +2088,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:7200 +#: ../dgit:7252 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" "de boom bevat niet-vastgelegde bestanden (na het uitvoeren van rules clean)" -#: ../dgit:7214 +#: ../dgit:7266 msgid "clean takes no additional arguments" msgstr "met clean kunnen geen extra argumenten opgegeven worden" -#: ../dgit:7233 +#: ../dgit:7285 #, perl-format msgid "-p specified package %s, but changelog says %s" msgstr "-p specificeerde pakket %s, maar het changelog-bestand vermeldt %s" -#: ../dgit:7243 +#: ../dgit:7295 msgid "" "dgit: --include-dirty is not supported with split view (including with view-" "splitting quilt modes)" @@ -2105,7 +2110,7 @@ msgstr "" "dgit: --include-dirty wordt niet ondersteund bij gesplitste weergave (met " "inbegrip van quilt-modi welke de weergave splitsen)" -#: ../dgit:7251 +#: ../dgit:7303 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" @@ -2114,7 +2119,7 @@ msgstr "" "ignore'\n" "Gebruik in de plaats 'tar-ignore=.git' in d/s/options. (Zie #908747.)\n" -#: ../dgit:7256 +#: ../dgit:7308 #, perl-format msgid "" "%s: warning: debian/source/options contains bare 'tar-ignore'\n" @@ -2124,33 +2129,33 @@ msgstr "" "Hierdoor kunnen .gitignore-bestanden ten onrechte worden overgeslagen. Zie " "#908747.\n" -#: ../dgit:7267 +#: ../dgit:7319 #, perl-format msgid "dgit: --quilt=%s, %s" msgstr "dgit: --quilt=%s, %s" -#: ../dgit:7271 +#: ../dgit:7323 msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian" msgstr "dgit: --upstream-commitish is enkel zinvol met --quilt=baredebian" -#: ../dgit:7306 +#: ../dgit:7358 #, perl-format msgid "remove old changes file %s: %s" msgstr "verwijder oud changes-bestand %s: %s" -#: ../dgit:7308 +#: ../dgit:7360 #, perl-format msgid "would remove %s" msgstr "zou %s verwijderen" -#: ../dgit:7326 +#: ../dgit:7378 #, 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:7333 +#: ../dgit:7385 #, perl-format msgid "" "warning: option %s should probably be passed to dgit before %s sub-command " @@ -2161,56 +2166,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:7359 +#: ../dgit:7411 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:7365 +#: ../dgit:7417 #, perl-format msgid "changelog will contain changes since %s" msgstr "changelog zal wijzigingen sinds %s bevatten" -#: ../dgit:7368 +#: ../dgit:7420 msgid "package seems new, not specifying -v" msgstr "pakket lijkt nieuw te zijn, geen vermelding van -v" -#: ../dgit:7411 +#: ../dgit:7463 msgid "Wanted to build nothing!" msgstr "Wilde niets bouwen!" -#: ../dgit:7449 +#: ../dgit:7501 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "slechts één changes-bestand van bouw (%s)\n" -#: ../dgit:7456 +#: ../dgit:7508 #, perl-format msgid "%s found in binaries changes file %s" msgstr "%s aangetroffen in changes-bestand %s van de binaire pakketten" -#: ../dgit:7463 +#: ../dgit:7515 #, perl-format msgid "%s unexpectedly not created by build" msgstr "%s tegen de verwachtingen in niet gecreëerd door de bouw" -#: ../dgit:7467 +#: ../dgit:7519 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "installeer nieuw changes %s{,.inmulti}: %s" -#: ../dgit:7472 +#: ../dgit:7524 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "fout nummer van verschillende changes-bestanden (%s)" -#: ../dgit:7475 +#: ../dgit:7527 #, perl-format msgid "build successful, results in %s\n" msgstr "bouw was succesvol, resultaten in %s\n" -#: ../dgit:7488 +#: ../dgit:7540 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -2222,11 +2227,11 @@ msgstr "" "resultaat.\n" "De suggestie is dat u %s verwijdert.\n" -#: ../dgit:7506 +#: ../dgit:7558 msgid "build successful\n" msgstr "de bouw was succesvol\n" -#: ../dgit:7514 +#: ../dgit:7566 #, perl-format msgid "" "%s: warning: build-products-dir set, but not supported by dpkg-buildpackage\n" @@ -2237,46 +2242,46 @@ msgstr "" "%s: waarschuwing: build-products-dir zal genegeerd worden; bestanden zullen " "gaan naar ..\n" -#: ../dgit:7625 +#: ../dgit:7677 #, perl-format msgid "remove %s: %s" msgstr "verwijder %s: %s" -#: ../dgit:7632 +#: ../dgit:7684 msgid "--tag2upload-builder-mode needs split-brain mode" msgstr "--tag2upload-builder-mode heeft de modus split-brain nodig" -#: ../dgit:7637 +#: ../dgit:7689 msgid "upstream tag and not commit, or vice-versa" msgstr "upstream-tag en geen vastlegging (commit), of omgekeerd" -#: ../dgit:7693 +#: ../dgit:7745 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "--include-dirty niet ondersteund met --build-products-dir, sorry" -#: ../dgit:7718 +#: ../dgit:7770 msgid "--include-dirty not supported with --tag2upload-builder-mode" msgstr "--include-dirty niet ondersteund met --tag2upload-builder-mode" -#: ../dgit:7731 +#: ../dgit:7783 msgid "source-only buildinfo" msgstr "uitsluitend broncode bouwinfo" -#: ../dgit:7760 +#: ../dgit:7812 #, perl-format msgid "put in place new built file (%s): %s" msgstr "zet nieuw gebouwd bestand (%s) op zijn plaats: %s" -#: ../dgit:7777 +#: ../dgit:7840 msgid "build-source takes no additional arguments" msgstr "build-source moet zonder bijkomende argumenten gebruikt worden" -#: ../dgit:7781 +#: ../dgit:7845 #, perl-format msgid "source built, results in %s and %s" msgstr "broncodepakket is gebouwd, resultaten in %s en %s" -#: ../dgit:7788 +#: ../dgit:7852 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" @@ -2284,25 +2289,25 @@ msgstr "" "dgit push-source: --include-dirty/--ignore-dirty zijn zinloos met push-" "source!" -#: ../dgit:7793 +#: ../dgit:7857 msgid "--tag2upload-builder-mode not supported with -C" msgstr "--tag2upload-builder-mode niet ondersteund met -C" -#: ../dgit:7796 +#: ../dgit:7860 msgid "source changes file" msgstr "broncode-changes-bestand" -#: ../dgit:7798 +#: ../dgit:7862 msgid "user-specified changes file is not source-only" msgstr "" "door de gebruiker opgegeven changes-bestand is niet 'uitsluitend broncode'" -#: ../dgit:7818 ../dgit:7820 +#: ../dgit:7882 ../dgit:7884 #, perl-format msgid "%s (in build products dir): %s" msgstr "%s (in bouwproductenmap): %s" -#: ../dgit:7834 +#: ../dgit:7898 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" @@ -2311,7 +2316,7 @@ msgstr "" "specifieke\n" "binaire pakketten te bouwen; dgit 1.4 was gewend dit te overschrijven.)\n" -#: ../dgit:7847 +#: ../dgit:7911 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" @@ -2319,7 +2324,7 @@ msgstr "" "u vroeg een bouwprogramma maar uw debbuildopts vroeg geen enkel binair " "pakket - is dit echt wat u bedoelde?" -#: ../dgit:7851 +#: ../dgit:7915 msgid "" "we must build a .dsc to pass to the builder but your debbuiltopts forbids " "the building of a source package; cannot continue" @@ -2328,65 +2333,65 @@ msgstr "" "debbuiltopts verbiedt het bouwen van een broncodepakket; voortgaan is " "onmogelijk" -#: ../dgit:7881 +#: ../dgit:7945 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "foutieve argumenten voor dgit print-unapplied-treeish" -#: ../dgit:7902 +#: ../dgit:7966 msgid "source tree" msgstr "broncodeboom" -#: ../dgit:7904 +#: ../dgit:7968 #, perl-format msgid "dgit: import-dsc: %s" msgstr "dgit: import-dsc: %s" -#: ../dgit:7917 +#: ../dgit:7981 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "onbekende onderliggende optie `%s' voor dgit import-dsc" -#: ../dgit:7921 +#: ../dgit:7985 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "gebruik: dgit import-dsc .../PAD/NAAR/.DSC TAK" -#: ../dgit:7925 +#: ../dgit:7989 msgid "dry run makes no sense with import-dsc" msgstr "testuitvoering (dry run) is zinloos met import-dsc" -#: ../dgit:7942 +#: ../dgit:8006 #, perl-format msgid "%s is checked out - will not update it" msgstr "%s is binnengehaald (checked out) - zal het niet bijwerken" -#: ../dgit:7947 +#: ../dgit:8011 #, perl-format msgid "open import .dsc (%s): %s" msgstr "open import-.dsc (%s): %s" -#: ../dgit:7949 +#: ../dgit:8013 #, perl-format msgid "read %s: %s" msgstr "lees %s: %s" -#: ../dgit:7960 +#: ../dgit:8024 msgid "import-dsc signature check failed" msgstr "controle ondertekening van import-dsc mislukte" -#: ../dgit:7963 +#: ../dgit:8027 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "%s: waarschuwing: niet-ondertekend .dsc wordt geïmporteerd\n" -#: ../dgit:7974 +#: ../dgit:8038 msgid "Dgit metadata in .dsc" msgstr "Dgit-metadata in .dsc" -#: ../dgit:7985 +#: ../dgit:8049 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:7994 +#: ../dgit:8058 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -2397,21 +2402,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:8001 +#: ../dgit:8065 msgid "Not fast forward, forced update." msgstr "Niet lineair (fast forward), gedwongen update." -#: ../dgit:8003 +#: ../dgit:8067 #, perl-format msgid "Not fast forward to %s" msgstr "Niet lineair (fast forward) naar %s" -#: ../dgit:8008 +#: ../dgit:8072 #, perl-format msgid "updated git ref %s" msgstr "git ref %s geüpdatet" -#: ../dgit:8013 +#: ../dgit:8077 #, perl-format msgid "" "Branch %s already exists\n" @@ -2423,88 +2428,142 @@ msgstr "" "geschiedenis\n" "Geef +%s op om te overschrijven en bestaande geschiedenis te verwijderen\n" -#: ../dgit:8033 +#: ../dgit:8097 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "lstat %s werkt maar stat geeft %s !" -#: ../dgit:8035 +#: ../dgit:8099 #, perl-format msgid "stat %s: %s" msgstr "stat %s: %s" -#: ../dgit:8043 +#: ../dgit:8107 #, perl-format msgid "import %s requires %s, but: %s" msgstr "importeren van %s vereist %s, maar: %s" -#: ../dgit:8062 +#: ../dgit:8126 #, 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:8066 +#: ../dgit:8130 #, perl-format msgid "symlink %s to %s: %s" msgstr "symbolische koppeling %s naar %s: %s" -#: ../dgit:8067 +#: ../dgit:8131 #, perl-format msgid "made symlink %s -> %s" msgstr "maakte symbolische koppeling %s -> %s" -#: ../dgit:8078 +#: ../dgit:8142 msgid "Import, forced update - synthetic orphan git history." msgstr "Importeren, gedwongen update - kunstmatige verweesde git-geschiedenis." -#: ../dgit:8080 +#: ../dgit:8144 msgid "Import, merging." msgstr "Importeren, samenvoegen." -#: ../dgit:8094 +#: ../dgit:8158 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "Invoegen van import %s (%s) in %s\n" -#: ../dgit:8103 +#: ../dgit:8167 #, perl-format msgid "results are in git ref %s" msgstr "resultaten staan in git ref %s" -#: ../dgit:8110 +#: ../dgit:8174 msgid "need only 1 subpath argument" msgstr "slechts 1 argument met een onderliggend pad nodig" -#: ../dgit:8128 +#: ../dgit:8192 msgid "need destination argument" msgstr "bestemmingsargument nodig" -#: ../dgit:8133 +#: ../dgit:8197 #, perl-format msgid "exec git clone: %s\n" msgstr "exec git clone: %s\n" -#: ../dgit:8141 +#: ../dgit:8205 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:8152 +#: ../dgit:8217 +msgid "package does not exist in target suite, looking in whole archive\n" +msgstr "" + +#: ../dgit:8224 +#, perl-format +msgid "package in target suite is different upstream version, %s\n" +msgstr "" + +#: ../dgit:8236 +msgid "suite has this upstream version, but no origs\n" +msgstr "" + +#: ../dgit:8240 +msgid "suite has origs for this upstream version\n" +msgstr "" + +#: ../dgit:8266 +#, perl-format +msgid "no .origs for package %s upstream version %s\n" +msgstr "" + +#: ../dgit:8298 +#, 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 +msgid "failed to resolve, unambiguously, which .origs are intended\n" +msgstr "" + +#: ../dgit:8329 +#, fuzzy, perl-format +#| msgid "unknown long option `%s'" +msgid "unknown long option to download-unfetched-origs `%s'" +msgstr "onbekende lange optie `%s'" + +#: ../dgit:8332 +#, 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 +#, perl-format +msgid "orig file is missing (404) at archive mirror: %s\n" +msgstr "" + +#: ../dgit:8369 +#, perl-format +msgid "%d orig file(s) could not be obtained\n" +msgstr "" + +#: ../dgit:8379 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "geen argumenten toegelaten bij dgit print-dpkg-source-ignores" -#: ../dgit:8158 +#: ../dgit:8385 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "geen argumenten toegelaten bij dgit setup-mergechangelogs" -#: ../dgit:8165 ../dgit:8171 +#: ../dgit:8392 ../dgit:8398 msgid "no arguments allowed to dgit setup-useremail" msgstr "geen argumenten toegelaten bij dgit setup-useremail" -#: ../dgit:8177 +#: ../dgit:8404 msgid "no arguments allowed to dgit setup-tree" msgstr "geen argumenten toegelaten bij dgit setup-tree" -#: ../dgit:8228 +#: ../dgit:8459 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." @@ -2512,42 +2571,42 @@ msgstr "" "--initiator-tempdir moet gebruikt worden om een absolute, geen relatieve map " "op te geven." -#: ../dgit:8267 +#: ../dgit:8501 #, perl-format msgid "%s needs a value" msgstr "%s moet een waarde hebben" -#: ../dgit:8271 +#: ../dgit:8505 #, perl-format msgid "bad value `%s' for %s" msgstr "foute waarde `%s' voor %s" -#: ../dgit:8380 +#: ../dgit:8614 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "%s: waarschuwing: onbekende force-optie %s wordt genegeerd\n" -#: ../dgit:8404 +#: ../dgit:8648 #, perl-format msgid "unknown long option `%s'" msgstr "onbekende lange optie `%s'" -#: ../dgit:8461 +#: ../dgit:8705 #, perl-format msgid "unknown short option `%s'" msgstr "onbekende korte optie `%s'" -#: ../dgit:8484 +#: ../dgit:8728 #, 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:8488 +#: ../dgit:8732 #, perl-format msgid "%s is blocked\n" msgstr "%s is geblokkeerd\n" -#: ../dgit:8494 +#: ../dgit:8738 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -2558,7 +2617,7 @@ msgstr "" "Dit is een bug die veroorzaakt wordt door iets in uw uitvoeringsomgeving.\n" "Er wordt opgegeven.\n" -#: ../dgit:8541 +#: ../dgit:8785 #, perl-format msgid "" "unsupported option `%s', cannot set command for %s (can only provide options)" @@ -2566,7 +2625,7 @@ msgstr "" "niet-ondersteunde optie \"%s', kan commando voor %s niet instellen (kan " "alleen opties opgeven)" -#: ../dgit:8546 +#: ../dgit:8790 #, perl-format msgid "" "unsupported option `%s', cannot provide additional options for %s (can only " @@ -2575,7 +2634,7 @@ msgstr "" "niet-ondersteunde optie `%s', kan geen extra opties voor %s bieden (kan " "alleen vervangend commando opgeven)" -#: ../dgit:8553 +#: ../dgit:8797 #, perl-format msgid "" "unsupported option `%s', cannot adjust options for %s (can only provide " @@ -2584,47 +2643,47 @@ msgstr "" "niet-ondersteunde optie `%s', kan opties voor %s niet aanpassen (kan alleen " "vervangend commando opgeven)" -#: ../dgit:8585 +#: ../dgit:8829 #, perl-format msgid "cannot set command for %s (can only provide options)" msgstr "kan commando voor %s niet instellen (kan alleen opties opgeven)" -#: ../dgit:8606 +#: ../dgit:8850 #, 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:8625 +#: ../dgit:8869 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "onbekende quilt-modus `%s'" -#: ../dgit:8637 +#: ../dgit:8881 #, perl-format msgid "unknown %s setting `%s'" msgstr "onbekende %s dat `%s' instelt" -#: ../dgit:8650 +#: ../dgit:8894 msgid "--tag2upload-builder-mode implies --dep14tag-reuse=must" msgstr "--tag2upload-builder-mode veronderstelt --dep14tag-reuse=must" -#: ../dgit:8657 +#: ../dgit:8901 #, perl-format msgid "unknown dep14tag-reuse mode `%s'" msgstr "onbekende dep14tag-reuse-modus `%s'" -#: ../dgit:8680 +#: ../dgit:8924 msgid "DRY RUN ONLY\n" msgstr "ENKEL TESTUITVOERING (DRY RUN)\n" -#: ../dgit:8681 +#: ../dgit:8925 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" "GETEMPERDE UITVOERING (DAMP RUN) - ZAL LOKALE (NIET-ONDERTEKENDE) " "WIJZIGINGEN MAKEN\n" -#: ../dgit:8701 +#: ../dgit:8945 #, perl-format msgid "unknown operation %s" msgstr "onbekende bewerking %s" @@ -3416,70 +3475,70 @@ msgstr "aantal slechte bytes" msgid "data block" msgstr "gegevensblok" -#: ../Debian/Dgit.pm:352 +#: ../Debian/Dgit.pm:324 #, perl-format msgid "error: %s\n" msgstr "fout: %s\n" -#: ../Debian/Dgit.pm:378 +#: ../Debian/Dgit.pm:350 #, perl-format msgid "getcwd failed: %s\n" msgstr "getcwd mislukte: %s\n" -#: ../Debian/Dgit.pm:397 +#: ../Debian/Dgit.pm:369 msgid "terminated, reporting successful completion" msgstr "beëindigd, met de melding van een succesvolle voltooiing" -#: ../Debian/Dgit.pm:399 +#: ../Debian/Dgit.pm:371 #, perl-format msgid "failed with error exit status %s" msgstr "mislukt met de foutmelding %s" -#: ../Debian/Dgit.pm:402 +#: ../Debian/Dgit.pm:374 #, perl-format msgid "died due to fatal signal %s" msgstr "gestorven vanwege fataal signaal %s" -#: ../Debian/Dgit.pm:406 +#: ../Debian/Dgit.pm:378 #, perl-format msgid "failed with unknown wait status %s" msgstr "mislukt met ongekende wachttoestand %s" -#: ../Debian/Dgit.pm:412 +#: ../Debian/Dgit.pm:384 msgid "failed command" msgstr "mislukt commando" -#: ../Debian/Dgit.pm:418 +#: ../Debian/Dgit.pm:390 #, perl-format msgid "failed to fork/exec: %s" msgstr "fork/exec is mislukt: %s" -#: ../Debian/Dgit.pm:420 +#: ../Debian/Dgit.pm:392 #, perl-format msgid "subprocess %s" msgstr "onderliggend proces %s" -#: ../Debian/Dgit.pm:422 +#: ../Debian/Dgit.pm:394 msgid "subprocess produced invalid output" msgstr "onderliggend proces produceerde ongeldige uitvoer" -#: ../Debian/Dgit.pm:527 +#: ../Debian/Dgit.pm:499 msgid "stat source file: %S" msgstr "stat bronbestand: %S" -#: ../Debian/Dgit.pm:537 +#: ../Debian/Dgit.pm:509 msgid "stat destination file: %S" msgstr "stat doelbestand: %S" -#: ../Debian/Dgit.pm:556 +#: ../Debian/Dgit.pm:528 msgid "finally install file after cp: %S" msgstr "tot slot, installeer bestand na cp: %S" -#: ../Debian/Dgit.pm:562 +#: ../Debian/Dgit.pm:534 msgid "delete old file after cp: %S" msgstr "verwijder oud bestand na cp: %S" -#: ../Debian/Dgit.pm:585 +#: ../Debian/Dgit.pm:557 msgid "" "not in a git working tree?\n" "(git rev-parse --show-toplevel produced no output)\n" @@ -3487,24 +3546,24 @@ msgstr "" "niet in een git werkboom?\n" "(git rev-parse --show-toplevel gaf geen uitvoer)\n" -#: ../Debian/Dgit.pm:588 +#: ../Debian/Dgit.pm:560 #, perl-format msgid "chdir toplevel %s: %s\n" msgstr "chdir naar hoogste niveau %s: %s\n" -#: ../Debian/Dgit.pm:696 +#: ../Debian/Dgit.pm:668 msgid "git index contains changes (does not match HEAD)" msgstr "de index van git bevat wijzigingen (komt niet overeen met HEAD)" -#: ../Debian/Dgit.pm:697 +#: ../Debian/Dgit.pm:669 msgid "working tree is dirty (does not match HEAD)" msgstr "werkboom is bevuild (komt niet overeen met HEAD)" -#: ../Debian/Dgit.pm:722 +#: ../Debian/Dgit.pm:694 msgid "using specified upstream commitish" msgstr "opgegeven bovenstroomse commitish wordt gebruikt" -#: ../Debian/Dgit.pm:729 +#: ../Debian/Dgit.pm:701 #, perl-format msgid "" "Could not determine appropriate upstream commitish.\n" @@ -3515,30 +3574,30 @@ msgstr "" " (Probeerde deze tags: %s)\n" " Controleer versie en geef bovenstroomse commitish expliciet op." -#: ../Debian/Dgit.pm:734 ../Debian/Dgit.pm:736 +#: ../Debian/Dgit.pm:706 ../Debian/Dgit.pm:708 #, perl-format msgid "using upstream from git tag %s" msgstr "bovenstroom van git tag %s wordt gebruikt" -#: ../Debian/Dgit.pm:850 +#: ../Debian/Dgit.pm:822 #, 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:885 +#: ../Debian/Dgit.pm:857 msgid "detached HEAD" msgstr "vrijstaande HEAD (detached HEAD)" -#: ../Debian/Dgit.pm:886 +#: ../Debian/Dgit.pm:858 msgid "HEAD symref is not to refs/" msgstr "symbolische referentie HEAD is geen referentie naar refs/" -#: ../Debian/Dgit.pm:902 +#: ../Debian/Dgit.pm:874 #, perl-format msgid "parsing of %s failed" msgstr "ontleden van %s mislukte" -#: ../Debian/Dgit.pm:911 +#: ../Debian/Dgit.pm:883 #, perl-format msgid "" "control file %s is (already) PGP-signed. Note that dgit push needs to " @@ -3547,76 +3606,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:925 +#: ../Debian/Dgit.pm:897 #, perl-format msgid "open %s (%s): %s" msgstr "open %s (%s): %s" -#: ../Debian/Dgit.pm:950 +#: ../Debian/Dgit.pm:922 #, perl-format msgid "missing field %s in %s" msgstr "ontbrekend veld %s in %s" -#: ../Debian/Dgit.pm:1036 +#: ../Debian/Dgit.pm:1008 msgid "Dummy commit - do not use\n" msgstr "Voorbeeldvastlegging - niet gebruiken\n" -#: ../Debian/Dgit.pm:1057 +#: ../Debian/Dgit.pm:1029 #, perl-format msgid "exec %s: %s\n" msgstr "exec %s: %s\n" -#: ../Debian/Dgit.pm:1085 +#: ../Debian/Dgit.pm:1057 #, perl-format msgid "Taint recorded at time %s for package %s" msgstr "Bezoedeling geregistreerd op tijdstip %s voor pakket %s" -#: ../Debian/Dgit.pm:1087 +#: ../Debian/Dgit.pm:1059 #, perl-format msgid "Taint recorded at time %s for any package" msgstr "Bezoedeling geregistreerd op tijdstip %s voor willekeurig pakket" -#: ../Debian/Dgit.pm:1089 +#: ../Debian/Dgit.pm:1061 #, perl-format msgid "Taint recorded for package %s" msgstr "Bezoedeling geregistreerd voor pakket %s" -#: ../Debian/Dgit.pm:1091 +#: ../Debian/Dgit.pm:1063 msgid "Taint recorded for any package" msgstr "Bezoedeling geregistreerd voor willekeurig pakket" -#: ../Debian/Dgit.pm:1103 +#: ../Debian/Dgit.pm:1075 msgid "Uncorrectable error. If confused, consult administrator.\n" msgstr "" "Niet-corrigeerbare fout. Neem bij verwarring contact op met de beheerder.\n" -#: ../Debian/Dgit.pm:1106 +#: ../Debian/Dgit.pm:1078 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:1109 +#: ../Debian/Dgit.pm:1081 #, perl-format msgid "Forcing due to %s\n" msgstr "Forceren vanwege %s\n" -#: ../Debian/Dgit.pm:1174 +#: ../Debian/Dgit.pm:1146 #, perl-format msgid "cannot stat %s/.git: %s" msgstr "kan status van %s/.git niet verkrijgen: %s" -#: ../Debian/Dgit.pm:1197 +#: ../Debian/Dgit.pm:1169 #, perl-format msgid "failed to mkdir playground parent %s: %s" msgstr "mkdir van speelplaatsouder %s mislukte: %s" -#: ../Debian/Dgit.pm:1205 +#: ../Debian/Dgit.pm:1177 #, perl-format msgid "failed to mkdir a playground %s: %s" msgstr "mkdir van een speelplaats %s mislukte: %s" -#: ../Debian/Dgit.pm:1214 +#: ../Debian/Dgit.pm:1186 #, perl-format msgid "failed to mkdir the playground %s: %s" msgstr "mkdir van de speelplaats %s mislukte: %s" diff -pruN 13.11+exp1/po4a/Makefile 13.12/po4a/Makefile --- 13.11+exp1/po4a/Makefile 2025-08-10 18:58:53.000000000 +0000 +++ 13.12/po4a/Makefile 2025-08-15 09:05:44.000000000 +0000 @@ -38,7 +38,7 @@ # discrepancy, since our generation script scans the available po # files. # -# Generation is done by a shell script, ./list-documents. +# Generation is done by a shell script, ./generate-po4a.cfg. # # make targets: po4a.cfg # many others imply this # po4a.cfg.check # fails if out of date @@ -97,13 +97,16 @@ pofiles: po4a.cfg translated: po4a.cfg $(PO4A) $< -po4a.cfg: list-documents +po4a.cfg: generate-po4a.cfg ./$< $o -po4a.cfg.check: list-documents +po4a.cfg.check: generate-po4a.cfg ./$< >$@.tmp diff po4a.cfg $@.tmp +potfiles.check: + ls $(addsuffix .pot, $(subst .,_, $(shell ./list-documents))) + pairwise-pocheck.check: ./pairwise-pocheck diff -pruN 13.11+exp1/po4a/README 13.12/po4a/README --- 13.11+exp1/po4a/README 2025-08-10 18:58:53.000000000 +0000 +++ 13.12/po4a/README 2025-08-15 09:05:44.000000000 +0000 @@ -4,7 +4,8 @@ NOTES FOR TRANSLATORS Introduction ------------ -The dgit source package contains dgit and git-debrebase. +The dgit source package builds several binary packages: +dgit, git-debrebase, git-debpush, and dgit-infrastructure. These are useful for a variety of different users and in different situations. So there are various documents aimed at various users. @@ -13,9 +14,7 @@ situations. So there are various docume * Documentation translation is handled via po4a, in the po4a directory. The documeents are all manpages. -* git-debrebase is currently mostly useful within the Debian project, - but this will change and its document translations will then be more - important. +* git-debrebase is currently mostly useful within the Debian project. The en_US message translation is slightly special. It is used for testing the translation machinery, and since the source native @@ -36,19 +35,21 @@ Translatation priorities MEDIUM - po/messages.pot All the messages for both programs + po/messages.pot All the messages for all programs po4a/dgit_1 po4a/dgit-downstream-dsc_7 po4a/dgit-sponshorship_7 po4a/dgit_7 + po4a/git-deborig_1 - LOW + LOW - For work within Debian, where one needs good English anyway: - po4a/dgit-maint-* } For work within the Debian project - po4a/dgit-nmu-simple_7 } (where one needs good English anyway) - - po4a/git-debrebase_* Currently low priority but this will change + po4a/dgit-maint-* + po4a/dgit-nmu-simple_7 + po4a/git-debpush_1 + po4a/git-debrebase_* + po4a/tag2upload_5 Translation organisation diff -pruN 13.11+exp1/po4a/dgit-downstream-dsc_7.pot 13.12/po4a/dgit-downstream-dsc_7.pot --- 13.11+exp1/po4a/dgit-downstream-dsc_7.pot 2025-08-10 18:58:53.000000000 +0000 +++ 13.12/po4a/dgit-downstream-dsc_7.pot 2025-08-15 09:05:44.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-03-01 16:59+0000\n" +"POT-Creation-Date: 2025-08-15 11:11+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,36 +21,38 @@ msgstr "" #: ../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 -#: ../git-debrebase.1.pod:1 ../git-debrebase.5.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 "" #. type: =head1 -#: ../dgit.1:1253 ../dgit-downstream-dsc.7.pod:150 +#: ../dgit.1:1646 ../dgit-downstream-dsc.7.pod:150 #, no-wrap msgid "CONFIGURATION" msgstr "" #. type: =item -#: ../dgit.1:1267 ../dgit-downstream-dsc.7.pod:286 +#: ../dgit.1:1660 ../dgit-downstream-dsc.7.pod:286 #, no-wrap msgid "BIB<.distro> I" msgstr "" #. type: =item -#: ../dgit.1:1320 ../dgit-downstream-dsc.7.pod:242 +#: ../dgit.1:1719 ../dgit-downstream-dsc.7.pod:242 #, no-wrap msgid "BIB<.upload-host>" msgstr "" #. type: =head1 -#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447 -#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 -#: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619 -#: ../git-debrebase.5.pod:678 +#: ../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 "" @@ -59,7 +61,7 @@ msgstr "" #: ../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 -#: ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5 +#: ../dgit-maint-bpo.7.pod:5 ../git-debrebase.5.pod:5 ../tag2upload.5.pod:5 msgid "INTRODUCTION" msgstr "" @@ -160,8 +162,9 @@ msgstr "" msgid "" "In dgit and Debian archive terminology, a B is a line of development, " "and/or a Debian release. For example, at the time of writing, Debian has " -"suites like B aka B, B aka B, and B " -"aka B. There are also ancillary suites like B." +"suites like B aka B, B aka B, and " +"B aka B. There are also ancillary suites like B." msgstr "" #. type: textblock @@ -170,7 +173,7 @@ msgid "" "If your releases align with Debian's releases, then your suites should " "contain the Debian suite names. B use just the Debian names. That " "will cause confusion. Instead, prepend your organisation's name and a " -"hyphen. For example, FSFE might end up with suites like fsfe-stretch." +"hyphen. For example, FSFE might end up with suites like fsfe-trixie." msgstr "" #. type: textblock diff -pruN 13.11+exp1/po4a/dgit-maint-bpo_7.pot 13.12/po4a/dgit-maint-bpo_7.pot --- 13.11+exp1/po4a/dgit-maint-bpo_7.pot 1970-01-01 00:00:00.000000000 +0000 +++ 13.12/po4a/dgit-maint-bpo_7.pot 2025-08-15 09:05:44.000000000 +0000 @@ -0,0 +1,297 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR Free Software Foundation, Inc. +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2025-08-15 11:11+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\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 "" + +#. 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 "" + +#. 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 "" + +#. 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 "" + +#. type: textblock +#: ../dgit-maint-bpo.7.pod:3 +msgid "dgit - tips for maintaining official Debian backports" +msgstr "" + +#. type: textblock +#: ../dgit-maint-bpo.7.pod:7 +msgid "" +"This document describes elements of a workflow for using B to maintain " +"an official Debian backport. We do not assume that whoever uploads the " +"package to Debian unstable is using B." +msgstr "" + +#. type: =head1 +#: ../dgit-maint-bpo.7.pod:11 +msgid "GENERAL TIPS" +msgstr "" + +#. type: textblock +#: ../dgit-maint-bpo.7.pod:13 +msgid "" +"The first time a package is backported for any particular Debian release, " +"you will have to pass the --new option to dgit." +msgstr "" + +#. type: =head1 +#: ../dgit-maint-bpo.7.pod:17 ../git-debrebase.5.pod:37 +msgid "TERMINOLOGY" +msgstr "" + +#. type: textblock +#: ../dgit-maint-bpo.7.pod:19 +msgid "" +"Let the I branch contain the packaging history uploaded to Debian " +"unstable, and the I branch be where you prepare your uploads " +"to the B suite." +msgstr "" + +#. type: textblock +#: ../dgit-maint-bpo.7.pod:23 +msgid "" +"A B backports workflow means that each time an upload migrates to " +"Debian testing and you want to prepare an upload to B, " +"you do something like this:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-bpo.7.pod:29 +#, no-wrap +msgid "" +" % git checkout bookworm-bpo\n" +" % git merge master\n" +" % dch --bpo\n" +" % # any other changes needed for backporting\n" +" % git commit -a\n" +" % # try a build\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-bpo.7.pod:38 +msgid "" +"A B backports workflow means that you throw away the history of " +"the I branch each time a new version migrates to Debian " +"testing, something equivalent to this:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-bpo.7.pod:44 +#, no-wrap +msgid "" +" % git checkout -B bookworm-bpo master\n" +" % dch --bpo\n" +" % # any other changes needed for backporting\n" +" % git commit -a\n" +" % # try a build\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-bpo.7.pod:52 +msgid "" +"If you use a merging backports workflow, your changelog contains entries for " +"each previous upload to B; in a rebasing workflow, it " +"contains only the latest." +msgstr "" + +#. type: =head1 +#: ../dgit-maint-bpo.7.pod:56 +msgid "CHOOSING BETWEEN THE TWO WORKFLOWS" +msgstr "" + +#. type: textblock +#: ../dgit-maint-bpo.7.pod:58 +msgid "" +"If backporting involves making no (additional) changes to the upstream " +"source, whether you use a merging or rebasing backports workflow is a matter " +"of personal preference. There are good arguments in favour of both " +"workflows fitting the semantics of the B<*-backports> suites." +msgstr "" + +#. type: textblock +#: ../dgit-maint-bpo.7.pod:63 +msgid "" +"If you have to make changes to the upstream source to make the package work " +"on machines running Debian stable, it is advisable to choose a rebasing " +"workflow. This ensures that dgit can automatically update the debian/" +"patches directory without any manual intervention." +msgstr "" + +#. type: =head1 +#: ../dgit-maint-bpo.7.pod:68 +msgid "TIPS FOR A MERGING WORKFLOW" +msgstr "" + +#. type: =head2 +#: ../dgit-maint-bpo.7.pod:70 ../dgit-maint-bpo.7.pod:97 +msgid "Use dgit's branches" +msgstr "" + +#. type: textblock +#: ../dgit-maint-bpo.7.pod:72 +msgid "" +"If you do not yourself upload the package to Debian unstable, it is usually " +"easiest to use dgit's branches, and ignore the configured Vcs-Git repository." +msgstr "" + +#. type: textblock +#: ../dgit-maint-bpo.7.pod:76 +msgid "You would use" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-bpo.7.pod:80 +#, no-wrap +msgid "" +" % dgit clone foo bookworm\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-bpo.7.pod:84 +msgid "for a new backport of package 'foo' to B, and then" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-bpo.7.pod:88 +#, no-wrap +msgid "" +" % dgit fetch bookworm\n" +" % git merge dgit/dgit/bookworm\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-bpo.7.pod:93 +msgid "when new versions migrate to Debian testing." +msgstr "" + +#. type: =head1 +#: ../dgit-maint-bpo.7.pod:95 +msgid "TIPS FOR A REBASING WORKFLOW" +msgstr "" + +#. type: textblock +#: ../dgit-maint-bpo.7.pod:99 +msgid "" +"If you do not yourself upload the package to Debian unstable, it is usually " +"easiest to use dgit's branches, and ignore the configured Vcs-Git " +"repository. For each new version from Debian testing, you would" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-bpo.7.pod:106 +#, no-wrap +msgid "" +" % dgit fetch bookworm\n" +" % git checkout -B bookworm-bpo dgit/dgit/bookworm\n" +" % # use git-cherry-pick(1) to (re)apply any needed backporting fixes\n" +"\n" +msgstr "" + +#. type: =head2 +#: ../dgit-maint-bpo.7.pod:112 +msgid "Overwriting" +msgstr "" + +#. type: textblock +#: ../dgit-maint-bpo.7.pod:114 +msgid "" +"B tries hard to prevent you from accidentally overwriting uploads " +"that it thinks aren't represented in the git history you are trying to " +"upload. This is mainly to prevent accidentally overwriting NMUs." +msgstr "" + +#. type: textblock +#: ../dgit-maint-bpo.7.pod:119 +msgid "" +"With a rebasing backports workflow, dgit will think that every upload of a " +"new version from Debian testing might be accidentally overwriting uploads. " +"You will need to explicitly indicate the upload to B you " +"wish to overwrite." +msgstr "" + +#. type: textblock +#: ../dgit-maint-bpo.7.pod:124 +msgid "" +"Suppose that the last upload to B was versioned " +"I<1.2.2-1~bpo10+1> and you have now prepared I<1.2.3-1~bpo10+1> for upload. " +"When you B, you will need to pass I<--trust-" +"changelog=1.2.2-1~bpo10+1>." +msgstr "" + +#. type: textblock +#: ../dgit-maint-bpo.7.pod:129 +msgid "" +"Alternatively, you can perform the pseudomerge that I<--trust-changelog> " +"would have done yourself:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-bpo.7.pod:134 +#, no-wrap +msgid "" +" % dgit fetch bookworm-backports\n" +" % git merge -s ours dgit/dgit/bookworm-backports\n" +" % dgit push-source\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-bpo.7.pod:142 +msgid "dgit(1), dgit(7), https://backports.debian.org/" +msgstr "" + +#. type: textblock +#: ../dgit-maint-bpo.7.pod:146 +msgid "" +"This manpage was written and is maintained by Sean Whitton " +"." +msgstr "" diff -pruN 13.11+exp1/po4a/dgit-nmu-simple_7.pot 13.12/po4a/dgit-nmu-simple_7.pot --- 13.11+exp1/po4a/dgit-nmu-simple_7.pot 2025-08-10 18:58:53.000000000 +0000 +++ 13.12/po4a/dgit-nmu-simple_7.pot 2025-08-15 09:05:44.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2025-05-07 19:40+0100\n" +"POT-Creation-Date: 2025-08-15 11:11+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -22,19 +22,19 @@ msgstr "" #: ../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 ../tag2upload.5.pod:1 +#: ../git-debpush.1.pod:1 ../git-deborig.1.pod:1 ../tag2upload.5.pod:1 #, no-wrap msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1826 ../dgit.7:23 ../dgit-user.7.pod:463 +#: ../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:272 ../tag2upload.5.pod:224 +#: ../git-debpush.1.pod:341 ../git-deborig.1.pod:60 ../tag2upload.5.pod:307 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -100,7 +100,7 @@ msgstr "" #: ../dgit-nmu-simple.7.pod:39 #, no-wrap msgid "" -" % dgit clone glibc jessie\n" +" % dgit clone glibc bookworm\n" " % cd glibc\n" " % git am ~/glibc-security-fix.diff\n" " % dch --nmu \"Apply upstream's fix for foo bug.\"\n" @@ -108,9 +108,9 @@ msgid "" " % dpkg-buildpackage -uc -b\n" " [ run your tests ]\n" " % dch -r && git add debian/changelog && git commit -m\"Finalise NMU\"\n" -" % dgit -wgf sbuild -A -c jessie\n" +" % dgit -wgf sbuild -A -d trixie\n" " [ any final tests on generated .debs ]\n" -" % dgit -wgf [--delayed=5] push-source jessie\n" +" % dgit -wgf [--delayed=5] push-source bookworm\n" " [ enter your gnupg passphrase as prompted ]\n" " [ see that push and upload are successful ]\n" " [ prepare and email NMU diff (git-diff, git-format-patch) ]\n" diff -pruN 13.11+exp1/po4a/dgit-user_7.nl.po 13.12/po4a/dgit-user_7.nl.po --- 13.11+exp1/po4a/dgit-user_7.nl.po 2025-08-10 18:58:53.000000000 +0000 +++ 13.12/po4a/dgit-user_7.nl.po 2025-08-15 09:05:44.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dgit_12.11_dgit-user_7\n" -"POT-Creation-Date: 2025-03-28 17:38+0000\n" +"POT-Creation-Date: 2025-08-15 11:11+0100\n" "PO-Revision-Date: 2025-04-12 22:04+0200\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" @@ -24,19 +24,19 @@ msgstr "" #: ../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 ../tag2upload.5.pod:1 +#: ../git-debpush.1.pod:1 ../git-deborig.1.pod:1 ../tag2upload.5.pod:1 #, no-wrap msgid "NAME" msgstr "NAAM" #. type: =head1 -#: ../dgit.1:1826 ../dgit.7:23 ../dgit-user.7.pod:463 -#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 +#: ../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:272 ../tag2upload.5.pod:224 +#: ../git-debpush.1.pod:341 ../git-deborig.1.pod:60 ../tag2upload.5.pod:307 #, no-wrap msgid "SEE ALSO" msgstr "ZIE OOK" @@ -110,9 +110,19 @@ msgstr "(Deze runen worden later besprok #. type: verbatim #: ../dgit-user.7.pod:33 -#, no-wrap +#, fuzzy, no-wrap +#| msgid "" +#| " % dgit clone glibc jessie,-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" msgid "" -" % dgit clone glibc jessie,-security\n" +" % 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" @@ -138,7 +148,7 @@ msgid "Occasionally:" msgstr "Sporadisch:" #. type: verbatim -#: ../dgit-user.7.pod:48 ../dgit-user.7.pod:242 +#: ../dgit-user.7.pod:48 ../dgit-user.7.pod:235 #, no-wrap msgid "" " % git clean -xdf\n" @@ -156,10 +166,17 @@ msgstr "Later:" #. type: verbatim #: ../dgit-user.7.pod:57 -#, no-wrap +#, fuzzy, no-wrap +#| msgid "" +#| " % cd glibc\n" +#| " % dgit pull jessie,-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" msgid "" " % cd glibc\n" -" % dgit pull jessie,-security\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" @@ -179,9 +196,13 @@ msgstr "DE JUISTE BRONCODE VINDEN - DGIT #. type: verbatim #: ../dgit-user.7.pod:69 -#, no-wrap +#, fuzzy, no-wrap +#| msgid "" +#| " % dgit clone glibc jessie,-security\n" +#| " % cd glibc\n" +#| "\n" msgid "" -" % dgit clone glibc jessie,-security\n" +" % dgit clone glibc bookworm,-security\n" " % cd glibc\n" "\n" msgstr "" @@ -260,13 +281,22 @@ msgstr "De Debian-release (de \"suite\") #. type: textblock #: ../dgit-user.7.pod:106 +#, fuzzy +#| 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 8) is Debian C; and the current version of Ubuntu is " +#| "C (Yakkety Yak, 16.10). 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." 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 8) is Debian C; and the current version of Ubuntu is " -"C (Yakkety Yak, 16.10). You can specify either the codename " -"C or the alias C. If you don't say, you get C, which " +"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 "" "Intern verwijzen Debian (en de ervan afgeleide distributies) gewoonlijk naar " @@ -280,64 +310,66 @@ msgstr "" #. type: textblock #: ../dgit-user.7.pod:117 -msgid "If you don't know what you're running, try this:" -msgstr "" -"Indien u niet weet met welke suite u werkt, kunt u het volgende gebruiken:" - -#. type: verbatim -#: ../dgit-user.7.pod:121 -#, no-wrap msgid "" -" % grep '^deb' /etc/apt/sources.list\n" -" deb http://the.earth.li/debian/ jessie main non-free contrib\n" -" ...\n" -" %\n" -"\n" +"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 "" -" % grep '^deb' /etc/apt/sources.list\n" -" deb http://the.earth.li/debian/ jessie main non-free contrib\n" -" ...\n" -" %\n" -"\n" #. type: textblock -#: ../dgit-user.7.pod:128 +#: ../dgit-user.7.pod:121 +#, fuzzy +#| 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.)" 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.)" +"unless you're on unstable or testing. Hence, in our example C " +"becomes C. (Yes, with a comma.)" msgstr "" "Voor Debian moet u aan het eind van de naam van de suite C<,-security> " "toevoegen, tenzij u met de suite unstable of testing werkt. Dus in ons " "voorbeeld wordt C C. (Wel degelijk met de komma.)" #. type: =head1 -#: ../dgit-user.7.pod:135 +#: ../dgit-user.7.pod:128 msgid "WHAT DGIT CLONE PRODUCES" msgstr "WAT DGIT CLONE AANMAAKT" #. type: =head2 -#: ../dgit-user.7.pod:137 +#: ../dgit-user.7.pod:130 msgid "What branches are there" msgstr "Welke takken er zijn" #. type: textblock -#: ../dgit-user.7.pod:139 +#: ../dgit-user.7.pod:132 +#, fuzzy +#| 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)." 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)." +"branch named like C (yes, with a comma in the " +"branch name)." msgstr "" "dgit clone zal voor u een verse werkkopie aanmaken en ervoor zorgen dat u " "zich bevindt op een tak met een naam als C " "(inderdaad, met een komma in de naam van de tak)." #. type: textblock -#: ../dgit-user.7.pod:143 -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, " +#: ../dgit-user.7.pod:136 +#, fuzzy +#| 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." +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 "" @@ -349,12 +381,19 @@ msgstr "" "forwarding in git-terminologie)." #. type: textblock -#: ../dgit-user.7.pod:152 +#: ../dgit-user.7.pod:145 +#, fuzzy +#| 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 jessie, or jessie-security if there is an update for the package " +#| "there." 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 " -"jessie, or jessie-security if there is an update for the package there." +"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 "" "De veiligheidsupdates worden door Debian afgezonderd in C<*-security>. Aan " "dgit de opdracht C geven, betekent dat het de eventueel " @@ -363,7 +402,7 @@ msgstr "" "als zich daarin een update voor het pakket bevindt." #. type: textblock -#: ../dgit-user.7.pod:158 +#: ../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 " @@ -374,12 +413,12 @@ msgstr "" "aanwezig is, zult u met dgit fetch de optie C<-p>I moeten gebruiken.)" #. type: =head2 -#: ../dgit-user.7.pod:162 +#: ../dgit-user.7.pod:155 msgid "What kind of source tree do you get" msgstr "Welk soort broncodeboom u verkrijgt" #. type: textblock -#: ../dgit-user.7.pod:164 +#: ../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 " @@ -391,7 +430,7 @@ msgstr "" "u met bewerken wilt beginnen." #. type: textblock -#: ../dgit-user.7.pod:168 +#: ../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. It is best to ignore these. Insofar as they are relevant the changes " @@ -420,7 +459,7 @@ msgstr "" "dgit verkregen git-takken, wordt de inhoud van debian/patches genegeerd." #. type: textblock -#: ../dgit-user.7.pod:185 +#: ../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\".)" @@ -429,12 +468,12 @@ msgstr "" "zijn \"verpakkingstakken met toegepaste patches, maar zonder .pc-map\".)" #. type: =head2 -#: ../dgit-user.7.pod:190 +#: ../dgit-user.7.pod:183 msgid "What kind of history you get" msgstr "Welk soort geschiedenis u verkrijgt" #. type: textblock -#: ../dgit-user.7.pod:192 +#: ../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." @@ -444,7 +483,7 @@ msgstr "" "van de git-geschiedenis van de toeleveraar." #. type: textblock -#: ../dgit-user.7.pod:197 +#: ../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 " @@ -455,11 +494,17 @@ msgstr "" "dat de geschiedenis eerder kort is en door dgit bedacht." #. type: textblock -#: ../dgit-user.7.pod:203 +#: ../dgit-user.7.pod:196 +#, fuzzy +#| 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." 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 "" "dgit-geschiedenissen bevatten vaak automatisch gegenereerde vastleggingen " @@ -470,7 +515,7 @@ msgstr "" "geval bij gecombineerde takken zoals C." #. type: textblock -#: ../dgit-user.7.pod:210 +#: ../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 " @@ -490,19 +535,19 @@ msgstr "" "bevinden voor u iets anders doet!" #. type: =head1 -#: ../dgit-user.7.pod:222 ../dgit-maint-gbp.7.pod:56 +#: ../dgit-user.7.pod:215 ../dgit-maint-gbp.7.pod:56 msgid "BUILDING" msgstr "BOUWPROCES" #. type: =head2 -#: ../dgit-user.7.pod:224 +#: ../dgit-user.7.pod:217 msgid "Always commit before building" msgstr "" "Leg steeds veranderingen vast (N.v.d.V.: \"commit\" in git-terminologie) " "voor u begint te bouwen" #. type: verbatim -#: ../dgit-user.7.pod:228 +#: ../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" @@ -514,7 +559,7 @@ msgstr "" "\n" #. type: textblock -#: ../dgit-user.7.pod:233 +#: ../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 " @@ -525,12 +570,12 @@ msgstr "" "bestanden achterlaten die niet door C<.gitignore> afgedekt zijn." #. type: textblock -#: ../dgit-user.7.pod:237 +#: ../dgit-user.7.pod:230 msgid "If you always commit, you can use" msgstr "Indien u steeds een vastlegging doet, kunt u gebruik maken van" #. type: textblock -#: ../dgit-user.7.pod:247 +#: ../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 " @@ -542,7 +587,7 @@ msgstr "" "bewaren.)" #. type: textblock -#: ../dgit-user.7.pod:252 +#: ../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 " @@ -554,12 +599,12 @@ msgstr "" "voeren)." #. type: =head2 -#: ../dgit-user.7.pod:257 +#: ../dgit-user.7.pod:250 msgid "Update the changelog (at least once) before building" msgstr "Werk het bestand changelog (minstens eenmaal) bij voor u bouwt" #. type: verbatim -#: ../dgit-user.7.pod:261 +#: ../dgit-user.7.pod:254 #, no-wrap msgid "" " % gbp dch -S --since=dgit/dgit/sid --ignore-branch --commit\n" @@ -569,7 +614,7 @@ msgstr "" "\n" #. type: textblock -#: ../dgit-user.7.pod:265 +#: ../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 " @@ -580,7 +625,7 @@ msgstr "" "uw binaire pakketten kunnen onderscheiden van die van uw distributie." #. type: textblock -#: ../dgit-user.7.pod:270 +#: ../dgit-user.7.pod:263 msgid "" "So you should update C to add a new stanza at the top, for " "your build." @@ -589,7 +634,7 @@ msgstr "" "toevoegen voor u de bouw uitvoert." #. type: textblock -#: ../dgit-user.7.pod:274 +#: ../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 " @@ -600,7 +645,7 @@ msgstr "" "versienummer (dat een stukje van het id van uw vastlegging bevat)." #. type: textblock -#: ../dgit-user.7.pod:279 +#: ../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 " @@ -616,12 +661,12 @@ msgstr "" "onderwerp valt buiten het bestek van deze handleiding." #. type: =head2 -#: ../dgit-user.7.pod:287 +#: ../dgit-user.7.pod:280 msgid "Actually building" msgstr "Het eigenlijke bouwen" #. type: verbatim -#: ../dgit-user.7.pod:291 +#: ../dgit-user.7.pod:284 #, no-wrap msgid "" " % sudo apt-get build-dep .\n" @@ -633,7 +678,7 @@ msgstr "" "\n" #. type: textblock -#: ../dgit-user.7.pod:296 +#: ../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 " @@ -645,12 +690,12 @@ msgstr "" "broncodepakket." #. type: =head2 -#: ../dgit-user.7.pod:302 +#: ../dgit-user.7.pod:295 msgid "Using sbuild" msgstr "Gebruik maken van sbuild" #. type: textblock -#: ../dgit-user.7.pod:304 +#: ../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.)" @@ -660,11 +705,16 @@ msgstr "" "Debian gebruikt.)" #. type: verbatim -#: ../dgit-user.7.pod:309 -#, no-wrap +#: ../dgit-user.7.pod:302 +#, fuzzy, no-wrap +#| msgid "" +#| " % git clean -xdf\n" +#| " % sbuild -c jessie -A --no-clean-source \\\n" +#| " --dpkg-source-opts='-Zgzip -z1 --format=1.0 -sn'\n" +#| "\n" msgid "" " % git clean -xdf\n" -" % sbuild -c jessie -A --no-clean-source \\\n" +" % sbuild -d trixie -A --no-clean-source \\\n" " --dpkg-source-opts='-Zgzip -z1 --format=1.0 -sn'\n" "\n" msgstr "" @@ -674,7 +724,7 @@ msgstr "" "\n" #. type: textblock -#: ../dgit-user.7.pod:315 +#: ../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 " @@ -686,17 +736,12 @@ msgstr "" "Debian-bug #868527." #. type: =head1 -#: ../dgit-user.7.pod:322 +#: ../dgit-user.7.pod:315 msgid "INSTALLING" msgstr "INSTALLEREN" -#. type: =head2 -#: ../dgit-user.7.pod:324 -msgid "Debian Stretch or newer" -msgstr "Debian Stretch of later" - #. type: verbatim -#: ../dgit-user.7.pod:328 +#: ../dgit-user.7.pod:319 #, no-wrap msgid "" " % sudo apt install ../libc6_*.deb\n" @@ -705,23 +750,8 @@ msgstr "" " % sudo apt install ../libc6_*.deb\n" "\n" -#. type: =head2 -#: ../dgit-user.7.pod:332 -msgid "Debian Jessie or older" -msgstr "Debian Jessie of eerder" - -#. type: verbatim -#: ../dgit-user.7.pod:336 -#, no-wrap -msgid "" -" % sudo dpkg -i ../libc6_*.deb\n" -"\n" -msgstr "" -" % sudo dpkg -i ../libc6_*.deb\n" -"\n" - #. type: textblock -#: ../dgit-user.7.pod:340 +#: ../dgit-user.7.pod:323 msgid "" "You can use C to install the .debs that came out of your package." msgstr "" @@ -729,7 +759,7 @@ msgstr "" "pakket voortkwamen." #. type: textblock -#: ../dgit-user.7.pod:343 +#: ../dgit-user.7.pod:326 msgid "" "If the dependencies aren't installed, you will get an error, which can " "usually be fixed with C." @@ -738,12 +768,12 @@ msgstr "" "die gewoonlijk gerepareerd kan worden met C." #. type: =head1 -#: ../dgit-user.7.pod:347 +#: ../dgit-user.7.pod:330 msgid "Multiarch" msgstr "Multiarch" #. type: textblock -#: ../dgit-user.7.pod:349 +#: ../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:" @@ -753,7 +783,7 @@ msgstr "" "dit:" #. type: verbatim -#: ../dgit-user.7.pod:355 +#: ../dgit-user.7.pod:338 #, no-wrap msgid "" " dpkg: error processing package libpcre3-dev:amd64 (--configure):\n" @@ -765,7 +795,7 @@ msgstr "" "\n" #. type: textblock -#: ../dgit-user.7.pod:360 +#: ../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 " @@ -776,7 +806,7 @@ msgstr "" "bij alle architecturen waarvoor het geïnstalleerd is." #. type: textblock -#: ../dgit-user.7.pod:364 +#: ../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 " @@ -793,7 +823,7 @@ msgstr "" "dezelfde naam en C uit het pakket C." #. type: textblock -#: ../dgit-user.7.pod:374 +#: ../dgit-user.7.pod:357 msgid "" "Otherwise you could deinstall the packages of interest for those other " "architectures with something like C." @@ -802,7 +832,7 @@ msgstr "" "architecturen de-installeert met iets zoals C." #. type: textblock -#: ../dgit-user.7.pod:378 +#: ../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. " @@ -817,14 +847,14 @@ msgstr "" "de war brengen." #. type: textblock -#: ../dgit-user.7.pod:386 +#: ../dgit-user.7.pod:369 msgid "With the \"same number\" approach you may still get errors like" msgstr "" "Met de \"hetzelfde-nummer\"-benadering kunt u nog steeds foutmeldingen " "krijgen zoals" #. type: textblock -#: ../dgit-user.7.pod:390 +#: ../dgit-user.7.pod:373 msgid "" "trying to overwrite shared '/usr/include/pcreposix.h', which is different " "from other instances of package libpcre3-dev" @@ -833,7 +863,7 @@ msgstr "" "verschilt van andere exemplaren van pakket libpcre3-dev" #. type: textblock -#: ../dgit-user.7.pod:394 +#: ../dgit-user.7.pod:377 msgid "" "but passing C<--force-overwrite> to dpkg will help - assuming you know what " "you're doing." @@ -842,21 +872,25 @@ msgstr "" "veronderstelling dat u weet wat u doet." #. type: =head1 -#: ../dgit-user.7.pod:397 +#: ../dgit-user.7.pod:380 msgid "SHARING YOUR WORK" msgstr "UW WERK DELEN" #. type: textblock -#: ../dgit-user.7.pod:399 +#: ../dgit-user.7.pod:382 +#, fuzzy +#| msgid "" +#| "The C branch (or whatever) is a normal git " +#| "branch. You can use C to publish it on any suitable git server." msgid "" -"The C branch (or whatever) is a normal git branch. " +"The C branch (or whatever) is a normal git branch. " "You can use C to publish it on any suitable git server." msgstr "" "De tak C (of wat dan ook) is een gewone git-tak. U " "kunt C gebruiken om hem te publiceren op elke geschikte git-server." #. type: textblock -#: ../dgit-user.7.pod:402 +#: ../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." @@ -865,7 +899,7 @@ msgstr "" "pakketten (.deb) te bouwen, zoals u het deed." #. type: textblock -#: ../dgit-user.7.pod:406 +#: ../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 zijn gewoonlijk erg welkom." #. type: =head2 -#: ../dgit-user.7.pod:413 +#: ../dgit-user.7.pod:396 msgid "Source packages" msgstr "Broncodepakketten" #. type: textblock -#: ../dgit-user.7.pod:415 +#: ../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 " @@ -898,7 +932,7 @@ msgstr "" "daarvan uw git-tak te delen." #. type: textblock -#: ../dgit-user.7.pod:423 +#: ../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 " @@ -914,7 +948,7 @@ msgstr "" "dan een tar-archief met een bijhorend .dsc-metadatabestand:" #. type: verbatim -#: ../dgit-user.7.pod:434 +#: ../dgit-user.7.pod:417 #, no-wrap msgid "" " % echo '3.0 (native)' >debian/source/format\n" @@ -928,7 +962,7 @@ msgstr "" "\n" #. type: textblock -#: ../dgit-user.7.pod:440 +#: ../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 of L" #. type: =head1 -#: ../dgit-user.7.pod:447 +#: ../dgit-user.7.pod:430 msgid "INSTALLING NEWER DGIT ON OLDER DISTROS" msgstr "NIEUWERE DGIT INSTALLEREN OP OUDERE DISTRIBUTIES" #. type: textblock -#: ../dgit-user.7.pod:449 +#: ../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." @@ -954,7 +988,7 @@ msgstr "" "zijn aan een bug. Deze kan worden verholpen door een upgrade." #. type: textblock -#: ../dgit-user.7.pod:452 +#: ../dgit-user.7.pod:435 msgid "" "You can probably directly C the latest version of dgit.deb from " "Debian stable, or Debian testing." @@ -963,7 +997,7 @@ msgstr "" "installeren via C vanuit Debian stable of Debian testing." #. type: textblock -#: ../dgit-user.7.pod:457 +#: ../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 " @@ -976,7 +1010,7 @@ msgstr "" "Debian testing en kijk in de sectie ONDERSTEUNING OP OUDE DISTRIBUTIES.." #. type: textblock -#: ../dgit-user.7.pod:465 ../dgit-maint-native.7.pod:127 +#: ../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.11+exp1/po4a/dgit-user_7.pot 13.12/po4a/dgit-user_7.pot --- 13.11+exp1/po4a/dgit-user_7.pot 2025-08-10 18:58:53.000000000 +0000 +++ 13.12/po4a/dgit-user_7.pot 2025-08-15 09:05:44.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2025-03-28 17:38+0000\n" +"POT-Creation-Date: 2025-08-15 11:11+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -22,19 +22,19 @@ msgstr "" #: ../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 ../tag2upload.5.pod:1 +#: ../git-debpush.1.pod:1 ../git-deborig.1.pod:1 ../tag2upload.5.pod:1 #, no-wrap msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1826 ../dgit.7:23 ../dgit-user.7.pod:463 -#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 +#: ../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:272 ../tag2upload.5.pod:224 +#: ../git-debpush.1.pod:341 ../git-deborig.1.pod:60 ../tag2upload.5.pod:307 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -97,7 +97,7 @@ msgstr "" #: ../dgit-user.7.pod:33 #, no-wrap msgid "" -" % dgit clone glibc jessie,-security\n" +" % 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" @@ -114,7 +114,7 @@ msgid "Occasionally:" msgstr "" #. type: verbatim -#: ../dgit-user.7.pod:48 ../dgit-user.7.pod:242 +#: ../dgit-user.7.pod:48 ../dgit-user.7.pod:235 #, no-wrap msgid "" " % git clean -xdf\n" @@ -132,7 +132,7 @@ msgstr "" #, no-wrap msgid "" " % cd glibc\n" -" % dgit pull jessie,-security\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" @@ -148,7 +148,7 @@ msgstr "" #: ../dgit-user.7.pod:69 #, no-wrap msgid "" -" % dgit clone glibc jessie,-security\n" +" % dgit clone glibc bookworm,-security\n" " % cd glibc\n" "\n" msgstr "" @@ -206,76 +206,67 @@ msgstr "" 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 8) is Debian C; and the current version of Ubuntu is " -"C (Yakkety Yak, 16.10). You can specify either the codename " -"C or the alias C. If you don't say, you get C, which " +"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 "" #. type: textblock #: ../dgit-user.7.pod:117 -msgid "If you don't know what you're running, try this:" -msgstr "" - -#. type: verbatim -#: ../dgit-user.7.pod:121 -#, no-wrap msgid "" -" % grep '^deb' /etc/apt/sources.list\n" -" deb http://the.earth.li/debian/ jessie main non-free contrib\n" -" ...\n" -" %\n" -"\n" +"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 "" #. type: textblock -#: ../dgit-user.7.pod:128 +#: ../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.)" +"unless you're on unstable or testing. Hence, in our example C " +"becomes C. (Yes, with a comma.)" msgstr "" #. type: =head1 -#: ../dgit-user.7.pod:135 +#: ../dgit-user.7.pod:128 msgid "WHAT DGIT CLONE PRODUCES" msgstr "" #. type: =head2 -#: ../dgit-user.7.pod:137 +#: ../dgit-user.7.pod:130 msgid "What branches are there" msgstr "" #. type: textblock -#: ../dgit-user.7.pod:139 +#: ../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)." +"branch named like C (yes, with a comma in the " +"branch name)." msgstr "" #. type: textblock -#: ../dgit-user.7.pod:143 +#: ../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, " +"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 "" #. type: textblock -#: ../dgit-user.7.pod:152 +#: ../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 " -"jessie, or jessie-security if there is an update for the package there." +"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 "" #. type: textblock -#: ../dgit-user.7.pod:158 +#: ../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 " @@ -283,12 +274,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-user.7.pod:162 +#: ../dgit-user.7.pod:155 msgid "What kind of source tree do you get" msgstr "" #. type: textblock -#: ../dgit-user.7.pod:164 +#: ../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 " @@ -296,7 +287,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-user.7.pod:168 +#: ../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. It is best to ignore these. Insofar as they are relevant the changes " @@ -315,26 +306,26 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-user.7.pod:185 +#: ../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 "" #. type: =head2 -#: ../dgit-user.7.pod:190 +#: ../dgit-user.7.pod:183 msgid "What kind of history you get" msgstr "" #. type: textblock -#: ../dgit-user.7.pod:192 +#: ../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 "" #. type: textblock -#: ../dgit-user.7.pod:197 +#: ../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 " @@ -342,16 +333,16 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-user.7.pod:203 +#: ../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 "" #. type: textblock -#: ../dgit-user.7.pod:210 +#: ../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 " @@ -363,17 +354,17 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-user.7.pod:222 ../dgit-maint-gbp.7.pod:56 +#: ../dgit-user.7.pod:215 ../dgit-maint-gbp.7.pod:56 msgid "BUILDING" msgstr "" #. type: =head2 -#: ../dgit-user.7.pod:224 +#: ../dgit-user.7.pod:217 msgid "Always commit before building" msgstr "" #. type: verbatim -#: ../dgit-user.7.pod:228 +#: ../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" @@ -382,7 +373,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-user.7.pod:233 +#: ../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 " @@ -390,12 +381,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-user.7.pod:237 +#: ../dgit-user.7.pod:230 msgid "If you always commit, you can use" msgstr "" #. type: textblock -#: ../dgit-user.7.pod:247 +#: ../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 " @@ -403,7 +394,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-user.7.pod:252 +#: ../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 " @@ -411,12 +402,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-user.7.pod:257 +#: ../dgit-user.7.pod:250 msgid "Update the changelog (at least once) before building" msgstr "" #. type: verbatim -#: ../dgit-user.7.pod:261 +#: ../dgit-user.7.pod:254 #, no-wrap msgid "" " % gbp dch -S --since=dgit/dgit/sid --ignore-branch --commit\n" @@ -424,7 +415,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-user.7.pod:265 +#: ../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 " @@ -432,14 +423,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-user.7.pod:270 +#: ../dgit-user.7.pod:263 msgid "" "So you should update C to add a new stanza at the top, for " "your build." msgstr "" #. type: textblock -#: ../dgit-user.7.pod:274 +#: ../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 " @@ -447,7 +438,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-user.7.pod:279 +#: ../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 " @@ -457,12 +448,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-user.7.pod:287 +#: ../dgit-user.7.pod:280 msgid "Actually building" msgstr "" #. type: verbatim -#: ../dgit-user.7.pod:291 +#: ../dgit-user.7.pod:284 #, no-wrap msgid "" " % sudo apt-get build-dep .\n" @@ -471,7 +462,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-user.7.pod:296 +#: ../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 " @@ -479,29 +470,29 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-user.7.pod:302 +#: ../dgit-user.7.pod:295 msgid "Using sbuild" msgstr "" #. type: textblock -#: ../dgit-user.7.pod:304 +#: ../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 "" #. type: verbatim -#: ../dgit-user.7.pod:309 +#: ../dgit-user.7.pod:302 #, no-wrap msgid "" " % git clean -xdf\n" -" % sbuild -c jessie -A --no-clean-source \\\n" +" % sbuild -d trixie -A --no-clean-source \\\n" " --dpkg-source-opts='-Zgzip -z1 --format=1.0 -sn'\n" "\n" msgstr "" #. type: textblock -#: ../dgit-user.7.pod:315 +#: ../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 " @@ -509,63 +500,45 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-user.7.pod:322 +#: ../dgit-user.7.pod:315 msgid "INSTALLING" msgstr "" -#. type: =head2 -#: ../dgit-user.7.pod:324 -msgid "Debian Stretch or newer" -msgstr "" - #. type: verbatim -#: ../dgit-user.7.pod:328 +#: ../dgit-user.7.pod:319 #, no-wrap msgid "" " % sudo apt install ../libc6_*.deb\n" "\n" msgstr "" -#. type: =head2 -#: ../dgit-user.7.pod:332 -msgid "Debian Jessie or older" -msgstr "" - -#. type: verbatim -#: ../dgit-user.7.pod:336 -#, no-wrap -msgid "" -" % sudo dpkg -i ../libc6_*.deb\n" -"\n" -msgstr "" - #. type: textblock -#: ../dgit-user.7.pod:340 +#: ../dgit-user.7.pod:323 msgid "" "You can use C to install the .debs that came out of your package." msgstr "" #. type: textblock -#: ../dgit-user.7.pod:343 +#: ../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 "" #. type: =head1 -#: ../dgit-user.7.pod:347 +#: ../dgit-user.7.pod:330 msgid "Multiarch" msgstr "" #. type: textblock -#: ../dgit-user.7.pod:349 +#: ../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 "" #. type: verbatim -#: ../dgit-user.7.pod:355 +#: ../dgit-user.7.pod:338 #, no-wrap msgid "" " dpkg: error processing package libpcre3-dev:amd64 (--configure):\n" @@ -574,7 +547,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-user.7.pod:360 +#: ../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 " @@ -582,7 +555,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-user.7.pod:364 +#: ../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 " @@ -593,14 +566,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-user.7.pod:374 +#: ../dgit-user.7.pod:357 msgid "" "Otherwise you could deinstall the packages of interest for those other " "architectures with something like C." msgstr "" #. type: textblock -#: ../dgit-user.7.pod:378 +#: ../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. " @@ -610,45 +583,45 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-user.7.pod:386 +#: ../dgit-user.7.pod:369 msgid "With the \"same number\" approach you may still get errors like" msgstr "" #. type: textblock -#: ../dgit-user.7.pod:390 +#: ../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 "" #. type: textblock -#: ../dgit-user.7.pod:394 +#: ../dgit-user.7.pod:377 msgid "" "but passing C<--force-overwrite> to dpkg will help - assuming you know what " "you're doing." msgstr "" #. type: =head1 -#: ../dgit-user.7.pod:397 +#: ../dgit-user.7.pod:380 msgid "SHARING YOUR WORK" msgstr "" #. type: textblock -#: ../dgit-user.7.pod:399 +#: ../dgit-user.7.pod:382 msgid "" -"The C branch (or whatever) is a normal git branch. " +"The C branch (or whatever) is a normal git branch. " "You can use C to publish it on any suitable git server." msgstr "" #. type: textblock -#: ../dgit-user.7.pod:402 +#: ../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 "" #. type: textblock -#: ../dgit-user.7.pod:406 +#: ../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 Ldebian/source/format\n" @@ -691,7 +664,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-user.7.pod:440 +#: ../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 the latest version of dgit.deb from " "Debian stable, or Debian testing." msgstr "" #. type: textblock -#: ../dgit-user.7.pod:457 +#: ../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 " @@ -727,7 +700,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-user.7.pod:465 ../dgit-maint-native.7.pod:127 +#: ../dgit-user.7.pod:448 ../dgit-maint-native.7.pod:127 #: ../dgit-maint-gbp.7.pod:141 msgid "dgit(1), dgit(7)" msgstr "" diff -pruN 13.11+exp1/po4a/dgit_1.pot 13.12/po4a/dgit_1.pot --- 13.11+exp1/po4a/dgit_1.pot 2025-08-10 18:58:53.000000000 +0000 +++ 13.12/po4a/dgit_1.pot 2025-08-15 09:05:44.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2025-03-28 17:38+0000\n" +"POT-Creation-Date: 2025-08-15 14:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -34,7 +34,7 @@ msgstr "" #: ../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 ../tag2upload.5.pod:1 +#: ../git-debpush.1.pod:1 ../git-deborig.1.pod:1 ../tag2upload.5.pod:1 #, no-wrap msgid "NAME" msgstr "" @@ -46,6 +46,7 @@ msgstr "" #. 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 "" @@ -92,7 +93,7 @@ msgid "B [I] I msgstr "" #. type: =head1 -#: ../dgit.1:33 ../git-debpush.1.pod:9 +#: ../dgit.1:33 ../git-debpush.1.pod:9 ../git-deborig.1.pod:9 #, no-wrap msgid "DESCRIPTION" msgstr "" @@ -340,7 +341,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:148 ../dgit.1:196 ../dgit.1:236 +#: ../dgit.1:148 ../dgit.1:207 ../dgit.1:247 msgid "Tagging, signing and actually uploading should be left to dgit push." msgstr "" @@ -358,54 +359,68 @@ msgid "B ..." msgstr "" #. type: Plain text -#: ../dgit.1:161 +#: ../dgit.1:157 msgid "" "Builds the source package, and a changes file for a prospective source-only " -"upload, using B. The output is left in " -"IB<_>IB<.dsc> and " +"upload, using B." +msgstr "" + +#. type: Plain text +#: ../dgit.1:162 +msgid "" +"The output is left in IB<_>IB<.dsc> and " "IB<_>IB<_source.changes>." msgstr "" #. type: Plain text -#: ../dgit.1:164 +#: ../dgit.1:165 msgid "" "Tagging, signing and actually uploading should be left to dgit push-source, " "or dgit push." msgstr "" +#. type: Plain text +#: ../dgit.1:175 +msgid "" +"B checks that the generated source package corresponds to " +"the git HEAD (as canonicalised with the specified quilt mode, if " +"applicable). The other B options to not perform this check at " +"build time, instead leaving it to B." +msgstr "" + #. type: TP -#: ../dgit.1:164 +#: ../dgit.1:175 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: ../dgit.1:168 +#: ../dgit.1:179 msgid "" "Cleans the current working tree (according to the --clean= option in force)." msgstr "" #. type: TP -#: ../dgit.1:168 +#: ../dgit.1:179 #, no-wrap msgid "B [I|B<.>] [B<-->] [I]" msgstr "" #. type: TQ -#: ../dgit.1:170 +#: ../dgit.1:181 #, no-wrap msgid "B [IB<.>] B<->" msgstr "" #. type: Plain text -#: ../dgit.1:175 +#: ../dgit.1:186 msgid "" "Sets up, or updates the url of, the vcs-git remote, and (unless B<-> was " "specified) runs git fetch on it." msgstr "" #. type: Plain text -#: ../dgit.1:182 +#: ../dgit.1:193 msgid "" "By default, the Vcs-Git field of the .dsc from Debian sid is used, as that " "is probably most up to date. Another suite may be specified, or B<.> to " @@ -413,24 +428,24 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:182 +#: ../dgit.1:193 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: ../dgit.1:185 ../dgit.1:1442 +#: ../dgit.1:196 ../dgit.1:1484 msgid "Print a usage summary." msgstr "" #. type: TP -#: ../dgit.1:185 +#: ../dgit.1:196 #, no-wrap msgid "B ..." msgstr "" #. type: Plain text -#: ../dgit.1:194 +#: ../dgit.1:205 msgid "" "Constructs the source package, uses B to do a binary build, and uses " "mergechanges to merge the source and binary changes files. Options and " @@ -439,13 +454,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:196 +#: ../dgit.1:207 #, no-wrap msgid "B [I]" msgstr "" #. type: Plain text -#: ../dgit.1:204 +#: ../dgit.1:215 msgid "" "Constructs the source package, uses B to do a binary build, and " "uses mergechanges to merge the source and binary changes files. The output " @@ -453,14 +468,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:207 +#: ../dgit.1:218 msgid "" "You should ensure that your dgit --build-products-dir setting matches your " "pbuilder --buildresult." msgstr "" #. type: Plain text -#: ../dgit.1:213 +#: ../dgit.1:224 msgid "" "The I are passed to pbuilder using its --debbuildopts option. " "If you want to pass other options to pbuilder, use the B<--pbuilder:> dgit " @@ -469,58 +484,58 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:219 +#: ../dgit.1:230 msgid "" "You should ensure that in your pbuilderrc you do B have the setting " "B as this may cause trouble." msgstr "" #. type: TP -#: ../dgit.1:219 +#: ../dgit.1:230 #, no-wrap msgid "B [I]" msgstr "" #. type: Plain text -#: ../dgit.1:225 +#: ../dgit.1:236 msgid "Like B, but uses B instead of B" msgstr "" #. type: TP -#: ../dgit.1:225 +#: ../dgit.1:236 #, no-wrap msgid "B ..." msgstr "" #. type: Plain text -#: ../dgit.1:231 +#: ../dgit.1:242 msgid "" "Runs B with some suitable options. Options and arguments " "after gbp-build will be passed on to git-buildpackage." msgstr "" #. type: Plain text -#: ../dgit.1:234 +#: ../dgit.1:245 msgid "" "By default this uses --quilt=gbp, so HEAD should be a git-buildpackage style " "branch, not a patches-applied branch." msgstr "" #. type: TP -#: ../dgit.1:236 +#: ../dgit.1:247 #, no-wrap msgid "B [I]" msgstr "" #. type: Plain text -#: ../dgit.1:241 +#: ../dgit.1:252 msgid "" "Does an `upload': sends the current HEAD to dgit-repos (as git commits), and " "to the archive (as a source package, built by this command)." msgstr "" #. type: Plain text -#: ../dgit.1:245 +#: ../dgit.1:256 msgid "" "This is the usual way to upload to Debian. It is like saying \"update the " "source code in the archive to match my git HEAD, and let the autobuilders do " @@ -528,7 +543,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:256 +#: ../dgit.1:267 msgid "" "In more detail: dgit push-source builds a source package from HEAD. It then " "pushes the HEAD to the suite's dgit-repos branch, adjusts the .changes to " @@ -540,7 +555,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:260 +#: ../dgit.1:271 msgid "" "dgit push always uses the package, suite and version specified in the debian/" "changelog and the .dsc, which must agree. If the command line specifies a " @@ -548,27 +563,27 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:265 +#: ../dgit.1:276 msgid "" "When used on a git-debrebase branch, dgit calls git-debrebase to prepare the " "branch for source package upload and push." msgstr "" #. type: Plain text -#: ../dgit.1:269 +#: ../dgit.1:280 msgid "" "With B<-C>, dgit push-source performs a dgit push-built, additionally " "ensuring that no binary packages are uploaded." msgstr "" #. type: TP -#: ../dgit.1:269 +#: ../dgit.1:280 #, no-wrap msgid "B [I]" msgstr "" #. type: Plain text -#: ../dgit.1:276 +#: ../dgit.1:287 msgid "" "Does an `upload' of a previously built package, possibly including " "binaries. Sends the current HEAD to dgit-repos (as git commits); and, sends " @@ -576,7 +591,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:283 +#: ../dgit.1:294 msgid "" "The package must already have been built ready for upload, with the .dsc " "and .changes left in the parent directory. It is normally best to do the " @@ -586,7 +601,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:288 +#: ../dgit.1:299 msgid "" "dgit will check that the .dsc corresponds exactly to the current HEAD, " "ensuring that all users, whether of the dgit git view, or of the traditional " @@ -594,13 +609,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:288 +#: ../dgit.1:299 #, no-wrap msgid "B|B IB<:>I [I]" msgstr "" #. type: Plain text -#: ../dgit.1:295 +#: ../dgit.1:306 msgid "" "Pushes the contents of the specified directory on a remote machine. This is " "like running dgit push on build-host with src-dir as the current directory; " @@ -610,67 +625,67 @@ msgid "" msgstr "" #. type: =item -#: ../dgit.1:298 ../dgit-maint-merge.7.pod:464 +#: ../dgit.1:309 ../dgit-maint-merge.7.pod:464 #, no-wrap msgid "1." msgstr "" #. type: tbl table -#: ../dgit.1:298 +#: ../dgit.1:309 #, no-wrap msgid "Clone on build host (dgit clone)" msgstr "" #. type: =item -#: ../dgit.1:299 ../dgit-maint-merge.7.pod:468 +#: ../dgit.1:310 ../dgit-maint-merge.7.pod:468 #, no-wrap msgid "2." msgstr "" #. type: tbl table -#: ../dgit.1:299 +#: ../dgit.1:310 #, no-wrap msgid "Edit code on build host (edit, git commit)" msgstr "" #. type: =item -#: ../dgit.1:300 ../dgit-maint-merge.7.pod:473 +#: ../dgit.1:311 ../dgit-maint-merge.7.pod:473 #, no-wrap msgid "3." msgstr "" #. type: tbl table -#: ../dgit.1:300 +#: ../dgit.1:311 #, no-wrap msgid "Build package on build host (dgit build)" msgstr "" #. type: tbl table -#: ../dgit.1:301 +#: ../dgit.1:312 #, no-wrap msgid "4." msgstr "" #. type: tbl table -#: ../dgit.1:301 +#: ../dgit.1:312 #, no-wrap msgid "Test package on build host or elsewhere (dpkg -i, test)" msgstr "" #. type: tbl table -#: ../dgit.1:302 +#: ../dgit.1:313 #, no-wrap msgid "5." msgstr "" #. type: tbl table -#: ../dgit.1:302 +#: ../dgit.1:313 #, no-wrap msgid "Upload by invoking dgit rpush on host with your GPG key." msgstr "" #. type: Plain text -#: ../dgit.1:308 +#: ../dgit.1:319 msgid "" "However, the build-host must be able to ssh to the dgit repos. If this is " "not already the case, you must organise it separately, for example by the " @@ -678,14 +693,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:312 +#: ../dgit.1:323 msgid "" "The remaining arguments are treated just as dgit push-source or dgit push-" "built would handle them." msgstr "" #. type: Plain text -#: ../dgit.1:317 +#: ../dgit.1:328 msgid "" "build-host and build-dir can be passed as separate arguments; this is " "assumed to be the case if the first argument contains no : (except perhaps " @@ -693,7 +708,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:323 +#: ../dgit.1:334 msgid "" "You will need similar enough versions of dgit on the build-host and the " "invocation host. The build-host needs gnupg installed, with your public " @@ -702,13 +717,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:323 +#: ../dgit.1:334 #, no-wrap msgid "B|B I<...>" msgstr "" #. type: Plain text -#: ../dgit.1:334 +#: ../dgit.1:345 msgid "" "Configurable aliases for B and B. These " "aliases will in the future change to mean B and B " "git config option:" msgstr "" #. type: tbl table -#: ../dgit.1:340 +#: ../dgit.1:351 #, no-wrap msgid "B" msgstr "" #. type: tbl table -#: ../dgit.1:340 +#: ../dgit.1:351 #, no-wrap msgid "runs B" msgstr "" #. type: tbl table -#: ../dgit.1:340 +#: ../dgit.1:351 #, no-wrap msgid "future default" msgstr "" #. type: tbl table -#: ../dgit.1:341 +#: ../dgit.1:352 #, no-wrap msgid "B" msgstr "" #. type: tbl table -#: ../dgit.1:341 +#: ../dgit.1:352 #, no-wrap msgid "and runs B" msgstr "" #. type: tbl table -#: ../dgit.1:342 +#: ../dgit.1:353 #, no-wrap msgid "B" msgstr "" #. type: tbl table -#: ../dgit.1:342 +#: ../dgit.1:353 #, no-wrap msgid "warns, and runs B" msgstr "" #. type: tbl table -#: ../dgit.1:342 +#: ../dgit.1:353 #, no-wrap msgid "current default" msgstr "" #. type: tbl table -#: ../dgit.1:343 +#: ../dgit.1:354 #, no-wrap msgid "B" msgstr "" #. type: tbl table -#: ../dgit.1:343 +#: ../dgit.1:354 #, no-wrap msgid "fails" msgstr "" #. type: Plain text -#: ../dgit.1:354 +#: ../dgit.1:365 msgid "" "For dgit rpush, the behaviour is controlled by B, " "falling back to B if that is not set. Because " @@ -792,7 +807,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:364 +#: ../dgit.1:375 msgid "" "These settings can safely be passed to older dgit (via B<-c);> the value " "B will be supported indefinitely. This should be used in scripts " @@ -801,13 +816,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:364 +#: ../dgit.1:375 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: ../dgit.1:380 +#: ../dgit.1:391 msgid "" "Configure the current working tree the way that dgit clone would have set it " "up. Like running B, B and " @@ -818,13 +833,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:380 +#: ../dgit.1:391 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: ../dgit.1:386 +#: ../dgit.1:397 msgid "" "Set the working tree's user.name and user.email from the distro-specific " "dgit configuration (BIB<.user-name> and B<.user-" @@ -832,26 +847,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:386 +#: ../dgit.1:397 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: ../dgit.1:392 +#: ../dgit.1:403 msgid "" "Configures a git merge helper for the file B which uses " "B." msgstr "" #. type: TP -#: ../dgit.1:392 +#: ../dgit.1:403 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: ../dgit.1:407 +#: ../dgit.1:418 msgid "" "Set up the working tree's B<.git/info/attributes> to disable all " "transforming attributes for all files. This is done by defining a macro " @@ -861,7 +876,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:415 +#: ../dgit.1:426 msgid "" "If there is an existing macro attribute line B<[attr]dgit-defuse-attrs> " "in .git/info/attributes, but it is insufficient, because it was made by an " @@ -870,7 +885,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:426 +#: ../dgit.1:437 msgid "" "(If there is already a macro attribute line B<[attr]dgit-defuse-attrs> " "in .git/info/attributes which does what dgit requires (whatever files it " @@ -880,13 +895,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:426 +#: ../dgit.1:437 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: ../dgit.1:433 +#: ../dgit.1:444 msgid "" "`3.0 (quilt)' format source packages need changes representing not only in-" "tree but also as patches in debian/patches. dgit quilt-fixup checks whether " @@ -895,12 +910,12 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:435 +#: ../dgit.1:446 msgid "This is normally done automatically by dgit build and dgit push." msgstr "" #. type: Plain text -#: ../dgit.1:441 +#: ../dgit.1:452 msgid "" "dgit will try to turn each relevant commit in your git history into a new " "quilt patch. dgit cannot convert nontrivial merges, or certain other kinds " @@ -910,7 +925,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:450 +#: ../dgit.1:461 msgid "" "When used with a git-debrebase branch, dgit will ask git-debrebase to " "prepare patches. However, dgit can make patches in some situations where " @@ -920,25 +935,25 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:455 +#: ../dgit.1:466 msgid "See B in B." msgstr "" #. type: TP -#: ../dgit.1:455 +#: ../dgit.1:466 #, no-wrap msgid "B [I] I<../path/to/.dsc> [B<+>|B<..>]branch" msgstr "" #. type: Plain text -#: ../dgit.1:461 +#: ../dgit.1:472 msgid "" "Import a Debian-format source package, specified by its .dsc, into git, the " "way dgit fetch would do." msgstr "" #. type: Plain text -#: ../dgit.1:472 +#: ../dgit.1:483 msgid "" "This does about half the work of dgit fetch: it will convert the .dsc into a " "new, orphan git branch. Since dgit has no access to a corresponding source " @@ -949,7 +964,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:482 +#: ../dgit.1:493 msgid "" "Because a .dsc can contain a Dgit field naming a git commit (which you might " "not have), and specifying where to find that commit (and any history rewrite " @@ -959,12 +974,12 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:484 +#: ../dgit.1:495 msgid "There is only one sub-option:" msgstr "" #. type: Plain text -#: ../dgit.1:490 +#: ../dgit.1:501 msgid "" "B<--require-valid-signature> causes dgit to insist that the signature on " "the .dsc is valid (using the same criteria as dpkg-source -x). Otherwise, " @@ -973,7 +988,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:509 +#: ../dgit.1:520 msgid "" "If I is prefixed with B<+> then if it already exists, it will be " "simply overwritten, no matter its existing contents. If I is " @@ -985,55 +1000,109 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:513 +#: ../dgit.1:524 msgid "If I does not start with refs/, refs/heads/ is prepended." msgstr "" #. type: TP -#: ../dgit.1:513 +#: ../dgit.1:524 +#, no-wrap +msgid "Bdownload-unfetched-origsB< [>I]" +msgstr "" + +#. type: Plain text +#: ../dgit.1:529 +msgid "" +"Consults the archive for any orig tarballs for this package and upstream " +"version, and downloads them." +msgstr "" + +#. type: Plain text +#: ../dgit.1:531 +msgid "The suite declared in the changelog will be checked first." +msgstr "" + +#. type: Plain text +#: ../dgit.1:537 +msgid "" +"Failing that, the whole archive will be searched for suitable origs. If " +"there are multiple sets of origs that may apply, fails with exit status 5. " +"This can happen if different uploads of the same upstream version have " +"different origs." +msgstr "" + +#. type: Plain text +#: ../dgit.1:541 +msgid "" +"If (some of) the selected origs are already present locally, they aren't re-" +"downloaded, but their checksums are checked against data from the archive." +msgstr "" + +#. type: Plain text +#: ../dgit.1:543 +msgid "download-unfetched-origs supports some subcommand-specific options:" +msgstr "" + +#. type: TP +#: ../dgit.1:544 +#, no-wrap +msgid "B<--write-sha256sums=>I" +msgstr "" + +#. type: Plain text +#: ../dgit.1:554 +msgid "" +"Writes checksums of the selected origs to I, in sha256sum format. The " +"files listed are a set suitable for a new upload or build, of the this " +"package and version. The checksums file is written and correct, even if " +"dgit download-unfetched-origs exits with status 3." +msgstr "" + +#. type: TP +#: ../dgit.1:555 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: ../dgit.1:516 +#: ../dgit.1:558 msgid "Prints version information and exits." msgstr "" #. type: TP -#: ../dgit.1:516 +#: ../dgit.1:558 #, no-wrap msgid "BI< destdir>" msgstr "" #. type: Plain text -#: ../dgit.1:520 +#: ../dgit.1:562 msgid "" "Tries to fetch a copy of the source code for the dgit-repos-server, as " "actually being used on the dgit git server, as a git tree." msgstr "" #. type: TP -#: ../dgit.1:520 +#: ../dgit.1:562 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: ../dgit.1:525 +#: ../dgit.1:567 msgid "" "Prints the url used by dgit clone-dgit-repos-server. This is hopefully " "suitable for use as a git remote url. It may not be usable in a browser." msgstr "" #. type: TP -#: ../dgit.1:525 +#: ../dgit.1:567 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: ../dgit.1:532 +#: ../dgit.1:574 msgid "" "Prints the -i and -I arguments which must be passed to dpkg-souce to cause " "it to exclude exactly the .git directory and nothing else. The separate " @@ -1041,13 +1110,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:532 +#: ../dgit.1:574 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: ../dgit.1:543 +#: ../dgit.1:585 msgid "" "Constructs a tree-ish approximating the patches-unapplied state of your 3.0 " "(quilt) package, and prints the git object name to stdout. This requires " @@ -1058,7 +1127,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:550 +#: ../dgit.1:592 msgid "" "To make this operate off-line, the access configuration key which is used to " "determine the build-products-dir is the uncanonicalised version of the suite " @@ -1067,24 +1136,24 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:552 +#: ../dgit.1:594 msgid "This function is primarily provided for the benefit of git-debrebase." msgstr "" #. type: =head1 -#: ../dgit.1:552 ../git-debrebase.1.pod:473 +#: ../dgit.1:594 ../git-debrebase.1.pod:473 ../git-deborig.1.pod:28 #, no-wrap msgid "OPTIONS" msgstr "" #. type: TP -#: ../dgit.1:553 +#: ../dgit.1:595 #, no-wrap msgid "B<-k>I" msgstr "" #. type: Plain text -#: ../dgit.1:562 +#: ../dgit.1:604 msgid "" "Use I for signing the tag and the upload. The default comes from the " "distro's B config setting (see CONFIGURATION, below), or failing " @@ -1092,63 +1161,63 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:562 +#: ../dgit.1:604 #, no-wrap msgid "B<--no-sign>" msgstr "" #. type: Plain text -#: ../dgit.1:565 +#: ../dgit.1:607 msgid "does not sign tags or uploads (meaningful only with push)." msgstr "" #. type: TP -#: ../dgit.1:566 +#: ../dgit.1:608 #, no-wrap msgid "B<-p>I" msgstr "" #. type: Plain text -#: ../dgit.1:570 +#: ../dgit.1:612 msgid "Specifies that we should process source package I." msgstr "" #. type: Plain text -#: ../dgit.1:574 +#: ../dgit.1:616 msgid "" "For dgit fetch and dgit pull, uses this value rather than looking in debian/" "control or debian/changelog." msgstr "" #. type: Plain text -#: ../dgit.1:579 +#: ../dgit.1:621 msgid "" "For dgit rpush, specifies that the invoking host should be willing to sign " "only a .dsc or .changes file for the source package I." msgstr "" #. type: TP -#: ../dgit.1:579 +#: ../dgit.1:621 #, no-wrap msgid "B<--clean=git> | B<-wg>" msgstr "" #. type: Plain text -#: ../dgit.1:585 +#: ../dgit.1:627 msgid "" "Use B to clean the working tree, rather than running the " "package's rules clean target." msgstr "" #. type: Plain text -#: ../dgit.1:588 +#: ../dgit.1:630 msgid "" "This will delete all files which are not tracked by git. (Including any " "files you forgot to git add.)" msgstr "" #. type: Plain text -#: ../dgit.1:593 +#: ../dgit.1:635 msgid "" "B<--clean=>I<...> options other than dpkg-source are useful when the " "package's clean target is troublesome, or to avoid needing the build-" @@ -1156,7 +1225,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:600 +#: ../dgit.1:642 msgid "" "dgit will only actually clean the tree if it needs to (because it needs to " "build the source package or binaries from your working tree). Otherwise it " @@ -1165,13 +1234,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:600 +#: ../dgit.1:642 #, no-wrap msgid "B<--clean=git-ff> | B<-wgf>" msgstr "" #. type: Plain text -#: ../dgit.1:609 +#: ../dgit.1:651 msgid "" "Use B to clean the working tree. Like git clean -xdf but " "it also removes any subdirectories containing different git trees (which " @@ -1179,33 +1248,33 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:609 +#: ../dgit.1:651 #, no-wrap msgid "B<--clean=git>[B<-ff>]B<,always> | B<-wga> | B<-wgfa>" msgstr "" #. type: Plain text -#: ../dgit.1:613 +#: ../dgit.1:655 msgid "" "Like --clean=git, but always does the clean and not just a check, deleting " "any untracked un-ignored files." msgstr "" #. type: TP -#: ../dgit.1:613 +#: ../dgit.1:655 #, no-wrap msgid "B<--clean=check> | B<--clean=check,ignores> | B<-wc> | B<-wci>" msgstr "" #. type: Plain text -#: ../dgit.1:619 +#: ../dgit.1:661 msgid "" "Merely check that the tree is clean (does not contain uncommitted files). " "Avoids running rules clean, and can avoid needing the build-dependencies." msgstr "" #. type: Plain text -#: ../dgit.1:630 +#: ../dgit.1:672 msgid "" "With B<,ignores> or B<-wci>, untracked files covered by .gitignore are " "tolerated, so only files which show up as B in git status (ie, ones you " @@ -1213,13 +1282,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:630 +#: ../dgit.1:672 #, no-wrap msgid "B<--clean=none> | B<-wn>" msgstr "" #. type: Plain text -#: ../dgit.1:638 +#: ../dgit.1:680 msgid "" "Do not clean the tree, nor check that it is clean. Avoids running rules " "clean, and can avoid needing the build-dependencies. If there are files " @@ -1228,13 +1297,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:638 +#: ../dgit.1:680 #, no-wrap msgid "B<--clean=dpkg-source>[B<-d>] | B<-wd> | B<-wdd>" msgstr "" #. type: Plain text -#: ../dgit.1:643 +#: ../dgit.1:685 msgid "" "Use dpkg-buildpackage to do the clean, so that the source package is cleaned " "by dpkg-source running the package's clean target. --clean=dpkg-source is " @@ -1242,12 +1311,12 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:647 +#: ../dgit.1:689 msgid "Without the extra B, requires the package's build dependencies." msgstr "" #. type: Plain text -#: ../dgit.1:657 +#: ../dgit.1:699 msgid "" "With B<...>-d or B<-wdd>, the build-dependencies are not checked (due to " "passing B<-d> to dpkg-buildpackage), which violates policy, but may work in " @@ -1255,7 +1324,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:664 +#: ../dgit.1:706 msgid "" "The rules clean target will only be run if it is needed: when dgit is going " "to build source or binary packages from your working tree, rather than from " @@ -1264,7 +1333,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:674 +#: ../dgit.1:716 msgid "" "In all cases, dgit will check that there are (after rules clean, if " "applicable) no untracked un-ignored files, in case these are files you " @@ -1275,38 +1344,38 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:674 +#: ../dgit.1:716 #, no-wrap msgid "B<--clean=dpkg-source>[B<-d>]B<,no-check> | B<-wdn> | B<-wddn>" msgstr "" #. type: Plain text -#: ../dgit.1:678 +#: ../dgit.1:720 msgid "" "Like --clean=dpkg-source, but does not care about untracked un-ignored files." msgstr "" #. type: TP -#: ../dgit.1:678 +#: ../dgit.1:720 #, no-wrap msgid "B<--clean=dpkg-source>[B<-d>]B<,all-check> | B<-wda> | B<-wdda>" msgstr "" #. type: Plain text -#: ../dgit.1:683 +#: ../dgit.1:725 msgid "" "Like --clean=dpkg-source, but fails even on ignored untracked files. This " "could perhaps be used to detect bugs in your rules clean target." msgstr "" #. type: TP -#: ../dgit.1:683 +#: ../dgit.1:725 #, no-wrap msgid "B<-N> | B<--new>" msgstr "" #. type: Plain text -#: ../dgit.1:689 +#: ../dgit.1:731 msgid "" "The package is, or may be, new in this suite. Without this, dgit will " "refuse to push. Needing --new is not unusual; for example, it is frequently " @@ -1314,7 +1383,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:695 +#: ../dgit.1:737 msgid "" "Note that dgit may be unable to access the git history for an entirely new " "package which has not been accepted by the archive. So for an entirely new " @@ -1322,13 +1391,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:695 +#: ../dgit.1:737 #, no-wrap msgid "B<--include-dirty>" msgstr "" #. type: Plain text -#: ../dgit.1:703 +#: ../dgit.1:745 msgid "" "Do not complain if the working tree does not match your git HEAD, and when " "building, include the changes from your working tree. This can be useful " @@ -1338,7 +1407,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:715 +#: ../dgit.1:757 msgid "" "Note that this does B prevent dgit from cleaning your tree, so if the " "changes in your working tree are in the form of untracked files, those might " @@ -1349,31 +1418,31 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:715 +#: ../dgit.1:757 #, no-wrap msgid "B<--ignore-dirty>" msgstr "" #. type: Plain text -#: ../dgit.1:718 +#: ../dgit.1:760 msgid "Deprecated alias for --include-dirty." msgstr "" #. type: TP -#: ../dgit.1:718 +#: ../dgit.1:760 #, no-wrap msgid "B<--collab-non-dgit>" msgstr "" #. type: Plain text -#: ../dgit.1:725 +#: ../dgit.1:767 msgid "" "Make B, behave more suitably for collaborating (using shared git " "history) with git-using co-developers who aren't using dgit." msgstr "" #. type: Plain text -#: ../dgit.1:731 +#: ../dgit.1:773 msgid "" "With this option, dgit won't mind that the git history you're using isn't " "necessarily fast forward from the dgit view; instead, it will rely on the " @@ -1381,7 +1450,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:740 +#: ../dgit.1:782 msgid "" "And, the synthetic commits needed to make the dgit git history fast forward " "will appear only on the dgit git server, and local dgit suite branches, not " @@ -1390,18 +1459,18 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:743 +#: ../dgit.1:785 msgid "This is equivalent to B<--split-view=always --trust-changelog>." msgstr "" #. type: TP -#: ../dgit.1:743 +#: ../dgit.1:785 #, no-wrap msgid "B<--trust-changelog> | B<--overwrite>=I" msgstr "" #. type: Plain text -#: ../dgit.1:754 +#: ../dgit.1:796 msgid "" "Declare that your HEAD really does contain all the (wanted) changes from all " "versions listed in its changelog; or, all (wanted) changes from I, than B<--overwrite=>I, and usually the latter is not needed." msgstr "" #. type: Plain text -#: ../dgit.1:767 +#: ../dgit.1:809 msgid "" "B<--trust-changelog> is useful if you are the maintainer, and you have " "incorporated NMU changes into your own git workflow in a way that doesn't " @@ -1427,14 +1496,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:773 +#: ../dgit.1:815 msgid "" "It is also usually necessary the first time a package is pushed with dgit " "push to a particular suite. See BI<*>B<(7)>." msgstr "" #. type: Plain text -#: ../dgit.1:782 +#: ../dgit.1:824 msgid "" "With B<--trust-changelog> dgit will check that the version in the archive is " "mentioned in your debian/changelog. (This will avoid losing changes, unless " @@ -1443,7 +1512,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:788 +#: ../dgit.1:830 msgid "" "With B<--overwrite=>I that version ought to be the version " "currently in the archive, and it will be unconditionally overwritten, " @@ -1451,7 +1520,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:794 +#: ../dgit.1:836 msgid "" "These options will, if necessary, make a pseudo-merge (that is, something " "that looks like the result of git merge -s ours) to stitch the archive's " @@ -1460,7 +1529,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:801 +#: ../dgit.1:843 msgid "" "(In quilt mode B, B, B or B*, implying a " "split between the dgit view and the maintainer view, the pseudo-merge will " @@ -1469,25 +1538,25 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:805 +#: ../dgit.1:847 msgid "" "B<--overwrite> without a version number is an obsolete way of specifying B<--" "trust-changelog>." msgstr "" #. type: TP -#: ../dgit.1:805 +#: ../dgit.1:847 #, no-wrap msgid "B<--delayed>=I" msgstr "" #. type: Plain text -#: ../dgit.1:808 +#: ../dgit.1:850 msgid "Upload to a DELAYED queue." msgstr "" #. type: Plain text -#: ../dgit.1:818 +#: ../dgit.1:860 msgid "" "B If the maintainer responds by cancelling your upload from the " "queue, and does not make an upload of their own, this will not rewind the " @@ -1497,27 +1566,27 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:823 +#: ../dgit.1:865 msgid "" "If this situation arises, someone should make a suitable dgit push to update " "the contents of dgit-repos to a version without the controversial changes." msgstr "" #. type: TP -#: ../dgit.1:823 +#: ../dgit.1:865 #, no-wrap msgid "B<--no-chase-dsc-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:829 +#: ../dgit.1:871 msgid "" "Tells dgit not to look online for additional git repositories containing " "information about a particular .dsc being imported. Chasing is the default." msgstr "" #. type: Plain text -#: ../dgit.1:839 +#: ../dgit.1:881 msgid "" "For most operations (such as fetch and pull), disabling chasing means dgit " "will access only the git server for the distro you are directly working " @@ -1526,7 +1595,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:847 +#: ../dgit.1:889 msgid "" "Disabling chasing can be hazardous: if the .dsc names a git commit which has " "been rewritten by those in charge of the distro, this option may prevent " @@ -1535,13 +1604,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:847 +#: ../dgit.1:889 #, no-wrap msgid "B<--save-dgit-view=>I|I" msgstr "" #. type: Plain text -#: ../dgit.1:857 +#: ../dgit.1:899 msgid "" "Specifies that when split view is in operation, and dgit calculates (or " "looks up in its cache) a dgit view corresponding to your HEAD, the dgit " @@ -1550,7 +1619,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:861 +#: ../dgit.1:903 msgid "" "This option is effective only with the following operations: quilt-fixup; " "push; all builds. And it is only effective when split view is actually in " @@ -1558,25 +1627,25 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:865 +#: ../dgit.1:907 msgid "" "If ref does not start with refs/ it is taken to be a branch - i.e. refs/" "heads/ is prepended." msgstr "" #. type: Plain text -#: ../dgit.1:869 +#: ../dgit.1:911 msgid "B<--dgit-view-save> is a deprecated alias for --save-dgit-view." msgstr "" #. type: TP -#: ../dgit.1:869 +#: ../dgit.1:911 #, no-wrap msgid "B<--deliberately->I" msgstr "" #. type: Plain text -#: ../dgit.1:883 +#: ../dgit.1:925 msgid "" "Declare that you are deliberately doing I. This can be used to " "override safety catches, including safety catches which relate to distro-" @@ -1588,13 +1657,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:883 +#: ../dgit.1:925 #, no-wrap msgid "B<--deliberately-not-fast-forward>" msgstr "" #. type: Plain text -#: ../dgit.1:889 +#: ../dgit.1:931 msgid "" "Declare that you are deliberately rewriting history. This could be because " "your branch is not fast forward from the dgit server history, or not fast " @@ -1602,7 +1671,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:895 +#: ../dgit.1:937 msgid "" "When pushing to Debian, use this only when you are making a renewed upload " "of an entirely new source package whose previous version was not accepted " @@ -1611,7 +1680,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:906 +#: ../dgit.1:948 msgid "" "When split view is in operation, this also prevents the construction by dgit " "of a pseudomerge to make the dgit view fast forwarding. Normally only one " @@ -1621,13 +1690,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:906 +#: ../dgit.1:948 #, no-wrap msgid "B<--deliberately-include-questionable-history>" msgstr "" #. type: Plain text -#: ../dgit.1:915 +#: ../dgit.1:957 msgid "" "Declare that you are deliberately including, in the git history of your " "current push, history which contains a previously-submitted version of this " @@ -1639,13 +1708,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:915 +#: ../dgit.1:957 #, no-wrap msgid "B<--deliberately-fresh-repo>" msgstr "" #. type: Plain text -#: ../dgit.1:920 +#: ../dgit.1:962 msgid "" "Declare that you are deliberately rewriting history and want to throw away " "the existing repo. Not relevant when pushing to Debian, as the Debian " @@ -1653,13 +1722,13 @@ msgid "" msgstr "" #. type: =item -#: ../dgit.1:920 ../git-debpush.1.pod:114 +#: ../dgit.1:962 ../git-debpush.1.pod:138 #, no-wrap msgid "B<--quilt=linear>" msgstr "" #. type: Plain text -#: ../dgit.1:927 +#: ../dgit.1:969 msgid "" "With format `3.0 (quilt)', insist on a linear patch stack: one new patch for " "each relevant commit. If such a stack cannot be generated, fail. This is " @@ -1667,20 +1736,20 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:932 +#: ../dgit.1:974 msgid "" "HEAD should be a series of plain commits (not touching debian/patches/), and " "pseudomerges, with as ancestor a patches-applied branch." msgstr "" -#. type: TP -#: ../dgit.1:932 +#. type: =item +#: ../dgit.1:974 ../git-debpush.1.pod:150 #, no-wrap msgid "B<--quilt=try-linear>" msgstr "" #. type: Plain text -#: ../dgit.1:942 +#: ../dgit.1:984 msgid "" "With format `3.0 (quilt)', prefer a linear patch stack (as with --" "quilt=linear) but if that doesn't seem possible, try to generate a single " @@ -1689,13 +1758,13 @@ msgid "" msgstr "" #. type: =item -#: ../dgit.1:942 ../git-debpush.1.pod:120 +#: ../dgit.1:984 ../git-debpush.1.pod:144 #, no-wrap msgid "B<--quilt=smash>" msgstr "" #. type: Plain text -#: ../dgit.1:948 +#: ../dgit.1:990 msgid "" "With format `3.0 (quilt)', assume patches-applied (as obtained from dgit " "clone) and generate a single additional patch for all the changes made in " @@ -1703,7 +1772,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:954 +#: ../dgit.1:996 msgid "" "(If HEAD has any in-tree patches already, they must apply cleanly. This " "will be the case for any trees produced by dgit fetch or clone; if you do " @@ -1712,13 +1781,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:954 +#: ../dgit.1:996 #, no-wrap msgid "B<--quilt=single>" msgstr "" #. type: Plain text -#: ../dgit.1:961 +#: ../dgit.1:1003 msgid "" "With format `3.0 (quilt)', assume patches-applied (as obtained from dgit " "clone), delete all the existing patches, and then generate a single patch " @@ -1727,7 +1796,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:970 +#: ../dgit.1:1012 msgid "" "Use this instead of the B dpkg-source format option. " "That dpkg-source option cannot handle certain changes to the tree that dpkg-" @@ -1737,13 +1806,13 @@ msgid "" msgstr "" #. type: =item -#: ../dgit.1:970 ../git-debpush.1.pod:131 +#: ../dgit.1:1012 ../git-debpush.1.pod:155 #, no-wrap msgid "B<--quilt=nofix>" msgstr "" #. type: Plain text -#: ../dgit.1:980 +#: ../dgit.1:1022 msgid "" "With format `3.0 (quilt)', assume patches-applied (as obtained from dgit " "clone), and check that the patch metadata is up to date. If it isn't, fail; " @@ -1753,13 +1822,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:980 +#: ../dgit.1:1022 #, no-wrap msgid "B<--quilt=nocheck> | B<--no-quilt-fixup>" msgstr "" #. type: Plain text -#: ../dgit.1:987 +#: ../dgit.1:1029 msgid "" "With format `3.0 (quilt)', assume that the tree is patches-applied (as " "obtained from dgit clone), and I that the patch metadata is up to " @@ -1768,27 +1837,27 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:987 +#: ../dgit.1:1029 #, no-wrap msgid "B<-->[B]B | B<-->[B]B | B<--quilt=unapplied> | B<-->[B]B[B<+git>|B<+tarball>]" msgstr "" #. type: Plain text -#: ../dgit.1:994 +#: ../dgit.1:1036 msgid "" "Tell dgit that you are using a nearly-dgit-compatible git branch, aka a " "B, and do not want your branch changed by dgit." msgstr "" #. type: Plain text -#: ../dgit.1:998 +#: ../dgit.1:1040 msgid "" "These quilt modes are known as B. See --split-view, " "below." msgstr "" #. type: Plain text -#: ../dgit.1:1006 +#: ../dgit.1:1048 msgid "" "B<--gbp> (short for B<--quilt=gbp>) is for use with git-buildpackage. Your " "HEAD is expected to be a patches-unapplied git branch, except that it might " @@ -1797,7 +1866,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1014 +#: ../dgit.1:1056 msgid "" "B<--dpm> (short for B<--quilt=dpm>) is for use with git-dpm. Your HEAD is " "expected to be a patches-applied git branch, except that it might contain " @@ -1805,7 +1874,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1019 +#: ../dgit.1:1061 msgid "" "B<--quilt=unapplied> specifies that your HEAD is a patches-unapplied git " "branch (and that any changes to upstream .gitignore files are represented as " @@ -1813,7 +1882,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1033 +#: ../dgit.1:1075 msgid "" "B<--quilt=baredebian> (or its alias B<--quilt=baredebian+git>) specifies " "that your HEAD contains only a debian/ directory, with any changes to " @@ -1825,7 +1894,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1044 +#: ../dgit.1:1086 msgid "" "B<--quilt=baredebian+tarball> is like --quilt=baredebian, but is used when " "there is no appropriate upstream git history. To construct the dgit view, " @@ -1836,7 +1905,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1062 +#: ../dgit.1:1104 msgid "" "With --quilt=gbp|dpm|unapplied|baredebian*, dgit push (or precursors like " "quilt-fixup and build) will automatically generate a conversion of your git " @@ -1850,7 +1919,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1071 +#: ../dgit.1:1113 msgid "" "B This is because it is not always possible to tell: a " @@ -1862,13 +1931,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1071 +#: ../dgit.1:1113 #, no-wrap msgid "B<-d>I | B<--distro=>I" msgstr "" #. type: Plain text -#: ../dgit.1:1080 +#: ../dgit.1:1122 msgid "" "Specifies that the suite to be operated on is part of distro I. " "This overrides the default value found from the git config option B|B|B" msgstr "" #. type: Plain text -#: ../dgit.1:1096 +#: ../dgit.1:1138 msgid "" "Controls whether dgit operates a split view, separating your own branch (as " "Debian maintainer) from that shown to users of dgit clone and dgit fetch." msgstr "" #. type: Plain text -#: ../dgit.1:1104 +#: ../dgit.1:1146 msgid "" "When split view is in operation dgit will not make or merge any commits onto " "your own branch. Specifically, only the dgit view will contain dgit's " @@ -1918,7 +1987,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1110 +#: ../dgit.1:1152 msgid "" "B is the default, and splits the view only when needed: i.e., when you " "are working with a `3.0 (quilt)' source package and a splitting quilt mode: " @@ -1926,18 +1995,18 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1113 +#: ../dgit.1:1155 msgid "" "B splits the view regardless of the source format and the quilt mode." msgstr "" #. type: Plain text -#: ../dgit.1:1116 +#: ../dgit.1:1158 msgid "B will cause dgit to fail if split view is needed." msgstr "" #. type: Plain text -#: ../dgit.1:1124 +#: ../dgit.1:1166 msgid "" "When split view is in operation, the dgit view is visible in your local git " "clone, but only in refs specific to dgit: notably BI" msgstr "" #. type: Plain text -#: ../dgit.1:1132 +#: ../dgit.1:1174 msgid "" "Specifies the .changes file which is to be uploaded. By default dgit push " "looks for a single .changes file in the parent directory whose filename " @@ -1966,7 +2035,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1141 +#: ../dgit.1:1183 msgid "" "If the specified I pathname contains slashes, the directory " "part is also used as the value for B<--build-products-dir>; otherwise, the " @@ -1974,13 +2043,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1141 +#: ../dgit.1:1183 #, no-wrap msgid "B<--upstream-commitish=>I" msgstr "" #. type: Plain text -#: ../dgit.1:1149 +#: ../dgit.1:1191 msgid "" "For use with --quilt=baredebian only. Specifies the commit containing the " "upstream source. This commit must be identical to your .orig tarball. The " @@ -1989,13 +2058,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1149 +#: ../dgit.1:1191 #, no-wrap msgid "B<--rm-old-changes>" msgstr "" #. type: Plain text -#: ../dgit.1:1161 +#: ../dgit.1:1203 msgid "" "When doing a build, delete any changes files matching " "IB<_>IB<_*.changes> before starting. This ensures that " @@ -2007,32 +2076,32 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1164 +#: ../dgit.1:1206 msgid "" "Note that B will always find the right .changes, " "regardless of this option." msgstr "" #. type: TP -#: ../dgit.1:1164 +#: ../dgit.1:1206 #, no-wrap msgid "B<--build-products-dir=>I" msgstr "" #. type: Plain text -#: ../dgit.1:1168 +#: ../dgit.1:1210 msgid "" "Specifies where to find and create tarballs, binary packages, source " "packages, .changes files, and so on." msgstr "" #. type: Plain text -#: ../dgit.1:1171 +#: ../dgit.1:1213 msgid "By default, dgit uses the parent directory (B<..>)." msgstr "" #. type: Plain text -#: ../dgit.1:1180 +#: ../dgit.1:1222 msgid "" "Changing this setting may necessitate moving .orig tarballs to the new " "directory, so it is probably best to use the B" msgstr "" #. type: Plain text -#: ../dgit.1:1183 +#: ../dgit.1:1225 msgid "Do not delete the destination directory if clone fails." msgstr "" #. type: TP -#: ../dgit.1:1183 +#: ../dgit.1:1225 #, no-wrap msgid "B<--dep14tag> | B<--no-dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:1189 +#: ../dgit.1:1231 msgid "" "Whether to push a DEP-14 tag (eg BI) as well as a dgit " "tag (eg BI)." msgstr "" #. type: Plain text -#: ../dgit.1:1192 +#: ../dgit.1:1234 msgid "" "Pushing a DEP-14 tag is the default. In split view mode, a DEP-14 tag is " "always pushed, regardless of this option." msgstr "" #. type: Plain text -#: ../dgit.1:1195 +#: ../dgit.1:1237 msgid "" "B<--always-dep14tag> is an obsolete alias for --dep14tag, retained for " "compatibility." msgstr "" #. type: TP -#: ../dgit.1:1195 +#: ../dgit.1:1237 #, no-wrap msgid "B<--dep14tag-reuse=must>|B|B|B" msgstr "" #. type: Plain text -#: ../dgit.1:1199 +#: ../dgit.1:1241 msgid "" "Whether to use an existing DEP-14 tag, or make a fresh one. Ignored if no " "DEP-14 tag is to be pushed." msgstr "" #. type: TP -#: ../dgit.1:1200 +#: ../dgit.1:1242 #, no-wrap msgid "B<--dep14tag-reuse=must>" msgstr "" #. type: Plain text -#: ../dgit.1:1204 +#: ../dgit.1:1246 msgid "" "Push an existing tag DEP-14 tag. If there is no existing tag, or the " "existing tag is unsuitable, fail." msgstr "" #. type: TP -#: ../dgit.1:1204 +#: ../dgit.1:1246 #, no-wrap msgid "B<--dep14tag-reuse=if-exists>" msgstr "" #. type: Plain text -#: ../dgit.1:1209 +#: ../dgit.1:1251 msgid "" "Push an existing tag DEP-14 tag, if it exists. If there is no existing tag, " "make one. If there is an existing tag but it is unsuitable, fail." msgstr "" #. type: Plain text -#: ../dgit.1:1211 +#: ../dgit.1:1253 msgid "This is the default." msgstr "" #. type: TP -#: ../dgit.1:1211 +#: ../dgit.1:1253 #, no-wrap msgid "B<--dep14tag-reuse=replace-unsuitable>" msgstr "" #. type: Plain text -#: ../dgit.1:1216 +#: ../dgit.1:1258 msgid "" "Push an existing tag DEP-14 tag, if it exists and is suitable. If there is " "no existing tag, or it's unsuitable, make a fresh tag, overwriting the " @@ -2137,44 +2206,44 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1216 +#: ../dgit.1:1258 #, no-wrap msgid "B<--dep14tag-reuse=replace>" msgstr "" #. type: Plain text -#: ../dgit.1:1220 +#: ../dgit.1:1262 msgid "" "Always make a fresh DEP-14 tag, overwriting the corresponding git ref, and " "thus deleting any old tag." msgstr "" #. type: Plain text -#: ../dgit.1:1222 +#: ../dgit.1:1264 msgid "This was the default in dgit 11 and earlier." msgstr "" #. type: TP -#: ../dgit.1:1223 +#: ../dgit.1:1265 #, no-wrap msgid "B<--dep14tag-verify> | B<--no-dep14tag-verify>" msgstr "" #. type: Plain text -#: ../dgit.1:1227 +#: ../dgit.1:1269 msgid "" "Whether to verify an existing DEP-14 tag, as part of the suitability check." msgstr "" #. type: Plain text -#: ../dgit.1:1230 +#: ../dgit.1:1272 msgid "" "The default is to consider an unsigned tag suitable (and not verify a signed " "one)." msgstr "" #. type: Plain text -#: ../dgit.1:1236 +#: ../dgit.1:1278 msgid "" "Note that any DEP-14 tag being pushed will be, effectively, countersigned: " "the hash of the DEP-14 tag object (if there is one) is part of the metadata " @@ -2182,26 +2251,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1236 +#: ../dgit.1:1278 #, no-wrap msgid "B<-D>" msgstr "" #. type: Plain text -#: ../dgit.1:1240 +#: ../dgit.1:1282 msgid "" "Prints debugging information to stderr. Repeating the option produces more " "output (currently, up to -DDDD is meaningfully different)." msgstr "" #. type: TP -#: ../dgit.1:1240 +#: ../dgit.1:1282 #, no-wrap msgid "B<--keep-playground>|B<--no--keep-playground>" msgstr "" #. type: Plain text -#: ../dgit.1:1249 +#: ../dgit.1:1291 msgid "" "Controls whether to retain the \"playground\" working directory B<.git/dgit/" "unpack> even on success, for examination and debugging. The default is B<--" @@ -2209,26 +2278,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1249 +#: ../dgit.1:1291 #, no-wrap msgid "B<-c>IB<=>I" msgstr "" #. type: Plain text -#: ../dgit.1:1253 +#: ../dgit.1:1295 msgid "" "Specifies a git configuration option, to be used for this run. dgit itself " "is also controlled by git configuration options." msgstr "" #. type: TP -#: ../dgit.1:1253 +#: ../dgit.1:1295 #, no-wrap msgid "B<-v>I|B<_> | B<--since-version=>versionI<|>B<_>" msgstr "" #. type: Plain text -#: ../dgit.1:1262 +#: ../dgit.1:1304 msgid "" "Specifies the B<-v>I option to pass to dpkg-genchanges, during " "builds. Changes (from debian/changelog) since this version will be included " @@ -2238,7 +2307,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1268 +#: ../dgit.1:1310 msgid "" "Specifying B<_> inhibits this, so that no -v option will be passed to dpkg-" "genchanges (and as a result, only the last stanza from debian/changelog will " @@ -2246,30 +2315,30 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1268 +#: ../dgit.1:1310 #, no-wrap msgid "B<-m>I" msgstr "" #. type: Plain text -#: ../dgit.1:1271 +#: ../dgit.1:1313 msgid "Passed to dpkg-genchanges (eventually)." msgstr "" #. type: TP -#: ../dgit.1:1271 +#: ../dgit.1:1313 #, no-wrap msgid "B<--ch:>I config when B, " "or when pushing and B." msgstr "" #. type: TP -#: ../dgit.1:1713 +#: ../dgit.1:1807 #, no-wrap msgid "BIB<.git-url>" msgstr "" #. type: TP -#: ../dgit.1:1715 +#: ../dgit.1:1809 #, no-wrap msgid "BIB<.git-url>[B<-suffix>]" msgstr "" #. type: TP -#: ../dgit.1:1717 +#: ../dgit.1:1811 #, no-wrap msgid "BIB<.git-proto>" msgstr "" #. type: TP -#: ../dgit.1:1719 +#: ../dgit.1:1813 #, no-wrap msgid "BIB<.git-path>" msgstr "" #. type: TP -#: ../dgit.1:1721 +#: ../dgit.1:1815 #, no-wrap msgid "BIB<.git-check> B|B|B|B" msgstr "" #. type: TP -#: ../dgit.1:1723 +#: ../dgit.1:1817 #, no-wrap msgid "BIB<.git-check-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1725 +#: ../dgit.1:1819 #, no-wrap msgid "BIB<.policy-query-supported-ssh>I< >BI<|>BI<|>B" msgstr "" #. type: TP -#: ../dgit.1:1727 +#: ../dgit.1:1821 #, no-wrap msgid "BIB<.diverts.divert> B|BI" msgstr "" #. type: TP -#: ../dgit.1:1729 +#: ../dgit.1:1823 #, no-wrap msgid "BIB<.git-create>I< >BI<|>B" msgstr "" #. type: TP -#: ../dgit.1:1731 +#: ../dgit.1:1825 #, no-wrap msgid "BIB<.archive-query> B | BI | BI | BIB<@>IB<:>IB< >|B< aptget:>" msgstr "" #. type: TP -#: ../dgit.1:1733 +#: ../dgit.1:1827 #, no-wrap msgid "BIB<.archive-query->(B|B|B)" msgstr "" #. type: TP -#: ../dgit.1:1735 +#: ../dgit.1:1829 #, no-wrap msgid "BIB<.madison-distro>" msgstr "" #. type: TP -#: ../dgit.1:1737 +#: ../dgit.1:1831 #, no-wrap msgid "BIB<.archive-query-default-component>" msgstr "" #. type: TP -#: ../dgit.1:1739 +#: ../dgit.1:1833 #, no-wrap msgid "BIB<.dep14tag> B|B[|B]" msgstr "" #. type: TP -#: ../dgit.1:1741 +#: ../dgit.1:1835 #, no-wrap msgid "BIB<.dep14tag-reuse> B|B|B|B" msgstr "" #. type: Plain text -#: ../dgit.1:1744 +#: ../dgit.1:1838 msgid "BIB<.dep14tag-verify> B|B" msgstr "" #. type: TP -#: ../dgit.1:1744 +#: ../dgit.1:1838 #, no-wrap msgid "BIB<.ssh>" msgstr "" #. type: TP -#: ../dgit.1:1746 +#: ../dgit.1:1840 #, no-wrap msgid "BIB<.sshpsql-dbname>" msgstr "" #. type: TP -#: ../dgit.1:1748 +#: ../dgit.1:1842 #, no-wrap msgid "BIB<.>(B|B)B<->(B|B|B)" msgstr "" #. type: TP -#: ../dgit.1:1750 +#: ../dgit.1:1844 #, no-wrap msgid "BIB<.backports-quirk>" msgstr "" #. type: TP -#: ../dgit.1:1752 +#: ../dgit.1:1846 #, no-wrap msgid "BIB<.rewrite-map-enable>" msgstr "" #. type: TP -#: ../dgit.1:1754 +#: ../dgit.1:1848 #, no-wrap msgid "BIB<.source-only-uploads> B|B|B|B" msgstr "" #. type: TP -#: ../dgit.1:1756 +#: ../dgit.1:1850 #, no-wrap msgid "B" msgstr "" #. type: TP -#: ../dgit.1:1758 +#: ../dgit.1:1852 #, no-wrap msgid "BI" msgstr "" #. type: TP -#: ../dgit.1:1760 +#: ../dgit.1:1854 #, no-wrap msgid "B" msgstr "" #. type: TP -#: ../dgit.1:1762 +#: ../dgit.1:1856 #, no-wrap msgid "B" msgstr "" #. type: TP -#: ../dgit.1:1764 +#: ../dgit.1:1858 #, no-wrap msgid "BI< >BI<|>BI<|>B" msgstr "" #. type: Plain text -#: ../dgit.1:1768 +#: ../dgit.1:1862 msgid "Controls the behaviour of B." msgstr "" #. type: TP -#: ../dgit.1:1768 +#: ../dgit.1:1862 #, no-wrap msgid "B I[B<;>...]" msgstr "" #. type: SH -#: ../dgit.1:1770 +#: ../dgit.1:1864 #, no-wrap msgid "ENVIRONMENT VARIABLES" msgstr "" #. type: TP -#: ../dgit.1:1771 +#: ../dgit.1:1865 #, no-wrap msgid "B, B" msgstr "" #. type: Plain text -#: ../dgit.1:1780 +#: ../dgit.1:1874 msgid "" "specify an alternative default program (and perhaps arguments) to use " "instead of ssh. DGIT_SSH is consulted first and may contain arguments; if " @@ -3291,26 +3490,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1780 +#: ../dgit.1:1874 #, no-wrap msgid "B, B" msgstr "" #. type: Plain text -#: ../dgit.1:1784 +#: ../dgit.1:1878 msgid "" "Default git user.email and user.name for new trees. See B." msgstr "" #. type: TP -#: ../dgit.1:1784 +#: ../dgit.1:1878 #, no-wrap msgid "B, B..., B, B, [B]B, B" msgstr "" #. type: Plain text -#: ../dgit.1:1789 +#: ../dgit.1:1883 msgid "" "and other subprograms and modules used by dgit are affected by various " "environment variables. Consult the documentation for those programs for " @@ -3318,13 +3517,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.1:1789 +#: ../dgit.1:1883 #, no-wrap msgid "SUPPORT ON OLD DISTRIBUTIONS" msgstr "" #. type: Plain text -#: ../dgit.1:1795 +#: ../dgit.1:1889 msgid "" "We aim to make modern dgit installable and useable on old versions of " "Debian, and on derivatives. One reason this is helpful is that it can be " @@ -3333,7 +3532,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1803 +#: ../dgit.1:1897 msgid "" "This version of B is directly installable, and functional (with " "B) all the way back to Debian 10 (buster) and later; " @@ -3342,13 +3541,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.1:1803 +#: ../dgit.1:1897 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: ../dgit.1:1810 +#: ../dgit.1:1904 msgid "" "There should be a `dgit rebase-prep' command or some such to turn a fast-" "forwarding branch containing pseudo-merges back into a rebasing patch " @@ -3356,7 +3555,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1816 +#: ../dgit.1:1910 msgid "" "If the dgit push fails halfway through, it is not necessarily restartable " "and idempotent. It would be good to check that the proposed signing key is " @@ -3364,7 +3563,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1821 +#: ../dgit.1:1915 msgid "" "dgit's build functions, and dgit push, may make changes to your current " "HEAD. Sadly this is necessary for packages in the `3.0 (quilt)' source " @@ -3373,7 +3572,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1826 +#: ../dgit.1:1920 msgid "" "--dry-run does not always work properly, as not doing some of the git " "fetches may result in subsequent actions being different. Doing a non-dry-" @@ -3381,25 +3580,25 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit.1:1826 ../dgit.7:23 ../dgit-user.7.pod:463 -#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 +#: ../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 #: ../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:272 ../tag2upload.5.pod:224 +#: ../git-debpush.1.pod:341 ../git-deborig.1.pod:60 ../tag2upload.5.pod:307 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text -#: ../dgit.1:1835 +#: ../dgit.1:1929 msgid "" "B(7), B(7), B(1), B(1), B(1), B(1), B(1), B(1)," msgstr "" #. type: Plain text -#: ../dgit.1:1836 +#: ../dgit.1:1930 msgid "https://browse.dgit.debian.org/" msgstr "" diff -pruN 13.11+exp1/po4a/dgit_7.pot 13.12/po4a/dgit_7.pot --- 13.11+exp1/po4a/dgit_7.pot 2025-08-10 18:58:53.000000000 +0000 +++ 13.12/po4a/dgit_7.pot 2025-08-15 09:05:44.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2024-04-11 22:39+0100\n" +"POT-Creation-Date: 2025-08-15 11:11+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -34,19 +34,19 @@ msgstr "" #: ../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-debpush.1.pod:1 ../git-deborig.1.pod:1 ../tag2upload.5.pod:1 #, no-wrap msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1694 ../dgit.7:23 ../dgit-user.7.pod:447 -#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 +#: ../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:325 ../dgit-maint-bpo.7.pod:140 -#: ../git-debrebase.1.pod:643 ../git-debrebase.5.pod:678 -#: ../git-debpush.1.pod:261 +#: ../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 "" @@ -276,7 +276,7 @@ msgstr "" msgid "" "So, for example, B means to look for the package in " "stable, and stable-security, taking whichever is newer. If stable is " -"currently jessie, dgit clone would leave you on the branch B." msgstr "" diff -pruN 13.11+exp1/po4a/generate-po4a.cfg 13.12/po4a/generate-po4a.cfg --- 13.11+exp1/po4a/generate-po4a.cfg 1970-01-01 00:00:00.000000000 +0000 +++ 13.12/po4a/generate-po4a.cfg 2025-08-15 09:05:44.000000000 +0000 @@ -0,0 +1,46 @@ +#!/bin/bash +set -e +set -o pipefail +shopt -s inherit_errexit # #514862, wtf + +fail () { "echo >&2 $0: $*"; exit 1; } + +langs=( $( ls -1 *.po \ + | sed 's#\.po$##; s#.*\.##' \ + | LC_COLLATE=C.UTF-8 sort -u) ) + +cat <, 2016-2018. +# +msgid "" +msgstr "" +"Project-Id-Version: po 4a\n" +"POT-Creation-Date: 2025-08-15 11:11+0100\n" +"PO-Revision-Date: 2025-08-15 11:11+0100\n" +"Last-Translator: Unknown\n" +"Language-Team: de \n" +"Language: de\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" + +#. 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 "" + +#. 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 "" + +#. type: =head1 +#: ../dgit.1:33 ../git-debpush.1.pod:9 ../git-deborig.1.pod:9 +#, no-wrap +msgid "DESCRIPTION" +msgstr "" + +#. type: =head1 +#: ../dgit.1:583 ../git-debrebase.1.pod:473 ../git-deborig.1.pod:28 +#, no-wrap +msgid "OPTIONS" +msgstr "" + +#. 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 "" + +#. 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 "" + +#. type: textblock +#: ../git-deborig.1.pod:3 +msgid "git-deborig - try to produce Debian orig.tar using git-archive(1)" +msgstr "" +"git-deborig - versucht, mittels git-archive(1) Debians orig.tar zu erstellen." + +#. type: textblock +#: ../git-deborig.1.pod:7 +msgid "" +"B [B<--force>|B<-f>] [B<--just-print>|B<--just-print-tag-" +"names>] [B<--version=>I] [I]" +msgstr "" + +#. type: textblock +#: ../git-deborig.1.pod:11 +msgid "" +"B tries to produce the orig.tar you need for your upload by " +"calling git-archive(1) on an existing git tag or branch head. It was " +"written with the dgit-maint-merge(7) workflow in mind, but can be used with " +"other workflows." +msgstr "" +"B versucht, das orig.tar, das Sie zum Hochladen benötigen, zu " +"erstellen, indem es git-archive(1) auf einer bestehenden Git-Markierung oder " +"Kopf eines Zweiges aufrufen. Es wurde unter Berücksichtigung des " +"Arbeitsablaufs von dgit-maint-merge(7) geschrieben, kann aber auch mit " +"anderen Arbeitsabläufen benutzt werden." + +#. type: textblock +#: ../git-deborig.1.pod:16 +msgid "" +"B will try several common tag names. If this fails, or if more " +"than one of those common tags are present, you can specify the tag or branch " +"head to archive on the command line (I above)." +msgstr "" +"B wird mehrere geläufige Markierungsnamen durchprobieren. Falls " +"dies fehlschlägt oder mherere dieser Markierungen vorhanden sind, können Sie " +"die Markierung oder den Kopf des Zweiges zum Archivieren auf der " +"Befehlszeile (I oben) angeben." + +#. type: textblock +#: ../git-deborig.1.pod:20 +msgid "" +"B will override gitattributes(5) that would cause the contents " +"of the tarball generated by git-archive(1) not to be identical with the " +"commitish archived: the B and B attributes." +msgstr "" +"B wird gitattributes(5) außer Kraft setzen. letzteres würde " +"dazu führen, dass der Inhalt des durch git-archive(1) erstellten Tarballs " +"nicht mit dem archivierten Commitish übereinstimmt: den Attributen B und B." + +#. type: textblock +#: ../git-deborig.1.pod:25 +msgid "" +"B should be invoked from the root of the git repository, which " +"should contain I." +msgstr "" +"B sollte von der Wurzel des Git-Depots aufgerufen werden, das " +"I enthalten sollte." + +#. type: =item +#: ../git-deborig.1.pod:32 +msgid "B<-f>|B<--force>" +msgstr "B<-f>|B<--force>" + +#. type: textblock +#: ../git-deborig.1.pod:34 +msgid "Overwrite any existing orig.tar in the parent directory." +msgstr "überschreibt jede existierende orig.tar im übergeordneten Verzeichnis." + +#. type: =item +#: ../git-deborig.1.pod:36 +msgid "B<--just-print>" +msgstr "B<--just-print>" + +#. type: textblock +#: ../git-deborig.1.pod:38 +msgid "" +"Instead of actually invoking git-archive(1), output information about how it " +"would be invoked. Ignores I<--force>." +msgstr "" +"gibt, anstatt git-archive(1) tatsächlich aufzurufen, Informationen aus, was " +"beim Aufruf geschehen würde. Ignoriert I<--force>." + +#. type: textblock +#: ../git-deborig.1.pod:41 +msgid "" +"Note that running the git-archive(1) invocation outputted with this option " +"may not produce the same output. This is because B takes care " +"to disables git attributes otherwise heeded by git-archive(1), as detailed " +"above." +msgstr "" +"Beachten Sie, dass das Ausführen von git-archive(1) dessen Aufruf mit dieser " +"Option ausgegeben wird, möglicherweise nicht dieselbe Ausgabe erzeugt. Dies " +"liegt daran, dass B Git-Attribute deaktiviert, die anderenfalls " +"durch git-archive(1) beherzigt würden, wie oben erklärt." + +#. type: =item +#: ../git-deborig.1.pod:46 +msgid "B<--just-print-tag-names>" +msgstr "B<--just-print-tag-names>" + +#. type: textblock +#: ../git-deborig.1.pod:48 +msgid "" +"Instead of actually invoking git-archive(1), or even checking which tags " +"exist, print the tag names we would consider for the upstream version number " +"in the first entry in the Debian changelog, or that supplied with B<--" +"version>." +msgstr "" + +#. type: =item +#: ../git-deborig.1.pod:53 +msgid "B<--version=>I" +msgstr "B<--version=>I" + +#. type: textblock +#: ../git-deborig.1.pod:55 +msgid "" +"Instead of reading the new upstream version from the first entry in the " +"Debian changelog, use I." +msgstr "" +"benutzt I, statt die Version von den Originalautoren aus dem ersten " +"Eintrag des Debian-Changelogs zu lesen." + +#. type: textblock +#: ../git-deborig.1.pod:62 +msgid "git-archive(1), dgit-maint-merge(7), dgit-maint-debrebase(7)" +msgstr "git-archive(1), dgit-maint-merge(7), dgit-maint-debrebase(7)" + +#. type: textblock +#: ../git-deborig.1.pod:66 +msgid "B was written by Sean Whitton ." +msgstr "" +"B wurde von Sean Whitton geschrieben." diff -pruN 13.11+exp1/po4a/git-deborig_1.fr.po 13.12/po4a/git-deborig_1.fr.po --- 13.11+exp1/po4a/git-deborig_1.fr.po 1970-01-01 00:00:00.000000000 +0000 +++ 13.12/po4a/git-deborig_1.fr.po 2025-08-15 09:05:44.000000000 +0000 @@ -0,0 +1,206 @@ +# French translations for dgit package +# Copyright (C) 2016-2025 Debian French l10n team . +# This file is distributed under the same license as the dgit package. +# +msgid "" +msgstr "" +"Project-Id-Version: po 4a\n" +"POT-Creation-Date: 2025-08-15 11:11+0100\n" +"PO-Revision-Date: 2025-08-15 13:13+0100\n" +"Last-Translator: Unknown\n" +"Language-Team: French \n" +"Language: fr\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" + +#. 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 "" + +#. 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 "" + +#. type: =head1 +#: ../dgit.1:33 ../git-debpush.1.pod:9 ../git-deborig.1.pod:9 +#, no-wrap +msgid "DESCRIPTION" +msgstr "" + +#. type: =head1 +#: ../dgit.1:583 ../git-debrebase.1.pod:473 ../git-deborig.1.pod:28 +#, no-wrap +msgid "OPTIONS" +msgstr "" + +#. 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 "" + +#. 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 "" + +#. type: textblock +#: ../git-deborig.1.pod:3 +msgid "git-deborig - try to produce Debian orig.tar using git-archive(1)" +msgstr "" +"git-deborig - Tenter de produire orig.tar de Debian avec git-archive(1)" + +#. type: textblock +#: ../git-deborig.1.pod:7 +msgid "" +"B [B<--force>|B<-f>] [B<--just-print>|B<--just-print-tag-" +"names>] [B<--version=>I] [I]" +msgstr "" +"B [B<--force>|B<-f>] [B<--just-print>|B<--just-print-tag-" +"names>] [B<--version=>I] [I]" + +#. type: textblock +#: ../git-deborig.1.pod:11 +msgid "" +"B tries to produce the orig.tar you need for your upload by " +"calling git-archive(1) on an existing git tag or branch head. It was " +"written with the dgit-maint-merge(7) workflow in mind, but can be used with " +"other workflows." +msgstr "" +"B tente de produire le fichier I dont vous avez " +"besoin pour votre envoi en appelant B(1) sur une étiquette ou " +"un \"head\" de branche de git; Il a été écrit en pensant au déroulement de " +"B(7) mais peut être utilisé avec d’autres flux de travaux." + +#. type: textblock +#: ../git-deborig.1.pod:16 +msgid "" +"B will try several common tag names. If this fails, or if more " +"than one of those common tags are present, you can specify the tag or branch " +"head to archive on the command line (I above)." +msgstr "" +"B essaiera plusieurs noms d’étiquette courants. S’il échoue, ou " +"si plus d’une étiquette courante sont présentes, il est possible de préciser " +"en ligne de commande l’étiquette ou le \"head\" de branche à archiver " +"(I ci-dessus)." + +#. type: textblock +#: ../git-deborig.1.pod:20 +msgid "" +"B will override gitattributes(5) that would cause the contents " +"of the tarball generated by git-archive(1) not to be identical with the " +"commitish archived: the B and B attributes." +msgstr "" +"B remplacera les B(5) qui pourraient faire que " +"le contenu de l’archive générée par B(1) ne soit pas identique " +"à l’objet d’envoi archivé : les attributs B et B." + +#. type: textblock +#: ../git-deborig.1.pod:25 +msgid "" +"B should be invoked from the root of the git repository, which " +"should contain I." +msgstr "" +"B devrait être invoqué à partir de la racine du dépôt git qui " +"devrait contenir I." + +#. type: =item +#: ../git-deborig.1.pod:32 +msgid "B<-f>|B<--force>" +msgstr "B<-f>|B<--force>" + +#. type: textblock +#: ../git-deborig.1.pod:34 +msgid "Overwrite any existing orig.tar in the parent directory." +msgstr "Écraser tout fichier I existant dans le répertoire parent." + +#. type: =item +#: ../git-deborig.1.pod:36 +msgid "B<--just-print>" +msgstr "B<--just-print>" + +#. type: textblock +#: ../git-deborig.1.pod:38 +msgid "" +"Instead of actually invoking git-archive(1), output information about how it " +"would be invoked. Ignores I<--force>." +msgstr "" +"Au lieu d’invoquer réellement B(1), afficher les informations " +"sur comment il devrait être invoqué. I<--force> est ignoré." + +#. type: textblock +#: ../git-deborig.1.pod:41 +msgid "" +"Note that running the git-archive(1) invocation outputted with this option " +"may not produce the same output. This is because B takes care " +"to disables git attributes otherwise heeded by git-archive(1), as detailed " +"above." +msgstr "" +"Notez que l’exécution de l’invocation de B(1) produite avec " +"cette option peut ne pas produire la même sortie. C’est parce que B prend soin de désactiver les attributs de git dont autrement B(1) tient compte, comme cela est détaillé précédemment." + +#. type: =item +#: ../git-deborig.1.pod:46 +msgid "B<--just-print-tag-names>" +msgstr "B<--just-print-tag-names>" + +#. type: textblock +#: ../git-deborig.1.pod:48 +msgid "" +"Instead of actually invoking git-archive(1), or even checking which tags " +"exist, print the tag names we would consider for the upstream version number " +"in the first entry in the Debian changelog, or that supplied with B<--" +"version>." +msgstr "" +"Au lieu d’appeler réellement git-archive (1), ou même de vérifier quels tags " +"existent, affiche les noms de balises considérées comme numéro de version " +"amont dans la première entrée du changelog Debian, ou celle fournie avec B<--" +"version>." + +#. type: =item +#: ../git-deborig.1.pod:53 +msgid "B<--version=>I" +msgstr "B<--version=>I" + +#. type: textblock +#: ../git-deborig.1.pod:55 +msgid "" +"Instead of reading the new upstream version from the first entry in the " +"Debian changelog, use I." +msgstr "" +"Au lieu de lire la nouvelle version amont, prise dans la première entrée du " +"changelog de Debian, utiliser la I." + +#. type: textblock +#: ../git-deborig.1.pod:62 +msgid "git-archive(1), dgit-maint-merge(7), dgit-maint-debrebase(7)" +msgstr "git-archive(1), dgit-maint-merge(7), dgit-maint-debrebase(7)" + +#. type: textblock +#: ../git-deborig.1.pod:66 +msgid "B was written by Sean Whitton ." +msgstr "" +"B a été écrit par Sean Whitton ." diff -pruN 13.11+exp1/po4a/git-deborig_1.pot 13.12/po4a/git-deborig_1.pot --- 13.11+exp1/po4a/git-deborig_1.pot 1970-01-01 00:00:00.000000000 +0000 +++ 13.12/po4a/git-deborig_1.pot 2025-08-15 09:05:44.000000000 +0000 @@ -0,0 +1,177 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR Free Software Foundation, Inc. +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2025-08-15 11:11+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\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 "" + +#. 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 "" + +#. type: =head1 +#: ../dgit.1:33 ../git-debpush.1.pod:9 ../git-deborig.1.pod:9 +#, no-wrap +msgid "DESCRIPTION" +msgstr "" + +#. type: =head1 +#: ../dgit.1:583 ../git-debrebase.1.pod:473 ../git-deborig.1.pod:28 +#, no-wrap +msgid "OPTIONS" +msgstr "" + +#. 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 "" + +#. 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 "" + +#. type: textblock +#: ../git-deborig.1.pod:3 +msgid "git-deborig - try to produce Debian orig.tar using git-archive(1)" +msgstr "" + +#. type: textblock +#: ../git-deborig.1.pod:7 +msgid "" +"B [B<--force>|B<-f>] [B<--just-print>|B<--just-print-tag-" +"names>] [B<--version=>I] [I]" +msgstr "" + +#. type: textblock +#: ../git-deborig.1.pod:11 +msgid "" +"B tries to produce the orig.tar you need for your upload by " +"calling git-archive(1) on an existing git tag or branch head. It was " +"written with the dgit-maint-merge(7) workflow in mind, but can be used with " +"other workflows." +msgstr "" + +#. type: textblock +#: ../git-deborig.1.pod:16 +msgid "" +"B will try several common tag names. If this fails, or if more " +"than one of those common tags are present, you can specify the tag or branch " +"head to archive on the command line (I above)." +msgstr "" + +#. type: textblock +#: ../git-deborig.1.pod:20 +msgid "" +"B will override gitattributes(5) that would cause the contents " +"of the tarball generated by git-archive(1) not to be identical with the " +"commitish archived: the B and B attributes." +msgstr "" + +#. type: textblock +#: ../git-deborig.1.pod:25 +msgid "" +"B should be invoked from the root of the git repository, which " +"should contain I." +msgstr "" + +#. type: =item +#: ../git-deborig.1.pod:32 +msgid "B<-f>|B<--force>" +msgstr "" + +#. type: textblock +#: ../git-deborig.1.pod:34 +msgid "Overwrite any existing orig.tar in the parent directory." +msgstr "" + +#. type: =item +#: ../git-deborig.1.pod:36 +msgid "B<--just-print>" +msgstr "" + +#. type: textblock +#: ../git-deborig.1.pod:38 +msgid "" +"Instead of actually invoking git-archive(1), output information about how it " +"would be invoked. Ignores I<--force>." +msgstr "" + +#. type: textblock +#: ../git-deborig.1.pod:41 +msgid "" +"Note that running the git-archive(1) invocation outputted with this option " +"may not produce the same output. This is because B takes care " +"to disables git attributes otherwise heeded by git-archive(1), as detailed " +"above." +msgstr "" + +#. type: =item +#: ../git-deborig.1.pod:46 +msgid "B<--just-print-tag-names>" +msgstr "" + +#. type: textblock +#: ../git-deborig.1.pod:48 +msgid "" +"Instead of actually invoking git-archive(1), or even checking which tags " +"exist, print the tag names we would consider for the upstream version number " +"in the first entry in the Debian changelog, or that supplied with B<--" +"version>." +msgstr "" + +#. type: =item +#: ../git-deborig.1.pod:53 +msgid "B<--version=>I" +msgstr "" + +#. type: textblock +#: ../git-deborig.1.pod:55 +msgid "" +"Instead of reading the new upstream version from the first entry in the " +"Debian changelog, use I." +msgstr "" + +#. type: textblock +#: ../git-deborig.1.pod:62 +msgid "git-archive(1), dgit-maint-merge(7), dgit-maint-debrebase(7)" +msgstr "" + +#. type: textblock +#: ../git-deborig.1.pod:66 +msgid "B was written by Sean Whitton ." +msgstr "" diff -pruN 13.11+exp1/po4a/git-deborig_1.pt.po 13.12/po4a/git-deborig_1.pt.po --- 13.11+exp1/po4a/git-deborig_1.pt.po 1970-01-01 00:00:00.000000000 +0000 +++ 13.12/po4a/git-deborig_1.pt.po 2025-08-15 09:05:44.000000000 +0000 @@ -0,0 +1,205 @@ +# European Portuguese translations for dgit package +# Copyright (C) 2020 Free Software Foundation, Inc. +# This file is distributed under the same license as the dgit package. +# +# Américo Monteiro , 2020 - 2025. +msgid "" +msgstr "" +"Project-Id-Version: po 4a\n" +"POT-Creation-Date: 2025-08-15 11:11+0100\n" +"PO-Revision-Date: 2025-08-15 11:11+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" + +#. 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 "" + +#. 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 "" + +#. type: =head1 +#: ../dgit.1:33 ../git-debpush.1.pod:9 ../git-deborig.1.pod:9 +#, no-wrap +msgid "DESCRIPTION" +msgstr "" + +#. type: =head1 +#: ../dgit.1:583 ../git-debrebase.1.pod:473 ../git-deborig.1.pod:28 +#, no-wrap +msgid "OPTIONS" +msgstr "" + +#. 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 "" + +#. 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 "" + +#. type: textblock +#: ../git-deborig.1.pod:3 +msgid "git-deborig - try to produce Debian orig.tar using git-archive(1)" +msgstr "git-deborig - tenta produzir Debian orig.tar usando git-archive(1)" + +#. type: textblock +#: ../git-deborig.1.pod:7 +msgid "" +"B [B<--force>|B<-f>] [B<--just-print>|B<--just-print-tag-" +"names>] [B<--version=>I] [I]" +msgstr "" +"B [B<--force>|B<-f>] [B<--just-print>|B<--just-print-tag-" +"names>] [B<--version=>I] [I]" + +#. type: textblock +#: ../git-deborig.1.pod:11 +msgid "" +"B tries to produce the orig.tar you need for your upload by " +"calling git-archive(1) on an existing git tag or branch head. It was " +"written with the dgit-maint-merge(7) workflow in mind, but can be used with " +"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." + +#. type: textblock +#: ../git-deborig.1.pod:16 +msgid "" +"B will try several common tag names. If this fails, or if more " +"than one of those common tags are present, you can specify the tag or branch " +"head to archive on the command line (I above)." +msgstr "" +"B irá tentar vários nomes de etiquetas comuns. Se falhar, ou se " +"mais do que uma dessas etiquetas comuns estiver presente, você pode " +"especificar a etiqueta ou cabeça de ramo a arquivar na linha de comandos " +"(I em cima)." + +#. type: textblock +#: ../git-deborig.1.pod:20 +msgid "" +"B will override gitattributes(5) that would cause the contents " +"of the tarball generated by git-archive(1) not to be identical with the " +"commitish archived: the B and B attributes." +msgstr "" +"B irá sobrepor gitattributes(5) que iriam causar com que o " +"conteúdo do tarball gerado pelo git-archive(1) não fosse idêntico ao do " +"arquivo submetido: os atributos B e B." + +#. type: textblock +#: ../git-deborig.1.pod:25 +msgid "" +"B should be invoked from the root of the git repository, which " +"should contain I." +msgstr "" +"B deve ser invocado a partir da raiz do repositório git, o qual " +"deve conter I." + +#. type: =item +#: ../git-deborig.1.pod:32 +msgid "B<-f>|B<--force>" +msgstr "B<-f>|B<--force>" + +#. type: textblock +#: ../git-deborig.1.pod:34 +msgid "Overwrite any existing orig.tar in the parent directory." +msgstr "Sobrescreve qualquer orig.tar existente no directório pai." + +#. type: =item +#: ../git-deborig.1.pod:36 +msgid "B<--just-print>" +msgstr "B<--just-print>" + +#. type: textblock +#: ../git-deborig.1.pod:38 +msgid "" +"Instead of actually invoking git-archive(1), output information about how it " +"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>." + +#. type: textblock +#: ../git-deborig.1.pod:41 +msgid "" +"Note that running the git-archive(1) invocation outputted with this option " +"may not produce the same output. This is because B takes care " +"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 " +"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." + +#. type: =item +#: ../git-deborig.1.pod:46 +msgid "B<--just-print-tag-names>" +msgstr "B<--just-print-tag-names>" + +#. type: textblock +#: ../git-deborig.1.pod:48 +msgid "" +"Instead of actually invoking git-archive(1), or even checking which tags " +"exist, print the tag names we would consider for the upstream version number " +"in the first entry in the Debian changelog, or that supplied with B<--" +"version>." +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 " +"Debian, ou isso fornecido com B<--version>." + +#. type: =item +#: ../git-deborig.1.pod:53 +msgid "B<--version=>I" +msgstr "B<--version=>I" + +#. type: textblock +#: ../git-deborig.1.pod:55 +msgid "" +"Instead of reading the new upstream version from the first entry in the " +"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." + +#. type: textblock +#: ../git-deborig.1.pod:62 +msgid "git-archive(1), dgit-maint-merge(7), dgit-maint-debrebase(7)" +msgstr "git-archive(1), dgit-maint-merge(7), dgit-maint-debrebase(7)" + +#. type: textblock +#: ../git-deborig.1.pod:66 +msgid "B was written by Sean Whitton ." +msgstr "" +"B foi escrito por Sean Whitton ." diff -pruN 13.11+exp1/po4a/git-debpush_1.pot 13.12/po4a/git-debpush_1.pot --- 13.11+exp1/po4a/git-debpush_1.pot 1970-01-01 00:00:00.000000000 +0000 +++ 13.12/po4a/git-debpush_1.pot 2025-08-15 09:05:44.000000000 +0000 @@ -0,0 +1,738 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR Free Software Foundation, Inc. +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2025-08-15 11:11+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\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 "" + +#. 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 "" + +#. type: =head1 +#: ../dgit.1:33 ../git-debpush.1.pod:9 ../git-deborig.1.pod:9 +#, no-wrap +msgid "DESCRIPTION" +msgstr "" + +#. type: =item +#: ../dgit.1:951 ../git-debpush.1.pod:138 +#, no-wrap +msgid "B<--quilt=linear>" +msgstr "" + +#. type: =item +#: ../dgit.1:963 ../git-debpush.1.pod:150 +#, no-wrap +msgid "B<--quilt=try-linear>" +msgstr "" + +#. type: =item +#: ../dgit.1:973 ../git-debpush.1.pod:144 +#, no-wrap +msgid "B<--quilt=smash>" +msgstr "" + +#. type: =item +#: ../dgit.1:1001 ../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-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 "" + +#. 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 "" + +#. type: textblock +#: ../git-debpush.1.pod:3 +msgid "" +"git-debpush - create & push a git tag with metadata for an ftp-master upload" +msgstr "" + +#. type: textblock +#: ../git-debpush.1.pod:7 +msgid "B [I