Merge from trunk

This commit is contained in:
Stefano Rivera 2010-12-21 11:39:00 +02:00
commit 07cb3f5777
2 changed files with 20 additions and 22 deletions

18
debian/copyright vendored
View File

@ -60,7 +60,7 @@ Files: 404main,
pbuilder-dist,
pbuilder-dist-simple,
reverse-build-depends,
submittodebian,
submittodebian
Copyright: 2007-2010, Canonical Ltd.
2009, James Westby <james.westby@ubuntu.com>
2008, Jamin W. Collins <jcollins@asgardsrealm.net>
@ -104,7 +104,7 @@ Files: ack-sync,
massfile,
merge-changelog,
setup-packaging-environment,
syncpackage,
syncpackage
Copyright: 2010, Benjamin Drung <bdrung@ubuntu.com>
2007-2010, Canonical Ltd.
2010, Dustin Kirkland <kirkland@ubuntu.com>
@ -125,8 +125,7 @@ License: GPL-3
On Debian systems, the complete text of the GNU General Public License
version 3 can be found in the /usr/share/common-licenses/GPL-3 file.
Files:
dch-repeat,
Files: dch-repeat,
doc/dch-repeat.1,
doc/get-build-deps.1,
doc/grep-merges.1,
@ -156,7 +155,7 @@ Files:
ubuntutools/packages.py,
ubuntutools/update_maintainer.py,
update-maintainer,
what-patch,
what-patch
Copyright: 2007, Albin Tonnerre (Lutin) <lut1n.tne@gmail.com>
2007-2010, Canonical Ltd.
2008-2009, Iain Lane <iain@orangesquash.org.uk>
@ -181,8 +180,7 @@ License: GPL-3+
On Debian systems, the complete text of the GNU General Public License
version 3 can be found in the /usr/share/common-licenses/GPL-3 file.
Files:
doc/sponsor-patch.1,
Files: doc/sponsor-patch.1,
doc/suspicious-source.1,
doc/ubuntu-dev-tools.5,
doc/wrap-and-sort.1,
@ -198,9 +196,9 @@ Files:
ubuntutools/test/*,
wrap-and-sort
Copyright:
2010, Benjamin Drung <bdrung@ubuntu.com>
2010, Evan Broder <evan@ebroder.net>
2010, Stefano Rivera <stefanor@ubuntu.com>
2010, Benjamin Drung <bdrung@ubuntu.com>
2010, Evan Broder <evan@ebroder.net>
2010, Stefano Rivera <stefanor@ubuntu.com>
License: ISC
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above

View File

@ -9,6 +9,18 @@ backportpackage \- helper to test package backports
<\fIsource package name or .dsc URL/file\fR>
.PP
.B backportpackage \-h
.SH DESCRIPTION
\fBbackportpackage\fR fetches a package from one Ubuntu release or
from a specified .dsc path or URL and creates a no-change backport of
that package to a previous release, optionally doing a test build of
the package and/or uploading the resulting backport for testing.
.PP
Unless a working directory is specified, the backported package is
fetched and built in a temporary directory in \fB/tmp\fR, which is
removed once the script finishes running.
.PP
\fBbackportpackage\fR is only recommended for testing backports in a
PPA, not uploading backports to the Ubuntu archive.
.SH OPTIONS
.TP
.B \-d \fIDEST\fR, \fB\-\-destination\fR=\fIDEST\fR
@ -75,18 +87,6 @@ the default of "production".
.B \-\-no\-conf
Do not read any configuration files, or configuration from environment
variables.
.SH DESCRIPTION
\fBbackportpackage\fR fetches a package from one Ubuntu release or
from a specified .dsc path or URL and creates a no-change backport of
that package to a previous release, optionally doing a test build of
the package and/or uploading the resulting backport for testing.
.PP
Unless a working directory is specified, the backported package is
fetched and built in a temporary directory in \fB/tmp\fR, which is
removed once the script finishes running.
.PP
\fBbackportpackage\fR is only recommended for testing backports in a
PPA, not uploading backports to the Ubuntu archive.
.SH ENVIRONMENT
All of the \fBCONFIGURATION VARIABLES\fR below are also supported as
environment variables.