Sat Jun 16 03:18:21 UTC 2012

2 files changed, 65 insertions, 41 deletions

diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index a2e3ed362..516695d75 100644
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=${_debname}
 pkgname=${_debname}-libre
 pkgver=${_debver}.${_debrel}
-pkgrel=1
+pkgrel=2
 pkgdesc="A libre version of Debian Iceape, the Internet Suite based on Mozilla Seamonkey."
 arch=('i586' 'i686' 'x86_64' 'mips64el')
 license=('GPL2' 'MPL' 'LGPL')
@@ -35,7 +35,7 @@ md5sums=('7a6e671485a75cd9495f346e0f8e4dcb'
          '7266333e31731af8bb50c2eca8d0bd26'
          '25b6fe16ac24cd5c852213e5c1adb272'
          'c395d443a8c4c16880c7322bcf174743'
-         '79f99d8cda03dbcc1e88ef96776f591a')
+         '251eec11c09b0003a4717f54e86703e7')
 
 build() {
   export QUILT_PATCHES=debian/patches
diff --git a/libre/iceape-libre/libre.patch b/libre/iceape-libre/libre.patch
index fef11cbad..fbb2de1fb 100644
--- a/libre/iceape-libre/libre.patch
+++ b/libre/iceape-libre/libre.patch
@@ -1,15 +1,17 @@
 --- comm-release.orig/mozilla/browser/locales/en-US/chrome/browser-region/region.properties	2012-02-16 12:08:39.000000000 -0200
-+++ comm-release/mozilla/browser/locales/en-US/chrome/browser-region/region.properties	2012-05-12 05:03:27.306166002 -0300
-@@ -1,45 +1,23 @@
++++ comm-release/mozilla/browser/locales/en-US/chrome/browser-region/region.properties	2012-06-15 23:23:02.484406177 -0300
+@@ -1,23 +1,23 @@
  # Default search engine
 -browser.search.defaultenginename=Google
-+browser.search.defaultenginename=DuckDuckGo
++browser.search.defaultenginename=Duck Duck Go (Lite)
  
  # Search engine order (order displayed in the search bar dropdown)s
 -browser.search.order.1=Google
 -browser.search.order.2=Yahoo
 -browser.search.order.3=Bing
-+browser.search.order.1=DuckDuckGo
++browser.search.order.1=Duck Duck Go (Lite)
++browser.search.order.2=Seeks Search
++browser.search.order.3=YaCy
  
  # This is the default set of web based feed handlers shown in the reader
  # selection UI
@@ -17,41 +19,50 @@
 -browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s
 -browser.contentHandlers.types.1.title=My Yahoo!
 -browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
-+browser.contentHandlers.types.0.title=DuckDuckGo
-+browser.contentHandlers.types.0.uri=https://duckduckgo.com/search_box.html
++browser.contentHandlers.types.0.title=
++browser.contentHandlers.types.0.uri=about:blank
++browser.contentHandlers.types.1.title=
++browser.contentHandlers.types.1.uri=about:blank
  
  # URL for site-specific search engines
  # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
  # to be searched and the user's search query. Place them in the appropriate location
  # for your locale's URL but do not translate them.
 -browser.search.siteSearchURL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
-+browser.search.siteSearchURL=http://duckduckgo.com/?q=site%3A{moz:domain}+{searchTerms}
++browser.search.siteSearchURL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms}
  
  # increment this number when anything gets changed in the list below.  This will
  # cause Firefox to re-read these prefs and inject any new handlers into the 
- # profile database.  Note that "new" is defined as "has a different URL"; this
- # means that it's not possible to update the name of existing handler, so 
- # don't make any spelling errors here.
--gecko.handlerService.defaultHandlersVersion=3
--
--# The default set of protocol handlers for webcal:
+@@ -27,19 +27,19 @@
+ gecko.handlerService.defaultHandlersVersion=3
+ 
+ # The default set of protocol handlers for webcal:
 -gecko.handlerService.schemes.webcal.0.name=30 Boxes
 -gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
--
--# The default set of protocol handlers for mailto:
++gecko.handlerService.schemes.webcal.0.name=
++gecko.handlerService.schemes.webcal.0.uriTemplate=about:blank
+ 
+ # The default set of protocol handlers for mailto:
 -gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
 -gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s 
 -gecko.handlerService.schemes.mailto.1.name=Gmail
 -gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
--
--# The default set of protocol handlers for irc:
++gecko.handlerService.schemes.mailto.0.name=
++gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank
++gecko.handlerService.schemes.mailto.1.name=
++gecko.handlerService.schemes.mailto.1.uriTemplate=about:blank
+ 
+ # The default set of protocol handlers for irc:
 -gecko.handlerService.schemes.irc.0.name=Mibbit
 -gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s
--
--# The default set of protocol handlers for ircs:
++gecko.handlerService.schemes.irc.0.name=Freenode
++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/
+ 
+ # The default set of protocol handlers for ircs:
 -gecko.handlerService.schemes.ircs.0.name=Mibbit
 -gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
-+gecko.handlerService.defaultHandlersVersion=0
++gecko.handlerService.schemes.ircs.0.name=Freenode
++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/
 --- comm-release.orig/mozilla/modules/libpref/src/init/all.js	2012-03-16 04:46:09.000000000 -0300
 +++ comm-release/mozilla/modules/libpref/src/init/all.js	2012-05-12 04:03:52.163831535 -0300
 @@ -47,7 +47,7 @@
