@@ -5,6 +5,7 @@

   Significant changes since merge chiark/anarres/mnemeth:
+  * example config files from Relativity shipped.

diff --git a/backup/Makefile b/backup/Makefile
index ded6a8c2aef82207048a5a9452f888269b1edc23..4d7a9e2cc418a60cb9f8c66abc2ecfbde36cb73f 100644 (file)
--- a/backup/Makefile
+++ b/backup/Makefile
@@ -35,6 +35,8 @@ prefix=/usr/local
 etcdir=/etc/chiark-backup
 bindir=$(prefix)/bin
 sharedir=$(prefix)/share/chiark-backup
+txtdocdir=$(prefix)/share/doc/chiark-backup/examples
+exampledir=$(txtdocdir)/examples
 
 INSTALL=               install -c
 INSTALL_SHARE=         $(INSTALL) -m 644 -o root -g root
@@ -47,6 +49,8 @@ BINSCRIPTS=   checkallused loaded driver takedown whatsthis
 SHARESCRIPTS=  bringup full increm
 SHAREFILES=    backuplib.pl
 
+EXAMPLES=      relativity
+
 all:           $(CTARGETS)
 
 readbuffer:                            readbuffer.o rwbuffer.o
@@ -61,6 +65,13 @@ install:             all
                $(INSTALL_SHARE) $(SHAREFILES) $(sharedir)
                $(INSTALL_SCRIPT) $(SHARESCRIPTS) $(sharedir)
 
+install-examples:
+               set -e; for e in $(EXAMPLES); do \
+                       cd examples/$$e; \
+                       $(INSTALL_DIRECTORY) $(exampledir)/$$e; \
+                       $(INSTALL_SHARE) *[^S~] $(exampledir)/$$e; \
+               done
+
 clean:
                rm -f *~ ./#*# *.o
 

diff --git a/backup/expected-diffs b/backup/examples/relativity/expected-diffs
similarity index 100%
rename from backup/expected-diffs
rename to backup/examples/relativity/expected-diffs

diff --git a/backup/fsys.all b/backup/examples/relativity/fsys.all
similarity index 100%
rename from backup/fsys.all
rename to backup/examples/relativity/fsys.all

diff --git a/backup/fsys.pt0 b/backup/examples/relativity/fsys.pt0
similarity index 100%
rename from backup/fsys.pt0
rename to backup/examples/relativity/fsys.pt0

diff --git a/backup/fsys.pt1 b/backup/examples/relativity/fsys.pt1
similarity index 100%
rename from backup/fsys.pt1
rename to backup/examples/relativity/fsys.pt1

diff --git a/backup/fsys.pt2 b/backup/examples/relativity/fsys.pt2
similarity index 100%
rename from backup/fsys.pt2
rename to backup/examples/relativity/fsys.pt2

diff --git a/backup/ifsys.prefixes b/backup/examples/relativity/ifsys.prefixes
similarity index 100%
rename from backup/ifsys.prefixes
rename to backup/examples/relativity/ifsys.prefixes

diff --git a/backup/ifsys.pt0 b/backup/examples/relativity/ifsys.pt0
similarity index 100%
rename from backup/ifsys.pt0
rename to backup/examples/relativity/ifsys.pt0

diff --git a/backup/ifsys.pt1 b/backup/examples/relativity/ifsys.pt1
similarity index 100%
rename from backup/ifsys.pt1
rename to backup/examples/relativity/ifsys.pt1

diff --git a/backup/ifsys.pt2 b/backup/examples/relativity/ifsys.pt2
similarity index 100%
rename from backup/ifsys.pt2
rename to backup/examples/relativity/ifsys.pt2

diff --git a/backup/settings.pl b/backup/examples/relativity/settings.pl
similarity index 100%
rename from backup/settings.pl
rename to backup/examples/relativity/settings.pl

diff --git a/backup/tape.ks b/backup/examples/relativity/tape.ks
similarity index 100%
rename from backup/tape.ks
rename to backup/examples/relativity/tape.ks

diff --git a/backup/tape.kt b/backup/examples/relativity/tape.kt
similarity index 100%
rename from backup/tape.kt
rename to backup/examples/relativity/tape.kt

diff --git a/backup/tape.s0 b/backup/examples/relativity/tape.s0
similarity index 100%
rename from backup/tape.s0
rename to backup/examples/relativity/tape.s0

