Okay. I'm including a diff from 2.0-3 to the debian/* subdir below.
I'm sending a tarball of an upstream snapshot (commit 6fe2f4f) under
separate cover without a BTS CC, because it seems silly to include it
as an attachment. I am however including below a log of the nontrivial
upstream commits, along with file change histograms, so you can see
what's what.
BTW, this kind of thing is really easy w/ git, each of the above is a
single short command. Github also exports snapshots as tarballs at
some magic URLs. If you need anything like that in the future just let
me know.
Cheers,
--Barak.
commit 0667e301c792a690fa47745e8caf4167119cf74a
Author: Barak A. Pearlmutter <barak+...@pearlmutter.net>
Date: Wed Dec 21 17:45:05 2016 +0000
policykit support file config option
Makefile.am | 5 +++++
configure.ac | 8 ++++++++
2 files changed, 13 insertions(+)
commit ae685ab9459a2084407c3f8011a899b082069ac8
Author: Barak A. Pearlmutter <barak+...@pearlmutter.net>
Date: Wed Dec 21 17:40:32 2016 +0000
distribute policykit support file
Makefile.am | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit ddefeba3f67d6a6f394eb57352254c1c8a312671
Author: Barak A. Pearlmutter <barak+...@pearlmutter.net>
Date: Tue Nov 29 16:47:27 2016 +0000
desktop file via policykit
This addresses bugs.debian.org/565294 which requests a menu item.
org.freedesktop.pkexec.usbview.policy | 18 ++++++++++++++++++
usbview.desktop | 5 +++--
2 files changed, 21 insertions(+), 2 deletions(-)
commit 13d3691bad4f569a45007be24fa9e80176e37f23
Author: Barak A. Pearlmutter <barak+...@pearlmutter.net>
Date: Tue Nov 29 16:15:32 2016 +0000
enable compiler warnings
configure.ac | 1 +
1 file changed, 1 insertion(+)
commit bef1aac68881b774c427200b360ca61fce134e10
Author: Michael Sartain <mikes...@gmail.com>
Date: Thu Sep 15 16:03:09 2016 -0600
Fix interface class/name buffer over-read.
Class was mallocing 10 bytes, then GetString would do a strncpy
of 10 bytes into class, however strncpy was not null-terminating
the buffer. From the strncpy man page:
Warning: If there is no null byte among the first n bytes of
src, the string placed in dest will not be null-terminated.
Fix is to malloc an extra byte for the class and name buffers.
Signed-off-by: Michael Sartain <mikes...@gmail.com>
usbparse.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 58737674053676a50c94fd72c2300ef8a9522425
Author: Barak A. Pearlmutter <barak+...@cs.nuim.ie>
Date: Mon Feb 23 09:09:04 2015 +0000
log changes
ChangeLog | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
commit 9c3d06c3fa1da102fe2886bf28ea45e18f20aa86
Author: Barak A. Pearlmutter <barak+...@pearlmutter.net>
Date: Wed May 18 22:04:01 2016 +0100
update .gitignore
.gitignore | 31 ++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
commit f611dab52afe2c9a0cf0ad0ee1668bf204c4b757
Author: Barak A. Pearlmutter <barak+...@cs.nuim.ie>
Date: Mon Feb 23 08:54:21 2015 +0000
trim ChangeLog whitespace
ChangeLog | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
commit 3da299fc3501a5832261ddd969a86bac600645e5
Author: Barak A. Pearlmutter <barak+...@pearlmutter.net>
Date: Wed Oct 28 14:03:26 2015 +0000
rm NEWS, as allowed by automake foreign option
NEWS | 1 -
1 file changed, 1 deletion(-)
commit 2ffa57666450c26d64cc6e475479219090696308
Author: Barak A. Pearlmutter <barak+...@cs.nuim.ie>
Date: Wed Feb 25 09:05:05 2015 +0000
squelch compiler warnings about gtk stock item deprecation
Compiler warnings were:
interface.c: In function ‘create_windowMain’:
interface.c:111:2: warning: ‘gtk_button_new_from_stock’ is deprecated
(declared at /usr/include/gtk-3.0/gtk/gtkbutton.h:103): Use
'gtk_button_new_with_label' instead [-Wdeprecated-declarations]
buttonRefresh = gtk_button_new_from_stock(GTK_STOCK_REFRESH);
^
interface.c:111:2: warning: ‘GtkStock’ is deprecated
[-Wdeprecated-declarations]
interface.c:125:2: warning: ‘gtk_button_new_from_stock’ is deprecated
(declared at /usr/include/gtk-3.0/gtk/gtkbutton.h:103): Use
'gtk_button_new_with_label' instead [-Wdeprecated-declarations]
buttonAbout = gtk_button_new_from_stock(GTK_STOCK_ABOUT);
^
interface.c:125:2: warning: ‘GtkStock’ is deprecated
[-Wdeprecated-declarations]
interface.c:132:2: warning: ‘gtk_button_new_from_stock’ is deprecated
(declared at /usr/include/gtk-3.0/gtk/gtkbutton.h:103): Use
'gtk_button_new_with_label' instead [-Wdeprecated-declarations]
buttonClose = gtk_button_new_from_stock(GTK_STOCK_QUIT);
^
interface.c:132:2: warning: ‘GtkStock’ is deprecated
[-Wdeprecated-declarations]
configure-dialog.c: In function ‘fileSelectButtonClick’:
configure-dialog.c:38:5: warning: ‘GtkStock’ is deprecated
[-Wdeprecated-declarations]
GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
^
configure-dialog.c:39:5: warning: ‘GtkStock’ is deprecated
[-Wdeprecated-declarations]
GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
^
configure-dialog.c: In function ‘configure_dialog’:
configure-dialog.c:66:5: warning: ‘GtkStock’ is deprecated
[-Wdeprecated-declarations]
GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
^
configure-dialog.c:67:5: warning: ‘GtkStock’ is deprecated
[-Wdeprecated-declarations]
GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
^
configure-dialog.c | 8 ++++----
interface.c | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
commit a87916703630ab5e6eb6f88e44453e2cbb1c79dd
Author: Barak A. Pearlmutter <barak+...@cs.nuim.ie>
Date: Tue Feb 24 22:26:50 2015 +0000
squelch compiler warning about ignored return value of fgets
Compiler warning was:
usbtree.c: In function ‘LoadUSBTree’:
usbtree.c:365:3: warning: ignoring return value of ‘fgets’, declared with
attribute warn_unused_result [-Wunused-result]
fgets (dataLine, MAX_LINE_SIZE-1, usbFile);
^
usbtree.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
commit 6a0fb55f6f820b9be774627b11cab17e8e7a3f90
Author: Barak A. Pearlmutter <barak+...@cs.nuim.ie>
Date: Wed Feb 11 12:31:22 2015 +0000
scalable icon and desktop file support
Convert xpm bitmap icon into a scalable svg icon (carefully sized to
64x64 and saved as plain SVG instead of inkscape-extended SVG)
Add a .desktop file.
Have Makefile.am install the desktop file and icons, including bitmap
icons at various resolutions. This is controlled by configuration-time
option ./configure --enable-icons for conditional installation of icons
and desktop file. Inkscape is used to convert graphics when available
as it does a better job than ImageMagick convert, which is used as a
fallback.
The icon compiled into the executable is also generated from the
scalable icon.
Add usbview.desktop to distribution tarball.
Makefile.am | 73 ++++++++++++++++++++--
configure.ac | 34 +++++++++++
interface.c | 4 +-
usb_icon.xpm | 181 -------------------------------------------------------
usbview.desktop | 9 +++
usbview_icon.svg | 41 +++++++++++++
6 files changed, 154 insertions(+), 188 deletions(-)
commit 5a99b76190f0c54489ad0971672b7ace70731648
Author: Barak A. Pearlmutter <barak+...@cs.nuim.ie>
Date: Thu Feb 5 14:07:30 2015 +0000
update autotools
$ mv configure.in configure.ac
$ rm autogen.sh (just run autoreconf --install)
$ rm config.h.in (generated by autoreconf)
Tweaks so that
$ autoupdate
$ autoreconf --warn=all
cease all nit picking.
Run
$ autoscan
and use its output to make configure.ac as bog standard as possible.
use AX_CFLAGS_WARN_ALL instead of custom code
Instead of custom autoconf code to enable -Wall when using GCC, use
the autoconf macro AX_CFLAGS_WARN_ALL, which enables reasonable
warnings. On Debian this is found in the autoconf-archive package.
See
http://www.gnu.org/software/autoconf-archive/ax_cflags_warn_all.html
VERSION belongs in config.h from configure.ac, not Makefile.am
Don't include CPPFLAGS in AM_CPPFLAGS as automake puts CPPFLAGS on the
CC commandline itself, so putting it in AM_CPPFLAGS causes it to be
included twice.
Remove references to GLIB_CFLAGS and GLIB_LIBS in Makefile.am as they
are not set by anything.
Reorder clauses to usual order, remove obsolete comments, add m4
quoting to configure.ac per autoconf documentation.
Makefile.am | 12 ++----------
autogen.sh | 4 ----
config.h.in | 28 ----------------------------
configure.ac | 39 +++++++++++++++++++++++++++++++++++++++
configure.in | 32 --------------------------------
5 files changed, 41 insertions(+), 74 deletions(-)
commit 4b25f25cd91b9cf297ca0439835c7d97f8d25813
Author: Barak A. Pearlmutter <barak+...@cs.nuim.ie>
Date: Wed Feb 25 11:13:03 2015 +0000
remove debian subdir; maintained in separate branch
debian/changelog | 92 -------------------------------------------------
debian/compat | 1 -
debian/control | 21 -----------
debian/copyright | 16 ---------
debian/rules | 65 ----------------------------------
debian/usbview.desktop | 7 ----
debian/usbview.dirs | 1 -
debian/usbview.docs | 1 -
debian/usbview.manpages | 1 -
debian/usbview.menu | 3 --
10 files changed, 208 deletions(-)
commit b801280b87d9b21ce3fbf8d662b179c9c787fa9c
Author: Diego Herranz <diegoherr...@diegoherranz.com>
Date: Tue May 17 19:59:54 2016 +0100
Add support for SuperSpeed and SuperSpeed+ (5-10Gb/s) in the speed field
Tested on a computer with SuperSpeed ports. SuperSpeed+ not tested due
to lack of hardware.
Signed-off-by: Diego Herranz <diegoherr...@diegoherranz.com>
usbtree.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit bb469f36f705e28c1d05f344c6e6d708dcdeac53
Author: Vikram Pandita <vikrampand...@gmail.com>
Date: Sat Jan 12 13:27:04 2013 -0800
add bus number and device address display
Its useful to show for an enumerated USB device:
* Device Address assigned
* on which Bus number
Signed-off-by: Vikram Pandita <vikrampand...@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
usbtree.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 24cd694..989198d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,21 @@
+usbview (2.0-4~1) UNRELEASED; urgency=medium
+
+ * Merge tweaks to upstream
+ * debian/source/local-options: single-debian-patch source option
+ * Add debian/watch from Debian QA group
+ * Allow upstream to install desktop, icon, manpage (closes: #565294),
+ remove said from debian/
+ * Install policykit file
+ * Bump policy version
+ * Convert debian/copyright to new standard format
+ * Debhelper 10
+ * Bounce desktop launch off a /usr/bin/usbview-pkexec trampoline
+
+ -- Barak A. Pearlmutter <b...@debian.org> Wed, 21 Dec 2016 16:31:59 +0000
+
usbview (2.0-3) unstable; urgency=low
- * Lots of changes, mostly from Barak A. Pearlmutter <ba...@cs.nuim.ie>
+ * Lots of changes, mostly from Barak A. Pearlmutter <ba...@cs.nuim.ie>
with changelog and tweaks from me (closes: #777603).
* Convert icon to svg format.
* Make menu entries use su-wrapper.
@@ -21,7 +36,7 @@ usbview (2.0-2) unstable; urgency=low
usbview (2.0-1) unstable; urgency=low
* New upstream release (closes: #691232).
- * Updated for current kernel ABIs (closes: #451191, #599162).
+ * Updated for current kernel ABIs (closes: #451191, #599162).
-- Mark Brown <broo...@debian.org> Wed, 21 Nov 2012 16:40:38 +0900
diff --git a/debian/clean b/debian/clean
index ce7f268..2f7d69b 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1 +1 @@
-debian/icons/*/*
+debian/usbview.xpm
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index ce7bf44..b96bddb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,20 @@ Source: usbview
Section: x11
Priority: optional
Maintainer: Mark Brown <broo...@debian.org>
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
Homepage: http://www.kroah.com/linux-usb/
-Build-Depends: debhelper (>= 9), dh-autoreconf, autoconf-archive,
- imagemagick, libmagickcore-6.q16-2-extra, libgtk-3-dev
+Build-Depends: debhelper (>= 10),
+ dh-autoreconf, autoconf-archive,
+ imagemagick,
+ inkscape,
+ libgtk-3-dev
+Vcs-Git: git://github.com/barak/usbview.git
+Vcs-Browser: https://github.com/barak/usbview
X-Vcs-Upstream-Git: git://github.com/gregkh/usbview.git
Package: usbview
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, policykit-1
Suggests: usbutils
Description: USB device viewer
USBView is a small GTK+ application to show what the device tree of
diff --git a/debian/copyright b/debian/copyright
index 404476c..5d68c06 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,17 +1,32 @@
-This is the Debian GNU/Linux packaged version of usbview version 0.7.0.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: usbview
+Source: http://www.kroah.com/linux-usb/
+ http://www.kroah.com/linux-usb/usbview-0.7.0.tar.gz
+ http://www.kroah.com/linux-usb/usbview-2.0.tar.gz
+ https://github.com/gregkh/usbview/
-The developer of this software is Greg Kroah-Hartman <g...@kroah.com>.
+Files: *
+Copyright: 1999-2012 Greg Kroah-Hartman <g...@kroah.com>
+License: GPL-2
-It was put together by Raphael Bossek <boss...@debian.org>
-from the following sources:
+Files: debian/*
+Copyright: 2000 Raphael Bossek <boss...@debian.org>
+ 2001-2013 Mark Brown <broo...@debian.org>
+ 2015 Barak A. Pearlmutter <b...@debian.org>
+License: GPL-2
- http://www.kroah.com/linux-usb/usbview-0.7.0.tar.gz
-
-Changes:
- * Added Debian GNU/Linux packaging files.
-
-This software is released under the terms of the GNU General Public License
-v2.
-
-On Debian systems, the complete text of the GNU General Public License v2
-can be found in /usr/share/common-licenses/GPL-2.
+License: GPL-2
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/debian/patches/0001-desktop-usbview-pkexec.patch b/debian/patches/0001-desktop-usbview-pkexec.patch
new file mode 100644
index 0000000..0c53170
--- /dev/null
+++ b/debian/patches/0001-desktop-usbview-pkexec.patch
@@ -0,0 +1,22 @@
+From: "Barak A. Pearlmutter" <barak+...@pearlmutter.net>
+Date: Wed, 21 Dec 2016 16:20:38 +0000
+Subject: desktop usbview-pkexec
+
+For reasons beyond the ken of mere developers, a trampoline is apparently necessary to invoke pkexec usbview from the desktop file. I've given up asking.
+---
+ usbview.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/usbview.desktop b/usbview.desktop
+index 69f2bb8..d787d7c 100644
+--- a/usbview.desktop
++++ b/usbview.desktop
+@@ -2,7 +2,7 @@
+ Name=USBView
+ GenericName=USB Device Viewer
+ Comment=View USB devices attached to system
+-Exec=pkexec /usr/bin/usbview
++Exec=usbview-pkexec
+ Icon=usbview
+ Terminal=false
+ Type=Application
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3c173ed
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-desktop-usbview-pkexec.patch
diff --git a/debian/rules b/debian/rules
index e47e5d0..f057edb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,14 @@
#!/usr/bin/make -f
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
%:
- dh $@ --with autoreconf --parallel
+ dh $@
-bitmaps=debian/icons/32x32/usbview.xpm debian/icons/64x64/usbview.png
+bitmap = debian/usbview.xpm
-override_dh_install: $(bitmaps)
+override_dh_install: $(bitmap)
dh_install
-$(bitmaps): debian/usbview.svg
- mkdir -p $$(dirname $@)
- convert -geometry $$(basename $$(dirname $@)) $< $@
+$(bitmap): hicolor/32x32/apps/usbview.png
+ convert -geometry 32x32 $< $@
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..7423a2d
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+single-debian-patch
diff --git a/debian/usbview-pkexec b/debian/usbview-pkexec
new file mode 100755
index 0000000..8322344
--- /dev/null
+++ b/debian/usbview-pkexec
@@ -0,0 +1,2 @@
+#!/bin/sh
+pkexec /usr/bin/usbview "$@"
diff --git a/debian/usbview.desktop b/debian/usbview.desktop
deleted file mode 100644
index ec44efd..0000000
--- a/debian/usbview.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=USBView
-Comment=View USB devices attached to system
-Exec=su-to-root -X -c /usr/bin/usbview
-Icon=usbview
-Terminal=false
-Type=Application
-Keywords=USB;devices;connected;removable;
-Categories=GTK;HardwareSettings;Settings;
diff --git a/debian/usbview.install b/debian/usbview.install
index f386049..ecab1ea 100644
--- a/debian/usbview.install
+++ b/debian/usbview.install
@@ -1,4 +1,3 @@
-debian/usbview.desktop /usr/share/applications/
-debian/icons/32x32/usbview.xpm /usr/share/icons/hicolor/32x32/apps/
-debian/icons/64x64/usbview.png /usr/share/icons/hicolor/64x64/apps/
-debian/usbview.svg /usr/share/icons/hicolor/scalable/apps/
+debian/usbview.xpm /usr/share/icons/hicolor/32x32/apps/
+org.freedesktop.pkexec.usbview.policy /usr/share/polkit-1/actions/
+debian/usbview-pkexec /usr/bin/
diff --git a/debian/usbview.manpages b/debian/usbview.manpages
deleted file mode 100644
index fcb2364..0000000
--- a/debian/usbview.manpages
+++ /dev/null
@@ -1 +0,0 @@
-usbview.8
diff --git a/debian/usbview.menu b/debian/usbview.menu
deleted file mode 100644
index e7b36d2..0000000
--- a/debian/usbview.menu
+++ /dev/null
@@ -1,3 +0,0 @@
-?package(usbview):needs="X11" section="Applications/System/Hardware" \
- title="USB View" command="su-to-root -X -c /usr/bin/usbview" \
- icon="/usr/share/icons/hicolor/32x32/apps/usbview.xpm"
diff --git a/debian/usbview.svg b/debian/usbview.svg
deleted file mode 100644
index da3295b..0000000
--- a/debian/usbview.svg
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/";
- xmlns:cc="http://creativecommons.org/ns#";
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
- xmlns:svg="http://www.w3.org/2000/svg";
- xmlns="http://www.w3.org/2000/svg";
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- width="64px"
- height="64px"
- id="svg2985"
- version="1.1"
- inkscape:version="0.48.5 r10040"
- sodipodi:docname="New document 2">
- <defs
- id="defs2987" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="7.1276363"
- inkscape:cx="8.9147202"
- inkscape:cy="26.700074"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:document-units="px"
- inkscape:grid-bbox="true"
- inkscape:snap-global="false"
- inkscape:window-width="1600"
- inkscape:window-height="834"
- inkscape:window-x="0"
- inkscape:window-y="27"
- inkscape:window-maximized="1" />
- <metadata
- id="metadata2990">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- id="layer1"
- inkscape:label="Layer 1"
- inkscape:groupmode="layer">
- <rect
- style="fill:#67bfef;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.95700002;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3111"
- width="62.055035"
- height="62.055035"
- x="1.1009438"
- y="1.124616"
- ry="12.767206" />
- <path
- id="path1334"
- d="m 59.757253,31.012666 -6.076826,-3.509323 0,2.50338 -31.060353,0 6.047801,-6.389553 c 0.514692,-0.412553 1.188114,-0.701962 1.880845,-0.717993 2.802382,0 4.466566,-7.28e-4 5.079145,-0.0019 0.415225,1.183011 1.530592,2.036904 2.856546,2.036904 1.677422,0 3.038717,-1.361174 3.038717,-3.039203 0,-1.678759 -1.361174,-3.039447 -3.038717,-3.039447 -1.325954,0 -2.441321,0.853407 -2.856546,2.035447 l -5.019635,-8.51e-4 c -1.360447,0 -2.785988,0.746412 -3.693316,1.621436 0.02478,-0.02599 0.05052,-0.05368 -0.0014,4.86e-4 -0.01919,0.02162 -6.416513,6.778424 -6.416513,6.778424 -0.513597,0.411947 -1.186655,0.699533 -1.878901,0.716051 l -3.513696,0 c -0.465749,-2.321211 -2.515525,-4.070043 -4.974335,-4.070043 -2.8033537,0 -5.0757426,2.272388 -5.0757426,5.074892 0,2.803354 2.2723889,5.075864 5.0757426,5.075864 2.459296,0 4.509072,-1.750289 4.97482,-4.073443 l 3.452123,0 c 0.0089,0 0.01773,4.85e-4 0.02672,0 l 7.635474,0 c 0.69091,0.01761 1.363117,0.30556 1.87623,0.717993 0,0 6.395868,6.756321 6.415664,6.778182 0.05125,0.05429 0.02575,0.02599 4.85e-4,4.85e-4 0.907329,0.874902 2.333477,1.620827 3.694166,1.620827 l 4.837463,-0.0011 0,2.03751 6.078407,0 0,-6.077797 -6.078407,0 0,2.034839 c 0,0 -1.274098,-0.0023 -4.896729,-0.0023 -0.692854,-0.01591 -1.367005,-0.304953 -1.881452,-0.717507 l -6.049142,-6.390725 23.464591,0 0,2.507388 6.076827,-3.508837 z"
- inkscape:connector-curvature="0"
- style="fill:#ffffff;fill-opacity:1" />
- </g>
-</svg>
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..9b45dc7
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/,dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$// \
+http://www.kroah.com/linux-usb/ (?:.*/)?usbview[_\-\.]?(\d\S*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
