Bump version to 1.5 and cleanup patches

4 files changed, 11 insertions, 372 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 679060f35f0b..f90ea0cd1a7e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = oacapture
 	pkgdesc = A planetary imaging application using Qt5
-	pkgver = 1.4.0
-	pkgrel = 2
+	pkgver = 1.5.0
+	pkgrel = 1
 	url = http://www.openastroproject.org/oacapture/
 	arch = i686
 	arch = x86_64
@@ -13,10 +13,8 @@ pkgbase = oacapture
 	depends = sdl
 	depends = libdc1394
 	optdepends = fxload: support for QHY5 cameras
-	source = https://github.com/openastroproject/openastro/archive/v1.4.0.tar.gz
-	source = oacapture-slash-lib.diff
-	sha1sums = 921dddfcdd0ae91de273c770f8b79c567ff197b6
-	sha1sums = 9fc44f9fbc00c8da87a9b6b0dbb6e8dee3e9bdc1
+	source = https://github.com/openastroproject/openastro/archive/v1.5.0.tar.gz
+	sha256sums = 1b3fc328cfa9e64ef6c5f51d2aa17196f636f8171a15e916f322a0875114bc31
 
 pkgname = oacapture
 
diff --git a/PKGBUILD b/PKGBUILD
index d267592c679a..0f4103c62fad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=oacapture
-pkgver=1.4.0
-pkgrel=2
+pkgver=1.5.0
+pkgrel=1
 pkgdesc="A planetary imaging application using Qt5"
 arch=('i686' 'x86_64')
 license=('GPLv3')
@@ -8,12 +8,11 @@ depends=('qt5-base' 'qt5-tools' 'cfitsio' 'autoconf-archive' 'sdl' 'libdc1394')
 url="http://www.openastroproject.org/oacapture/"
 optdepends=('fxload: support for QHY5 cameras')
 
