<URL: http://bugs.freeciv.org/Ticket/Display.html?id=39329 >

I wrote another patch (this for trunk), that point people at the bugs URL 
instead of putting the email address where spam spiders can pick it up. 
That means we ought to improve the bugs.freeciv.org front page a bit, 
though. Right now it looks horrible (and it is all my fault, I know).

Also simplified the bug reporting procedure in BUGS a bit.

   - Per
Index: configure.ac
===================================================================
--- configure.ac        (revision 12943)
+++ configure.ac        (working copy)
@@ -12,6 +12,7 @@
 PACKAGE=freeciv
 
 AC_DEFINE(FC_CONFIG_H, 1, [Configuration autogenerated])
+AC_DEFINE(BUG_URL, "http://bugs.freeciv.org/";, [Bug reporting URL])
 
 dnl client/server should always have the same major and minor versions
 dnl different patch versions are compatible
Index: utility/registry.c
===================================================================
--- utility/registry.c  (revision 12943)
+++ utility/registry.c  (working copy)
@@ -813,8 +813,7 @@
                      "avoid this make sure all rows of a table are filled\n"
                      "out with an entry for every column.  This is surely\n"
                      "a bug so if you're reading this message, report it\n"
-                     "to [EMAIL PROTECTED]",
-                     real_filename, psection->name, expect);
+                     "at %s", real_filename, psection->name, expect, BUG_URL);
              fz_fprintf(fs, "\n");
            }
            fz_fprintf(fs, "}\n");
Index: doc/sv/BUGS.sv
===================================================================
--- doc/sv/BUGS.sv      (revision 12943)
+++ doc/sv/BUGS.sv      (working copy)
@@ -11,7 +11,7 @@
 Listan innehåller endast de tydligaste programfelen. För en
 fullständig lista, se:
 
-    http://www.freeciv.org/cgi-bin/bugs
+    http://bugs.freeciv.org/
 
 KÄNDA PROGRAMFEL:
 =================
@@ -100,29 +100,17 @@
 - Tittar på <http://www.freeciv.org> och försäkrar sig om att man har
   den nyaste versionen. (Vi kanske redan har rättat felet.)
 
-  Man kanske vill prova en utvecklarversion från CVS-upplaget. De kan
-  hämtas från:
-
-        http://www.freeciv.org/latest.html
-
-- Tittar på Freecivs FAQ på <http://www.freeciv.org/faq> för att se om
-  något sätt att upphäva problemet har offentliggjorts.
-
 - Tittar på Freecivs system för spårning av programfel vid:
 
-        http://www.freeciv.org/cgi-bin/bugs
+        http://bugs.freeciv.org/
 
   för att se om programfelet redan har anmälts.
 
 - Anmäler programfelet
 
-   Man kan änmäla ett programfel genom att skicka epost till
-    <[EMAIL PROTECTED]> eller på väven vid
-    <http://www.freeciv.org/cgi-bin/bugs>.
+   Man kan änmäla ett programfel på väven vid
 
-   Om man vill skicka förslag till freecivutvecklarna utan att göra en
-   programfelsanmälan kan man skicka epost till
-   <[EMAIL PROTECTED]>, freecivutvecklarnas sändlista.
+        http://bugs.freeciv.org/
 
    Vad man ska nämna i sin programfelsanmälan:
 
Index: doc/BUGS
===================================================================
--- doc/BUGS    (revision 12943)
+++ doc/BUGS    (working copy)
@@ -74,30 +74,14 @@
  - Check the Freeciv website, to ensure you're playing the latest
    version.  (We may have already fixed the problem.)
 
-   In particular, you might like to try a development snapshot,
-   from our CVS repository.  You can FTP them from:
-
-        http://www.freeciv.org/latest.html
-
- - Check the Freeciv FAQ on the Freeciv website to see if we've
-   published a way to work around your bug.
-
  - Check the Freeciv Bug Tracking System at:
 
         http://bugs.freeciv.org/
 
    to see if the bug has already been reported.
 
- - Submit a bug report!
+ - Submit a bug report through our bug tracking system above!
 
-   You can submit a bug report either by sending email to
-   <[EMAIL PROTECTED]>, or via the web at
-   <http://bugs.freeciv.org/>.
-
-   Or, if you want to send the Freeciv developers some comments
-   but don't want to lodge a bug report, you can sent email to
-   <[EMAIL PROTECTED]>, the Freeciv developer's mailing list.
-
    If you get any GDK/GTK messages (they look like this:
 
      Gtk-CRITICAL **: file gtkobject.c: line 1163 (gtk_object_ref): 
@@ -138,8 +122,8 @@
          got it from.
 
    - If Freeciv "dumps core", then we may ask you to use a debugger to
-   give us a "stack trace".  You'll need the "core" file for this as
-   well as the binary which you used, so please backup both.
+     give us a "stack trace".  You'll need the "core" file for this as
+     well as the binary which you used, so please backup both.
 
 FURTHER INFORMATION:
 ====================
Index: server/civserver.c
===================================================================
--- server/civserver.c  (revision 12943)
+++ server/civserver.c  (working copy)
@@ -249,7 +249,7 @@
     fc_fprintf(stderr,
               _("  -R, --Ranklog FILE\tUse FILE as ranking logfile\n"));
     fc_fprintf(stderr, _("  -v, --version\t\tPrint the version number\n"));
-    fc_fprintf(stderr, _("Report bugs to <%s>.\n"), BUG_EMAIL_ADDRESS);
+    fc_fprintf(stderr, _("Report bugs at %s.\n"), BUG_URL);
     exit(EXIT_SUCCESS);
   }
 
Index: data/helpdata.txt
===================================================================
--- data/helpdata.txt   (revision 12943)
+++ data/helpdata.txt   (working copy)
@@ -58,8 +58,6 @@
 best done by visiting the Freeciv Bug Tracking System, at:\
 \n\n\
   http://bugs.freeciv.org/\
-\n\n\
-or by sending email to:  [EMAIL PROTECTED]
 "), _("\
 For more information about submitting bug reports see the file BUGS \
 in the Freeciv distribution.  For more information in general, \
Index: common/fc_types.h
===================================================================
--- common/fc_types.h   (revision 12943)
+++ common/fc_types.h   (working copy)
@@ -23,7 +23,6 @@
  * Nothing in this file should require anything else from the common/
  * directory! */
 
-#define BUG_EMAIL_ADDRESS "[EMAIL PROTECTED]"
 #define WEBSITE_URL "http://www.freeciv.org/";
 
 /* MAX_NUM_PLAYERS + MAX_NUM_BARBARIANS <= 32 !!!! */
Index: manual/civmanual.c
===================================================================
--- manual/civmanual.c  (revision 12947)
+++ manual/civmanual.c  (working copy)
@@ -371,7 +371,7 @@
     fc_fprintf(stderr,
          _("  -h, --help\t\tPrint a summary of the options\n"));
     fc_fprintf(stderr, _("  -v, --version\t\tPrint the version number\n"));
-    fc_fprintf(stderr, _("Report bugs to <%s>.\n"), BUG_EMAIL_ADDRESS);
+    fc_fprintf(stderr, _("Report bugs at %s.\n"), BUG_URL);
     exit(EXIT_SUCCESS);
   }
 
Index: client/agents/cma_core.c
===================================================================
--- client/agents/cma_core.c    (revision 12943)
+++ client/agents/cma_core.c    (working copy)
@@ -432,7 +432,7 @@
 
     freelog(LOG_ERROR, "CMA: %s has changed multiple times due to "
             "an error in Freeciv. Please send a savegame that can reproduce "
-            "this bug to <[EMAIL PROTECTED]>. Thank you.", pcity->name);
+            "this bug at %s. Thank you.", pcity->name, BUG_URL);
   }
 
   freelog(HANDLE_CITY_LOG_LEVEL2, "END handle city=(%d)", city_id);
Index: client/gui-gtk-2.0/gui_main.c
===================================================================
--- client/gui-gtk-2.0/gui_main.c       (revision 12952)
+++ client/gui-gtk-2.0/gui_main.c       (working copy)
@@ -335,7 +335,7 @@
 static void print_usage(const char *argv0)
 {
   /* add client-specific usage information here */
-  fc_fprintf(stderr, _("Report bugs to <%s>.\n"), BUG_EMAIL_ADDRESS);
+  fc_fprintf(stderr, _("Report bugs at %s.\n"), BUG_URL);
 }
 
 /**************************************************************************
Index: client/gui-xaw/gui_main.c
===================================================================
--- client/gui-xaw/gui_main.c   (revision 12943)
+++ client/gui-xaw/gui_main.c   (working copy)
@@ -242,7 +242,7 @@
 static void print_usage(const char *argv0)
 {
   /* add client-specific usage information here */
-  fc_fprintf(stderr, _("Report bugs to <%s>.\n"), BUG_EMAIL_ADDRESS);
+  fc_fprintf(stderr, _("Report bugs at %s.\n"), BUG_URL);
 }
 
 /**************************************************************************
Index: client/gui-mui/gui_main.c
===================================================================
--- client/gui-mui/gui_main.c   (revision 12943)
+++ client/gui-mui/gui_main.c   (working copy)
@@ -116,7 +116,7 @@
 static void print_usage(const char *argv0)
 {
   /* add client-specific usage information here */
-  fc_fprintf(stderr, _("Report bugs to <%s>.\n"), BUG_EMAIL_ADDRESS); 
+  fc_fprintf(stderr, _("Report bugs at %s.\n"), BUG_URL);
 }
 
 /**************************************************************************
Index: client/tilespec.c
===================================================================
--- client/tilespec.c   (revision 12943)
+++ client/tilespec.c   (working copy)
@@ -3960,7 +3960,7 @@
       if (!reported) {
        freelog(LOG_ERROR,
                _("Paths longer than 99 turns are not supported.\n"
-                 "Report this bug to [EMAIL PROTECTED]"));
+                 "Report this bug at %s"), BUG_URL);
        reported = TRUE;
       }
       tens = units = 9;
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to