[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 0.7-17-gebc44f7

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit c0be99852923464f13dd861a429d7014fa1cb4e3
Author: Andreas B. Mundt <andi at debian.org>
Date:   Sun Feb 3 09:43:23 2013 +0100

    Drop the config space to /usr/share, not /usr/share/doc.
    
    A package must still work with /usr/share/doc removed.

diff --git a/debian/README.Debian b/debian/README.Debian
index 280ea1a..f83bd51 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -22,7 +22,7 @@ Create the CD image in the following way:
    aptitude install debian-lan-config  # might be already installed
    aptitude -R install fai-server genisoimage  # no recommends needed
    mkdir /srv/fai/
-   cp -r /usr/share/doc/debian-lan-config/fai/config /srv/fai/
+   cp -r /usr/share/debian-lan-config/fai/config /srv/fai/
    cp /srv/fai/config/files/etc/fai/grub.cfg/SERVER_A /etc/fai/grub.cfg
    cp /srv/fai/config/files/etc/fai/NFSROOT/FAISERVER /etc/fai/NFSROOT
    sed -i "s/^deb.*fai-project/\#&/" /etc/fai/apt/sources.list
@@ -52,7 +52,7 @@ Then convert the installation with the following commands:
    aptitude install debian-lan-config  # might be already installed
    aptitude -R install fai-server      # no recommends needed
    mkdir /srv/fai/
-   cp -r /usr/share/doc/debian-lan-config/fai/config /srv/fai/
+   cp -r /usr/share/debian-lan-config/fai/config /srv/fai/
 
 Adapt the config space to your needs if necessary and run FAI with the
 variable CONVERT set to true:
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index dc38a63..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-fai/
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..05939ef
--- /dev/null
+++ b/debian/install
@@ -0,0 +1 @@
+fai/config /usr/share/debian-lan-config/fai/
diff --git a/debian/rules b/debian/rules
index d4e9f93..955dd78 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,3 @@
 
 %:
 	dh $@
-
-override_dh_compress:
-	dh_compress --exclude=fai/config
diff --git a/fai/config/files/usr/local/sbin/dhcpd-keytab/SERVER_A b/fai/config/files/usr/local/sbin/dhcpd-keytab/SERVER_A
old mode 100644
new mode 100755

-- 
Debian-LAN development and packaging