[hamradio-commits] [limesuite] 08/11: Drop patches that were applied upstream
Andreas E. Bombe
aeb at moszumanska.debian.org
Fri Jan 12 23:36:06 UTC 2018
This is an automated email from the git hooks/post-receive script.
aeb pushed a commit to annotated tag debian/17.12.0+dfsg-1
in repository limesuite.
commit adb67717190ff7eb714454a90f5b211f3a58c713
Author: Andreas Bombe <aeb at debian.org>
Date: Tue Jan 9 22:28:29 2018 +0100
Drop patches that were applied upstream
Dropped fix-libusb-include, fix-missing-udev-subsystem, udev-use-tag-uaccess,
fix-spelling-errors.
---
debian/changelog | 3 +
debian/patches/fix-icon-install | 2 +-
debian/patches/fix-libusb-include | 30 --------
debian/patches/fix-missing-udev-subsystem | 19 -----
debian/patches/fix-spelling-errors | 119 ------------------------------
debian/patches/link-libatomic | 2 +-
debian/patches/series | 4 -
debian/patches/udev-use-tag-uaccess | 18 -----
8 files changed, 5 insertions(+), 192 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 528d8c0..d9d7c73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
limesuite (17.12.0+dfsg-1) UNRELEASED; urgency=medium
+ * New upstream release 17.12.0
+ * Drop patches that were applied upstream: fix-libusb-include,
+ fix-missing-udev-subsystem, udev-use-tag-uaccess, fix-spelling-errors
* Change liblimesuite ABI version from 17.09-1 to 17.12-1
* Change debhelper compat level to 11
* Bump Standards-Version to 4.1.3, no changes required
diff --git a/debian/patches/fix-icon-install b/debian/patches/fix-icon-install
index 4f8eb70..996594c 100644
--- a/debian/patches/fix-icon-install
+++ b/debian/patches/fix-icon-install
@@ -15,7 +15,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
include(FeatureSummary)
include(CMakeDependentOption)
--cmake_dependent_option(ENABLE_DESKTOP "Enable LimeSuite launcher and icons" ON "LINUX" OFF)
+-cmake_dependent_option(ENABLE_DESKTOP "Enable LimeSuite launcher and icons" ON "ENABLE_GUI;LINUX" OFF)
+cmake_dependent_option(ENABLE_DESKTOP "Enable LimeSuite launcher and icons" ON "ANY_ARCH" OFF)
add_feature_info(LimeSuiteDesktop ENABLE_DESKTOP "LimeSuite freedesktop integration")
if (NOT ENABLE_DESKTOP)
diff --git a/debian/patches/fix-libusb-include b/debian/patches/fix-libusb-include
deleted file mode 100644
index da84f7e..0000000
--- a/debian/patches/fix-libusb-include
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Fix libusb include
- Two source files had include lines specifying libusb-1.0/libusb.h. Although
- that is the location for the standard libusb-1.0, it isn't correct for
- kfreebsd. Since configuring the package already sets up the include path for
- the libusb directory, we can simply drop the path and include libusb.h.
-Author: Andreas Bombe <aeb at debian.org>
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/ConnectionSTREAM/ConnectionSTREAM.h
-+++ b/src/ConnectionSTREAM/ConnectionSTREAM.h
-@@ -21,7 +21,7 @@
- #include "windows.h"
- #include "CyAPI.h"
- #else
--#include <libusb-1.0/libusb.h>
-+#include <libusb.h>
- #include <mutex>
- #include <condition_variable>
- #include <chrono>
---- a/src/Connection_uLimeSDR/Connection_uLimeSDR.h
-+++ b/src/Connection_uLimeSDR/Connection_uLimeSDR.h
-@@ -19,7 +19,7 @@
- #include "windows.h"
- #include "FTD3XXLibrary/FTD3XX.h"
- #else
--#include <libusb-1.0/libusb.h>
-+#include <libusb.h>
- #include <mutex>
- #include <condition_variable>
- #include <chrono>
diff --git a/debian/patches/fix-missing-udev-subsystem b/debian/patches/fix-missing-udev-subsystem
deleted file mode 100644
index a1cd643..0000000
--- a/debian/patches/fix-missing-udev-subsystem
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Add SUBSYSTEM match to udev rules
- The udev rules match vendor and product IDs without specifying the subsystem
- and might match devices with the same IDs that aren't USB. Add a
- SUBSYSTEM=="usb" match to fix.
-Author: Andreas Bombe <aeb at debian.org>
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/udev-rules/64-limesuite.rules
-+++ b/udev-rules/64-limesuite.rules
-@@ -1,5 +1,5 @@
--ATTR{idVendor}=="04b4", ATTR{idProduct}=="8613", SYMLINK+="stream-%k", MODE="660", GROUP="plugdev"
--ATTR{idVendor}=="04b4", ATTR{idProduct}=="00f1", SYMLINK+="stream-%k", MODE="660", GROUP="plugdev"
--ATTR{idVendor}=="0403", ATTR{idProduct}=="601f", SYMLINK+="stream-%k", MODE="660", GROUP="plugdev"
--ATTR{idVendor}=="1d50", ATTR{idProduct}=="6108", SYMLINK+="stream-%k", MODE="660", GROUP="plugdev"
-+SUBSYSTEM=="usb", ATTR{idVendor}=="04b4", ATTR{idProduct}=="8613", SYMLINK+="stream-%k", MODE="660", GROUP="plugdev"
-+SUBSYSTEM=="usb", ATTR{idVendor}=="04b4", ATTR{idProduct}=="00f1", SYMLINK+="stream-%k", MODE="660", GROUP="plugdev"
-+SUBSYSTEM=="usb", ATTR{idVendor}=="0403", ATTR{idProduct}=="601f", SYMLINK+="stream-%k", MODE="660", GROUP="plugdev"
-+SUBSYSTEM=="usb", ATTR{idVendor}=="1d50", ATTR{idProduct}=="6108", SYMLINK+="stream-%k", MODE="660", GROUP="plugdev"
- SUBSYSTEM=="xillybus", MODE="666", OPTIONS="last_rule"
diff --git a/debian/patches/fix-spelling-errors b/debian/patches/fix-spelling-errors
deleted file mode 100644
index 30a020d..0000000
--- a/debian/patches/fix-spelling-errors
+++ /dev/null
@@ -1,119 +0,0 @@
---- a/src/lms7002_wxgui/lms7002_pnlCLKGEN_view.cpp
-+++ b/src/lms7002_wxgui/lms7002_pnlCLKGEN_view.cpp
-@@ -20,8 +20,8 @@
- {
- sizerR3->Add(new wxStaticText(this, wxID_ANY, _("CMPLO_CTRL:")), 1, wxEXPAND, 0);
- cmbCMPLO_CTRL = new wxComboBox(this, wxID_ANY);
-- cmbCMPLO_CTRL->Append(_("Low treshold is set to 0.18V"));
-- cmbCMPLO_CTRL->Append(_("Low treshold is set to 0.1V"));
-+ cmbCMPLO_CTRL->Append(_("Low threshold is set to 0.18V"));
-+ cmbCMPLO_CTRL->Append(_("Low threshold is set to 0.1V"));
- cmbCMPLO_CTRL->Connect(wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler(lms7002_pnlCLKGEN_view::ParameterChangeHandler), NULL, this);
- sizerR3->Add(cmbCMPLO_CTRL, 0, 0, 5);
- wndId2Enum[cmbCMPLO_CTRL] = LMS7_CMPLO_CTRL_CGEN;
---- a/src/lms7002_wxgui/lms7002_pnlSX_view.cpp
-+++ b/src/lms7002_wxgui/lms7002_pnlSX_view.cpp
-@@ -31,8 +31,8 @@
-
- sizerR3->Add(new wxStaticText(this, wxID_ANY, _("CMPLO_CTRL:")), 1, wxEXPAND, 0);
- cmbCMPLO_CTRL = new wxComboBox(this, wxID_ANY);
-- cmbCMPLO_CTRL->Append(_("Low treshold is set to 0.18V"));
-- cmbCMPLO_CTRL->Append(_("Low treshold is set to 0.1V"));
-+ cmbCMPLO_CTRL->Append(_("Low threshold is set to 0.18V"));
-+ cmbCMPLO_CTRL->Append(_("Low threshold is set to 0.1V"));
- cmbCMPLO_CTRL->Connect(wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler(lms7002_pnlSX_view::ParameterChangeHandler), NULL, this);
- sizerR3->Add(cmbCMPLO_CTRL, 0, 0, 5);
- wndId2Enum[cmbCMPLO_CTRL] = LMS7_CMPLO_CTRL_SX;
---- a/src/lms7002m/LMS7002M_parameters.h
-+++ b/src/lms7002m/LMS7002M_parameters.h
-@@ -411,7 +411,7 @@
- static const struct LMS7Parameter LMS7_ICT_LPFS5_PT_TBB = { 0x0106, 9, 5, 12, "ICT_LPFS5_PT_TBB", "This controls the operational amplifier's input stage bias current of the low band real pole filter of the transmitter's baseband" };
- static const struct LMS7Parameter LMS7_ICT_LPF_H_PT_TBB = { 0x0106, 4, 0, 12, "ICT_LPF_H_PT_TBB", "This controls the operational amplifiers input stage bias reference current of the high band low pass filter of the transmitter's baseband " };
- static const struct LMS7Parameter LMS7_ICT_LPFH_F_TBB = { 0x0107, 14, 10, 12, "ICT_LPFH_F_TBB", "controls the operational amplifiers output stage bias reference current of the high band low pass filter of the transmitter's baseband (LPFH_TBB)" };
--static const struct LMS7Parameter LMS7_ICT_LPFLAD_F_TBB = { 0x0107, 9, 5, 12, "ICT_LPFLAD_F_TBB", "This controls the operational amplfiers' output stages bias referene current of the low band ladder filter of the transmisster's baseband" };
-+static const struct LMS7Parameter LMS7_ICT_LPFLAD_F_TBB = { 0x0107, 9, 5, 12, "ICT_LPFLAD_F_TBB", "This controls the operational amplfiers' output stages bias reference current of the low band ladder filter of the transmisster's baseband" };
- static const struct LMS7Parameter LMS7_ICT_LPFLAD_PT_TBB = { 0x0107, 4, 0, 12, "ICT_LPFLAD_PT_TBB", "This controls the operational amplifers' input stages bias reference current of the low band ladder filter of the transmitter's baseband" };
- static const struct LMS7Parameter LMS7_CG_IAMP_TBB = { 0x0108, 15, 10, 37, "CG_IAMP_TBB", "This controls the frontend gain of the TBB. For a given gain value, this control value varies with the set TX mode. After resistance calibration, the following table gives the nominal values for each frequency setting. However, this table is to be updated and corrected after calibration" };
- static const struct LMS7Parameter LMS7_ICT_IAMP_FRP_TBB = { 0x0108, 9, 5, 12, "ICT_IAMP_FRP_TBB", "This controls the reference bias current of the IAMP main bias current sources" };
-@@ -448,7 +448,7 @@
- static const struct LMS7Parameter LMS7_ICT_LNA_RFE = { 0x0110, 9, 5, 12, "ICT_LNA_RFE", "Controls the current of the LNA core" };
- static const struct LMS7Parameter LMS7_ICT_LODC_RFE = { 0x0110, 4, 0, 20, "ICT_LODC_RFE", "Controls the DC of the mixer LO signal at the gate of the mixer switches" };
- static const struct LMS7Parameter LMS7_CAP_RXMXO_RFE = { 0x0111, 9, 5, 4, "CAP_RXMXO_RFE", "Control the decoupling cap at the output of the RX Mixer" };
--static const struct LMS7Parameter LMS7_CGSIN_LNA_RFE = { 0x0111, 4, 0, 3, "CGSIN_LNA_RFE", "Controls the cap parallel with the LNA input input NMOS CGS to control the Q of the maching circuit and provides trade off between gain/NF and IIP. The higher the frequency, the lower CGSIN_LNA_RFE should be. Also, the higher CGSIN, the lower the Q, The lower the gain, the higher the NF, and the higher the IIP3" };
-+static const struct LMS7Parameter LMS7_CGSIN_LNA_RFE = { 0x0111, 4, 0, 3, "CGSIN_LNA_RFE", "Controls the cap parallel with the LNA input input NMOS CGS to control the Q of the matching circuit and provides trade off between gain/NF and IIP. The higher the frequency, the lower CGSIN_LNA_RFE should be. Also, the higher CGSIN, the lower the Q, The lower the gain, the higher the NF, and the higher the IIP3" };
- static const struct LMS7Parameter LMS7_CCOMP_TIA_RFE = { 0x0112, 15, 12, 12, "CCOMP_TIA_RFE", "Compensation capacitor for TIA" };
- static const struct LMS7Parameter LMS7_CFB_TIA_RFE = { 0x0112, 11, 0, 230, "CFB_TIA_RFE", "Feeback capacitor for TIA. Controls the 3dB BW of the TIA. Should be set with calibration through digital baseband" };
- static const struct LMS7Parameter LMS7_G_LNA_RFE = { 0x0113, 9, 6, 15, "G_LNA_RFE", "Controls the gain of the LNA" };
-@@ -640,8 +640,8 @@
- static const struct LMS7Parameter LMS7_G_LNA_RFE_R3 = { 0x0126, 5, 2, 15, "G_LNA_RFE_R3", "[Alternative control] Controls the gain of the LNA"};
- static const struct LMS7Parameter LMS7_G_TIA_RFE_R3 = { 0x0126, 1, 0, 3, "G_TIA_RFE_R3", "[Alternative control] Controls the Gain of the TIA"};
- static const struct LMS7Parameter LMS7_RZ_CTRL = { 0x0122, 15, 14, 0, "RZ_CTRL", "Controls the PLL LPF zero resistor values"};
--static const struct LMS7Parameter LMS7_CMPLO_CTRL_SX = { 0x0122, 13, 13, 0, "CMPLO_CTRL_SX", "Controls the SXR/SXT PLL VCO comparator low treshold value"};
--static const struct LMS7Parameter LMS7_CMPLO_CTRL_CGEN_R3 = { 0x008B, 14, 14, 0, "CMPLO_CTRL_CGEN", "Controls the CGEN PLL VCO comparator low treshold value"};
-+static const struct LMS7Parameter LMS7_CMPLO_CTRL_SX = { 0x0122, 13, 13, 0, "CMPLO_CTRL_SX", "Controls the SXR/SXT PLL VCO comparator low threshold value"};
-+static const struct LMS7Parameter LMS7_CMPLO_CTRL_CGEN_R3 = { 0x008B, 14, 14, 0, "CMPLO_CTRL_CGEN", "Controls the CGEN PLL VCO comparator low threshold value"};
- static const struct LMS7Parameter LMS7_ISINK_SPIBUFF = { 0x00A6, 15, 13, 0, "ISINK_SPI_BUFF", "Controls the SPIBUF LDO output resistive load"};
-
- static const struct LMS7Parameter LMS7_DCMODE = { 0x05C0, 15, 15, 0, "DCMODE", "DC calibration mode" };
---- a/src/lms7002_wxgui/lms7002_wxgui.cpp
-+++ b/src/lms7002_wxgui/lms7002_wxgui.cpp
-@@ -370,7 +370,7 @@
- fgSizer43->Add( ID_STATICTEXT3, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 0 );
-
- cmbCGSIN_LNA_RFE = new wxComboBox( this, ID_CGSIN_LNA_RFE, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-- cmbCGSIN_LNA_RFE->SetToolTip( wxT("Controls the cap parallel with the LNA input input NMOS CGS to control the Q of the maching circuit and provides trade off between gain/NF and IIP. The higher the frequency, the lower CGSIN_LNA_RFE should be. Also, the higher CGSIN, the lower the Q, The lower the gain, the higher the NF, and the higher the IIP3") );
-+ cmbCGSIN_LNA_RFE->SetToolTip( wxT("Controls the cap parallel with the LNA input input NMOS CGS to control the Q of the matching circuit and provides trade off between gain/NF and IIP. The higher the frequency, the lower CGSIN_LNA_RFE should be. Also, the higher CGSIN, the lower the Q, The lower the gain, the higher the NF, and the higher the IIP3") );
-
- fgSizer43->Add( cmbCGSIN_LNA_RFE, 0, wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 0 );
-
-@@ -1567,7 +1567,7 @@
- fgSizer60->Add( ID_STATICTEXT10, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 0 );
-
- cmbICT_LPFLAD_F_TBB = new wxComboBox( sbSizerOpamp->GetStaticBox(), ID_ICT_LPFLAD_F_TBB, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-- cmbICT_LPFLAD_F_TBB->SetToolTip( wxT("This controls the operational amplfiers' output stages bias referene current of the low band ladder filter of the transmisster's baseband") );
-+ cmbICT_LPFLAD_F_TBB->SetToolTip( wxT("This controls the operational amplfiers' output stages bias reference current of the low band ladder filter of the transmisster's baseband") );
-
- fgSizer60->Add( cmbICT_LPFLAD_F_TBB, 0, wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 0 );
-
---- a/src/lms7002_wxgui/lms7002_wxgui.fbp
-+++ b/src/lms7002_wxgui/lms7002_wxgui.fbp
-@@ -4669,7 +4669,7 @@
- <property name="style"></property>
- <property name="subclass">; </property>
- <property name="toolbar_pane">0</property>
-- <property name="tooltip">Controls the cap parallel with the LNA input input NMOS CGS to control the Q of the maching circuit and provides trade off between gain/NF and IIP. The higher the frequency, the lower CGSIN_LNA_RFE should be. Also, the higher CGSIN, the lower the Q, The lower the gain, the higher the NF, and the higher the IIP3</property>
-+ <property name="tooltip">Controls the cap parallel with the LNA input input NMOS CGS to control the Q of the matching circuit and provides trade off between gain/NF and IIP. The higher the frequency, the lower CGSIN_LNA_RFE should be. Also, the higher CGSIN, the lower the Q, The lower the gain, the higher the NF, and the higher the IIP3</property>
- <property name="validator_data_type"></property>
- <property name="validator_style">wxFILTER_NONE</property>
- <property name="validator_type">wxDefaultValidator</property>
-@@ -17716,7 +17716,7 @@
- <property name="style"></property>
- <property name="subclass">; </property>
- <property name="toolbar_pane">0</property>
-- <property name="tooltip">This controls the operational amplfiers' output stages bias referene current of the low band ladder filter of the transmisster's baseband</property>
-+ <property name="tooltip">This controls the operational amplfiers' output stages bias reference current of the low band ladder filter of the transmisster's baseband</property>
- <property name="validator_data_type"></property>
- <property name="validator_style">wxFILTER_NONE</property>
- <property name="validator_type">wxDefaultValidator</property>
---- a/src/protocols/LMS64CProtocol.cpp
-+++ b/src/protocols/LMS64CProtocol.cpp
-@@ -918,7 +918,7 @@
- if(status != STATUS_COMPLETED_CMD)
- {
- std::stringstream ss;
-- ss << "Programing MCU: status : not completed, block " << packetNumber << std::endl;
-+ ss << "Programming MCU: status : not completed, block " << packetNumber << std::endl;
- success = false;
- break;
- }
---- a/src/ConnectionSTREAM/ConnectionSTREAM.cpp
-+++ b/src/ConnectionSTREAM/ConnectionSTREAM.cpp
-@@ -492,7 +492,7 @@
- }
- break;
- case LIBUSB_TRANSFER_ERROR:
-- lime::error("TRANSFER ERRROR");
-+ lime::error("TRANSFER ERROR");
- context->bytesXfered = trans->actual_length;
- context->done.store(true);
- //context->used = false;
diff --git a/debian/patches/link-libatomic b/debian/patches/link-libatomic
index 1f80fe3..0fda608 100644
--- a/debian/patches/link-libatomic
+++ b/debian/patches/link-libatomic
@@ -7,7 +7,7 @@ Author: Andreas Bombe <aeb at debian.org>
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
-@@ -105,6 +105,8 @@
+@@ -106,6 +106,8 @@
list(APPEND LIME_SUITE_INCLUDES ${SQLITE3_INCLUDE_DIRS})
list(APPEND LIME_SUITE_LIBRARIES ${SQLITE3_LIBRARIES})
diff --git a/debian/patches/series b/debian/patches/series
index 9d90dcb..3a4802f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,3 @@ version-string
use-system-glew
link-libatomic
fix-icon-install
-fix-libusb-include
-fix-missing-udev-subsystem
-udev-use-tag-uaccess
-fix-spelling-errors
diff --git a/debian/patches/udev-use-tag-uaccess b/debian/patches/udev-use-tag-uaccess
deleted file mode 100644
index 4cfa41e..0000000
--- a/debian/patches/udev-use-tag-uaccess
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Use TAG+="uaccess" in udev rules
- Instead of MODE="660", GROUP="plugdev", the preferred way to make the device
- accessible to the logged in user is the uaccess tag.
-Author: Andreas Bombe <aeb at debian.org>
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/udev-rules/64-limesuite.rules
-+++ b/udev-rules/64-limesuite.rules
-@@ -1,5 +1,5 @@
--SUBSYSTEM=="usb", ATTR{idVendor}=="04b4", ATTR{idProduct}=="8613", SYMLINK+="stream-%k", MODE="660", GROUP="plugdev"
--SUBSYSTEM=="usb", ATTR{idVendor}=="04b4", ATTR{idProduct}=="00f1", SYMLINK+="stream-%k", MODE="660", GROUP="plugdev"
--SUBSYSTEM=="usb", ATTR{idVendor}=="0403", ATTR{idProduct}=="601f", SYMLINK+="stream-%k", MODE="660", GROUP="plugdev"
--SUBSYSTEM=="usb", ATTR{idVendor}=="1d50", ATTR{idProduct}=="6108", SYMLINK+="stream-%k", MODE="660", GROUP="plugdev"
-+SUBSYSTEM=="usb", ATTR{idVendor}=="04b4", ATTR{idProduct}=="8613", SYMLINK+="stream-%k", TAG+="uaccess"
-+SUBSYSTEM=="usb", ATTR{idVendor}=="04b4", ATTR{idProduct}=="00f1", SYMLINK+="stream-%k", TAG+="uaccess"
-+SUBSYSTEM=="usb", ATTR{idVendor}=="0403", ATTR{idProduct}=="601f", SYMLINK+="stream-%k", TAG+="uaccess"
-+SUBSYSTEM=="usb", ATTR{idVendor}=="1d50", ATTR{idProduct}=="6108", SYMLINK+="stream-%k", TAG+="uaccess"
- SUBSYSTEM=="xillybus", MODE="666", OPTIONS="last_rule"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/limesuite.git
More information about the pkg-hamradio-commits
mailing list