[debian-edu-commits] [Git][debian-edu/debian-edu][master] 5 commits: debian/control.stub: (education-menus) Drop Depends on desktop-profiles.

[WolfgangSchweer]

WolfgangSchweer pushed to branch master at Debian Edu / debian-edu


Commits:
8f20a7a0 by Wolfgang Schweer at 2019-11-02T17:53:19Z
debian/control.stub: (education-menus) Drop Depends on desktop-profiles.

The menu reorganization is now managed via XDG; it applies for all users.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -
732e4b5a by Wolfgang Schweer at 2019-11-02T17:56:29Z
Remove no longer needed files debian-edu-menus.listing and menus/is-enabled

These were used to configure the desktop-profiles package.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -
15d754cf by Wolfgang Schweer at 2019-11-02T17:58:28Z
Adjust debian/{education-menus.install,education-menus.postinst} accordingly.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -
2d8698c9 by Wolfgang Schweer at 2019-11-02T18:01:37Z
Udpade after running 'make dist'.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -
ed0d150d by Wolfgang Schweer at 2019-11-02T18:08:37Z
Add changelog entries for education-menus related commits.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -


7 changed files:

- − debian-edu-menus.listing
- debian/changelog
- debian/control
- debian/control.stub
- debian/education-menus.install
- − debian/education-menus.postinst
- − menus/is-enabled


Changes:

=====================================
debian-edu-menus.listing deleted
=====================================
@@ -1,2 +0,0 @@
-# Menu reordering for teachers and students
-edu-menus;XDG_CONFIG;/usr/share/debian-edu/menu;;$(/usr/share/debian-edu/menu/menus/is-enabled);Menu reordering


=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+debian-edu (2.11.6) UNRELEASED; urgency=medium
+
+  * debian/control.stub: (education-menus) Drop Depends on desktop-profiles.
+    The menu reorganization is now managed via XDG; it applies for all users.
+    The concept of group specific desktop icons is gone since a long time, too.
+  * Remove no longer needed files debian-edu-menus.listing and menus/is-enabled.
+  * Adjust debian/{education-menus.install,education-menus.postinst}.
+  * debian/control: Update after running 'make dist'.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Sat, 02 Nov 2019 19:02:30 +0100
+
 debian-edu (2.11.5) unstable; urgency=medium
 
   [ Wolfgang Schweer ]


=====================================
debian/control
=====================================
@@ -33,15 +33,10 @@ XS-Comment: This is a specific package which reorganizes the menu. It doesn't ma
 Package: education-menus
 Section: misc
 Architecture: any
-Depends: desktop-profiles,
- ${misc:Depends}
+Depends: ${misc:Depends}
 Description: Debian Edu menu reorganization
- A package to reorganizate menu branches in order to get a structure
+ A package to reorganize menu branches in order to get a structure
  easy to use for teachers and students.
- .
- To activate the menu reorganization, a teachers or students group must
- exist in the system and the user has to be a member of one of these two
- groups.
 
 Package: education-astronomy
 Section: metapackages


=====================================
debian/control.stub
=====================================
@@ -32,13 +32,8 @@ XS-Comment: This is a specific package which reorganizes the menu. It doesn't ma
 Package: education-menus
 Section: misc
 Architecture: any
-Depends: desktop-profiles,
- ${misc:Depends}
+Depends: ${misc:Depends}
 Description: Debian Edu menu reorganization
- A package to reorganizate menu branches in order to get a structure
+ A package to reorganize menu branches in order to get a structure
  easy to use for teachers and students.
- .
- To activate the menu reorganization, a teachers or students group must
- exist in the system and the user has to be a member of one of these two
- groups.
 


=====================================
debian/education-menus.install
=====================================
@@ -1,4 +1,3 @@
 desktop-directories/* usr/share/desktop-directories
 pixmaps/* usr/share/pixmaps
 menus usr/share/debian-edu/menu
-debian-edu-menus.listing etc/desktop-profiles


=====================================
debian/education-menus.postinst deleted
=====================================
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-if test "$1" = "configure" && \
-   test -x "$(type -p update-profile-cache 2>/dev/null)" ; then
-  update-profile-cache;
-fi;
-
-#DEBHELPER#


=====================================
menus/is-enabled deleted
=====================================
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# Allow it to be enabled using a local file setting
-if [ -e /etc/debian-edu/config ] ; then
-    . /etc/debian-edu/config
-    if [ true = "$MENUREORDER" ] ; then
-        exit 0
-    fi
-fi
-
-# Enable it for all teachers and students if the groups exist
-id -Gn | egrep -qw 'teachers|students'



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/c9ef4bb11c3199a4a9bb25f2159ae46e8c1ebfd6...ed0d150d7dbe3bef93e19a22a1f821a31023cd5f

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/c9ef4bb11c3199a4a9bb25f2159ae46e8c1ebfd6...ed0d150d7dbe3bef93e19a22a1f821a31023cd5f
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20191102/af0577ad/attachment-0001.html>