From 8096d208d5eb24c11684a30586eea46094ae86b0 Mon Sep 17 00:00:00 2001 From: badaix Date: Sun, 12 Jan 2025 15:19:08 +0100 Subject: [PATCH] Install "/etc/snapserver/certs" directory --- .github/workflows/package.yml | 4 ++-- extras/package/debian/changelog | 7 +++++-- extras/package/debian/changelog_md2deb.py | 10 +++++----- extras/package/debian/snapclient.install | 2 ++ extras/package/debian/snapserver.install | 4 ++++ 5 files changed, 18 insertions(+), 9 deletions(-) create mode 100644 extras/package/debian/snapclient.install create mode 100644 extras/package/debian/snapserver.install diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 18b46149..4f3fd7d4 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -173,7 +173,7 @@ jobs: - name: configure run: | echo vcpkg installation root: $env:VCPKG_INSTALLATION_ROOT - cmake -S . -B build -G "Visual Studio 16 2019" -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET="x64-windows" -DCMAKE_BUILD_TYPE="Release" -DREVISION="${{ github.sha }}" -DWERROR=ON -DBUILD_TESTS=ON + cmake -S . -B build -G "Visual Studio 16 2019" -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET="x64-windows" -DCMAKE_BUILD_TYPE="Release" -DREVISION="${{ github.sha }}" -DWERROR=ON - name: build run: cmake --build build --config Release --parallel 3 --verbose - name: installer @@ -240,7 +240,7 @@ jobs: # #- name: ccache dump config # # run: ccache -p # - name: configure - # run: cmake -S $GITHUB_WORKSPACE/src/snapcast -B build -DBOOST_ROOT=$GITHUB_WORKSPACE/${{env.BOOST}} -DCMAKE_BUILD_TYPE=Release -DREVISION=${{ github.sha }} -DWERROR=ON -DBUILD_TESTS=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_FLAGS="-I/usr/local/include -Wno-deprecated-declarations" + # run: cmake -S $GITHUB_WORKSPACE/src/snapcast -B build -DBOOST_ROOT=$GITHUB_WORKSPACE/${{env.BOOST}} -DCMAKE_BUILD_TYPE=Release -DREVISION=${{ github.sha }} -DWERROR=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_FLAGS="-I/usr/local/include -Wno-deprecated-declarations" # - name: build # run: cmake --build build --parallel 3 diff --git a/extras/package/debian/changelog b/extras/package/debian/changelog index 463ced76..398b8b38 100644 --- a/extras/package/debian/changelog +++ b/extras/package/debian/changelog @@ -1,3 +1,6 @@ -Placeholder for changelog +snapcast (0.0.0-1) unstable; urgency=medium -Content should be created with `changelog_md2deb.py` + * Placeholder for changelog + Content should be created with `changelog_md2deb.py changelog.md` + + -- Johannes Pohl Sun, 01 Jan 1970 00:00:00 +0000 diff --git a/extras/package/debian/changelog_md2deb.py b/extras/package/debian/changelog_md2deb.py index 5a30e5e5..de956436 100755 --- a/extras/package/debian/changelog_md2deb.py +++ b/extras/package/debian/changelog_md2deb.py @@ -28,13 +28,13 @@ if __name__ == "__main__": with open(sys.argv[1], 'r') as file: data = file.read() - data = re.sub('^\s*# Snapcast changelog *\n*', + data = re.sub(r'^\s*# Snapcast changelog *\n*', '', data, flags=re.MULTILINE) - data = re.sub('^\s*### ([a-zA-Z]+) *\n', + data = re.sub(r'^\s*### ([a-zA-Z]+) *\n', r'\n * \1\n', data, flags=re.MULTILINE) - data = re.sub('^\s*## Version\s+(\S*) *\n', + data = re.sub(r'^\s*## Version\s+(\S*) *\n', r'snapcast (\1-1) unstable; urgency=medium\n', data, flags=re.MULTILINE) - data = re.sub('^\s*-\s*(.*) *\n', r' -\1\n', data, flags=re.MULTILINE) - data = re.sub('^_(.*)_ *\n', r' -- \1\n\n', data, flags=re.MULTILINE) + data = re.sub(r'^\s*-\s*(.*) *\n', r' -\1\n', data, flags=re.MULTILINE) + data = re.sub(r'^_(.*)_ *\n', r' -- \1\n\n', data, flags=re.MULTILINE) print(data) diff --git a/extras/package/debian/snapclient.install b/extras/package/debian/snapclient.install new file mode 100644 index 00000000..81d57c5e --- /dev/null +++ b/extras/package/debian/snapclient.install @@ -0,0 +1,2 @@ +usr/bin/snapclient usr/bin/ +usr/share/pixmaps/snapcast.svg usr/share/pixmaps/ \ No newline at end of file diff --git a/extras/package/debian/snapserver.install b/extras/package/debian/snapserver.install new file mode 100644 index 00000000..bde825ae --- /dev/null +++ b/extras/package/debian/snapserver.install @@ -0,0 +1,4 @@ +usr/bin/snapserver usr/bin/ +usr/share/snapserver usr/share/ +etc/snapserver.conf etc/ +etc/snapserver etc/ \ No newline at end of file