Merge branch 'etiona-desktop' into 'etiona'

Etiona MATE desktop

See merge request trisquel/package-helpers!250

helpers/make-indicator-datetime

@@ -0,0 +1,65 @@
+#!/bin/sh
+#
+#    Copyright (C) 2019 Mason Hock <ruben@trisquel.info>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+#
+
+VERSION=1
+
+. ./config
+
+cat << EOF > data/indicator-datetime.desktop.in
+[Desktop Entry]
+Type=Application
+Name=Indicator Date & Time
+Exec=@pkglibexecdir@/indicator-datetime-service
+OnlyShowIn=MATE;
+NoDisplay=true
+StartupNotify=false
+Terminal=false
+Icon=@messaging_menu_icon@
+EOF
+
+cat << EOF >> data/CMakeLists.txt
+
+##
+##  XDG Autostart File
+##
+
+# where to install
+set (XDG_AUTOSTART_DIR "/etc/xdg/autostart")
+message (STATUS "\${XDG_AUTOSTART_DIR} is the DBus Service File install dir")
+
+set (XDG_AUTOSTART_NAME "\${CMAKE_PROJECT_NAME}.desktop")
+set (XDG_AUTOSTART_FILE "\${CMAKE_CURRENT_BINARY_DIR}/\${XDG_AUTOSTART_NAME}")
+set (XDG_AUTOSTART_FILE_IN "\${CMAKE_CURRENT_SOURCE_DIR}/\${XDG_AUTOSTART_NAME}.in")
+
+# build it
+set (pkglibexecdir "\${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
+configure_file ("\${XDG_AUTOSTART_FILE_IN}" "\${XDG_AUTOSTART_FILE}")
+
+# install XDG autostart
+install (FILES "\${XDG_AUTOSTART_FILE}"
+         DESTINATION "\${XDG_AUTOSTART_DIR}")
+EOF
+
+# this shouldn't be needed for Ubuntu 20.04
+sed '/UNITY8,/a\        MATE,' -i include/datetime/actions-live.h
+patch -p0 < $DATA/launch-time-admin-in-mate.patch
+
+changelog "Add MATE compatibility"
+
+compile

helpers/make-mate-panel

@@ -1,6 +1,7 @@
 #!/bin/sh
 #
 #    Copyright (C) 2016-2017  Ruben Rodriguez <ruben@trisquel.info>
+#    Copyright (C)      2017  Mason Hock <mason@masonhock.com>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -17,7 +18,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=5
+VERSION=6
 
 . ./config
 
@@ -26,23 +27,24 @@ sed 's/"tooltip", tooltip,/"tooltip", "Trisquel",/; s/"has-arrow", TRUE,/"has-ar
 
 # Custom layout
 cat << EOF > data/panel-default-layout.layout
-[Toplevel bottom]
+[Toplevel top]
-expand=true
 orientation=bottom
-size=42
+expand=true
+size=44
 
-[Object mate-menu]
+[Object menu]
 locked=true
 position=0
-toplevel-id=bottom
+panel-right-stick=false
+toplevel-id=top
 object-type=menu
 
-
 [Object files]
 locked=true
 position=20
-launcher-location=/usr/share/applications/caja-home.desktop
+launcher-location=caja.desktop
-toplevel-id=bottom
+panel-right-stick=false
+toplevel-id=top
 object-type=launcher
 menu-path=applications:/
 
@@ -50,49 +52,34 @@ menu-path=applications:/
 locked=true
 position=30
 launcher-location=/usr/share/applications/browser.desktop
-toplevel-id=bottom
+panel-right-stick=false
+toplevel-id=top
 object-type=launcher
 menu-path=applications:/
 
-[Object window-list]
+[Object windowlistapplet]
-object-type=applet
+locked=true
-applet-iid=WnckletFactory::WindowListApplet
-toplevel-id=bottom
 position=40
-locked=true
+panel-right-stick=false
-
+toplevel-id=top
-[Object notification-area]
+applet-iid=WnckletFactory::WindowListApplet
 object-type=applet
-applet-iid=NotificationAreaAppletFactory::NotificationArea
-toplevel-id=bottom
-position=30
-panel-right-stick=true
-locked=true
 
 [Object indicatorappletcomplete]
-object-type=applet
+locked=true
-applet-iid=IndicatorAppletCompleteFactory::IndicatorAppletComplete
-toplevel-id=bottom
 position=20
 panel-right-stick=true
-locked=true
+toplevel-id=top
-
+applet-iid=IndicatorAppletCompleteFactory::IndicatorAppletComplete
-[Object clock]
 object-type=applet
-applet-iid=ClockAppletFactory::ClockApplet
-toplevel-id=bottom
-position=10
-panel-right-stick=true
-locked=true
 
 [Object showdesktopapplet]
 locked=true
 position=0
 panel-right-stick=true
-toplevel-id=bottom
+toplevel-id=top
 applet-iid=WnckletFactory::ShowDesktopApplet
 object-type=applet
-
 EOF
 
 cp data/panel-default-layout.layout data/ubuntu.layout

helpers/make-mate-tweak

@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+#    Copyright (C) 2019  Mason Hock <mason@masonhock.com>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+#
+
+VERSION=1
+
+. ./config
+
+sed -i 's/manjaro/trisquel/g' mate-tweak
+sed -i 's/Manjaro/Trisquel/g' mate-tweak
+
+changelog "Add Trisquel as panel layout option"
+
+compile
+

helpers/make-xul-ext-eds-calendar

@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+#    Copyright (C) 2019 Mason Hock <mason@masonhock.com>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+#
+
+VERSION=1
+EXTERNAL='deb-src http://ppa.launchpad.net/mate-ob/eds-calendar/ubuntu bionic main '
+REPOKEY=E99FABBCCA21C62C
+
+. ./config
+
+changelog "Imported from PPA"
+
+compile