-source=("https://github.com/openastroproject/openastro/archive/v1.4.0.tar.gz" "oacapture-slash-lib.diff")
-sha1sums=("921dddfcdd0ae91de273c770f8b79c567ff197b6" "9fc44f9fbc00c8da87a9b6b0dbb6e8dee3e9bdc1")
+source=("https://github.com/openastroproject/openastro/archive/v${pkgver}.tar.gz")
+sha256sums=("1b3fc328cfa9e64ef6c5f51d2aa17196f636f8171a15e916f322a0875114bc31")
 
 build() {
 	cd "openastro-${pkgver}"
-	patch -Np1 < ${srcdir}/oacapture-slash-lib.diff
 	./bootstrap
 	./configure --prefix=/usr
 	make
@@ -25,8 +24,7 @@ package() {
 
 	# remove unwanted files
 	rm -rf ${pkgdir}/usr/include
-        rm -rf ${pkgdir}/usr/lib/*.a
-        rm -rf ${pkgdir}/usr/lib/pkgconfig
-        rm -rf ${pkgdir}/usr/share/doc/hidapi
+	rm -rf ${pkgdir}/usr/lib/*.a
+	rm -rf ${pkgdir}/usr/lib/pkgconfig
+	rm -rf ${pkgdir}/usr/share/doc/hidapi
 }
-
diff --git a/oacapture-qt5.diff b/oacapture-qt5.diff
deleted file mode 100644
index 65b793291087..000000000000
--- a/oacapture-qt5.diff
+++ /dev/null
@@ -1,262 +0,0 @@
-diff -ru -N oacapture-1.0.0-orig/oalive/advancedSettings.h oacapture-1.0.0/oalive/advancedSettings.h
---- oacapture-1.0.0-orig/oalive/advancedSettings.h	2016-06-29 22:31:50.000000000 +0100
-+++ oacapture-1.0.0/oalive/advancedSettings.h	2016-08-06 19:06:19.958093691 +0100
-@@ -26,7 +26,7 @@
- 
- #pragma once
- 
--#include <QtGui>
-+#include "qtgui_all_includes.h"
- 
- #include <openastro/userConfig.h>
- 
-diff -ru -N oacapture-1.0.0-orig/oalive/cameraControls.h oacapture-1.0.0/oalive/cameraControls.h
---- oacapture-1.0.0-orig/oalive/cameraControls.h	2016-06-29 22:31:39.000000000 +0100
-+++ oacapture-1.0.0/oalive/cameraControls.h	2016-08-06 19:06:19.958093691 +0100
-@@ -26,7 +26,7 @@
- 
- #pragma once
- 
--#include <QtGui>
-+#include "qtgui_all_includes.h"
- 
- extern "C" {
- #include <openastro/camera.h>
-diff -ru -N oacapture-1.0.0-orig/oalive/captureSettings.h oacapture-1.0.0/oalive/captureSettings.h
---- oacapture-1.0.0-orig/oalive/captureSettings.h	2016-06-29 22:31:34.000000000 +0100
-+++ oacapture-1.0.0/oalive/captureSettings.h	2016-08-06 19:06:19.958093691 +0100
-@@ -26,7 +26,7 @@
- 
- #pragma once
- 
--#include <QtGui>
-+#include "qtgui_all_includes.h"
- 
- 
- class CaptureSettings : public QWidget
-diff -ru -N oacapture-1.0.0-orig/oalive/controlsWidget.h oacapture-1.0.0/oalive/controlsWidget.h
---- oacapture-1.0.0-orig/oalive/controlsWidget.h	2016-06-29 22:31:32.000000000 +0100
-+++ oacapture-1.0.0/oalive/controlsWidget.h	2016-08-06 19:06:19.958093691 +0100
-@@ -26,7 +26,7 @@
- 
- #pragma once
- 
--#include <QtGui>
-+#include "qtgui_all_includes.h"
- 
- #include "cameraControls.h"
- #include "stackingControls.h"
-diff -ru -N oacapture-1.0.0-orig/oalive/demosaicSettings.h oacapture-1.0.0/oalive/demosaicSettings.h
---- oacapture-1.0.0-orig/oalive/demosaicSettings.h	2016-06-29 22:31:37.000000000 +0100
-+++ oacapture-1.0.0/oalive/demosaicSettings.h	2016-08-06 19:06:19.958093691 +0100
-@@ -26,7 +26,7 @@
- 
- #pragma once
- 
--#include <QtGui>
-+#include "qtgui_all_includes.h"
- 
- 
- class DemosaicSettings : public QWidget
-diff -ru -N oacapture-1.0.0-orig/oalive/filterSettings.h oacapture-1.0.0/oalive/filterSettings.h
---- oacapture-1.0.0-orig/oalive/filterSettings.h	2016-06-29 22:31:38.000000000 +0100
-+++ oacapture-1.0.0/oalive/filterSettings.h	2016-08-06 19:06:19.958093691 +0100
-@@ -28,7 +28,7 @@
- 
- #include "oa_common.h"
- 
--#include <QtGui>
-+#include "qtgui_all_includes.h"
- #include <openastro/filterwheel.h>
- 
- 
-diff -ru -N oacapture-1.0.0-orig/oalive/focusOverlay.h oacapture-1.0.0/oalive/focusOverlay.h
---- oacapture-1.0.0-orig/oalive/focusOverlay.h	2016-06-29 22:31:41.000000000 +0100
-+++ oacapture-1.0.0/oalive/focusOverlay.h	2016-08-06 19:06:19.958093691 +0100
-@@ -26,7 +26,7 @@
- 
- #pragma once
- 
--#include <QtGui>
-+#include "qtgui_all_includes.h"
- 
- class FocusOverlay : public QWidget
- {
-diff -ru -N oacapture-1.0.0-orig/oalive/generalSettings.h oacapture-1.0.0/oalive/generalSettings.h
---- oacapture-1.0.0-orig/oalive/generalSettings.h	2016-06-29 22:31:31.000000000 +0100
-+++ oacapture-1.0.0/oalive/generalSettings.h	2016-08-06 19:06:19.958093691 +0100
-@@ -26,7 +26,7 @@
- 
- #pragma once
- 
--#include <QtGui>
-+#include "qtgui_all_includes.h"
- 
- #include "version.h"
- 
-diff -ru -N oacapture-1.0.0-orig/oalive/mainWindow.cc oacapture-1.0.0/oalive/mainWindow.cc
---- oacapture-1.0.0-orig/oalive/mainWindow.cc	2016-06-29 22:31:33.000000000 +0100
-+++ oacapture-1.0.0/oalive/mainWindow.cc	2016-08-06 19:06:19.958093691 +0100
-@@ -99,7 +99,7 @@
-   state.filterWheel->updateAllSearchFilters();
- 
-   char d[ PATH_MAX ];
--  state.currentDirectory = QString::fromAscii ( getcwd ( d, PATH_MAX ));
-+  state.currentDirectory = QString::fromLocal8Bit ( getcwd ( d, PATH_MAX ));
- 
-   if ( connectedCameras == 1 && config.connectSoleCamera ) {
-     connectCamera ( 0 );
-@@ -1506,7 +1506,7 @@
-   if ( config.numCustomColours ) {
-     config.customColours.clear();
-     for ( int i = 0; i < config.numCustomColours; i++ ) {
--      QRgb custCol = colourDialog->customColor ( i );
-+      QRgb custCol = colourDialog->customColor ( i ).rgb();
-       config.customColours.append ( QColor ( custCol ));
-     }
-   }
-diff -ru -N oacapture-1.0.0-orig/oalive/mainWindow.h oacapture-1.0.0/oalive/mainWindow.h
---- oacapture-1.0.0-orig/oalive/mainWindow.h	2016-06-29 22:31:39.000000000 +0100
-+++ oacapture-1.0.0/oalive/mainWindow.h	2016-08-06 19:06:19.958093691 +0100
-@@ -26,7 +26,7 @@
- 
- #pragma once
- 
--#include <QtGui>
-+#include "qtgui_all_includes.h"
- 
- extern "C" {
- #include <openastro/camera.h>
-diff -ru -N oacapture-1.0.0-orig/oalive/outputHandler.h oacapture-1.0.0/oalive/outputHandler.h
---- oacapture-1.0.0-orig/oalive/outputHandler.h	2016-06-29 22:31:36.000000000 +0100
-+++ oacapture-1.0.0/oalive/outputHandler.h	2016-08-06 19:06:19.958093691 +0100
-@@ -26,7 +26,7 @@
- 
- #pragma once
- 
--#include <QtGui>
-+#include "qtgui_all_includes.h"
- 
- class OutputHandler
- {
-diff -ru -N oacapture-1.0.0-orig/oalive/profileSettings.h oacapture-1.0.0/oalive/profileSettings.h
---- oacapture-1.0.0-orig/oalive/profileSettings.h	2016-06-29 22:31:41.000000000 +0100
-+++ oacapture-1.0.0/oalive/profileSettings.h	2016-08-06 19:06:19.958093691 +0100
-@@ -26,7 +26,7 @@
- 
- #pragma once
- 
--#include <QtGui>
-+#include "qtgui_all_includes.h"
- 
- #include "configuration.h"
- 
-diff -ru -N oacapture-1.0.0-orig/oalive/qtgui_all_includes.h oacapture-1.0.0/oalive/qtgui_all_includes.h
---- oacapture-1.0.0-orig/oalive/qtgui_all_includes.h	1970-01-01 01:00:00.000000000 +0100
-+++ oacapture-1.0.0/oalive/qtgui_all_includes.h	2016-08-06 19:06:26.807981864 +0100
-@@ -0,0 +1,57 @@
-+#ifndef QTGUI_ALL_INCLUDES
-+#define QTGUI_ALL_INCLUDES
-+
-+#include <QAbstractButton>
-+#include <QAction>
-+#include <QApplication>
-+#include <QButtonGroup>
-+#include <QCheckBox>
-+#include <QColor>
-+#include <QColorDialog>
-+#include <QComboBox>
-+#include <QFileDialog>
-+#include <QFrame>
-+#include <QGridLayout>
-+#include <QHBoxLayout>
-+#include <QIcon>
-+#include <QImage>
-+#include <QKeySequence>
-+#include <QLabel>
-+#include <QLayout>
-+#include <QLayoutItem>
-+#include <QLineEdit>
-+#include <QList>
-+#include <QListWidget>
-+#include <QListWidgetItem>
-+#include <QMenu>
-+#include <QMessageBox>
-+#include <QMouseEvent>
-+#include <QObject>
-+#include <QPaintDevice>
-+#include <QPainter>
-+#include <QPaintEvent>
-+#include <QPushButton>
-+#include <QRadioButton>
-+#include <QRgb>
-+#include <QScrollArea>
-+#include <QSignalMapper>
-+#include <QSlider>
-+#include <QSpinBox>
-+#include <QSplitter>
-+#include <QStatusBar>
-+#include <QString>
-+#include <QTabWidget>
-+#include <QtCore>
-+#include <QtGui>
-+#include <QtGuiDepends>
-+#include <QtNetwork>
-+#include <QTransform>
-+#include <QtWidgets>
-+#include <QVariant>
-+#include <QVBoxLayout>
-+#include <QVector>
-+#include <QWheelEvent>
-+#include <QWidget>
-+
-+#endif
-+
-diff -ru -N oacapture-1.0.0-orig/oalive/saveControls.h oacapture-1.0.0/oalive/saveControls.h
---- oacapture-1.0.0-orig/oalive/saveControls.h	2016-06-29 22:31:34.000000000 +0100
-+++ oacapture-1.0.0/oalive/saveControls.h	2016-08-06 19:06:19.958093691 +0100
-@@ -26,7 +26,7 @@
- 
- #pragma once
- 
--#include <QtGui>
-+#include "qtgui_all_includes.h"
- 
- #define	CAPTURE_TIFF	1
- #define	CAPTURE_FITS	2
-diff -ru -N oacapture-1.0.0-orig/oalive/settingsWidget.h oacapture-1.0.0/oalive/settingsWidget.h
---- oacapture-1.0.0-orig/oalive/settingsWidget.h	2016-06-29 22:31:31.000000000 +0100
-+++ oacapture-1.0.0/oalive/settingsWidget.h	2016-08-06 19:06:19.958093691 +0100
-@@ -26,7 +26,7 @@
- 
- #pragma once
- 
--#include <QtGui>
-+#include "qtgui_all_includes.h"
- 
- #include "generalSettings.h"
- #include "captureSettings.h"
-diff -ru -N oacapture-1.0.0-orig/oalive/stackingControls.h oacapture-1.0.0/oalive/stackingControls.h
---- oacapture-1.0.0-orig/oalive/stackingControls.h	2016-06-29 22:31:51.000000000 +0100
-+++ oacapture-1.0.0/oalive/stackingControls.h	2016-08-06 19:06:19.958093691 +0100
-@@ -26,7 +26,7 @@
- 
- #pragma once
- 
--#include <QtGui>
-+#include "qtgui_all_includes.h"
- 
- extern "C" {
- #include <openastro/camera.h>
-diff -ru -N oacapture-1.0.0-orig/oalive/viewWidget.h oacapture-1.0.0/oalive/viewWidget.h
---- oacapture-1.0.0-orig/oalive/viewWidget.h	2016-06-29 22:31:34.000000000 +0100
-+++ oacapture-1.0.0/oalive/viewWidget.h	2016-08-06 19:06:19.958093691 +0100
-@@ -26,7 +26,7 @@
- 
- #pragma once
- 
--#include <QtGui>
-+#include "qtgui_all_includes.h"
- 
- extern "C" {
- #include <openastro/camera.h>
diff --git a/oacapture-slash-lib.diff b/oacapture-slash-lib.diff
deleted file mode 100644
index d9eba8b32f2f..000000000000
--- a/oacapture-slash-lib.diff
+++ /dev/null
@@ -1,95 +0,0 @@
-diff --git a/lib/firmware/qhy/Makefile.am b/lib/firmware/qhy/Makefile.am
-index ff5beeb..b620cff 100644
---- a/lib/firmware/qhy/Makefile.am
-+++ b/lib/firmware/qhy/Makefile.am
-@@ -28,5 +28,5 @@ FIRMWAREFILES = QHY5.HEX QHY5II.HEX QHY5LOADER.HEX QHY6.HEX SLAVEFIFO.HEX
- # Nasty, this, but there doesn't appear to be a suitable other way to
- # handle it
- 
--firmwaredir = ${prefix}/../lib/firmware/qhy
-+firmwaredir = ${prefix}/../usr/lib/firmware/qhy
- firmware_DATA = $(FIRMWAREFILES)
-diff --git a/udev/85-qhy-cameras.rules b/udev/85-qhy-cameras.rules
-index e5522f7..b91ee80 100644
---- a/udev/85-qhy-cameras.rules
-+++ b/udev/85-qhy-cameras.rules
-@@ -36,37 +36,37 @@ SUBSYSTEM!="usb_device", GOTO="qhy_end"
- 
- LABEL="qhy_test"
- 
--ATTRS{idVendor}=="1618", ATTRS{idProduct}=="0412", RUN+="/sbin/fxload -t fx2 -I /lib/firmware/qhy/QHY2.HEX -D $env{DEVNAME}"
--ATTRS{idVendor}=="1618", ATTRS{idProduct}=="0901", RUN+="/sbin/fxload -t fx2 -I /lib/firmware/qhy/QHY5.HEX -D $env{DEVNAME} -s /lib/firmware/qhy/QHY5LOADER.HEX"
--ATTRS{idVendor}=="1618", ATTRS{idProduct}=="1002", RUN+="/sbin/fxload -t fx2 -I /lib/firmware/qhy/QHY5.HEX -D $env{DEVNAME} -s /lib/firmware/qhy/QHY5LOADER.HEX"
--ATTRS{idVendor}=="0547", ATTRS{idProduct}=="1002", RUN+="/sbin/fxload -t fx2 -I /lib/firmware/qhy/QHY5.HEX -D $env{DEVNAME} -s /lib/firmware/qhy/QHY5LOADER.HEX"
--ATTRS{idVendor}=="04b4", ATTRS{idProduct}=="8613", RUN+="/sbin/fxload -t fx2 -I /lib/firmware/qhy/QHY5.HEX -D $env{DEVNAME} -s /lib/firmware/qhy/QHY5LOADER.HEX"
--ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="081a", RUN+="/sbin/fxload -t fx2 -I /lib/firmware/qhy/QHY5.HEX -D $env{DEVNAME} -s /lib/firmware/qhy/QHY5LOADER.HEX"
--ATTRS{idVendor}=="1856", ATTRS{idProduct}=="0011", RUN+="/sbin/fxload -t fx2 -I /lib/firmware/qhy/QHY5.HEX -D $env{DEVNAME} -s /lib/firmware/qhy/QHY5LOADER.HEX"
--ATTRS{idVendor}=="1618", ATTRS{idProduct}=="0932", RUN+="/sbin/fxload -t fx2 -I /lib/firmware/qhy/QHY5V.HEX -D $env{DEVNAME}"
--ATTRS{idVendor}=="1618", ATTRS{idProduct}=="0259", RUN+="/sbin/fxload -t fx2 -I /lib/firmware/qhy/QHY6.HEX -D $env{DEVNAME}"
--ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="2980", RUN+="/sbin/fxload -t fx2 -I /lib/firmware/qhy/QHY6PRO.HEX -D $env{DEVNAME}"
--ATTRS{idVendor}=="1618", ATTRS{idProduct}=="4022", RUN+="/sbin/fxload -t fx2 -I /lib/firmware/qhy/QHY7.HEX -D $env{DEVNAME}"
--ATTRS{idVendor}=="1618", ATTRS{idProduct}=="6000", RUN+="/sbin/fxload -t fx2 -I /lib/firmware/qhy/QHY8.HEX -D $env{DEVNAME}"
--ATTRS{idVendor}=="1618", ATTRS{idProduct}=="6002", RUN+="/sbin/fxload -t fx2 -I /lib/firmware/qhy/QHY8PRO.HEX -D $env{DEVNAME}"
--ATTRS{idVendor}=="1618", ATTRS{idProduct}=="6004", RUN+="/sbin/fxload -t fx2lp -I /lib/firmware/qhy/QHY8L.HEX -D $env{DEVNAME}"
--ATTRS{idVendor}=="1618", ATTRS{idProduct}=="8300", RUN+="/sbin/fxload -t fx2 -I /lib/firmware/qhy/QHY9.HEX -D $env{DEVNAME}"
--ATTRS{idVendor}=="1618", ATTRS{idProduct}=="8310", RUN+="/sbin/fxload -t fx2 -I /lib/firmware/qhy/QHY9L.HEX -D $env{DEVNAME}"
--ATTRS{idVendor}=="1618", ATTRS{idProduct}=="1000", RUN+="/sbin/fxload -t fx2 -I /lib/firmware/qhy/QHY10.HEX -D $env{DEVNAME}"
--ATTRS{idVendor}=="1618", ATTRS{idProduct}=="1100", RUN+="/sbin/fxload -t fx2 -I /lib/firmware/qhy/qhy11.hex -D $env{DEVNAME}"
--ATTRS{idVendor}=="1618", ATTRS{idProduct}=="6740", RUN+="/sbin/fxload -t fx2 -I /lib/firmware/qhy/QHY21.HEX -D $env{DEVNAME}"
--ATTRS{idVendor}=="1618", ATTRS{idProduct}=="6940", RUN+="/sbin/fxload -t fx2 -I /lib/firmware/qhy/QHY22.HEX -D $env{DEVNAME}"
--ATTRS{idVendor}=="1618", ATTRS{idProduct}=="8140", RUN+="/sbin/fxload -t fx2 -I /lib/firmware/qhy/QHY23.HEX -D $env{DEVNAME}"
--ATTRS{idVendor}=="04b4", ATTRS{idProduct}=="8613", RUN+="/sbin/fxload -t fx2 -I /lib/firmware/qhy/QHY16000.HEX -D $env{DEVNAME}"
--
--ATTRS{idVendor}=="1618", ATTRS{idProduct}=="b618", RUN+="/sbin/fxload -t fx2 -I /lib/firmware/qhy/IMG0H.HEX -D $env{DEVNAME}"
--ATTRS{idVendor}=="1618", ATTRS{idProduct}=="2850", RUN+="/sbin/fxload -t fx2 -I /lib/firmware/qhy/IMG2PRO.HEX -D $env{DEVNAME}"
--ATTRS{idVendor}=="1618", ATTRS{idProduct}=="b285", RUN+="/sbin/fxload -t fx2lp -I /lib/firmware/qhy/IMG2S.HEX -D $env{DEVNAME}"
--ATTRS{idVendor}=="1618", ATTRS{idProduct}=="0005", RUN+="/sbin/fxload -t fx2 -I /lib/firmware/qhy/SLAVEFIFO.HEX -D $env{DEVNAME}"
--
--ATTRS{idVendor}=="1618", ATTRS{idProduct}=="0920", RUN+="/sbin/fxload -t fx2 -I /lib/firmware/qhy/QHY5II.HEX -D $env{DEVNAME}"
--
--ATTRS{idVendor}=="1856", ATTRS{idProduct}=="0011", RUN+="/sbin/fxload -t fx2 -I /lib/firmware/qhy/ORIONG.HEX -D $env{DEVNAME}"
-+ATTRS{idVendor}=="1618", ATTRS{idProduct}=="0412", RUN+="/sbin/fxload -t fx2 -I /usr/lib/firmware/qhy/QHY2.HEX -D $env{DEVNAME}"
-+ATTRS{idVendor}=="1618", ATTRS{idProduct}=="0901", RUN+="/sbin/fxload -t fx2 -I /usr/lib/firmware/qhy/QHY5.HEX -D $env{DEVNAME} -s /usr/lib/firmware/qhy/QHY5LOADER.HEX"
-+ATTRS{idVendor}=="1618", ATTRS{idProduct}=="1002", RUN+="/sbin/fxload -t fx2 -I /usr/lib/firmware/qhy/QHY5.HEX -D $env{DEVNAME} -s /usr/lib/firmware/qhy/QHY5LOADER.HEX"
-+ATTRS{idVendor}=="0547", ATTRS{idProduct}=="1002", RUN+="/sbin/fxload -t fx2 -I /usr/lib/firmware/qhy/QHY5.HEX -D $env{DEVNAME} -s /usr/lib/firmware/qhy/QHY5LOADER.HEX"
-+ATTRS{idVendor}=="04b4", ATTRS{idProduct}=="8613", RUN+="/sbin/fxload -t fx2 -I /usr/lib/firmware/qhy/QHY5.HEX -D $env{DEVNAME} -s /usr/lib/firmware/qhy/QHY5LOADER.HEX"
-+ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="081a", RUN+="/sbin/fxload -t fx2 -I /usr/lib/firmware/qhy/QHY5.HEX -D $env{DEVNAME} -s /usr/lib/firmware/qhy/QHY5LOADER.HEX"
-+ATTRS{idVendor}=="1856", ATTRS{idProduct}=="0011", RUN+="/sbin/fxload -t fx2 -I /usr/lib/firmware/qhy/QHY5.HEX -D $env{DEVNAME} -s /usr/lib/firmware/qhy/QHY5LOADER.HEX"
-+ATTRS{idVendor}=="1618", ATTRS{idProduct}=="0932", RUN+="/sbin/fxload -t fx2 -I /usr/lib/firmware/qhy/QHY5V.HEX -D $env{DEVNAME}"
-+ATTRS{idVendor}=="1618", ATTRS{idProduct}=="0259", RUN+="/sbin/fxload -t fx2 -I /usr/lib/firmware/qhy/QHY6.HEX -D $env{DEVNAME}"
-+ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="2980", RUN+="/sbin/fxload -t fx2 -I /usr/lib/firmware/qhy/QHY6PRO.HEX -D $env{DEVNAME}"
-+ATTRS{idVendor}=="1618", ATTRS{idProduct}=="4022", RUN+="/sbin/fxload -t fx2 -I /usr/lib/firmware/qhy/QHY7.HEX -D $env{DEVNAME}"
-+ATTRS{idVendor}=="1618", ATTRS{idProduct}=="6000", RUN+="/sbin/fxload -t fx2 -I /usr/lib/firmware/qhy/QHY8.HEX -D $env{DEVNAME}"
-+ATTRS{idVendor}=="1618", ATTRS{idProduct}=="6002", RUN+="/sbin/fxload -t fx2 -I /usr/lib/firmware/qhy/QHY8PRO.HEX -D $env{DEVNAME}"
-+ATTRS{idVendor}=="1618", ATTRS{idProduct}=="6004", RUN+="/sbin/fxload -t fx2lp -I /usr/lib/firmware/qhy/QHY8L.HEX -D $env{DEVNAME}"
-+ATTRS{idVendor}=="1618", ATTRS{idProduct}=="8300", RUN+="/sbin/fxload -t fx2 -I /usr/lib/firmware/qhy/QHY9.HEX -D $env{DEVNAME}"
-+ATTRS{idVendor}=="1618", ATTRS{idProduct}=="8310", RUN+="/sbin/fxload -t fx2 -I /usr/lib/firmware/qhy/QHY9L.HEX -D $env{DEVNAME}"
-+ATTRS{idVendor}=="1618", ATTRS{idProduct}=="1000", RUN+="/sbin/fxload -t fx2 -I /usr/lib/firmware/qhy/QHY10.HEX -D $env{DEVNAME}"
-+ATTRS{idVendor}=="1618", ATTRS{idProduct}=="1100", RUN+="/sbin/fxload -t fx2 -I /usr/lib/firmware/qhy/qhy11.hex -D $env{DEVNAME}"
-+ATTRS{idVendor}=="1618", ATTRS{idProduct}=="6740", RUN+="/sbin/fxload -t fx2 -I /usr/lib/firmware/qhy/QHY21.HEX -D $env{DEVNAME}"
-+ATTRS{idVendor}=="1618", ATTRS{idProduct}=="6940", RUN+="/sbin/fxload -t fx2 -I /usr/lib/firmware/qhy/QHY22.HEX -D $env{DEVNAME}"
-+ATTRS{idVendor}=="1618", ATTRS{idProduct}=="8140", RUN+="/sbin/fxload -t fx2 -I /usr/lib/firmware/qhy/QHY23.HEX -D $env{DEVNAME}"
-+ATTRS{idVendor}=="04b4", ATTRS{idProduct}=="8613", RUN+="/sbin/fxload -t fx2 -I /usr/lib/firmware/qhy/QHY16000.HEX -D $env{DEVNAME}"
-+
-+ATTRS{idVendor}=="1618", ATTRS{idProduct}=="b618", RUN+="/sbin/fxload -t fx2 -I /usr/lib/firmware/qhy/IMG0H.HEX -D $env{DEVNAME}"
-+ATTRS{idVendor}=="1618", ATTRS{idProduct}=="2850", RUN+="/sbin/fxload -t fx2 -I /usr/lib/firmware/qhy/IMG2PRO.HEX -D $env{DEVNAME}"
-+ATTRS{idVendor}=="1618", ATTRS{idProduct}=="b285", RUN+="/sbin/fxload -t fx2lp -I /usr/lib/firmware/qhy/IMG2S.HEX -D $env{DEVNAME}"
-+ATTRS{idVendor}=="1618", ATTRS{idProduct}=="0005", RUN+="/sbin/fxload -t fx2 -I /usr/lib/firmware/qhy/SLAVEFIFO.HEX -D $env{DEVNAME}"
-+
-+ATTRS{idVendor}=="1618", ATTRS{idProduct}=="0920", RUN+="/sbin/fxload -t fx2 -I /usr/lib/firmware/qhy/QHY5II.HEX -D $env{DEVNAME}"
-+
-+ATTRS{idVendor}=="1856", ATTRS{idProduct}=="0011", RUN+="/sbin/fxload -t fx2 -I /usr/lib/firmware/qhy/ORIONG.HEX -D $env{DEVNAME}"
- 
- LABEL="qhy_end"
- 
-diff --git a/udev/Makefile.am b/udev/Makefile.am
-index 8b7d790..e5e58ce 100644
---- a/udev/Makefile.am
-+++ b/udev/Makefile.am
-@@ -31,5 +31,5 @@ RULESFILES = 70-altair-cameras.rules 70-atik.rules 70-celestron-camera.rules \
- 	70-tis-cameras.rules 70-tis-cameras-uvc.rules \
- 	70-touptek-cameras.rules 70-xagyl-ftdi.rules 85-qhy-cameras.rules
- 
--udevrulesdir = ${sysconfdir}/../lib/udev/rules.d
-+udevrulesdir = ${sysconfdir}/../usr/lib/udev/rules.d
- udevrules_DATA = $(RULESFILES)