Update of /cvsroot/fink/experimental/beren12/finkinfo/devel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19650

Modified Files:
        reportbug.info 
Added Files:
        reportbug.info~ reportbug.patch 
Log Message:
testing...

Index: reportbug.info
===================================================================
RCS file: /cvsroot/fink/experimental/beren12/finkinfo/devel/reportbug.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- reportbug.info      10 Oct 2004 17:37:39 -0000      1.1
+++ reportbug.info      12 Oct 2004 15:06:33 -0000      1.2
@@ -6,66 +6,111 @@
 PatchScript: sed -e s,@FINKPREFIX@,%p, %a/%n.patch | patch -p1
 Depends: python2.3
 CompileScript: <<
-  echo foo
+  echo :-P~
 <<
 
 InstallScript: <<
 #!/bin/sh
 
+# Cleanup
+rm -rf `find . -name '*~' -o -name '.#*' -o -name '*.orig' -o -name '*.rej' -o -name 
'*.py[co]'` test sed-script
+
+# get current version info
+echo "s/##VERSION##/`head -n 1 debian/changelog | sed -e 
's/[^(]*(\([^)]*\).*/\1/'`/g" > sed-script
+cat sed-script
+
+# Install package into %i
+debian/install-sed %i/bin reportbug querybts
+debian/install-sed %i/share/reportbug *.py
+
+# Remove unneeded .py files
+rm `pwd`/debian/reportbug/usr/share/reportbug/urllib2.py
+rm `pwd`/debian/reportbug/usr/share/reportbug/test_hiermatch.py
+
+chmod 0755 %i/bin/*
+cp handle_bugscript reportbug.el %i/share/reportbug
+cp -p reportbug.conf %i/etc
+cp -p presubj script %i/share/bug/reportbug/
+
+# Install man pages
+mkdir -p %i/share/man/man1
+cp querybts.1 reportbug.1 %i/share/man/man1
+ 
 <<
 
-ConfFiles: 
+ConfFiles: %p/etc/reportbug.conf
 
-DocFiles: COPYING UPGRADE README debian/README.mail debian/README.Debian debian/TODO 
debian/changelog debian/copyright
+DocFiles: TODO debian/NEWS debian/changelog debian/copyright README.developers
 PostInstScript: <<
 #!/bin/sh -e
 
-if [ "$1" = "configure" ]; then
-  %p/sbin/debbugsconfig
-  if dpkg --compare-versions "$2" lt 2.4; then
-    spool=`perl -e 'require "%p/etc/debbugs/config"; print $gSpoolDir;'`
-    if [ -d "$spool/db" ]; then
-      if [ -d "$spool/db-h" ]; then
-        echo "Cannot migrate bug database to hashed format, because" >&2
-        echo "$spool/db-h already exists." >&2
-        echo "Rectify the situation and run the following command by hand:" >&2
-        echo "  %p/sbin/debbugs-dbhash \"$spool/db\" \"$spool/db-h\"" >&2
-      else
-        echo "Migrating bug database to hashed format." >&2
-        %p/sbin/debbugs-dbhash "$spool/db" "$spool/db-h"
-        echo "You can remove bug logs from $spool/db" >&2
-        echo "after ensuring that the new database works." >&2
-      fi
-    fi
-  fi
-fi
+# postinst script for Debian python packages.
+# Written 1998 by Gregor Hoffleit <[EMAIL PROTECTED]>.
+#
+
+#DEBHELPER#
+
+PACKAGE=reportbug
+DIRLIST="%p/share/reportbug"
+
+PYTHON=python2.3
+
+case "$1" in
+    configure|abort-upgrade|abort-remove|abort-deconfigure)
+        for i in $DIRLIST ; do
+            /usr/bin/$PYTHON -O /usr/lib/$PYTHON/compileall.py -q $i
+            /usr/bin/$PYTHON /usr/lib/$PYTHON/compileall.py -q $i
+        done
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+exit 0
 
-if [ -f %p/etc/debbugs/nextnumber ]; then
-  rm -f %p/etc/debbugs/nextnumber
-fi
 <<
 
-PostRmScript: <<
-#!/bin/sh
+PreRmScript: <<
+#!/bin/sh -e
+#
+# sample prerm script for Debian python packages.
+# Written 1998 by Gregor Hoffleit <[EMAIL PROTECTED]>.
+#
 
-if [ "$1" = "purge" ]; then
-  rm -rf %p/etc/debbugs %p/var/lib/debbugs
-fi
+#DEBHELPER#
+
+PACKAGE=reportbug
+
+dpkg --listfiles $PACKAGE |
+        awk '$0~/\.py$/ {print $0"c\n" $0"o"}' |
+        xargs rm -f >&2
 <<
 
-Description: The bug tracking system based on the active Debian BTS
+Description: Reports bugs in the Fink distribution
 DescDetail: <<
-Debian has a bug tracking system which files details of bugs reported by
-users and developers. Each bug is given a number, and is kept on file until
-it is marked as having been dealt with. The system is mainly controlled by
-e-mail, but the bug reports can be viewed using the WWW.
+A tool designed to make the reporting of bugs in Debian
+and derived distributions relatively painless.  Its features include:
 
-This version is fully functional, but it does not automatically configure.
-See /sw/share/doc/debbugs/README.Debian after installation.
+ * Integration with the mutt, af, and mh/nmh mail readers.
+ * Access to outstanding bug reports to make it easier to identify
+   whether problems have already been reported.
+ * Automatic checking for newer versions of packages.
+ * Optional automatic verification of integrity of packages via debsums.
+ * Support for following-up on outstanding reports.
+ * Optional PGP/GnuPG integration.
 
-Note: there might be various issues with this package, caveat emptor.
+reportbug is designed to be used on systems with an installed mail
+transport agent, like exim or sendmail; however, you can edit the
+configuration file and send reports using any available mail server.
+
+If your system's users use locales with character sets other than
+UTF-8 and ISO-8859-*, python2.3-cjkcodecs is required for proper
+operation.
 <<
 License: GPL
 Maintainer: Chris Zubrzycki <[EMAIL PROTECTED]>
-Homepage: http://
-Source-MD5: dab04deabb0aab2d2d1eb58759b829b8
+Homepage: http://packages.qa.debian.org/r/reportbug.html
+Source-MD5: c0a2bccadcd3676666b70a217669f39b

--- NEW FILE: reportbug.info~ ---
Package: reportbug
Version: 2.99.5
Revision: 1
Source: mirror:debian:/pool/main/r/%n/%n_%v.tar.gz
SourceDirectory: %n
PatchScript: sed -e s,@FINKPREFIX@,%p, %a/%n.patch | patch -p1
Depends: python2.3
CompileScript: <<
  echo foo
<<

InstallScript: <<
#!/bin/sh

<<

ConfFiles: 

DocFiles: TODO debian/NEWS debian/changelog debian/copyright
PostInstScript: <<
#!/bin/sh -e

# postinst script for Debian python packages.
# Written 1998 by Gregor Hoffleit <[EMAIL PROTECTED]>.
#

#DEBHELPER#

PACKAGE=reportbug
DIRLIST="%p/share/reportbug"

PYTHON=python2.3

case "$1" in
    configure|abort-upgrade|abort-remove|abort-deconfigure)
        for i in $DIRLIST ; do
            /usr/bin/$PYTHON -O /usr/lib/$PYTHON/compileall.py -q $i
            /usr/bin/$PYTHON /usr/lib/$PYTHON/compileall.py -q $i
        done
    ;;

    *)
        echo "postinst called with unknown argument \`$1'" >&2
        exit 1
    ;;
esac

exit 0

<<

PreRmScript: <<
#!/bin/sh -e
#
# sample prerm script for Debian python packages.
# Written 1998 by Gregor Hoffleit <[EMAIL PROTECTED]>.
#

#DEBHELPER#

PACKAGE=reportbug

dpkg --listfiles $PACKAGE |
        awk '$0~/\.py$/ {print $0"c\n" $0"o"}' |
        xargs rm -f >&2
<<

Description: Reports bugs in the Fink distribution
DescDetail: <<
A tool designed to make the reporting of bugs in Debian
and derived distributions relatively painless.  Its features include:

 * Integration with the mutt, af, and mh/nmh mail readers.
 * Access to outstanding bug reports to make it easier to identify
   whether problems have already been reported.
 * Automatic checking for newer versions of packages.
 * Optional automatic verification of integrity of packages via debsums.
 * Support for following-up on outstanding reports.
 * Optional PGP/GnuPG integration.

reportbug is designed to be used on systems with an installed mail
transport agent, like exim or sendmail; however, you can edit the
configuration file and send reports using any available mail server.

If your system's users use locales with character sets other than
UTF-8 and ISO-8859-*, python2.3-cjkcodecs is required for proper
operation.
<<
License: GPL
Maintainer: Chris Zubrzycki <[EMAIL PROTECTED]>
Homepage: http://packages.qa.debian.org/r/reportbug.html
Source-MD5: dab04deabb0aab2d2d1eb58759b829b8

--- NEW FILE: reportbug.patch ---
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
@@ -10,7 +10,7 @@
 Template Information & Interaction with the user
 ================================================
 
- If /usr/share/bug/$package is executable, then bug executes it and
+ If @FINKPREFIX@/share/bug/$package is executable, then bug executes it and
 takes what comes out from the file descriptor 3 and puts it in the bug
 template.
  The maintainer can then ask questions to the user or run whatever
@@ -22,8 +22,8 @@
        ...
        system-information-tool >&3
        
- If /usr/share/bug/$package is a directory, then
-/usr/share/bug/$package/script is executed.
+ If @FINKPREFIX@/share/bug/$package is a directory, then
[EMAIL PROTECTED]@/share/bug/$package/script is executed.
 
  While the script is executed, the following shell functions are
 available:
@@ -34,7 +34,7 @@
                                          in REPLY. The second argument is
                                          the default.
 
- If the file /usr/share/bug/$package/presubj exists, its content is
+ If the file @FINKPREFIX@/share/bug/$package/presubj exists, its content is
 shown to the user before asking him for the bug's subject.
 
  Note: It's your responsibility to check if the information included
@@ -48,7 +48,7 @@
 used to redirect bugs in packages coming from a single source to where the
 maintainer likes to have them.
 
- This is done by having this line in /usr/share/bug/$package/control:
+ This is done by having this line in @FINKPREFIX@/share/bug/$package/control:
 
        Submit-As: $new-package
 
@@ -57,9 +57,9 @@
 BTS selection
 =============
 
- Packages not distributed by Debian can take advantage of this utility too.
+ Packages not distributed by Fink can take advantage of this utility too.
 They just need to add a "send-to" header to the control file
-/usr/share/bug/$package/control.
[EMAIL PROTECTED]@/share/bug/$package/control.
 
        Send-To: bugs.myproject.com
 
@@ -76,7 +76,7 @@
 ================
 
  Often programs are distributed across several different packages, for
-example an upstream package 'foo' may be packaged in Debian as foo, libfoo,
+example an upstream package 'foo' may be packaged in Fink as foo, libfoo,
 foo-common and foo-data.  In such cases it can be useful to include related
 package information in bugreports, to minimise the need for 'moreinfo' requests
 to the submitter :) This is done by adding a "report-with" header to the
@@ -90,7 +90,7 @@
 Addendum: Languages other than SH
 =================================
 
-The script in /usr/share/bug/reportbug/script is an example of a bug
+The script in @FINKPREFIX@/share/bug/reportbug/script is an example of a bug
 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 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
@@ -26,7 +26,7 @@
 from urlutils import open_url
 from reportbug_exceptions import *
 
-BUILDD_URL = 'http://buildd.debian.org/build.php?arch=%s&pkg=%s'
+BUILDD_URL = 'http://buildd.finkproject.org/build.php?arch=%s&pkg=%s'
 
 # This is easy; just look for succeeded in an em block...
 
@@ -70,7 +70,8 @@
         arch = archname()
 
     try:
-        page = open_url(BUILDD_URL % (arch, src_package), http_proxy)
+#        page = open_url(BUILDD_URL % (arch, src_package), http_proxy)
+        return {}
     except NoNetwork:
         return {}
     if not page:
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
@@ -125,7 +125,7 @@
 
 def get_versions_available(package, dists=None, http_proxy=None, arch='i386'):
     if not dists:
-        dists = ('stable', 'testing', 'unstable')
+        dists = ('stable', 'unstable')
 
     try:
         page = open_url(PACKAGES_URL % package, http_proxy)
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
@@ -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 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
@@ -4,5 +4,5 @@
 shift
 
 for filename in $@; do
-    sed -f sed-script < $filename > `pwd`/debian/reportbug/$dir/$filename
+    sed -f sed-script < $filename > $dir/$filename
 done
diff -ruN reportbug/debian/install-sed~ reportbug.new/debian/install-sed~
--- reportbug/debian/install-sed~       Wed Dec 31 19:00:00 1969
+++ reportbug.new/debian/install-sed~   Mon Jul 12 14:30:56 2004
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+dir=$1
+shift
+
+for filename in $@; do
+    sed -f sed-script < $filename > `pwd`/debian/reportbug/$dir/$filename
+done
diff -ruN reportbug/debianbts.py reportbug.new/debianbts.py
--- reportbug/debianbts.py      Fri Oct  1 04:12:02 2004
+++ reportbug.new/debianbts.py  Sat Oct  9 23:33:22 2004
@@ -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 
     to the accounts of users who use the package.""",
-    'serious' : """is a severe violation of Debian policy (that is,
+    'serious' : """is a severe violation of Fink policy (that is,
     the problem is a violation of a 'must' or 'required' directive);
     may or may not affect the usability of the package.  Note that non-severe
     policy violations may be 'normal,' 'minor,' or 'wishlist' bugs.
@@ -131,39 +131,25 @@
     else:
         return severity
 
-# These packages are virtual in Debian; we don't look them up...
+# These packages are virtual in Fink; we don't look them up...
 debother = {
     'base' : 'General bugs in the base system',
-# Actually a real package, but most people don't have boot-floppies installed for 
good reason
-    'boot-floppy' : '(Obsolete, please use boot-floppies instead.)',
-    'boot-floppies' : 'Bugs in the woody installation subsystem',
-    'bugs.debian.org' : 'The bug tracking system, @bugs.debian.org',
-    'cdimage.debian.org' : 'CD Image issues',
-    'cdrom' : 'Problems with installation from CD-ROMs',
-# dpkg-iwj -- The dpkg branch maintained by Ian Jackson
-    'debian-policy' : 'Proposed changes in the Debian policy documentation',
-    'ftp.debian.org' : 'Problems with the FTP site',
+    'bugs.finkproject.org' : 'The bug tracking system, @bugs.finkproject.org',
+    'fink-policy' : 'Proposed changes in the Fink policy documentation',
+    'ftp.finkproject.org' : 'Problems with the FTP site',
     'general' : 'General problems (e.g., that many manpages are mode 755)',
-    'install' : 'Problems with the sarge installer.',
+    'install' : 'Problems with the fink installer.',
     'installation' : 'General installation problems not covered otherwise.',
-    'kernel' : '(Obsolete, please use "kernel-image" instead.)',
-    'kernel-image' : 'Problems with the Linux kernel, or the kernel shipped with 
Debian',
     'listarchives' :  'Problems with the WWW mailing list archives',
-    'lists.debian.org' : 'The mailing lists, [EMAIL PROTECTED]',
-    'mirrors' : 'Problems with Debian archive mirrors.',
-    'nonus.debian.org' : 'Problems with the non-US FTP site',
+    'lists.finkproject.org' : 'The mailing lists, [EMAIL PROTECTED]',
+    'mirrors' : 'Problems with Fink archive mirrors.',
     'press' : 'Press release issues',
     'project' : 'Problems related to Project administration',
-    'qa.debian.org' : 'Problems related to the quality assurance group',
-#slink-cd -- Slink CD 
-#spam -- Spam (reassign spam to here so we can complain about it)
-    'security.debian.org' : 'Problems with the security updates server',
-    'wnpp' : 'Work-Needing and Prospective Packages list',
-    'www.debian.org' : 'Problems with the WWW site (including other *.debian.org 
sites)'
+    'fink.sourceforge.net' : 'Problems with the WWW site (including other 
*.finkproject.org sites)'
     }
 
 progenyother = {
-    'debian-general' : 'Any non-package-specific bug',
+    'fink-general' : 'Any non-package-specific bug',
     }
 
 def handle_wnpp(package, bts, ui, online=True, http_proxy=None):
@@ -184,7 +170,7 @@
         'ITP' :
         "This is an `Intent To Package'. Please submit a package description along 
