diff --git a/helpers/DATA/rekonq/patches/kubuntu_04_no_default_bookmarks.diff b/helpers/DATA/rekonq/patches/kubuntu_04_no_default_bookmarks.diff deleted file mode 100644 index dc5bae1..0000000 --- a/helpers/DATA/rekonq/patches/kubuntu_04_no_default_bookmarks.diff +++ /dev/null @@ -1,27 +0,0 @@ -Index: rekonq-0.6.80/src/data/defaultbookmarks.xbel -=================================================================== ---- rekonq-0.6.80.orig/src/data/defaultbookmarks.xbel 2011-02-08 17:12:18.000000000 +0000 -+++ rekonq-0.6.80/src/data/defaultbookmarks.xbel 2011-02-09 12:08:31.830984778 +0000 -@@ -1,22 +1,4 @@ - - - -- -- Qt site -- -- -- WebKit.org -- -- -- rekonq site -- -- -- Qt Labs -- -- -- KDE-Apps.org -- -- -- KDE site -- - diff --git a/helpers/DATA/rekonq/patches/kubuntu_05_default_homepages.diff b/helpers/DATA/rekonq/patches/kubuntu_05_default_homepages.diff deleted file mode 100644 index e6d1eea..0000000 --- a/helpers/DATA/rekonq/patches/kubuntu_05_default_homepages.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: rekonq-0.6.80/src/rekonq.kcfg -=================================================================== ---- rekonq-0.6.80.orig/src/rekonq.kcfg 2011-02-08 17:12:18.000000000 +0000 -+++ rekonq-0.6.80/src/rekonq.kcfg 2011-02-09 12:11:25.094984734 +0000 -@@ -59,7 +59,7 @@ - 0 - - -- http://www.kde.org/ -+ http://trisquel.info/ - - - false diff --git a/helpers/DATA/rekonq/patches/kubuntu_07_initial_preference.diff b/helpers/DATA/rekonq/patches/kubuntu_07_initial_preference.diff deleted file mode 100644 index bc86ca6..0000000 --- a/helpers/DATA/rekonq/patches/kubuntu_07_initial_preference.diff +++ /dev/null @@ -1,10 +0,0 @@ -Index: rekonq-0.6.95+git20110331/src/data/rekonq.desktop -=================================================================== ---- rekonq-0.6.95+git20110331.orig/src/data/rekonq.desktop 2011-03-31 17:08:13.913727631 +0100 -+++ rekonq-0.6.95+git20110331/src/data/rekonq.desktop 2011-03-31 17:08:18.333727630 +0100 -@@ -83,4 +83,4 @@ - MimeType=text/html;application/xhtml+xml;application/xml; - X-DBUS-StartupType=Unique - X-DBUS-ServiceName=org.kde.rekonq -- -+InitialPreference=10 diff --git a/helpers/DATA/rekonq/patches/kubuntu_default_homepages.diff b/helpers/DATA/rekonq/patches/kubuntu_default_homepages.diff new file mode 100644 index 0000000..f62fdc7 --- /dev/null +++ b/helpers/DATA/rekonq/patches/kubuntu_default_homepages.diff @@ -0,0 +1,26 @@ +Index: b/src/rekonq.kcfg +=================================================================== +--- a/src/rekonq.kcfg ++++ b/src/rekonq.kcfg +@@ -72,10 +72,10 @@ + + + +- KDE Homepage,rekonq site ++ DuckDuckGO, Trisquel forum, Donate, Store + + +- http://www.kde.org/,http://rekonq.kde.org/ ++ https://duckduckgo.com/?t=trisquel, https://trisquel.info/forum/, https://trisquel.info/donate/, http://store.trisquel.info/ + + + +@@ -86,7 +86,7 @@ + 1 + + +- http://www.kde.org/ ++ https://duckduckgo.com/?t=trisquel + + + KUrl(KGlobalSettings::downloadPath()) diff --git a/helpers/DATA/rekonq/patches/series b/helpers/DATA/rekonq/patches/series deleted file mode 100644 index 2e5549d..0000000 --- a/helpers/DATA/rekonq/patches/series +++ /dev/null @@ -1,3 +0,0 @@ -kubuntu_04_no_default_bookmarks.diff -kubuntu_05_default_homepages.diff -kubuntu_07_initial_preference.diff diff --git a/helpers/make-kdenetwork b/helpers/make-kdenetwork deleted file mode 100644 index a97865c..0000000 --- a/helpers/make-kdenetwork +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2011 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 -COMPONENT=main -. ./config - -sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' kopete/protocols/CMakeLists.txt - -sed -i '/skype/d; /callto/d; /tel.protocol/d' debian/kopete.install -rm -rf kopete/protocols/skype -sed 's/, Skype//' -i ./doc/kopete/index.docbook -#rm debian/patches/no_home_set.diff -#sed /no_home_set/d debian/patches/series -i - -changelog "Compiled for Trisquel" - -compile - diff --git a/helpers/make-rekonq b/helpers/make-rekonq index 4f11797..36ae65b 100644 --- a/helpers/make-rekonq +++ b/helpers/make-rekonq @@ -17,26 +17,23 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=1 +VERSION=3 +QUILT=skip +COMPONENT=main . ./config #%FSDG: Remove method to install non-free plugins -#rm debian/patches/kubuntu_06_restricted_install.diff -#sed /kubuntu_06_restricted_install.diff/d debian/patches/series -i +rm debian/patches/kubuntu_restricted_install.diff +sed /kubuntu_restricted_install.diff/d debian/patches/series -i -#sed ' -#s/www.google.com,/duckduckgo.com,/; s/Google/Duck Duck Go/; -#s/userbase.kde.org/trisquel.info/; s/UserBase/Trisquel/; -#s/www.kubuntuforums.net/store.trisquel.info/; s/Kubuntu Forums/Store/; -#s:www.kubuntu.org:trisquel.info/donate/:; s/Kubuntu/Donate/; -# -#s/www.google.com/trisquel.info/; -#' debian/patches/kubuntu_05_default_homepages.diff -i +cp $DATA/patches/kubuntu_default_homepages.diff debian/patches/ -cp $DATA/patches debian -a +export QUILT_PATCHES=debian/patches +quilt push -a + +bash changelog "Compiled for Trisquel" compile -