[Pkg-bugzilla-commits] r77 - in trunk/bugzilla-2.18/debian: . patches

[Alexis Sukrieh]

Author: sukria-guest
Date: 2005-04-23 15:43:30 +0000 (Sat, 23 Apr 2005)
New Revision: 77

Modified:
   trunk/bugzilla-2.18/debian/bugzilla.postinst
   trunk/bugzilla-2.18/debian/patches/101_Config.diff
Log:
Bugfix in our patch sequence

Modified: trunk/bugzilla-2.18/debian/bugzilla.postinst
===================================================================
--- trunk/bugzilla-2.18/debian/bugzilla.postinst	2005-04-23 15:29:51 UTC (rev 76)
+++ trunk/bugzilla-2.18/debian/bugzilla.postinst	2005-04-23 15:43:30 UTC (rev 77)
@@ -93,7 +93,7 @@
 	
 	# We want checksetup.pl to write the new params file in params.new
 	# Then Config.pm has to be patched
-	patch -p2 -d /usr/share/perl5 < /usr/share/bugzilla/debian/101_Config.diff 
+	patch -p1 -d /usr/share/perl5 < /usr/share/bugzilla/debian/101_Config.diff > /dev/null
 	
 	# Call checksetup now that everything is ready
 	# The params file will then be updated if needed, the resulting file
@@ -106,7 +106,7 @@
 	fi
 	
 	# We restore the good Config.pm file
-	patch -R -p1 -d /usr/share/perl5 < /usr/share/bugzilla/debian/101_Config.diff 
+	patch -R -p1 -d /usr/share/perl5 < /usr/share/bugzilla/debian/101_Config.diff > /dev/null
 	
 	# the answerfile should be removed now
 	rm -f $answerfile

Modified: trunk/bugzilla-2.18/debian/patches/101_Config.diff
===================================================================
--- trunk/bugzilla-2.18/debian/patches/101_Config.diff	2005-04-23 15:29:51 UTC (rev 76)
+++ trunk/bugzilla-2.18/debian/patches/101_Config.diff	2005-04-23 15:43:30 UTC (rev 77)
@@ -1,11 +1,29 @@
---- bugzilla-2.18.orig/Bugzilla/Config.pm	2005-04-23 16:17:08.108546800 +0200
-+++ bugzilla-2.18/Bugzilla/Config.pm	2005-04-23 16:32:19.635973568 +0200
-@@ -56,7 +56,7 @@
- our $datadir = "$libpath/web/data";
- our $templatedir = "$libpath/template";
- our $webdotdir = "$datadir/webdot";
--our $params_file = "/etc/bugzilla/params";
-+our $params_file = "/usr/share/bugzilla/debian/params.new";
+--- Bugzilla/Config.pm	2005-04-23 17:49:18.921735392 +0200
++++ Bugzilla/Config.pm.debian	2005-04-23 17:47:40.586684592 +0200
+@@ -251,6 +251,8 @@
+ sub WriteParams {
+     require Data::Dumper;
  
- # Module stuff
- @Bugzilla::Config::EXPORT = qw(Param);
++    my $params_218_new="/usr/share/bugzilla/debian/params.new";
++
+     # This only has an affect for Data::Dumper >= 2.12 (ie perl >= 5.8.0)
+     # Its just cosmetic, though, so that doesn't matter
+     local $Data::Dumper::Sortkeys = 1;
+@@ -267,7 +269,7 @@
+     # this works really better than the original rename() call
+     # and will prevent overwriting of symlinks.
+     open TMPFILE, "<$tmpname" or die "$!";
+-    open PARAMSFILE, ">$params_file" or die $!;
++    open PARAMSFILE, ">$params_218_new" or die $!;
+     while (<TMPFILE>) {
+            print PARAMSFILE $_;
+     }
+@@ -275,7 +277,7 @@
+     close PARAMSFILE;
+     unlink $tmpname;
+ 
+-    ChmodDataFile($params_file, 0666);
++    ChmodDataFile($params_218_new, 0666);
+ }
+ 
+ # Some files in the data directory must be world readable iff we don't have