From 15c6107d196baeb2ec9f4dea371b836306e09182 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Mayer?= <jmayer@loplof.de>
Date: Tue, 20 Aug 2002 00:59:42 +0000
Subject: [PATCH] Add the FAQ to the packages.

svn path=/trunk/; revision=6028
---
 packaging/nsis/Makefile.nmake        | 3 ++-
 packaging/nsis/ethereal.nsi          | 4 +++-
 packaging/rpm/SPECS/ethereal.spec.in | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index 80762783a3..028160d0c0 100644
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.13 2002/08/19 15:48:28 gerald Exp $
+# $Id: Makefile.nmake,v 1.14 2002/08/20 00:59:39 jmayer Exp $
 #
 # NSIS is a free packager/installer/uninstaller program for Win32.
 # It was originally written for the Winamp package, but various
@@ -17,6 +17,7 @@ DOC=../../doc/ethereal.html		\
 	../../doc/editcap.html 		\
 	../../doc/text2pcap.html 	\
 	../../doc/mergecap.html 	\
+	../../FAQ			\
 	../../README			\
 	../../README.win32
 GPL=GPL.txt
diff --git a/packaging/nsis/ethereal.nsi b/packaging/nsis/ethereal.nsi
index 47ad6b4482..d928a898d7 100644
--- a/packaging/nsis/ethereal.nsi
+++ b/packaging/nsis/ethereal.nsi
@@ -1,7 +1,7 @@
 ;
 ; ethereal.nsi
 ;
-; $Id: ethereal.nsi,v 1.3 2002/08/19 15:48:28 gerald Exp $
+; $Id: ethereal.nsi,v 1.4 2002/08/20 00:59:39 jmayer Exp $
 
 ; ============================================================================
 ; Header configuration
@@ -72,6 +72,7 @@ File "${COMMON_FILES_GNU}\glib-1.3.dll"
 File "${COMMON_FILES_GNU}\gmodule-1.3.dll"
 File "${COMMON_FILES_GNU}\gnu-intl.dll"
 ;File "${COMMON_FILES_GNU}\zlib.dll"
+File "..\..\FAQ"
 File "..\..\README"
 File "..\..\README.win32"
 File "..\..\manuf"
@@ -164,6 +165,7 @@ Section "Uninstall"
 DeleteRegKey HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Ethereal"
 DeleteRegKey HKEY_LOCAL_MACHINE SOFTWARE\Ethereal
 
+Delete "$INSTDIR\FAQ"
 Delete "$INSTDIR\README*"
 Delete "$INSTDIR\manuf"
 Delete "$INSTDIR\dictionary.dtd"
diff --git a/packaging/rpm/SPECS/ethereal.spec.in b/packaging/rpm/SPECS/ethereal.spec.in
index 4524497eb6..d8b06a69f7 100644
--- a/packaging/rpm/SPECS/ethereal.spec.in
+++ b/packaging/rpm/SPECS/ethereal.spec.in
@@ -47,7 +47,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root)
-%doc AUTHORS COPYING ChangeLog INSTALL NEWS README
+%doc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README
 %doc README.hpux  README.linux  README.vmware
 %doc README.aix  README.irix  README.tru64  README.win32
 %doc README.bsd