Bug 854074: Remove all references to the uwinnipeg.ca PPM repository as it is no...

r=glob a=LpSolit

diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm
index e04701250a6b9d2a951b16d35718f2e29532c5b7..66622a7a578baf32b3bf518c8f4c88adab739c20 100644 (file)
--- a/Bugzilla/Install/Requirements.pm
+++ b/Bugzilla/Install/Requirements.pm
@@ -569,16 +569,6 @@ sub print_module_instructions {
         ( (!$output and @{$check_results->{missing}})
           or ($output and $check_results->{any_missing}) ) ? 1 : 0;
 
-    # We only print the PPM repository note if we have to.
-    my $perl_ver = sprintf('%vd', $^V);
-    if ($need_module_instructions && ON_ACTIVESTATE && vers_cmp($perl_ver, '5.12') < 0) {
-        my $url_to_theory58S = 'http://cpan.uwinnipeg.ca/PPMPackages/10xx/';
-        print colored(
-            install_string('ppm_repo_add', 
-                           { theory_url => $url_to_theory58S }),
-            COLOR_ERROR);
-    }
-
     if ($need_module_instructions or @{ $check_results->{apache} }) {
         # If any output was required, we want to close the "table"
         print "*" x TABLE_WIDTH . "\n";

diff --git a/docs/en/xml/installation.xml b/docs/en/xml/installation.xml
index d26ebbae317eb07e5e95a5ed29011996bdf9d5d6..d3ac86ee9132124866084b1bdbade14f06bac159 100644 (file)
--- a/docs/en/xml/installation.xml
+++ b/docs/en/xml/installation.xml
@@ -1588,21 +1588,6 @@ AddType application/rdf+xml .rdf</screen>
 C:\perl&gt; <command>ppm install &lt;module name&gt;</command>
         </programlisting>
 
-        <para>
-          If you are using Perl 5.10.1, the best source for the Windows PPM modules
-          needed for Bugzilla is probably the theory58S website, which you can add
-          to your list of repositories as follows:
-        </para>
-
-        <programlisting>
-<command>ppm repo add theory58S http://cpan.uwinnipeg.ca/PPMPackages/10xx/</command>
-        </programlisting>
-
-        <para>
-          If you are using Perl 5.12 or newer, you no longer need to add
-          this repository. All modules you need are already available from
-         the ActiveState repository.
-        </para>
         <note>
           <para>
             The PPM repository stores modules in 'packages' that may have

diff --git a/docs/en/xml/modules.xml b/docs/en/xml/modules.xml
index 4ae77e9b6733a8fdf1e5fc27edc6b51b7f684b87..eba87d41d554d8912b53a7fcc47d3cacb1451ea8 100644 (file)
--- a/docs/en/xml/modules.xml
+++ b/docs/en/xml/modules.xml
@@ -54,10 +54,8 @@
     <note>
       <para>
         Running Bugzilla on Windows requires the use of ActiveState
-        Perl &min-perl-ver; or higher. Many modules already exist in the core
-        distribution of ActiveState Perl. Additional modules can be downloaded
-        from <ulink url="http://cpan.uwinnipeg.ca/PPMPackages/10xx/" />
-        if you use Perl 5.10.1.
+        Perl &min-perl-ver; or higher. Most modules already exist in the core
+        distribution of ActiveState Perl.
       </para>
     </note>
 

diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl
index f7c4d15cf33c66f80ca0293c5d82f429162fc22f..f7a7e39f5e6842908debbcbe69454bd0de7345ac 100644 (file)
--- a/template/en/default/setup/strings.txt.pl
+++ b/template/en/default/setup/strings.txt.pl
@@ -373,15 +373,6 @@ as well), you should install patchutils from:
 
     http://cyberelk.net/tim/software/patchutils/
 END
-    ppm_repo_add => <<EOT,
-***********************************************************************
-* Note For Windows Users                                              *
-***********************************************************************
-* In order to install the modules listed below, you first have to run * 
-* the following command as an Administrator:                          *
-*                                                                     *
-*   ppm repo add theory58S ##theory_url##
-EOT
     template_precompile   => "Precompiling templates...",
     template_removal_failed => <<END,
 WARNING: The directory '##template_cache##' could not be removed.