diff --git a/backup/tape.s1 b/backup/examples/relativity/tape.s1
similarity index 100%
rename from backup/tape.s1
rename to backup/examples/relativity/tape.s1

diff --git a/backup/tape.s2 b/backup/examples/relativity/tape.s2
similarity index 100%
rename from backup/tape.s2
rename to backup/examples/relativity/tape.s2

diff --git a/backup/tape.t0 b/backup/examples/relativity/tape.t0
similarity index 100%
rename from backup/tape.t0
rename to backup/examples/relativity/tape.t0

diff --git a/backup/tape.t1 b/backup/examples/relativity/tape.t1
similarity index 100%
rename from backup/tape.t1
rename to backup/examples/relativity/tape.t1

diff --git a/backup/tape.t2 b/backup/examples/relativity/tape.t2
similarity index 100%
rename from backup/tape.t2
rename to backup/examples/relativity/tape.t2

diff --git a/backup/tape.u0 b/backup/examples/relativity/tape.u0
similarity index 100%
rename from backup/tape.u0
rename to backup/examples/relativity/tape.u0

diff --git a/backup/tape.u1 b/backup/examples/relativity/tape.u1
similarity index 100%
rename from backup/tape.u1
rename to backup/examples/relativity/tape.u1

diff --git a/backup/tape.u2 b/backup/examples/relativity/tape.u2
similarity index 100%
rename from backup/tape.u2
rename to backup/examples/relativity/tape.u2

diff --git a/backup/tape.v0 b/backup/examples/relativity/tape.v0
similarity index 100%
rename from backup/tape.v0
rename to backup/examples/relativity/tape.v0

diff --git a/backup/tape.v1 b/backup/examples/relativity/tape.v1
similarity index 100%
rename from backup/tape.v1
rename to backup/examples/relativity/tape.v1

diff --git a/backup/tape.v2 b/backup/examples/relativity/tape.v2
similarity index 100%
rename from backup/tape.v2
rename to backup/examples/relativity/tape.v2

diff --git a/backup/warnings. b/backup/examples/relativity/warnings.
similarity index 100%
rename from backup/warnings.
rename to backup/examples/relativity/warnings.

diff --git a/backup/warnings.now b/backup/examples/relativity/warnings.now
similarity index 100%
rename from backup/warnings.now
rename to backup/examples/relativity/warnings.now

diff --git a/backup/warnings.soon b/backup/examples/relativity/warnings.soon
similarity index 100%
rename from backup/warnings.soon
rename to backup/examples/relativity/warnings.soon

diff --git a/backup/ifsys.end b/backup/ifsys.end
deleted file mode 100644 (file)
index 7f2d065..0000000
--- a/backup/ifsys.end
+++ /dev/null
@@ -1,2 +0,0 @@
-
-end

diff --git a/backup/increm-advance b/backup/increm-advance
deleted file mode 100644 (file)
index 4099407..0000000
--- a/backup/increm-advance
+++ /dev/null
@@ -1 +0,0 @@
-23

diff --git a/backup/last-tape b/backup/last-tape
deleted file mode 100644 (file)
index 8c1384d..0000000
--- a/backup/last-tape
+++ /dev/null
@@ -1 +0,0 @@
-v2

diff --git a/backup/next-full b/backup/next-full
deleted file mode 100644 (file)
index 5abb5bb..0000000
--- a/backup/next-full
+++ /dev/null
@@ -1 +0,0 @@
-s0

diff --git a/debian/changelog b/debian/changelog
index 11df0c15abadacb136c63dd09f6be7c8ca130349..a0cb1c25420d11658c34b11265d257113cb5d130 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ chiark-utils (0.99.0-1) experimental; urgency=low
   Significant changes since merge chiark/anarres/mnemeth:
   * readbuffer/writebuffer command line arg for buffer size.
   * readbuffer/writebuffer share common code.
+  * example config files from Relativity shipped.
 
  --
 

diff --git a/debian/rules b/debian/rules
index 86b50e10faa61f5c8a9edf4d04939291da04a68c..457d144cc0ebfe6b3ba33cf1f3554f504c429078 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,7 @@ binary-prep:
                gzip -9v $t/$$p/usr/share/doc/$$p/changelog; \
                done
        #
-       $(MAKE) -C backup install \
+       $(MAKE) -C backup install install-examples \
                prefix=$t/chiark-backup/usr \
                etcdir=$t/chiark-backup/etc
        #