From 952fb453fc920edc640e5c760d8af64070516fab Mon Sep 17 00:00:00 2001 From: Marius Meisenzahl Date: Wed, 2 Nov 2022 15:18:40 +0100 Subject: [PATCH 1/7] Create prerm --- debian/prerm | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 debian/prerm diff --git a/debian/prerm b/debian/prerm new file mode 100644 index 00000000..85a95c95 --- /dev/null +++ b/debian/prerm @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +flatpak remove --system --noninteractive io.elementary.calculator//stable || true + +#DEBHELPER# + +exit 0 From c76cb363b238239f5e02d329eab5195960912802 Mon Sep 17 00:00:00 2001 From: Marius Meisenzahl Date: Wed, 2 Nov 2022 15:19:05 +0100 Subject: [PATCH 2/7] Create postinst --- debian/postinst | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 debian/postinst diff --git a/debian/postinst b/debian/postinst new file mode 100644 index 00000000..4b0a48ea --- /dev/null +++ b/debian/postinst @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +flatpak remote-add --if-not-exists --system appcenter https://flatpak.elementary.io/repo.flatpakrepo +flatpak install --system --noninteractive appcenter io.elementary.calculator//stable || true + +#DEBHELPER# + +exit 0 From c8d8f229ad6fb33c864e1381679891a2ca6bdd99 Mon Sep 17 00:00:00 2001 From: Marius Meisenzahl Date: Wed, 2 Nov 2022 15:19:17 +0100 Subject: [PATCH 3/7] Delete install --- debian/io.elementary.calculator.install | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 debian/io.elementary.calculator.install diff --git a/debian/io.elementary.calculator.install b/debian/io.elementary.calculator.install deleted file mode 100644 index 498a4ede..00000000 --- a/debian/io.elementary.calculator.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/share -usr/bin From 6977a114e17422a19d83ce8bab51db51d60abca8 Mon Sep 17 00:00:00 2001 From: Marius Meisenzahl Date: Wed, 2 Nov 2022 15:19:29 +0100 Subject: [PATCH 4/7] Update control --- debian/control | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/debian/control b/debian/control index 998170b0..d3e28862 100644 --- a/debian/control +++ b/debian/control @@ -2,12 +2,7 @@ Source: io.elementary.calculator Section: x11 Priority: extra Maintainer: elementary, Inc. -Build-Depends: debhelper (>= 10.5.1), - gettext, - libgranite-7-dev, - libgtk-4-dev, - meson, - valac (>= 0.26) +Build-Depends: debhelper (>= 10.5.1) Standards-Version: 4.1.1 Homepage: https://github.com/elementary/calculator @@ -20,7 +15,7 @@ Description: Calculate in an elementary way. Package: pantheon-calculator Architecture: any -Depends: io.elementary.calculator, ${misc:Depends} +Depends: flatpak, ${misc:Depends} Section: oldlibs Priority: optional Description: transitional dummy package From 76dc37c06863d4fb50da3b8ff0ce24b0b7a59162 Mon Sep 17 00:00:00 2001 From: Marius Meisenzahl Date: Wed, 2 Nov 2022 20:14:01 +0100 Subject: [PATCH 5/7] Revert "Update control" This reverts commit 6977a114e17422a19d83ce8bab51db51d60abca8. --- debian/control | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index d3e28862..998170b0 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,12 @@ Source: io.elementary.calculator Section: x11 Priority: extra Maintainer: elementary, Inc. -Build-Depends: debhelper (>= 10.5.1) +Build-Depends: debhelper (>= 10.5.1), + gettext, + libgranite-7-dev, + libgtk-4-dev, + meson, + valac (>= 0.26) Standards-Version: 4.1.1 Homepage: https://github.com/elementary/calculator @@ -15,7 +20,7 @@ Description: Calculate in an elementary way. Package: pantheon-calculator Architecture: any -Depends: flatpak, ${misc:Depends} +Depends: io.elementary.calculator, ${misc:Depends} Section: oldlibs Priority: optional Description: transitional dummy package From 65c25eea485e897116ecdf1701be23616f158e2b Mon Sep 17 00:00:00 2001 From: Marius Meisenzahl Date: Wed, 2 Nov 2022 20:15:03 +0100 Subject: [PATCH 6/7] Update control --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 998170b0..d397735c 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Homepage: https://github.com/elementary/calculator Package: io.elementary.calculator Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: flatpak, ${misc:Depends}, ${shlibs:Depends} Breaks: pantheon-calculator Replaces: pantheon-calculator Description: Calculate in an elementary way. From 6320d857e1113a63193cff5296b6983ece966e58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Wed, 2 Nov 2022 13:56:46 -0700 Subject: [PATCH 7/7] Update rules --- debian/rules | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/debian/rules b/debian/rules index 38cae7d1..955dd78b 100755 --- a/debian/rules +++ b/debian/rules @@ -10,8 +10,4 @@ #export DH_VERBOSE=1 %: - dh $@ --buildsystem=meson - -override_dh_install: - dh_install --fail-missing - + dh $@