From 49b1f200a58ba06743a05a09b12de68624b910c1 Mon Sep 17 00:00:00 2001 From: Benjamin Drung Date: Tue, 29 Jun 2010 16:39:12 +0200 Subject: [PATCH] Revert last commit, use Andrew Starr-Bochicchio's branch instead. --- debian/changelog | 7 ------- doc/syncpackage.1 | 37 +++++-------------------------------- 2 files changed, 5 insertions(+), 39 deletions(-) diff --git a/debian/changelog b/debian/changelog index 44a6eb0..8e2bcbd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,3 @@ -ubuntu-dev-tools (0.101) UNRELEASED; urgency=low - - * doc/syncpackage.1: - - Integrate with new syncpackage options (Closes: #587142). - - -- Luca Falavigna Sun, 27 Jun 2010 17:12:03 +0200 - ubuntu-dev-tools (0.100) maverick; urgency=low [ Luca Falavigna ] diff --git a/doc/syncpackage.1 b/doc/syncpackage.1 index 8dd829c..61d6915 100644 --- a/doc/syncpackage.1 +++ b/doc/syncpackage.1 @@ -2,7 +2,7 @@ .SH NAME syncpackage \- helper to prepare .changes file to upload synced packages .SH SYNOPSIS -.B syncpacage\fR \fB[OPTIONS]\fR \fB<.dsc file>\fR +.B syncpacage\fR \fB<.dsc file>\fR \fB\fR .SH DESCRIPTION \fBsyncpackage\fR generates a changes file to be directly uploaded to Ubuntu primary archive or PPA starting from a pristine Debian package. @@ -14,38 +14,11 @@ this way you can preserve source files integrity between the two distributions. .B <.dsc file> This is the .dsc file to generate .changes file against. .TP -.B -h, --help -Show help message and exit -.TP -.B -d DIST, --distribution=DIST -Debian distribution to sync from -.TP -.B -r RELEASE, --release=RELEASE -Specify target Ubuntu release -.TP -.B -V DEBVERSION, --debian-version=DEBVERSION -Specify the version to sync -.TP -.B -c COMPONENT, --component=COMPONENT -Specify the component to sync from -.TP -.B -n UPLOADER_NAME, --uploader-name=UPLOADER_NAME -Use UPLOADER_NAME as the name of the maintainer for this upload instead of -evaluating DEBFULLNAME environment variable -.TP -.B -e UPLOADER_EMAIL, --uploader-email=UPLOADER_EMAIL -Use UPLOADER_EMAIL as email address of the maintainer for this upload instead -of evaluating DEBEMAIL environment variable -.TP -.B -k KEYID, --key=KEYID -Specify the key ID to be used for signing -.TP -.B -b BUG, --bug=BUG -Mark a Launchpad bug as being fixed by this upload -.TP -.B -v, --verbose -Display more information +.B +This is the release that you would like the source package to be synced into. +This should always be the latest development release of Ubuntu. .SH AUTHOR +.B requestsync This manual page were written by Luca Falavigna .PP It is released under GNU General Public License, version 3.