diff -Naur -x '*~' bugzilla-3.6/admin.cgi bugzilla-3.6-fhs//admin.cgi
--- bugzilla-3.6/admin.cgi	2007-10-19 08:46:10.000000000 +0200
+++ bugzilla-3.6-fhs//admin.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -20,8 +20,7 @@
 # Contributor(s): Frédéric Buclin <LpSolit@gmail.com>
 
 use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/attachment.cgi bugzilla-3.6-fhs//attachment.cgi
--- bugzilla-3.6/attachment.cgi	2010-04-07 05:31:29.000000000 +0200
+++ bugzilla-3.6-fhs//attachment.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -35,8 +35,7 @@
 
 # Make it harder for us to do dangerous things in Perl.
 use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::BugMail;
diff -Naur -x '*~' bugzilla-3.6/buglist.cgi bugzilla-3.6-fhs//buglist.cgi
--- bugzilla-3.6/buglist.cgi	2010-03-03 23:01:31.000000000 +0100
+++ bugzilla-3.6-fhs//buglist.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -31,8 +31,7 @@
 
 # Make it harder for us to do dangerous things in Perl.
 use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/Bugzilla/Constants.pm bugzilla-3.6-fhs//Bugzilla/Constants.pm
--- bugzilla-3.6/Bugzilla/Constants.pm	2010-04-13 06:56:24.000000000 +0200
+++ bugzilla-3.6-fhs//Bugzilla/Constants.pm	2010-04-13 21:08:09.000000000 +0200
@@ -514,43 +514,40 @@
     #
     # On mod_cgi this will be a relative path. On mod_perl it will be an
     # absolute path.
-    my $libpath = dirname(dirname($INC{'Bugzilla/Constants.pm'}));
-    # We have to detaint $libpath, but we can't use Bugzilla::Util here.
-    $libpath =~ /(.*)/;
-    $libpath = $1;
+    my $basepath = '/usr/share/bugzilla';
 
     my ($project, $localconfig, $datadir);
     if ($ENV{'PROJECT'} && $ENV{'PROJECT'} =~ /^(\w+)$/) {
         $project = $1;
-        $localconfig = "localconfig.$project";
-        $datadir = "data/$project";
+        $localconfig = "/etc/bugzilla/localconfig.$project";
+        $datadir = "/var/lib/bugzilla/$project";
     } else {
-        $localconfig = "localconfig";
-        $datadir = "data";
+        $localconfig = "/etc/bugzilla/localconfig";
+        $datadir = "/var/lib/bugzilla";
     }
 
     # We have to return absolute paths for mod_perl. 
     # That means that if you modify these paths, they must be absolute paths.
     return {
-        'libpath'     => $libpath,
-        'ext_libpath' => "$libpath/lib",
+        'libpath'     => "$basepath/lib",
+        'ext_libpath' => "",
         # If you put the libraries in a different location than the CGIs,
         # make sure this still points to the CGIs.
-        'cgi_path'    => $libpath,
-        'templatedir' => "$libpath/template",
+        'cgi_path'    => "$basepath/www",
+        'templatedir' => "$basepath/template",
         'project'     => $project,
-        'localconfig' => "$libpath/$localconfig",
-        'datadir'     => "$libpath/$datadir",
-        'attachdir'   => "$libpath/$datadir/attachments",
-        'skinsdir'    => "$libpath/skins",
+        'localconfig' => "$localconfig",
+        'datadir'     => "$datadir",
+        'attachdir'   => "$datadir/attachments",
+        'skinsdir'    => "$basepath/www/skins",
         # $webdotdir must be in the web server's tree somewhere. Even if you use a 
         # local dot, we output images to there. Also, if $webdotdir is 
         # not relative to the bugzilla root directory, you'll need to 
         # change showdependencygraph.cgi to set image_url to the correct 
         # location.
         # The script should really generate these graphs directly...
-        'webdotdir'   => "$libpath/$datadir/webdot",
-        'extensionsdir' => "$libpath/extensions",
+        'webdotdir'   => "$datadir/webdot",
+        'extensionsdir' => "$basepath/extensions",
     };
 }
 
