Removed netrc-doc.dpatch which has been merged upstream.

diff --git a/debian/control b/debian/control
index 41bbd4563956515bc2006d80de2185b6e1ef2d03..7909de4b90582335fa076de5584acc18d1550493 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: cadaver
 Section: web
 Priority: optional
 Maintainer: Sebastian Harl <sh@tokkee.org>
-Build-Depends: debhelper (>= 5), autotools-dev, libncurses5-dev, libxml2-dev | libxml-dev, libreadline5-dev, zlib1g-dev (>= 1:1.1.3), libneon26-gnutls-dev, dpatch
+Build-Depends: debhelper (>= 5), autotools-dev, libncurses5-dev, libxml2-dev | libxml-dev, libreadline5-dev, zlib1g-dev (>= 1:1.1.3), libneon26-gnutls-dev
 Standards-Version: 3.7.2
 
 Package: cadaver

diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644 (file)
index 39eb04c..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-netrc-doc.dpatch
-

diff --git a/debian/patches/netrc-doc.dpatch b/debian/patches/netrc-doc.dpatch
deleted file mode 100644 (file)
index 0179ec3..0000000
--- a/debian/patches/netrc-doc.dpatch
+++ /dev/null
@@ -1,88 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## netrc-doc.dpatch by Sebastian Harl <sh@tokkee.org>
-##
-## DP: Document the .netrc file support.
-
-@DPATCH@
-
---- a/doc/cadaver.1    2007-01-08 15:32:18.000000000 +0100
-+++ b/doc/cadaver.1    2007-01-08 15:32:13.000000000 +0100
-@@ -14,6 +14,12 @@
- .BR smbclient (1). 
- A user familiar with these tools should be quite
- comfortable with cadaver.
-+
-+.B cadaver
-+supports automatically logging in to servers requiring authentication via
-+a .netrc file (similar to
-+.BR ftp (1)
-+- see section "THE .netrc FILE" below).
- .SH OPTIONS
- .IP "-e, --expect100"
- Enable sending of `Expect: 100-continue' header.
-@@ -93,6 +99,55 @@
- Logout of authentication session
- .IP "help [command]"
- Display help message
-+.SH THE .netrc FILE
-+The file
-+.I ~/.netrc
-+may be used to automatically login to a server requiring authentication. The
-+following tokens (separated by spaces, tabs or newlines) may be used:
-+
-+.B machine
-+.I host
-+.RS
-+Identify a remote machine
-+.I host
-+which is compared with the hostname given on the command line or as an
-+argument to the
-+.B open
-+command.
-+Any subsequent tokens up to the end of file or the next
-+.B machine
-+or
-+.B default
-+token are associated with this entry.
-+.RE
-+
-+.B default
-+.RS
-+This is equivalent to the
-+.B machine
-+token but matches any hostname. Only one
-+.B default
-+token may be used and it must be after all
-+.B machine
-+tokens.
-+.RE
-+
-+.B login
-+.I username
-+.RS
-+Specifies the username to use when logging in to the remote machine.
-+.RE
-+
-+.B password
-+.I string
-+.br
-+.B passwd
-+.I string
-+.RS
-+Specifies the password to use when logging in to the remote machine.
-+.RE
-+
-+Any other tokens (as described in ftp(1)) are ignored.
- .SH EXAMPLES
- .IP "cadaver http://dav.example.com/"
- Connects to the server myserver.example.com, opening the root collection.
-@@ -105,6 +160,9 @@
- .SH FILES
- .IP "~/.cadaverrc"
- Individual user settings that can override cadaver defaults.
-+.IP "~/.netrc"
-+Login and initialization information used by the auto-login process. See
-+section "THE .netrc FILE" for details.
- .SH AUTHOR
- Joe Orton <cadaver@webdav.org>
- .SH SEE ALSO

diff --git a/debian/rules b/debian/rules
index 11daf3cc4316b8caa406736870b7f14ed23e2646..797557b7b628cb305784228a7108f7a9384b4af1 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -21,8 +21,6 @@ else
        CFLAGS += -O2
 endif
 
-include /usr/share/dpatch/dpatch.make
-
 $(BUILDDIR)/config.status: configure
        dh_testdir
        
@@ -39,7 +37,7 @@ $(BUILDDIR)/config.status: configure
 
 build: build-stamp
 
-build-stamp: $(BUILDDIR)/config.status patch
+build-stamp: $(BUILDDIR)/config.status
        dh_testdir
        dh_clean
        
@@ -48,7 +46,7 @@ build-stamp: $(BUILDDIR)/config.status patch
        
        touch build-stamp
 
-clean: unpatch
+clean:
        dh_testdir
        dh_testroot
        rm -f build-stamp