From df28e21b549901c9cf7906f6fc8a3734d539b50a Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Mon, 24 Jan 2011 00:43:05 -0600 Subject: [PATCH] * debian/control, debian/copyright, doc/errno.1, errno, setup.py: - purge the errno utility per request of the ubuntu-dev-tools maintainer; errno now provided by the 'errno' package; (LP: #666540) --- debian/changelog | 8 +++++++- debian/control | 1 - debian/copyright | 2 -- doc/errno.1 | 22 ---------------------- errno | 42 ------------------------------------------ setup.py | 1 - 6 files changed, 7 insertions(+), 69 deletions(-) delete mode 100644 doc/errno.1 delete mode 100755 errno diff --git a/debian/changelog b/debian/changelog index 6c18031..d6883a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ ubuntu-dev-tools (0.114) UNRELEASED; urgency=low + [ Stefano Rivera ] * ubuntutools.archive: Handle source package in workdir correctly. Add regression tests. (LP: #706403) - -- Stefano Rivera Sat, 22 Jan 2011 23:18:13 +0200 + [ Dustin Kirkland ] + * debian/control, debian/copyright, doc/errno.1, errno, setup.py: + - purge the errno utility per request of the ubuntu-dev-tools + maintainer; errno now provided by the 'errno' package; (LP: #666540) + + -- Dustin Kirkland Mon, 24 Jan 2011 00:40:03 -0600 ubuntu-dev-tools (0.113) unstable; urgency=low diff --git a/debian/control b/debian/control index cfc9656..0b18542 100644 --- a/debian/control +++ b/debian/control @@ -75,7 +75,6 @@ Description: useful tools for Ubuntu developers - debian-distro-info - provides information about Debian's distributions. - dgetlp - download a source package from the Launchpad library. - distro-info - provides information about the distributions' releases. - - errno - search POSIX error codes by error number, name, or description - get-branches - used to branch/checkout all the bzr branches in a Launchpad team. - get-build-deps - install the build dependencies needed for a package diff --git a/debian/copyright b/debian/copyright index 9c1a70e..4f8ee62 100644 --- a/debian/copyright +++ b/debian/copyright @@ -9,7 +9,6 @@ Files: *, check-symbols, doc/backportpackage.1, doc/check-symbols.1, - doc/errno.1, doc/requestsync.1, doc/ubuntu-iso.1, lp-shell, @@ -97,7 +96,6 @@ Files: ack-sync, doc/setup-packaging-environment.1, doc/syncpackage.1, edit-patch, - errno, get-branches, grab-attachments, grab-merge, diff --git a/doc/errno.1 b/doc/errno.1 deleted file mode 100644 index 302ca7e..0000000 --- a/doc/errno.1 +++ /dev/null @@ -1,22 +0,0 @@ -.TH errno 1 "10 Aug 2010" ubuntu-dev-tools "ubuntu-dev-tools" -.SH NAME -errno \- search POSIX error codes by error number, error name, or error description - -.SH DESCRIPTION -\fBerrno\fP is a simple script that interprets a POSIX error code, or finds error codes related to a search string. - -.SH EXAMPLE - $ errno 36 - ENAMETOOLONG 36 /* File name too long */ - - $ errno perm - EPERM 1 /* Operation not permitted */ - EACCES 13 /* Permission denied */ - -.SH SEE ALSO -\fBerrno\fP(2)\fP, \fBerrno\fP(3), \fI/usr/include/asm/errno.h\fP - -.SH AUTHOR -This manpage and the utility was written by Dustin Kirkland for Ubuntu systems (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 published by the Free Software Foundation. - -On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL. diff --git a/errno b/errno deleted file mode 100755 index a66f5c5..0000000 --- a/errno +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -e -# -# errno - search POSIX error codes by error number, error name, -# or error description -# -# Copyright (C) 2010 Dustin Kirkland -# -# Authors: -# Dustin Kirkland -# Kees Cook -# Scott Moser -# -# 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 -# the Free Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -if which gcc >/dev/null; then - # Header finding trick from Kees Cook - headers=$(echo "#include " | gcc -E - | grep "\.h" | awk -F\" '{print $2}' | sort -u) -else - headers="/usr/include/asm-generic/errno*.h" -fi - -code="$1" - -for code in "${@}"; do - if [ "$code" -le 0 -o "$code" -ge 0 ] 2>/dev/null; then - # Input is a number, search for a particular matching code - sed -n "s,^#define\s\+\([^[:space:]]\+\s\+${code}\s.*\),\1,p" ${headers} - else - # Input is not a number, search for any matching strings - sed -n "s,^#define\s\+\(.*${code}.*\),\1,Ip" ${headers} - fi -done diff --git a/setup.py b/setup.py index 0e64299..aa6c392 100755 --- a/setup.py +++ b/setup.py @@ -21,7 +21,6 @@ scripts = ['404main', 'debian-distro-info', 'dgetlp', 'edit-patch', - 'errno', 'get-branches', 'get-build-deps', 'grab-attachments',