diff --git a/README b/README index 34c918f..8cf4e00 100644 --- a/README +++ b/README @@ -46,12 +46,6 @@ pbuilder-dist [withlog] [create|update|build|clean|login|execute] Debian releases. It's recommended to symlink as pbuilder-feisty, pbuilder-gutsy, etc. -ppaput [-n] [] - ... will build a source package using , upload it - to and follow up on specified bugs, make sure the - sponsoring process is followed. Also it will file a new bug, if - '-n' is used. - pull-debian-debdiff ... will attempt to find and download a specific version of a Debian package and its immediate parent to generate a debdiff. diff --git a/debian/changelog b/debian/changelog index 733dfc7..9ed3fdd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,7 +19,12 @@ ubuntu-dev-tools (0.27) UNRELEASED; urgency=low * Add ppaput to debian/copyright. * Remove debian/pycompat. - -- Siegfried-Angel Gevatter Pujals (RainCT) Sun, 17 Feb 2008 22:05:00 +0100 + [ Daniel Holbach ] + * README, debian/rules, doc/ppaput.1.docbook, ppaput, setup.py: removed + ppaput for now. It has shortcomings and is not actively used in the + sponsoring process. + + -- Daniel Holbach Fri, 22 Feb 2008 18:55:21 +0100 ubuntu-dev-tools (0.26) hardy; urgency=low diff --git a/debian/rules b/debian/rules index 5350360..b43537e 100755 --- a/debian/rules +++ b/debian/rules @@ -7,11 +7,5 @@ include /usr/share/cdbs/1/class/python-distutils.mk DEB_INSTALL_MANPAGES_ubuntu-dev-tools = doc/*.1 -build/ubuntu-dev-tools:: - docbook2x-man doc/ppaput.1.docbook; mv ppaput.1 doc - binary-install/python-ubuntutools:: rm -rf debian/python-ubuntutools/usr/lib - -clean:: - rm -f doc/ppaput.1 diff --git a/doc/ppaput.1.docbook b/doc/ppaput.1.docbook deleted file mode 100644 index 75b9bb8..0000000 --- a/doc/ppaput.1.docbook +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - Daniel - Holbach - daniel.holbach@ubuntu.com - - - 2007 - Daniel Holbach - - - - 2007-09-07 - - - - ppaput - 1 - - - ppaput - A tool for uploading packages for sponsorship - - - - ppaput - - - - - - - - - - - - - PREREQUISITES - - To use this tool, you will need to set up your PPA in Launchpad and - therefore carefully follow the instructions in the PPA documentation. - - - Also you need to copy your Launchpad cookie to - ~/.lpcookie. Firefox uses - ~/.mozilla/firefox/<random>cookies.txt, - Epiphany uses - ~/.gnome2/epiphany/mozilla/epiphany/cookies.txt. - - - - OVERVIEW - - This tool aims to help with the sponsoring - process and is written by the MOTU team. - - - This tool will 1) build a source package of the current source tree - you're in, 2) upload the package to <dput - location> (using 'default' if not specified), 3) follow up on the bug - report (if specified in debian/changelog as per the - changelog - spec), 4) set the right status and subscribe the right people to - the bug report. - - - If you use the option, it - will also 1) file a bug and add 2) a (LP: #.....) header to the source - package. - - - The - sponsoring process was complicated enough and package uploads - were done to either Malone, - REVU or personal web servers. This tool aims - to unify processes and make use of existing infrastructure such as - Launchpad Bugs (Malone) and - Launchpad PPA. - In September 2007, Daniel Holbach started working on this tool. - - - - DESCRIPTION - - This tool has lists of known strings for a given package that - it searches for in bug reports (even in the attachments uploaded), - thus helping to find duplicates, related bugs and other information, - but mainly making bug triagers job a lot easier. - - - - OPTIONS - - These are all the options available so far: - - - - ppaput options: - - - files a new bug report and adds its number to - debian/changelog - - - - - specifies the location you upload the source package - to according to the alias you specified in either - /etc/dput.cf or - ~/.dput.cf - - - - will be passed to debuild - during source package creation - - - - - - - COPYRIGHT - - This manual page was written by the MOTU team for the - revutool bug tracking system. - Permission is granted to copy, distribute and/or modify this document - under the terms of the GNU General Public License, - Version 3 or any later version published by the Free Software Foundation. - - - On Debian systems (like Ubuntu), the complete text of the - GNU General Public License can be found in - /usr/share/common-licenses/GPL-3. - - - diff --git a/ppaput b/ppaput deleted file mode 100755 index ced3f57..0000000 --- a/ppaput +++ /dev/null @@ -1,82 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- -# -# Copyright 2007, Canonical, Daniel Holbach -# License: GPLv3 -# -# Builds a source package from the source tree you're currently in, -# uploads it to PPA and follow up on a bug report, subscribe the right -# sponsors and sets the right status - if you pass "-n" it will file a -# bug report and add "(LP: #....)" and to the changelog. - -import os -import sys -from optparse import OptionParser - -try: - import ubuntutools.ppaput -except ImportError: - print 'You need python-ubuntu-utils installed to use ppaput.' - sys.exit(1) - -USAGE = \ -"""Usage: ppaput [-n] [] [] - -See debuild(1) for more information on debuild options.""" -parser = OptionParser(usage=USAGE) - -parser.add_option('-n', action='store_true', dest='new_bug', help='File a new bug on Launchpad', default=False) -parser.disable_interspersed_args() -(options, args) = parser.parse_args() - -def check_arguments(): - location = 'default' - debuild_args = [] - - try: - if args[0].startswith("-"): - debuild_args = args - else: - location = args[0] - debuild_args = args[1:] - except IndexError: - print "No location or arguments given, using defaults" - - return (location, debuild_args) - -def main(): - - (location, debuild_args) = check_arguments() - print location - print debuild_args - - (sourcepackage, version, \ - section, release) = ppaput.get_name_version_section_and_release() - - if options.new_bug: - bugnumber = ppaput.file_bug(sourcepackage, version) - os.system("dch -a 'Fixes (LP: #%s)'" % bugnumber) - if not ppaput.call_debuild(debuild_args): - sys.exit(1) - - changesfile = "../%s_%s_source.changes" % (sourcepackage, version) - if not os.path.exists(os.path.expanduser(changesfile)): - print >> sys.stderr, "%s does not exist." % \ - os.path.expanduser(changesfile) - sys.exit(1) - - host = ppaput.lookup_dput_host(location) - (dput_res, incoming) = ppaput.call_dput(location, changesfile) - if not dput_res: - print >> sys.stderr, "%s was not uploaded." % changesfile - sys.exit(1) - - fixed_lp_bugs = ppaput.find_fixed_launchpad_bug(changesfile) - if fixed_lp_bugs: - deal_with_bugreport(fixed_lp_bugs, host, section, incoming, - sourcepackage, version, release) - - -if __name__ == '__main__': - main() - diff --git a/setup.py b/setup.py index dafc11d..2a7bd96 100755 --- a/setup.py +++ b/setup.py @@ -25,7 +25,6 @@ setup(name='ubuntu-dev-tools', 'pull-debian-debdiff', 'what-patch', 'suspicious-source', - 'ppaput', 'requestsync', 'hugdaylist', 'massfile',