diff -Nru airspyhf-1.6.8/debian/changelog airspyhf-1.6.8/debian/changelog
--- airspyhf-1.6.8/debian/changelog	2020-08-16 13:42:04.000000000 +0000
+++ airspyhf-1.6.8/debian/changelog	2020-12-18 01:01:46.000000000 +0000
@@ -1,3 +1,19 @@
+airspyhf (1.6.8-3) unstable; urgency=medium
+
+  [ Debian Janitor ]
+  * Trim trailing whitespace.
+  * debian/copyright: use spaces rather than tabs to start continuation lines.
+  * Set debhelper-compat version in Build-Depends.
+  * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
+    Repository-Browse.
+
+  [ A. Maitland Bottoms ]
+  * Thanks to the Debian Janitor for above packaging improvements
+  * update Standards-Version (no changes)
+  * move udev entry to libairsppyhf1
+
+ -- A. Maitland Bottoms <bottoms@debian.org>  Thu, 17 Dec 2020 20:01:46 -0500
+
 airspyhf (1.6.8-2) unstable; urgency=medium
 
   * source only upload to unstable to allow transition
@@ -26,4 +42,3 @@
   * New release (Closes: #882184)
 
  -- A. Maitland Bottoms <bottoms@debian.org>  Sun, 19 Nov 2017 16:12:17 -0500
-
diff -Nru airspyhf-1.6.8/debian/com.airspy.airspyhf.metainfo.xml airspyhf-1.6.8/debian/com.airspy.airspyhf.metainfo.xml
--- airspyhf-1.6.8/debian/com.airspy.airspyhf.metainfo.xml	1970-01-01 00:00:00.000000000 +0000
+++ airspyhf-1.6.8/debian/com.airspy.airspyhf.metainfo.xml	2020-12-18 01:01:46.000000000 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component>
+  <id>com.airspy.airspyhf</id>
+  <metadata_license>Airspy-BSD</metadata_license>
+  <project_license>GPL-2+</project_license>
+  <name>airspyhf</name>
+  <summary>Control of Airspy HF+ radio receiver</summary>
+  <description>
+    <p>
+      Airspy HF+ is a Radio that can receive
+      9 kHZ to 31 MHz and 60 MHz to 260 MHz.
+      It is a High Speed USB device powered by the USB bus.
+    </p>
+  </description>
+  <provides>
+    <modalias>usb:v03EBp800Cd*</modalias>
+  </provides>
+</component>
diff -Nru airspyhf-1.6.8/debian/com.airspy.airspy-hf-plus.metainfo.xml airspyhf-1.6.8/debian/com.airspy.airspy-hf-plus.metainfo.xml
--- airspyhf-1.6.8/debian/com.airspy.airspy-hf-plus.metainfo.xml	2020-08-11 02:51:28.000000000 +0000
+++ airspyhf-1.6.8/debian/com.airspy.airspy-hf-plus.metainfo.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component>
-  <id>com.airspy.airspy-hf-plus</id>
-  <metadata_license>Airspy-BSD</metadata_license>
-  <name>airspyhf</name>
-  <summary>Control of Airspy HF+ radio receiver</summary>
-  <description>
-    <p>
-      Airspy HF+ is a Radio that can receive
-      9 kHZ to 31 MHz and 60 MHz to 260 MHz.
-      It is a High Speed USB device powered by the USB bus.
-    </p>
-  </description>
-  <provides>
-    <modalias>usb:v03EBp800Cd*</modalias>
-  </provides>
-</component>
diff -Nru airspyhf-1.6.8/debian/compat airspyhf-1.6.8/debian/compat
--- airspyhf-1.6.8/debian/compat	2020-08-11 02:57:21.000000000 +0000
+++ airspyhf-1.6.8/debian/compat	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-12
diff -Nru airspyhf-1.6.8/debian/control airspyhf-1.6.8/debian/control
--- airspyhf-1.6.8/debian/control	2020-08-12 01:53:38.000000000 +0000
+++ airspyhf-1.6.8/debian/control	2020-12-18 01:01:46.000000000 +0000
@@ -4,11 +4,12 @@
 Maintainer: Debian Hamradio Maintainers <debian-hams@lists.debian.org>
 Uploaders: A. Maitland Bottoms <bottoms@debian.org>
 Build-Depends: cmake,
-               debhelper (>= 12~),
+               debhelper-compat (= 13),
                libusb-1.0-0-dev [!kfreebsd-any],
                libusb2-dev [kfreebsd-any],
                pkg-config
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
+Rules-Requires-Root: no
 Homepage: https://airspy.com/airspy-hf-plus
 Vcs-Browser: https://salsa.debian.org/debian-hamradio-team/airspyhf
 Vcs-Git: https://salsa.debian.org/debian-hamradio-team/airspyhf.git
@@ -18,7 +19,7 @@
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, libairspyhf1 (= ${binary:Version}), ${misc:Depends}
-Description: HF+VHF software defined radio receiver - development
+Description: HF+VHF software defined radio receiver - user runtime
  Airspy HF+ is an open source Software Defined Radio that can receive
  9 kHZ to 31 MHz and 60 MHz to 260 MHz.
  It is a High Speed USB device powered by the USB bus.
@@ -44,6 +45,7 @@
  This package contains development files.
 
 Package: libairspyhf1
+Section: libs
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
diff -Nru airspyhf-1.6.8/debian/copyright airspyhf-1.6.8/debian/copyright
--- airspyhf-1.6.8/debian/copyright	2020-08-12 01:44:13.000000000 +0000
+++ airspyhf-1.6.8/debian/copyright	2020-12-18 01:01:46.000000000 +0000
@@ -18,10 +18,10 @@
 
 Files: libairspyhf/src/*
 Copyright: Copyright (c) 2013-2017, Youssef Touil <youssef@airspy.com>
-	   Copyright (c) 2013-2017, Ian Gilmour <ian@sdrsharp.com>
-	   Copyright (c) 2013-2017, Benjamin Vernoux <bvernoux@airspy.com>
-	   Copyright (c) 2013, Michael Ossmann <mike@ossmann.com>
-	   Copyright (c) 2012, Jared Boone <jared@sharebrained.com>
+           Copyright (c) 2013-2017, Ian Gilmour <ian@sdrsharp.com>
+           Copyright (c) 2013-2017, Benjamin Vernoux <bvernoux@airspy.com>
+           Copyright (c) 2013, Michael Ossmann <mike@ossmann.com>
+           Copyright (c) 2012, Jared Boone <jared@sharebrained.com>
 License: AirSpy-BSD
 
 Files: libairspyhf/src/iqbalancer.*
@@ -51,7 +51,7 @@
          Based heavily upon the libftdi cmake setup.
 License: GPL-2+
 
-Files: tools/airspyhf_calibrate.c
+Files: tools/src/airspyhf_calibrate.c
 Copyright: 2012 Jared Boone <jared@sharebrained.com>
            2013 Michael Ossmann <mike@ossmann.com>
            2013/2014 Benjamin Vernoux <bvernoux@airspy.com>
@@ -59,18 +59,18 @@
            2020 Kenji Rikitake JJ1BDX <kenji.rikitake@acm.org>
 License: GPL-2+
 
-Files: tools/airspyhf_gpio.c tools/airspyhf_lib_version.c
+Files: tools/src/airspyhf_gpio.c tools/src/airspyhf_lib_version.c
 Copyright: 2018 Andrea Montefusco IW0HDV <andrew@montefusco.com>
 License: GPL-2+
 
-Files: tools/airspyhf_info.c
+Files: tools/src/airspyhf_info.c
 Copyright: 2012 Jared Boone <jared@sharebrained.com>
            2013 Michael Ossmann <mike@ossmann.com>
            2013/2014 Benjamin Vernoux <bvernoux@airspy.com>
            2018 Andrea Montefusco IW0HDV <andrew@montefusco.com>
 License: GPL-2+
 
-Files: tools/airspyhf_rx.c
+Files: tools/src/airspyhf_rx.c
 Copyright: 2012 Jared Boone <jared@sharebrained.com>
            2014-2015 Benjamin Vernoux <bvernoux@airspy.com>
            2018 Andrea Montefusco IW0HDV <andrew@montefusco.com>
diff -Nru airspyhf-1.6.8/debian/libairspyhf1.install airspyhf-1.6.8/debian/libairspyhf1.install
--- airspyhf-1.6.8/debian/libairspyhf1.install	2018-08-01 18:40:02.000000000 +0000
+++ airspyhf-1.6.8/debian/libairspyhf1.install	2020-12-18 01:01:46.000000000 +0000
@@ -1 +1,2 @@
 usr/lib/*/lib*.so.*
+debian/com.airspy.airspyhf.metainfo.xml usr/share/metainfo
diff -Nru airspyhf-1.6.8/debian/libairspyhf1.udev airspyhf-1.6.8/debian/libairspyhf1.udev
--- airspyhf-1.6.8/debian/libairspyhf1.udev	1970-01-01 00:00:00.000000000 +0000
+++ airspyhf-1.6.8/debian/libairspyhf1.udev	2020-12-18 01:01:46.000000000 +0000
@@ -0,0 +1 @@
+SUBSYSTEM=="usb", ATTR{idVendor}=="03eb", ATTR{idProduct}=="800c", SYMLINK+="airspyhf-%k", TAG+="uaccess"
diff -Nru airspyhf-1.6.8/debian/libairspyhf-dev.install airspyhf-1.6.8/debian/libairspyhf-dev.install
--- airspyhf-1.6.8/debian/libairspyhf-dev.install	2018-08-01 18:40:11.000000000 +0000
+++ airspyhf-1.6.8/debian/libairspyhf-dev.install	2020-12-18 01:01:46.000000000 +0000
@@ -2,4 +2,3 @@
 usr/lib/*/lib*.a
 usr/lib/*/lib*.so
 usr/lib/*/pkgconfig/
-debian/com.airspy.airspy-hf-plus.metainfo.xml usr/share/metainfo
diff -Nru airspyhf-1.6.8/debian/libairspyhf-dev.udev airspyhf-1.6.8/debian/libairspyhf-dev.udev
--- airspyhf-1.6.8/debian/libairspyhf-dev.udev	2018-08-01 19:03:36.000000000 +0000
+++ airspyhf-1.6.8/debian/libairspyhf-dev.udev	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-SUBSYSTEM=="usb", ATTR{idVendor}=="03eb", ATTR{idProduct}=="800c", SYMLINK+="airspyhf-%k", MODE="660", GROUP="plugdev", TAG+="uaccess"
diff -Nru airspyhf-1.6.8/debian/source/include-binaries airspyhf-1.6.8/debian/source/include-binaries
--- airspyhf-1.6.8/debian/source/include-binaries	2018-04-06 03:10:27.000000000 +0000
+++ airspyhf-1.6.8/debian/source/include-binaries	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-debian/libairspyhf-dev.abi.tar.gz.amd64
diff -Nru airspyhf-1.6.8/debian/upstream/metadata airspyhf-1.6.8/debian/upstream/metadata
--- airspyhf-1.6.8/debian/upstream/metadata	1970-01-01 00:00:00.000000000 +0000
+++ airspyhf-1.6.8/debian/upstream/metadata	2020-12-18 00:57:51.000000000 +0000
@@ -0,0 +1,5 @@
+---
+Bug-Database: https://github.com/airspy/airspyhf/issues
+Bug-Submit: https://github.com/airspy/airspyhf/issues/new
+Repository: https://github.com/airspy/airspyhf.git
+Repository-Browse: https://github.com/airspy/airspyhf