From 66f3c74cf3507646e74bb48b1895a9df84fa0643 Mon Sep 17 00:00:00 2001 From: Joao Eriberto Mota Filho Date: Sun, 12 Sep 2021 17:07:39 -0300 Subject: [PATCH] Fix some mistakes in debian CI test Some mistakes found when packaging for Debian: - Remove trash from rules and enforce hardening. - Use the same licensing from Debian package to avoid a misinterpretation from FTP Master. - Fix target variable in debian/rules --- CI/linux/debian/copyright | 43 +++++++++++++++++++++++++++++++++------ CI/linux/debian/rules | 25 ++++------------------- 2 files changed, 41 insertions(+), 27 deletions(-) diff --git a/CI/linux/debian/copyright b/CI/linux/debian/copyright index 0a694468..c8214dff 100644 --- a/CI/linux/debian/copyright +++ b/CI/linux/debian/copyright @@ -1,21 +1,27 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: obs-advancedsceneswitcher +Upstream-Name: SceneSwitcher Upstream-Contact: https://github.com/WarmUpTill/SceneSwitcher/issues Source: https://github.com/WarmUpTill/SceneSwitcher Files: * -Copyright: WarmUpTill +Copyright: 2016-2021 WarmUpTill License: GPL-2 +Files: cmake/GetGitRevisionDescription.cmake + cmake/GetGitRevisionDescription.cmake.in +Copyright: 2009-2013 Iowa State University + 2013-2020 Contributors + 2013-2020 Ryan Pavlik +License: BSL-1.0 + Files: debian/* Copyright: 2021 Joao Eriberto Mota Filho -License: GPL-2+ +License: BSL-1.0 -License: GPL-2 or GPL-2+ +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. + the Free Software Foundation; version 2. . This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -27,3 +33,28 @@ License: GPL-2 or GPL-2+ . On Debian systems, the complete text of the GNU General Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +License: BSL-1.0 + Boost Software License - Version 1.0 - August 17th, 2003 + . + Permission is hereby granted, free of charge, to any person or organization + obtaining a copy of the software and accompanying documentation covered by + this license (the "Software") to use, reproduce, display, distribute, + execute, and transmit the Software, and to prepare derivative works of the + Software, and to permit third-parties to whom the Software is furnished to + do so, all subject to the following: + . + The copyright notices in the Software and this entire statement, including + the above license grant, this restriction and the following disclaimer, + must be included in all copies of the Software, in whole or in part, and + all derivative works of the Software, unless such copies or derivative + works are solely in the form of machine-executable object code generated by + a source language processor. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT + SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE + FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. diff --git a/CI/linux/debian/rules b/CI/linux/debian/rules index 1b8457cf..c4d170bb 100644 --- a/CI/linux/debian/rules +++ b/CI/linux/debian/rules @@ -1,9 +1,9 @@ #!/usr/bin/make -f #export DH_VERBOSE = 1 -#export DEB_BUILD_MAINT_OPTIONS = hardening=+all -export QT_SELECT = qt5 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export QT_SELECT = qt5 %: dh $@ @@ -11,23 +11,6 @@ export QT_SELECT = qt5 dh_auto_configure -- -DBUILD_OUT_OF_TREE=1 \ -DLIBOBS_INCLUDE_DIR=/usr/include/obs \ - -DLIBOBS_LIB=/usr/lib/${DEB_TARGET_GNU_TYPE}/libobs.so \ + -DLIBOBS_LIB=/usr/lib/${DEB_TARGET_MULTIARCH}/libobs.so \ -DLIBOBS_FRONTEND_INCLUDE_DIR=/usr/include/obs \ - -DLIBOBS_FRONTEND_API_LIB=/usr/lib/${DEB_TARGET_GNU_TYPE}/libobs-frontend-api.so - -#override_dh_auto_configure: -# dh_auto_configure -- -DBUILD_OUT_OF_TREE=1 \ -# -DLIBOBS_FRONTEND_API_LIB=/usr/lib/x86_64-linux-gnu/libobs-frontend-api.so \ -# -DLIBOBS_FRONTEND_INCLUDE_DIR=/usr/include/obs \ -# -DCMAKE_INSTALL_PREFIX=/usr \ -# -DCMAKE_BUILD_TYPE=None \ -# -DCMAKE_INSTALL_SYSCONFDIR=/etc \ -# -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ -# -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON \ -# -DCMAKE_FIND_USE_PACKAGE_REGISTRY=OFF \ -# -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON \ -# -DCMAKE_INSTALL_RUNSTATEDIR=/run \ -# -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON \ -# "-GUnix Makefiles" -DCMAKE_VERBOSE_MAKEFILE=ON \ -# -DCMAKE_INSTALL_LIBDIR=lib/x86_64-linux-gnu .. - + -DLIBOBS_FRONTEND_API_LIB=/usr/lib/${DEB_TARGET_MULTIARCH}/libobs-frontend-api.so