[Pkg-bugzilla-commits] r50 - in trunk/bugzilla-2.18: . Bugzilla debian

[Alexis Sukrieh]

Author: sukria-guest
Date: 2005-04-20 10:14:37 +0000 (Wed, 20 Apr 2005)
New Revision: 50

Modified:
   trunk/bugzilla-2.18/Bugzilla/Config.pm
   trunk/bugzilla-2.18/Makefile
   trunk/bugzilla-2.18/debian/bugzilla.links
Log:
params is now a conffile

Modified: trunk/bugzilla-2.18/Bugzilla/Config.pm
===================================================================
--- trunk/bugzilla-2.18/Bugzilla/Config.pm	2005-04-18 14:48:30 UTC (rev 49)
+++ trunk/bugzilla-2.18/Bugzilla/Config.pm	2005-04-20 10:14:37 UTC (rev 50)
@@ -263,6 +263,8 @@
 
     close $fh;
 
+	# TODO : Debian ; maybe a thing like 
+	# rename $tmpname, "$datadir/params.new" and use ucf after...
     rename $tmpname, "$datadir/params"
       || die "Can't rename $tmpname to $datadir/params: $!";
 

Modified: trunk/bugzilla-2.18/Makefile
===================================================================
--- trunk/bugzilla-2.18/Makefile	2005-04-18 14:48:30 UTC (rev 49)
+++ trunk/bugzilla-2.18/Makefile	2005-04-20 10:14:37 UTC (rev 50)
@@ -21,7 +21,7 @@
 lib_dir		= Bugzilla
 static_dirs	= css js skins data graphs 
 static_files	= *.js *.txt *.gif *.png *.jpg quicksearchhack.html quicksearch.html
-config_files	= localconfig index.html
+config_files	= localconfig index.html data/params
 
 install: install_static_dirs install_static_files install_lib_files \
 	 install_cgi install_config install_template install_contrib
@@ -82,7 +82,9 @@
 	@for this_file in $(shell find js -type f) ; do \
 		install -m 0644 -o root -g root $$this_file $(BUGZILLA_WWW)/`dirname $$this_file` ;\
 	done
-	@for this_file in $(shell find data -type f) ; do \
+	# The tricky point here, is to leave "params" alone, that's a conffile now 
+	# We'll handle it by hand in postinst.
+	@for this_file in $(shell find data -type f -name '!params') ; do \
 		install -m 0644 -o root -g root $$this_file $(BUGZILLA_WWW)/`dirname $$this_file` ;\
 	done
 	@for this_file in $(shell find graph -type f) ; do \

Modified: trunk/bugzilla-2.18/debian/bugzilla.links
===================================================================
--- trunk/bugzilla-2.18/debian/bugzilla.links	2005-04-18 14:48:30 UTC (rev 49)
+++ trunk/bugzilla-2.18/debian/bugzilla.links	2005-04-20 10:14:37 UTC (rev 50)
@@ -1,2 +1,3 @@
 usr/share/bugzilla/web var/www/bugzilla
 etc/bugzilla/index.html usr/share/bugzilla/web/index.html
+etc/bugzilla/params usr/share/bugzilla/web/data/params