--- sapphire-0.15.8.orig/debian/menu-method
+++ sapphire-0.15.8/debian/menu-method
@@ -0,0 +1,50 @@
+#!/usr/bin/install-menu
+#
+# menu-method for Sapphire window manager
+# Copyright (C) 2001 Chris Boyle
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or any later version.
+#
+# This program 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.
+#
+# On Debian systems, the complete text of the GNU General Public
+# License can be found in /usr/share/common-licenses/GPL
+#
+
+!include menu.h
+
+outputencoding="ASCII"
+
+function item($i, $t, $c) = \
+	nstring(add("1",level()),"	") $i " (" esc($t,"(){}[]") ") {" \ 
+	esc($c,"(){}[]") "}\n"
+
+supported
+	x11=	item("exec",	$title, $command)
+#	wm=	item("exec",	$title, "sh -c 'skill sapphire; exec " $command "'")
+	wm=	item("wmexec",	$title, $command)
+	text=	item("exec",	$title, "x-terminal-emulator -T '" $title "' -e " $command)
+endsupported
+
+treewalk="(cm)"
+startmenu= \
+	nstring(add("1",level()),"	") "submenu (" $title ")\n" \
+	nstring(add("1",level()),"	") "{\n"
+endmenu=nstring(add("1",level()),"	") "}\n"
+submenutitle=""
+
+# no comment support?!?
+preoutput=""
+
+# user's version won't actually be read (yet)
+userprefix=".sapphire/menu"
+rootprefix="/etc/X11/sapphire/menu"
+genmenu="menu-defs.hook"
+examplercfile="default-menu"
+rcfile="default"
--- sapphire-0.15.8.orig/debian/postinst
+++ sapphire-0.15.8/debian/postinst
@@ -0,0 +1,53 @@
+#! /bin/sh
+# postinst script for sapphire
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/share/doc/packaging-manual/
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+case "$1" in
+    configure)
+        if [ -x `which update-alternatives` ]; then
+            update-alternatives \
+              --install /usr/bin/x-window-manager x-window-manager \
+                        /usr/bin/sapphire 50 \
+              --slave /usr/share/man/man1/x-window-manager.1.gz \
+                      x-window-manager.1.gz /usr/share/man/man1/sapphire.1.gz
+        fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
--- sapphire-0.15.8.orig/debian/menu
+++ sapphire-0.15.8/debian/menu
@@ -0,0 +1,2 @@
+?package(sapphire):needs="wm" section="Window Managers"\
+  title="Sapphire" command="/usr/bin/sapphire"
--- sapphire-0.15.8.orig/debian/links
+++ sapphire-0.15.8/debian/links
@@ -0,0 +1 @@
+etc/X11/sapphire/menu usr/share/sapphire/menu
--- sapphire-0.15.8.orig/debian/control
+++ sapphire-0.15.8/debian/control
@@ -0,0 +1,22 @@
+Source: sapphire
+Section: x11
+Priority: optional
+Maintainer: Chris Boyle <cmb@debian.org>
+Build-Depends: debhelper (>= 7), libx11-dev, docbook-to-man, x11proto-xext-dev, libxext-dev
+Standards-Version: 3.8.1.0
+Homepage: http://sourceforge.net/projects/sapphire
+
+Package: sapphire
+Architecture: any
+Depends: ${shlibs:Depends}
+Provides: x-window-manager
+Suggests: menu (>>1.5)
+Recommends: xfonts-100dpi | xfonts-75dpi
+Description: A minimal but configurable X11R6 window manager
+ Sapphire is a window manager for X11R6. It is fairly minimal in
+ what it provides on screen: one toolbar, the usual window borders
+ and a popup menu from the root window.
+ .
+ It supports themes as X resource files, and the menu is editable.
+ If you install the 'menu' package, you'll get an automatically updated
+ 'Debian' submenu of installed programs.
--- sapphire-0.15.8.orig/debian/changelog
+++ sapphire-0.15.8/debian/changelog
@@ -0,0 +1,138 @@
+sapphire (0.15.8-9) unstable; urgency=low
+
+  * Acknowledge NMU; thanks Moritz.
+  * Depend on xfonts-100dpi|xfonts-75dpi (the default font is lucida).
+    (closes: #510264)
+  * Fix debian/watch. (closes: #450076, #529138)
+  * Don't strip in Makefile, leave it to conditional dh_strip.
+    (closes: #437953)
+  * Don't use absolute path for update-alternatives. (closes: #510938)
+  * Bump Standards-Version to 3.8.1.0.
+  * Fix menu section.
+  * Add Homepage field.
+  * Bump debhelper version to 7.
+  * Catch errors from make clean.
+  * Use dh_prep, not dh_clean -k.
+
+ -- Chris Boyle <cmb@debian.org>  Mon, 25 May 2009 05:05:43 +0100
+
+sapphire (0.15.8-8.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add missing buid-deps on x11proto-xext-dev and libxext-dev, fixes
+    FTBFS (Closes: #487003)
+
+ -- Moritz Muehlenhoff <jmm@debian.org>  Fri, 27 Jun 2008 23:12:18 +0200
+
+sapphire (0.15.8-8) unstable; urgency=low
+
+  * Add outputencoding to menu-method, thanks Bill Alombert.
+    (closes: #393082)
+  * Fix interpreter in menu-method.
+  * Bump Standards-Version to 3.7.2.2.
+
+ -- Chris Boyle <cmb@debian.org>  Sat, 28 Oct 2006 14:12:45 +0100
+
+sapphire (0.15.8-7) unstable; urgency=low
+
+  * Update Build-Depends for Xorg. (closes: #347057)
+
+ -- Chris Boyle <cmb@debian.org>  Fri, 13 Jan 2006 00:48:53 +0000
+
+sapphire (0.15.8-6) unstable; urgency=low
+
+  * Add .desktop file. (closes: #330061)
+  * Bump Standards-Version to 3.6.2.
+  * Update GPL declaration in debian/copyright.
+
+ -- Chris Boyle <cmb@debian.org>  Sun, 16 Oct 2005 16:34:36 +0100
+
+sapphire (0.15.8-5) unstable; urgency=low
+
+  * Fix description tyops, thanks Jens Nachtigall
+    <nachtigall@web.de>. (closes: #272212)
+
+ -- Chris Boyle <cmb@debian.org>  Sat, 27 Nov 2004 22:34:05 +0000
+
+sapphire (0.15.8-4) unstable; urgency=low
+
+  * Bumped standards-version to 3.6.1.0.
+  * Fixed debian/watch file (sourceforge ftp layout).
+
+ -- Chris Boyle <cmb@debian.org>  Sun, 28 Mar 2004 19:18:05 +0100
+
+sapphire (0.15.8-3) unstable; urgency=low
+
+  * Finished upstream's incomplete support for switching window
+    managers, added a new "wmexec" menu item type, changed menu-method
+    to use it instead of my half-assed kludge using "skill sapphire".
+    (closes: #182430)
+  * Corrected version string in windowmanager.cc:30.
+
+ -- Chris Boyle <cmb@debian.org>  Wed, 20 Aug 2003 13:45:35 +0100
+
+sapphire (0.15.8-2) unstable; urgency=low
+
+  * Changed maintainer address, now here I *really* haven't been paying
+    attention. (note: hmm, no new upstream release in all this time, I
+    guess he's working on aewm++ instead)
+  * Added support for DEB_BUILD_OPTIONS.
+  * Bumped standards version to 3.6.0.
+  * Building using pbuilder.
+
+ -- Chris Boyle <cmb@debian.org>  Fri, 25 Jul 2003 13:57:49 +0100
+
+sapphire (0.15.8-1) unstable; urgency=medium
+
+  * New upstream release.
+    - Incorporates all source changes I've made so far (the bugfixes
+      from previous versions).
+  * Fixed build failure on g++ 2.96 (#include <stdlib.h> was missing in
+    linkedlist.cc), hence the urgency. (closes: #128371)
+  * Added support for switching to a different wm and bumped alternatives
+    priority to 50 accordingly.
+  * Added support for "text" menu items (calling x-terminal-emulator).
+  * Cleaned up some "dh_make'isms" (comments from the example debian
+    files that were still lying around).
+
+ -- Chris Boyle <cmb@bluelinux.co.uk>  Wed,  9 Jan 2002 19:38:10 +0000
+
+sapphire (0.15.7-2) unstable; urgency=low
+
+  * Fixed build failure with g++ 3.0 by changing use of "or" as a variable
+    name in image.cc (patch from LaMont Jones <lamont@smallone.fc.hp.com>).
+    (closes: #126830)
+  * Other changes for g++ 3.0 from the same patch ("using namespace std;"
+    and use of "friend class" instead of "friend" a few times).
+  * Added the manpage to the alternatives system as a slave link.
+  * Fixed "postrm: unknown argument" problems. That message will appear
+    (harmlessly) on upgrading from the previous version, but hopefully
+    for the last time.
+
+ -- Chris Boyle <cmb@bluelinux.co.uk>  Mon, 31 Dec 2001 10:34:46 +0100
+
+sapphire (0.15.7-1) unstable; urgency=low
+
+  * Initial Release. (closes: #82572)
+  * Added install(1) commands in Makefile instead of data.inst script, to
+    allow use of DESTDIR.
+  * Changed CONFIGURATION_PATH to /usr/share/sapphire
+  * Moved the menus to /etc/X11/sapphire/menu but symlinked it so it doesn't
+    bother the program.
+  * Fixed some segfaults that would happen if we couldn't open the menu file,
+    or a theme.
+  * Made sure the default theme is always loaded if another one isn't, to fix
+    another segfault where bits of the Theme object were uninitialized.
+  * Fixed a segfault in RootMenu::parseMenuConfigurationFile() (rootmenu.cc,
+    line 39) that for some reason was only manifesting when I changed the
+    CONFIGURATION_PATH (fault was that the configuration_home variable was too
+    small by 1).
+  * Added a menu-method to get the Debian menu.
+  * Added apostrophe as an allowed character in commands in the menu file.
+  * Added backslash support to menulex.cc, and used it in the menu method to
+    allow brackets in program titles.
+  * Fixed a bug which would rearrange the menu if the tree depth was too
+    great (by keeping track of position with a local variable in
+    MenuLex::submenu, not 4 global variables).
+
+ -- Chris Boyle <cmb@bluelinux.co.uk>  Mon, 17 Dec 2001 09:48:50 +0000
--- sapphire-0.15.8.orig/debian/docs
+++ sapphire-0.15.8/debian/docs
@@ -0,0 +1,4 @@
+HISTORY
+ISSUES
+NEWS
+README
--- sapphire-0.15.8.orig/debian/prerm
+++ sapphire-0.15.8/debian/prerm
@@ -0,0 +1,39 @@
+#! /bin/sh
+# prerm script for sapphire
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/share/doc/packaging-manual/
+
+case "$1" in
+    remove|upgrade|deconfigure)
+        if [ -x `which update-alternatives` ]; then
+             update-alternatives --remove x-window-manager \
+             /usr/bin/sapphire
+        fi
+        ;;
+    failed-upgrade)
+        ;;
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
--- sapphire-0.15.8.orig/debian/compat
+++ sapphire-0.15.8/debian/compat
@@ -0,0 +1 @@
+7
--- sapphire-0.15.8.orig/debian/dirs
+++ sapphire-0.15.8/debian/dirs
@@ -0,0 +1,2 @@
+usr/bin
+etc/X11/sapphire
--- sapphire-0.15.8.orig/debian/postrm
+++ sapphire-0.15.8/debian/postrm
@@ -0,0 +1,39 @@
+#! /bin/sh
+# postrm script for sapphire
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see /usr/share/doc/packaging-manual/
+
+case "$1" in
+    purge|failed-upgrade|abort-install|disappear)
+        # files generated by the menu-method
+        rm -f /etc/X11/sapphire/menu/menu-defs.hook \
+              /etc/X11/sapphire/menu/default
+        ;;
+
+    remove|upgrade|abort-upgrade)
+        ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 0
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
--- sapphire-0.15.8.orig/debian/README.Debian
+++ sapphire-0.15.8/debian/README.Debian
@@ -0,0 +1,14 @@
+sapphire for Debian
+-------------------
+
+The CONFIGURATION_PATH is /usr/share/sapphire, not /usr/local/share/sapphire.
+Also, the menu files are in /etc/X11/sapphire/menu, but I put in a symlink so
+that shouldn't bother anyone.
+
+If you install the 'menu' package, you'll get an automatically updated
+'Debian' submenu of installed programs. If you want to edit the items outside
+the 'Debian' submenu, edit the file /etc/X11/sapphire/menu/default-menu and
+force an update by running update-menus as root. It will generate the other
+two files in that directory, and sapphire will read the 'default' file.
+
+ -- Chris Boyle <cmb@debian.org>, Mon, 17 Dec 2001 09:48:50 +0000
--- sapphire-0.15.8.orig/debian/copyright
+++ sapphire-0.15.8/debian/copyright
@@ -0,0 +1,27 @@
+This package was debianized by Chris Boyle <cmb@debian.org> on
+Mon, 17 Dec 2001 09:48:50 +0000.
+
+It was downloaded from ftp://ftp.sourceforge.net/pub/sourceforge/sapphire/
+
+Upstream Author: Frank Hale <frankhale@lycos.com>
+
+Copyright:
+
+Copyright (C) 1999,2000,2001 Frank Hale
+frankhale@yahoo.com
+http://sapphire.sourceforge.net/
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program 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 GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
+  Floor, Boston, MA 02110-1301, USA.
--- sapphire-0.15.8.orig/debian/sapphire.desktop
+++ sapphire-0.15.8/debian/sapphire.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=sapphire
+Comment=minimal but configurable window manager
+Exec=sapphire
+Terminal=False
+TryExec=sapphire
+Type=Application
+
+[Window Manager]
+SessionManaged=false
+
--- sapphire-0.15.8.orig/debian/rules
+++ sapphire-0.15.8/debian/rules
@@ -0,0 +1,87 @@
+#!/usr/bin/make -f
+# Based on sample debian/rules from debhelper,
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+  COMPILER_FLAGS += CFLAGS="-O0 -g -Wall"
+else
+  COMPILER_FLAGS += CFLAGS="-O2 -g -Wall"
+endif
+
+#configure: configure-stamp
+#configure-stamp:
+#	dh_testdir
+#	# Add here commands to configure the package.
+#	
+#
+#	touch configure-stamp
+
+#build: configure-stamp build-stamp
+build: build-stamp
+build-stamp:
+	dh_testdir
+
+	# compile the package
+	$(MAKE) $(COMPILER_FLAGS)
+
+	/usr/bin/docbook-to-man debian/sapphire.sgml > debian/sapphire.1
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	# clean up after the build process
+	[ ! -f Makefile ] || $(MAKE) clean
+
+	rm -f debian/sapphire.1
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_prep
+	dh_installdirs
+
+	# install the package into debian/sapphire
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/sapphire
+
+	mv debian/sapphire/usr/share/sapphire/menu debian/sapphire/etc/X11/sapphire/menu
+	mv debian/sapphire/etc/X11/sapphire/menu/default debian/sapphire/etc/X11/sapphire/menu/default-menu
+	mkdir -p debian/sapphire/usr/share/xsessions
+	install -m 644 debian/sapphire.desktop debian/sapphire/usr/share/xsessions/sapphire.desktop
+
+# build architecture-independent files
+binary-indep: build install
+# We have nothing to do by default.
+
+# build architecture-dependent files
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs
+#	dh_installexamples
+	dh_installmenu
+	dh_installman debian/sapphire.1
+	dh_desktop
+	dh_installchangelogs ChangeLog
+	dh_link
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	dh_strip
+endif
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
--- sapphire-0.15.8.orig/debian/sapphire.sgml
+++ sapphire-0.15.8/debian/sapphire.sgml
@@ -0,0 +1,175 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Chris</firstname>">
+  <!ENTITY dhsurname   "<surname>Boyle</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>December 17, 2001</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>cmb@debian.org</email>">
+  <!ENTITY dhusername  "Chris Boyle">
+  <!ENTITY dhucpackage "<refentrytitle>SAPPHIRE</refentrytitle>">
+  <!ENTITY dhpackage   "sapphire">
+
+  <!ENTITY debian      "<productname>Debian GNU/Linux</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2001</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>minimal but configurable window manager</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+      <group choice="opt"><arg><option>-display <replaceable>displayname</replaceable></option></arg>
+                          <arg><option>-version</option></arg></group>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> command.</para>
+
+    <para>This manual page was written for the &debian; distribution
+      because the original program does not have a manual page.</para>
+
+    <para><command>&dhpackage;</command> is a minimal but configurable
+      window manager for X11R6. It supports themes in the form of X resource
+      files, and has a customisable menu.</para>
+
+    <para>The Debian version receives Debian menu entries automatically
+      in a "Debian" submenu by default, you can add entries
+      specifically to sapphire (in the rest of the menu) in the
+      <filename>default-menu</filename> file. For more information, see
+      update-menus (1) and the FILES section below.</para>
+
+    <para>Users can also set their own options in
+      <filename>$HOME/.sapphire/wmconf</filename> (an X resource file).</para>
+
+  </refsect1>
+  <refsect1>
+    <title>OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>-display <replaceable>displayname</replaceable></option></term>
+        <listitem>
+          <para>Use the X-server display 'displayname'.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-version</option></term>
+        <listitem>
+          <para>Show version of program.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>FILES</title>
+
+    <variablelist>
+      <varlistentry>
+         <term><filename>/etc/X11/sapphire/menu/default-menu</filename></term>
+         <listitem><para>menu entries specific to sapphire (you can edit this one, it's 
+           a conffile)</para></listitem>
+      </varlistentry>
+      <varlistentry>
+         <term><filename>/etc/X11/sapphire/menu/menudefs.hook</filename></term>
+         <listitem><para>Debian menu entries in sapphire's format, not 
+           read directly, do not edit (edit <filename>default-menu</filename>
+           instead)</para></listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><filename>/etc/X11/sapphire/menu/default</filename></term>
+        <listitem><para>this menu file is the one sapphire actually reads, it is
+          automatically generated from the other two by update-menus, do not edit
+          (edit <filename>default-menu</filename> instead)</para></listitem>
+      </varlistentry>
+      <varlistentry>
+         <term><filename>$HOME/.sapphire/wmconf</filename></term>
+         <listitem><para>user-specific options</para></listitem>
+      </varlistentry>
+      <varlistentry>
+         <term><filename>/usr/share/sapphire/themes</filename></term>
+         <listitem><para>themes directory, all of the above may refer to themes from
+           here (the files themselves are X resource files)</para></listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>HISTORY</title>
+
+    <para>Sapphire was originally developed from Decklin Foster's aewm, and
+      also uses some code from Blackbox (for gradients).</para>
+  </refsect1>
+  <refsect1>
+    <title>SEE ALSO</title>
+
+    <para>XFree86 (1), update-menus (1).</para>
+
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername; &lt;&dhemail;&gt; 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 <acronym>GNU</acronym> Free Documentation
+      License, Version 1.1 or any later version published by the Free
+      Software Foundation; with no Invariant Sections, no Front-Cover
+      Texts and no Back-Cover Texts.</para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
--- sapphire-0.15.8.orig/debian/watch
+++ sapphire-0.15.8/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/sapphire/sapphire-(.+)\.tar\.gz
