From b2b78dcbb87abb0f12428ba4ea4e7a331084e30a Mon Sep 17 00:00:00 2001
From: Andrew Shadura <andrewsh@debian.org>
Date: Sat, 30 Nov 2013 21:33:35 +0100
Subject: Import Debian changes 1.3-10

9mount (1.3-10) unstable; urgency=low

  * Update the homepage (Closes: #730858).
  * Fix manpages.
  * Build on Linux only.
---
 debian/changelog              |  8 ++++
 debian/control                |  4 +-
 debian/patches/manpages.patch | 94 +++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series         |  1 +
 debian/rules                  |  3 ++
 5 files changed, 108 insertions(+), 2 deletions(-)
 create mode 100644 debian/patches/manpages.patch
 create mode 100644 debian/patches/series

diff --git a/debian/changelog b/debian/changelog
index b419376..ce18f1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+9mount (1.3-10) unstable; urgency=low
+
+  * Update the homepage (Closes: #730858).
+  * Fix manpages.
+  * Build on Linux only.
+
+ -- Andrew Shadura <andrewsh@debian.org>  Sat, 30 Nov 2013 21:33:35 +0100
+
 9mount (1.3-9) unstable; urgency=low
 
   * Drop nearly useless debug package.
diff --git a/debian/control b/debian/control
index 85fb64f..7d90a34 100644
--- a/debian/control
+++ b/debian/control
@@ -4,10 +4,10 @@ Priority: optional
 Maintainer: Andrew Shadura <andrewsh@debian.org>
 Build-Depends: debhelper (>= 9)
 Standards-Version: 3.9.4
-Homepage: http://sqweek.dnsdojo.org/code/9mount/
+Homepage: http://sqweek.net/code/9mount/
 
 Package: 9mount
-Architecture: any
+Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: plan9 filesystem (v9fs) user mount utilities
  9mount is a set of SUID mounting tools for use with v9fs to help cope with
diff --git a/debian/patches/manpages.patch b/debian/patches/manpages.patch
new file mode 100644
index 0000000..ba49989
--- /dev/null
+++ b/debian/patches/manpages.patch
@@ -0,0 +1,94 @@
+--- a/9mount.1
++++ b/9mount.1
+@@ -3,7 +3,7 @@
+ 9mount, 9bind, 9umount \- mount/unmount 9p filesystems
+ .SH SYNOPSIS
+ .B 9mount
+-[ insuvx ] [ -a SPEC ] [ -c CACHE ] [ -d DEBUG ] [ -m MSIZE ] DIAL MOUNTPT
++[ insuvx ] [ \-a SPEC ] [ \-c CACHE ] [ \-d DEBUG ] [ \-m MSIZE ] DIAL MOUNTPT
+ .PP
+ .B 9bind
+ OLD NEW
+@@ -22,48 +22,48 @@
+ .br
+ virtio!CHANNEL
+ .br
+--
++\-
+ .PP
+ where SOCKET is the name of a file representing a socket, HOST is a
+ hostname, PORT is a port number or service name, and CHANNEL is a
+-virtio channel name (currently ignored). - indicates that 9p messages
++virtio channel name (currently ignored). \- indicates that 9p messages
+ should be read/written on stdin/stdout.
+ .B 9mount
+ has several options:
+ .TP
+--i
++\-i
+ mount the file system with your uid/gid
+ .TP
+--n
++\-n
+ dry-run, print mount command to stderr but don't actually mount anything
+ .TP
+--s
+-single attach mode - all users accessing the mount point see the same
++\-s
++single attach mode \- all users accessing the mount point see the same
+ filesystem (by default they'll each see a unique attach)
+ .TP
+--u
++\-u
+ use the 9P2000.u extensions
+ .TP
+--v
++\-v
+ use device mapping
+ .TP
+--x
++\-x
+ exclusive access - other users cannot access the mount point
+ .TP
+--a SPEC
++\-a SPEC
+ SPEC determines which file tree to mount when attaching to file servers that
+ export multiple trees
+ .TP
+--c CACHE
++\-c CACHE
+ turns on caching using CACHE mode. Currently only
+ .I loose
+ cache mode is available, which is suitable for exclusive read-only mounts.
+ .TP
+--d DEBUG
+-comma seperated list of channels for which to enable debug output. Possible
++\-d DEBUG
++comma separated list of channels for which to enable debug output. Possible
+ channels include: err, devel, 9p, vfs, conv, mux, trans, alloc, fcall.
+ .TP
+--m MSIZE
++\-m MSIZE
+ specifies the maximum length of a single 9p message in bytes.
+ .PP
+ .B 9bind
+@@ -78,16 +78,16 @@
+ the uname to provide to the server.
+ .SH EXAMPLES
+ .TP
+-9mount -i 'unix!/tmp/ns.'$USER'.:0/factotum' $HOME/n/factotum
++9mount \-i 'unix!/tmp/ns.'$USER'.:0/factotum' $HOME/n/factotum
+ mount p9p's factotum interface
+ .TP
+ 9mount 'tcp!sources.cs.bell-labs.com' $HOME/n/sources
+ import plan 9's "sources"
+ .TP
+-9mount -u -a/home/sqweek/mail 'tcp!wren!5640' $HOME/mail
++9mount \-u \-a/home/sqweek/mail 'tcp!wren!5640' $HOME/mail
+ import my maildir from my server(wren), being served by ufs
+ .TP
+-9mount -i 'tcp!wren' $HOME/n/wren; 9bind $HOME/n/wren/home/sqweek/mail $HOME/mail
++9mount \-i 'tcp!wren' $HOME/n/wren; 9bind $HOME/n/wren/home/sqweek/mail $HOME/mail
+ again importing my maildir, this time serving via u9fs
+ .SH BUGS
+ .B 9mount
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8654805
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+manpages.patch
diff --git a/debian/rules b/debian/rules
index f85d829..662befd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,9 @@
 %:
 	dh $@
 
+override_dh_auto_build:
+	$(MAKE) CFLAGS="$(CFLAGS)"
+
 override_dh_auto_test:
 
 override_dh_auto_install:
-- 
cgit v1.2.3