Package: devscripts Version: 2.12.1 Severity: minor Tags: patch User: devscri...@packages.debian.org Usertags: debcheckout origtargz
Hi Christoph, After translating origtargz.1, I'd advise the attached formatting fix. Since debcheckout.1 was also touched, I hereby propose another one for this manpage. Regards David -- Package-specific info: --- /etc/devscripts.conf --- --- ~/.devscripts --- Not present -- System Information: Debian Release: wheezy/sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.2.0-3-amd64 (SMP w/1 CPU core) Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages devscripts depends on: ii dpkg-dev 1.16.8 ii libc6 2.13-35 ii perl 5.14.2-12 ii python 2.7.3-2 Versions of packages devscripts recommends: ii at 3.1.13-2 ii curl 7.27.0-1 ii dctrl-tools 2.22.2 ii debian-keyring 2012.06.01 ii dput 0.9.6.3 ii equivs 2.0.9 ii fakeroot 1.18.4-2 ii gnupg 1.4.12-4+b1 ii libcrypt-ssleay-perl 0.58-1 ii libdistro-info-perl 0.10 ii libjson-perl 2.53-1 ii libparse-debcontrol-perl 2.005-3 ii libsoap-lite-perl 0.714-1 ii liburi-perl 1.60-1 ii libwww-perl 6.04-1 ii lintian 2.5.10.1 ii man-db 2.6.2-1 ii patch 2.6.1-3 ii patchutils 0.3.2-1.1 ii python-debian 0.1.21 ii python-magic 5.11-2 ii sensible-utils 0.0.7 ii strace 4.5.20-2.3 ii unzip 6.0-7 ii wdiff 1.1.2-1 ii wget 1.14-1 ii xz-utils 5.1.1alpha+20120614-1 Versions of packages devscripts suggests: ii bsd-mailx [mailx] 8.1.2-0.20111106cvs-1 ii build-essential 11.5 ii cvs-buildpackage 5.23 pn devscripts-el <none> ii gnuplot 4.6.0-8 ii libauthen-sasl-perl 2.1500-1 ii libfile-desktopentry-perl 0.04-3 ii libnet-smtp-ssl-perl 1.01-3 pn libterm-size-perl <none> ii libtimedate-perl 1.2000-1 ii libyaml-syck-perl 1.20-1 ii mutt 1.5.21-6.1 ii openssh-client [ssh-client] 1:6.0p1-2 ii svn-buildpackage 0.8.5 ii w3m 0.5.3-8 -- no debconf information
>From 9bd23c65bf07d8ccf43c9a75be9b7fdfb51a1b46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Pr=C3=A9vot?= <taf...@debian.org> Date: Sat, 11 Aug 2012 17:55:02 -0400 Subject: [PATCH 1/2] origtargz.1: ffix --- scripts/origtargz.pl | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/scripts/origtargz.pl b/scripts/origtargz.pl index ae1d2a1..7871a18 100755 --- a/scripts/origtargz.pl +++ b/scripts/origtargz.pl @@ -35,7 +35,7 @@ origtargz - fetch the orig tarball of a Debian package from various sources, and B<origtargz> downloads the orig tarball of a Debian package, and optionally unpacks it into the current directory. The version number to be used is -determined from B<debian/changelog>. The main use for B<origtargz> is with +determined from F<debian/changelog>. The main use for B<origtargz> is with debian-dir-only repository checkouts. It should be invoked from the top level directory of an unpacked Debian source package. @@ -45,9 +45,9 @@ version. Finally, B<uscan --download-current-version> is tried. When asked to unpack the orig tarball, B<origtargz> will remove all files and directories from the current directory, except the debian directory, and the -VCS repository directories. Some files outside debian/ which are often stored -in VCS even for debian-dir-only repositories are also preserved (.bzr-builddeb, -.gitignore, .hgignore). +VCS repository directories. Some files outside F<debian> which are often stored +in VCS even for debian-dir-only repositories are also preserved (F<.bzr-builddeb>, +F<.gitignore>, F<.hgignore>). The default behavior is to unpack the orig tarball on the first invocation of B<origtargz> in a debian-dir-only checkout. @@ -67,16 +67,16 @@ everything except the debian directory. Valid choices are: Do not unpack the orig tarball. -=item B<once> (default when --unpack is not used) +=item B<once> (default when B<--unpack> is not used) -If the current directory contains only a debian directory (and possibly some +If the current directory contains only a F<debian> directory (and possibly some dotfiles), unpack the orig tarball. This is the default behavior. -=item B<yes> (default for --unpack without argument) +=item B<yes> (default for B<--unpack> without argument) -Always unpack the orig tarball. Existing files are removed, except for debian/ -and VCS files. Preserved are: B<.bzr .bzrignore .bzr-builddeb .git .gitignore -.hg .hgignore .svn>. +Always unpack the orig tarball. Existing files are removed, except for F<debian> +and VCS files. Preserved are: F<.bzr>, F<.bzrignore>, F<.bzr-builddeb>, F<.git>, +F<.gitignore>, F<.hg>, F<.hgignore>, and F<.svn>. =back @@ -94,7 +94,7 @@ and VCS files. Preserved are: B<.bzr .bzrignore .bzr-builddeb .git .gitignore =head1 SEE ALSO -B<debcheckout>(1). +B<debcheckout>(1) =head1 AUTHOR -- 1.7.10.4
>From 39b76b72e5f942f77004ba59c9c049d08b1cf669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Pr=C3=A9vot?= <taf...@debian.org> Date: Sat, 11 Aug 2012 18:01:00 -0400 Subject: [PATCH 2/2] debcheckout.1: ffix --- scripts/debcheckout.pl | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/debcheckout.pl b/scripts/debcheckout.pl index a8270c8..0a73f44 100755 --- a/scripts/debcheckout.pl +++ b/scripts/debcheckout.pl @@ -29,9 +29,9 @@ debcheckout - checkout the development repository of a Debian package =over -=item B<debcheckout> [I<OPTIONS>] I<PACKAGE> [I<DESTDIR>] +=item B<debcheckout> [I<options>] I<package> [I<destdir>] -=item B<debcheckout> [I<OPTIONS>] I<REPOSITORY_URL> [I<DESTDIR>] +=item B<debcheckout> [I<options>] I<repository_URL> [I<destdir>] =item B<debcheckout> B<--help> @@ -40,10 +40,10 @@ debcheckout - checkout the development repository of a Debian package =head1 DESCRIPTION B<debcheckout> retrieves the information about the Version Control System used -to maintain a given Debian package (the I<PACKAGE> argument), and then checks +to maintain a given Debian package (the I<package> argument), and then checks out the latest (potentially unreleased) version of the package from its -repository. By default the repository is checked out to the I<PACKAGE> -directory; this can be overridden by providing the I<DESTDIR> argument. +repository. By default the repository is checked out to the I<package> +directory; this can be overridden by providing the I<destdir> argument. The information about where the repository is available is expected to be found in B<Vcs-*> fields available in the source package record. For example, the B<vim> @@ -54,7 +54,7 @@ B<apt-cache showsrc vim>. If more than one source package record containing B<Vcs-*> fields is available, B<debcheckout> will select the record with the highest version number. Alternatively, a particular version may be selected from those available by -specifying the package name as I<PACKAGE>=I<VERSION>. +specifying the package name as I<package>B<=>I<version>. If you already know the URL of a given repository you can invoke B<debcheckout> directly on it, but you will probably need to pass the @@ -76,7 +76,7 @@ B<GENERAL OPTIONS> Work in authenticated mode; this means that for known repositories (mainly those hosted on S<I<http://alioth.debian.org>>) URL rewriting is attempted before checking out, to ensure that the repository can be committed to. For example, -for subversion repositories hosted on alioth this means that +for Subversion repositories hosted on alioth this means that S<I<svn+ssh://svn.debian.org/...>> will be used instead of S<I<svn://svn.debian.org/...>>. @@ -108,13 +108,13 @@ Also see B<-d>. This option and B<-d> are mutually exclusive. When checking out a repository URL, instead of trying to guess the package name from the URL, use this package name. -=item B<-t> I<TYPE>, B<--type> I<TYPE> +=item B<-t> I<type>, B<--type> I<type> Override the repository type (which defaults to some heuristics based on the URL or, in case of heuristic failure, the fallback "svn"); should be one of the currently supported repository types. -=item B<-u> I<USERNAME>, B<--user> I<USERNAME> +=item B<-u> I<username>, B<--user> I<username> Specify the login name to be used in authenticated mode (see B<-a>). This option implies B<-a>: you don't need to specify both. @@ -162,7 +162,7 @@ I<GIT-SPECIFIC OPTIONS> =over -=item B<--git-track> I<BRANCHES> +=item B<--git-track> I<branches> Specify a list of remote branches which will be set up for tracking (as in S<B<git branch --track>>, see B<git-branch>(1)) after the remote @@ -187,8 +187,8 @@ for this purpose. The currently recognised variables are: =item B<DEBCHECKOUT_AUTH_URLS> This variable should be a space separated list of Perl regular -expressions and replacement texts, which must come in pairs: I<REGEXP> -I<TEXT> I<REGEXP> I<TEXT> ... and so on. Each pair denotes a substitution which +expressions and replacement texts, which must come in pairs: I<regexp> +I<text> I<regexp> I<text> ... and so on. Each pair denotes a substitution which is applied to repository URLs if other built-in means of building URLs for authenticated mode (see B<-a>) have failed. -- 1.7.10.4
