Signed-off-by: Peter Müller peter.mueller@ipfire.org --- usbutils/patches/usbutils-003-hwdata.patch | 79 --------------------- usbutils/patches/usbutils-make-hwdata.patch | 21 ------ usbutils/usbutils.nm | 11 ++- 3 files changed, 4 insertions(+), 107 deletions(-) delete mode 100644 usbutils/patches/usbutils-003-hwdata.patch delete mode 100644 usbutils/patches/usbutils-make-hwdata.patch
diff --git a/usbutils/patches/usbutils-003-hwdata.patch b/usbutils/patches/usbutils-003-hwdata.patch deleted file mode 100644 index 4a08c48fa..000000000 --- a/usbutils/patches/usbutils-003-hwdata.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- usbutils-003/Makefile.am 2011-03-22 00:23:33.000000000 +0100 -+++ usbutils-003_/Makefile.am 2011-06-16 15:41:20.927882420 +0200 -@@ -4,15 +4,9 @@ - AM_LDFLAGS = \ - -Wl,--as-needed - --data_DATA = \ -- usb.ids -- - bin_PROGRAMS = \ - lsusb - --sbin_SCRIPTS = \ -- update-usbids.sh -- - bin_SCRIPTS = \ - usb-devices \ - lsusb.py -@@ -27,37 +21,22 @@ - - lsusb_CPPFLAGS = \ - $(AM_CPPFLAGS) $(LIBUSB_CFLAGS) \ -- -DDATADIR="$(datadir)" -+ -DDATADIR="$(datadir)/hwdata" - - lsusb_LDADD = \ - $(LIBUSB_LIBS) - --if HAVE_ZLIB --data_DATA += usb.ids.gz --lsusb_CPPFLAGS += -DHAVE_LIBZ --lsusb_LDADD += -lz --endif -- - man_MANS = \ - lsusb.8 \ - usb-devices.1 - - EXTRA_DIST = \ -- usb.ids \ -- update-usbids.sh.in \ - lsusb.8.in \ - usb-devices.1.in \ - usb-devices \ - lsusb.py \ - usbutils.pc.in - --usb.ids.gz: $(srcdir)/usb.ids -- gzip -c -9 $< > $@ -- --update-usbids.sh: $(srcdir)/update-usbids.sh.in -- sed 's|@usbids@|$(datadir)/usb.ids|g' $< >$@ -- chmod 755 $@ -- - lsusb.8: $(srcdir)/lsusb.8.in - sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@ - -@@ -71,10 +50,8 @@ - sed 's|@usbids@|$(datadir)/usb.ids|g;s|@VERSION[@]|$(VERSION)|g' $< >$@ - - DISTCLEANFILES = \ -- usb.ids.gz \ - lsusb.8 \ - usb-devices.1 \ -- update-usbids.sh \ - usbutils.pc - - distclean-local: ---- usbutils-003/lsusb.py 2010-12-16 01:07:09.000000000 +0100 -+++ usbutils-003_/lsusb.py 2011-08-11 09:57:57.079327430 +0200 -@@ -16,7 +16,7 @@ - warnsort = False - - prefix = "/sys/bus/usb/devices/" --usbids = "/usr/share/usb.ids" -+usbids = "/usr/share/hwdata/usb.ids" - - esc = chr(27) - norm = esc + "[0;0m" diff --git a/usbutils/patches/usbutils-make-hwdata.patch b/usbutils/patches/usbutils-make-hwdata.patch deleted file mode 100644 index 862c7fcb3..000000000 --- a/usbutils/patches/usbutils-make-hwdata.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up usbutils-004/Makefile.am.orig usbutils-004/Makefile.am ---- usbutils-004/Makefile.am.orig 2011-09-20 09:42:04.282566870 +0200 -+++ usbutils-004/Makefile.am 2011-09-20 09:42:41.399102845 +0200 -@@ -38,7 +38,7 @@ EXTRA_DIST = \ - usbutils.pc.in - - lsusb.8: $(srcdir)/lsusb.8.in -- sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@ -+ sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/hwdata/usb.ids|g' $< >$@ - - usb-devices.1: $(srcdir)/usb-devices.1.in - sed 's|VERSION|$(VERSION)|g' $< >$@ -@@ -47,7 +47,7 @@ pkgconfigdir = $(datarootdir)/pkgconfig - pkgconfig_DATA = usbutils.pc - - usbutils.pc: $(srcdir)/usbutils.pc.in -- sed 's|@usbids@|$(datadir)/usb.ids|g;s|@VERSION[@]|$(VERSION)|g' $< >$@ -+ sed 's|@usbids@|$(datadir)/hwdata/usb.ids|g;s|@VERSION[@]|$(VERSION)|g' $< >$@ - - DISTCLEANFILES = \ - lsusb.8 \ diff --git a/usbutils/usbutils.nm b/usbutils/usbutils.nm index a54a78c0d..a0038fef5 100644 --- a/usbutils/usbutils.nm +++ b/usbutils/usbutils.nm @@ -5,11 +5,11 @@
name = usbutils epoch = 1 -version = 005 +version = 014 release = 4
groups = System/Tools -url = http://www.linux-usb.org/ +url = https://www.linux-usb.org/ license = GPLv2 summary = Tool to provide and enhance USB support in Linux.
@@ -17,21 +17,18 @@ description A set of tools to configure list USB Devices. end
-source_dl = http://www.kernel.org/pub/linux/utils/usb/usbutils/ +source_dl = https://www.kernel.org/pub/linux/utils/usb/usbutils/
build requires autoconf automake hwdata + libudev-devel libusb-devel zlib-devel end
- prepare_cmds - ./autogen.sh - end - install_cmds # Removing lsusb.py. rm -rfv %{BUILDROOT}/usr/bin/lsusb.py
Hi all,
for the records: Thunderbird's mailnews.send_plaintext_flowed setting (defaults to true) causes patches to be mangled in a way that they are no longer applicable, even when mailnews.wraplength is set to "0" (which was previously sufficient to disable wrapping of plaintext lengths entirely).
For sending patches with Thunderbird, mailnews.send_plaintext_flowed has therefore set to "false". See also: https://kb.mozillazine.org/Plain_text_e-mail_-_Thunderbird#Flowed_format
Thanks, and best regards, Peter Müller