Update for new upstream release.

diff --git a/debian/changelog b/debian/changelog
index 7e89fab8407c7c45c5ac6ead9033d89cd02de3a1..bf0513196d9a8ed338dcb35a22f0f0aa6266de4b 100755 (executable)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
-sapphire-remote (7.1-1) UNRELEASED; urgency=medium
+sapphire-remote (7.2-1) UNRELEASED; urgency=medium

 
   * New upstream release
 
   * New upstream release

+  * Remove patch move_rmmod.diff as it has been merged upstream.

 
 

- -- Andrew Ruthven <andrew@etc.gen.nz>  Sat, 16 Feb 2019 07:19:10 +0000
+ -- Andrew Ruthven <andrew@etc.gen.nz>  Wed, 20 Feb 2019 09:28:10 +0000

 
 

-sapphire-remote (6.6-1) stable; urgency=low
+sapphire-remote (7.1-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Andrew Ruthven <andrew@etc.gen.nz>  Tue, 19 Feb 2019 08:19:10 +0000
+
+sapphire-remote (6.6-1) unstable; urgency=low

 
   * Automatically packaged by DKMS.
 
 
   * Automatically packaged by DKMS.
 

diff --git a/debian/patches/move_rmmod.diff b/debian/patches/move_rmmod.diff
deleted file mode 100644 (file)
index e61c572..0000000
--- a/debian/patches/move_rmmod.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-By leaving hid_topseed running, we can see what devices it had
-bound, then move them over to sapphire.
-
-I was running into a problem where after unloading hid_topseed,
-when I loaded sapphire the remote wasn't being registered
-with sapphire until I unplugged it and plugged it back it.
---- a/sapphire_startup.sh
-+++ b/sapphire_startup.sh
-@@ -8,8 +8,9 @@
- #
- TOPSEED=/sys/bus/hid/drivers/topseed
- SAPPHIRE=/sys/bus/hid/drivers/sapphire
--rmmod hid-topseed     &>/dev/null
- modprobe sapphire     &>/dev/null
-+
-+# Move any devices bound to hid-topseed over to sapphire.
- if [ -d $SAPPHIRE -a -e $TOPSEED/unbind ]; then
-       cd $TOPSEED
-       for dev in [0-9]*[-0-9A-F] ; do
-@@ -19,6 +20,8 @@
-               fi
-       done
- fi
-+
-+rmmod hid-topseed      &>/dev/null
- #
- # Ubuntu/Mint kernels (and likely others too) don't like it
- # when we unload and reload the sapphire driver.

diff --git a/debian/patches/series b/debian/patches/series
index 9be992da64635836bf094c5b18c8f43903c1485b..fa4e49bcdd548ed867d0cda2736728cbde8e47a6 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 paths.diff
 paths.diff

-move_rmmod.diff

 dkms.diff
 dkms.diff