From dc5c649441ff3812f75937275d5b46ea39abcb11 Mon Sep 17 00:00:00 2001 From: Michael Bienia Date: Mon, 30 Nov 2009 23:01:47 +0100 Subject: [PATCH] Rename buildd to ubuntu-build to resolve filename conflict (Closes: #558816) --- debian/changelog | 4 +++- debian/control | 2 +- debian/copyright | 10 +++++----- doc/{buildd.1 => ubuntu-build.1} | 18 +++++++++--------- setup.py | 2 +- buildd => ubuntu-build | 4 ++-- 6 files changed, 21 insertions(+), 19 deletions(-) rename doc/{buildd.1 => ubuntu-build.1} (66%) rename buildd => ubuntu-build (98%) diff --git a/debian/changelog b/debian/changelog index 49de572..dfb0426 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ ubuntu-dev-tools (0.84) UNRELEASED; urgency=low [ Michael Bienia ] * update-maintainer: Remove the check for LP credentials again as this script doesn't use the LP API (Closes: #558598). + * Rename buildd to ubuntu-build to resolve filename conflict + (Closes: #558816). [ Manny Vindiola ] * grab-merge: Only download files listed multiple times in REPORT once @@ -11,7 +13,7 @@ ubuntu-dev-tools (0.84) UNRELEASED; urgency=low * ubuntutools/lp/lpapicache.py: recent lazr.restfulclient does use of unicode strings, use basestring to catch bot str and unicode. - -- Luca Falavigna Sun, 29 Nov 2009 17:52:33 +0100 + -- Michael Bienia Mon, 30 Nov 2009 22:55:46 +0100 ubuntu-dev-tools (0.83) lucid; urgency=low diff --git a/debian/control b/debian/control index 1000256..79b2e95 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,6 @@ Description: useful tools for Ubuntu developers . - 404main - used to check what components a package's deps are in, for doing a main inclusion report for example. - - buildd - give commands to the Launchpad build daemons from the command line. - check-symbols - will compare and give you a diff of the exported symbols of all .so files in a binary package. - dch-repeat - used to repeat a change log into an older release. @@ -62,6 +61,7 @@ Description: useful tools for Ubuntu developers - submittodebian - automatically send your changes to Debian as a bug report. - suspicious-source - outputs a list of files which are not common source files. + - ubuntu-build - give commands to the Launchpad build daemons from the command line. - ubuntu-iso - output information of an Ubuntu ISO image. - update-maintainer - script to update maintainer field in ubuntu packages. - what-patch - determines what patch system, if any, a source package is diff --git a/debian/copyright b/debian/copyright index 7842749..a30bbd3 100644 --- a/debian/copyright +++ b/debian/copyright @@ -67,11 +67,11 @@ and update-maintainer are licensed under the GNU General Public License, version On Debian and Ubuntu systems, the complete text of the GNU General Public License v2 can be found in `/usr/share/common-licenses/GPL-2'. -buildd, dch-repeat, get-branches, get-build-deps, grab-attachments, grab-merge, +dch-repeat, get-branches, get-build-deps, grab-attachments, grab-merge, hugdaylist, manage-credentials, massfile, mk-sbuild-lv, pbuilder-dist-simple, ppaput, pull-debian-debdiff, pull-debian-source, pull-lp-source, pull-revu-source, -setup-packaging-environment, suspicious-source and what-patch are licensed under -the GNU General Public License, version 3: +setup-packaging-environment, suspicious-source, ubuntu-build and what-patch are +licensed under the GNU General Public License, version 3: 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 @@ -86,8 +86,8 @@ On Debian and Ubuntu systems, the complete text of the GNU General Public License v3 can be found in `/usr/share/common-licenses/GPL-3'. The following scripts can be used, at your option, regarding any later -version of the previously specified license: 404main, buildd, dch-repeat, dgetlp, +version of the previously specified license: 404main, dch-repeat, dgetlp, get-build-deps, lp-project-upload, lp-set-dup, manage-credentials, mk-sbuild-lv, pbuilder-dist, pull-debian-debdiff, pull-debian-source, pull-lp-source, pull-revu-source, reverse-build-depends, setup-packaging-environment, submittodebian, -suspicious-source, what-patch. +suspicious-source, ubuntu-build, what-patch. diff --git a/doc/buildd.1 b/doc/ubuntu-build.1 similarity index 66% rename from doc/buildd.1 rename to doc/ubuntu-build.1 index 4bdb6a8..1329484 100644 --- a/doc/buildd.1 +++ b/doc/ubuntu-build.1 @@ -1,24 +1,24 @@ -.TH BUILDD "1" "14 August 2008" "ubuntu-dev-tools" +.TH UBUNTU-BUILD "1" "14 August 2008" "ubuntu-dev-tools" .SH NAME -buildd \- command-line interface to Launchpad build operations +ubuntu-build \- command-line interface to Launchpad build operations .SH SYNOPSIS -.B buildd +.B ubuntu-build .br -.B buildd \-\-help +.B ubuntu-build \-\-help .SH DESCRIPTION -\fBbuildd\fR provides a command line interface to the Launchpad build +\fBubuntu-build\fR provides a command line interface to the Launchpad build operations. .PP -\fBbuildd\fR uses a cookie file stored at \fI~/.lpcookie.txt\fR to authenticate +\fBubuntu-build\fR uses a cookie file stored at \fI~/.lpcookie.txt\fR to authenticate to Launchpad. This cookie is created on run from the Mozilla Firefox cookie file at \fI~/.mozilla/*/*/cookies.sqlite\fR. .SH OPERATIONS -Listed below are the available operations for \fBbuildd\fR: +Listed below are the available operations for \fBubuntu-build\fR: .TP .B status Outputs the build status of the package on Launchpad on all architectures. @@ -33,7 +33,7 @@ Only members of the Launchpad build administrators may issue this operation, and it may only be performed on packages which \fINeed building\fR. .SH OPTIONS -Listed below are the command line options for \fBbuildd\fR: +Listed below are the command line options for \fBubuntu-build\fR: .TP .B \-h or \-\-help Display a help message and exit. @@ -44,7 +44,7 @@ This will only request the rebuilding/rescoring on the specified architecture. .SH AUTHORS -\fBbuildd\fR was written by Martin Pitt , and +\fBubuntu-build\fR was written by Martin Pitt , and this manual page was written by Jonathan Patrick Davies . .PP Both are released under the terms of the GNU General Public License, version 3 diff --git a/setup.py b/setup.py index 623f0d4..a8f508a 100755 --- a/setup.py +++ b/setup.py @@ -16,7 +16,6 @@ if os.path.exists(changelog): setup(name='ubuntu-dev-tools', version=version, scripts=['404main', - 'buildd', 'check-symbols', 'dch-repeat', 'dgetlp', @@ -41,6 +40,7 @@ setup(name='ubuntu-dev-tools', 'setup-packaging-environment', 'submittodebian', 'suspicious-source', + 'ubuntu-build', 'ubuntu-iso', 'update-maintainer', 'what-patch', diff --git a/buildd b/ubuntu-build similarity index 98% rename from buildd rename to ubuntu-build index f640b43..cef3b1c 100755 --- a/buildd +++ b/ubuntu-build @@ -1,6 +1,6 @@ #!/usr/bin/python # -# buildd - command line interface for Launchpad buildd operations. +# ubuntu-build - command line interface for Launchpad buildd operations. # # Copyright (C) 2007 Canonical Ltd. # Authors: @@ -54,7 +54,7 @@ retryRescoreOptions.add_option("-a", "--arch", type = "string", batch_options = OptionGroup( optParser, "Batch processing", "These options and parameter ordering is only available in --batch mode.\n" - "Usage: buildd --batch [options] ...") + "Usage: ubuntu-build --batch [options] ...") batch_options.add_option( '--batch', action = 'store_true', dest = 'batch', default = False, help = 'Enable batch mode')