From 8105bb709f1d58610e450fc832d3095adc5345f0 Mon Sep 17 00:00:00 2001 From: glubsy Date: Tue, 29 Dec 2020 23:45:15 +0100 Subject: [PATCH 1/5] Fix debian src package build Workaround "dpkg-source: error: can't build with source format '3.0 (native)': native package version may not have a revision" error as mentioned in #753 --- hscommon/build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hscommon/build.py b/hscommon/build.py index 96f52598..f7994636 100644 --- a/hscommon/build.py +++ b/hscommon/build.py @@ -295,7 +295,7 @@ def build_debian_changelog( return [s.strip() for s in result if s.strip()] ENTRY_MODEL = ( - "{pkg} ({version}-1) {distribution}; urgency=low\n\n{changes}\n " + "{pkg} ({version}) {distribution}; urgency=low\n\n{changes}\n " "-- Virgil Dupras {date}\n\n" ) CHANGE_MODEL = " * {description}\n" From 7414f82e2877293bc26d41014c753d036b77b3d0 Mon Sep 17 00:00:00 2001 From: glubsy Date: Tue, 29 Dec 2020 23:57:10 +0100 Subject: [PATCH 2/5] Fix missing directory for pixmap symlink in Debian --- pkg/debian/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/debian/Makefile b/pkg/debian/Makefile index 5309f39e..aeb5d4af 100644 --- a/pkg/debian/Makefile +++ b/pkg/debian/Makefile @@ -8,5 +8,6 @@ all: chmod +x src/run.py cp -R src/ "$(CURDIR)/debian/{pkgname}/usr/share/{execname}" cp "$(CURDIR)/debian/{execname}.desktop" "$(CURDIR)/debian/{pkgname}/usr/share/applications" + mkdir -p "$(CURDIR)/debian/{pkgname}/usr/pixmaps" ln -s "/usr/share/{execname}/dgse_logo_128.png" "$(CURDIR)/debian/{pkgname}/usr/pixmaps/{execname}.png" ln -s "/usr/share/{execname}/run.py" "$(CURDIR)/debian/{pkgname}/usr/bin/{execname}" From 1058247b44db80aa94401946b54c3d9a72ba9e17 Mon Sep 17 00:00:00 2001 From: glubsy Date: Wed, 30 Dec 2020 00:24:15 +0100 Subject: [PATCH 3/5] Fix missing application icon Should be placed in /usr/share/pixmaps for .dekstop file to point to it. --- pkg/debian/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/debian/Makefile b/pkg/debian/Makefile index aeb5d4af..cb0e08f3 100644 --- a/pkg/debian/Makefile +++ b/pkg/debian/Makefile @@ -9,5 +9,5 @@ all: cp -R src/ "$(CURDIR)/debian/{pkgname}/usr/share/{execname}" cp "$(CURDIR)/debian/{execname}.desktop" "$(CURDIR)/debian/{pkgname}/usr/share/applications" mkdir -p "$(CURDIR)/debian/{pkgname}/usr/pixmaps" - ln -s "/usr/share/{execname}/dgse_logo_128.png" "$(CURDIR)/debian/{pkgname}/usr/pixmaps/{execname}.png" + ln -s "/usr/share/{execname}/dgse_logo_128.png" "$(CURDIR)/debian/{pkgname}/usr/share/pixmaps/{execname}.png" ln -s "/usr/share/{execname}/run.py" "$(CURDIR)/debian/{pkgname}/usr/bin/{execname}" From 3255bdf0a2d02ede75b827e41738f9f84bf2effd Mon Sep 17 00:00:00 2001 From: glubsy Date: Wed, 30 Dec 2020 17:55:53 +0100 Subject: [PATCH 4/5] Fix incorrect path --- pkg/debian/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/debian/Makefile b/pkg/debian/Makefile index cb0e08f3..db506893 100644 --- a/pkg/debian/Makefile +++ b/pkg/debian/Makefile @@ -8,6 +8,6 @@ all: chmod +x src/run.py cp -R src/ "$(CURDIR)/debian/{pkgname}/usr/share/{execname}" cp "$(CURDIR)/debian/{execname}.desktop" "$(CURDIR)/debian/{pkgname}/usr/share/applications" - mkdir -p "$(CURDIR)/debian/{pkgname}/usr/pixmaps" + mkdir -p "$(CURDIR)/debian/{pkgname}/usr/share/pixmaps" ln -s "/usr/share/{execname}/dgse_logo_128.png" "$(CURDIR)/debian/{pkgname}/usr/share/pixmaps/{execname}.png" ln -s "/usr/share/{execname}/run.py" "$(CURDIR)/debian/{pkgname}/usr/bin/{execname}" From 990eaaa797bfa52af485e474916fad19480e68f3 Mon Sep 17 00:00:00 2001 From: glubsy Date: Wed, 30 Dec 2020 18:52:37 +0100 Subject: [PATCH 5/5] Update requirements.txt * Recently, the "hsaudiotag3k" on pypi has changed name slightly * The actual version is now "1.1.3.post1" * This avoids errors when invoking `pip -r requirements.txt` --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e53b5793..ad9a4f74 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ Send2Trash>=1.3.0 sphinx>=1.2.2 polib>=1.0.4 -hsaudiotag3k>=1.1.3 +hsaudiotag3k>=1.1.3* distro>=1.5.0 PyQt5 >=5.4,<6.0; sys_platform == 'win32' pywin32>=200; sys_platform == 'win32' \ No newline at end of file