Imported Debian patch 1.2.1-1

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644 (file)
index 66a5588..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,29 +0,0 @@
-nfs-utils for Debian
-====================
-
-nfs-utils for Debian is packaged using quilt. To get started:
-
-  sudo aptitude install quilt
-  export QUILT_PATCHES=debian/patches/
-
-To get the complete source as built, use the "patch" target in debian/rules or,
-equivalently:
-
-  quilt push -a
-
-To make a new modification, first apply all patches as described above, and
-then
-
-  quilt new 99-my-local-patch.patch
-  quilt edit foo/bar.c
-  quilt edit baz/quux.c
-  quilt refresh
-
-To get the tree back in pristine form, use the "unpatch" target in debian/rules
-or, equivalently:
-
-  quilt pop -a
-
-Happy hacking!
-
- -- Steinar H. Gunderson <sesse@debian.org>, Mon, 14 Jul 2008 11:20:34 +0200

diff --git a/debian/changelog b/debian/changelog
index 0e502944255f31a260c9859fa083924d935a2fb8..1fbf367fe4170b28fde7e0a43b93324bb173ad7f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+nfs-utils (1:1.2.1-1) unstable; urgency=low
+
+  * New upstream release 
+  * Update debian/watch
+  * Debian source format is 3.0 (quilt)
+    Don't build depend on quilt
+  * Remove 10-493659-nfs.man.patch (merged)
+  * Build depend on libtirpc-dev
+
+ -- Anibal Monsalve Salazar <anibal@debian.org>  Fri, 18 Dec 2009 13:17:42 +1100
+
 nfs-utils (1:1.2.0-4.1) unstable; urgency=low
 
   * Non-maintainer upload.

diff --git a/debian/control b/debian/control
index 66c830c591d884f477e56de611f2b63f588a12a1..51e9e8a426f2b892fe00a6def3a06fa38b855136 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: nfs-utils
 Priority: standard
 Section: net
 Maintainer: Anibal Monsalve Salazar <anibal@debian.org>
-Build-Depends: debhelper (>= 5), libwrap0-dev, libevent-dev, libnfsidmap-dev, libkrb5-dev, libgssglue-dev, librpcsecgss-dev (>= 0.17), libblkid-dev, libkeyutils-dev, pkg-config, quilt (>= 0.40), libldap2-dev
+Build-Depends: debhelper (>= 5), libwrap0-dev, libevent-dev, libnfsidmap-dev, libkrb5-dev, libgssglue-dev, librpcsecgss-dev (>= 0.17), libblkid-dev, libkeyutils-dev, pkg-config, libldap2-dev, libtirpc-dev
 Standards-Version: 3.8.1
 Homepage: http://nfs.sourceforge.net/
 

diff --git a/debian/patches/10-493659-nfs.man.patch b/debian/patches/10-493659-nfs.man.patch
deleted file mode 100644 (file)
index 3b45fae..0000000
--- a/debian/patches/10-493659-nfs.man.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=493659
-patch by nbreen@ofb.net (Nicholas Breen)
-
-Index: nfs-utils-1.1.6/utils/mount/nfs.man
-===================================================================
---- nfs-utils-1.1.6.orig/utils/mount/nfs.man
-+++ nfs-utils-1.1.6/utils/mount/nfs.man
-@@ -835,7 +835,7 @@ dropped requests, but this can result in
- and server load.
- .P
- However, UDP can be quite effective in specialized settings where  
--the network’s MTU is large relative to NFS’s data transfer size (such  
-+the network's MTU is large relative to NFS's data transfer size (such  
- as network environments that enable jumbo Ethernet frames).  In such  
- environments, trimming the 
- .B rsize 

diff --git a/debian/patches/series b/debian/patches/series
index 7fff9f568717152ebde58c493a0c56bf6aae2f0a..b6407f6358ccc7dd26ca999d9165c87e09d308c0 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 01-sm-notify-in-sbin.patch
 03-handle-mtab-symlink.patch
 07-remove-duplicate-exports-paragraphs.patch
-10-493659-nfs.man.patch
 11-532048-reduce-verbosity.patch

diff --git a/debian/rules b/debian/rules
index 2bd4939551392df9945d1dec60e51c3e91200aa4..c0c3a9b24df2738ad9fa830950718e341fc666ad 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
 #! /usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
-
 # Parsing of DEB_BUILD_OPTIONS flags.
 # Note that nostrip is handled automatically by debhelper.
 CFLAGS := -g -Wall
@@ -18,7 +16,7 @@ endif
 # Temporary root
 DEBTMP := $(CURDIR)/debian/tmp
 
-build: patch build-stamp
+build: build-stamp
 build-stamp:
        dh_testdir
        CFLAGS="$(CFLAGS)" ./configure \
@@ -27,7 +25,7 @@ build-stamp:
        $(MAKE) $(MAKEFLAGS)
        touch build-stamp
 
-clean: unpatch
+clean:
        dh_testdir
        dh_testroot
        rm -f build-stamp

diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

diff --git a/debian/source/options b/debian/source/options
new file mode 100644 (file)
index 0000000..779dbfd
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1,2 @@
+compression = "bzip2"
+compression-level = 9

diff --git a/debian/watch b/debian/watch
index fb19538ed87ae44bb312cc837bb81ce75228ddb3..482dbc9e0412b183d66a4fa2dd08775990c2e8a4 100644 (file)
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://www.kernel.org/pub/linux/utils/nfs/nfs-utils-([\.\d]+).tar.gz
+http://www.kernel.org/pub/linux/utils/nfs/nfs-utils-([\.\d]+).tar.bz2