From b452a7281a80a18c8d9f1743be1d96de9c2745eb Mon Sep 17 00:00:00 2001
From: Ruben Rodriguez <ruben@trisquel.info>
Date: Fri, 24 Jun 2016 12:36:26 -0400
Subject: [PATCH] Simplified make-plymouth

---
 helpers/make-plymouth | 45 ++++++-------------------------------------
 1 file changed, 6 insertions(+), 39 deletions(-)

diff --git a/helpers/make-plymouth b/helpers/make-plymouth
index c87ab9d6..7e042036 100644
--- a/helpers/make-plymouth
+++ b/helpers/make-plymouth
@@ -1,6 +1,6 @@
 #/bin/sh
 #
-#    Copyright (C) 2008-2010  Rubén Rodríguez <ruben@trisquel.info>
+#    Copyright (C) 2008-2016  Rubén Rodríguez <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
@@ -17,32 +17,23 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=6
+VERSION=1
 QUILT=skip
 . ./config
 
-rm ./debian/patches/ubuntu-logo-scale-factor-2.patch
-sed '/ubuntu-logo-scale-factor/d' -i debian/patches/series
-
 export QUILT_PATCHES=debian/patches
 quilt push -a
 
 cp $DATA/plymouth-theme-trisquel-logo* debian
 
-sed 's/a corporate-looking/an illustration/' debian/control -i
-sed 's/pie chart for boot.*/made by Dongyun Lee for the Sugar project/' debian/control -i
-sed 's/ttf-ubuntu-font-family,//' -i debian/control
+sed '/ttf-ubuntu-font-family/d' -i debian/control
 
 cat << EOF >> debian/copyright
 
 == Additions made by Trisquel ==
 
 themes/script/taranis.png Copyright (C) 2010 Rubén Rodríguez, GPL-3 license
-themes/glow/sugar.png Copyright (C) 2008 Dongyun Lee CC Attribution 3.0 Unported license
 themes/script/trisquel_logo16.png Copyright (C) 2004-2011 Rubén Rodríguez, GPL-3 license
-themes/glow/trisquel_logo16.png Copyright (C) 2004-2011 Rubén Rodríguez, GPL-3 license
-themes/glow/trisquel_logo-sugar.png Copyright (C) 2004-2011 Rubén Rodríguez, GPL-3 license
-
 EOF
 
 find -type d |xargs rename s/kubuntu/trisquel-mini/g
@@ -74,15 +65,13 @@ cp $DATA/script.script themes/script/script.script
 
 cat << EOF > debian/source/include-binaries
 themes/script/background.png
-themes/glow/sugar.png
 themes/script/trisquel_logo16.png
-themes/glow/trisquel_logo16.png
-themes/glow/trisquel_logo-sugar.png
 EOF
 
-rm themes/trisquel-logo themes/glow -rf
+rm themes/trisquel-logo -rf
 cp themes/script -a themes/trisquel-logo
-cp $DATA/background.png $DATA/trisquel_logo16.png themes/trisquel-logo/
+cp $DATA/background.png themes/trisquel-logo/
+cp $DATA/trisquel_logo16.png themes/trisquel-logo/trisquel-logo.png
 sed -i 's/progress_bar.png/progress_bar.png\\\n\t\tbackground.png\\\n\t\ttrisquel_logo16.png/' themes/trisquel-logo/Makefile*
 sed s:/script:/trisquel-logo:g -i themes/trisquel-logo/script.plymouth.in
 sed 's:=Script:=Trisquel-logo:g' -i themes/trisquel-logo/script.plymouth.in
@@ -92,29 +81,7 @@ sed 's/rtoken/script/g' -i themes/trisquel-logo/Make*
 rename s/script.script/trisquel-logo.script/g themes/trisquel-logo/*
 rename s/script.plymouth.in/trisquel-logo.plymouth.in/g themes/trisquel-logo/*
 
-cp themes/script -a themes/glow
-sed s:/script:/glow:g -i themes/glow/script.plymouth.in
-sed 's:=Script:=Glow:g' -i themes/glow/script.plymouth.in
-sed 's/script\.script/glow\.rtoken/g' -i themes/glow/Make*
-sed 's/script/glow/g' -i themes/glow/Make*
-sed 's/rtoken/script/g' -i themes/glow/Make*
-cp $DATA/sugar.png $DATA/trisquel_logo16.png $DATA/trisquel_logo-sugar.png themes/glow/
-/bin/sed -i s/background/sugar/g themes/glow/*
-sed -i 's_special://logo_trisquel\_logo-sugar.png_g; s/0.3/0.8/' themes/glow/*.script
-rename s/script.script/glow.script/g themes/glow/*
-rename s/script.plymouth.in/glow.plymouth.in/g themes/glow/*
-sed -i 's/progress_bar.png/progress_bar.png\\\n\t\tsugar.png\\\n\t\ttrisquel_logo16.png\\\n\t\ttrisquel_logo-sugar.png/' themes/glow/Makefile*
-
-find -type d |xargs rename s/glow/sugar/g
-find -type f |xargs rename s/glow/sugar/g
-
-replace glow sugar .
-replace Glow Sugar .
-
-sed -i /two-step/d debian/plymouth-theme-sugar.install
 sed s/Ubuntu/Trisquel/ -i debian/plymouth-theme-trisquel-text.postinst
-#sed '/trisquel-logo/d; /trisquel-text/d; /trisquel-mini-text/d' -i debian/patches/series
-#rm themes/trisquel*/Makefile.in
 
 changelog "Plymouth themes modified for Trisquel"
 
-- 
GitLab