From e9bf04031bf5cd6aa942328787602091c4e81304 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sun, 14 Apr 2019 18:20:06 +0200 Subject: [PATCH] Move debian directory --- cmake/Deb.cmake | 3 +-- {dist/debian => debian}/changelog.in | 0 {dist/debian => debian}/compat | 0 {dist/debian => debian}/control | 0 {dist/debian => debian}/copyright | 4 ++++ {dist/debian => debian}/copyright-scan-patterns.yml | 0 {dist/debian => debian}/rules | 3 +-- dist/CMakeLists.txt | 2 +- 8 files changed, 7 insertions(+), 5 deletions(-) rename {dist/debian => debian}/changelog.in (100%) rename {dist/debian => debian}/compat (100%) rename {dist/debian => debian}/control (100%) rename {dist/debian => debian}/copyright (99%) rename {dist/debian => debian}/copyright-scan-patterns.yml (100%) rename {dist/debian => debian}/rules (91%) diff --git a/cmake/Deb.cmake b/cmake/Deb.cmake index 8b2653143..3df5e4db5 100644 --- a/cmake/Deb.cmake +++ b/cmake/Deb.cmake @@ -1,6 +1,5 @@ add_custom_target(deb - #COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SOURCE_DIR}/dist/debian ${CMAKE_BINARY_DIR}/debian - COMMAND cp -r -p ${CMAKE_SOURCE_DIR}/dist/debian ${CMAKE_BINARY_DIR}/ + COMMAND cp -r -p ${CMAKE_SOURCE_DIR}/debian ${CMAKE_BINARY_DIR}/ COMMAND dpkg-buildpackage -b -d -uc -us WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) diff --git a/dist/debian/changelog.in b/debian/changelog.in similarity index 100% rename from dist/debian/changelog.in rename to debian/changelog.in diff --git a/dist/debian/compat b/debian/compat similarity index 100% rename from dist/debian/compat rename to debian/compat diff --git a/dist/debian/control b/debian/control similarity index 100% rename from dist/debian/control rename to debian/control diff --git a/dist/debian/copyright b/debian/copyright similarity index 99% rename from dist/debian/copyright rename to debian/copyright index b05a99c98..69468178a 100644 --- a/dist/debian/copyright +++ b/debian/copyright @@ -43,6 +43,10 @@ Files: src/core/main.h src/covermanager/lastfmcoverprovider.h src/covermanager/musicbrainzcoverprovider.cpp src/covermanager/musicbrainzcoverprovider.h + src/covermanager/tidalcoverprovider.cpp + src/covermanager/tidalcoverprovider.h + src/covermanager/deezercoverprovider.cpp + src/covermanager/deezercoverprovider.h src/globalshortcuts/globalshortcutbackend-system.cpp src/globalshortcuts/globalshortcutbackend-system.h src/globalshortcuts/globalshortcut.cpp diff --git a/dist/debian/copyright-scan-patterns.yml b/debian/copyright-scan-patterns.yml similarity index 100% rename from dist/debian/copyright-scan-patterns.yml rename to debian/copyright-scan-patterns.yml diff --git a/dist/debian/rules b/debian/rules similarity index 91% rename from dist/debian/rules rename to debian/rules index 77dedf36d..d1485db7d 100755 --- a/dist/debian/rules +++ b/debian/rules @@ -11,8 +11,7 @@ configure: configure-stamp configure-stamp: dh_testdir cmake .. \ - -DCMAKE_INSTALL_PREFIX=$(CURDIR)/debian/strawberry/usr \ - -DENABLE_TRANSLATIONS=ON + -DCMAKE_INSTALL_PREFIX=$(CURDIR)/debian/strawberry/usr touch configure-stamp build: build-stamp diff --git a/dist/CMakeLists.txt b/dist/CMakeLists.txt index cf2b7f000..e5bdad345 100644 --- a/dist/CMakeLists.txt +++ b/dist/CMakeLists.txt @@ -5,7 +5,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/maketarball.sh.in ${CMAKE_CUR if (RPM_DISTRO) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/rpm/strawberry.spec.in ${CMAKE_CURRENT_SOURCE_DIR}/rpm/strawberry.spec @ONLY) endif() -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/debian/changelog.in ${CMAKE_CURRENT_SOURCE_DIR}/debian/changelog) +configure_file(${CMAKE_SOURCE_DIR}/debian/changelog.in ${CMAKE_SOURCE_DIR}/debian/changelog) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pacman/PKGBUILD.in ${CMAKE_CURRENT_SOURCE_DIR}/pacman/PKGBUILD @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist.in ${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/macos/create-dmg.sh.in ${CMAKE_CURRENT_SOURCE_DIR}/macos/create-dmg.sh)