[Fai-commit] r4582 - in trunk: . debian

[lange at alioth.debian.org]

Author: lange
Date: 2007-09-15 17:51:23 +0000 (Sat, 15 Sep 2007)
New Revision: 4582

Modified:
   trunk/Makefile
   trunk/debian/control
   trunk/debian/fai-server.dirs
   trunk/debian/fai-server.install
Log:
new files and directories for faimond-gui, suggest perl-tk


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2007-09-15 17:50:45 UTC (rev 4581)
+++ trunk/Makefile	2007-09-15 17:51:23 UTC (rev 4582)
@@ -6,7 +6,7 @@
 LIBDIR = $(DESTDIR)/usr/lib/fai
 USRSBIN_SCRIPTS = make-fai-nfsroot make-fai-bootfloppy fai-setup fcopy ftar install_packages fai-chboot faimond fai-cd fai setup_harddisks faireboot fai-statoverride
 
-USRBIN_SCRIPTS = fai-class fai-do-scripts fai-mirror fai-debconf device2grub policy-rc.d.fai ainsl
+USRBIN_SCRIPTS = fai-class fai-do-scripts fai-mirror fai-debconf device2grub policy-rc.d.fai ainsl faimond-gui
 
 libfiles=$(wildcard lib/[a-z]*)  # do not include .svn dir and S01
 
@@ -26,7 +26,7 @@
 install: 
 	mkdir -p $(DESTDIR)/{sbin,man} $(DESTDIR)/etc/{modutils,dhcp3,apt/apt.conf.d}
 	mkdir -p $(DESTDIR)/usr/{sbin,bin} $(DESTDIR)/usr/lib/fai $(DESTDIR)/etc/fai/apt
-	mkdir -p $(DESTDIR)/etc/init.d
+	mkdir -p $(DESTDIR)/etc/init.d $(DESTDIR)/usr/share/fai/pixmaps
 	install man/* $(DESTDIR)/man
 	$(MAKE) -C doc install
 	-install $(libfiles) $(LIBDIR)
@@ -42,6 +42,7 @@
 	install -m644 conf/NFSROOT $(DESTDIR)/etc/fai
 	install -m644 conf/fai_modules_off $(DESTDIR)/etc/modutils
 	install -m755 lib/fai-abort $(DESTDIR)/etc/init.d
+	install -p -m644 pixmaps/*.gif $(DESTDIR)/usr/share/fai/pixmaps
 	perl -pi -e 's/_KERNELVERSION_/$(KERNELVERSION)/' $(KVERSION_FILES)
 	perl -pi -e 's/FAIVERSIONSTRING/$(VERSIONSTRING)/' $(DESTDIR)/usr/sbin/fai
 	cp -a examples $(DOCDIR)

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2007-09-15 17:50:45 UTC (rev 4581)
+++ trunk/debian/control	2007-09-15 17:51:23 UTC (rev 4582)
@@ -12,6 +12,7 @@
 Architecture: all
 Section: admin
 Depends: perl, file, libapt-pkg-perl
+Suggests: perl-tk
 Conflicts: fai
 Replaces: fai
 Description: Fully Automatic Installation client package

Modified: trunk/debian/fai-server.dirs
===================================================================
--- trunk/debian/fai-server.dirs	2007-09-15 17:50:45 UTC (rev 4581)
+++ trunk/debian/fai-server.dirs	2007-09-15 17:51:23 UTC (rev 4582)
@@ -2,3 +2,4 @@
 etc/fai/apt
 usr/bin
 usr/sbin
+usr/share/fai/pixmaps

Modified: trunk/debian/fai-server.install
===================================================================
--- trunk/debian/fai-server.install	2007-09-15 17:50:45 UTC (rev 4581)
+++ trunk/debian/fai-server.install	2007-09-15 17:51:23 UTC (rev 4582)
@@ -1,4 +1,5 @@
 sbin/fai-start-stop-daemon
+usr/bin/faimond-gui
 usr/sbin/fai-cd
 usr/sbin/fai-chboot
 usr/sbin/fai-setup
@@ -6,6 +7,7 @@
 usr/sbin/make-fai-nfsroot
 usr/sbin/make-fai-bootfloppy
 usr/bin/fai-mirror
+usr/share/fai/pixmaps/*
 etc/fai/menu.lst
 etc/fai/NFSROOT
 etc/fai/apt/sources.list