[Debian-on-mobile-maintainers] Bug#1034595: unblock: phog/0.1.3-2

[Jochen Sprickerhof]

Package: release.debian.org
Severity: normal
User: release.debian.org at packages.debian.org
Usertags: unblock
X-Debbugs-Cc: phog at packages.debian.org, Arnaud Ferraris <aferraris at debian.org>
Control: affects -1 + src:phog

Please unblock package phog

[ Reason ]
phog in testing ships PAM files for greetd that where transitioned to
the greetd package in 0.9.0-3 and are already unblocked in #1033966.
This cleans up the phog part of it.
In addition this fixes the dependencies of phog.

[ Impact ]
same as #1033966:
PAM configuration conflicts with greetd's embedded version (in new
version).
Also phog fails to start in a minimal installation due to the missing
dependencies.

[ Tests ]
I manually tested the upgrade (as did the greetd and phog maintainers,
according to #1033966) and uninstalling.
I also tested the missing runtime dependencies.

[ Risks ]
None.

[ Checklist ]
  [X] all changes are documented in the d/changelog
  [X] I reviewed all changes and I approve them
  [X] attach debdiff against the package in testing

[ Other info ]
I'm filling this on behalf of the DebianOnMobile team as I was not able
to reach Arnaud, assuming that he is fine with this and to finish #1033966.
I will also ping #1032914 to gain some time.

unblock phog/0.1.3-2
-------------- next part --------------
diff -Nru phog-0.1.3/debian/changelog phog-0.1.3/debian/changelog
--- phog-0.1.3/debian/changelog	2023-02-02 19:50:11.000000000 +0100
+++ phog-0.1.3/debian/changelog	2023-03-15 13:59:03.000000000 +0100
@@ -1,3 +1,19 @@
+phog (0.1.3-2) unstable; urgency=medium
+
+  [ Guido G?nther ]
+  * d/control: Allow for phosh-osk-stub.
+    This allows to use phosh-osk-stub instead of squeekboard
+
+  [ Arnaud Ferraris ]
+  * debian: remove PAM conffiles on upgrade
+    `greetd` now ships those, so we should get rid of them. Add a versioned
+    dependency on `greetd` to ensure we have the proper configs.
+    (Closes: #1032914)
+  * d/control: add missing runtime dependencies.
+    (Closes: #1033282)
+
+ -- Arnaud Ferraris <aferraris at debian.org>  Wed, 15 Mar 2023 13:59:03 +0100
+
 phog (0.1.3-1) unstable; urgency=medium
 
   * New upstream version 0.1.3
diff -Nru phog-0.1.3/debian/control phog-0.1.3/debian/control
--- phog-0.1.3/debian/control	2023-02-02 19:50:11.000000000 +0100
+++ phog-0.1.3/debian/control	2023-03-15 13:59:03.000000000 +0100
@@ -36,9 +36,11 @@
  ${misc:Depends},
  ${shlibs:Depends},
  fonts-lato,
- greetd,
+ gnome-shell-common,
+ greetd (>= 0.9.0-3),
  phoc (>= 0.21.0+ds1),
- squeekboard,
+ polkitd,
+ squeekboard | phosh-osk-stub,
 Description: Greetd-compatible greeter for mobile phones
  Phog is a graphical greeter speaking the `greetd` protocol and aimed at mobile
  devices like smart phones and tablets using touch based inputs and small
diff -Nru phog-0.1.3/debian/phog.conffiles phog-0.1.3/debian/phog.conffiles
--- phog-0.1.3/debian/phog.conffiles	1970-01-01 01:00:00.000000000 +0100
+++ phog-0.1.3/debian/phog.conffiles	2023-03-15 13:59:03.000000000 +0100
@@ -0,0 +1,2 @@
+remove-on-upgrade /etc/pam.d/greetd
+remove-on-upgrade /etc/pam.d/greetd-greeter
diff -Nru phog-0.1.3/debian/phog.greetd-greeter.pam phog-0.1.3/debian/phog.greetd-greeter.pam
--- phog-0.1.3/debian/phog.greetd-greeter.pam	2023-02-02 19:50:11.000000000 +0100
+++ phog-0.1.3/debian/phog.greetd-greeter.pam	1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-#%PAM-1.0
- at include login
diff -Nru phog-0.1.3/debian/phog.greetd.pam phog-0.1.3/debian/phog.greetd.pam
--- phog-0.1.3/debian/phog.greetd.pam	2023-02-02 19:50:11.000000000 +0100
+++ phog-0.1.3/debian/phog.greetd.pam	1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-#%PAM-1.0
- at include login
-
-auth        optional        pam_gnome_keyring.so
-session     optional        pam_gnome_keyring.so auto_start
diff -Nru phog-0.1.3/debian/rules phog-0.1.3/debian/rules
--- phog-0.1.3/debian/rules	2023-02-02 19:50:11.000000000 +0100
+++ phog-0.1.3/debian/rules	2023-03-15 13:59:03.000000000 +0100
@@ -15,7 +15,3 @@
 	# dh_auto_install will put files in debian/<PACKAGE>, while dh_install
 	# will look in debian/tmp. Make sure both use the same directory.
 	dh_auto_install --destdir=$(PHOG_DESTDIR)
-
-override_dh_installpam:
-	dh_installpam --name=greetd
-	dh_installpam --name=greetd-greeter