[debian-edu-commits] [Git][debian-edu/debian-edu-artwork][master] 4 commits: Drop Mate desktop environment and Gdm login configuration

Wolfgang Schweer gitlab at salsa.debian.org
Tue Nov 24 16:12:53 GMT 2020



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


Commits:
b812757a by Wolfgang Schweer at 2020-11-24T16:37:03+01:00
Drop Mate desktop environment and Gdm login configuration

These non-artwork items moved to d-e-config as a better suited place.

Adjust configure.ac, debian/debian-edu-artwork.install and Makefile.am files.

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

- - - - -
7bd6fc35 by Wolfgang Schweer at 2020-11-24T17:04:08+01:00
Drop debian/debian-edu-artwork{-buster,-softlines}.lintian-overrides files

These are no longer needed / now unknown to Lintian because a NEWS file exists.
(Making an upstream changelog file superfluous.)

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

- - - - -
cb3f8e28 by Wolfgang Schweer at 2020-11-24T17:06:19+01:00
d/control: Use https://blends.debian.org/edu as homepage

https://wiki.debian.org/DebianEdu/Teams/ArtWork is totally outdated and will be
marked as such.

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

- - - - -
f718efad by Wolfgang Schweer at 2020-11-24T17:11:27+01:00
Add changelog entries for last commits

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

- - - - -


14 changed files:

- art-common/Makefile.am
- − art-common/gdm-theme/20_debian-edu+gdm.gschema.override
- art-common/gdm-theme/Makefile.am
- − art-common/mate/30_debian-edu+mate.gschema.override
- − art-common/mate/Makefile.am
- − art-common/mate/debian-edu.arctica-greeter.gschema.override
- − art-common/mate/debian-edu.layout
- configure.ac
- debian/changelog
- debian/control
- − debian/debian-edu-artwork-buster.lintian-overrides
- − debian/debian-edu-artwork-softwaves.lintian-overrides
- debian/debian-edu-artwork.install
- − debian/debian-edu-artwork.lintian-overrides


Changes:

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


=====================================
art-common/gdm-theme/20_debian-edu+gdm.gschema.override deleted
=====================================
@@ -1,4 +0,0 @@
-[org.gnome.login-screen]
-
-# - Disable user list
-disable-user-list=true


=====================================
art-common/gdm-theme/Makefile.am
=====================================
@@ -1,7 +1,4 @@
 install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(datadir)/glib-2.0/schemas
-	$(INSTALL_DATA) 20_debian-edu+gdm.gschema.override \
-		$(DESTDIR)$(datadir)/glib-2.0/schemas/20_debian-edu+gdm.gschema.override
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/gdm/dconf
 	$(INSTALL_DATA) 95-debian-edu-settings \
 		$(DESTDIR)$(datadir)/gdm/dconf/95-debian-edu-settings


=====================================
art-common/mate/30_debian-edu+mate.gschema.override deleted
=====================================
@@ -1,16 +0,0 @@
-[org.mate.panel]
-default-layout="debian-edu"
-
-[org.mate.caja.preferences]
-always-use-browser=true
-click-policy='single'
-
-[org.mate.interface]
-icon-theme='menta'
-gtk-theme='Menta'
-
-[org.mate.Marco.general]
-theme='Menta'
-
-[org.mate.peripherals-mouse]
-cursor-theme='menta'


=====================================
art-common/mate/Makefile.am deleted
=====================================
@@ -1,10 +0,0 @@
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(datadir)/glib-2.0/schemas
-	$(INSTALL_DATA) 30_debian-edu+mate.gschema.override \
-		$(DESTDIR)$(datadir)/glib-2.0/schemas/30_debian-edu+mate.gschema.override
-	$(INSTALL_DATA) debian-edu.arctica-greeter.gschema.override \
-		$(DESTDIR)$(datadir)/glib-2.0/schemas/debian-edu.arctica-greeter.gschema.override
-
-	$(mkinstalldirs) $(DESTDIR)$(datadir)/mate-panel/layouts/
-	$(INSTALL_DATA) debian-edu.layout \
-		$(DESTDIR)$(datadir)/mate-panel/layouts/debian-edu.layout


=====================================
art-common/mate/debian-edu.arctica-greeter.gschema.override deleted
=====================================
@@ -1,2 +0,0 @@
-[org.ArcticaProject.arctica-greeter]
-logo=''


