From 737d0f8ad4663770f9f22cf97c78f4d4f2335086 Mon Sep 17 00:00:00 2001 From: Siegfried-Angel Gevatter Pujals Date: Sun, 17 Feb 2008 23:39:10 +0100 Subject: [PATCH] Released version 0.26 (with only some of the current changes); updated changelog. Other changes. --- debian/changelog | 34 +++++++++++++++++++-------- debian/control | 17 +++++++++----- debian/pycompat | 1 - debian/rules | 2 +- doc/ppaput.1.docbook | 2 +- doc/update-maintainer.1 | 2 +- ppaput | 16 ++++++++++++- ppaput.py => python_modules/ppaput.py | 20 ++++------------ setup.py | 2 +- submittodebian | 4 ++++ 10 files changed, 62 insertions(+), 38 deletions(-) delete mode 100644 debian/pycompat rename ppaput.py => python_modules/ppaput.py (90%) diff --git a/debian/changelog b/debian/changelog index dbc7ab0..a6e555b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,26 @@ -ubuntu-dev-tools (0.26) UNRELEASED; urgency=low +ubuntu-dev-tools (0.27) UNRELEASED; urgency=low + + [ Andrew Hunter ] + * Use install files as we have multiple binaries now. + * ppaput: + * Separated ppaput script from backend python modules (shipped in + python-ppaput). (LP: #192184) + * Switched from homegrown option parseing to Optparse, much more + robust and less code duplication. + + [ Siegfried-Angel Gevatter Pujals (RainCT) ] + * Remove wrong element from doc/ppaput.1.docbook. + * Move ppaput.py into new python_modules/directory and remove + it's shabang. + * Write a description for the new python-ubuntu-utils binary + package in debian/control. Add a "Suggests: ubuntu-dev-tools". + * Check for reportbug being installed in submittodebian. Replace + reportbug dependency with a Recommends. + * Remove debian/pycompat. + + -- Siegfried-Angel Gevatter Pujals (RainCT) Sun, 17 Feb 2008 22:05:00 +0100 + +ubuntu-dev-tools (0.26) hardy; urgency=low [ Stephan Hermann ] * pbuild-dist: fixed a bug with the *sudo call. @@ -12,14 +34,6 @@ ubuntu-dev-tools (0.26) UNRELEASED; urgency=low (LP: #190351) * Exit, if versions in Ubuntu and Debian are the same already. - [ Andrew Hunter ] - * Use install files as we have multiple binaries now. - * ppaput: - * Separated ppaput script from backend python modules (shipped in - python-ppaput). (LP: #192184) - * Switched from homegrown option parseing to Optparse, much more - robust and less code duplication. - [ Siegfried-Angel Gevatter Pujals (RainCT) ] * Add manpages for update-maintainer and 404main. * Move pbuilder-dist.bash_completion into new bash_completion/ @@ -31,7 +45,7 @@ ubuntu-dev-tools (0.26) UNRELEASED; urgency=low doc/suspicious-source.1. * Fix some issues with the new pbuilder-dist code. - -- Siegfried-Angel Gevatter Pujals (RainCT) Sun, 17 Feb 2008 17:36:11 +0100 + -- Siegfried-Angel Gevatter Pujals (RainCT) Sun, 17 Feb 2008 19:35:46 +0100 ubuntu-dev-tools (0.25) hardy; urgency=low diff --git a/debian/control b/debian/control index 64d904a..fde21ab 100644 --- a/debian/control +++ b/debian/control @@ -13,8 +13,8 @@ Standards-Version: 3.7.3 Package: ubuntu-dev-tools Architecture: all Section: devel -Depends: ${python:Depends}, ${misc:Depends}, binutils, devscripts, sudo, python-launchpad-bugs (>= 0.2.25), reportbug (>= 3.39ubuntu1), python-debian, dctrl-tools, lsb-release, python-ppaput -Recommends: bzr, pbuilder +Depends: ${python:Depends}, ${misc:Depends}, binutils, devscripts, sudo, python-launchpad-bugs (>= 0.2.25), python-debian, dctrl-tools, lsb-release +Recommends: bzr, pbuilder, python-ubuntu-utils, reportbug (>= 3.39ubuntu1) Conflicts: devscripts (<< 2.10.7ubuntu5) Replaces: devscripts (<< 2.10.7ubuntu5) XB-Python-Version: ${python:Versions} @@ -23,11 +23,16 @@ Description: useful tools for Ubuntu developers make their packaging work a lot easier. Such tools can include bug filing, packaging preparation, package analysis, etc. -Package: python-ppaput +Package: python-ubuntu-utils Architecture: all Section: python Depends: ${python:Depends} +Suggests: ubuntu-dev-tools XB-Python-Version: ${python:Versions} -Description: python module for uploading to PPAs. - python-ppaput is a python module that abstracts the process of creating and - uploading Debian source packages to Personal Package Archives. +Description: useful Python modules for Ubuntu developers + This is a collection of useful Python modules that people interested + in Ubuntu development might find interesting. Those include: + . + * ppaput: a Python module that abstracts the process of creating and + uploading Debian source packages to Launchpad's Personal Package + Archives. diff --git a/debian/pycompat b/debian/pycompat deleted file mode 100644 index 0cfbf08..0000000 --- a/debian/pycompat +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/debian/rules b/debian/rules index c2b9d93..623e240 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -DEB_PYTHON_SYSTEM := pycentral +DEB_PYTHON_SYSTEM := pycentral include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/python-distutils.mk diff --git a/doc/ppaput.1.docbook b/doc/ppaput.1.docbook index a415680..75b9bb8 100644 --- a/doc/ppaput.1.docbook +++ b/doc/ppaput.1.docbook @@ -73,7 +73,7 @@ the bug report. - If you use the option, it + If you use the option, it will also 1) file a bug and add 2) a (LP: #.....) header to the source package. diff --git a/doc/update-maintainer.1 b/doc/update-maintainer.1 index 8d19e15..351656a 100644 --- a/doc/update-maintainer.1 +++ b/doc/update-maintainer.1 @@ -22,7 +22,7 @@ Manually specify the section of the package. This is necessary if the package is not yet in the archive or if you don't have an Internet connection available when you run \fBupdate\-maintainer\fP. .TP -\fB\-\-nochangelog\fP +\fB\-\-nochangelog\fP, \fB\-\-no\-changelog\fP By default, \fBupdate\-maintainer\fP adds an entry to the changelog explaining that it changed the Maintainer field. If you don't want that to happen, use this option. diff --git a/ppaput b/ppaput index 7020e52..baab521 100755 --- a/ppaput +++ b/ppaput @@ -1,10 +1,24 @@ #!/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 -import ppaput from optparse import OptionParser +try: + import ppaput +except ImportError: + print 'You need python-ubuntu-utils installed to use ppaput.' + sys.exit(1) + USAGE = \ """Usage: ppaput [-n] [] [] diff --git a/ppaput.py b/python_modules/ppaput.py similarity index 90% rename from ppaput.py rename to python_modules/ppaput.py index 66ebecf..7e291aa 100755 --- a/ppaput.py +++ b/python_modules/ppaput.py @@ -1,19 +1,8 @@ -#!/usr/bin/python # -*- coding: utf-8 -*- # # Copyright 2007, Canonical, Daniel Holbach -# -# GPL 3 -# -# -# 11:57:27 < dholbach> but what it does is: build a source package of -# the current source tree you're in, upload it to PPA -# and follow up on a bug report, subscribe the right -# sponsors, set the right status - if you pass "-n" -# it will file a bug report, add a (LP: #....) to -# the changelog also -# 11:57:37 < dholbach> I thought it'd help with our sponsoring process -# +# Modified by Andrew Hunter +# License: GPLv3 import re import os @@ -23,14 +12,13 @@ import string try: import launchpadbugs.connector as Connector except: - print >> sys.stderr, \ - "You need python-launchpad-bugs (>= 0.2.14) installed to use ppaput." + raise ImportError, "You need python-launchpad-bugs (>= 0.2.14) installed to use ppaput." sys.exit(1) #try: # import apt #except: -# print >> sys.stderr, "You need python-apt installed to use ppaput." +# raise ImportError, "You need python-apt installed to use ppaput." # sys.exit(1) def dput_check(): diff --git a/setup.py b/setup.py index b42befe..8b663c2 100755 --- a/setup.py +++ b/setup.py @@ -33,5 +33,5 @@ setup(name='ubuntu-dev-tools', 'get-build-deps', 'dgetlp' ], - py_modules=['ppaput'], + py_modules=['modules/ppaput.py'], ) diff --git a/submittodebian b/submittodebian index 1288f71..209fe7b 100755 --- a/submittodebian +++ b/submittodebian @@ -28,6 +28,10 @@ except ImportError: print 'This utility requires modules from the «python-debian» package, which isn\'t currently installed.' sys.exit(1) +if not os.path.exists('/usr/bin/reportbug'): + print 'This utility requires the «reportbug» package, which isn\'t currently installed.' + sys.exit(1) + def get_most_recent_debian_version(changelog): for v in changelog.get_versions(): if not re.search('(ubuntu|build)', v.full_version):