Merge branch 'rename'

Conflicts:
	sitarba

diff --git a/Makefile b/Makefile
index 408a6adf29c846311fddbfa2e2ded1e4abc1989e..8ceb4c005f39563bc8baa557ef0fb07dd3c2ed91 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,20 +2,22 @@ PREFIX=/usr
 # Where the script binary should go
 BINPATH = $(PREFIX)/bin
 MANPATH = $(PREFIX)/share/man
-CONFFILE = $(PREFIX)/share/shbackup.conf.sample
+SHAREDIR = $(PREFIX)/share/sitarba/
+CONFFILE = $(SHAREDIR)/sitarba.conf.sample
 
 ######################################################################
 
 all:
 
 install: all
-       install -m 0755 shbackup $(BINPATH)/shbackup
-       install -m 0644 shbackup.conf $(CONFFILE)
-       install -m 0644 shbackup.1 $(MANPATH)/man1/shbackup.1
+       install -m 0755 sitarba $(BINPATH)/sitarba
+       mkdir -p $(SHAREDIR)
+       install -m 0644 sitarba.conf $(CONFFILE)
+       install -m 0644 sitarba.1 $(MANPATH)/man1/sitarba.1
 
-manpage: shbackup.1
+manpage: sitarba.1
 
-shbackup.1: shbackup.docbook
+sitarba.1: sitarba.docbook
        docbook2man.pl $<
 
 

diff --git a/shbackup.1 b/sitarba.1
similarity index 89%
rename from shbackup.1
rename to sitarba.1
index e2b5fc60b3c3771d3d803a5112e92a67e3a45b41..07139cbc4ae66a5e0744968d81abe0468a60e725 100644 (file)
--- a/shbackup.1
+++ b/sitarba.1
@@ -5,14 +5,14 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH shbackup 1 2012-05-13 "" ""
+.TH sitarba 1 2012-05-13 "" ""
 .SH NAME
-shbackup \- a simple backup solution
+sitarba \- a simple backup solution
 .SH SYNOPSIS
 'nh
 .fi
 .ad l
-\fBshbackup\fR \kx
+\fBsitarba\fR \kx
 .if (\nx>(\n(.l/2)) .nr x (\n(.l/5)
 'in \n(.iu+\nxu
 [options] {\fIcommand\fR}
@@ -20,13 +20,13 @@ shbackup \- a simple backup solution
 .ad b
 'hy
 .SH DESCRIPTION
-\fBshbackup\fR is a simple backup solution
+\fBsitarba\fR is a simple backup solution
 which packs user-defined file sets with tar. Each
 backup belongs to an epoch, which is 'sporadic' or one
 of the user-defined epochs. Standard epochs are year,
 month, week, day, or hour. The backup can be made
 either full, differential or incremental.
-\fBshbackup\fR takes care for pruning old
+\fBsitarba\fR takes care for pruning old
 backups. The user defines for every epoch the number of
 backups to keep, except for 'sporadic'. Sporadic
 backups need to be removed manually.
@@ -47,7 +47,7 @@ Print out a help summary.
 .TP 
 \*(T<\fB\-c, \-\-conf FILE\fR\*(T>
 Use given configuration file instead of
-/etc/shbackup.conf.
+/etc/sitarba.conf.
 .TP 
 \*(T<\fB\-e, \-\-epoch EPOCH\fR\*(T>
 Do not determine epoch automatically, but

diff --git a/shbackup.conf b/sitarba.conf
similarity index 97%
rename from shbackup.conf
rename to sitarba.conf
index 11bfa92881764b8f7741f7cf4dac83e2f6d29a29..bd316a85ac55c6619bbfab85596d1ac3fa03ab13 100644 (file)
--- a/shbackup.conf
+++ b/sitarba.conf
@@ -1,5 +1,5 @@
 [global]
-# Where shbackup stores the backups and other stuff
+# Where sitarba stores the backups and other stuff
 backupdir = /media/backup
 
 # Which format should be used by tar?

diff --git a/shbackup.docbook b/sitarba.docbook
similarity index 92%
rename from shbackup.docbook
rename to sitarba.docbook
index 36741d98c4fb266bddd24fcc310830d971f9ba9d..1eacde1653bf9a99ad8b0c832eb47f3770aeffb6 100644 (file)
--- a/shbackup.docbook
+++ b/sitarba.docbook
@@ -15,18 +15,18 @@
        </refentryinfo>
 
        <refmeta>
-               <refentrytitle>shbackup</refentrytitle>
+               <refentrytitle>sitarba</refentrytitle>
                <manvolnum>1</manvolnum>
        </refmeta>
 
        <refnamediv>
-               <refname>shbackup</refname> 
+               <refname>sitarba</refname> 
                <refpurpose>a simple backup solution</refpurpose>
        </refnamediv>
 
        <refsynopsisdiv>
                <cmdsynopsis>
-                       <command>shbackup</command>
+                       <command>sitarba</command>
                        <arg>options</arg>
                        <arg choice="req"><replaceable>command</replaceable></arg>
                </cmdsynopsis>
@@ -36,14 +36,14 @@
                <title>DESCRIPTION</title>
        
                <para>
-                       <command>shbackup</command> is a simple backup solution
+                       <command>sitarba</command> is a simple backup solution
                        which packs user-defined file sets with tar. Each
                        backup belongs to an epoch, which is 'sporadic' or one
                        of the user-defined epochs. Standard epochs are year,
                        month, week, day, or hour. The backup can be made
                        either full, differential or incremental.
 
-                       <command>shbackup</command> takes care for pruning old
+                       <command>sitarba</command> takes care for pruning old
                        backups. The user defines for every epoch the number of
                        backups to keep, except for 'sporadic'. Sporadic
                        backups need to be removed manually.
@@ -98,7 +98,7 @@
                        <term><option>-c, --conf FILE</option></term>
                        <listitem>
                                <para>Use given configuration file instead of
-                                       /etc/shbackup.conf.</para>
+                                       /etc/sitarba.conf.</para>
                        </listitem>
                </varlistentry>