From 8d93bb4a9edf33377498585ddf49fd012f03b1f3 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Wed, 12 Sep 2018 23:37:15 +0100
Subject: [PATCH] debian/{watch,bin/uscan-hook}: Drop uscan hook in favour of
 uupdate

uscan now does the file removals, which makes the hook script
redundant.  Not only that, but the orig tarball passed to the hook is
no longer a symlink to the upstream filename, so genorig.py doesn't
recognise the filename and fails.
---
 debian/bin/uscan-hook | 19 -------------------
 debian/changelog      |  1 +
 debian/watch          |  3 +--
 3 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100755 debian/bin/uscan-hook

diff --git a/debian/bin/uscan-hook b/debian/bin/uscan-hook
deleted file mode 100755
index b0631c64e..000000000
--- a/debian/bin/uscan-hook
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash -e
-
-# This script is invoked by uscan after downloading a new tarball
-
-if [ "x$1" != "x--upstream-version" -o $# != 3 ]; then
-   echo >&2 "invalid arguments: $*"
-   exit 2
-fi
-
-version="$2"
-filename="$3"
-
-upstream_tarball="$(readlink -f "$filename")"
-rm "$filename"
-debian/bin/genorig.py --override-version "$version" "$upstream_tarball"
-
-dch -v "$version-1" 'New upstream release'
-
-debian/rules orig
diff --git a/debian/changelog b/debian/changelog
index a42f43043..3747069ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ linux (4.18.6-2) UNRELEASED; urgency=medium
   * [rt] genpatch-rt: Store patches and series file in debian/patches-rt
   * linux-headers: Stop linking the doc directory, which is not binNMU-safe
   * debian/copyright: Simplify exclusions to work with mk-origtargz
+  * debian/{watch,bin/uscan-hook}: Drop uscan hook in favour of uupdate
 
   [ Salvatore Bonaccorso ]
   * mac80211: don't update the PM state of a peer upon a multicast frame
diff --git a/debian/watch b/debian/watch
index 09e8e35c3..d2fa8b6ea 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,3 @@
 # Find first non-rc tarball linked from kernel.org.
-# We need to DFSG-clean it, so use our own script instead of uupdate.
 version=3
-https://www.kernel.org/ .*/linux-([0-9.]+).tar.xz debian debian/bin/uscan-hook
+https://www.kernel.org/ .*/linux-([0-9.]+).tar.xz debian uupdate