xfs: Changes to 'debian-unstable'
debian/changelog | 10 ++++++
debian/local/xfs.options.5 | 73 +++++++++++++++++++++++++++++++++++++++++++++
debian/rules | 1
debian/xfs.install | 1
debian/xfs.manpages | 2 +
5 files changed, 86 insertions(+), 1 deletion(-)
New commits:
commit 08a450af6ea993137df8cd8def7dfa9d4f4302be
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Aug 15 12:45:38 2007 +0200
Restore and update the old debian/local/xfs.options.5
diff --git a/debian/changelog b/debian/changelog
index fe54530..76d39cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xfs (1:1.0.4-3) UNRELEASED; urgency=low
+
+ * Restore and update the old xfs.options.5 manpage which got lost
+ during the monolothic/modular transition. It might still help
+ since the maintainer scripts still look at the corresponding
+ config file. Closes: #364587.
+ + Use dh_installman
+
+ -- Brice Goglin <bgoglin@debian.org> Wed, 15 Aug 2007 12:19:31 +0200
+
xfs (1:1.0.4-2) unstable; urgency=high
* High urgency upload for security fix.
diff --git a/debian/local/xfs.options.5 b/debian/local/xfs.options.5
new file mode 100644
index 0000000..7c60c47
--- /dev/null
+++ b/debian/local/xfs.options.5
@@ -0,0 +1,73 @@
+.\" $Id: xfs.options.5 189 2005-06-11 00:04:27Z branden $
+.\"
+.\" Copyright 1998, 2002, 2004 Branden Robinson <branden@debian.org>.
+.\"
+.\" This is free software; you may redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; version 2.
+.\"
+.\" This is distributed in the hope that it will be useful, but
+.\" WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License with
+.\" the Debian operating system, in /usr/share/common-licenses/GPL; if
+.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
+.\" Suite 330, Boston, MA 02111-1307 USA
+.TH xfs.options 5 "2004\-11\-04" "Debian Project"
+.SH NAME
+xfs.options \- configuration options for the X font server
+.SH DESCRIPTION
+.I /etc/X11/fs/xfs.options
+contains a set of flags that determine some of the behavior of the X font
+server
+.BR xfs (1).
+.PP
+.I /etc/X11/fs/xfs.options
+may contain comments, which begin with a hash mark (\(oq#\(cq) and end at
+the next newline, just like comments in shell scripts.
+The rest of the file consists of options which are expressed as words
+separated by hyphens, with only one option per line.
+Options are enabled by simply placing them in the file; they are disabled
+by prefixing the option name with \(oqno\-\(cq.
+.PP
+Available options are:
+.TP
+.B restart\-on\-upgrade
+.B Enable this option with caution on \(oqproduction\(cq machines;
+it causes the
+.B xfs
+daemon to be stopped and restarted on upgrade.
+This will break all existing connections by X servers to the font server,
+and as a result may deprive them of access to fonts.
+In some situations this could be an unwelcome surprise (for instance, for
+remote
+.B xfs
+users who had no idea the administrator was performing system maintenance).
+On the other hand, for machines that stay up for long periods of time,
+leaving the old daemon running can be a bad idea if the new version has,
+for instance, a fix for a security vulnerability (overwriting
+.BR xfs 's
+executable on the file system has no effect on the copy of
+.B xfs
+in memory).
+This behavior is disabled by default:
+.B xfs
+will be not be stopped or started during an upgrade of its package; the
+administrator will have to do so by hand (with
+.B invoke\-rc.d xfs restart
+or by rebooting the system) before the newly installed
+.B xfs
+binary is used.
+.PP
+Since no options are enabled by default,
+.I /etc/X11/fs/xfs.options
+is not created automatically.
+.SH AUTHOR
+Branden Robinson customized
+.BR xfs 's
+package maintainer scripts to implement the functionality described above.
+.SH SEE ALSO
+.BR xfs (1)
+.\" vim:set et tw=80:
diff --git a/debian/rules b/debian/rules
index c709390..1a41a2a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,6 +75,7 @@ binary-arch: build install
dh_installdocs
dh_install --sourcedir=debian/tmp --list-missing
+ dh_installman
dh_installchangelogs
dh_installexamples
dh_installinit
diff --git a/debian/xfs.install b/debian/xfs.install
index 1f2a5d2..73bbf32 100644
--- a/debian/xfs.install
+++ b/debian/xfs.install
@@ -1,3 +1,2 @@
usr/bin/xfs
-usr/share/man/man1/xfs.1
etc/X11/fs/config
diff --git a/debian/xfs.manpages b/debian/xfs.manpages
new file mode 100644
index 0000000..f24afa5
--- /dev/null
+++ b/debian/xfs.manpages
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/man/man1/xfs.1
+debian/local/xfs.options.5
Reply to: