From c2900ad94bea0cae14648b000d6de65ac4b48468 Mon Sep 17 00:00:00 2001
From: Ian Beckwith <ianb@erislabs.net>
Date: Mon, 19 Apr 2010 21:03:26 +0100
Subject: [PATCH] Switch to source format 3.0 (quilt) NB: Henceforth, the
 master branch has patches in debian/patches *applied*

---
 debian/changelog              | 1 +
 debian/control                | 2 +-
 debian/rules                  | 2 +-
 debian/source/format          | 1 +
 gnulib-tool                   | 2 +-
 lib/uniname/gen-uninames.lisp | 2 +-
 6 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 debian/source/format

diff --git a/debian/changelog b/debian/changelog
index 6a918367a..6271477b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ gnulib (20100419+stable-1) unstable; urgency=low
 
   * New upstream stable snapshot.
   * Refresh 01-gnulib-directory.patch.
+  * Switch to source format 3.0 (quilt).
   * debian/rules:
     + Remove 'upstream' target - not needed now we use stable snapshot tarballs.
     + Temporarily override dh_auto_test, until 'make check' is fixed
diff --git a/debian/control b/debian/control
index d2287202a..4dd3a940b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: gnulib
 Section: devel
 Priority: optional
 Maintainer: Ian Beckwith <ianb@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), quilt, texinfo
+Build-Depends: debhelper (>= 7.0.50~), texinfo
 Standards-Version: 3.8.4
 Homepage: http://www.gnu.org/software/gnulib/
 Vcs-Browser: http://erislabs.net/gitweb?p=gnulib.git
diff --git a/debian/rules b/debian/rules
index 1ab5f14f8..07618c00d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh ${@} --with quilt
+	dh ${@}
 
 # skip tests until 'make check' is fixed
 override_dh_auto_test:
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/gnulib-tool b/gnulib-tool
index 407a96f92..46c3d2fc4 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -410,7 +410,7 @@ func_gnulib_dir ()
       * ) self_abspathname=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`/"$linkval" ;;
     esac
   done
-  gnulib_dir=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`
+  gnulib_dir=/usr/share/gnulib
 }
 
 # func_tmpdir
diff --git a/lib/uniname/gen-uninames.lisp b/lib/uniname/gen-uninames.lisp
index d08e93f06..ec24d9776 100755
--- a/lib/uniname/gen-uninames.lisp
+++ b/lib/uniname/gen-uninames.lisp
@@ -1,4 +1,4 @@
-#!/usr/local/bin/clisp -C
+#!/usr/bin/clisp -C
 
 ;;; Creation of gnulib's uninames.h from the UnicodeData.txt table.
 ;;; Bruno Haible 2000-12-28
-- 
2.11.0