[debian-edu-commits] [Git][debian-edu/debian-edu-artwork][master] 3 commits: Replace non existing .desktop file name in art-common/mate/debian-edu.layout

[WolfgangSchweer]

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


Commits:
c915015a by Wolfgang Schweer at 2018-11-29T14:15:27Z
Replace non existing .desktop file name in art-common/mate/debian-edu.layout

Maybe the debian-edu.layout file should rather be shipped with the 'mate-panel'
package (like all other .layout files).

- - - - -
c1263ed5 by Wolfgang Schweer at 2018-11-29T14:22:53Z
Drop Xfce first-start configuration (basically commit f4bb65d).

It has been moved to the 'debian-edu-config' package because it's not artwork
related.

- - - - -
c40ed380 by Wolfgang Schweer at 2018-11-29T14:31:58Z
Add changelog entries for last commits.

- - - - -


7 changed files:

- art-common/Makefile.am
- art-common/mate/debian-edu.layout
- − art-common/xfce/55xfce4-session-debian-edu
- − art-common/xfce/Makefile.am
- configure.ac
- debian/changelog
- debian/debian-edu-artwork.install


Changes:

=====================================
art-common/Makefile.am
=====================================
@@ -1,4 +1,3 @@
 SUBDIRS = \
 		gdm-theme \
-		mate      \
-		xfce
+		mate


=====================================
art-common/mate/debian-edu.layout
=====================================
@@ -40,7 +40,7 @@ locked=true
 
 [Object web-browser]
 object-type=launcher
-launcher-location=/usr/share/applications/x-www-browser.desktop
+launcher-location=/usr/share/applications/firefox-esr.desktop
 toplevel-id=bottom
 position=50
 locked=true


=====================================
art-common/xfce/55xfce4-session-debian-edu deleted
=====================================
@@ -1,8 +0,0 @@
-case "$BASESTARTUP" in
-  xfce4-session|startxfce4)
-    if [ -z "$XFCE_PANEL_MIGRATE_DEFAULT" ]; then
-      XFCE_PANEL_MIGRATE_DEFAULT=1
-      export XFCE_PANEL_MIGRATE_DEFAULT
-    fi
-    ;;
-esac


=====================================
art-common/xfce/Makefile.am deleted
=====================================
@@ -1,4 +0,0 @@
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/X11/Xsession.d
-	$(INSTALL_DATA) 55xfce4-session-debian-edu \
-		$(DESTDIR)$(sysconfdir)/X11/Xsession.d/55xfce4-session-debian-edu


=====================================
configure.ac
=====================================
@@ -28,7 +28,6 @@ Makefile
 art-common/Makefile
 art-common/mate/Makefile
 art-common/gdm-theme/Makefile
-art-common/xfce/Makefile
 art-lines/Makefile
 art-lines/g-i/Makefile
 art-lines/gnome-shell/Makefile


=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+debian-edu-artwork (2.10.1.0.3-1) UNRELEASED; urgency=medium
+
+  * art-common/mate/debian-edu.layout:
+    - Use firefox-esr.desktop instead of (non exsting) x-www-browser.desktop.
+  * Drop Xfce first-start configuration (moved to d-e-c).
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 29 Nov 2018 15:28:13 +0100
+
 debian-edu-artwork (2.10.1.0.2-1) unstable; urgency=medium
 
   [ Wolfgang Schweer ]


=====================================
debian/debian-edu-artwork.install
=====================================
@@ -1,4 +1,3 @@
-etc/X11/Xsession.d/55xfce4-session-debian-edu
 usr/share/gdm/dconf/
 usr/share/glib-2.0/
 usr/share/mate-panel/



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-artwork/compare/28480bba938e5e0b926a9e6b53fe69a76e934c9d...c40ed380b008980a6d49f0d50fc5654eb5d28bd9

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-artwork/compare/28480bba938e5e0b926a9e6b53fe69a76e934c9d...c40ed380b008980a6d49f0d50fc5654eb5d28bd9
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/20181129/e4cffb50/attachment-0001.html>