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

[Alexis Sukrieh]

Author: sukria-guest
Date: 2005-04-22 12:03:42 +0000 (Fri, 22 Apr 2005)
New Revision: 68

Added:
   trunk/bugzilla-2.18/debian/bugzilla.conffiles
Modified:
   trunk/bugzilla-2.18/Makefile
   trunk/bugzilla-2.18/debian/bugzilla.postinst
   trunk/bugzilla-2.18/debian/bugzilla.templates
Log:
added conffiles

Modified: trunk/bugzilla-2.18/Makefile
===================================================================
--- trunk/bugzilla-2.18/Makefile	2005-04-22 11:46:24 UTC (rev 67)
+++ trunk/bugzilla-2.18/Makefile	2005-04-22 12:03:42 UTC (rev 68)
@@ -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 data/params
+config_files	= localconfig index.html 
 
 install: install_static_dirs install_static_files install_lib_files \
 	 install_cgi install_config install_template install_contrib

Added: trunk/bugzilla-2.18/debian/bugzilla.conffiles
===================================================================
--- trunk/bugzilla-2.18/debian/bugzilla.conffiles	2005-04-22 11:46:24 UTC (rev 67)
+++ trunk/bugzilla-2.18/debian/bugzilla.conffiles	2005-04-22 12:03:42 UTC (rev 68)
@@ -0,0 +1 @@
+/usr/share/bugzilla/web/data/params

Modified: trunk/bugzilla-2.18/debian/bugzilla.postinst
===================================================================
--- trunk/bugzilla-2.18/debian/bugzilla.postinst	2005-04-22 11:46:24 UTC (rev 67)
+++ trunk/bugzilla-2.18/debian/bugzilla.postinst	2005-04-22 12:03:42 UTC (rev 68)
@@ -65,20 +65,14 @@
 			# We are upgrading from 2.16, then $params_218_dest is only our 
 			# package's version, we can safely remove it and use the old 2.16 file
 			replace_file $params_216 $params_218_dest
-		
-		# Strange, we upgrade but we don't find any 2.16 file...
-		# using the default one
-		else 
-			replace_file $params_218_src $params_218_dest 
 		fi
+	fi
 
-	# Here we don't upgrade from lower than 2.18, then we can put safely 
-	# our params file
-	else 
+	# If there's no $params_218_dest yet, let's move our package version
+	if [ ! -f $params_218_dest ]; then
 		replace_file $params_218_src $params_218_dest 
 	fi
 
-
 	# Debconf is needed here for the postinst-db.pl script
 	. /usr/share/debconf/confmodule
 	

Modified: trunk/bugzilla-2.18/debian/bugzilla.templates
===================================================================
--- trunk/bugzilla-2.18/debian/bugzilla.templates	2005-04-22 11:46:24 UTC (rev 67)
+++ trunk/bugzilla-2.18/debian/bugzilla.templates	2005-04-22 12:03:42 UTC (rev 68)
@@ -145,8 +145,3 @@
  .
  Choosing "Later" means that you don't have yet a MySQL server up
  for Bugzilla. This choice will abort the installation process.
-
-Template: bugzilla/bugzilla_upgrade_note
-Type: note
-_Description: Upgrade of the "params" file 
-