diff -Naur -x '*~' bugzilla-3.6/Bugzilla/Install/Localconfig.pm bugzilla-3.6-fhs//Bugzilla/Install/Localconfig.pm
--- bugzilla-3.6/Bugzilla/Install/Localconfig.pm	2009-09-30 13:42:54.000000000 +0200
+++ bugzilla-3.6-fhs//Bugzilla/Install/Localconfig.pm	2010-04-13 21:08:09.000000000 +0200
@@ -49,7 +49,7 @@
 use constant LOCALCONFIG_VARS => (
     {
         name    => 'create_htaccess',
-        default => 1,
+        default => 0,
         desc    => <<EOT
 # If you are using Apache as your web server, Bugzilla can create .htaccess
 # files for you that will instruct Apache not to serve files that shouldn't
diff -Naur -x '*~' bugzilla-3.6/chart.cgi bugzilla-3.6-fhs//chart.cgi
--- bugzilla-3.6/chart.cgi	2009-10-24 07:21:06.000000000 +0200
+++ bugzilla-3.6-fhs//chart.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -44,7 +44,7 @@
 # Offer subscription when you get a "series already exists" error?
 
 use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/checksetup.pl bugzilla-3.6-fhs//checksetup.pl
--- bugzilla-3.6/checksetup.pl	2010-03-28 23:38:41.000000000 +0200
+++ bugzilla-3.6-fhs//checksetup.pl	2010-04-13 21:08:09.000000000 +0200
@@ -49,8 +49,7 @@
 use Pod::Usage;
 use Safe;
 
-BEGIN { chdir dirname($0); }
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 use Bugzilla::Constants;
 use Bugzilla::Install::Requirements;
 use Bugzilla::Install::Util qw(install_string get_version_and_os init_console);
diff -Naur -x '*~' bugzilla-3.6/colchange.cgi bugzilla-3.6-fhs//colchange.cgi
--- bugzilla-3.6/colchange.cgi	2009-11-24 07:09:41.000000000 +0100
+++ bugzilla-3.6-fhs//colchange.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -24,8 +24,7 @@
 #                 Pascal Held <paheld@gmail.com>
 
 use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/collectstats.pl bugzilla-3.6-fhs//collectstats.pl
--- bugzilla-3.6/collectstats.pl	2009-09-07 00:45:51.000000000 +0200
+++ bugzilla-3.6-fhs//collectstats.pl	2010-04-13 21:08:09.000000000 +0200
@@ -31,7 +31,7 @@
 # ISO (2004-08-14) format.
 
 use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use List::Util qw(first);
 use Cwd;
@@ -44,6 +44,7 @@
 use Bugzilla::User;
 use Bugzilla::Product;
 use Bugzilla::Field;
+use Bugzilla::Error;
 
 # Turn off output buffering (probably needed when displaying output feedback
 # in the regenerate mode).
@@ -69,6 +70,7 @@
 }
 
 my $datadir = bz_locations()->{'datadir'};
+my $cgidir = bz_locations()->{'cgi_path'};
 
 my @myproducts = map {$_->name} Bugzilla::Product->get_all;
 unshift(@myproducts, "-All-");
diff -Naur -x '*~' bugzilla-3.6/config.cgi bugzilla-3.6-fhs//config.cgi
--- bugzilla-3.6/config.cgi	2010-03-18 15:02:54.000000000 +0100
+++ bugzilla-3.6-fhs//config.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -28,8 +28,7 @@
 
 # Make it harder for us to do dangerous things in Perl.
 use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/contrib/bzdbcopy.pl bugzilla-3.6-fhs//contrib/bzdbcopy.pl
--- bugzilla-3.6/contrib/bzdbcopy.pl	2009-10-24 07:30:19.000000000 +0200
+++ bugzilla-3.6-fhs//contrib/bzdbcopy.pl	2010-04-13 21:08:09.000000000 +0200
@@ -19,7 +19,7 @@
 # Contributor(s): Max Kanat-Alexander <mkanat@bugzilla.org>
 
 use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 use Bugzilla;
 use Bugzilla::Constants;
 use Bugzilla::DB;
diff -Naur -x '*~' bugzilla-3.6/contrib/bz_webservice_demo.pl bugzilla-3.6-fhs//contrib/bz_webservice_demo.pl
--- bugzilla-3.6/contrib/bz_webservice_demo.pl	2008-05-19 20:38:26.000000000 +0200
+++ bugzilla-3.6-fhs//contrib/bz_webservice_demo.pl	2010-04-13 21:08:09.000000000 +0200
@@ -29,7 +29,7 @@
 =cut
 
 use strict;
-use lib qw(lib);
+use lib '/usr/share/bugzilla/lib';
 use Getopt::Long;
 use Pod::Usage;
 use File::Basename qw(dirname);
diff -Naur -x '*~' bugzilla-3.6/contrib/cmdline/makequery bugzilla-3.6-fhs//contrib/cmdline/makequery
--- bugzilla-3.6/contrib/cmdline/makequery	2005-01-27 20:42:34.000000000 +0100
+++ bugzilla-3.6-fhs//contrib/cmdline/makequery	2010-04-13 21:08:09.000000000 +0200
@@ -19,7 +19,7 @@
 #
 # Contributor(s): 
 
-conf="`dirname $0`/query.conf"
+conf='/etc/bugzilla/query.conf'
 
 query="https://bugzilla.mozilla.org/buglist.cgi?ctype=csv"
 
diff -Naur -x '*~' bugzilla-3.6/contrib/console.pl bugzilla-3.6-fhs//contrib/console.pl
--- bugzilla-3.6/contrib/console.pl	2010-01-31 18:49:13.000000000 +0100
+++ bugzilla-3.6-fhs//contrib/console.pl	2010-04-13 21:12:18.000000000 +0200
@@ -21,8 +21,7 @@
 # Contributor(s): Jesse Clark <jjclark1982@gmail.com>
 
 use File::Basename;
-BEGIN { chdir dirname($0) . "/.."; }
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/contrib/extension-convert.pl bugzilla-3.6-fhs//contrib/extension-convert.pl
--- bugzilla-3.6/contrib/extension-convert.pl	2009-11-25 04:37:09.000000000 +0100
+++ bugzilla-3.6-fhs//contrib/extension-convert.pl	2010-04-13 21:11:33.000000000 +0200
@@ -21,7 +21,7 @@
 
 use strict;
 use warnings;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/contrib/fixperms.pl bugzilla-3.6-fhs//contrib/fixperms.pl
--- bugzilla-3.6/contrib/fixperms.pl	2010-03-09 08:00:48.000000000 +0100
+++ bugzilla-3.6-fhs//contrib/fixperms.pl	2010-04-13 21:11:15.000000000 +0200
@@ -21,7 +21,7 @@
 
 use strict;
 use warnings;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Install::Filesystem qw(fix_all_file_permissions);
diff -Naur -x '*~' bugzilla-3.6/contrib/merge-users.pl bugzilla-3.6-fhs//contrib/merge-users.pl
--- bugzilla-3.6/contrib/merge-users.pl	2008-03-11 16:50:04.000000000 +0100
+++ bugzilla-3.6-fhs//contrib/merge-users.pl	2010-04-13 21:08:09.000000000 +0200
@@ -44,7 +44,7 @@
 
 =cut
 
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/contrib/recode.pl bugzilla-3.6-fhs//contrib/recode.pl
--- bugzilla-3.6/contrib/recode.pl	2009-02-20 22:54:16.000000000 +0100
+++ bugzilla-3.6-fhs//contrib/recode.pl	2010-04-13 21:08:09.000000000 +0200
@@ -20,7 +20,7 @@
 # Contributor(s): Max Kanat-Alexander <mkanat@bugzilla.org>
 
 use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/contrib/sendbugmail.pl bugzilla-3.6-fhs//contrib/sendbugmail.pl
--- bugzilla-3.6/contrib/sendbugmail.pl	2010-03-08 03:47:38.000000000 +0100
+++ bugzilla-3.6-fhs//contrib/sendbugmail.pl	2010-04-13 21:08:09.000000000 +0200
@@ -12,7 +12,7 @@
 # 
 # Usage: perl -T contrib/sendbugmail.pl bug_id user_email
 
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Util;
diff -Naur -x '*~' bugzilla-3.6/contrib/sendunsentbugmail.pl bugzilla-3.6-fhs//contrib/sendunsentbugmail.pl
--- bugzilla-3.6/contrib/sendunsentbugmail.pl	2007-10-19 08:46:17.000000000 +0200
+++ bugzilla-3.6-fhs//contrib/sendunsentbugmail.pl	2010-04-13 21:08:09.000000000 +0200
@@ -22,8 +22,7 @@
 #                 Myk Melez <myk@mozilla.org>
 
 use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/contrib/syncLDAP.pl bugzilla-3.6-fhs//contrib/syncLDAP.pl
--- bugzilla-3.6/contrib/syncLDAP.pl	2008-07-07 11:01:51.000000000 +0200
+++ bugzilla-3.6-fhs//contrib/syncLDAP.pl	2010-04-13 21:08:09.000000000 +0200
@@ -21,8 +21,7 @@
 #
 
 use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Net::LDAP;
 use Bugzilla;
diff -Naur -x '*~' bugzilla-3.6/createaccount.cgi bugzilla-3.6-fhs//createaccount.cgi
--- bugzilla-3.6/createaccount.cgi	2007-11-11 23:03:16.000000000 +0100
+++ bugzilla-3.6-fhs//createaccount.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -25,8 +25,7 @@
 #                 Gervase Markham <gerv@gerv.net>
 
 use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/describecomponents.cgi bugzilla-3.6-fhs//describecomponents.cgi
--- bugzilla-3.6/describecomponents.cgi	2009-05-21 10:43:23.000000000 +0200
+++ bugzilla-3.6-fhs//describecomponents.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -23,7 +23,7 @@
 #                 Frédéric Buclin <LpSolit@gmail.com>
 
 use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/describekeywords.cgi bugzilla-3.6-fhs//describekeywords.cgi
--- bugzilla-3.6/describekeywords.cgi	2009-01-25 13:42:51.000000000 +0100
+++ bugzilla-3.6-fhs//describekeywords.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -22,7 +22,7 @@
 # Contributor(s): Gervase Markham <gerv@gerv.net>
 
 use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Error;
diff -Naur -x '*~' bugzilla-3.6/duplicates.cgi bugzilla-3.6-fhs//duplicates.cgi
--- bugzilla-3.6/duplicates.cgi	2010-02-02 01:02:50.000000000 +0100
+++ bugzilla-3.6-fhs//duplicates.cgi	2010-04-13 21:13:51.000000000 +0200
@@ -23,7 +23,7 @@
 #   Max Kanat-Alexander <mkanat@bugzilla.org>
 
 use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/editclassifications.cgi bugzilla-3.6-fhs//editclassifications.cgi
--- bugzilla-3.6/editclassifications.cgi	2009-01-02 14:59:22.000000000 +0100
+++ bugzilla-3.6-fhs//editclassifications.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -21,7 +21,7 @@
 
 
 use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/editcomponents.cgi bugzilla-3.6-fhs//editcomponents.cgi
--- bugzilla-3.6/editcomponents.cgi	2010-02-01 00:33:30.000000000 +0100
+++ bugzilla-3.6-fhs//editcomponents.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -24,7 +24,7 @@
 #                 Akamai Technologies <bugzilla-dev@akamai.com>
 
 use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/editfields.cgi bugzilla-3.6-fhs//editfields.cgi
--- bugzilla-3.6/editfields.cgi	2009-01-15 16:47:36.000000000 +0100
+++ bugzilla-3.6-fhs//editfields.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -16,7 +16,7 @@
 # Contributor(s): Frédéric Buclin <LpSolit@gmail.com>
 
 use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/editflagtypes.cgi bugzilla-3.6-fhs//editflagtypes.cgi
--- bugzilla-3.6/editflagtypes.cgi	2009-11-23 23:40:54.000000000 +0100
+++ bugzilla-3.6-fhs//editflagtypes.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -27,7 +27,7 @@
 
 # Make it harder for us to do dangerous things in Perl.
 use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 # Use Bugzilla's flag modules for handling flag types.
 use Bugzilla;
diff -Naur -x '*~' bugzilla-3.6/editgroups.cgi bugzilla-3.6-fhs//editgroups.cgi
--- bugzilla-3.6/editgroups.cgi	2009-12-31 13:48:21.000000000 +0100
+++ bugzilla-3.6-fhs//editgroups.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -25,7 +25,7 @@
 #                 Frédéric Buclin <LpSolit@gmail.com>
 
 use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/editkeywords.cgi bugzilla-3.6-fhs//editkeywords.cgi
--- bugzilla-3.6/editkeywords.cgi	2009-11-09 20:51:58.000000000 +0100
+++ bugzilla-3.6-fhs//editkeywords.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -21,7 +21,7 @@
 # Contributor(s): Terry Weissman <terry@mozilla.org>
 
 use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/editmilestones.cgi bugzilla-3.6-fhs//editmilestones.cgi
--- bugzilla-3.6/editmilestones.cgi	2008-01-28 00:14:14.000000000 +0100
+++ bugzilla-3.6-fhs//editmilestones.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -20,7 +20,7 @@
 #                Frédéric Buclin <LpSolit@gmail.com>
 
 use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/editparams.cgi bugzilla-3.6-fhs//editparams.cgi
--- bugzilla-3.6/editparams.cgi	2010-02-10 05:17:28.000000000 +0100
+++ bugzilla-3.6-fhs//editparams.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -23,7 +23,7 @@
 #                 Frédéric Buclin <LpSolit@gmail.com>
 
 use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/editproducts.cgi bugzilla-3.6-fhs//editproducts.cgi
--- bugzilla-3.6/editproducts.cgi	2009-12-18 00:31:52.000000000 +0100
+++ bugzilla-3.6-fhs//editproducts.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -29,7 +29,7 @@
 #               Elliotte Martin <elliotte.martin@yahoo.com>
 
 use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/editsettings.cgi bugzilla-3.6-fhs//editsettings.cgi
--- bugzilla-3.6/editsettings.cgi	2008-01-28 00:14:14.000000000 +0100
+++ bugzilla-3.6-fhs//editsettings.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -17,7 +17,7 @@
 #                 Frédéric Buclin <LpSolit@gmail.com>
 
 use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/editusers.cgi bugzilla-3.6-fhs//editusers.cgi
--- bugzilla-3.6/editusers.cgi	2009-12-30 15:28:38.000000000 +0100
+++ bugzilla-3.6-fhs//editusers.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -21,7 +21,7 @@
 #                 Gavin Shelley  <bugzilla@chimpychompy.org>
 
 use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/editvalues.cgi bugzilla-3.6-fhs//editvalues.cgi
--- bugzilla-3.6/editvalues.cgi	2009-07-18 00:40:13.000000000 +0200
+++ bugzilla-3.6-fhs//editvalues.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -19,7 +19,7 @@
 # with some cleanup.
 
 use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Util;
diff -Naur -x '*~' bugzilla-3.6/editversions.cgi bugzilla-3.6-fhs//editversions.cgi
--- bugzilla-3.6/editversions.cgi	2009-04-10 11:36:43.000000000 +0200
+++ bugzilla-3.6-fhs//editversions.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -24,7 +24,7 @@
 #                 Frédéric Buclin <LpSolit@gmail.com>
 
 use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/editwhines.cgi bugzilla-3.6-fhs//editwhines.cgi
--- bugzilla-3.6/editwhines.cgi	2010-02-01 00:33:30.000000000 +0100
+++ bugzilla-3.6-fhs//editwhines.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -26,8 +26,7 @@
 ################################################################################
 
 use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/editworkflow.cgi bugzilla-3.6-fhs//editworkflow.cgi
--- bugzilla-3.6/editworkflow.cgi	2008-07-02 21:10:17.000000000 +0200
+++ bugzilla-3.6-fhs//editworkflow.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -20,8 +20,7 @@
 # Contributor(s): Frédéric Buclin <LpSolit@gmail.com>
 
 use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/email_in.pl bugzilla-3.6-fhs//email_in.pl
--- bugzilla-3.6/email_in.pl	2010-02-20 21:19:50.000000000 +0100
+++ bugzilla-3.6-fhs//email_in.pl	2010-04-13 21:09:02.000000000 +0200
@@ -21,18 +21,7 @@
 
 use strict;
 use warnings;
-
-# MTAs may call this script from any directory, but it should always
-# run from this one so that it can find its modules.
-use Cwd qw(abs_path);
-use File::Basename qw(dirname);
-BEGIN {
-    # Untaint the abs_path.
-    my ($a) = abs_path($0) =~ /^(.*)$/;
-    chdir dirname($a);
-}
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Data::Dumper;
 use Email::Address;
diff -Naur -x '*~' bugzilla-3.6/enter_bug.cgi bugzilla-3.6-fhs//enter_bug.cgi
--- bugzilla-3.6/enter_bug.cgi	2010-03-14 23:45:58.000000000 +0100
+++ bugzilla-3.6-fhs//enter_bug.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -35,8 +35,7 @@
 ##############################################################################
 
 use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/extensions/create.pl bugzilla-3.6-fhs//extensions/create.pl
--- bugzilla-3.6/extensions/create.pl	2009-11-25 06:02:55.000000000 +0100
+++ bugzilla-3.6-fhs//extensions/create.pl	2010-04-13 21:10:48.000000000 +0200
@@ -20,7 +20,7 @@
 #   Max Kanat-Alexander <mkanat@bugzilla.org>
 
 use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 use Bugzilla;
 use Bugzilla::Constants;
 use Bugzilla::Error;
diff -Naur -x '*~' bugzilla-3.6/importxml.pl bugzilla-3.6-fhs//importxml.pl
--- bugzilla-3.6/importxml.pl	2009-12-18 00:31:53.000000000 +0100
+++ bugzilla-3.6-fhs//importxml.pl	2010-04-13 21:08:09.000000000 +0200
@@ -54,16 +54,7 @@
 #
 #####################################################################
 
-use File::Basename qw(dirname);
-# MTAs may call this script from any directory, but it should always
-# run from this one so that it can find its modules.
-BEGIN {
-    require File::Basename;
-    my $dir = $0; $dir =~ /(.*)/; $dir = $1; # trick taint
-    chdir(File::Basename::dirname($dir));
-}
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 # Data dumber is used for debugging, I got tired of copying it back in 
 # and then removing it. 
 #use Data::Dumper;
diff -Naur -x '*~' bugzilla-3.6/index.cgi bugzilla-3.6-fhs//index.cgi
--- bugzilla-3.6/index.cgi	2009-10-09 06:31:09.000000000 +0200
+++ bugzilla-3.6-fhs//index.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -29,7 +29,7 @@
 use strict;
 
 # Include the Bugzilla CGI and general utility library.
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/install-module.pl bugzilla-3.6-fhs//install-module.pl
--- bugzilla-3.6/install-module.pl	2010-03-09 05:45:48.000000000 +0100
+++ bugzilla-3.6-fhs//install-module.pl	2010-04-13 21:08:09.000000000 +0200
@@ -21,15 +21,7 @@
 
 use strict;
 use warnings;
-
-# Have to abs_path('.') or calls to Bugzilla modules won't work once
-# CPAN has chdir'ed around. We do all of this in this funny order to
-# make sure that we use the lib/ modules instead of the base Perl modules,
-# in case the lib/ modules are newer.
-use Cwd qw(abs_path);
-use lib abs_path('.');
-use Bugzilla::Constants;
-use lib abs_path(bz_locations()->{ext_libpath});
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla::Install::CPAN;
 
diff -Naur -x '*~' bugzilla-3.6/jobqueue.pl bugzilla-3.6-fhs//jobqueue.pl
--- bugzilla-3.6/jobqueue.pl	2009-09-04 23:20:16.000000000 +0200
+++ bugzilla-3.6-fhs//jobqueue.pl	2010-04-13 21:08:09.000000000 +0200
@@ -23,9 +23,8 @@
 
 use strict;
 use File::Basename;
-BEGIN { chdir dirname($0); }
 
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 use Bugzilla;
 use Bugzilla::JobQueue::Runner;
 
diff -Naur -x '*~' bugzilla-3.6/jsonrpc.cgi bugzilla-3.6-fhs//jsonrpc.cgi
--- bugzilla-3.6/jsonrpc.cgi	2009-11-10 22:19:46.000000000 +0100
+++ bugzilla-3.6-fhs//jsonrpc.cgi	2010-04-13 21:13:38.000000000 +0200
@@ -21,7 +21,7 @@
 #   Max Kanat-Alexander <mkanat@bugzilla.org>
 
 use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/long_list.cgi bugzilla-3.6-fhs//long_list.cgi
--- bugzilla-3.6/long_list.cgi	2007-10-19 08:46:11.000000000 +0200
+++ bugzilla-3.6-fhs//long_list.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -22,7 +22,7 @@
 #                 Gervase Markham <gerv@gerv.net>
 
 use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 use Bugzilla;
 
 my $cgi = Bugzilla->cgi;
diff -Naur -x '*~' bugzilla-3.6/migrate.pl bugzilla-3.6-fhs//migrate.pl
--- bugzilla-3.6/migrate.pl	2009-10-24 07:30:15.000000000 +0200
+++ bugzilla-3.6-fhs//migrate.pl	2010-04-13 21:12:48.000000000 +0200
@@ -21,9 +21,8 @@
 #   Max Kanat-Alexander <mkanat@bugzilla.org>
 
 use strict;
+use lib '/usr/share/bugzilla/lib';
 use File::Basename;
-BEGIN { chdir dirname($0); }
-use lib qw(. lib);
 use Bugzilla;
 use Bugzilla::Migrate;
 
@@ -107,4 +106,4 @@
 You may also need to increase the number of file handles a process is allowed
 to hold open (as the migrator will create a file handle for each attachment
 in your database). On Linux and simliar systems, you can do this as root
-by typing C<ulimit -n 65535> before running your script.
\ Pas de fin de ligne à la fin du fichier.
+by typing C<ulimit -n 65535> before running your script.
diff -Naur -x '*~' bugzilla-3.6/page.cgi bugzilla-3.6-fhs//page.cgi
--- bugzilla-3.6/page.cgi	2010-02-09 01:02:57.000000000 +0100
+++ bugzilla-3.6-fhs//page.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -29,8 +29,7 @@
 ###############################################################################
 
 use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Error;
diff -Naur -x '*~' bugzilla-3.6/post_bug.cgi bugzilla-3.6-fhs//post_bug.cgi
--- bugzilla-3.6/post_bug.cgi	2010-04-07 05:31:29.000000000 +0200
+++ bugzilla-3.6-fhs//post_bug.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -25,7 +25,7 @@
 #                 Marc Schumann <wurblzap@gmail.com>
 
 use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Attachment;
diff -Naur -x '*~' bugzilla-3.6/process_bug.cgi bugzilla-3.6-fhs//process_bug.cgi
--- bugzilla-3.6/process_bug.cgi	2010-04-07 05:31:29.000000000 +0200
+++ bugzilla-3.6-fhs//process_bug.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -42,8 +42,7 @@
 # later processing.
 
 use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/query.cgi bugzilla-3.6-fhs//query.cgi
--- bugzilla-3.6/query.cgi	2010-01-31 18:52:38.000000000 +0100
+++ bugzilla-3.6-fhs//query.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -26,7 +26,7 @@
 #                 Max Kanat-Alexander <mkanat@bugzilla.org>
 
 use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Bug;
diff -Naur -x '*~' bugzilla-3.6/quips.cgi bugzilla-3.6-fhs//quips.cgi
--- bugzilla-3.6/quips.cgi	2008-11-05 19:38:49.000000000 +0100
+++ bugzilla-3.6-fhs//quips.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -24,8 +24,7 @@
 #                 Tobias Burnus <burnus@net-b.de>
 
 use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/relogin.cgi bugzilla-3.6-fhs//relogin.cgi
--- bugzilla-3.6/relogin.cgi	2009-04-15 19:52:46.000000000 +0200
+++ bugzilla-3.6-fhs//relogin.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -23,7 +23,7 @@
 #                 A. Karl Kornel <karl@kornel.name>
 
 use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Mailer;
diff -Naur -x '*~' bugzilla-3.6/report.cgi bugzilla-3.6-fhs//report.cgi
--- bugzilla-3.6/report.cgi	2010-02-18 20:33:13.000000000 +0100
+++ bugzilla-3.6-fhs//report.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -22,7 +22,7 @@
 #                 <rdean@cambianetworks.com>
 
 use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/reports.cgi bugzilla-3.6-fhs//reports.cgi
--- bugzilla-3.6/reports.cgi	2009-10-24 07:21:06.000000000 +0200
+++ bugzilla-3.6-fhs//reports.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -36,8 +36,7 @@
 #    Templatization.
 
 use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/request.cgi bugzilla-3.6-fhs//request.cgi
--- bugzilla-3.6/request.cgi	2010-02-01 00:33:31.000000000 +0100
+++ bugzilla-3.6-fhs//request.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -27,8 +27,7 @@
 
 # Make it harder for us to do dangerous things in Perl.
 use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Util;
diff -Naur -x '*~' bugzilla-3.6/runtests.pl bugzilla-3.6-fhs//runtests.pl
--- bugzilla-3.6/runtests.pl	2007-10-19 08:46:11.000000000 +0200
+++ bugzilla-3.6-fhs//runtests.pl	2010-04-13 21:08:09.000000000 +0200
@@ -23,7 +23,7 @@
 # Make it harder for us to do dangerous things in Perl.
 use diagnostics;
 use strict;
-use lib qw(lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Test::Harness qw(&runtests $verbose);
 
diff -Naur -x '*~' bugzilla-3.6/sanitycheck.cgi bugzilla-3.6-fhs//sanitycheck.cgi
--- bugzilla-3.6/sanitycheck.cgi	2009-12-18 00:31:53.000000000 +0100
+++ bugzilla-3.6-fhs//sanitycheck.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -25,8 +25,7 @@
 #                 Frédéric Buclin <LpSolit@gmail.com>
 
 use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Bug;
diff -Naur -x '*~' bugzilla-3.6/sanitycheck.pl bugzilla-3.6-fhs//sanitycheck.pl
--- bugzilla-3.6/sanitycheck.pl	2008-12-16 22:16:29.000000000 +0100
+++ bugzilla-3.6-fhs//sanitycheck.pl	2010-04-13 21:08:09.000000000 +0200
@@ -20,8 +20,7 @@
 # Contributor(s): Frédéric Buclin <LpSolit@gmail.com>
 
 use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/search_plugin.cgi bugzilla-3.6-fhs//search_plugin.cgi
--- bugzilla-3.6/search_plugin.cgi	2008-12-16 23:39:41.000000000 +0100
+++ bugzilla-3.6-fhs//search_plugin.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -16,7 +16,7 @@
 # Contributor(s): Frédéric Buclin <LpSolit@gmail.com>
 
 use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Error;
diff -Naur -x '*~' bugzilla-3.6/show_activity.cgi bugzilla-3.6-fhs//show_activity.cgi
--- bugzilla-3.6/show_activity.cgi	2009-01-25 13:42:52.000000000 +0100
+++ bugzilla-3.6-fhs//show_activity.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -23,8 +23,7 @@
 #                 Gervase Markham <gerv@gerv.net>
 
 use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Error;
diff -Naur -x '*~' bugzilla-3.6/showattachment.cgi bugzilla-3.6-fhs//showattachment.cgi
--- bugzilla-3.6/showattachment.cgi	2007-10-19 08:46:11.000000000 +0200
+++ bugzilla-3.6-fhs//showattachment.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -22,8 +22,7 @@
 #                 Jacob Steenhagen <jake@bugzilla.org>
 
 use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Util;
diff -Naur -x '*~' bugzilla-3.6/show_bug.cgi bugzilla-3.6-fhs//show_bug.cgi
--- bugzilla-3.6/show_bug.cgi	2009-11-10 17:31:48.000000000 +0100
+++ bugzilla-3.6-fhs//show_bug.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -21,8 +21,7 @@
 # Contributor(s): Terry Weissman <terry@mozilla.org>
 
 use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/showdependencygraph.cgi bugzilla-3.6-fhs//showdependencygraph.cgi
--- bugzilla-3.6/showdependencygraph.cgi	2010-03-08 02:05:21.000000000 +0100
+++ bugzilla-3.6-fhs//showdependencygraph.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -22,8 +22,7 @@
 #                 Gervase Markham <gerv@gerv.net>
 
 use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use File::Temp;
 
diff -Naur -x '*~' bugzilla-3.6/showdependencytree.cgi bugzilla-3.6-fhs//showdependencytree.cgi
--- bugzilla-3.6/showdependencytree.cgi	2008-06-29 23:57:54.000000000 +0200
+++ bugzilla-3.6-fhs//showdependencytree.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -25,8 +25,7 @@
 #                 Frédéric Buclin <LpSolit@gmail.com>
 
 use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Error;
diff -Naur -x '*~' bugzilla-3.6/sidebar.cgi bugzilla-3.6-fhs//sidebar.cgi
--- bugzilla-3.6/sidebar.cgi	2007-10-19 08:46:11.000000000 +0200
+++ bugzilla-3.6-fhs//sidebar.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -16,8 +16,7 @@
 # Contributor(s): Jacob Steenhagen <jake@bugzilla.org>
 
 use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Error;
diff -Naur -x '*~' bugzilla-3.6/summarize_time.cgi bugzilla-3.6-fhs//summarize_time.cgi
--- bugzilla-3.6/summarize_time.cgi	2009-11-10 17:31:48.000000000 +0100
+++ bugzilla-3.6-fhs//summarize_time.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -18,8 +18,7 @@
 #                 Frédéric Buclin <LpSolit@gmail.com>
 
 use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Date::Parse;         # strptime
 
diff -Naur -x '*~' bugzilla-3.6/testserver.pl bugzilla-3.6-fhs//testserver.pl
--- bugzilla-3.6/testserver.pl	2009-09-04 23:08:05.000000000 +0200
+++ bugzilla-3.6-fhs//testserver.pl	2010-04-13 21:08:09.000000000 +0200
@@ -19,7 +19,7 @@
 # issues as possible.
 
 use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/token.cgi bugzilla-3.6-fhs//token.cgi
--- bugzilla-3.6/token.cgi	2009-10-09 06:31:09.000000000 +0200
+++ bugzilla-3.6-fhs//token.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -27,8 +27,7 @@
 
 # Make it harder for us to do dangerous things in Perl.
 use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/userprefs.cgi bugzilla-3.6-fhs//userprefs.cgi
--- bugzilla-3.6/userprefs.cgi	2010-03-29 23:47:39.000000000 +0200
+++ bugzilla-3.6-fhs//userprefs.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -23,8 +23,7 @@
 #                 Shane H. W. Travis <travis@sedsystems.ca>
 
 use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/votes.cgi bugzilla-3.6-fhs//votes.cgi
--- bugzilla-3.6/votes.cgi	2010-04-07 05:31:30.000000000 +0200
+++ bugzilla-3.6-fhs//votes.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -25,7 +25,7 @@
 #                 Frédéric Buclin <LpSolit@gmail.com>
 
 use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/whineatnews.pl bugzilla-3.6-fhs//whineatnews.pl
--- bugzilla-3.6/whineatnews.pl	2008-04-02 19:42:26.000000000 +0200
+++ bugzilla-3.6-fhs//whineatnews.pl	2010-04-13 21:08:09.000000000 +0200
@@ -29,7 +29,7 @@
 # touched for more than the number of days specified in the whinedays param.
 
 use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Mailer;
diff -Naur -x '*~' bugzilla-3.6/whine.pl bugzilla-3.6-fhs//whine.pl
--- bugzilla-3.6/whine.pl	2009-12-28 01:58:47.000000000 +0100
+++ bugzilla-3.6-fhs//whine.pl	2010-04-13 21:08:09.000000000 +0200
@@ -25,8 +25,7 @@
 ################################################################################
 
 use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;
diff -Naur -x '*~' bugzilla-3.6/xml.cgi bugzilla-3.6-fhs//xml.cgi
--- bugzilla-3.6/xml.cgi	2007-10-19 08:46:11.000000000 +0200
+++ bugzilla-3.6-fhs//xml.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -23,8 +23,8 @@
 #                 Gervase Markham <gerv@gerv.net>
 
 use strict;
+use lib '/usr/share/bugzilla/lib';
 
-use lib qw(. lib);
 use Bugzilla;
 
 my $cgi = Bugzilla->cgi;
diff -Naur -x '*~' bugzilla-3.6/xmlrpc.cgi bugzilla-3.6-fhs//xmlrpc.cgi
--- bugzilla-3.6/xmlrpc.cgi	2009-11-10 22:19:46.000000000 +0100
+++ bugzilla-3.6-fhs//xmlrpc.cgi	2010-04-13 21:08:09.000000000 +0200
@@ -16,7 +16,7 @@
 # Contributor(s): Marc Schumann <wurblzap@gmail.com>
 
 use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
 
 use Bugzilla;
 use Bugzilla::Constants;