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.
This commit is contained in:
Ben Hutchings 2018-09-12 23:37:15 +01:00
parent d1a9cf0bdc
commit 8d93bb4a9e
3 changed files with 2 additions and 21 deletions

19
debian/bin/uscan-hook vendored
View File

@ -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

1
debian/changelog vendored
View File

@ -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

3
debian/watch vendored
View File

@ -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