[Fai-commit] r2930 - in trunk: . debian
fai-repository at svn.debian.org
fai-repository at svn.debian.org
Sat Oct 8 19:58:03 UTC 2005
Author: lange
Date: 2005-10-08 19:58:02 +0000 (Sat, 08 Oct 2005)
New Revision: 2930
Added:
trunk/debian/fai-doc.dirs
trunk/debian/fai.dirs
trunk/debian/fai.postinst
trunk/debian/fai.postrm
trunk/debian/fai.preinst
trunk/debian/fai.prerm
Removed:
trunk/debian/dirs
trunk/debian/postinst
trunk/debian/postrm
trunk/debian/preinst
trunk/debian/prerm
Modified:
trunk/Makefile
trunk/debian/changelog
trunk/debian/control
trunk/debian/rules
Log:
move documentation and examples into new package fai-doc
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2005-10-08 19:13:40 UTC (rev 2929)
+++ trunk/Makefile 2005-10-08 19:58:02 UTC (rev 2930)
@@ -2,7 +2,7 @@
DESTDIR=$(shell pwd)/debian/fai
DEB_HOST_ARCH=$(MACHTYPE)
-export DOCDIR = $(DESTDIR)/usr/share/doc/fai
+export DOCDIR = $(shell pwd)/debian/fai-doc/usr/share/doc/fai-doc
LIBDIR = $(DESTDIR)/usr/lib/fai
SHAREDIR = $(DESTDIR)/usr/share/fai
SCRIPTSDIR = $(LIBDIR)/sbin
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-10-08 19:13:40 UTC (rev 2929)
+++ trunk/debian/changelog 2005-10-08 19:58:02 UTC (rev 2930)
@@ -1,3 +1,9 @@
+fai (2.9) unstable; urgency=low
+
+ * splitting binary package in fai and fai-doc
+
+ -- Thomas Lange <lange at debian.org> Sat, 8 Oct 2005 21:28:29 +0200
+
fai (2.8.4) unstable; urgency=high
* fix important bug: remove non-US entry (closes: #310392)
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2005-10-08 19:13:40 UTC (rev 2929)
+++ trunk/debian/control 2005-10-08 19:58:02 UTC (rev 2930)
@@ -16,3 +16,9 @@
PCs, turn on the power, and after a few minutes, Linux is installed,
configured, and running on the whole cluster, without any interaction
necessary. Homepage: http://www.informatik.uni-koeln.de/fai
+
+Package: fai-doc
+Architecture: all
+Description: Documentation for FAI
+ FAI is a tool for doing Fully Automatic Installation of Debian(-based) Linux
+ systems. This is the documentation for FAI in various formats.
Deleted: trunk/debian/dirs
===================================================================
--- trunk/debian/dirs 2005-10-08 19:13:40 UTC (rev 2929)
+++ trunk/debian/dirs 2005-10-08 19:58:02 UTC (rev 2930)
@@ -1,12 +0,0 @@
-var/run/fai/make-fai-nfsroot
-etc/fai
-sbin
-usr/bin
-usr/sbin
-usr/share/doc/fai/examples/advanced
-usr/share/doc/fai/examples/utils
-usr/share/fai/etc
-usr/lib/fai/sbin
-usr/lib/fai/nfsroot
-usr/share/perl5/Debian
-boot/fai
Added: trunk/debian/fai-doc.dirs
===================================================================
--- trunk/debian/fai-doc.dirs 2005-10-08 19:13:40 UTC (rev 2929)
+++ trunk/debian/fai-doc.dirs 2005-10-08 19:58:02 UTC (rev 2930)
@@ -0,0 +1,2 @@
+usr/share/doc/fai-doc/examples/advanced
+usr/share/doc/fai-doc/examples/utils
Copied: trunk/debian/fai.dirs (from rev 2929, trunk/debian/dirs)
===================================================================
--- trunk/debian/dirs 2005-10-08 19:13:40 UTC (rev 2929)
+++ trunk/debian/fai.dirs 2005-10-08 19:58:02 UTC (rev 2930)
@@ -0,0 +1,10 @@
+var/run/fai/make-fai-nfsroot
+etc/fai
+sbin
+usr/bin
+usr/sbin
+usr/share/fai/etc
+usr/lib/fai/sbin
+usr/lib/fai/nfsroot
+usr/share/perl5/Debian
+boot/fai
Copied: trunk/debian/fai.postinst (from rev 2928, trunk/debian/postinst)
Copied: trunk/debian/fai.postrm (from rev 2928, trunk/debian/postrm)
Copied: trunk/debian/fai.preinst (from rev 2928, trunk/debian/preinst)
Copied: trunk/debian/fai.prerm (from rev 2928, trunk/debian/prerm)
Deleted: trunk/debian/postinst
===================================================================
--- trunk/debian/postinst 2005-10-08 19:13:40 UTC (rev 2929)
+++ trunk/debian/postinst 2005-10-08 19:58:02 UTC (rev 2930)
@@ -1,56 +0,0 @@
-#! /bin/sh
-
-# $Id $
-#*********************************************************************
-# postinst -- setup fai
-#
-# This script is part of FAI (Fully Automatic Installation)
-# Copyright (c) 2000-2005 by Thomas Lange, Universitaet zu Koeln
-#*********************************************************************
-#
-# see: dh_installdeb(1)
-
-set -e
-
-
-# summary of how this script can be called:
-# * <postinst> `configure' <most-recently-configured-version>
-# * <old-postinst> `abort-upgrade' <new version>
-# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-# <new-version>
-# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-# <failed-install-package> <version> `removing'
-# <conflicting-package> <version>
-# for details, see /usr/share/doc/packaging-manual/
-#
-# quoting from the policy:
-# Any necessary prompting should almost always be confined to the
-# post-installation script, and should be protected with a conditional
-# so that unnecessary prompting doesn't happen if a package's
-# installation fails and the `postinst' is called with `abort-upgrade',
-# `abort-remove' or `abort-deconfigure'.
-
-
-case "$1" in
- configure)
-
- echo "Now edit fai.conf, make-fai-nfsroot.conf and sources.list in /etc/fai and call fai-setup."
- echo "Especially, you'll have to replace the placeholder INSTALLSERVER in /etc/fai/fai.conf."
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
-
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 0
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
Deleted: trunk/debian/postrm
===================================================================
--- trunk/debian/postrm 2005-10-08 19:13:40 UTC (rev 2929)
+++ trunk/debian/postrm 2005-10-08 19:58:02 UTC (rev 2930)
@@ -1,26 +0,0 @@
-#! /bin/sh
-
-# postrm script for fai
-
-
-set -e
-
-case "$1" in
- purge)
- rm -rf /boot/fai /var/run/fai
- ;;
-
- remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;;
-
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
-
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
Deleted: trunk/debian/preinst
===================================================================
--- trunk/debian/preinst 2005-10-08 19:13:40 UTC (rev 2929)
+++ trunk/debian/preinst 2005-10-08 19:58:02 UTC (rev 2930)
@@ -1,46 +0,0 @@
-#! /bin/sh
-# preinst script for fai
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <new-preinst> `install'
-# * <new-preinst> `install' <old-version>
-# * <new-preinst> `upgrade' <old-version>
-# * <old-preinst> `abort-upgrade' <new-version>
-#
-# For details see /usr/share/doc/packaging-manual/
-
-case "$1" in
- upgrade)
-
- if [ -e /etc/fai.conf -a ! -e /etc/fai/fai.conf ]; then
- echo "Moving old /etc/fai.conf to new location /etc/fai/fai.conf"
- mkdir /etc/fai
- cp -p /etc/fai.conf /etc/fai/fai.conf
- fi
-
- ;;
-
- abort-upgrade)
- rm -f /etc/fai/fai.conf
- ;;
-
- install) ;;
-
- *)
- echo "preinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
Deleted: trunk/debian/prerm
===================================================================
--- trunk/debian/prerm 2005-10-08 19:13:40 UTC (rev 2929)
+++ trunk/debian/prerm 2005-10-08 19:58:02 UTC (rev 2930)
@@ -1,68 +0,0 @@
-#! /bin/sh
-
-# $Id$
-#
-# prerm script for fai
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <prerm> `remove'
-# * <old-prerm> `upgrade' <new-version>
-# * <new-prerm> `failed-upgrade' <old-version>
-# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-# * <deconfigured's-prerm> `deconfigure' `in-favour'
-# <package-being-installed> <version> `removing'
-# <conflicting-package> <version>
-# for details, see /usr/share/doc/packaging-manual/
-
-# nothing to do during upgrade
-case "$1" in
- upgrade) exit 0 ;;
-esac
-
-. /etc/fai/fai.conf
-. /etc/fai/make-fai-nfsroot.conf
-
-test -f /etc/init.d/nfs-kernel-server && nfsserver=nfs-kernel-server
-test -f /etc/init.d/nfs-user-server && nfsserver=nfs-user-server
-
-case "$1" in
- upgrade) exit 0 ;;
-
- remove|deconfigure)
-
- if [ -z "$NFSROOT" ]; then
- echo "\$NFSROOT is not set. Please check your settings in fai.conf."
- exit 4
- fi
- echo "WARNING: removing NFSROOT $NFSROOT"
- sleep 2
- rm -rf $NFSROOT || true
-
- perl -ni.bak -e "print unless m#^$FAI_CONFIGDIR\s|^$NFSROOT\s#" /etc/exports
- [ -n "$nfsserver" ] && /etc/init.d/$nfsserver reload || true
-
- rmdir $FAI_CONFIGDIR || true
-
- [ -f /home/$LOGUSER/.account_created_by_fai_package ] && userdel -r $LOGUSER
-
- ;;
- failed-upgrade)
- ;;
- *)
- echo "prerm called with unknown argument \`$1'" >&2
- exit 0
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2005-10-08 19:13:40 UTC (rev 2929)
+++ trunk/debian/rules 2005-10-08 19:58:02 UTC (rev 2930)
@@ -2,8 +2,11 @@
DESTDIR=`pwd`/debian/fai
SHAREDIR = $(DESTDIR)/usr/share/fai
-DOCDIR=$(DESTDIR)/usr/share/doc/fai
+DOCDIR=`pwd`/debian/fai-doc/usr/share/doc/fai-doc
+# we never want CVS and subversion files in our packages
+export DH_ALWAYS_EXCLUDE=CVS:.svn
+
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -32,7 +35,7 @@
dh_clean -k
dh_installdirs
# Add here commands to install the package into debian/fai.
- $(MAKE) install DESTDIR=${DESTDIR}
+ $(MAKE) install
# Build architecture-independent files here.
binary-indep: build install
@@ -54,7 +57,6 @@
find ${DOCDIR}/examples/*/files -name postinst | xargs chmod a+x
chmod a+rx ${DOCDIR}/examples/utils/*
perl -pi -e 's/FAIVERSIONSTRING/$(VERSIONSTRING)/' ${DOCDIR}/README
- find ${DESTDIR} -name CVS |xargs rm -rf
# You may want to make some executables suid here.
dh_installdeb
dh_gencontrol
More information about the Fai-commit
mailing list