From 9f09f055fecf367b5ffdc0e099b4759aeb703ad5 Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Wed, 29 May 2019 23:01:41 -0700 Subject: [PATCH 1/6] make-gnome-icon-theme remove uneeded replace --- helpers/make-natron | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 helpers/make-natron diff --git a/helpers/make-natron b/helpers/make-natron new file mode 100644 index 0000000..177efc7 --- /dev/null +++ b/helpers/make-natron @@ -0,0 +1,26 @@ +#!/bin/sh +# +# Copyright (C) 2019 Mason Hock +# +# 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 3 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, see . + +VERSION=1 +EXTERNAL='deb-src http://apt.pop-os.org/proprietary $UPSTREAM main' +REPOKEY=204DD8AEC33A7AFF + +. ./config + +changelog "Import from Pop!_OS" + +compile From 002d8e7da495c7e4a023c03097d327d33ba17815 Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Wed, 29 May 2019 23:02:30 -0700 Subject: [PATCH 2/6] update changed filename --- helpers/make-gnome-tweak-tool | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/make-gnome-tweak-tool b/helpers/make-gnome-tweak-tool index b20f601..9785d3e 100644 --- a/helpers/make-gnome-tweak-tool +++ b/helpers/make-gnome-tweak-tool @@ -21,7 +21,7 @@ VERSION=1 . ./config sed '/ShellShowsAppMenu/s/True/False/' -i ./gtweak/utils.py -sed '/ApplicationMenuTweak()/d' -i gtweak/tweaks/tweak_group_shell.py +sed '/ApplicationMenuTweak()/d' -i gtweak/tweaks/tweak_group_top_bar.py changelog "Disable ShellShowsAppMenu" compile From 7941c81f96531d89b4b8cf9af0ff40814c4a68af Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Thu, 30 May 2019 18:40:48 -0700 Subject: [PATCH 3/6] no longer needed for emacs25 --- helpers/make-emacs24-non-dfsg | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 helpers/make-emacs24-non-dfsg diff --git a/helpers/make-emacs24-non-dfsg b/helpers/make-emacs24-non-dfsg deleted file mode 100644 index 3a1f7c5..0000000 --- a/helpers/make-emacs24-non-dfsg +++ /dev/null @@ -1,32 +0,0 @@ -#!/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=2 -. ./config - -# Note, this doesn't appear to be necessary for emacs25 - -rename 's/$/.dfsg/' etc/* -sed 's/THE-GNU-PROJECT/THE-GNU-PROJECT.dfsg/' -i debian/rules -sed 's/COPYING/COPYING.dfsg/' -i debian/rules -sed 's/24.4/24.5/' -i debian/rules - -changelog "Corrected file paths" -compile - From 45a04269f93ad6a00ce576fb5b014809ca118149 Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Thu, 30 May 2019 18:42:29 -0700 Subject: [PATCH 4/6] no longer exist upstream --- helpers/make-exaile | 60 --------------------------------------------- helpers/make-red5 | 28 --------------------- helpers/make-rekonq | 37 ---------------------------- helpers/make-z88dk | 32 ------------------------ 4 files changed, 157 deletions(-) delete mode 100644 helpers/make-exaile delete mode 100644 helpers/make-red5 delete mode 100644 helpers/make-rekonq delete mode 100644 helpers/make-z88dk diff --git a/helpers/make-exaile b/helpers/make-exaile deleted file mode 100644 index c93a0c6..0000000 --- a/helpers/make-exaile +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2011 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 -FAKEROOT=true - -. ./config - -rm debian/patches/10_defaults.patch -sed /10_defaults.patch/d -i debian/patches/series - -cat << EOF > data/config/settings.ini -[plugins] -enabled = L: ['equalizer', 'lyricsviewer', 'shoutcast', 'lyricwiki', 'cd', 'massstorage', 'notifyosd', 'ipod', 'gnomemmkeys' ] - -[osd] -enabled = B: False -hover_tray = B: False - -[covers] -preferred_order = L: ['local', 'lastfm'] - -[cd_import] -format = S: FLAC - -[gui] -use_tray = B: True -minimize_to_tray = B: True -use_splash = B: False -EOF - -cat << EOF >> data/exaile.desktop -Comment[es]=Escuche, explore o gestione su colección de música -Comment[gl]=Escoite, explore ou xestione a súa colección de música -GenericName[es]=Reproductor de música -GenericName[gl]=Reproductor de música -X-GNOME-FullName[es]=Reproductor de música Exaile -X-GNOME-FullName[gl]=Reproductor de música Exaile -EOF - -changelog "Default settings changed for Trisquel" - -compile - diff --git a/helpers/make-red5 b/helpers/make-red5 deleted file mode 100644 index 3eeab93..0000000 --- a/helpers/make-red5 +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2012 Grant Houlgate -# -# 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 's/Gnash flash client and//g; s/Adobe Flash Player/Gnash flash player/g' debian/control -i - -changelog "Removed references to non-free programs" - -compile diff --git a/helpers/make-rekonq b/helpers/make-rekonq deleted file mode 100644 index abd5f21..0000000 --- a/helpers/make-rekonq +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2011 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=3 -QUILT=skip -COMPONENT=main - -. ./config - -#%FSDG: Remove method to install non-free plugins -rm debian/patches/kubuntu_restricted_install.diff -sed /kubuntu_restricted_install.diff/d debian/patches/series -i - -cp $DATA/patches/kubuntu_default_homepages.diff debian/patches/ - -export QUILT_PATCHES=debian/patches -quilt push -a - -changelog "Compiled for Trisquel" - -compile diff --git a/helpers/make-z88dk b/helpers/make-z88dk deleted file mode 100644 index bf4ca22..0000000 --- a/helpers/make-z88dk +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2015 Legimet -# -# 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 - -# The test suite uses files with a noncommercial restriction, and a keyboard -# driver from ozcustomisr.asm also has one, but these files are unrequired -# See http://www.z88dk.org/forum/viewtopic.php?pid=8504 -rm -rf test libsrc/oz/ozinterrupt/ozcustomisr.asm - -changelog "Remove unrequired nonfree files" - -compile - From 5dcedc2f34ecabc963073f10ff37b84aeaa01768 Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Thu, 30 May 2019 20:11:28 -0700 Subject: [PATCH 5/6] use disco instead of unmaintained ppa --- helpers/{make-filteraudio => make-libtoxcore} | 6 ++--- helpers/make-qtox | 6 ++--- helpers/make-toxcore | 26 ------------------- helpers/make-toxic | 26 ------------------- helpers/make-utox | 6 ++--- 5 files changed, 9 insertions(+), 61 deletions(-) rename helpers/{make-filteraudio => make-libtoxcore} (83%) delete mode 100644 helpers/make-toxcore delete mode 100644 helpers/make-toxic diff --git a/helpers/make-filteraudio b/helpers/make-libtoxcore similarity index 83% rename from helpers/make-filteraudio rename to helpers/make-libtoxcore index 6e88ad2..b1fd0e2 100644 --- a/helpers/make-filteraudio +++ b/helpers/make-libtoxcore @@ -16,11 +16,11 @@ # along with this program. If not, see . VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/i2p.packages/i2p/ubuntu $UPSTREAM main' -REPOKEY=D1386E5F3FC3365C +EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu disco main universe' +REPOKEY=7638D0442B90D010 . ./config -changelog "Bring Tox to Trisquel from PPA" +changelog "Bring Tox to Trisquel from disco" compile diff --git a/helpers/make-qtox b/helpers/make-qtox index 6e88ad2..b1fd0e2 100644 --- a/helpers/make-qtox +++ b/helpers/make-qtox @@ -16,11 +16,11 @@ # along with this program. If not, see . VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/i2p.packages/i2p/ubuntu $UPSTREAM main' -REPOKEY=D1386E5F3FC3365C +EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu disco main universe' +REPOKEY=7638D0442B90D010 . ./config -changelog "Bring Tox to Trisquel from PPA" +changelog "Bring Tox to Trisquel from disco" compile diff --git a/helpers/make-toxcore b/helpers/make-toxcore deleted file mode 100644 index 646ac85..0000000 --- a/helpers/make-toxcore +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2015 fr33domlover -# -# 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 3 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, see . - -VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/i2p.packages/i2p/ubuntu $UPSTREAM main' -REPOKEY="D1386E5F3FC3365C" - -. ./config - -changelog "Bring Tox to Trisquel from PPA" - -compile diff --git a/helpers/make-toxic b/helpers/make-toxic deleted file mode 100644 index 646ac85..0000000 --- a/helpers/make-toxic +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2015 fr33domlover -# -# 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 3 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, see . - -VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/i2p.packages/i2p/ubuntu $UPSTREAM main' -REPOKEY="D1386E5F3FC3365C" - -. ./config - -changelog "Bring Tox to Trisquel from PPA" - -compile diff --git a/helpers/make-utox b/helpers/make-utox index 646ac85..b1fd0e2 100644 --- a/helpers/make-utox +++ b/helpers/make-utox @@ -16,11 +16,11 @@ # along with this program. If not, see . VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/i2p.packages/i2p/ubuntu $UPSTREAM main' -REPOKEY="D1386E5F3FC3365C" +EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu disco main universe' +REPOKEY=7638D0442B90D010 . ./config -changelog "Bring Tox to Trisquel from PPA" +changelog "Bring Tox to Trisquel from disco" compile From 1614ee2dffab391c5aabf06a53f9c783c9a84442 Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Fri, 31 May 2019 10:39:25 -0700 Subject: [PATCH 6/6] Revert "use disco instead of unmaintained ppa" This reverts commit 5dcedc2f34ecabc963073f10ff37b84aeaa01768. --- helpers/{make-libtoxcore => make-filteraudio} | 6 ++--- helpers/make-qtox | 6 ++--- helpers/make-toxcore | 26 +++++++++++++++++++ helpers/make-toxic | 26 +++++++++++++++++++ helpers/make-utox | 6 ++--- 5 files changed, 61 insertions(+), 9 deletions(-) rename helpers/{make-libtoxcore => make-filteraudio} (83%) create mode 100644 helpers/make-toxcore create mode 100644 helpers/make-toxic diff --git a/helpers/make-libtoxcore b/helpers/make-filteraudio similarity index 83% rename from helpers/make-libtoxcore rename to helpers/make-filteraudio index b1fd0e2..6e88ad2 100644 --- a/helpers/make-libtoxcore +++ b/helpers/make-filteraudio @@ -16,11 +16,11 @@ # along with this program. If not, see . VERSION=1 -EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu disco main universe' -REPOKEY=7638D0442B90D010 +EXTERNAL='deb-src http://ppa.launchpad.net/i2p.packages/i2p/ubuntu $UPSTREAM main' +REPOKEY=D1386E5F3FC3365C . ./config -changelog "Bring Tox to Trisquel from disco" +changelog "Bring Tox to Trisquel from PPA" compile diff --git a/helpers/make-qtox b/helpers/make-qtox index b1fd0e2..6e88ad2 100644 --- a/helpers/make-qtox +++ b/helpers/make-qtox @@ -16,11 +16,11 @@ # along with this program. If not, see . VERSION=1 -EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu disco main universe' -REPOKEY=7638D0442B90D010 +EXTERNAL='deb-src http://ppa.launchpad.net/i2p.packages/i2p/ubuntu $UPSTREAM main' +REPOKEY=D1386E5F3FC3365C . ./config -changelog "Bring Tox to Trisquel from disco" +changelog "Bring Tox to Trisquel from PPA" compile diff --git a/helpers/make-toxcore b/helpers/make-toxcore new file mode 100644 index 0000000..646ac85 --- /dev/null +++ b/helpers/make-toxcore @@ -0,0 +1,26 @@ +#!/bin/sh +# +# Copyright (C) 2015 fr33domlover +# +# 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 3 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, see . + +VERSION=1 +EXTERNAL='deb-src http://ppa.launchpad.net/i2p.packages/i2p/ubuntu $UPSTREAM main' +REPOKEY="D1386E5F3FC3365C" + +. ./config + +changelog "Bring Tox to Trisquel from PPA" + +compile diff --git a/helpers/make-toxic b/helpers/make-toxic new file mode 100644 index 0000000..646ac85 --- /dev/null +++ b/helpers/make-toxic @@ -0,0 +1,26 @@ +#!/bin/sh +# +# Copyright (C) 2015 fr33domlover +# +# 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 3 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, see . + +VERSION=1 +EXTERNAL='deb-src http://ppa.launchpad.net/i2p.packages/i2p/ubuntu $UPSTREAM main' +REPOKEY="D1386E5F3FC3365C" + +. ./config + +changelog "Bring Tox to Trisquel from PPA" + +compile diff --git a/helpers/make-utox b/helpers/make-utox index b1fd0e2..646ac85 100644 --- a/helpers/make-utox +++ b/helpers/make-utox @@ -16,11 +16,11 @@ # along with this program. If not, see . VERSION=1 -EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu disco main universe' -REPOKEY=7638D0442B90D010 +EXTERNAL='deb-src http://ppa.launchpad.net/i2p.packages/i2p/ubuntu $UPSTREAM main' +REPOKEY="D1386E5F3FC3365C" . ./config -changelog "Bring Tox to Trisquel from disco" +changelog "Bring Tox to Trisquel from PPA" compile