[debian-edu-commits] [Git][debian-edu/debian-edu][master] 3 commits: Update menus/applications-merged/video.menu after adding vokoscreenNG

[Wolfgang Schweer]

Wolfgang Schweer pushed to branch master at Debian Edu / debian-edu


Commits:
b117ee87 by Wolfgang Schweer at 2021-01-04T13:21:32+01:00
Update menus/applications-merged/video.menu after adding vokoscreenNG

The vokoscreenNG tool replaces gtk-recordmydesktop, removed some time ago.

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

- - - - -
f283682d by Wolfgang Schweer at 2021-01-04T13:26:15+01:00
Adjust menus/xfce-applications.menu to reflect recent Xfce4 changes.

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

- - - - -
d5683f76 by Wolfgang Schweer at 2021-01-04T13:31:44+01:00
Add changelog entries for last commits

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

- - - - -


3 changed files:

- debian/changelog
- menus/applications-merged/video.menu
- menus/xfce-applications.menu


Changes:

=====================================
debian/changelog
=====================================
@@ -8,6 +8,9 @@ debian-edu (2.11.31) UNRELEASED; urgency=medium
     - Drop ltsp. The debian-edu-pxeinstall tool shipped with d-e-config 2.11.42
       is used to generate the complete iPXE menu.
   * debian/control: Update after running 'make dist'.
+  * menus/applications-merged/video.menu:
+    - Update after adding vokoscreenNG (replacing gtk-recordmydesktop).
+  * menus/xfce-applications.menu: Adjust to reflect recent Xfce4 changes.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Sun, 03 Jan 2021 18:16:34 +0100
 


=====================================
menus/applications-merged/video.menu
=====================================
@@ -8,7 +8,7 @@
           <Name>Video</Name>
           <Directory>Edu-Video.directory</Directory>
             <Include>
-              <Filename>gtk-recordmydesktop.desktop</Filename>
+              <Filename>vokoscreenNG.desktop</Filename>
               <Filename>org.kde.kdenlive.desktop</Filename>
             <And>
               <Category>Video</Category>


=====================================
menus/xfce-applications.menu
=====================================
@@ -6,7 +6,6 @@
 
     <DefaultAppDirs/>
     <DefaultDirectoryDirs/>
-    <DefaultMergeDirs/>
 
     <Include>
         <Category>X-Xfce-Toplevel</Category>
@@ -15,10 +14,10 @@
     <Layout>
         <Filename>xfce4-run.desktop</Filename>
         <Separator/>
-        <Filename>exo-terminal-emulator.desktop</Filename>
-        <Filename>exo-file-manager.desktop</Filename>
-        <Filename>exo-mail-reader.desktop</Filename>
-        <Filename>exo-web-browser.desktop</Filename>
+        <Filename>xfce4-terminal-emulator.desktop</Filename>
+        <Filename>xfce4-file-manager.desktop</Filename>
+        <Filename>xfce4-mail-reader.desktop</Filename>
+        <Filename>xfce4-web-browser.desktop</Filename>
         <Separator/>
         <Menuname>Settings</Menuname>
         <Separator/>
@@ -63,8 +62,8 @@
         </Include>
         <Exclude>
             <Or>
-                <Filename>exo-file-manager.desktop</Filename>
-                <Filename>exo-terminal-emulator.desktop</Filename>
+                <Filename>xfce4-file-manager.desktop</Filename>
+                <Filename>xfce4-terminal-emulator.desktop</Filename>
                 <Filename>xfce4-about.desktop</Filename>
                 <Filename>xfce4-run.desktop</Filename>
             </Or>
@@ -120,8 +119,8 @@
         </Include>
         <Exclude>
             <Or>
-                <Filename>exo-mail-reader.desktop</Filename>
-                <Filename>exo-web-browser.desktop</Filename>
+                <Filename>xfce4-mail-reader.desktop</Filename>
+                <Filename>xfce4-web-browser.desktop</Filename>
             </Or>
         </Exclude>
     </Menu>
@@ -158,5 +157,6 @@
             <All/>
         </Include>
     </Menu>
+    <DefaultMergeDirs/>
 
 </Menu>



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/compare/d1320599b0ad7a62f0f04df681bf68c49fcca077...d5683f76caf6ffe70ed3b48d1a0d824256cf7306

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/compare/d1320599b0ad7a62f0f04df681bf68c49fcca077...d5683f76caf6ffe70ed3b48d1a0d824256cf7306
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/20210104/65af719b/attachment-0001.html>