[Reportbug-commits] r687 - in trunk (15 files)
morph at users.alioth.debian.org
morph at users.alioth.debian.org
Thu Jan 15 20:07:38 UTC 2009
Date: Thursday, January 15, 2009 @ 20:07:37
Author: morph
Revision: 687
conf/reportbug.conf, debian/rules
* conf/reportbug.conf, debian/rules
- moved reportbug.conf to conf/ dir
* share/{handle_bugscript, presubj, reportbug.el, script}, setup.py
- moved files installed in /usr/share/... into share/ to clean up top level
directory
Added:
trunk/conf/
trunk/conf/reportbug.conf
(from rev 686, trunk/reportbug.conf)
trunk/share/
trunk/share/handle_bugscript
(from rev 686, trunk/handle_bugscript)
trunk/share/presubj
(from rev 686, trunk/presubj)
trunk/share/reportbug.el
(from rev 686, trunk/reportbug.el)
trunk/share/script
(from rev 686, trunk/script)
Modified:
trunk/debian/changelog
trunk/debian/rules
trunk/setup.py
Deleted:
trunk/handle_bugscript
trunk/presubj
trunk/reportbug.conf
trunk/reportbug.el
trunk/script
Copied: trunk/conf/reportbug.conf (from rev 686, trunk/reportbug.conf)
===================================================================
--- trunk/conf/reportbug.conf (rev 0)
+++ trunk/conf/reportbug.conf 2009-01-15 20:07:37 UTC (rev 687)
@@ -0,0 +1,105 @@
+# Example configuration file for reportbug(1)
+# Options can be specified in any order
+# usually, no-OPTION will disable OPTION if OPTION is boolean
+
+# Default severity level; will bypass prompt in reportbug, so disabled
+# severity normal
+
+# BTS to use
+#bts debian
+# See 'reportbug --bts help' for a current list of supported BTSes
+
+# Submission address: default is 'submit'
+submit
+# Can also be 'quiet' or 'maintonly'; see --report-quiet and --maintonly
+# entries on man page
+
+# Mailer to use (default is empty, to use internal mailer). One of:
+# mutt
+# af
+# mh
+# nmh
+
+# You can also use 'mua'; it takes an argument like that to --mua
+# mua 'mutt -H'
+
+# Additional headers to add:
+# header "X-Debbugs-CC: debian-qa at lists.debian.org"
+# header "X-Silly-Header: I haven't edited my /etc/reportbug.conf"
+# header "X-Debbugs-No-Ack: please" # to suppress acknowledgments
+
+# The following boolean options can be disabled by adding 'no-'
+# Should I query the BTS?
+query-bts
+
+# Should I check for newer releases of the package
+# check-available
+
+# Should I CC the reporter?
+cc
+
+# Should I ever include modified config files?
+config-files
+
+# Should I strip down modified config files?
+compress
+
+# Specify one of the following to digitally sign bug reports automatically.
+# sign gpg
+# sign pgp
+
+# Default "from" email address and real name (override with env. vars.)
+# email "humberto at example.com"
+# realname "Humberto Flores III"
+
+# Default REPLYTO (override with env. variables)
+# replyto "Humberto Flores <humflores at example.org>"
+
+# Default HTTP Proxy (override with the env. variable)
+# http_proxy http://proxy.example.com:3128/
+
+# Use this to enable the internal MTA (bypassing /usr/sbin/sendmail)
+# smtphost localhost
+#
+# You can also specify a port other than 25
+# smtphost mail.example.com:2525
+
+# Username and password for SMTP
+# smtpuser bob
+# smtppasswd XXX
+
+# Use TLS encryption.
+# smtptls
+
+# Use this to specify the path of your MTA; any SMTP server on Debian
+# should be OK with the default.
+# mta /usr/sbin/sendmail
+
+# User interface: text or newt
+# querybts and reportbug will use this setting
+# ui text
+
+# Editor
+# editor "emacs -nw"
+
+# Always use template mode (bypass all prompts, output to stdout)
+# template
+
+# Don't query source packages
+# no-query-source
+
+# Disable debconf-show output
+# no-debconf
+
+# Automatically verify package installation before reporting using
+# debsums, if available
+verify
+
+# Disable all external queries
+# offline
+
+# Default operating mode (novice, standard, advanced, expert)
+# mode novice
+
+# Don't check whether user IDs are outside admin range - root is still checked
+# no-check-uid
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2009-01-15 10:48:24 UTC (rev 686)
+++ trunk/debian/changelog 2009-01-15 20:07:37 UTC (rev 687)
@@ -2,8 +2,13 @@
* reportbug/__init__.py
- updated version number
+ * conf/reportbug.conf, debian/rules
+ - moved reportbug.conf to conf/ dir
+ * share/{handle_bugscript, presubj, reportbug.el, script}, setup.py
+ - moved files installed in /usr/share/... into share/ to clean up top level
+ directory
- -- Sandro Tosi <morph at debian.org> Thu, 15 Jan 2009 11:41:10 +0100
+ -- Sandro Tosi <morph at debian.org> Thu, 15 Jan 2009 13:19:44 +0100
reportbug (3.99.1) experimental; urgency=low
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2009-01-15 10:48:24 UTC (rev 686)
+++ trunk/debian/rules 2009-01-15 20:07:37 UTC (rev 687)
@@ -43,7 +43,7 @@
python setup.py install --root $(CURDIR)/debian/reportbug
mv $(CURDIR)/debian/reportbug/usr/lib $(CURDIR)/debian/python-reportbug/usr
chmod 0755 $(CURDIR)/debian/reportbug/usr/bin/*
- cp -p reportbug.conf $(CURDIR)/debian/reportbug/etc
+ cp -p conf/reportbug.conf $(CURDIR)/debian/reportbug/etc
touch install-stamp
Deleted: trunk/handle_bugscript
===================================================================
--- trunk/handle_bugscript 2009-01-15 10:48:24 UTC (rev 686)
+++ trunk/handle_bugscript 2009-01-15 20:07:37 UTC (rev 687)
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-# Adapted from bits and pieces of /usr/bin/bug, to provide the functions
-# that package says are permitted.
-#
-# /usr/bin/bug is:
-# (C) 1996-2000 Christoph Lameter <clameter at debian.org>
-# Nicolás Lichtmaier <nick at debian.org>
-# Modifications:
-# Copyright (C) 2000 Chris Lawrence <lawrencc at debian.org>
-#
-# You may freely redistribute, use and modify this software under the terms
-# of the GNU General Public License.
-
-set -e
-
-# Wait for a keypress and put it in $KEY
-getkey()
-{
- stty -icanon min 1 || true 2> /dev/null
- KEY=$(dd bs=1 count=1 2> /dev/null)
- stty icanon || true 2> /dev/null
- KEY="${KEY:0:1}"
- echo
-}
-
-export -f getkey
-export YESNO="yYnN"
-
-# Usage: yesno <prompt> "yep"|"nop" (<- default)
-# output: REPLY
-yesno()
-{
- while true; do
- echo -n "$1"
-
- getkey
-
- # if 'n'
- if [ "$KEY" = "${YESNO:2:1}" ] || [ "$KEY" = "${YESNO:3:1}" ]; then
- REPLY=nop
- return
- fi
-
- # if 'y'
- if [ "$KEY" = "${YESNO:0:1}" ] || [ "$KEY" = "${YESNO:1:1}" ]; then
- REPLY=yep
- return
- fi
-
- # if \n
- if [ "$KEY" = "" ]; then
- REPLY=$2
- return
- fi
- done
-}
-
-export -f yesno
-
-#&>3
-$1 3>|$2
Deleted: trunk/presubj
===================================================================
--- trunk/presubj 2009-01-15 10:48:24 UTC (rev 686)
+++ trunk/presubj 2009-01-15 20:07:37 UTC (rev 687)
@@ -1,31 +0,0 @@
-Common issues with reportbug:
-
-EXIM IS CONFIGURED FOR LOCAL DELIVERY: In Debian 4.0 (etch) and later,
- exim4 is configured by default to only deliver email to addresses
- on your system. YOUR BUG REPORTS WILL NOT ARRIVE AT THE BUG
- TRACKING SYSTEM UNLESS YOU FOLLOW ONE OF THE FOLLOWING STEPS:
-
- - Reconfigure exim (using 'dpkg-reconfigure -plow exim4') to send
- mail to the Internet directly or via a smarthost.
-
- - Configure reportbug to deliver mail to your ISP's smarthost or
- bugs.debian.org directly (using 'reportbug --configure').
-
- - Alternatively, see /usr/share/doc/reportbug/README.Users for
- instructions on how to use GMail's SMTP server to submit reports.
-
-EMAIL ADDRESS SETTING: See the manual page reportbug(1) for how to set
- your email address (i.e. the address that appears in the "From:"
- header), if reportbug is unable to correctly figure it out for you.
-
- Note that some mail systems will further rewrite the address
- displayed by reportbug when it starts.
-
-EDITORS: See the manual page reportbug(1) for how to choose an editor.
- You probably will want to have this setting for other tools as
- well. As an alternative, some mail programs, such as "mutt", can
- be configured to be used as the editor for your report, which you
- may find preferable.
-
-(You may need to press 'q' to exit your pager and continue using
-reportbug at this point.)
Deleted: trunk/reportbug.conf
===================================================================
--- trunk/reportbug.conf 2009-01-15 10:48:24 UTC (rev 686)
+++ trunk/reportbug.conf 2009-01-15 20:07:37 UTC (rev 687)
@@ -1,105 +0,0 @@
-# Example configuration file for reportbug(1)
-# Options can be specified in any order
-# usually, no-OPTION will disable OPTION if OPTION is boolean
-
-# Default severity level; will bypass prompt in reportbug, so disabled
-# severity normal
-
-# BTS to use
-#bts debian
-# See 'reportbug --bts help' for a current list of supported BTSes
-
-# Submission address: default is 'submit'
-submit
-# Can also be 'quiet' or 'maintonly'; see --report-quiet and --maintonly
-# entries on man page
-
-# Mailer to use (default is empty, to use internal mailer). One of:
-# mutt
-# af
-# mh
-# nmh
-
-# You can also use 'mua'; it takes an argument like that to --mua
-# mua 'mutt -H'
-
-# Additional headers to add:
-# header "X-Debbugs-CC: debian-qa at lists.debian.org"
-# header "X-Silly-Header: I haven't edited my /etc/reportbug.conf"
-# header "X-Debbugs-No-Ack: please" # to suppress acknowledgments
-
-# The following boolean options can be disabled by adding 'no-'
-# Should I query the BTS?
-query-bts
-
-# Should I check for newer releases of the package
-# check-available
-
-# Should I CC the reporter?
-cc
-
-# Should I ever include modified config files?
-config-files
-
-# Should I strip down modified config files?
-compress
-
-# Specify one of the following to digitally sign bug reports automatically.
-# sign gpg
-# sign pgp
-
-# Default "from" email address and real name (override with env. vars.)
-# email "humberto at example.com"
-# realname "Humberto Flores III"
-
-# Default REPLYTO (override with env. variables)
-# replyto "Humberto Flores <humflores at example.org>"
-
-# Default HTTP Proxy (override with the env. variable)
-# http_proxy http://proxy.example.com:3128/
-
-# Use this to enable the internal MTA (bypassing /usr/sbin/sendmail)
-# smtphost localhost
-#
-# You can also specify a port other than 25
-# smtphost mail.example.com:2525
-
-# Username and password for SMTP
-# smtpuser bob
-# smtppasswd XXX
-
-# Use TLS encryption.
-# smtptls
-
-# Use this to specify the path of your MTA; any SMTP server on Debian
-# should be OK with the default.
-# mta /usr/sbin/sendmail
-
-# User interface: text or newt
-# querybts and reportbug will use this setting
-# ui text
-
-# Editor
-# editor "emacs -nw"
-
-# Always use template mode (bypass all prompts, output to stdout)
-# template
-
-# Don't query source packages
-# no-query-source
-
-# Disable debconf-show output
-# no-debconf
-
-# Automatically verify package installation before reporting using
-# debsums, if available
-verify
-
-# Disable all external queries
-# offline
-
-# Default operating mode (novice, standard, advanced, expert)
-# mode novice
-
-# Don't check whether user IDs are outside admin range - root is still checked
-# no-check-uid
Deleted: trunk/reportbug.el
===================================================================
--- trunk/reportbug.el 2009-01-15 10:48:24 UTC (rev 686)
+++ trunk/reportbug.el 2009-01-15 20:07:37 UTC (rev 687)
@@ -1,41 +0,0 @@
-;; Vague implementation of needed code to invoke GNUS from reportbug
-;; by Tollef Fog Heen
-(require 'gnus)
-
-;; Match each component of Gnus' version number.
-(string-match "^\\([0-9]+\\)\\.\\([0-9]+\\)\\(?:\\.\\([0-9]+\\)\\)?$"
- gnus-version-number)
-;; Only load gnus-load if using a separately packaged Gnus (that is,
-;; not the Gnus bundled with Emacs).
-(if (or
- ;; Check for a separately packaged release of Gnus
- ;; (second component of version number even):
- (= (% (string-to-int (match-string 2 gnus-version-number)) 2) 0)
- ;; Check for a separately packaged pre-release of Gnus
- ;; (first component of version number 0):
- (= (string-to-int (match-string 1 gnus-version-number)) 0))
- (require 'gnus-load))
-
-(defun tfheen-set-header (header value)
- "Insert a string at the beginning of a header."
- (message-narrow-to-head)
- (goto-char (point-min))
- (search-forward (format "%s: " header) (point-max) t)
- (insert value)
- (widen))
-
-(defun tfheen-reportbug-insert-template ()
- (interactive)
- (require 'gnus)
- (find-file (getenv "REPORTBUG"))
- (let ((subject (message-fetch-field "Subject"))
- (toaddr (or (message-fetch-field "To") "submit at bugs.debian.org")))
- (gnus-narrow-to-body)
- (let ((body (or (buffer-string) "")))
- (gnus-summary-mail-other-window)
- (tfheen-set-header "Subject" subject)
- (tfheen-set-header "To" toaddr)
- (gnus-narrow-to-body)
- (insert body)
- (widen)))
- (kill-buffer (find-buffer-visiting (getenv "REPORTBUG"))))
Deleted: trunk/script
===================================================================
--- trunk/script 2009-01-15 10:48:24 UTC (rev 686)
+++ trunk/script 2009-01-15 20:07:37 UTC (rev 687)
@@ -1,31 +0,0 @@
-#! /usr/bin/python
-# -*- python -*-
-
-import os
-import re
-
-OUT=os.fdopen(3, 'w')
-
-envprint = False
-for var in ['EDITOR', 'VISUAL', 'REPORTBUGEMAIL', 'DEBEMAIL', 'EMAIL',
- 'DEBFULLNAME', 'DEBNAME', 'NAME', 'INTERFACE']:
- if var in os.environ:
- if not envprint:
- print >> OUT, '** Environment settings:'
- envprint = True
- print >> OUT, '%s="%s"' % (var, os.environ[var])
-
-passwdre = re.compile(r'\s*(smtppasswd)\s+(.*)$')
-
-USERFILE = os.path.expanduser('~/.reportbugrc')
-if os.path.exists(USERFILE):
- if envprint:
- print >> OUT
- print >> OUT, '** %s:' % USERFILE
- for line in file(USERFILE):
- line = line.strip()
- if line and not line.startswith('#'):
- m = passwdre.match(line)
- if m:
- line = '%s <omitted>' % m.group(1)
- print >> OUT, line
Modified: trunk/setup.py
===================================================================
--- trunk/setup.py 2009-01-15 10:48:24 UTC (rev 686)
+++ trunk/setup.py 2009-01-15 20:07:37 UTC (rev 687)
@@ -20,8 +20,8 @@
author='reportbug maintainence team',
author_email='reportbug-maint at lists.alioth.debian.org',
url='http://alioth.debian.org/projects/reportbug',
- data_files=[('share/reportbug', ['handle_bugscript', 'reportbug.el']),
- ('share/bug/reportbug', ['presubj', 'script'])],
+ data_files=[('share/reportbug', ['share/handle_bugscript', 'share/reportbug.el']),
+ ('share/bug/reportbug', ['share/presubj', 'share/script'])],
license='MIT',
packages=['reportbug','reportbug.ui'],
scripts=['bin/reportbug', 'bin/querybts'])
Copied: trunk/share/handle_bugscript (from rev 686, trunk/handle_bugscript)
===================================================================
--- trunk/share/handle_bugscript (rev 0)
+++ trunk/share/handle_bugscript 2009-01-15 20:07:37 UTC (rev 687)
@@ -0,0 +1,62 @@
+#!/bin/bash
+
+# Adapted from bits and pieces of /usr/bin/bug, to provide the functions
+# that package says are permitted.
+#
+# /usr/bin/bug is:
+# (C) 1996-2000 Christoph Lameter <clameter at debian.org>
+# Nicolás Lichtmaier <nick at debian.org>
+# Modifications:
+# Copyright (C) 2000 Chris Lawrence <lawrencc at debian.org>
+#
+# You may freely redistribute, use and modify this software under the terms
+# of the GNU General Public License.
+
+set -e
+
+# Wait for a keypress and put it in $KEY
+getkey()
+{
+ stty -icanon min 1 || true 2> /dev/null
+ KEY=$(dd bs=1 count=1 2> /dev/null)
+ stty icanon || true 2> /dev/null
+ KEY="${KEY:0:1}"
+ echo
+}
+
+export -f getkey
+export YESNO="yYnN"
+
+# Usage: yesno <prompt> "yep"|"nop" (<- default)
+# output: REPLY
+yesno()
+{
+ while true; do
+ echo -n "$1"
+
+ getkey
+
+ # if 'n'
+ if [ "$KEY" = "${YESNO:2:1}" ] || [ "$KEY" = "${YESNO:3:1}" ]; then
+ REPLY=nop
+ return
+ fi
+
+ # if 'y'
+ if [ "$KEY" = "${YESNO:0:1}" ] || [ "$KEY" = "${YESNO:1:1}" ]; then
+ REPLY=yep
+ return
+ fi
+
+ # if \n
+ if [ "$KEY" = "" ]; then
+ REPLY=$2
+ return
+ fi
+ done
+}
+
+export -f yesno
+
+#&>3
+$1 3>|$2
Copied: trunk/share/presubj (from rev 686, trunk/presubj)
===================================================================
--- trunk/share/presubj (rev 0)
+++ trunk/share/presubj 2009-01-15 20:07:37 UTC (rev 687)
@@ -0,0 +1,31 @@
+Common issues with reportbug:
+
+EXIM IS CONFIGURED FOR LOCAL DELIVERY: In Debian 4.0 (etch) and later,
+ exim4 is configured by default to only deliver email to addresses
+ on your system. YOUR BUG REPORTS WILL NOT ARRIVE AT THE BUG
+ TRACKING SYSTEM UNLESS YOU FOLLOW ONE OF THE FOLLOWING STEPS:
+
+ - Reconfigure exim (using 'dpkg-reconfigure -plow exim4') to send
+ mail to the Internet directly or via a smarthost.
+
+ - Configure reportbug to deliver mail to your ISP's smarthost or
+ bugs.debian.org directly (using 'reportbug --configure').
+
+ - Alternatively, see /usr/share/doc/reportbug/README.Users for
+ instructions on how to use GMail's SMTP server to submit reports.
+
+EMAIL ADDRESS SETTING: See the manual page reportbug(1) for how to set
+ your email address (i.e. the address that appears in the "From:"
+ header), if reportbug is unable to correctly figure it out for you.
+
+ Note that some mail systems will further rewrite the address
+ displayed by reportbug when it starts.
+
+EDITORS: See the manual page reportbug(1) for how to choose an editor.
+ You probably will want to have this setting for other tools as
+ well. As an alternative, some mail programs, such as "mutt", can
+ be configured to be used as the editor for your report, which you
+ may find preferable.
+
+(You may need to press 'q' to exit your pager and continue using
+reportbug at this point.)
Copied: trunk/share/reportbug.el (from rev 686, trunk/reportbug.el)
===================================================================
--- trunk/share/reportbug.el (rev 0)
+++ trunk/share/reportbug.el 2009-01-15 20:07:37 UTC (rev 687)
@@ -0,0 +1,41 @@
+;; Vague implementation of needed code to invoke GNUS from reportbug
+;; by Tollef Fog Heen
+(require 'gnus)
+
+;; Match each component of Gnus' version number.
+(string-match "^\\([0-9]+\\)\\.\\([0-9]+\\)\\(?:\\.\\([0-9]+\\)\\)?$"
+ gnus-version-number)
+;; Only load gnus-load if using a separately packaged Gnus (that is,
+;; not the Gnus bundled with Emacs).
+(if (or
+ ;; Check for a separately packaged release of Gnus
+ ;; (second component of version number even):
+ (= (% (string-to-int (match-string 2 gnus-version-number)) 2) 0)
+ ;; Check for a separately packaged pre-release of Gnus
+ ;; (first component of version number 0):
+ (= (string-to-int (match-string 1 gnus-version-number)) 0))
+ (require 'gnus-load))
+
+(defun tfheen-set-header (header value)
+ "Insert a string at the beginning of a header."
+ (message-narrow-to-head)
+ (goto-char (point-min))
+ (search-forward (format "%s: " header) (point-max) t)
+ (insert value)
+ (widen))
+
+(defun tfheen-reportbug-insert-template ()
+ (interactive)
+ (require 'gnus)
+ (find-file (getenv "REPORTBUG"))
+ (let ((subject (message-fetch-field "Subject"))
+ (toaddr (or (message-fetch-field "To") "submit at bugs.debian.org")))
+ (gnus-narrow-to-body)
+ (let ((body (or (buffer-string) "")))
+ (gnus-summary-mail-other-window)
+ (tfheen-set-header "Subject" subject)
+ (tfheen-set-header "To" toaddr)
+ (gnus-narrow-to-body)
+ (insert body)
+ (widen)))
+ (kill-buffer (find-buffer-visiting (getenv "REPORTBUG"))))
Copied: trunk/share/script (from rev 686, trunk/script)
===================================================================
--- trunk/share/script (rev 0)
+++ trunk/share/script 2009-01-15 20:07:37 UTC (rev 687)
@@ -0,0 +1,31 @@
+#! /usr/bin/python
+# -*- python -*-
+
+import os
+import re
+
+OUT=os.fdopen(3, 'w')
+
+envprint = False
+for var in ['EDITOR', 'VISUAL', 'REPORTBUGEMAIL', 'DEBEMAIL', 'EMAIL',
+ 'DEBFULLNAME', 'DEBNAME', 'NAME', 'INTERFACE']:
+ if var in os.environ:
+ if not envprint:
+ print >> OUT, '** Environment settings:'
+ envprint = True
+ print >> OUT, '%s="%s"' % (var, os.environ[var])
+
+passwdre = re.compile(r'\s*(smtppasswd)\s+(.*)$')
+
+USERFILE = os.path.expanduser('~/.reportbugrc')
+if os.path.exists(USERFILE):
+ if envprint:
+ print >> OUT
+ print >> OUT, '** %s:' % USERFILE
+ for line in file(USERFILE):
+ line = line.strip()
+ if line and not line.startswith('#'):
+ m = passwdre.match(line)
+ if m:
+ line = '%s <omitted>' % m.group(1)
+ print >> OUT, line
More information about the Reportbug-commits
mailing list