[SCM] archfs, the fuse-powered rdiff-backup browser branch, master, updated. upstream/0.5.4-14-g2a86814

Jon Dowland jmtd at debian.org
Mon Sep 28 09:14:15 UTC 2009


The following commit has been merged in the master branch:
commit 2a868149f366a78d88129d907b821afeb801d631
Author: Jon Dowland <jmtd at debian.org>
Date:   Mon Sep 28 10:07:28 2009 +0100

    remove xml manpage, just use a troff one

diff --git a/debian/archfs.1 b/debian/archfs.1
new file mode 100644
index 0000000..0bc197a
--- /dev/null
+++ b/debian/archfs.1
@@ -0,0 +1,119 @@
+'\" t
+.\"     Title: ARCHFS
+.\"    Author: Adam Sloboda
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+.\"      Date: March 18, 2008
+.\"    Manual: [FIXME: manual]
+.\"    Source: [FIXME: source]
+.\"  Language: English
+.\"
+.TH "ARCHFS" "1" "March 18, 2008" "[FIXME: source]" "[FIXME: manual]"
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+archfs \- filesystem for rdiff\-backup repositories
+.SH "SYNOPSIS"
+.HP \w'\fBarchfs\fR\ 'u
+\fBarchfs\fR\fI mountpoint\fR\fI repository\&.\&.\fR
+.HP \w'\fBarchfs\fR\ 'u
+\fBarchfs\fR\fB \-r \fR\fIrepository\&.\&.\fR\fB \-m \fR\fImountpoint\fR
+.SH "DESCRIPTION"
+.PP
+\fBarchfs\fR
+is a filesystem that allows to browse through the
+\fBrdiff\-backup\fR
+repositories\&. It is created in user space and besides the requirement of FUSE kernel module it can be set without the need of root privilages\&. It may present data in different layouts \- as a default it simply presents all revisions with contents at the time when certain backup had been made\&.
+.SH "LAYOUTS"
+.PP
+Files stored in the
+\fBrdiff\-backup\fR
+archive can be presented in one of two layouts\&. As a default filesystem displays all increments with precise image of a stored directory\&. If
+\fB\-l\fR
+option is used, however, then files from the last increment will be displayed as directories, each holding all versions of this file\&.
+.SH "OPTIONS"
+.PP
+This programs follows the usual
+GNU
+command line syntax, with long options starting with two dashes (`\-\')\&. A summary of options is included below\&.
+.PP
+\fB\-m\fR \fB\-\-mount path\fR
+.RS 4
+Specify path mount point\&.
+.RE
+.PP
+\fB\-r\fR \fB\-\-repositories repository\&.\&.\fR
+.RS 4
+Specify paths to repositories\&. If you use this option you have to specify mount point by option\&.
+.RE
+.PP
+\fB\-s\fR \fB\-\-simple\fR
+.RS 4
+This option forces filesystem to use simple list as a data structure and as a result program require a little less memory (available from version 0\&.1\&.0)
+.RE
+.PP
+\fB\-t\fR \fB\-\-tree\fR
+.RS 4
+This option explicitly forces filesystem to use directory tree as a data structure\&. This makes all operations faster, but requires a bit more memory\&. This data structure is chosen as a default (available from version 0\&.1\&.0)\&.
+.RE
+.PP
+\fB\-c\fR \fB\-\-caching limit\fR
+.RS 4
+Through this option user can use file caching, which increases efficiency on multiple accesses to one file\&. Without this function limit is set to 0 and there is no caching (this uses in fact simpler, better tested code)\&. Limit does not define how many cached files can be stored on disk; instead it defines how many files can be cached if there are no open files\&. If there are open files, then the limit is decreased by their number\&. In certain cases, when multiple files are open at the same time, no caching will be done, so the disk usage can stay as low, as user wants (available from version 0\&.2\&.0)\&.
+.RE
+.PP
+\fB\-d\fR \fB\-\-directory path\fR
+.RS 4
+As a default archfs creates temporary directory to store cache and other files in /tmp\&. Using this option, we can define some other directory, where temporary files directory is created (available from version 0\&.2\&.1)\&.
+.RE
+.PP
+\fB\-l\fR \fB\-\-last\fR
+.RS 4
+This option changes way of presenting files in the filesystem\&. When invoked files from the most recent increment will be presented as directories, each holding every version certain file (available from version 0\&.3\&.0)\&.
+.RE
+.PP
+\fB\-v\fR \fB\-\-version\fR
+.RS 4
+Displays version of archfs\&.
+.RE
+.SH "SEE ALSO"
+.PP
+rdiff\-backup(1), fusermount(1)\&.
+.SH "AUTHOR"
+.PP
+This manual page was adapted by Adam Sloboda
+ja at disorder\&.sk
+from
+\m[blue]\fBonline manual page\fR\m[]\&\s-2\u[1]\d\s+2
+for the
+Debian(TM)
+system (but may be used by others)\&. Permission is granted to copy, distribute and/or modify this document under the terms of the
+GNU
+General Public License, Version 2 any later version published by the Free Software Foundation\&.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL\&.
+.SH "AUTHOR"
+.PP
+\fBAdam Sloboda\fR
+.RS 4
+Author.
+.RE
+.SH "COPYRIGHT"
+.br
+Copyright \(co 2008 Adam Sloboda
+.br
+Copyright \(co 2009 Jon Dowland
+.br
+.SH "NOTES"
+.IP " 1." 4
+online manual page
+.RS 4
+\%http://code.google.com/p/archfs/wiki/Manual
+.RE
diff --git a/debian/control b/debian/control
index abd18ef..915e0d1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: archfs
 Section: utils
 Priority: optional
 Maintainer: Jon Dowland <jmtd at debian.org>
-Build-Depends: debhelper (>= 5), autotools-dev, libfuse-dev, xsltproc, docbook-xsl, libz-dev, pkg-config
+Build-Depends: debhelper (>= 5), autotools-dev, libfuse-dev, libz-dev, pkg-config
 Standards-Version: 3.8.3
 Homepage: http://code.google.com/p/archfs/
 Vcs-Git: git://git.debian.org/git/collab-maint/archfs
diff --git a/debian/manpage.xml b/debian/manpage.xml
deleted file mode 100644
index b64eb09..0000000
--- a/debian/manpage.xml
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
-<!--
-
-Process this file with an XSLT processor: `xsltproc \
--''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
-manpages/docbook.xsl manpage.dbk'.  A manual page
-<package>.<section> will be generated.  You may view the
-manual page with: nroff -man <package>.<section> | less'.  A
-typical entry in a Makefile or Makefile.am is:
-
-DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
-manpages/docbook.xsl
-XP=xsltproc -''-nonet
-
-manpage.1: manpage.dbk
-        $(XP) $(DB2MAN) $<
-    
-The xsltproc binary is found in the xsltproc package.  The
-XSL files are in docbook-xsl.  Please remember that if you
-create the nroff version in one of the debian/rules file
-targets (such as build), you will need to include xsltproc
-and docbook-xsl in your Build-Depends control field.
-
--->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>Adam</firstname>">
-  <!ENTITY dhsurname   "<surname>Sloboda</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>March 18, 2008</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
-  <!ENTITY dhemail     "<email>jmtd at debian.org</email>">
-  <!ENTITY asemail     "<email>ja at disorder.sk</email>">
-  <!ENTITY dhusername  "Jon Dowland">
-  <!ENTITY asusername  "Adam Sloboda">
-  <!ENTITY dhucpackage "<refentrytitle>ARCHFS</refentrytitle>">
-  <!ENTITY dhpackage   "archfs">
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2008</year>
-      <holder>&asusername;</holder>
-    </copyright>
-    <copyright>
-      <year>2009</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>filesystem for rdiff-backup repositories</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-      <replaceable class="parameter"> mountpoint</replaceable>
-      <replaceable class="parameter"> repository..</replaceable>
-    </cmdsynopsis>
-
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-      <option> -r </option><replaceable class="parameter">repository..</replaceable>
-      <option> -m </option><replaceable class="parameter">mountpoint</replaceable>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para><command>archfs</command> is a filesystem that allows to
-    browse through the <command>rdiff-backup</command>
-    repositories. It is created in user space and besides the
-    requirement of FUSE kernel module it can be set without the need
-    of root privilages. It may present data in different layouts - as
-    a default it simply presents all revisions with contents at the
-    time when certain backup had been made.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>LAYOUTS</title>
-
-    <para>Files stored in the <command>rdiff-backup</command> archive
-    can be presented in one of two layouts. As a default filesystem
-    displays all increments with precise image of a stored
-    directory. If <option>-l</option> option is used, however, then
-    files from the last increment will be displayed as directories,
-    each holding all versions of this file.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>This programs follows the usual &gnu; command line syntax,
-      with long options starting with two dashes (`-').  A summary of
-      options is included below.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>-m</option>
-          <option>--mount path</option>
-        </term>
-        <listitem>
-          <para>Specify path mount point.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-r</option>
-          <option>--repositories repository..</option>
-        </term>
-        <listitem>
-          <para>Specify paths to repositories.  If you use this option
-          you have to specify mount point by option.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-s</option>
-          <option>--simple</option>
-        </term>
-        <listitem>
-          <para>This option forces filesystem to use simple list as a
-          data structure and as a result program require a little less
-          memory (available from version 0.1.0)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-t</option>
-          <option>--tree</option>
-        </term>
-        <listitem>
-          <para>This option explicitly forces filesystem to use
-          directory tree as a data structure. This makes all
-          operations faster, but requires a bit more memory. This data
-          structure is chosen as a default (available from version
-          0.1.0).</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-c</option>
-          <option>--caching limit</option>
-        </term>
-        <listitem>
-          <para>Through this option user can use file caching, which
-          increases efficiency on multiple accesses to one
-          file. Without this function limit is set to 0 and there is
-          no caching (this uses in fact simpler, better tested
-          code). Limit does not define how many cached files can be
-          stored on disk; instead it defines how many files can be
-          cached if there are no open files. If there are open files,
-          then the limit is decreased by their number. In certain
-          cases, when multiple files are open at the same time, no
-          caching will be done, so the disk usage can stay as low, as
-          user wants (available from version 0.2.0).</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-d</option>
-          <option>--directory path</option>
-        </term>
-        <listitem>
-          <para>As a default archfs creates temporary directory to
-	  store cache and other files in /tmp. Using this option, we
-	  can define some other directory, where temporary files
-	  directory is created (available from version 0.2.1).</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-l</option>
-          <option>--last</option>
-        </term>
-        <listitem>
-          <para>This option changes way of presenting files in the
-          filesystem. When invoked files from the most recent
-          increment will be presented as directories, each holding
-          every version certain file (available from version
-          0.3.0).</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-v</option>
-          <option>--version</option>
-        </term>
-        <listitem>
-          <para>Displays version of archfs.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>SEE ALSO</title>
-
-    <para>rdiff-backup(1), fusermount(1).</para>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was adapted by &asusername; &asemail;
-      from <ulink
-      url="http://code.google.com/p/archfs/wiki/Manual">online manual
-      page</ulink> for the &debian; system (but may be used by
-      others).  Permission is granted to copy, distribute and/or
-      modify this document under the terms of the &gnu; General Public
-      License, Version 2 any later version published by the Free
-      Software Foundation.
-    </para>
-	<para>
-	  On Debian systems, the complete text of the GNU General Public
-	  License can be found in /usr/share/common-licenses/GPL.
-	</para>
-
-  </refsect1>
-</refentry>
-
diff --git a/debian/rules b/debian/rules
index da2e5b0..1d5201d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,11 +4,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Debian manpage
-DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
-XP=xsltproc -''-nonet
-
-
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -37,10 +32,7 @@ config.status: configure
 
 build: build-stamp
 
-manpage: 
-	$(XP) $(DB2MAN) debian/manpage.xml
-
-build-stamp:  config.status manpage
+build-stamp:  config.status
 	dh_testdir
 	$(MAKE)
 	touch $@
@@ -65,8 +57,6 @@ install: build
 	dh_clean -k 
 	dh_installdirs
 	$(MAKE) DESTDIR=$(CURDIR)/debian/archfs install
-	install -m644 archfs.1 $(CURDIR)/debian/archfs/usr/share/man/man1
-
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -77,8 +67,10 @@ binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs ChangeLog
+	echo dh_installdocs, yeah baby 1>&2
 	dh_installdocs
-	dh_installman
+	echo dh_installman oh yeah 1>&2
+	dh_installman debian/archfs.1
 	dh_link
 	dh_strip
 	dh_compress

-- 
archfs, the fuse-powered rdiff-backup browser



More information about the Pkg-games-commits mailing list