From 2b6d92c5fdfc7e96ce0c40a480edc021dbd20607 Mon Sep 17 00:00:00 2001
From: codehelp <codehelp@debian.org>
Date: Sat, 20 Jun 2009 22:12:53 +0000
Subject: [PATCH] Examples moved into /usr/share/doc/emdebian-rootfs/examples
 (Closes: #533236)

git-svn-id: http://emdebian.org/svn/current@6503 563faec7-e20c-0410-992a-a66f704d0ccd
---
 debian/changelog               | 4 +++-
 debian/control                 | 2 +-
 debian/emdebian-rootfs.install | 8 ++++----
 doc/xml/emsandbox.1.xml        | 4 ++++
 examples/README                | 4 ++--
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 58492e3..d283e3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ emdebian-rootfs (2.0.2) unstable; urgency=low
   * emrootfslib : Add provide_empty_dpkg_divert function for Crush.
   * Update default values for MIRROR (Closes: #532764)
   * emrootfslib : Add for empty scripts to replace adduser
+  * Examples moved into /usr/share/doc/emdebian-rootfs/examples
+    (Closes: #533236)
 
- -- Neil Williams <codehelp@debian.org>  Sat, 13 Jun 2009 17:45:33 +0100
+ -- Neil Williams <codehelp@debian.org>  Sat, 20 Jun 2009 22:45:43 +0100
 
 emdebian-rootfs (2.0.1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 4f083b9..5bc2471 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Wookey <wookey@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), po-debconf
 Build-Depends-Indep: devscripts, docbook-xml, docbook-xsl,
  gnupg, libxml2-utils, po4a, xml-core, xsltproc
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 Homepage: http://www.emdebian.org/
 Vcs-Browser: http://buildd.emdebian.org/svn/browser/current/
 Vcs-Svn: http://buildd.emdebian.org/repos/current/
diff --git a/debian/emdebian-rootfs.install b/debian/emdebian-rootfs.install
index 870dd66..e9f8ea1 100644
--- a/debian/emdebian-rootfs.install
+++ b/debian/emdebian-rootfs.install
@@ -11,8 +11,8 @@ emdebian.gpe ./usr/share/emdebian-tools/
 emdebian.coreutils ./usr/share/emdebian-tools/
 doc/man/man1/emsandbox.1 ./usr/share/man/man1/
 doc/man/man3/* ./usr/share/man/man3/
-examples/packages.conf ./usr/share/emdebian-tools/examples/machine/default/
-examples/setup.sh ./usr/share/emdebian-tools/examples/machine/default/
-examples/config.sh ./usr/share/emdebian-tools/examples/machine/default/
-examples/README ./usr/share/emdebian-tools/examples/
+examples/packages.conf ./usr/share/doc/emdebian-rootfs/examples/
+examples/setup.sh ./usr/share/doc/emdebian-rootfs/examples/
+examples/config.sh ./usr/share/doc/emdebian-rootfs/examples/
+examples/README ./usr/share/doc/emdebian-rootfs/examples/
 emdebian-rootfs ./etc/bash_completion.d/
diff --git a/doc/xml/emsandbox.1.xml b/doc/xml/emsandbox.1.xml
index 86fc4d4..6414850 100644
--- a/doc/xml/emsandbox.1.xml
+++ b/doc/xml/emsandbox.1.xml
@@ -205,6 +205,10 @@ I: Extracting base-passwd...
           <filename>setup.sh</filename> and <filename>config.sh</filename> shell
           scripts (which may be empty).
           </para>
+          <para>Examples of <filename>packages.conf</filename>,
+          <filename>setup.sh</filename> and <filename>config.sh</filename> are
+          in <filename>/usr/share/doc/emdebian-rootfs/examples/</filename>
+          </para>
         </listitem>
       </varlistentry>
       <varlistentry>
diff --git a/examples/README b/examples/README
index 57fe530..8069b93 100644
--- a/examples/README
+++ b/examples/README
@@ -2,8 +2,8 @@
 					======================
 
 
-The example files live machine/default so that you can copy
-the files into the right place in your machine:variant hierarchy.
+The example files exist so that you can copy the files into the
+right place in your machine:variant hierarchy.
 
 $WORK/machine/$machine_name/default/packages.conf
 $WORK/machine/$machine_name/default/config.sh