-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1001 from bluca/debian
Merge debian
- Loading branch information
Showing
6 changed files
with
24 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,12 @@ | ||
stlink (1.6.1+ds-2) unstable; urgency=medium | ||
|
||
* Update d/copyright to remove GPL-2+ stanza about flashloaders | ||
* Update upstream URLs for new Github org | ||
* Patch CMake's hard-coded define of XML gui file location (Closes: | ||
#963219) | ||
|
||
-- Luca Boccassi <[email protected]> Sun, 21 Jun 2020 13:41:37 +0100 | ||
|
||
stlink (1.6.1+ds-1) unstable; urgency=medium | ||
|
||
* Merge tag 'v1.6.1' into debian | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ | ||
Upstream-Name: stlink | ||
Upstream-Contact: Andrew 'Necromant' Andrianov <[email protected]> | ||
Source: https://github.com/texane/stlink | ||
Source: https://github.com/stlink-org/stlink | ||
Comment: Upstream tarball has been repackaged to remove binary OSX kernel | ||
drivers that are of unknown license and of no use to Debian. | ||
Files-Excluded: stlinkv1_macos_driver | ||
|
@@ -153,25 +153,3 @@ License: BSD-3-clause | |
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
||
Files: flashloaders/stm32l0x.s | ||
flashloaders/stm32lx.s | ||
Copyright: 2010 Spencer Oliver <[email protected]> | ||
2011 Øyvind Harboe <[email protected]> | ||
2011 Clement Burin des Roziers <[email protected]> | ||
License: GPL-2+ | ||
This package is free software; you can redistribute it and/or modify | ||
it under the terms of the GNU General Public License as published by | ||
the Free Software Foundation; either version 2 of the License, or | ||
(at your option) any later version. | ||
. | ||
This package is distributed in the hope that it will be useful, | ||
but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
GNU General Public License for more details. | ||
. | ||
You should have received a copy of the GNU General Public License | ||
along with this program. If not, see <http://www.gnu.org/licenses/> | ||
. | ||
On Debian systems, the complete text of the GNU General | ||
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- a/src/stlink-gui/CMakeLists.txt | ||
+++ b/src/stlink-gui/CMakeLists.txt | ||
@@ -32,7 +32,7 @@ | ||
add_executable(stlink-gui ${GUI_SOURCES}) | ||
install(FILES stlink-gui.ui DESTINATION ${CMAKE_INSTALL_BINDIR}) | ||
set_target_properties(stlink-gui PROPERTIES | ||
- COMPILE_DEFINITIONS STLINK_UI_DIR="${CMAKE_INSTALL_PREFIX}/bin") | ||
+ COMPILE_DEFINITIONS STLINK_UI_DIR="/usr/share/stlink") | ||
target_link_libraries(stlink-gui ${STLINK_LIB_SHARED} ${SSP_LIB} ${GTK3_LDFLAGS}) | ||
install(TARGETS stlink-gui DESTINATION ${CMAKE_INSTALL_BINDIR}) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
guipath.patch |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
version=3 | ||
opts=dversionmangle=s/\+ds$//,repacksuffix=+ds,filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/stlink-$1\.tar\.gz/ \ | ||
https://github.com/texane/stlink/tags .*/v?(\d\S+)\.tar\.gz | ||
https://github.com/stlink-org/stlink/tags .*/v?(\d\S+)\.tar\.gz |