diff --git a/srcpkgs/usb-modeswitch/patches/0001-fix-destdir.patch b/srcpkgs/usb-modeswitch/patches/0001-fix-destdir.patch index 4addfb95db4..a1a927b2128 100644 --- a/srcpkgs/usb-modeswitch/patches/0001-fix-destdir.patch +++ b/srcpkgs/usb-modeswitch/patches/0001-fix-destdir.patch @@ -27,7 +27,7 @@ - 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 && install --mode=644 usb_modeswitch@.service $(SYSDIR) || 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 @@ -36,7 +36,7 @@ + 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 && install --mode=644 usb_modeswitch@.service $(DESTDIR)/$(SYSDIR) || 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 diff --git a/srcpkgs/usb-modeswitch/template b/srcpkgs/usb-modeswitch/template index 9a08399d4be..7068b68a08b 100644 --- a/srcpkgs/usb-modeswitch/template +++ b/srcpkgs/usb-modeswitch/template @@ -1,10 +1,10 @@ # Template file for 'usb-modeswitch' pkgname=usb-modeswitch -version=2.2.1 -revision=3 +version=2.2.2 +revision=1 build_style=gnu-makefile short_desc="Mode switching tool for controlling multi-mode USB devices" -maintainer="Enno Boland " +maintainer="Enno Boland " license="GPL-2" conf_files="/etc/usb_modeswitch.conf" makedepends="libusb-devel" @@ -12,5 +12,5 @@ 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=37d926a0b6b6d490173c57e260a69aca49feb774875fc8f2001c1d0f5e8011cb +checksum=b4c120b0fc815aacc165a3e67ba79c3a03f60e04c1b57ffe6ffb7db0d1953a7e make_install_args="SBINDIR=/usr/bin UDEVDIR=/usr/lib/udev"