From eab5c4468b54b8f5513ff57f48e9d69e8d3ab254 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 22 Dec 2008 16:12:01 -0500 Subject: Move etckeeper to sbin, and man page to section 8, since only an admin can really use etckeeper. --- Makefile | 4 ++-- debian/changelog | 7 +++++++ etckeeper.1 | 48 ------------------------------------------------ etckeeper.8 | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 50 deletions(-) delete mode 100644 etckeeper.1 create mode 100644 etckeeper.8 diff --git a/Makefile b/Makefile index 449ca7d..d333e90 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ include $(CONFFILE) DESTDIR?= prefix=/usr -bindir=${prefix}/bin +sbindir=${prefix}/sbin etcdir=/etc mandir=${prefix}/share/man vardir=/var @@ -22,7 +22,7 @@ install: cp -a *.d $(DESTDIR)$(etcdir)/etckeeper/ $(INSTALL_DATA) $(CONFFILE) $(DESTDIR)$(etcdir)/etckeeper/etckeeper.conf $(INSTALL_EXE) etckeeper $(DESTDIR)$(bindir)/etckeeper - $(INSTALL_DATA) etckeeper.1 $(DESTDIR)$(mandir)/man1/etckeeper.1 + $(INSTALL_DATA) etckeeper.8 $(DESTDIR)$(mandir)/man1/etckeeper.8 $(INSTALL_DATA) bash_completion $(DESTDIR)$(etcdir)/bash_completion.d/etckeeper ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),apt) $(INSTALL_DATA) apt.conf $(DESTDIR)$(etcdir)/apt/apt.conf.d/05etckeeper diff --git a/debian/changelog b/debian/changelog index 4de1889..e130896 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +etckeeper (0.22) UNRELEASED; urgency=low + + * Move etckeeper to sbin, and man page to section 8, since only an admin + can really use etckeeper. + + -- Joey Hess Mon, 22 Dec 2008 16:11:38 -0500 + etckeeper (0.21) unstable; urgency=low * Swedish debconf translation from Martin Ågren. Closes: #492063 diff --git a/etckeeper.1 b/etckeeper.1 deleted file mode 100644 index c313a0c..0000000 --- a/etckeeper.1 +++ /dev/null @@ -1,48 +0,0 @@ -.\" -*- nroff -*- -.TH ETCKEEPER 1 "" "" "" -.SH NAME -etckeeper \- store /etc in git, mercurial, or bazaar -.SH SYNOPSIS -.B etckeeper command [-d directory] -.SH DESCRIPTION -etckeeper manages /etc be stored in a git, mercurial, or bazaar -repository. By default each of the commands operates on /etc, but a -different directory can be specified to operate on a clone of the /etc -repository located elsewhere. -.SH COMMANDS -.TP -.B init -This is the only command you typically need to run by hand. It -initialises and sets up a git, mercurial, or bazaar repository -(depending on the VCS setting in -/etc/etckeeper/etckeeper.conf). Typically this is run in /etc once -when starting to use etckeeper on a machine. It can also be used to -initialise a clone of the /etc repository located elsewhere. -.TP -.B commit [message] -Commits changes in /etc to the repository. A commit message can be -specified. -.TP -.B pre-commit -This is called as a pre-commit hook. It stores metadata and does sanity -checks. -.TP -.B pre-install -This is called by apt's DPkg::Pre-Install-Pkgs hook, or by equivilant hooks -of other package managers. It allows committing any uncommitted changes before -packages are installed, upgraded, etc. -.TP -.B post-install -This is called by apt's DPkg::Post-Invoke hook, or by equivilant hooks -of other package managers. It commits changes made by packages into the -repository. (You can also call this by hand after running dpkg by hand.) -.TP -.B unclean -This returns true if the directory contains uncommitted changes. -.SH FILES -/etc/etckeeper/etckeeper.conf is the configuration file. - -/etc/etckeeper also contains directories containing the programs that are -run for each of the above commands. -.SH AUTHOR -Joey Hess, . diff --git a/etckeeper.8 b/etckeeper.8 new file mode 100644 index 0000000..bbd340a --- /dev/null +++ b/etckeeper.8 @@ -0,0 +1,48 @@ +.\" -*- nroff -*- +.TH ETCKEEPER 8 "" "" "" +.SH NAME +etckeeper \- store /etc in git, mercurial, or bazaar +.SH SYNOPSIS +.B etckeeper command [-d directory] +.SH DESCRIPTION +etckeeper manages /etc be stored in a git, mercurial, or bazaar +repository. By default each of the commands operates on /etc, but a +different directory can be specified to operate on a clone of the /etc +repository located elsewhere. +.SH COMMANDS +.TP +.B init +This is the only command you typically need to run by hand. It +initialises and sets up a git, mercurial, or bazaar repository +(depending on the VCS setting in +/etc/etckeeper/etckeeper.conf). Typically this is run in /etc once +when starting to use etckeeper on a machine. It can also be used to +initialise a clone of the /etc repository located elsewhere. +.TP +.B commit [message] +Commits changes in /etc to the repository. A commit message can be +specified. +.TP +.B pre-commit +This is called as a pre-commit hook. It stores metadata and does sanity +checks. +.TP +.B pre-install +This is called by apt's DPkg::Pre-Install-Pkgs hook, or by equivilant hooks +of other package managers. It allows committing any uncommitted changes before +packages are installed, upgraded, etc. +.TP +.B post-install +This is called by apt's DPkg::Post-Invoke hook, or by equivilant hooks +of other package managers. It commits changes made by packages into the +repository. (You can also call this by hand after running dpkg by hand.) +.TP +.B unclean +This returns true if the directory contains uncommitted changes. +.SH FILES +/etc/etckeeper/etckeeper.conf is the configuration file. + +/etc/etckeeper also contains directories containing the programs that are +run for each of the above commands. +.SH AUTHOR +Joey Hess, . -- cgit v1.2.3