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

[Alexis Sukrieh]

Author: sukria-guest
Date: 2005-04-21 20:17:33 +0000 (Thu, 21 Apr 2005)
New Revision: 62

Modified:
   trunk/bugzilla-2.18/Makefile
   trunk/bugzilla-2.18/debian/bugzilla.links
   trunk/bugzilla-2.18/debian/rules
Log:
That works but it's not yet perfect...



Modified: trunk/bugzilla-2.18/Makefile
===================================================================
--- trunk/bugzilla-2.18/Makefile	2005-04-21 19:59:58 UTC (rev 61)
+++ trunk/bugzilla-2.18/Makefile	2005-04-21 20:17:33 UTC (rev 62)
@@ -10,7 +10,6 @@
 BUGZILLA_CONFIG = $(DESTDIR)/etc/bugzilla
 BUGZILLA_CGIDIR = $(DESTDIR)/usr/lib/cgi-bin/bugzilla
 BUGZILLA_ROOT	= $(DESTDIR)/usr/share/bugzilla
-BUGZILLA_TPL_ROOT = $(DESTDIR)/etc/bugzilla
 BUGZILLA_WWW	= $(BUGZILLA_ROOT)/web
 BUGZILLA_LIBDIR = $(BUGZILLA_ROOT)
 BUGZILLA_CONTRIB= $(BUGZILLA_ROOT)/contrib
@@ -67,10 +66,10 @@
 
 install_template:
 	@for this_dir in $(shell find template -type d) ; do \
-		install -d -m 0755 -o root -g root $(BUGZILLA_TPL_ROOT)/$$this_dir ;\
+		install -d -m 0755 -o root -g root $(BUGZILLA_ROOT)/$$this_dir ;\
 	done
 	@for this_file in $(shell find template -type f) ; do \
-		install -m 0644 -o root -g root $$this_file $(BUGZILLA_TPL_ROOT)/`dirname $$this_file` ;\
+		install -m 0644 -o root -g root $$this_file $(BUGZILLA_ROOT)/`dirname $$this_file` ;\
 	done
 
 

Modified: trunk/bugzilla-2.18/debian/bugzilla.links
===================================================================
--- trunk/bugzilla-2.18/debian/bugzilla.links	2005-04-21 19:59:58 UTC (rev 61)
+++ trunk/bugzilla-2.18/debian/bugzilla.links	2005-04-21 20:17:33 UTC (rev 62)
@@ -1,4 +1,2 @@
 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
-etc/bugzilla/template usr/share/bugzilla/template

Modified: trunk/bugzilla-2.18/debian/rules
===================================================================
--- trunk/bugzilla-2.18/debian/rules	2005-04-21 19:59:58 UTC (rev 61)
+++ trunk/bugzilla-2.18/debian/rules	2005-04-21 20:17:33 UTC (rev 62)
@@ -72,6 +72,7 @@
 	# We install our debian helpers
 	install -d -m 0755 -o root -g root $(CURDIR)/debian/bugzilla/usr/share/bugzilla/debian 
 	install    -m 0755 -o root -g root debian/helper/postinst-db.pl $(CURDIR)/debian/bugzilla/usr/share/bugzilla/debian/postinst-db.pl
+	install    -m 0644 -o root -g root data/params $(CURDIR)/debian/bugzilla/usr/share/bugzilla/debian
 	install    -m 0644 -o root -g root debian/patches/101_Config_params.diff $(CURDIR)/debian/bugzilla/usr/share/bugzilla/debian
 	
 	# remove all the CVS entries in the build dir