with copyright and URL in such a report.",
         'RFP' :
-        "This is a `Request For Package'. You have found an interesting piece of 
software and would like someone else to maintain it for Debian. Please submit a 
package description along with copyright and URL in such a report.",
+        "This is a `Request For Package'. You have found an interesting piece of 
software and would like someone else to maintain it for Fink. Please submit a package 
description along with copyright and URL in such a report.",
         }, 'Choose the request type: ', empty_ok=True)
     if not tag:
         ui.long_message('To report a bug in a package, use the name of the package, 
not wnpp.\n')
@@ -223,9 +209,9 @@
             return
 
         if tag == 'ITP':
-            headers.append('X-Debbugs-CC: [EMAIL PROTECTED]')
-            ui.ewrite('Your report will be carbon-copied to debian-devel, '
-                      'per Debian policy.\n')
+            headers.append('X-Debbugs-CC: [EMAIL PROTECTED]')
+            ui.ewrite('Your report will be carbon-copied to fink-devel, '
+                      'per Fink policy.\n')
 
         body = """* Package name    : %s
   Version         : x.y.z
@@ -262,9 +248,9 @@
             severity = 'important'
 
         if tag == 'RFH':
-            headers.append('X-Debbugs-CC: [EMAIL PROTECTED]')
-            ui.ewrite('Your request will be carbon-copied to debian-devel, '
-                      'per Debian policy.\n')
+            headers.append('X-Debbugs-CC: [EMAIL PROTECTED]')
+            ui.ewrite('Your request will be carbon-copied to fink-devel, '
+                      'per Fink policy.\n')
 
         if fulldesc:
             orphstr = 'intend to orphan'
@@ -287,17 +273,14 @@
 # Supported servers
 # Theoretically support for GNATS and Jitterbug could be added here.
 
-SYSTEMS = { 'debian' :
-            { 'name' : 'Debian', 'email': '[EMAIL PROTECTED]',
-              'btsroot' : 'http://www.debian.org/Bugs/',
+SYSTEMS = { 'fink' :
+            { 'name' : 'Fink', 'email': '[EMAIL PROTECTED]',
+              'btsroot' : 'http://bugs.finkproject.org'
               'query-dpkg' : 1, 'type' : 'debbugs',
-              'otherpkgs' : debother, 'nonvirtual' : ['kernel-image'],
-              'specials' : { 'wnpp': handle_wnpp },
+              #'otherpkgs' : debother, 
+              #'specials' : { 'wnpp': handle_wnpp },
               # Dependency packages
-              'deppkgs' : ('gcc', 'g++', 'cpp', 'gcj', 'gpc', 'gobjc',
-                           'chill', 'gij', 'g77', 'python', 'python-base',
-                           'x-window-system-core', 'x-window-system'),
-              'cgiroot' : 'http://bugs.debian.org/cgi-bin/',
+              'cgiroot' : 'http://bugs.finkproject.org/cgi-bin/',
               'mirrors' : {} },
             'kde' :
             { 'name' : 'KDE Project', 'email': '[EMAIL PROTECTED]',
@@ -350,7 +333,7 @@
 CLASSLIST = ['sw-bug', 'doc-bug', 'change-request']
 
 CRITICAL_TAGS = {
-    'security' : 'This problem is a security vulnerability in Debian.',
+    'security' : 'This problem is a security vulnerability in Fink.',
 }
 
 TAGS = {
@@ -361,12 +344,12 @@
 ##    'sarge' : 'This bug only applies to the sarge release (Debian 3.1).',
 ##    'sid' : 'This bug only applies to the unstable branch of Debian.',
     'experimental' : 'This bug only applies to a package in the experimental '
-    'branch of Debian.',
+    'branch of Fink.',
     "l10n" : "This bug reports a localization/internationalization issue.",
 ##    'done' : 'No more tags.',
     }
 
-EXTRA_TAGS = ['potato', 'woody', 'sarge', 'security', 'sid', 'upstream']
+EXTRA_TAGS = ['stable', 'unstable', 'upstream']
 
 TAGLIST = ['l10n', 'patch', 'experimental']
 CRITICAL_TAGLIST = ['security']
@@ -432,7 +415,7 @@
     return type, loc
 
 # Dynamically add any additional systems found
-for origin in glob.glob('/etc/dpkg/origins/*'):
+for origin in glob.glob('@FINKPREFIX@/etc/dpkg/origins/*'):
     try:
         fp = file(origin)
         system = os.path.basename(origin)
@@ -613,7 +596,7 @@
 
     return (title, output)
 
-def get_cgi_reports(package, system='debian', http_proxy='', archived=False,
+def get_cgi_reports(package, system='fink', http_proxy='', archived=False,
                     source=False):
     page = open_url(cgi_package_url(system, package, archived, source),
                     http_proxy)
@@ -630,7 +613,7 @@
 
     return parser.bugcount, parser.title, parser.hierarchy
 
-def get_cgi_report(number, system='debian', http_proxy='', archived=False,
+def get_cgi_report(number, system='fink', http_proxy='', archived=False,
                    followups=False):
     number = int(number)
 
@@ -645,7 +628,7 @@
                 return alternates[mirror]
     return SYSTEMS[system]['btsroot']
 
-def get_reports(package, system='debian', mirrors=None,
+def get_reports(package, system='fink', mirrors=None,
                 http_proxy='', archived=False, source=False):
     if isinstance(package, StringTypes):
         if SYSTEMS[system]['cgiroot']:
@@ -685,7 +668,7 @@
 
     return bugcount, title, hierarchy
 
-def get_report(number, system='debian', mirrors=None,
+def get_report(number, system='fink', mirrors=None,
                http_proxy='', archived=False, followups=False):
     number = int(number)
     if SYSTEMS[system]['cgiroot']:
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
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.3
[EMAIL PROTECTED]@/bin/python2.3
 # -*- python -*-
 # querybts - Examine the state of a debbugs server
 #   Written by Chris Lawrence <[EMAIL PROTECTED]>
@@ -25,7 +25,7 @@
 # $Id: querybts,v 1.2 2004/03/15 08:59:39 lawrencc Exp $
 
 import sys, os
-sys.path = [os.curdir, '/usr/share/reportbug'] + sys.path
+sys.path = [os.curdir, '@FINKPREFIX@/share/reportbug'] + sys.path
 
 import reportbug, debianbts, commands, getopt, re, mailcap, urlutils
 
@@ -53,7 +53,7 @@
          )
 
 def main():
-    system = 'debian'
+    system = 'fink'
     archived = False
     http_proxy = interface = ''
     use_browser = source = False
diff -ruN reportbug/reportbug reportbug.new/reportbug
--- reportbug/reportbug Fri Oct  1 04:22:17 2004
+++ reportbug.new/reportbug     Mon Oct 11 22:03:14 2004
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.3 -S
[EMAIL PROTECTED]@/bin/python2.3 -S
 # -*- python -*-
 # reportbug - Report a bug in the Debian distribution.
 #   Written by Chris Lawrence <[EMAIL PROTECTED]>
@@ -26,11 +26,11 @@
 
 import site
 
-DEBUGGER = '[EMAIL PROTECTED]'
-DEFAULT_BTS = 'debian'
+DEBUGGER = '[EMAIL PROTECTED]'
+DEFAULT_BTS = 'fink'
 
 import sys, os
-sys.path = [os.curdir, '/usr/share/reportbug'] + sys.path
+sys.path = [os.curdir, '@FINKPREFIX@/share/reportbug'] + sys.path
 
 import optparse, re, os, pwd, time, locale, commands, checkversions
 import rfc822, smtplib, reportbug, cStringIO, socket, debianbts, checkbuildd
@@ -94,7 +94,7 @@
 def spawn_editor(message, filename, default_editor=None):
     if not default_editor:
         editor = (os.environ.get('VISUAL') or os.environ.get('EDITOR') or
-                  '/usr/bin/sensible-editor')
+                  '@FINKPREFIX@/bin/sensible-editor')
     else:
         editor = default_editor
 
@@ -320,7 +320,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']
     prompt = "Please enter the name of the package in which you have found "\
              "a problem"
@@ -353,14 +353,14 @@
                 return get_package_name(bts, mode)
 
     if mode < MODE_EXPERT:
-        if package in ('bugs.debian.org', 'debbugs'):
+        if package in ('bugs.finkproject.org', 'debbugs'):
             if ui.yes_no('Are you reporting a problem with this program '
                          '(reportbug)', 'Yes, this is actually a bug in '
                          'reportbug.', 'No, this is really a problem in the '
                          'bug tracking system itself.'):
                 package = 'reportbug'
 
-        if package in ('general', 'project', 'debian-general', 'base'):
+        if package in ('general', 'project', 'fink-general', 'base'):
             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 @@
         print >> fp, '# Disable fallback mode by commenting out the following:'
         print >> fp, 'no-cc'
         print >> fp, 'header "X-Debbugs-CC: %s"' % email_addy
-        print >> fp, 'smtphost master.debian.org'
+        print >> fp, 'smtphost bugs.finkproject.org'
     else:
         print >> fp, '# If nothing else works, remove the # at the beginning'
         print >> fp, '# of the following three lines:'
         print >> fp, '#no-cc'
         print >> fp, '#header "X-Debbugs-CC: %s"' % email_addy
-        print >> fp, '#smtphost master.debian.org'
+        print >> fp, '#smtphost bugs.finkproject.org'
         
     print >> fp, '# You can add other settings after this line.  See'
-    print >> fp, '# /etc/reportbug.conf for a full listing of options.'
+    print >> fp, '# @FINKPREFIX@/etc/reportbug.conf for a full listing of options.'
     fp.close()
     ui.long_message('Default preferences file written.  To reconfigure, '
                     're-run reportbug with the "--configure" option.\n')
@@ -752,7 +752,7 @@
     severity = options.severity
     smtphost = options.smtphost
     subject = options.subject
-    sysinfo = debianbts.SYSTEMS[options.bts or 'debian']
+    sysinfo = debianbts.SYSTEMS[options.bts or 'fink']
     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 @@
          origin, vendor, reportinfo, priority, desc, src_name,
          fulldesc, state) = status
 
-    buginfo = '/usr/share/bug/' + package
+    buginfo = '@FINKPREFIX@/share/bug/' + package
     bugexec = submitas = submitto = presubj = reportwith = None
     if os.path.isfile(buginfo) and os.access(buginfo, os.X_OK):
         bugexec = buginfo
@@ -1073,11 +1073,11 @@
 
         if os.path.isfile(buginfo+'/control'):
             submitas, submitto, reportwith = 
reportbug.parse_bug_control_file(buginfo+'/control')
-    elif os.path.isfile('/usr/share/bug/default/'+package) \
-         and os.access('/usr/share/bug/default/'+package, os.X_OK):
-        bugexec = '/usr/share/bug/default/'+package
-    elif os.path.isdir('/usr/share/bug/default/'+package):
-        buginfo = '/usr/share/bug/default/'+package
+    elif os.path.isfile('@FINKPREFIX@/share/bug/default/'+package) \
+         and os.access('@FINKPREFIX@/share/bug/default/'+package, os.X_OK):
+        bugexec = '@FINKPREFIX@/share/bug/default/'+package
+    elif os.path.isdir('@FINKPREFIX@/share/bug/default/'+package):
+        buginfo = '@FINKPREFIX@/share/bug/default/'+package
         if os.path.isfile(buginfo+'/script') and os.access(buginfo+'/script',
                                                            os.X_OK):
             bugexec = buginfo+'/script'
@@ -1100,10 +1100,10 @@
         # Remove current package from report-with list
         reportwith = [x for x in reportwith if x != package]
 
-    if (pkgavail and options.verify and os.path.exists('/usr/bin/debsums')
+    if (pkgavail and options.verify and os.path.exists('@FINKPREFIX@/bin/debsums')
         and not (notatty or options.kudos) and state == 'installed'):
         ewrite('Verifying package integrity...\n')
-        rc, output = commands.getstatusoutput('/usr/bin/debsums -s'+
+        rc, output = commands.getstatusoutput('@FINKPREFIX@/bin/debsums -s'+
                                               commands.mkarg(package))
         if rc:
             if not ui.yes_no(
@@ -1123,15 +1123,15 @@
                                        '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')
         arch = reportbug.get_arch()
         (avail, toonew) = checkversions.check_available(
             package, pkgversion, check_incoming=(mode > MODE_STANDARD),
             http_proxy=options.http_proxy, arch=arch)
         if toonew:
             if not ui.yes_no(
-                '\nYour version of %s (%s) is newer than that in Debian!\n'
+                '\nYour version of %s (%s) is newer than that in Fink!\n'
                 '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 @@
         lmaintainer = maintainer.decode('UTF-8', 'ignore').encode(charset,
                                                                   'ignore')
         ewrite("Maintainer for %s is '%s'.\n", package, lmaintainer)
-        if 'qa.debian.org' in maintainer:
+        if 'fink-devel' in maintainer:
             ui.long_message('''\
-This package is currently "orphaned"; if you care a current or prospective
-Debian developer, you might consider adopting it.  Please be aware that your
+This package is currently "orphaned"; if you are a current or prospective
+Fink developer, you might consider adopting it.  Please be aware that your
 report may not be resolved for a while, and that packages that have been
 orphaned for a long period of time are often removed from the archive.\n''')
-            ui.ewrite('\nFor more details, please see: 
http://www.debian.org/devel/wnpp/\n')
+            ui.ewrite('\nFor more details, please see: 
http://fink.sourceforge.net/\n')
 
     if options.kudos:
         if maintainer:
@@ -1298,7 +1298,7 @@
                     confinfo[f] = 'changed [not included]'
                 break
             elif x == 'd':
-                PAGER = os.environ.get('PAGER', '/usr/bin/sensible-pager')
+                PAGER = os.environ.get('PAGER', '@FINKPREFIX@/bin/sensible-pager')
                 system(PAGER+' '+' '.join(changed))
             else:
                 break
@@ -1310,14 +1310,14 @@
         for f in files:
             conftext = conftext + '%s %s\n' % (f, confinfo[f])
 
-    if (options.debconf and os.path.exists('/usr/bin/debconf-show') and
+    if (options.debconf and os.path.exists('@FINKPREFIX@/bin/debconf-show') and
         not options.kudos and installed):
         showpkgs = package
         if reportwith:
             showpkgs += ' ' + ' '.join(reportwith)
         (status, output) = commands.getstatusoutput(
             'DEBCONF_SYSTEMRC=1 DEBCONF_NOWARNINGS=yes '
-            '/usr/bin/debconf-show %s' % showpkgs )
+            '@FINKPREFIX@/bin/debconf-show %s' % showpkgs )
         if status:
             conftext += '\n-- debconf-show failed\n'
         elif output:
@@ -1442,7 +1442,7 @@
         if pkgversion and not src_name:
             src_name = package
         if src_name and check_available and not notatty:
-            ewrite('Checking buildd.debian.org for past builds of %s...\n',
+            ewrite('Checking buildd.finkproject.org for past builds of %s...\n',
                    src_name)
             built = checkbuildd.check_built(src_name,
                                             http_proxy=options.http_proxy)
@@ -1463,7 +1463,7 @@
                 if ui.yes_no(
                     'Has this package successfully been built for this '
                     'architecture in the past (you can look this up at '
-                    'buildd.debian.org)',
+                    'buildd.finkproject.org)',
                     'Yes, this is a recently-introduced problem.',
                     'No, it has always been this way.'):
                     severity = 'serious'
@@ -1503,7 +1503,7 @@
         if os.path.exists('handle_bugscript'):
             handler = './handle_bugscript'
         else:
-            handler = '/usr/share/reportbug/handle_bugscript'
+            handler = '@FINKPREFIX@/share/reportbug/handle_bugscript'
 
         fh, filename = TempFile(prefix=tfprefix)
         fh.close()
@@ -1629,7 +1629,7 @@
     return
 
 if __name__ == '__main__':
-    sys.path.append('/usr/share/reportbug')
+    sys.path.append('@FINKPREFIX@/share/reportbug')
     try:
         main()
     except KeyboardInterrupt:
diff -ruN 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
@@ -6,7 +6,7 @@
 # severity normal
 
 # BTS to use
-#bts debian
+bts fink
 # See 'reportbug --bts help' for a current list of supported BTSes
 
 # Submission address: default is 'submit'
@@ -68,7 +68,7 @@
 # Use TLS encryption.
 # smtptls
 
-# Use this to specify the path of your MTA; any SMTP server on Debian
+# Use this to specify the path of your MTA; any SMTP server on OS X
 # should be OK with the default.
 # mta /usr/sbin/sendmail
 
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
@@ -15,7 +15,7 @@
   (require 'gnus)
   (find-file (getenv "REPORTBUG"))
   (let ((subject (message-fetch-field "Subject"))
-        (toaddr (or (message-fetch-field "To") "[EMAIL PROTECTED]")))
+        (toaddr (or (message-fetch-field "To") "[EMAIL PROTECTED]")))
     (gnus-narrow-to-body)
     (let ((body (or (buffer-string) "")))
       (gnus-summary-mail-other-window)
diff -ruN 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
@@ -33,7 +33,7 @@
 from string import ascii_letters, digits
 
 # Paths for dpkg
-DPKGLIB = '/var/lib/dpkg'
+DPKGLIB = '@FINKPREFIX@/var/lib/dpkg'
 AVAILDB = os.path.join(DPKGLIB, 'available')
 STATUSDB = os.path.join(DPKGLIB, 'status')
 
@@ -50,12 +50,12 @@
 MODES = {'novice': 'Offer simple prompts, bypassing technical questions.',
          'standard': 'Offer more extensive prompts, including asking about '
          'things that a moderately sophisticated user would be expected to '
-         'know about Debian.',
+         'know about Fink.',
          'advanced' : 'Like standard, but assumes you know a bit more about '
-         'Debian, including "incoming".',
+         'Fink, including "incoming".',
          'expert': 'Bypass most handholding measures and preliminary triage '
          'routines.  This mode should not be used by people unfamiliar with '
-         'Debian\'s policies and operating procedures.'}
+         'Fink\'s policies and operating procedures.'}
 MODELIST = ['novice', 'standard', 'advanced', 'expert']
 for mode in MODELIST:
     exec 'MODE_%s=%d' % (mode.upper(), MODELIST.index(mode))
@@ -87,8 +87,8 @@
     except:
         return 'Invalid date: '+`timeval`
 
-fhs_directories = ['/', '/usr', '/usr/share', '/var', '/usr/X11R6',
-                   '/usr/man', '/usr/doc', '/usr/bin']
+fhs_directories = ['@FINKPREFIX@', '@FINKPREFIX@/share', '@FINKPREFIX@/var', 
'/usr/X11R6',
+                   '@FINKPREFIX@/man', '@FINKPREFIX@/share/doc', '@FINKPREFIX@/bin']
 
 def realpath(filename):
     filename = os.path.abspath(filename)
@@ -108,8 +108,7 @@
 
     return filename
 
-pathdirs = ['/usr/sbin', '/usr/bin', '/sbin', '/bin', '/usr/X11R6/bin',
-            '/usr/games']
+pathdirs = ['@FINKPREFIX@/sbin', '@FINKPREFIX@/bin', '@FINKPREFIX@/sbin', 
'@FINKPREFIX@/bin', '/usr/X11R6/bin' ]
 
 def search_path_for(filename):
     dir, file = os.path.split(filename)
@@ -168,7 +167,7 @@
     return query_dpkg_for(newfilename or filename)
 
 def find_rewritten(username):
-    for filename in ['/etc/email-addresses']:
+    for filename in ['@FINKPREFIX@/etc/email-addresses']:
         if os.path.exists(filename):
             try:
                 fp = file(filename)
@@ -692,7 +691,7 @@
         return token
 
 USERFILE = os.path.expanduser('~/.reportbugrc')
-FILES = ('/etc/reportbug.conf', USERFILE)
+FILES = ('@FINKPREFIX@/etc/reportbug.conf', USERFILE)
 
 CONFIG_ARGS = (
     'sendto', 'severity', 'mua', 'mta', 'email', 'realname', 'bts', 'verify',
@@ -706,7 +705,7 @@
     'mutt' : 'mutt -H',
     'af' : 'af -EH < ',
     'mh' : '/usr/bin/mh/comp -use -file',
-    'gnus' : 'REPORTBUG=%s emacs -l /usr/share/reportbug/reportbug.el -f 
tfheen-reportbug-insert-template',
+    'gnus' : 'REPORTBUG=%s emacs -l @FINKPREFIX@/share/reportbug/reportbug.el -f 
tfheen-reportbug-insert-template',
     }
 MUA['nmh'] = MUA['mh']
 
diff -ruN 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
@@ -30,7 +30,7 @@
 from reportbug import VERSION, VERSION_NUMBER
 
 import os
-sys.path = [os.curdir, '/usr/share/reportbug'] + sys.path
+sys.path = [os.curdir, '@FINKPREFIX@/share/reportbug'] + sys.path
 
 import re
 import commands
@@ -421,7 +421,7 @@
     'o'
 
 if __name__ == '__main__':
-    sys.path.append('/usr/share/reportbug')
+    sys.path.append('@FINKPREFIX@/share/reportbug')
     try:
         main()
     except KeyboardInterrupt:
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
@@ -19,7 +19,7 @@
 ##  SOFTWARE.
 
 import sys
-sys.path.append('/usr/lib/python2.1/site-packages')
+sys.path.append('@FINKPREFIX/lib/python2.3/site-packages')
 
 from reportbug_exceptions import *
 import reportbug, gnome
@@ -42,7 +42,7 @@
 
 class ReportBugApp(GnomeApp):
        def __init__(self):
-               GnomeApp.__init__(self, "Debian Bug Report Druid", "Debian Bug Report 
Druid")
+               GnomeApp.__init__(self, "Fink Bug Report Druid", "Fink Bug Report 
Druid")
                self.connect("destroy", callback_destroy)
                self.setup()
 
@@ -52,7 +52,7 @@
                logo_bgcolor = GdkColor(0x02, 0x66, 0x9A)
 
                self.my_druid = GnomeDruid()
-               self.my_screen = GnomeDruidPageStandard("Debian Bug Report Druid", 
logo)
+               self.my_screen = GnomeDruidPageStandard("Fink Bug Report Druid", logo)
                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 reportbug/script reportbug.new/script
--- reportbug/script    Wed Feb  4 23:29:11 2004
+++ reportbug.new/script        Mon Oct 11 22:03:38 2004
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.3
[EMAIL PROTECTED]@/bin/python2.3
 # -*- python -*-
 
 import os



-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to