From cf62b0716f2b56da2d8bc9372d87c72218633399 Mon Sep 17 00:00:00 2001 From: David Trudgian Date: Mon, 5 Aug 2019 13:36:39 -0500 Subject: [PATCH 1/7] Remove make-yelp - upstream does not use ubuntu-help --- helpers/make-yelp | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 helpers/make-yelp diff --git a/helpers/make-yelp b/helpers/make-yelp deleted file mode 100644 index 624f22f..0000000 --- a/helpers/make-yelp +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2013 Rubén Rodríguez -# -# 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 -QUILT=skip -COMPONENT=main -. ./config - -rm debian/patches/06_make_ubuntu_docs_default.patch -sed '/make_ubuntu_docs_default/d' -i debian/patches/series - -export QUILT_PATCHES=debian/patches -quilt push -a - -changelog "Revert from using ubuntu-help to default gnome-help" -compile - From ce3ea8cb4bbf165bfaf133b3c9604871ca2226ec Mon Sep 17 00:00:00 2001 From: David Trudgian Date: Mon, 5 Aug 2019 13:34:24 -0500 Subject: [PATCH 2/7] Remove make-vino - upstream no longer uses ubuntu-help --- helpers/make-vino | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 helpers/make-vino diff --git a/helpers/make-vino b/helpers/make-vino deleted file mode 100644 index d0d42f3..0000000 --- a/helpers/make-vino +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2013 Rubén Rodríguez -# -# 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 -QUILT=skip -COMPONENT=main -. ./config - -rm debian/patches/06_use-ubuntu-help.patch -sed '/use-ubuntu-help/d' -i debian/patches/series - -export QUILT_PATCHES=debian/patches -quilt push -a - -changelog "Revert from using ubuntu-help to default gnome-help" -compile - From 5087958510c6ba16f31a07c3d54e87e8e5f0c172 Mon Sep 17 00:00:00 2001 From: David Trudgian Date: Mon, 5 Aug 2019 13:33:11 -0500 Subject: [PATCH 3/7] make-nautilus - 1 ubuntu patch was removed --- helpers/make-nautilus | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helpers/make-nautilus b/helpers/make-nautilus index 2ec9592..93a3cab 100644 --- a/helpers/make-nautilus +++ b/helpers/make-nautilus @@ -17,10 +17,10 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=1 +VERSION=2 . ./config -for patch in 15_use-ubuntu-help.patch 16_unity_new_documents.patch; do +for patch in 16_unity_new_documents.patch; do rm debian/patches/$patch sed "/$patch/d" -i debian/patches/series done From 7a3574c667d0ad042f78de7124e6ac286d5615ef Mon Sep 17 00:00:00 2001 From: David Trudgian Date: Mon, 5 Aug 2019 13:30:28 -0500 Subject: [PATCH 4/7] Remove make-gnome-screenshot - upstream doesn't use ubuntu-help --- helpers/make-gnome-screenshot | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 helpers/make-gnome-screenshot diff --git a/helpers/make-gnome-screenshot b/helpers/make-gnome-screenshot deleted file mode 100644 index ea458e4..0000000 --- a/helpers/make-gnome-screenshot +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2013 Rubén Rodríguez -# -# 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 -QUILT=skip -COMPONENT=main -. ./config - -rm debian/patches/01_use-ubuntu-help.patch -sed '/use-ubuntu-help/d' -i debian/patches/series - -export QUILT_PATCHES=debian/patches -quilt push -a - -changelog "Revert from using ubuntu-help to default gnome-help" -compile - From d2affcbd22c6895f30c4b0a4b3f9ed35577ba166 Mon Sep 17 00:00:00 2001 From: David Trudgian Date: Mon, 5 Aug 2019 13:25:53 -0500 Subject: [PATCH 5/7] gnome-icon-theme upstream doesn't have ubuntu content now --- helpers/make-gnome-icon-theme | 40 ----------------------------------- 1 file changed, 40 deletions(-) delete mode 100644 helpers/make-gnome-icon-theme diff --git a/helpers/make-gnome-icon-theme b/helpers/make-gnome-icon-theme deleted file mode 100644 index 8ba55ee..0000000 --- a/helpers/make-gnome-icon-theme +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2008-2016 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 - -cp $DATA/trisquel48.svg ./debian/ubuntu-icons/scalable/places/ubuntu-logo.svg -cp $DATA/trisquel32.png ./debian/ubuntu-icons/32x32/places/ubuntu-logo.png -cp $DATA/trisquel24.png ./debian/ubuntu-icons/24x24/places/ubuntu-logo.png -cp $DATA/trisquel22.png ./debian/ubuntu-icons/22x22/places/ubuntu-logo.png -cp $DATA/trisquel16.png ./debian/ubuntu-icons/16x16/places/ubuntu-logo.png - -rm -rf debian/ubuntu-icons/*/mimetypes - -find | grep ubuntu-logo | xargs rename s/ubuntu-logo/trisquel-logo/ -replace ubuntu-logo trisquel-logo debian -replace ubuntu-icons trisquel-icons debian -mv debian/ubuntu-icons debian/trisquel-icons - -changelog "Rebranded for Trisquel" - -compile - From 549f550f7cabf72f98b9ed9e8614a13d4c33bda5 Mon Sep 17 00:00:00 2001 From: David Trudgian Date: Mon, 5 Aug 2019 13:18:36 -0500 Subject: [PATCH 6/7] Remove gnome-desktop - see vanilla-gnome-desktop --- helpers/make-gnome-desktop | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 helpers/make-gnome-desktop diff --git a/helpers/make-gnome-desktop b/helpers/make-gnome-desktop deleted file mode 100644 index 434a37b..0000000 --- a/helpers/make-gnome-desktop +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2008-2010 Rubén Rodríguez -# -# 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 -COMPONENT=main - -. ./config - -sed -i '/LDFLAGS/ s/$/\nCFLAGS += -lm/' debian/rules -sed -i "s/Ubuntu/Trisquel/g" debian/rules - -changelog "Compiled for Trisquel" - -compile - From 7c89020163eb9a9a8b17e42746e67bccfa192424 Mon Sep 17 00:00:00 2001 From: David Trudgian Date: Mon, 5 Aug 2019 13:16:55 -0500 Subject: [PATCH 7/7] Remove virtualbox which is strictly non-free --- helpers/make-virtualbox | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100644 helpers/make-virtualbox diff --git a/helpers/make-virtualbox b/helpers/make-virtualbox deleted file mode 100644 index 11846be..0000000 --- a/helpers/make-virtualbox +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2012 Santiago Rodríguez -# -# 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 - -#% FREEDOM: Remove menu for non-free drivers -#% CurrentBehaviour: There is a menu option to install non-free drivers (called Guest Additions) -#% ExpectedBehaviour: There is no "Install Guest Additions" menu option -#% Closes: http://trisquel.info/es/issues/4456 - -FILE=src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp -LINENUM=`grep -n 'Simple_InstallGuestTools' $FILE | cut -d\: -f1` - -sed -i "$(($LINENUM-1))","$LINENUM"d $FILE - -changelog "Removed menu for non-free drivers" - -compile -