From 8247587de67198e37ec3a75604de58b7e87e8a2b Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez Date: Sat, 23 Dec 2017 11:34:26 -0500 Subject: [PATCH 1/7] Added make-firmware-linux-free --- helpers/make-firmware-linux-free | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 helpers/make-firmware-linux-free diff --git a/helpers/make-firmware-linux-free b/helpers/make-firmware-linux-free new file mode 100644 index 0000000..7ebc243 --- /dev/null +++ b/helpers/make-firmware-linux-free @@ -0,0 +1,28 @@ +#!/bin/sh +# +# Copyright (C) 2017 Ruben Rodriguez +# +# 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://ftp.us.debian.org/debian testing main' +REPOKEY=7638D0442B90D010 + +. ./config + +changelog "Imported into Trisquel" + +compile From ae508ee34d5b3cef1465d63c351ea97dfbf500b0 Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez Date: Sat, 23 Dec 2017 11:35:50 -0500 Subject: [PATCH 2/7] Renamed make-firmware-free --- helpers/{make-firmware-linux-free => make-firmware-free} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename helpers/{make-firmware-linux-free => make-firmware-free} (100%) diff --git a/helpers/make-firmware-linux-free b/helpers/make-firmware-free similarity index 100% rename from helpers/make-firmware-linux-free rename to helpers/make-firmware-free From a6076fa5e1cbeed58895687dd30a55cb58a93e35 Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez Date: Sat, 23 Dec 2017 12:27:50 -0500 Subject: [PATCH 3/7] make-firmware-free generate md5s --- helpers/make-firmware-free | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/helpers/make-firmware-free b/helpers/make-firmware-free index 7ebc243..b513cc2 100644 --- a/helpers/make-firmware-free +++ b/helpers/make-firmware-free @@ -23,6 +23,10 @@ REPOKEY=7638D0442B90D010 . ./config +sed '/Build-Depends/s/$/, python-configparser/' -i debian/control debian/templates/control.source.in + changelog "Imported into Trisquel" +md5sum debian/bin/gencontrol.py defines linux-free/defines linux-free/LICENSE debian/changelog debian/templates/control.binary.udeb.in debian/templates/control.binary.in debian/templates/control.source.in > debian/control.md5sum + compile From 6f01f511f28ee734f23e2ecfb28290735d4fbeba Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez Date: Sat, 23 Dec 2017 19:59:14 -0500 Subject: [PATCH 4/7] make-plymouth: corrected paths --- .../DATA/plymouth/plymouth-theme-trisquel-logo.postinst | 8 ++++---- helpers/make-plymouth | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/helpers/DATA/plymouth/plymouth-theme-trisquel-logo.postinst b/helpers/DATA/plymouth/plymouth-theme-trisquel-logo.postinst index 0276b59..16fc731 100755 --- a/helpers/DATA/plymouth/plymouth-theme-trisquel-logo.postinst +++ b/helpers/DATA/plymouth/plymouth-theme-trisquel-logo.postinst @@ -19,10 +19,10 @@ case "$1" in configure) update-alternatives \ - --install /lib/plymouth/themes/default.plymouth default.plymouth \ - /lib/plymouth/themes/trisquel-logo/trisquel-logo.plymouth 100 \ - --slave /lib/plymouth/themes/default.grub default.plymouth.grub \ - /lib/plymouth/themes/trisquel-logo/trisquel-logo.grub + --install /usr/share/plymouth/themes/default.plymouth default.plymouth \ + /user/share/plymouth/themes/trisquel-logo/trisquel-logo.plymouth 100 \ + --slave /user/share/plymouth/themes/default.grub default.plymouth.grub \ + /usr/share/plymouth/themes/trisquel-logo/trisquel-logo.grub if which update-initramfs >/dev/null 2>&1 then diff --git a/helpers/make-plymouth b/helpers/make-plymouth index 7e04203..3e65e18 100644 --- a/helpers/make-plymouth +++ b/helpers/make-plymouth @@ -1,6 +1,6 @@ #/bin/sh # -# Copyright (C) 2008-2016 Rubén Rodríguez +# Copyright (C) 2008-2017 Ruben Rodriguez # # 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 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=1 +VERSION=2 QUILT=skip . ./config From 6717a28fc06204df6671420564e048ce6e644d5a Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez Date: Sat, 23 Dec 2017 20:17:04 -0500 Subject: [PATCH 5/7] make-plymouth: corrected typo --- helpers/DATA/plymouth/plymouth-theme-trisquel-logo.postinst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helpers/DATA/plymouth/plymouth-theme-trisquel-logo.postinst b/helpers/DATA/plymouth/plymouth-theme-trisquel-logo.postinst index 16fc731..ab4d233 100755 --- a/helpers/DATA/plymouth/plymouth-theme-trisquel-logo.postinst +++ b/helpers/DATA/plymouth/plymouth-theme-trisquel-logo.postinst @@ -20,8 +20,8 @@ case "$1" in configure) update-alternatives \ --install /usr/share/plymouth/themes/default.plymouth default.plymouth \ - /user/share/plymouth/themes/trisquel-logo/trisquel-logo.plymouth 100 \ - --slave /user/share/plymouth/themes/default.grub default.plymouth.grub \ + /usr/share/plymouth/themes/trisquel-logo/trisquel-logo.plymouth 100 \ + --slave /usr/share/plymouth/themes/default.grub default.plymouth.grub \ /usr/share/plymouth/themes/trisquel-logo/trisquel-logo.grub if which update-initramfs >/dev/null 2>&1 From 040aba4c0102db504757164bf21190c11767a628 Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez Date: Sat, 23 Dec 2017 20:17:24 -0500 Subject: [PATCH 6/7] make-plymouth: corrected typo --- helpers/make-plymouth | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/make-plymouth b/helpers/make-plymouth index 3e65e18..454ea1e 100644 --- a/helpers/make-plymouth +++ b/helpers/make-plymouth @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=2 +VERSION=3 QUILT=skip . ./config From 2167fb2ba96cb40ea24941702386e94038457ddd Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez Date: Sat, 23 Dec 2017 22:30:44 -0500 Subject: [PATCH 7/7] added make-ubuntu-mate-settings --- helpers/make-ubuntu-mate-settings | 86 +++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 helpers/make-ubuntu-mate-settings diff --git a/helpers/make-ubuntu-mate-settings b/helpers/make-ubuntu-mate-settings new file mode 100644 index 0000000..f3b6b9c --- /dev/null +++ b/helpers/make-ubuntu-mate-settings @@ -0,0 +1,86 @@ +#!/bin/sh +# +# Copyright (C) 2017 Ruben Rodriguez +# +# 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 > usr/share/applications/mate-mimeapps.list +[Default Applications] +x-scheme-handler/apt=apturl.desktop; +x-scheme-handler/http=abrowser.desktop; +x-scheme-handler/https=abrowser.desktop; +x-scheme-handler/about=abrowser.desktop; +x-scheme-handler/mailto=thunderbird.desktop; +application/x-deb=gdebi.desktop; +application/x-debian-package=gdebi.desktop; +application/x-extension-eml=thunderbird.desktop; +message/rfc822=thunderbird.desktop; +inode/directory=caja-folder-handler.desktop; +text/plain=pluma.desktop; +audio/mpeg=rhythmbox.desktop; +audio/x-mpegurl=rhythmbox.desktop; +audio/x-scpls=rhythmbox.desktop; +audio/x-vorbis+ogg=rhythmbox.desktop; +audio/x-wav=rhythmbox.desktop; +x-content/audio-cdda=rhythmbox-device.desktop; +x-content/audio-player=rhythmbox-device.desktop; +video/mp4=vlc.desktop; +video/mpeg=vlc.desktop; +video/mp2t=vlc.desktop; +video/msvideo=vlc.desktop; +video/quicktime=vlc.desktop; +video/webm=vlc.desktop; +video/x-avi=vlc.desktop; +video/x-flv=vlc.desktop; +video/x-matroska=vlc.desktop; +video/x-mpeg=vlc.desktop; +video/x-ogm+ogg=vlc.desktop; +x-content/video-bluray=vlc.desktop; +x-content/video-dvd=vlc.desktop; +x-content/video-hddvd=vlc.desktop; +x-content/video-vcd=vlc.desktop; +x-content/video-svcd=vlc.desktop; +application/pdf=atril.desktop; +image/jpeg=viewnior.desktop;gimp.desktop; +image/x-pcx=viewnior.desktop;gimp.desktop; +image/gif=viewnior.desktop;gimp.desktop; +image/png=viewnior.desktop;gimp.desktop; +image/jpg=viewnior.desktop;gimp.desktop; +image/tiff=viewnior.desktop;gimp.desktop; +image/x-portable-bitmap=viewnior.desktop;gimp.desktop; +image/vnd.wap.wbmp=viewnior.desktop; +image/x-xpixmap=viewnior.desktop;gimp.desktop; +image/x-bmp=viewnior.desktop;gimp.desktop; +image/bmp=viewnior.desktop;gimp.desktop; +image/x-icb=viewnior.desktop; +image/x-portable-graymap=viewnior.desktop;gimp.desktop; +image/x-ico=viewnior.desktop;gimp.desktop; +image/x-xbitmap=viewnior.desktop;gimp.desktop; +image/x-portable-pixmap=viewnior.desktop;gimp.desktop; +image/pjpeg=viewnior.desktop;gimp.desktop; +image/x-portable-anymap=viewnior.desktop;gimp.desktop; +image/x-png=viewnior.desktop;gimp.desktop; +image/x-gray=viewnior.desktop;gimp.desktop; +image/svg+xml=viewnior.desktop; +EOF + +changelog "Customized for Trisquel" + +compile