From f8c7f1708c9dcb2facfaa4b94ebfa9324efde277 Mon Sep 17 00:00:00 2001 From: Alexander Frick Date: Wed, 12 Jul 2023 10:30:33 -0500 Subject: [PATCH] more deb fixes --- .gitignore | 1 + dist/DEBIAN/control | 4 ++-- dist/DEBIAN/postinst | 2 -- dist/usr/bin/mercury | 2 +- dist/{opt/Alex313031 => usr/lib}/.gitkeep | 0 dist/usr/share/applications/mercury.desktop | 8 ++++---- dist/usr/share/lintian/overrides/mercury | 5 +++-- 7 files changed, 11 insertions(+), 11 deletions(-) rename dist/{opt/Alex313031 => usr/lib}/.gitkeep (100%) diff --git a/.gitignore b/.gitignore index c27df43..1d40928 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .DS_Store /dist/opt/Alex313031/mercury/* +/dist/usr/lib/mercury/* thumbs.db *.deb # Dolphin file manager diff --git a/dist/DEBIAN/control b/dist/DEBIAN/control index b909486..b79711a 100644 --- a/dist/DEBIAN/control +++ b/dist/DEBIAN/control @@ -3,8 +3,8 @@ Version: 115.1.0 Architecture: amd64 Maintainer: Alex313031 Installed-Size: 300000 -Depends: lsb-release, libasound2 (>= 1.0.16), libatk1.0-0 (>= 1.12.4), libc6 (>= 2.30), libcairo-gobject2 (>= 1.10.0), libcairo2 (>= 1.10.0), libdbus-1-3 (>= 1.9.14), libdbus-glib-1-2 (>= 0.78), libfontconfig1 (>= 2.12.6), libfreetype6 (>= 2.3.5), libgcc-s1 (>= 4.2), libgdk-pixbuf2.0-0 (>= 2.22.0), libglib2.0-0 (>= 2.42), libgtk-3-0 (>= 3.14), libharfbuzz0b (>= 0.6.0), libpango-1.0-0 (>= 1.14.0), libpangocairo-1.0-0 (>= 1.14.0), libstdc++6 (>= 9), libx11-6, libx11-xcb1 (>= 2:1.6.9), libxcb-shm0, libxcb1, libxcomposite1 (>= 1:0.4.5), libxcursor1 (>> 1.1.2), libxdamage1 (>= 1:1.1), libxext6, libxfixes3, libxi6, libxrandr2 (>= 2:1.4.0), libxrender1, libxtst6 -Recommends: xul-ext-ubufox, libcanberra0, libdbusmenu-glib4, libdbusmenu-gtk3-4 +Depends: lsb-release, libasound2, libatk1.0-0, libc6, libcairo-gobject2, libcairo2, libdbus-1-3, libdbus-glib-1-2, libfontconfig1, libfreetype6, libgdk-pixbuf2.0-0, libglib2.0-0, libgtk-3-0, libharfbuzz0b, libpango-1.0-0, libpangocairo-1.0-0, libstdc++6, libx11-6, libx11-xcb1, libxcb-shm0, libxcb1, libxcomposite1, libxcursor1, libxdamage1, libxext6, libxfixes3, libxi6, libxrandr2, libxrender1, libxtst6 +Recommends: libcanberra0, libdbusmenu-glib4, libdbusmenu-gtk3-4, libvulkan1 Suggests: fonts-lyx Provides: gnome-www-browser, www-browser Section: web diff --git a/dist/DEBIAN/postinst b/dist/DEBIAN/postinst index fb0d07f..d4bbcd5 100755 --- a/dist/DEBIAN/postinst +++ b/dist/DEBIAN/postinst @@ -13,8 +13,6 @@ if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-remov x-www-browser /usr/bin/$MOZ_APP_NAME 40 fi -echo "Please restart all running instances of $MOZ_APP_NAME, or you will experience problems." - if [ -d /var/run ] ; then touch /var/run/$MOZ_APP_NAME-restart-required fi diff --git a/dist/usr/bin/mercury b/dist/usr/bin/mercury index abd07bb..1a25e10 100755 --- a/dist/usr/bin/mercury +++ b/dist/usr/bin/mercury @@ -1,3 +1,3 @@ #!/bin/bash -/opt/Alex313031/mercury/mercury $@ +/usr/lib/mercury/mercury $@ diff --git a/dist/opt/Alex313031/.gitkeep b/dist/usr/lib/.gitkeep similarity index 100% rename from dist/opt/Alex313031/.gitkeep rename to dist/usr/lib/.gitkeep diff --git a/dist/usr/share/applications/mercury.desktop b/dist/usr/share/applications/mercury.desktop index ca25c43..e51a116 100644 --- a/dist/usr/share/applications/mercury.desktop +++ b/dist/usr/share/applications/mercury.desktop @@ -4,7 +4,7 @@ Name=Mercury Comment=Browse the World Wide Web GenericName=Web Browser Keywords=Internet;WWW;Browser;Web;Explorer;Mercury -Exec=/opt/Alex313031/mercury/mercury %u +Exec=mercury %u StartupWMClass=mercury Terminal=false X-MultipleArgs=true @@ -17,12 +17,12 @@ Actions=NewWindow;NewPrivateWindow;TempUserDir; [Desktop Action NewWindow] Name=New Window -Exec=/opt/Alex313031/mercury/mercury -new-window +Exec=mercury -new-window [Desktop Action NewPrivateWindow] Name=New Private Window -Exec=/opt/Alex313031/mercury/mercury -private-window +Exec=mercury -private-window [Desktop Action TempUserDir] Name=Open With Temporary User Profile -Exec=/opt/Alex313031/mercury/mercury -profile /tmp/mercury/ +Exec=mercury -profile /tmp/mercury/ diff --git a/dist/usr/share/lintian/overrides/mercury b/dist/usr/share/lintian/overrides/mercury index e65505f..d01f4a3 100644 --- a/dist/usr/share/lintian/overrides/mercury +++ b/dist/usr/share/lintian/overrides/mercury @@ -1,2 +1,3 @@ -mercury binary: embedded-library opt/Alex313031/mercury/libxul.so: libjpeg -mercury binary: embedded-library opt/Alex313031/mercury/libmozsqlite3.so: sqlite +mercury binary: embedded-library usr/lib/mercury/libxul.so: libjpeg +mercury binary: embedded-library usr/lib/mercury/libmozsqlite3.so: sqlite +mercury binary: image-file-in-usr-lib