[SRU] Conflicts with edubuntu-menu and ubuntustudio-menu

[Erich Eickmeyer]

[ Impact ]

edubuntu-menu and ubuntustudio-menu were meant to be coinstallable, but file conflicts exists where the shortcut to AskUbuntu has identical files (an oversight by myself). To rectify this, namespace-specific filenames had to be made (i.e. edubuntu-askubuntu) so that the menus could, once again, be co-installable.

Having the menus co-installable is desired so that the Ubuntu Studio GNOME Activities overview folder customizations can also be brought into Edubuntu. Without this, Ubuntu Studio isn't fully "Installable on any official flavor via Ubuntu Studio Installer [1]".

[ Test Case ]

* Install Edubuntu
* Install ubuntustudio-menu
* Due to conflicts in the packaging left-over from pre-release times, edubuntu-menu will be removed. This is not desired.

[ Regression Potential ]

This is a simple filename rename for the following files:

edubuntu-menu package:
/usr/share/applications/askubuntu.desktop -> /usr/share/applications/edubuntu-askubuntu.desktop
/usr/share/icons/hicolor/*/places/askubuntu.* -> /usr/share/icons/hicolor/*/places/edubuntu-askubuntu.*

ubuntustudio-menu package:
/usr/share/applications/askubuntu.desktop -> /usr/share/applications/ubuntustudio-askubuntu.desktop
/usr/share/icons/hicolor/*/places/askubuntu.* -> /usr/share/icons/hicolor/*/places/ubuntustudio-askubuntu.*

The biggest potential for regression lies if anything got missed, such as the contents of the desktop file or if the conflicts line did not get removed, which I have double-checked.

[ Other Information ]

[1] https://ubuntustudio.org/ubuntu-studio-installer/

[Launchpad Janitor (janitor)]

This bug was fixed in the package edubuntu-menu - 23.10.1

