Update of /cvsroot/fink/experimental/beren12/finkinfo/devel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32475/devel
Modified Files:
devscripts.info devscripts.patch reportbug.info
reportbug.patch
Log Message:
updates
Index: reportbug.info
===================================================================
RCS file: /cvsroot/fink/experimental/beren12/finkinfo/devel/reportbug.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- reportbug.info 23 Nov 2004 06:59:53 -0000 1.6
+++ reportbug.info 24 Jan 2005 00:46:04 -0000 1.7
@@ -1,7 +1,8 @@
Package: reportbug
-Version: 3.1
+Version: 3.5
Revision: 1
Source: mirror:debian:/pool/main/r/%n/%n_%v.tar.gz
+Source-MD5: 1e8e0628b79258279b1dc1ba57d9b835
SourceDirectory: %n
PatchScript: sed -e s,@FINKPREFIX@,%p,g %a/%n.patch | patch -p1
Depends: python23
@@ -114,4 +115,3 @@
License: GPL
Maintainer: Chris Zubrzycki <[EMAIL PROTECTED]>
Homepage: http://packages.qa.debian.org/r/reportbug.html
-Source-MD5: aa8ac1c5bca3a7caefddc4f1d7267bf2
Index: devscripts.info
===================================================================
RCS file: /cvsroot/fink/experimental/beren12/finkinfo/devel/devscripts.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- devscripts.info 23 Nov 2004 20:04:25 -0000 1.2
+++ devscripts.info 24 Jan 2005 00:46:04 -0000 1.3
@@ -1,19 +1,19 @@
Package: devscripts
-Version: 2.8.5
+Version: 2.8.10
Revision: 0
Depends: libwww-pm581
BuildDepends: time-date-pm
Recommends: gnuplot, gnupg, wdiff, digest-md5-pm581, ssh
Enhances: dpkg, reportbug, debbugs
Source: mirror:debian:pool/main/d/%n/%n_%v.tar.gz
-Source-MD5: 901f57ad042de48b44a75557fa33a722
-SourceDirectory: %n-%v
+Source-MD5: e0a1baf4aba4202773ea1f438c0bc9bc
+SourceDirectory: %n
PatchScript: sed -e s,@FINKPREFIX@,%p,g %a/%n.patch | patch -p1
CompileScript: <<
- make
+ make
<<
InstallScript: <<
- make install DESTDIR=%d
+ make install DESTDIR=%d
<<
DocFiles: COPYING README debian/changelog debian/copyright
Description: Scripts to make the life of a Fink Package maintainer easier
Index: devscripts.patch
===================================================================
RCS file: /cvsroot/fink/experimental/beren12/finkinfo/devel/devscripts.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- devscripts.patch 23 Nov 2004 20:04:25 -0000 1.2
+++ devscripts.patch 24 Jan 2005 00:46:04 -0000 1.3
@@ -1,6 +1,6 @@
-diff --exclude=*~ -ruN devscripts-2.8.5/Makefile devscripts-2.8.5.new/Makefile
---- devscripts-2.8.5/Makefile Mon Aug 16 23:47:45 2004
-+++ devscripts-2.8.5.new/Makefile Tue Nov 23 10:23:16 2004
+diff -ruN devscripts/Makefile devscripts.new/Makefile
+--- devscripts/Makefile Mon Jan 10 17:12:47 2005
++++ devscripts.new/Makefile Tue Jan 18 22:14:56 2005
@@ -8,8 +8,6 @@
debrsign.sh debsign.sh dpkg-genbuilddeps.sh mergechanges.sh \
tagpending.sh uscan.sh uupdate.sh wnpp-alert.sh
@@ -10,7 +10,7 @@
PERL_MODULES = Devscripts
[...1746 lines suppressed...]
-+++ devscripts-2.8.5.new/uupdate.1 Tue Nov 23 01:51:15 2004
+diff -ruN devscripts/uupdate.1 devscripts.new/uupdate.1
+--- devscripts/uupdate.1 Thu Jul 29 18:21:56 2004
++++ devscripts.new/uupdate.1 Tue Jan 18 22:03:43 2005
@@ -83,7 +83,7 @@
.B \-\-version
Display version and copyright information and exit successfully.
@@ -821,9 +1852,9 @@
\fI~/.devscripts\fR are sourced in that order to set configuration
variables. Command line options can be used to override configuration
file settings. Environment variable settings are ignored for this
-diff --exclude=*~ -ruN devscripts-2.8.5/uupdate.sh
devscripts-2.8.5.new/uupdate.sh
---- devscripts-2.8.5/uupdate.sh Thu Jul 29 18:21:56 2004
-+++ devscripts-2.8.5.new/uupdate.sh Tue Nov 23 01:51:15 2004
+diff -ruN devscripts/uupdate.sh devscripts.new/uupdate.sh
+--- devscripts/uupdate.sh Sat Nov 27 20:51:03 2004
++++ devscripts.new/uupdate.sh Tue Jan 18 22:03:43 2005
@@ -126,7 +126,7 @@
eval "$var=\$DEFAULT_$var"
done
Index: reportbug.patch
===================================================================
RCS file: /cvsroot/fink/experimental/beren12/finkinfo/devel/reportbug.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- reportbug.patch 22 Oct 2004 00:06:15 -0000 1.4
+++ reportbug.patch 24 Jan 2005 00:46:04 -0000 1.5
@@ -1,6 +1,6 @@
-diff -ruN -x *~ reportbug/README.developers reportbug.new/README.developers
+diff -ruN reportbug/README.developers reportbug.new/README.developers
--- reportbug/README.developers Fri Oct 1 04:09:29 2004
-+++ reportbug.new/README.developers Sat Oct 9 22:48:23 2004
++++ reportbug.new/README.developers Tue Jan 18 11:35:44 2005
@@ -10,7 +10,7 @@
Template Information & Interaction with the user
================================================
@@ -69,9 +69,9 @@
handling script written in Python. You can also write bug handlers in
many other languages that allow direct access to file descriptors,
including Perl and C/C++.
-diff -ruN -x *~ reportbug/checkbuildd.py reportbug.new/checkbuildd.py
+diff -ruN reportbug/checkbuildd.py reportbug.new/checkbuildd.py
--- reportbug/checkbuildd.py Wed Feb 4 23:29:10 2004
-+++ reportbug.new/checkbuildd.py Sat Oct 9 22:59:13 2004
++++ reportbug.new/checkbuildd.py Tue Jan 18 11:35:44 2005
@@ -26,7 +26,7 @@
from urlutils import open_url
from reportbug_exceptions import *
@@ -91,9 +91,9 @@
except NoNetwork:
return {}
if not page:
-diff -ruN -x *~ reportbug/checkversions.py reportbug.new/checkversions.py
+diff -ruN reportbug/checkversions.py reportbug.new/checkversions.py
--- reportbug/checkversions.py Thu Sep 30 05:20:46 2004
-+++ reportbug.new/checkversions.py Sat Oct 9 23:00:37 2004
++++ reportbug.new/checkversions.py Tue Jan 18 11:35:44 2005
@@ -125,7 +125,7 @@
def get_versions_available(package, dists=None, http_proxy=None, arch='i386'):
@@ -103,18 +103,18 @@
try:
page = open_url(PACKAGES_URL % package, http_proxy)
-diff -ruN -x *~ reportbug/debian/copyright reportbug.new/debian/copyright
+diff -ruN reportbug/debian/copyright reportbug.new/debian/copyright
--- reportbug/debian/copyright Wed Feb 4 23:29:12 2004
-+++ reportbug.new/debian/copyright Tue Oct 12 00:16:51 2004
++++ reportbug.new/debian/copyright Tue Jan 18 11:35:44 2005
@@ -23,4 +23,4 @@
# SOFTWARE.
The "handle_bugscript" script is subject to the GNU General Public
-License. See /usr/share/common-licenses/GPL.
+License. See @FINKPREFIX@/share/common-licenses/GPL.
-diff -ruN -x *~ reportbug/debian/install-sed reportbug.new/debian/install-sed
+diff -ruN reportbug/debian/install-sed reportbug.new/debian/install-sed
--- reportbug/debian/install-sed Mon Jul 12 14:30:56 2004
-+++ reportbug.new/debian/install-sed Tue Oct 12 10:51:14 2004
++++ reportbug.new/debian/install-sed Tue Jan 18 11:35:44 2005
@@ -4,5 +4,5 @@
shift
@@ -122,9 +122,9 @@
- sed -f sed-script < $filename > `pwd`/debian/reportbug/$dir/$filename
+ sed -f sed-script < $filename > $dir/$filename
done
-diff -ruN -x *~ reportbug/debianbts.py reportbug.new/debianbts.py
+diff -ruN reportbug/debianbts.py reportbug.new/debianbts.py
--- reportbug/debianbts.py Fri Oct 1 04:12:02 2004
-+++ reportbug.new/debianbts.py Thu Oct 21 15:42:52 2004
++++ reportbug.new/debianbts.py Tue Jan 18 11:35:44 2005
@@ -40,7 +40,7 @@
'grave' : """makes the package in question unusable by most or all users,
or causes data loss, or introduces a security hole allowing access
@@ -332,9 +332,9 @@
http_proxy='', archived=False, followups=False):
number = int(number)
if SYSTEMS[system]['cgiroot']:
-diff -ruN -x *~ reportbug/querybts reportbug.new/querybts
+diff -ruN reportbug/querybts reportbug.new/querybts
--- reportbug/querybts Mon Mar 15 03:59:39 2004
-+++ reportbug.new/querybts Sat Oct 9 23:35:38 2004
++++ reportbug.new/querybts Tue Jan 18 11:35:44 2005
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.3
[EMAIL PROTECTED]@/bin/python2.3
@@ -359,9 +359,9 @@
archived = False
http_proxy = interface = ''
use_browser = source = False
-diff -ruN -x *~ reportbug/reportbug reportbug.new/reportbug
---- reportbug/reportbug Fri Oct 1 04:22:17 2004
-+++ reportbug.new/reportbug Mon Oct 11 22:03:14 2004
+diff -ruN reportbug/reportbug reportbug.new/reportbug
+--- reportbug/reportbug Fri Dec 17 23:01:23 2004
++++ reportbug.new/reportbug Tue Jan 18 11:46:59 2005
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.3 -S
[EMAIL PROTECTED]@/bin/python2.3 -S
@@ -392,16 +392,16 @@
else:
editor = default_editor
-@@ -320,7 +320,7 @@
+@@ -324,7 +324,7 @@
"categories:", others, "Enter a package: ", any_ok=True,
default='')
-def get_package_name(bts='debian', mode=MODE_EXPERT):
+def get_package_name(bts='fink', mode=MODE_EXPERT):
- others = debianbts.SYSTEMS[bts]['otherpkgs']
+ others = debianbts.SYSTEMS[bts].get('otherpkgs')
prompt = "Please enter the name of the package in which you have found "\
"a problem"
-@@ -353,14 +353,14 @@
+@@ -357,14 +357,14 @@
return get_package_name(bts, mode)
if mode < MODE_EXPERT:
@@ -418,7 +418,7 @@
if not ui.yes_no(
"Are you sure this bug doesn't apply to a specific package?",
'Yes, this bug is truly general.',
-@@ -485,16 +485,16 @@
+@@ -489,16 +489,16 @@
print >> fp, '# Disable fallback mode by commenting out the
following:'
print >> fp, 'no-cc'
print >> fp, 'header "X-Debbugs-CC: %s"' % email_addy
@@ -438,25 +438,16 @@
fp.close()
ui.long_message('Default preferences file written. To reconfigure, '
're-run reportbug with the "--configure" option.\n')
-@@ -752,7 +752,7 @@
+@@ -756,7 +756,7 @@
severity = options.severity
smtphost = options.smtphost
subject = options.subject
-- sysinfo = debianbts.SYSTEMS[options.bts or 'debian']
-+ sysinfo = debianbts.SYSTEMS[options.bts or 'fink']
+- bts = options.bts or 'debian'
++ bts = options.bts or 'fink'
+ sysinfo = debianbts.SYSTEMS[bts]
rtype = options.type or sysinfo['type']
attachments = options.attachments
- pgp_addr = options.keyid
-@@ -869,7 +869,7 @@
- foundfile = None
- package = None
- if not len(args) and not options.searchfor and not notatty:
-- package = get_package_name(options.bts or 'debian', mode)
-+ package = get_package_name(options.bts or 'fink', mode)
- elif len(args) > 1:
- ewrite("Please report one bug at a time.\n")
- ewrite("[Did you forget to put all switches before the "
-@@ -1060,7 +1060,7 @@
+@@ -1072,7 +1072,7 @@
origin, vendor, reportinfo, priority, desc, src_name,
fulldesc, state) = status
@@ -465,7 +456,7 @@
bugexec = submitas = submitto = presubj = reportwith = None
if os.path.isfile(buginfo) and os.access(buginfo, os.X_OK):
bugexec = buginfo
-@@ -1073,11 +1073,11 @@
+@@ -1085,11 +1085,11 @@
if os.path.isfile(buginfo+'/control'):
submitas, submitto, reportwith =
reportbug.parse_bug_control_file(buginfo+'/control')
@@ -482,7 +473,7 @@
if os.path.isfile(buginfo+'/script') and os.access(buginfo+'/script',
os.X_OK):
bugexec = buginfo+'/script'
-@@ -1100,10 +1100,10 @@
+@@ -1112,10 +1112,10 @@
# Remove current package from report-with list
reportwith = [x for x in reportwith if x != package]
@@ -495,17 +486,16 @@
commands.mkarg(package))
if rc:
if not ui.yes_no(
-@@ -1123,15 +1123,15 @@
+@@ -1136,7 +1136,7 @@
'package this report applies to '
'(blank OK)', force_prompt=True)
elif (check_available and not (options.kudos or notatty or
options.offline)
-- and (not options.bts or (options.bts=='debian'))):
-- ewrite('Checking for newer versions at packages.debian.org...\n')
-+ and (not options.bts or (options.bts=='fink'))):
-+ ewrite('Checking for newer versions at packages.finkproject.org...\n')
+- and bts=='debian'):
++ and bts=='fink'):
+ ewrite('Checking for newer versions at packages.debian.org...\n')
arch = reportbug.get_arch()
(avail, toonew) = checkversions.check_available(
- package, pkgversion, check_incoming=(mode > MODE_STANDARD),
+@@ -1144,7 +1144,7 @@
http_proxy=options.http_proxy, arch=arch)
if toonew:
if not ui.yes_no(
@@ -514,9 +504,18 @@
'Do you still want to file a report' % (package, pkgversion),
'Ignore this problem and continue. This may be '
'appropriate if you know this bug is present in older '
-@@ -1247,13 +1247,13 @@
+@@ -1163,7 +1163,7 @@
+
+ if not ui.yes_no(
+ ('\nYour version (%s) of %s appears to be out of date.\nThe '
+- 'following newer release(s) are available in the Debian '
++ 'following newer release(s) are available in the Fink '
+ 'archive:\n' % (pkgversion, package))+availtext+
+ 'Do you still want to file a report',
+ 'Ignore this problem and continue. This may be '
+@@ -1268,13 +1268,13 @@
lmaintainer = maintainer.decode('UTF-8', 'ignore').encode(charset,
- 'ignore')
+ 'replace')
ewrite("Maintainer for %s is '%s'.\n", package, lmaintainer)
- if 'qa.debian.org' in maintainer:
+ if 'fink-devel' in maintainer:
@@ -532,7 +531,7 @@
if options.kudos:
if maintainer:
-@@ -1298,7 +1298,7 @@
+@@ -1319,7 +1319,7 @@
confinfo[f] = 'changed [not included]'
break
elif x == 'd':
@@ -541,7 +540,7 @@
system(PAGER+' '+' '.join(changed))
else:
break
-@@ -1310,14 +1310,14 @@
+@@ -1331,14 +1331,14 @@
for f in files:
conftext = conftext + '%s %s\n' % (f, confinfo[f])
@@ -558,7 +557,7 @@
if status:
conftext += '\n-- debconf-show failed\n'
elif output:
-@@ -1442,7 +1442,7 @@
+@@ -1463,7 +1463,7 @@
if pkgversion and not src_name:
src_name = package
if src_name and check_available and not notatty:
@@ -567,7 +566,7 @@
src_name)
built = checkbuildd.check_built(src_name,
http_proxy=options.http_proxy)
-@@ -1463,7 +1463,7 @@
+@@ -1484,7 +1484,7 @@
if ui.yes_no(
'Has this package successfully been built for this '
'architecture in the past (you can look this up at '
@@ -576,7 +575,7 @@
'Yes, this is a recently-introduced problem.',
'No, it has always been this way.'):
severity = 'serious'
-@@ -1503,7 +1503,7 @@
+@@ -1524,7 +1524,7 @@
if os.path.exists('handle_bugscript'):
handler = './handle_bugscript'
else:
@@ -585,7 +584,7 @@
fh, filename = TempFile(prefix=tfprefix)
fh.close()
-@@ -1629,7 +1629,7 @@
+@@ -1650,7 +1650,7 @@
return
if __name__ == '__main__':
@@ -594,9 +593,9 @@
try:
main()
except KeyboardInterrupt:
-diff -ruN -x *~ reportbug/reportbug.conf reportbug.new/reportbug.conf
---- reportbug/reportbug.conf Fri Oct 1 03:32:12 2004
-+++ reportbug.new/reportbug.conf Sat Oct 9 23:40:50 2004
+diff -ruN reportbug/reportbug.conf reportbug.new/reportbug.conf
+--- reportbug/reportbug.conf Tue Dec 7 06:29:35 2004
++++ reportbug.new/reportbug.conf Tue Jan 18 11:35:44 2005
@@ -6,7 +6,7 @@
# severity normal
@@ -615,9 +614,9 @@
# should be OK with the default.
# mta /usr/sbin/sendmail
-diff -ruN -x *~ reportbug/reportbug.el reportbug.new/reportbug.el
+diff -ruN reportbug/reportbug.el reportbug.new/reportbug.el
--- reportbug/reportbug.el Wed Feb 4 23:29:11 2004
-+++ reportbug.new/reportbug.el Sat Oct 9 23:41:23 2004
++++ reportbug.new/reportbug.el Tue Jan 18 11:35:44 2005
@@ -15,7 +15,7 @@
(require 'gnus)
(find-file (getenv "REPORTBUG"))
@@ -627,9 +626,9 @@
(gnus-narrow-to-body)
(let ((body (or (buffer-string) "")))
(gnus-summary-mail-other-window)
-diff -ruN -x *~ reportbug/reportbug.py reportbug.new/reportbug.py
---- reportbug/reportbug.py Thu Sep 30 01:26:14 2004
-+++ reportbug.new/reportbug.py Sat Oct 9 23:49:57 2004
+diff -ruN reportbug/reportbug.py reportbug.new/reportbug.py
+--- reportbug/reportbug.py Wed Oct 20 08:34:05 2004
++++ reportbug.new/reportbug.py Tue Jan 18 11:35:44 2005
@@ -33,7 +33,7 @@
from string import ascii_letters, digits
@@ -685,7 +684,7 @@
if os.path.exists(filename):
try:
fp = file(filename)
-@@ -692,7 +691,7 @@
+@@ -693,7 +692,7 @@
return token
USERFILE = os.path.expanduser('~/.reportbugrc')
@@ -694,7 +693,7 @@
CONFIG_ARGS = (
'sendto', 'severity', 'mua', 'mta', 'email', 'realname', 'bts', 'verify',
-@@ -706,7 +705,7 @@
+@@ -707,7 +706,7 @@
'mutt' : 'mutt -H',
'af' : 'af -EH < ',
'mh' : '/usr/bin/mh/comp -use -file',
@@ -703,9 +702,9 @@
}
MUA['nmh'] = MUA['mh']
-diff -ruN -x *~ reportbug/reportbug_submit.py reportbug.new/reportbug_submit.py
---- reportbug/reportbug_submit.py Sun Sep 19 04:27:16 2004
-+++ reportbug.new/reportbug_submit.py Mon Oct 11 21:57:25 2004
+diff -ruN reportbug/reportbug_submit.py reportbug.new/reportbug_submit.py
+--- reportbug/reportbug_submit.py Tue Dec 7 06:32:35 2004
++++ reportbug.new/reportbug_submit.py Tue Jan 18 11:35:44 2005
@@ -30,7 +30,7 @@
from reportbug import VERSION, VERSION_NUMBER
@@ -715,7 +714,7 @@
import re
import commands
-@@ -421,7 +421,7 @@
+@@ -431,7 +431,7 @@
'o'
if __name__ == '__main__':
@@ -724,9 +723,9 @@
try:
main()
except KeyboardInterrupt:
-diff -ruN -x *~ reportbug/reportbug_ui_gnome.py
reportbug.new/reportbug_ui_gnome.py
+diff -ruN reportbug/reportbug_ui_gnome.py reportbug.new/reportbug_ui_gnome.py
--- reportbug/reportbug_ui_gnome.py Wed Feb 4 23:29:10 2004
-+++ reportbug.new/reportbug_ui_gnome.py Mon Oct 11 21:58:50 2004
++++ reportbug.new/reportbug_ui_gnome.py Tue Jan 18 11:35:44 2005
@@ -19,7 +19,7 @@
## SOFTWARE.
@@ -754,9 +753,9 @@
self.my_screen.connect("next", callback_next)
self.my_screen.set_bg_color(logo_bgcolor)
self.my_screen.set_logo_bg_color(logo_bgcolor)
-diff -ruN -x *~ reportbug/script reportbug.new/script
---- reportbug/script Wed Feb 4 23:29:11 2004
-+++ reportbug.new/script Mon Oct 11 22:03:38 2004
+diff -ruN reportbug/script reportbug.new/script
+--- reportbug/script Fri Dec 10 19:40:25 2004
++++ reportbug.new/script Tue Jan 18 11:35:44 2005
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.3
[EMAIL PROTECTED]@/bin/python2.3
-------------------------------------------------------
This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting
Tool for open source databases. Create drag-&-drop reports. Save time
by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc.
Download a FREE copy at http://www.intelliview.com/go/osdn_nl
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
