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