@@ -59,7 +70,7 @@
  //  The first character after a period must be alphabetic.
  
 -pref("keyword.URL", "http://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
-+pref("keyword.URL", "http://duckduckgo.com/?q=");
++pref("keyword.URL", "https://duckduckgo.com/lite/?q=");
  pref("keyword.enabled", false);
  pref("general.useragent.locale", "chrome://global/locale/intl.properties");
  pref("general.useragent.compatMode.firefox", false);
@@ -108,17 +119,27 @@
  
  </wizard>
 --- comm-release.orig/suite/locales/en-US/chrome/browser/region.properties	2012-02-16 11:59:54.000000000 -0200
-+++ comm-release/suite/locales/en-US/chrome/browser/region.properties	2012-05-12 04:10:18.982249044 -0300
-@@ -4,7 +4,7 @@
++++ comm-release/suite/locales/en-US/chrome/browser/region.properties	2012-06-15 23:39:17.111174410 -0300
+@@ -2,20 +2,20 @@
+ #
+ # all.js
  #
- browser.startup.homepage=about:
- browser.throbber.url=about:
+-browser.startup.homepage=http://www.seamonkey-project.org/start/
+-browser.throbber.url=http://www.seamonkey-project.org/
 -browser.search.defaulturl=http://www.google.com/search?q=
-+browser.search.defaulturl=http://duckduckgo.com/?q=
++browser.startup.homepage=about:blank
++browser.throbber.url=about:blank
++browser.search.defaulturl=https://duckduckgo.com/lite/?q=
  
- browser.translation.service=http://translate.google.com/translate?prev=/language_tools&u=
- browser.translation.serviceDomain=translate.google.com
-@@ -15,7 +15,5 @@
+-browser.translation.service=http://translate.google.com/translate?prev=/language_tools&u=
+-browser.translation.serviceDomain=translate.google.com
++browser.translation.service=about:blank
++browser.translation.serviceDomain=
+ 
+ #config.js
+ #
+-startup.homepage_override_url=http://www.seamonkey-project.org/releases/seamonkey%VERSION%/
++startup.homepage_override_url=about:blank
  
  # This is the default set of web based feed handlers shown in the reader
  # selection UI
@@ -126,24 +147,27 @@
 -browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s
 -browser.contentHandlers.types.1.title=My Yahoo!
 -browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
-+browser.contentHandlers.types.0.title=DuckDuckGo
-+browser.contentHandlers.types.0.uri=https://duckduckgo.com/search_box.html
++browser.contentHandlers.types.0.title=
++browser.contentHandlers.types.0.uri=about:blank
++browser.contentHandlers.types.1.title=
++browser.contentHandlers.types.1.uri=about:blank
 --- comm-release.orig/suite/locales/en-US/chrome/common/region.properties	2012-02-16 11:59:54.000000000 -0200
-+++ comm-release/suite/locales/en-US/chrome/common/region.properties	2012-05-12 05:49:20.084819625 -0300
-@@ -1,10 +1,9 @@
++++ comm-release/suite/locales/en-US/chrome/common/region.properties	2012-06-15 23:46:27.744272972 -0300
+@@ -1,10 +1,10 @@
  # Default search engine
 -browser.search.defaultenginename=Google
-+browser.search.defaultenginename=DuckDuckGo
++browser.search.defaultenginename=Duck Duck Go (Lite)
  
  # Search engine order (order displayed in the search bar dropdown)
 -browser.search.order.1=Google
 -browser.search.order.2=Yahoo
-+browser.search.order.1=DuckDuckGo
++browser.search.order.1=Duck Duck Go (Lite)
++browser.search.order.2=Seeks Search
  
  # More information about this update link available in the update wizard.
  # Only change this if you are providing localized release notes.
 -app.update.url.details=http://www.seamonkey-project.org/releases/
-+app.update.url.details=http://packages.debian.org/source/sid/iceape
++app.update.url.details=about:blank
 --- comm-release.orig/suite/locales/en-US/chrome/mailnews/region.properties	2012-02-16 11:59:54.000000000 -0200
 +++ comm-release/suite/locales/en-US/chrome/mailnews/region.properties	2012-05-12 04:28:05.202481512 -0300
 @@ -2,9 +2,9 @@
@@ -168,7 +192,7 @@
 -        <DT><A HREF="http://www.google.com/">Google</A>
 -        <DT><A HREF="http://groups.google.com/">Google Groups</A>
 -        <DT><A HREF="http://news.google.com/">Google News</A>
-+        <DT><A HREF="http://duckduckgo.com/">DuckDuckGo</A>
++        <DT><A HREF="https://duckduckgo.com/lite/">Duck Duck Go (Lite)</A>
      </DL><p>
  
  #unfilter emptyLines
@@ -238,8 +262,8 @@
  spellchecker.dictionaries.download.url=https://addons.mozilla.org/%LOCALE%/%APP%/dictionaries
 -app.releaseNotesURL=http://www.seamonkey-project.org/releases/seamonkey%VERSION%/
 -app.vendorURL=http://www.seamonkey-project.org/
-+app.releaseNotesURL=http://packages.debian.org/source/sid/iceape
-+app.vendorURL=http://packages.debian.org/source/sid/iceape
++app.releaseNotesURL=about:blank
++app.vendorURL=about:blank
 --- comm-release.orig/suite/locales/generic/profile/bookmarks.html.in	2012-02-16 11:59:54.000000000 -0200
 +++ comm-release/suite/locales/generic/profile/bookmarks.html.in	2012-05-12 04:40:19.221095752 -0300
 @@ -11,37 +11,14 @@