usb-modeswitch: update to 2.6.0.

This commit is contained in:
Enno Boland 2020-05-04 21:39:55 +02:00 committed by Enno Boland
parent 1ad9d16f70
commit 57359ece83
2 changed files with 20 additions and 27 deletions

View file

@ -1,6 +1,6 @@
--- Makefile.old 2014-05-29 20:35:46.000000000 +0200
+++ Makefile 2014-12-08 08:45:45.067710346 +0100
@@ -5,11 +5,11 @@ CFLAGS += -Wall
--- Makefile.orig 2019-11-11 21:45:13.000000000 +0100
+++ Makefile 2020-05-04 21:22:53.680445703 +0200
@@ -5,11 +5,11 @@ CFLAGS += -Wall -Wno-deprecated-dec
LIBS = `pkg-config --libs --cflags libusb-1.0`
RM = /bin/rm -f
OBJS = usb_modeswitch.c
@ -14,34 +14,28 @@
+UDEVDIR = /lib/udev
SBINDIR = $(PREFIX)/sbin
MANDIR = $(PREFIX)/share/man/man1
VPATH = jimtcl
@@ -77,15 +77,15 @@ ums-clean:
@@ -54,12 +54,12 @@ distclean: clean
# If not, use the dispatcher directly from the udev rule as in previous versions
install-common: $(PROG) usb_modeswitch_dispatcher
install-common: $(PROG) $(DISPATCH)
- install -D --mode=755 usb_modeswitch $(SBINDIR)/usb_modeswitch
- install -D --mode=755 usb_modeswitch.sh $(UDEVDIR)/usb_modeswitch
- install -D --mode=644 usb_modeswitch.conf $(ETCDIR)/usb_modeswitch.conf
- install -D --mode=644 usb_modeswitch.1 $(MANDIR)/usb_modeswitch.1
- install -D --mode=644 usb_modeswitch_dispatcher.1 $(MANDIR)/usb_modeswitch_dispatcher.1
- install -D --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher
- install -d $(DESTDIR)/var/lib/usb_modeswitch
- test -d $(UPSDIR) -a -e /sbin/initctl && install --mode=644 usb-modeswitch-upstart.conf $(UPSDIR) || test 1
- test -d $(SYSDIR) -a \( -e /usr/bin/systemctl -o -e /bin/systemctl \) && install --mode=644 usb_modeswitch@.service $(SYSDIR) || test 1
+ install -D --mode=755 usb_modeswitch $(DESTDIR)/$(SBINDIR)/usb_modeswitch
+ install -D --mode=755 usb_modeswitch.sh $(DESTDIR)/$(UDEVDIR)/usb_modeswitch
+ install -D --mode=644 usb_modeswitch.conf $(DESTDIR)/$(ETCDIR)/usb_modeswitch.conf
+ install -D --mode=644 usb_modeswitch.1 $(DESTDIR)/$(MANDIR)/usb_modeswitch.1
+ install -D --mode=644 usb_modeswitch_dispatcher.1 $(DESTDIR)/$(MANDIR)/usb_modeswitch_dispatcher.1
+ install -D --mode=755 usb_modeswitch_dispatcher $(DESTDIR)/$(SBINDIR)/usb_modeswitch_dispatcher
+ install -d $(DESTDIR)/var/lib/usb_modeswitch
+ test -d $(DESTDIR)/$(UPSDIR) -a -e /sbin/initctl && install --mode=644 usb-modeswitch-upstart.conf $(DESTDIR)/$(UPSDIR) || test 1
+ test -d $(DESTDIR)/$(SYSDIR) -a \( -e /usr/bin/systemctl -o -e /bin/systemctl \) && install --mode=644 usb_modeswitch@.service $(DESTDIR)/$(SYSDIR) || test 1
install: install-script
@@ -96,10 +96,10 @@ install-shared: dispatcher-shared instal
install-static: dispatcher-static install-common
install -d $(DESTDIR)/var/lib/usb_modeswitch
test -d $(UPSDIR) -a -e /sbin/initctl && install --mode=644 usb-modeswitch-upstart.conf $(UPSDIR) || test 1
test -d $(SYSDIR) -a \( -e /usr/bin/systemctl -o -e /bin/systemctl \) && install --mode=644 usb_modeswitch@.service $(SYSDIR) || test 1
@@ -73,10 +73,10 @@ install-dynlink: dispatcher-dynlink inst
install-statlink: dispatcher-statlink install-common
uninstall:
- $(RM) $(SBINDIR)/usb_modeswitch
@ -49,12 +43,11 @@
- $(RM) $(UDEVDIR)/usb_modeswitch
- $(RM) $(ETCDIR)/usb_modeswitch.conf
- $(RM) $(MANDIR)/usb_modeswitch.1
- $(RM) -R $(DESTDIR)/var/lib/usb_modeswitch
- $(RM) $(SYSDIR)/usb_modeswitch@.service
+ $(RM) $(DESTDIR)/$(SBINDIR)/usb_modeswitch
+ $(RM) $(DESTDIR)/$(SBINDIR)/usb_modeswitch_dispatcher
+ $(RM) $(DESTDIR)/$(UDEVDIR)/usb_modeswitch
+ $(RM) $(DESTDIR)/$(ETCDIR)/usb_modeswitch.conf
+ $(RM) $(DESTDIR)/$(MANDIR)/usb_modeswitch.1
+ $(RM) -R $(DESTDIR)/var/lib/usb_modeswitch
$(RM) -R $(DESTDIR)/var/lib/usb_modeswitch
- $(RM) $(SYSDIR)/usb_modeswitch@.service
+ $(RM) $(DESTDIR)/$(SYSDIR)/usb_modeswitch@.service

View file

@ -1,16 +1,16 @@
# Template file for 'usb-modeswitch'
pkgname=usb-modeswitch
version=2.5.2
version=2.6.0
revision=1
build_style=gnu-makefile
conf_files="/etc/usb_modeswitch.conf"
make_install_args="SBINDIR=/usr/bin UDEVDIR=/usr/lib/udev"
hostmakedepends="pkg-config tcl"
makedepends="libusb-devel"
depends="tcl ${pkgname}-data"
short_desc="Mode switching tool for controlling multi-mode USB devices"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2"
conf_files="/etc/usb_modeswitch.conf"
makedepends="libusb-devel"
depends="tcl ${pkgname}-data"
hostmakedepends="pkg-config tcl"
homepage="http://www.draisberghof.de/usb_modeswitch/"
distfiles="http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${version}.tar.bz2"
checksum=abffac09c87eacd78e101545967dc25af7e989745b4276756d45dbf4008a2ea6
make_install_args="SBINDIR=/usr/bin UDEVDIR=/usr/lib/udev"
checksum=c215236e6bada6e659fc195a31d611ea298a4bdb4d57a0d68c553b56585f8ba3