Adjust the previous change, fix all Lintian warnings over the Debian …

…PPA package
owlwang · Sep 7, 2022 · 88c2928 · 88c2928
1 parent c43dc06
commit 88c2928
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 16 deletions.
diff --git a/packaging/ppa/build_binary_package.sh b/packaging/ppa/build_binary_package.sh
@@ -17,9 +17,9 @@ trap cleanup_dirs INT TERM
 
 rm -rf ../../target/ ../../vendor/ ../../.flatpak-builder ../flatpak/.flatpak-builder ../../repo
 
-cp -ra ../../ "${temp_dir}/songrec-0.3.2+2"
+cp -ra ../../ "${temp_dir}/songrec-0.3.2+4"
 
-cd "${temp_dir}/songrec-0.3.2+2"
+cd "${temp_dir}/songrec-0.3.2+4"
 
 mkdir -p .cargo
 cargo vendor --locked vendor | sed 's/^directory = ".*"/directory = "vendor"/g' > .cargo/config

diff --git a/packaging/ppa/debian/changelog b/packaging/ppa/debian/changelog
@@ -1,3 +1,15 @@
+songrec (0.3.2+4) bionic; urgency=low
+
+  * Additionally build the package for the any architecture supported by recent Ubuntu releases (try to build for all supported architectures on Launchpad PPA).
+
+ -- Marin <[email protected]>  Wed, 7 Sep 2022 15:15:00 +0200
+
+songrec (0.3.2+3) bionic; urgency=low
+
+  * Additionally build the package for the any architecture supported by recent Ubuntu releases.
+
+ -- Marin <[email protected]>  Wed, 7 Sep 2022 13:18:00 +0200
+
 songrec (0.3.2+2) bionic; urgency=low
 
   * Additionally build the package for the AMD64/AArch64 architecture.

diff --git a/packaging/ppa/debian/control b/packaging/ppa/debian/control
@@ -15,11 +15,11 @@ Vcs-Git: https://github.com/marin-m/songrec.git
 Vcs-Browser: https://github.com/marin-m/SongRec
 
 Package: songrec
-Architecture: amd64 arm64
+Architecture: any
 Depends: libasound2,
          libssl1.1 | libssl3,
-         libc6,
          ffmpeg,
+         ${misc:Depends},
          libgtk-3-0
 Recommends: pulseaudio-utils
 Description: An unofficial Shazam client for Linux, written in Rust

diff --git a/packaging/ppa/debian/rules b/packaging/ppa/debian/rules
@@ -32,9 +32,3 @@ override_dh_auto_install:
 	mkdir -p $(CURDIR)/debian/songrec/usr/bin
 	cp -ra $(CURDIR)/target/release/songrec $(CURDIR)/debian/songrec/usr/bin/
 
-
-# dh_make generated override targets
-# This is example for Cmake (See https://bugs.debian.org/641051 )
-#override_dh_auto_configure:
-#	dh_auto_configure -- #	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
-
diff --git a/packaging/ppa/upload_source_package.sh b/packaging/ppa/upload_source_package.sh
@@ -17,13 +17,13 @@ function cleanup_dirs {
 
 trap cleanup_dirs INT TERM
 
-for version in bionic focal impish jammy kinetic; do
+for version in bionic focal jammy kinetic; do
 
     rm -rf ../../target/ ../../vendor/ ../../.flatpak-builder ../flatpak/.flatpak-builder ../../repo ../../.cargo
 
-    cp -ra ../../ "${temp_dir}/songrec-0.3.2+2${version}"
+    cp -ra ../../ "${temp_dir}/songrec-0.3.2+4${version}"
 
-    cd "${temp_dir}/songrec-0.3.2+2${version}"
+    cd "${temp_dir}/songrec-0.3.2+4${version}"
 
     mkdir -p .cargo
     cargo vendor --locked vendor | sed 's/^directory = ".*"/directory = "vendor"/g' > .cargo/config
@@ -49,11 +49,11 @@ for version in bionic focal impish jammy kinetic; do
 
     # Push to Launchpad
 
-    dput ppa:marin-m/songrec "../../songrec_0.3.2+2${version}_source.changes"
+    dput ppa:marin-m/songrec "../../songrec_0.3.2+4${version}_source.changes"
 
     cd "${ORIG_DIR}"
 
-    rm -rf "${temp_dir}/songrec-0.3.2+2${version}"
+    rm -rf "${temp_dir}/songrec-0.3.2+4${version}"
 
 done
 

diff --git a/packaging/rootfs/usr/share/metainfo/com.github.marinm.songrec.metainfo.xml b/packaging/rootfs/usr/share/metainfo/com.github.marinm.songrec.metainfo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop-application">
   <id>com.github.marinm.songrec</id>
-  <metadata_license>CC0</metadata_license>
+  <metadata_license>GPL-3.0+</metadata_license>
   <project_license>GPL-3.0+</project_license>
   <name>SongRec</name>
   <summary>An open-source, unofficial Shazam client for Linux, written in Rust.</summary>