---------------
edubuntu-menu (23.10.1) mantic; urgency=medium

  * Welcome to Mantic Minotaur!
  * Move askubuntu icon to edubuntu namespace (LP: #2025196)

 -- Erich Eickmeyer <email address hidden> Tue, 27 Jun 2023 19:03:12 -0700

[Launchpad Janitor (janitor)]

This bug was fixed in the package ubuntustudio-menu - 0.74

---------------
ubuntustudio-menu (0.74) mantic; urgency=medium

  * d/control: Update description
  * Move askubuntu icon to ubuntustudio file namespace (LP: #2025196)

 -- Erich Eickmeyer <email address hidden> Tue, 27 Jun 2023 19:11:13 -0700

[Robie Basak (racb)]

Hello Erich, or anyone else affected,

Accepted edubuntu-menu into lunar-proposed. The package will build now and be available at https://launchpad.net/ubuntu/+source/edubuntu-menu/23.04.2.1 in a few hours, and then in the -proposed repository.

Please help us by testing this new package. See https://wiki.ubuntu.com/Testing/EnableProposed for documentation on how to enable and use -proposed. Your feedback will aid us getting this update out to other Ubuntu users.

If this package fixes the bug for you, please add a comment to this bug, mentioning the version of the package you tested, what testing has been performed on the package and change the tag from verification-needed-lunar to verification-done-lunar. If it does not fix the bug for you, please add a comment stating that, and change the tag to verification-failed-lunar. In either case, without details of your testing we will not be able to proceed.

Further information regarding the verification process can be found at https://wiki.ubuntu.com/QATeam/PerformingSRUVerification . Thank you in advance for helping!

N.B. The updated package will be released to -updates after the bug(s) fixed by this package have been verified and the package has been in -proposed for a minimum of 7 days.

[Robie Basak (racb)]

An upload of ubuntustudio-menu to lunar-proposed has been rejected from the upload queue for the following reason: "Contains unexplained change to package description".

[Robie Basak (racb)]

Hello Erich, or anyone else affected,

Accepted ubuntustudio-menu into lunar-proposed. The package will build now and be available at https://launchpad.net/ubuntu/+source/ubuntustudio-menu/0.72.1 in a few hours, and then in the -proposed repository.

Please help us by testing this new package. See https://wiki.ubuntu.com/Testing/EnableProposed for documentation on how to enable and use -proposed. Your feedback will aid us getting this update out to other Ubuntu users.

If this package fixes the bug for you, please add a comment to this bug, mentioning the version of the package you tested, what testing has been performed on the package and change the tag from verification-needed-lunar to verification-done-lunar. If it does not fix the bug for you, please add a comment stating that, and change the tag to verification-failed-lunar. In either case, without details of your testing we will not be able to proceed.

Further information regarding the verification process can be found at https://wiki.ubuntu.com/QATeam/PerformingSRUVerification . Thank you in advance for helping!

N.B. The updated package will be released to -updates after the bug(s) fixed by this package have been verified and the package has been in -proposed for a minimum of 7 days.

[Erich Eickmeyer (eeickmeyer)]

Unfortunately, there was a second file that is a duplicate in both packages (/etc/dconf/profile/user) that has the same contents. I failed to test this in mantic, so this is on me.

This will require devising a method to install the file if the file does not already exist by using the postinst script as the file must be the same name and must have the same contents and cannot be duplicated.

[Erich Eickmeyer (eeickmeyer)]

Uploaded edubuntu-menu 23.04.2.2 and ubuntustudio-menu 0.72.2 as fixes for the issue described in my comment above.

[Launchpad Janitor (janitor)]

This bug was fixed in the package ubuntustudio-menu - 0.77

---------------
ubuntustudio-menu (0.77) mantic; urgency=medium

  * Remove /etc/* from install - no more files

ubuntustudio-menu (0.76) mantic; urgency=medium

  * Move /etc/dconf/profile/user and install via postinst (LP: #2025196)

 -- Erich Eickmeyer <email address hidden> Thu, 07 Sep 2023 13:45:38 -0700

[Launchpad Janitor (janitor)]

This bug was fixed in the package edubuntu-menu - 23.10.7

---------------
edubuntu-menu (23.10.7) mantic; urgency=medium

  * Move /etc/dconf/profile/user and install via postinst (LP: #2025196)

 -- Erich Eickmeyer <email address hidden> Thu, 07 Sep 2023 13:55:16 -0700

[Timo Aaltonen (tjaalton)]

Hello Erich, or anyone else affected,

Accepted ubuntustudio-menu into lunar-proposed. The package will build now and be available at https://launchpad.net/ubuntu/+source/ubuntustudio-menu/0.72.2 in a few hours, and then in the -proposed repository.

Please help us by testing this new package. See https://wiki.ubuntu.com/Testing/EnableProposed for documentation on how to enable and use -proposed. Your feedback will aid us getting this update out to other Ubuntu users.

If this package fixes the bug for you, please add a comment to this bug, mentioning the version of the package you tested, what testing has been performed on the package and change the tag from verification-needed-lunar to verification-done-lunar. If it does not fix the bug for you, please add a comment stating that, and change the tag to verification-failed-lunar. In either case, without details of your testing we will not be able to proceed.

Further information regarding the verification process can be found at https://wiki.ubuntu.com/QATeam/PerformingSRUVerification . Thank you in advance for helping!

N.B. The updated package will be released to -updates after the bug(s) fixed by this package have been verified and the package has been in -proposed for a minimum of 7 days.

[Timo Aaltonen (tjaalton)]

Hello Erich, or anyone else affected,

Accepted edubuntu-menu into lunar-proposed. The package will build now and be available at https://launchpad.net/ubuntu/+source/edubuntu-menu/23.04.2.2 in a few hours, and then in the -proposed repository.

Please help us by testing this new package. See https://wiki.ubuntu.com/Testing/EnableProposed for documentation on how to enable and use -proposed. Your feedback will aid us getting this update out to other Ubuntu users.

If this package fixes the bug for you, please add a comment to this bug, mentioning the version of the package you tested, what testing has been performed on the package and change the tag from verification-needed-lunar to verification-done-lunar. If it does not fix the bug for you, please add a comment stating that, and change the tag to verification-failed-lunar. In either case, without details of your testing we will not be able to proceed.

Further information regarding the verification process can be found at https://wiki.ubuntu.com/QATeam/PerformingSRUVerification . Thank you in advance for helping!

N.B. The updated package will be released to -updates after the bug(s) fixed by this package have been verified and the package has been in -proposed for a minimum of 7 days.

[Timo Aaltonen (tjaalton)]

Hello Erich, or anyone else affected,

Accepted ubuntustudio-menu into lunar-proposed. The package will build now and be available at https://launchpad.net/ubuntu/+source/ubuntustudio-menu/0.72.3 in a few hours, and then in the -proposed repository.

Please help us by testing this new package. See https://wiki.ubuntu.com/Testing/EnableProposed for documentation on how to enable and use -proposed. Your feedback will aid us getting this update out to other Ubuntu users.

If this package fixes the bug for you, please add a comment to this bug, mentioning the version of the package you tested, what testing has been performed on the package and change the tag from verification-needed-lunar to verification-done-lunar. If it does not fix the bug for you, please add a comment stating that, and change the tag to verification-failed-lunar. In either case, without details of your testing we will not be able to proceed.

Further information regarding the verification process can be found at https://wiki.ubuntu.com/QATeam/PerformingSRUVerification . Thank you in advance for helping!

N.B. The updated package will be released to -updates after the bug(s) fixed by this package have been verified and the package has been in -proposed for a minimum of 7 days.

[Erich Eickmeyer (eeickmeyer)]

Unfortunately, while there's probably no problem with ubuntustudio-menu, this entire SRU is blocked by LP: #2025196 since a separate, yet related, bug was found with edubuntu-menu. Sadly, verification will have to wait on this until that verification is done.

I have only myself to blame.

[Timo Aaltonen (tjaalton)]

Hello Erich, or anyone else affected,

Accepted edubuntu-menu into lunar-proposed. The package will build now and be available at https://launchpad.net/ubuntu/+source/edubuntu-menu/23.04.2.3 in a few hours, and then in the -proposed repository.

Please help us by testing this new package. See https://wiki.ubuntu.com/Testing/EnableProposed for documentation on how to enable and use -proposed. Your feedback will aid us getting this update out to other Ubuntu users.

If this package fixes the bug for you, please add a comment to this bug, mentioning the version of the package you tested, what testing has been performed on the package and change the tag from verification-needed-lunar to verification-done-lunar. If it does not fix the bug for you, please add a comment stating that, and change the tag to verification-failed-lunar. In either case, without details of your testing we will not be able to proceed.

Further information regarding the verification process can be found at https://wiki.ubuntu.com/QATeam/PerformingSRUVerification . Thank you in advance for helping!

N.B. The updated package will be released to -updates after the bug(s) fixed by this package have been verified and the package has been in -proposed for a minimum of 7 days.

[Erich Eickmeyer (eeickmeyer)]

With the fix in LP: #2034970, both packages now install simultaneously without file conflicts. edubuntu-menu 23.04.2.3 and ubuntustudio-menu 0.72.3

[Andreas Hasenack (ahasenack)]

I'm looking at releasing this, and have two questions:

a) Should this be released together with edubuntu-menu? ubuntustudio-menu has aged enough already, but edubuntu-menu has not

b) This change[1]:

--- a/debian/postinst
+++ b/debian/postinst
@@ -8,6 +8,11 @@ cp /usr/share/ubuntustudio/00_ubuntustudio /etc/dconf/db/site.d
 mkdir -p /etc/xdg/menus/applications-merged
 cp /usr/share/ubuntustudio/studio.menu /etc/xdg/menus/applications-merged

+mkdir -p /etc/dconf/profile
+if ! [ -f /etc/dconf/profile/user ]; then
+ cp /usr/share/ubuntustudio/user /etc/dconf/profile/user
+fi
+
 if [ -f /usr/bin/dconf ]; then
     dconf update
 fi
diff --git a/debian/postrm b/debian/postrm
index ce155f1..aa7921c 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -5,5 +5,9 @@ if [ -f /usr/bin/dconf ]; then
     dconf update
 fi

+if [ -f /etc/dconf/profile/user ]; then
+ rm -f /etc/dconf/profile/user
+fi
+

That is removing and adding /etc/dconf/profile/user in every single upgrade of this package. Is this intended? Or did you mean to remove it only when the package is actually being removed?

Otherwise, what about user changes to /etc/dconf/profile/user? They will be lost on every single package upgrade.

1. https://git.launchpad.net/ubuntu/+source/ubuntustudio-menu/commit/?h=applied/0.72.2&id=636ac247d5ad26689b450ce011a2e75817a70087

[Erich Eickmeyer (eeickmeyer)]

Sadly, this was the only way I could resolve the conflict at the time as both packages need that file in that format. Additionally, I cannot imagine a scenario where a user would need to change that file.

Also, package upgrades to this are rare. Usually this package is left alone until version upgrades.

[Andreas Hasenack (ahasenack)]

I don't think we can accept the change in (b) from comment #16, that's not the right way to solve a file conflict between two packages. Usually when something like this happened, some sort of -common package is created and then both previously-conflicting packages can require this -common package, and everyone is happy.

Other options include alternatives and dpkg-divert, but these are for the case when the actual file is different in each implementation. There may be other alternatives (no pun intended).

Removing the file and putting it back together like is being done here violates a few policies.

Can you come up with just a fix for the menu change that you need in bug #2033992, and leave this conflict to be sorted out at another time?

[Erich Eickmeyer (eeickmeyer)]

I have another fix and will be uploading shortly.

[Andreas Hasenack (ahasenack)]

An upload of edubuntu-menu to lunar-proposed has been rejected from the upload queue for the following reason: "Please use dpkg-maintscript-helper to rename the /etc/dconf/profile/user file, according to "renaming a conffile" in https://manpages.ubuntu.com/manpages/lunar/en/man1/dpkg-maintscript-helper.1.html#conffile%20related%20tasks".

[Andreas Hasenack (ahasenack)]

An upload of ubuntustudio-menu to lunar-proposed has been rejected from the upload queue for the following reason: "Please use dpkg-maintscript-helper to rename the /etc/dconf/profile/user file, according to "renaming a conffile" in https://manpages.ubuntu.com/manpages/lunar/en/man1/dpkg-maintscript-helper.1.html#conffile%20related%20tasks".

[Launchpad Janitor (janitor)]

This bug was fixed in the package ubuntustudio-menu - 0.81

---------------
ubuntustudio-menu (0.81) mantic; urgency=medium

  * Add maintscript helper for move of conffile (LP: #2025196)

ubuntustudio-menu (0.80) mantic; urgency=medium

  * Move /etc/dconf/profile/user to ubuntustudio namespace (LP: #2025196)
    - Avoids file conflicts, contents of files merge if identical

 -- Erich Eickmeyer <email address hidden> Fri, 22 Sep 2023 08:49:42 -0700

[Launchpad Janitor (janitor)]

This bug was fixed in the package edubuntu-menu - 23.10.11

---------------
edubuntu-menu (23.10.11) mantic; urgency=medium

  * Add maintscript helper for move of conffile (LP: #2025196)

edubuntu-menu (23.10.10) mantic; urgency=medium

  * Move /etc/dconf/profile/user to edubuntu namespace (LP: #2025196)
    - Avoids file conflicts, contents of files merge if identical

 -- Erich Eickmeyer <email address hidden> Fri, 22 Sep 2023 08:47:53 -0700

[Erich Eickmeyer (eeickmeyer)]

Unfortunately, while I was able to resolve this in mantic, I don't see any way to resolve this in lunar without significant changes. Therefore, I'm going to have to abort this.

[Steve Langasek (vorlon)]

The version of edubuntu-menu in the proposed pocket of Lunar that was purported to fix this bug report has been removed because one or more bugs that were to be fixed by the upload have failed verification and been in this state for more than 10 days.

[Steve Langasek (vorlon)]

The version of ubuntustudio-menu in the proposed pocket of Lunar that was purported to fix this bug report has been removed because one or more bugs that were to be fixed by the upload have failed verification and been in this state for more than 10 days.