=====================================
art-common/mate/debian-edu.layout deleted
=====================================
@@ -1,76 +0,0 @@
-[Toplevel bottom]
-expand=true
-orientation=bottom
-size=24
-
-[Object menu]
-object-type=applet
-applet-iid=BriskMenuFactory::BriskMenu
-toplevel-id=bottom
-position=0
-locked=true
-
-[Object shutdown]
-object-type=action
-action-type=shutdown
-toplevel-id=bottom
-position=10
-locked=true
-
-[Object logout]
-object-type=action
-action-type=logout
-toplevel-id=bottom
-position=20
-locked=true
-
-[Object workspace-switcher]
-object-type=applet
-applet-iid=WnckletFactory::WorkspaceSwitcherApplet
-toplevel-id=bottom
-position=30
-locked=true
-
-[Object show-desktop]
-object-type=applet
-applet-iid=WnckletFactory::ShowDesktopApplet
-toplevel-id=bottom
-position=40
-locked=true
-
-[Object web-browser]
-object-type=launcher
-launcher-location=/usr/share/applications/firefox-esr.desktop
-toplevel-id=bottom
-position=50
-locked=true
-
-[Object file-manager]
-object-type=launcher
-launcher-location=/usr/share/applications/caja.desktop
-toplevel-id=bottom
-position=60
-locked=true
-
-[Object window-list]
-object-type=applet
-applet-iid=WnckletFactory::WindowListApplet
-toplevel-id=bottom
-position=70
-locked=true
-
-[Object notification-area]
-object-type=applet
-applet-iid=NotificationAreaAppletFactory::NotificationArea
-toplevel-id=bottom
-position=10
-panel-right-stick=true
-locked=true
-
-[Object clock]
-object-type=applet
-applet-iid=ClockAppletFactory::ClockApplet
-toplevel-id=bottom
-position=0
-panel-right-stick=true
-locked=true


=====================================
configure.ac
=====================================
@@ -26,7 +26,6 @@ AC_PROG_INSTALL
 AC_OUTPUT([
 Makefile
 art-common/Makefile
-art-common/mate/Makefile
 art-common/gdm-theme/Makefile
 art-softwaves/Makefile
 art-softwaves/g-i/Makefile


=====================================
debian/changelog
=====================================
@@ -1,7 +1,18 @@
 debian-edu-artwork (2.11.0.2-3) UNRELEASED; urgency=medium
 
+  [ Holger Levsen ]
   * Update standards version to 4.5.1, no changes needed.
 
+  [ Wolfgang Schweer ]
+  * debian/control: Use https://blends.debian.org/edu as homepage.
+  * Drop both Mate desktop environment and Gdm login configuration from
+    art-common. These non-artwork items moved to d-e-config as a better suited
+    place. Adjust configure.ac, debian/debian-edu-artwork.install and all
+    involved Makefile.am files.
+  * Drop debian/debian-edu-artwork{-buster,-softlines}.lintian-overrides files.
+    These are no longer needed / now unknown to Lintian because a NEWS file
+    exists. (Making an upstream changelog file superfluous.)
+
  -- Holger Levsen <holger at debian.org>  Tue, 17 Nov 2020 13:08:22 +0100
 
 debian-edu-artwork (2.11.0.2-2) unstable; urgency=medium


=====================================
debian/control
=====================================
@@ -18,7 +18,7 @@ Build-Depends: advancecomp,
                symlinks,
 Standards-Version: 4.5.1
 Rules-Requires-Root: no
-Homepage: https://wiki.debian.org/DebianEdu/Teams/ArtWork
+Homepage: https://blends.debian.org/edu
 Vcs-Browser: https://salsa.debian.org/debian-edu/debian-edu-artwork
 Vcs-Git: https://salsa.debian.org/debian-edu/debian-edu-artwork.git
 


=====================================
debian/debian-edu-artwork-buster.lintian-overrides deleted
=====================================
@@ -1 +0,0 @@
-debian-edu-artwork-buster binary: no-upstream-changelog


=====================================
debian/debian-edu-artwork-softwaves.lintian-overrides deleted
=====================================
@@ -1 +0,0 @@
-debian-edu-artwork-softwaves binary: no-upstream-changelog


=====================================
debian/debian-edu-artwork.install
=====================================
@@ -1,4 +1,2 @@
 usr/share/gdm/dconf/
-usr/share/glib-2.0/
-usr/share/mate-panel/
 usr/share/pixmaps/debian-edu-logo.svg


=====================================
debian/debian-edu-artwork.lintian-overrides deleted
=====================================
@@ -1 +0,0 @@
-debian-edu-artwork binary: no-upstream-changelog



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-artwork/-/compare/31fd35524a631e79951886c0ebc5c157872d5e91...f718efad1fe6595c226eff0b3c1ed744fb48452a

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-artwork/-/compare/31fd35524a631e79951886c0ebc5c157872d5e91...f718efad1fe6595c226eff0b3c1ed744fb48452a
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/20201124/ac9869ec/attachment-0001.html>


More information about the debian-edu-commits mailing list