[Trisquel-devel] Rev 45: Updated ubufox, final updates and artwork for brigantia RC in file:///home/bzr/package-helpers/trunk/

Ruben Rodriguez ruben at trisquel.info
Thu Apr 5 05:02:57 CEST 2012 

At file:///home/bzr/package-helpers/trunk/

------------------------------------------------------------
revno: 45
revision-id: ruben en trisquel.info-20120405030238-2093ts52qw6o0gtd
parent: ruben en trisquel.info-20120319193532-dxj5dv4bohlx59yr
committer: Ruben Rodriguez <ruben en trisquel.info>
branch nick: trunk
timestamp: Thu 2012-04-05 05:02:38 +0200
message:
  Updated ubufox, final updates and artwork for brigantia RC
------------ pr�xima parte ------------
=== modified file 'helpers/lucid/make-apt'
--- a/helpers/lucid/make-apt	2011-12-12 17:54:06 +0000
+++ b/helpers/lucid/make-apt	2012-04-05 03:02:38 +0000
@@ -17,7 +17,8 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=2
+VERSION=3
+QUILT=skip
 
 . ./config
 

=== modified file 'helpers/lucid/make-ubufox'
--- a/helpers/lucid/make-ubufox	2012-02-06 01:55:40 +0000
+++ b/helpers/lucid/make-ubufox	2012-04-05 03:02:38 +0000
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=6
+VERSION=8
 
 . ./config
 
@@ -45,7 +45,7 @@
 pref("pfs.filehint.url", "http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%");
 
 // I'm feeling Ducky.
-pref("keyword.URL", "https://duckduckgo.com/?q=!+");
+pref("keyword.URL", "https://duckduckgo.com/?t=trisquel&q=!+");
 pref("browser.search.defaultenginename", "DuckDuckGo (SSL)");
 pref("browser.search.order.extra.duckduckgo", "DuckDuckGo (SSL)");
 
@@ -72,7 +72,7 @@
 // Prevent EULA dialog to popup on first run
 pref("browser.EULA.override", true);
 
-pref ("distribution.about", "Mozilla IceCat for Trisquel");
+pref ("distribution.about", "Abrowser for Trisquel");
 pref ("distribution.id", "trisquel");
 pref ("distribution.version", "$REVISION");
 
@@ -93,53 +93,6 @@
 pref("browser.search.searchEnginesURL", "http://mycroft.mozdev.org/");
 EOF
 
-# Add DDG to search plugins
-cat << EOF > searchplugins/duckduckgo.xml
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>DuckDuckGo</os:ShortName>
-<os:Description>Search DuckDuckGo</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA==</os:Image>
-<os:Url type="text/html" method="GET" template="http://duckduckgo.com/?q={searchTerms}">
-</os:Url>
-</SearchPlugin>
-EOF
-
-cat << EOF > searchplugins/duckduckgo-ssl.xml
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>DuckDuckGo (SSL)</os:ShortName>
-<os:Description>Search DuckDuckGo (SSL)</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA==</os:Image>
-<os:Url type="text/html" method="GET" template="https://duckduckgo.com/?q={searchTerms}">
-</os:Url>
-</SearchPlugin>
-EOF
-
-cat << EOF > searchplugins/trisquel-packages.xml
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Trisquel Packages</os:ShortName>
-<os:Description>Search packages.trisquel.info</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACi0lEQVQ4jY2T3UtTARiH92/0DxR0E10EZTeBF3VhBEqF9EEXUURUpn2AmohNS60oUrRMQ1D86ItKKz+atjmd25w5S82zlXPOqfNsc27nzOPOeboQJlakL/xuXnifi+d9Xx1bLEVZxTHhxzjsRZJXkn3dVob9gQhp+d1kFhs5rv9C6s1ufnjEjQDHhJ+bNXbOlJsprHfwyxdMAgrrHbzvcxONxXF7F6l47eRUaR+qqq4BWgwCO85+5KjeyMm7Jraf62DnhU5aDZMA3KodJByR0DSNmjdDCFML7L/Wy4IYQReNxUm52oXB7sEzG6Lb5sEx7uNgXi8pOT04JuYwO308bB3mrclNfbuTFoNAWoGJmLSCzusPcij3M6GlGJUvhzDYpymuH6Tvq5cDuX0cKzHjW1jCMxtk1DWPecRLZqkFfcPwmoNgOMrhgl5m5sJJu2UNVqZnRY7oLaSXWDlRZuFGjZ3LlVYOFpg5c6+fxVB0XeLjV07OP7LwosfFs7YxGjvGsI3Nkl5iJTW/nz3Zvey+1Mm+rA7y6uyEI9LGNWqahlOY59Ogh1HXPAA51Va2ne4gv86GazqQlPhn/fMOFCXB3qxOMu+YCASXud80RNFzC7Yx/9YAYijKrotd1LZP8OTtKG6viCSvcL16AGF6cXNATFohJbubqnffefruG+M/51FVlWaDQE3b+OYAgOyqQTKKTATEZT6YXQieAOXNIzR2Tf4N0DQNVVVZXV1FURQURcHrF8m4beTsgwFaewTKm0c4qjcy5RNJJBJJoTpN04jH40QiEUKhEKIoJuOemuFBs40rFWbuN9kYFzwEg0HC4TCSJK3/QiKRQJZlZFkmHo//N7IsI0kSiqKgaRq/AbKDgxgo7zYPAAAAAElFTkSuQmCC</os:Image>
-<SearchForm>http://packages.trisquel.info/</SearchForm>
-<os:Url type="text/html" method="GET" template="http://packages.trisquel.info/search?suite=default&section=all&arch=any&searchon=names&keywords={searchTerms}">
-</os:Url>
-</SearchPlugin>
-EOF
-
-cat << EOF > searchplugins/trisquel.xml
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Trisquel</os:ShortName>
-<os:Description>Trisquel GNU/Linux</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACi0lEQVQ4jY2T3UtTARiH92/0DxR0E10EZTeBF3VhBEqF9EEXUURUpn2AmohNS60oUrRMQ1D86ItKKz+atjmd25w5S82zlXPOqfNsc27nzOPOeboQJlakL/xuXnifi+d9Xx1bLEVZxTHhxzjsRZJXkn3dVob9gQhp+d1kFhs5rv9C6s1ufnjEjQDHhJ+bNXbOlJsprHfwyxdMAgrrHbzvcxONxXF7F6l47eRUaR+qqq4BWgwCO85+5KjeyMm7Jraf62DnhU5aDZMA3KodJByR0DSNmjdDCFML7L/Wy4IYQReNxUm52oXB7sEzG6Lb5sEx7uNgXi8pOT04JuYwO308bB3mrclNfbuTFoNAWoGJmLSCzusPcij3M6GlGJUvhzDYpymuH6Tvq5cDuX0cKzHjW1jCMxtk1DWPecRLZqkFfcPwmoNgOMrhgl5m5sJJu2UNVqZnRY7oLaSXWDlRZuFGjZ3LlVYOFpg5c6+fxVB0XeLjV07OP7LwosfFs7YxGjvGsI3Nkl5iJTW/nz3Zvey+1Mm+rA7y6uyEI9LGNWqahlOY59Ogh1HXPAA51Va2ne4gv86GazqQlPhn/fMOFCXB3qxOMu+YCASXud80RNFzC7Yx/9YAYijKrotd1LZP8OTtKG6viCSvcL16AGF6cXNATFohJbubqnffefruG+M/51FVlWaDQE3b+OYAgOyqQTKKTATEZT6YXQieAOXNIzR2Tf4N0DQNVVVZXV1FURQURcHrF8m4beTsgwFaewTKm0c4qjcy5RNJJBJJoTpN04jH40QiEUKhEKIoJuOemuFBs40rFWbuN9kYFzwEg0HC4TCSJK3/QiKRQJZlZFkmHo//N7IsI0kSiqKgaRq/AbKDgxgo7zYPAAAAAElFTkSuQmCC</os:Image>
-<os:Url type="text/html" method="GET" template="http://trisquel.info/search/node/{searchTerms}?page={startPage}">
-</os:Url><os:Url type="application/rss+xml" method="GET" template="http://trisquel.info/opensearch/node/{searchTerms}?page={startPage}">
-</os:Url>
-</SearchPlugin>
-EOF
-
 sed '/You can uninstall/d; s/ask.com/Duck Duck GO!/; /Add the following options/d; /Get help on-line/d; /Help translating/d; /Trisquel Release/d; ' debian/control -i
 
 replace Mozilla GNU .

=== modified file 'helpers/maverick/make-ubufox'
--- a/helpers/maverick/make-ubufox	2012-02-06 01:55:40 +0000
+++ b/helpers/maverick/make-ubufox	2012-04-05 03:02:38 +0000
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=6
+VERSION=8
 
 . ./config
 
@@ -45,7 +45,7 @@
 pref("pfs.filehint.url", "http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%");
 
 // I'm feeling Ducky.
-pref("keyword.URL", "https://duckduckgo.com/?q=!+");
+pref("keyword.URL", "https://duckduckgo.com/?t=trisquel&q=!+");
 pref("browser.search.defaultenginename", "DuckDuckGo (SSL)");
 pref("browser.search.order.extra.duckduckgo", "DuckDuckGo (SSL)");
 
@@ -72,7 +72,7 @@
 // Prevent EULA dialog to popup on first run
 pref("browser.EULA.override", true);
 
-pref ("distribution.about", "Mozilla IceCat for Trisquel");
+pref ("distribution.about", "Abrowser for Trisquel");
 pref ("distribution.id", "trisquel");
 pref ("distribution.version", "$REVISION");
 
@@ -93,53 +93,6 @@
 pref("browser.search.searchEnginesURL", "http://mycroft.mozdev.org/");
 EOF
 
-# Add DDG to search plugins
-cat << EOF > searchplugins/duckduckgo.xml
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>DuckDuckGo</os:ShortName>
-<os:Description>Search DuckDuckGo</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA==</os:Image>
-<os:Url type="text/html" method="GET" template="http://duckduckgo.com/?q={searchTerms}">
-</os:Url>
-</SearchPlugin>
-EOF
-
-cat << EOF > searchplugins/duckduckgo-ssl.xml
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>DuckDuckGo (SSL)</os:ShortName>
-<os:Description>Search DuckDuckGo (SSL)</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA==</os:Image>
-<os:Url type="text/html" method="GET" template="https://duckduckgo.com/?q={searchTerms}">
-</os:Url>
-</SearchPlugin>
-EOF
-
-cat << EOF > searchplugins/trisquel-packages.xml
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Trisquel Packages</os:ShortName>
-<os:Description>Search packages.trisquel.info</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACi0lEQVQ4jY2T3UtTARiH92/0DxR0E10EZTeBF3VhBEqF9EEXUURUpn2AmohNS60oUrRMQ1D86ItKKz+atjmd25w5S82zlXPOqfNsc27nzOPOeboQJlakL/xuXnifi+d9Xx1bLEVZxTHhxzjsRZJXkn3dVob9gQhp+d1kFhs5rv9C6s1ufnjEjQDHhJ+bNXbOlJsprHfwyxdMAgrrHbzvcxONxXF7F6l47eRUaR+qqq4BWgwCO85+5KjeyMm7Jraf62DnhU5aDZMA3KodJByR0DSNmjdDCFML7L/Wy4IYQReNxUm52oXB7sEzG6Lb5sEx7uNgXi8pOT04JuYwO308bB3mrclNfbuTFoNAWoGJmLSCzusPcij3M6GlGJUvhzDYpymuH6Tvq5cDuX0cKzHjW1jCMxtk1DWPecRLZqkFfcPwmoNgOMrhgl5m5sJJu2UNVqZnRY7oLaSXWDlRZuFGjZ3LlVYOFpg5c6+fxVB0XeLjV07OP7LwosfFs7YxGjvGsI3Nkl5iJTW/nz3Zvey+1Mm+rA7y6uyEI9LGNWqahlOY59Ogh1HXPAA51Va2ne4gv86GazqQlPhn/fMOFCXB3qxOMu+YCASXud80RNFzC7Yx/9YAYijKrotd1LZP8OTtKG6viCSvcL16AGF6cXNATFohJbubqnffefruG+M/51FVlWaDQE3b+OYAgOyqQTKKTATEZT6YXQieAOXNIzR2Tf4N0DQNVVVZXV1FURQURcHrF8m4beTsgwFaewTKm0c4qjcy5RNJJBJJoTpN04jH40QiEUKhEKIoJuOemuFBs40rFWbuN9kYFzwEg0HC4TCSJK3/QiKRQJZlZFkmHo//N7IsI0kSiqKgaRq/AbKDgxgo7zYPAAAAAElFTkSuQmCC</os:Image>
-<SearchForm>http://packages.trisquel.info/</SearchForm>
-<os:Url type="text/html" method="GET" template="http://packages.trisquel.info/search?suite=default&section=all&arch=any&searchon=names&keywords={searchTerms}">
-</os:Url>
-</SearchPlugin>
-EOF
-
-cat << EOF > searchplugins/trisquel.xml
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Trisquel</os:ShortName>
-<os:Description>Trisquel GNU/Linux</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACi0lEQVQ4jY2T3UtTARiH92/0DxR0E10EZTeBF3VhBEqF9EEXUURUpn2AmohNS60oUrRMQ1D86ItKKz+atjmd25w5S82zlXPOqfNsc27nzOPOeboQJlakL/xuXnifi+d9Xx1bLEVZxTHhxzjsRZJXkn3dVob9gQhp+d1kFhs5rv9C6s1ufnjEjQDHhJ+bNXbOlJsprHfwyxdMAgrrHbzvcxONxXF7F6l47eRUaR+qqq4BWgwCO85+5KjeyMm7Jraf62DnhU5aDZMA3KodJByR0DSNmjdDCFML7L/Wy4IYQReNxUm52oXB7sEzG6Lb5sEx7uNgXi8pOT04JuYwO308bB3mrclNfbuTFoNAWoGJmLSCzusPcij3M6GlGJUvhzDYpymuH6Tvq5cDuX0cKzHjW1jCMxtk1DWPecRLZqkFfcPwmoNgOMrhgl5m5sJJu2UNVqZnRY7oLaSXWDlRZuFGjZ3LlVYOFpg5c6+fxVB0XeLjV07OP7LwosfFs7YxGjvGsI3Nkl5iJTW/nz3Zvey+1Mm+rA7y6uyEI9LGNWqahlOY59Ogh1HXPAA51Va2ne4gv86GazqQlPhn/fMOFCXB3qxOMu+YCASXud80RNFzC7Yx/9YAYijKrotd1LZP8OTtKG6viCSvcL16AGF6cXNATFohJbubqnffefruG+M/51FVlWaDQE3b+OYAgOyqQTKKTATEZT6YXQieAOXNIzR2Tf4N0DQNVVVZXV1FURQURcHrF8m4beTsgwFaewTKm0c4qjcy5RNJJBJJoTpN04jH40QiEUKhEKIoJuOemuFBs40rFWbuN9kYFzwEg0HC4TCSJK3/QiKRQJZlZFkmHo//N7IsI0kSiqKgaRq/AbKDgxgo7zYPAAAAAElFTkSuQmCC</os:Image>
-<os:Url type="text/html" method="GET" template="http://trisquel.info/search/node/{searchTerms}?page={startPage}">
-</os:Url><os:Url type="application/rss+xml" method="GET" template="http://trisquel.info/opensearch/node/{searchTerms}?page={startPage}">
-</os:Url>
-</SearchPlugin>
-EOF
-
 sed '/You can uninstall/d; s/ask.com/Duck Duck GO!/; /Add the following options/d; /Get help on-line/d; /Help translating/d; /Trisquel Release/d; ' debian/control -i
 
 replace Mozilla GNU .

=== modified file 'helpers/natty/make-ubufox'
--- a/helpers/natty/make-ubufox	2011-09-29 00:17:35 +0000
+++ b/helpers/natty/make-ubufox	2012-04-05 03:02:38 +0000
@@ -17,56 +17,87 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=7
+VERSION=8
 
 . ./config
 
+#rm debian/patches/02_fix_about_home.patch
+#sed -i /02_fix_about_home.patch/d debian/patches/series
+
 # Unbranding
-replace "Canonical Ltd." "Trisquel GNU/Linux" .
 rm ./content/ubuntulogo32.png
 replace ubuntulogo32.png internet32.png .
-rm debian/example-homepage.properties debian/docs components/ufoxHTTPListener.js content/ubuntuHelpMenuOverlay.xul
-sed -i '/ufox-http/d; /ufoxHTTP/d; /startpage/d; /ubuntuHelpMenuOverlay/d' chrome.manifest
-
-cat << EOF > defaults/preferences/ubuntu-mods.js
-// ubuntu-printing overwrites
-pref("print.print_command", "lpr \${MOZ_PRINTER_NAME:+-P\"\$MOZ_PRINTER_NAME\"}");
-pref("print.postscript.print_command", "lpr \${MOZ_PRINTER_NAME:+-P\"\$MOZ_PRINTER_NAME\"}");
-
-pref("browser.link.open_newwindow", 3);
-pref("browser.link.open_external", 3);
-pref("middlemouse.contentLoadURL", false); // setting to false disables pasting urls on to the page
-
-// intl-property fixes (minimal set resurrected from ubufox 0.5 in 0.6~b2)
-pref("general.useragent.locale", "chrome://global/locale/intl.properties");
-
-// kerberos-for-https
-pref("network.negotiate-auth.trusted-uris", "https://");
-
-// Set the default dictionary.
-pref("spellchecker.dictionary", "chrome://ubufox/locale/ubufox.properties");
-
-// Remember last session
-pref ("browser.startup.page" , 3);
-EOF
 
 # This hack makes Firefox avoid sending a request for a list of plugins, instead returns a hardcoded xml list.
-sed 's^https://mozilla-pfs.ubuntu.com/.*ID%^http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%^' -i defaults/preferences/ubufox-pfs.js
+sed 's/ubuntu/trisquel/; s^https://mozilla-pfs.ubuntu.com/.*ID%^http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%^' -i defaults/preferences/ubufox-pfs.js
 
 # Changes the link to pfs.mozilla.org in the install wizard
 sed 's_https://pfs.mozilla.org/plugins/_http://trisquel.info/browser/_' -i content/pluginInstallerWizard.js
 
-# Remove extra menu entries from ubuntu
-#####rm content/overlay.js content/ubuntuHelpMenuOverlay.xul
-
-#sed 's/ubuntu-artwork/trisquel-artwork/; s_http://start.ubuntu.com/_https://trisquel.info/welcome_; s/PREFIX +.*/PREFIX;/' -i ./components/aboutStartpage.js
-rm components/aboutStartpage.js
-sed /aboutStartpage.js/d chrome.manifest -i
+sed 's/ubuntu-artwork/trisquel-artwork/; s_http://start.ubuntu.com/_https://trisquel.info/welcome_; s/PREFIX +.*/PREFIX;/' -i ./components/aboutStartpage.js
+sed 's/www.ubuntu.com/trisquel.info/' -i debian/example-homepage.properties
+
+# Stablish Trisquel's default or mandatory settings
+cat << EOF >> debian/xul-ext-ubufox.js
+
+// PFS url
+pref("pfs.datasource.url", "http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%");
+pref("pfs.filehint.url", "http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%");
+
+// I'm feeling Ducky.
+pref("keyword.URL", "https://duckduckgo.com/?t=trisquel&q=!+");
+pref("browser.search.defaultenginename", "DuckDuckGo (SSL)");
+pref("browser.search.order.extra.duckduckgo", "DuckDuckGo (SSL)");
+
+// Disable plugin installer
+pref("plugins.hide_infobar_for_missing_plugin", true);
+pref("plugins.hide_infobar_for_outdated_plugin", true);
+
+//Speeding it up
+pref("network.http.pipelining", true);
+pref("network.http.proxy.pipelining", true);
+pref("network.http.pipelining.maxrequests", 10);
+pref("network.dns.disableIPv6", true);
+pref("nglayout.initialpaint.delay", 0);
+
+// Disable third party cookies
+pref("network.cookie.cookieBehavior", 1);
+
+// Extensions can be updated
+pref("extensions.update.enabled", true);
+// Use LANG environment variable to choose locale
+pref("intl.locale.matchOS", true);
+// Disable default browser checking.
+pref("browser.shell.checkDefaultBrowser", false);
+// Prevent EULA dialog to popup on first run
+pref("browser.EULA.override", true);
+
+pref ("distribution.about", "Abrowser for Trisquel");
+pref ("distribution.id", "trisquel");
+pref ("distribution.version", "$REVISION");
+
+pref("general.useragent.vendor", "Trisquel");
+pref("general.useragent.vendorComment", "$CODENAME");
+pref("general.useragent.vendorSub", "$REVISION");
+pref ("startup.homepage_override_url" , "http://trisquel.info/newbrowser");
+
+// Preferences for the Get Add-ons panel
+pref ("extensions.webservice.discoverURL", "https://trisquel.info/browser");
+pref ("extensions.getAddons.search.url", "http://trisquel.info");
+
+// Help URL
+pref ("app.support.baseURL", "http://trisquel.info/wiki/");
+
+// Dictionary download preference
+pref("browser.dictionaries.download.url", "http://dictionaries.mozdev.org/");
+pref("browser.search.searchEnginesURL", "http://mycroft.mozdev.org/");
+EOF
+
 sed '/You can uninstall/d; s/ask.com/Duck Duck GO!/; /Add the following options/d; /Get help on-line/d; /Help translating/d; /Trisquel Release/d; ' debian/control -i
 
-replace Mozilla Trisquel .
-replace Firefox Abrowser .
-replace firefox abrowser .
+replace Mozilla GNU .
+replace Firefox IceCat .
+replace firefox icecat .
 replace Ubuntu Trisquel .
 
 changelog "Adapted for Trisquel"

=== modified file 'helpers/oneiric/DATA/gnome-control-center/gnomecc.menu.in'
--- a/helpers/oneiric/DATA/gnome-control-center/gnomecc.menu.in	2012-03-12 02:26:50 +0000
+++ b/helpers/oneiric/DATA/gnome-control-center/gnomecc.menu.in	2012-04-05 03:02:38 +0000
@@ -6,7 +6,7 @@
   <Directory>gnomecc.directory</Directory>
 
   <!-- Read standard .directory and .desktop file locations -->
-  <AppDir>@applicationsdir@</AppDir>
+  <AppDir>/usr/share/applications/</AppDir>
   <DefaultDirectoryDirs/>
 
   <!-- Read in overrides and child menus from gnomecc-merged/ -->
@@ -15,7 +15,6 @@
    <!-- Sort the control center categories -->
    <Layout>
      <Menuname>Personal</Menuname>
-     <Menuname>Hardware</Menuname>
      <Menuname>System</Menuname>
      <Menuname>Other</Menuname>
      <Merge type="all" />
@@ -52,16 +51,26 @@
         <Not>
         <Or>
          <Category>System</Category>
-        <Category>HardwareSettings</Category>
-        <Category>X-GNOME-SystemSettings</Category>
-        <Category>X-GNOME-NetworkSettings</Category>
+         <Category>X-GNOME-SystemSettings</Category>
         </Or>
       </Not>
       </And>
+<Or>
+<Filename>gnome-universal-access-panel.desktop</Filename>
+</Or>
     </Include>
+<Exclude>
+<Filename>gnome-printers-panel.desktop</Filename>
+<Filename>gnome-network-panel.desktop</Filename>
+<Filename>evolution-settings.desktop</Filename>
+<Filename>language-selector.desktop</Filename>
+<Filename>nm-connection-editor.desktop</Filename>
+<Filename>palimpsest.desktop</Filename>
+<Filename>gnome-online-accounts-panel.desktop</Filename>
+</Exclude>
   </Menu> <!-- End Personal -->
 
-  <!-- Hardware category -->
+  <!-- disabled
   <Menu>
     <Name>Hardware</Name>
     <Directory>Hardware.directory</Directory>
@@ -71,7 +80,7 @@
         <Category>HardwareSettings</Category>
       </And>
     </Include>
-  </Menu> <!-- End Hardware -->
+  </Menu>  -->
 
   <!-- System category -->
   <Menu>
@@ -79,10 +88,22 @@
     <Directory>System.directory</Directory>
     <Include>
       <And>
+         <Category>System</Category>
         <Category>Settings</Category>
-        <Category>System</Category>
       </And>
+<Or>
+         <Category>X-GNOME-SystemSettings</Category>
+<Filename>language-selector.desktop</Filename>
+<Filename>nm-connection-editor.desktop</Filename>
+<Filename>palimpsest.desktop</Filename>
+<Filename>gnome-ppp.desktop</Filename>
+</Or>
     </Include>
+<Exclude>
+<Filename>gnome-universal-access-panel.desktop</Filename>
+<Filename>gnome-user-accounts-panel.desktop</Filename>
+<Filename>gnome-app-install.desktop</Filename>
+</Exclude>
   </Menu> <!-- End System -->
 
   <!-- Other category -->

=== added file 'helpers/oneiric/DATA/plymouth/brigantia.jpg'
Binary files a/helpers/oneiric/DATA/plymouth/brigantia.jpg	1970-01-01 00:00:00 +0000 and b/helpers/oneiric/DATA/plymouth/brigantia.jpg	2012-04-05 03:02:38 +0000 differ
=== added file 'helpers/oneiric/DATA/plymouth/brigantia.png'
Binary files a/helpers/oneiric/DATA/plymouth/brigantia.png	1970-01-01 00:00:00 +0000 and b/helpers/oneiric/DATA/plymouth/brigantia.png	2012-04-05 03:02:38 +0000 differ
=== modified file 'helpers/oneiric/DATA/plymouth/script.script'
--- a/helpers/oneiric/DATA/plymouth/script.script	2012-01-08 18:15:35 +0000
+++ b/helpers/oneiric/DATA/plymouth/script.script	2012-04-05 03:02:38 +0000
@@ -7,7 +7,7 @@
 } else {
     logo.image = Image("special://logo");
 
-    bg_image = Image("dagda.png");
+    bg_image = Image("brigantia.png");
     bg_sprite = Sprite(bg_image);
 
     customlogo.image = Image("custom.png");
@@ -26,7 +26,9 @@
 logo.sprite = Sprite(logo.image);
 logo.opacity_angle = 0;
 logo.sprite.SetX (Window.GetX() + Window.GetWidth()  / 2 - logo.image.GetWidth()  / 2);
-logo.sprite.SetY (Window.GetY() + Window.GetHeight() / 2 - logo.image.GetHeight() / 2);
+logo.sprite.SetY (Window.GetY() + Window.GetHeight() / 4 - logo.image.GetHeight() / 2);
+#logo.sprite.SetX (Window.GetX() + Window.GetWidth()  / 2 - logo.image.GetWidth()  / 2);
+#logo.sprite.SetY (Window.GetY() + Window.GetHeight() / 2 - logo.image.GetHeight() / 2);
 logo.sprite.SetOpacity (1);
 
 fun refresh_callback ()

=== modified file 'helpers/oneiric/DATA/plymouth/trisquel-logo.png'
Binary files a/helpers/oneiric/DATA/plymouth/trisquel-logo.png	2012-01-08 18:15:35 +0000 and b/helpers/oneiric/DATA/plymouth/trisquel-logo.png	2012-04-05 03:02:38 +0000 differ
=== added file 'helpers/oneiric/DATA/ubiquity/trisquel_installed.png'
Binary files a/helpers/oneiric/DATA/ubiquity/trisquel_installed.png	1970-01-01 00:00:00 +0000 and b/helpers/oneiric/DATA/ubiquity/trisquel_installed.png	2012-04-05 03:02:38 +0000 differ
=== added file 'helpers/oneiric/make-gdm'
--- a/helpers/oneiric/make-gdm	1970-01-01 00:00:00 +0000
+++ b/helpers/oneiric/make-gdm	2012-04-05 03:02:38 +0000
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+#    Copyright (C) 2012  Rub��n Rodr��guez <ruben en 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
+#    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=9
+
+. ./config
+
+sed s/ubuntu/gnome-classic/ -i debian/patches/15_default_session.patch
+
+rm debian/patches/42_no_ecryptfs_autologin.patch
+sed /42_no_ecryptfs_autologin/d -i debian/patches/series
+
+sed 's/--no-setup//' ./data/greeter-autostart/orca-screen-reader.desktop.in -i
+
+changelog "Default session changed to gnome-classic"
+
+compile
+

=== modified file 'helpers/oneiric/make-gnome-control-center'
--- a/helpers/oneiric/make-gnome-control-center	2012-03-12 02:26:50 +0000
+++ b/helpers/oneiric/make-gnome-control-center	2012-04-05 03:02:38 +0000
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=1
+VERSION=3
 COMPONENT=main
 
 . ./config

=== modified file 'helpers/oneiric/make-gnome-panel'
--- a/helpers/oneiric/make-gnome-panel	2012-03-19 19:35:32 +0000
+++ b/helpers/oneiric/make-gnome-panel	2012-04-05 03:02:38 +0000
@@ -17,15 +17,16 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=6
+VERSION=8
 
 . ./config
 
-#sed ":PanelBackgroundType:,:/key: s/'none'/'color'/; s/rgba(255,255,255,.2)/rgba(000,000,000,.5)/" -i data/org.gnome.gnome-panel.toplevel.gschema.xml.in.in
-sed "105s/'none'/'color'/; s/rgba(255,255,255,.2)/rgba(000,000,000,.5)/" -i data/org.gnome.gnome-panel.toplevel.gschema.xml.in.in
-
+#sed "105s/'none'/'color'/; s/rgba(255,255,255,.2)/rgba(000,000,000,.5)/" -i data/org.gnome.gnome-panel.toplevel.gschema.xml.in.in
+sed "105s/'none'/'image'/; 115s_''_'file:///usr/share/themes/Trisquel/gtk-3.0/panel-bg.png'_; s/rgba(255,255,255,.2)/rgba(000,000,000,.5)/" -i data/org.gnome.gnome-panel.toplevel.gschema.xml.in.in
 sed 's/"tooltip", tooltip,/"tooltip", "Trisquel",/; s/"has-arrow", TRUE,/"has-arrow", FALSE,/' -i gnome-panel/panel-menu-button.c
 
+sed '/gnome-session /d' debian/control*
+
 cat << EOF > data/panel-default-layout.layout
 [Toplevel panel]
 expand=true

=== added file 'helpers/oneiric/make-gnome-tweak-tool'
--- a/helpers/oneiric/make-gnome-tweak-tool	1970-01-01 00:00:00 +0000
+++ b/helpers/oneiric/make-gnome-tweak-tool	2012-04-05 03:02:38 +0000
@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+#    Copyright (C) 2012  Rub��n Rodr��guez <ruben en 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
+#    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
+
+sed '/gnome-shell,/d' debian/control* -i
+rm gtweak/tweaks/tweak_shell*
+
+changelog "Remove gnome-shell dependency"
+
+compile
+

=== modified file 'helpers/oneiric/make-plymouth'
--- a/helpers/oneiric/make-plymouth	2012-02-06 01:55:40 +0000
+++ b/helpers/oneiric/make-plymouth	2012-04-05 03:02:38 +0000
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=1
+VERSION=7
 QUILT=skip
 . ./config
 
@@ -60,14 +60,14 @@
 replace "Ubuntu 10.10" "Trisquel $REVISION" .
 replace "Kubuntu 10.10" "Trisquel mini $REVISION" .
 replace 2c001e 000000 .
-replace ff4012 7ed300 .
+replace ff4012 0051FF .
 
 
 cp $DATA/trisquel-logo*.png debian
 cp $DATA/script.script themes/script/script.script
 
 cat << EOF > debian/source/include-binaries
-themes/script/dagda.png
+themes/script/brigantia.png
 themes/glow/sugar.png
 themes/script/trisquel-logo16.png
 themes/glow/trisquel-logo16.png
@@ -76,8 +76,8 @@
 
 rm themes/trisquel-logo themes/glow -rf
 cp themes/script -a themes/trisquel-logo
-cp $DATA/dagda.png $DATA/trisquel-logo16.png themes/trisquel-logo/
-sed -i 's/progress_bar.png/progress_bar.png\\\n\t\tdagda.png\\\n\t\ttrisquel-logo16.png/' themes/trisquel-logo/Makefile*
+cp $DATA/brigantia.png $DATA/trisquel-logo16.png themes/trisquel-logo/
+sed -i 's/progress_bar.png/progress_bar.png\\\n\t\tbrigantia.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
 sed 's/script\.script/trisquel-logo\.rtoken/g' -i themes/trisquel-logo/Make*
@@ -93,7 +93,7 @@
 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/
-sed -i s/dagda/sugar/g themes/glow/*
+sed -i s/brigantia/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/*

=== modified file 'helpers/oneiric/make-system-config-printer'
--- a/helpers/oneiric/make-system-config-printer	2012-01-08 18:15:35 +0000
+++ b/helpers/oneiric/make-system-config-printer	2012-04-05 03:02:38 +0000
@@ -17,11 +17,12 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=1
+VERSION=2
 COMPONENT=main
 
 . ./config
 
+sed 's/;GNOME;/;/' debian/patches/05_menu_entries.patch -i
 cp $DATA/testpage* debian/local/
 
 changelog "Compiled for Trisquel"

=== removed file 'helpers/oneiric/make-theunarchiver'
--- a/helpers/oneiric/make-theunarchiver	2012-01-08 18:15:35 +0000
+++ b/helpers/oneiric/make-theunarchiver	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-#    Copyright (C) 2011  Rub��n Rodr��guez <ruben en 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
-#    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
-EXTERNAL='deb-src http://ftp.debian.org/debian sid main'
-
-. ./config
-
-changelog "Imported into Trisquel"
-
-compile

=== modified file 'helpers/oneiric/make-ubiquity'
--- a/helpers/oneiric/make-ubiquity	2012-03-12 02:26:50 +0000
+++ b/helpers/oneiric/make-ubiquity	2012-04-05 03:02:38 +0000
@@ -17,17 +17,23 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=1
+VERSION=4
 
 . ./config
 
+cp $DATA/trisquel_installed.png pixmaps
+rm pixmaps/ubuntu_installed.png
+replace ubuntu_installed trisquel_installed .
+
 sed '/canonical/d' -i debian/ubiquity.install*
 rm  tests/test_ubi_partman*
 
+export DEB_BUILD_OPTIONS=nocheck
+
 # Fix update issues on clean installations: http://trisquel.info/es/forum/update-issues-clean-install
 sed 's:\(targetdb)\):\1\n        os.system("sudo chmod 644 /target/var/cache/debconf/config.dat"):' bin/ubiquity -i
 
-for i in $(ls -1 d-i/source/apt-setup/generators |grep -v 01setup)
+for i in $(ls -1 d-i/source/apt-setup/generators |grep -v 01setup) canonical.com security.ubuntu.com extras.ubuntu.com
 do
     sed /$i/d -i debian/ubiquity.install-any d-i/source/apt-setup/debian/*.install
 done
@@ -99,7 +105,6 @@
 sed -i 's/apt-install/true #apt-install/' ubiquity/components/check_kernels.py scripts/check-kernels
 sed -i '82s/True/False/g' gui/gtk/stepPrepare.ui
 
-echo "release-files/archive.trisquel.info usr/share/apt-setup/release-files" > d-i/source/apt-setup/debian/apt-mirror-setup.install
 rm -rf d-i/source/apt-setup/release-files/*
 for DIST in $CODENAME $CODENAME-security $CODENAME-updates $CODENAME-backports
 do
@@ -140,10 +145,27 @@
 EOF
 
 chmod 700 /target/etc/grub.d/01_PASSWORD
+
+# Hacks for accessibility
+if pgrep orca > /dev/null
+then
+  echo "Orca screen reader seems to be running, enabling accessibility by default in target system"
+  echo "[org.gnome.desktop.a11y.applications]
+screen-reader-enabled=true
+
+[org.gnome.desktop.interface]
+toolkit-accessibility=true
+" >> /target/usr/share/glib-2.0/schemas/99_accessibility.gschema.override
+  chroot /target glib-compile-schemas /usr/share/glib-2.0/schemas
+
+ echo "/desktop/gnome/applications/at/screen_reader_enabled true
+/desktop/gnome/interface/accessibility true" > /target/usr/share/gconf/defaults/91_accessibility
+ chroot /target update-gconf-defaults
+
+fi
+
 EOF1
 
-sed s/Trisquel/Ubuntu/g tests/test_gtkwidgets.py -i
-
 changelog "Adapted for Trisquel"
 
 rm -rf debian/source

=== modified file 'helpers/oneiric/make-ubufox'
--- a/helpers/oneiric/make-ubufox	2012-02-06 01:55:40 +0000
+++ b/helpers/oneiric/make-ubufox	2012-04-05 03:02:38 +0000
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=6
+VERSION=8
 
 . ./config
 
@@ -45,7 +45,7 @@
 pref("pfs.filehint.url", "http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%");
 
 // I'm feeling Ducky.
-pref("keyword.URL", "https://duckduckgo.com/?q=!+");
+pref("keyword.URL", "https://duckduckgo.com/?t=trisquel&q=!+");
 pref("browser.search.defaultenginename", "DuckDuckGo (SSL)");
 pref("browser.search.order.extra.duckduckgo", "DuckDuckGo (SSL)");
 
@@ -72,7 +72,7 @@
 // Prevent EULA dialog to popup on first run
 pref("browser.EULA.override", true);
 
-pref ("distribution.about", "Mozilla IceCat for Trisquel");
+pref ("distribution.about", "Abrowser for Trisquel");
 pref ("distribution.id", "trisquel");
 pref ("distribution.version", "$REVISION");
 
@@ -93,53 +93,6 @@
 pref("browser.search.searchEnginesURL", "http://mycroft.mozdev.org/");
 EOF
 
-# Add DDG to search plugins
-cat << EOF > searchplugins/duckduckgo.xml
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>DuckDuckGo</os:ShortName>
-<os:Description>Search DuckDuckGo</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA==</os:Image>
-<os:Url type="text/html" method="GET" template="http://duckduckgo.com/?q={searchTerms}">
-</os:Url>
-</SearchPlugin>
-EOF
-
-cat << EOF > searchplugins/duckduckgo-ssl.xml
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>DuckDuckGo (SSL)</os:ShortName>
-<os:Description>Search DuckDuckGo (SSL)</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA==</os:Image>
-<os:Url type="text/html" method="GET" template="https://duckduckgo.com/?q={searchTerms}">
-</os:Url>
-</SearchPlugin>
-EOF
-
-cat << EOF > searchplugins/trisquel-packages.xml
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Trisquel Packages</os:ShortName>
-<os:Description>Search packages.trisquel.info</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACi0lEQVQ4jY2T3UtTARiH92/0DxR0E10EZTeBF3VhBEqF9EEXUURUpn2AmohNS60oUrRMQ1D86ItKKz+atjmd25w5S82zlXPOqfNsc27nzOPOeboQJlakL/xuXnifi+d9Xx1bLEVZxTHhxzjsRZJXkn3dVob9gQhp+d1kFhs5rv9C6s1ufnjEjQDHhJ+bNXbOlJsprHfwyxdMAgrrHbzvcxONxXF7F6l47eRUaR+qqq4BWgwCO85+5KjeyMm7Jraf62DnhU5aDZMA3KodJByR0DSNmjdDCFML7L/Wy4IYQReNxUm52oXB7sEzG6Lb5sEx7uNgXi8pOT04JuYwO308bB3mrclNfbuTFoNAWoGJmLSCzusPcij3M6GlGJUvhzDYpymuH6Tvq5cDuX0cKzHjW1jCMxtk1DWPecRLZqkFfcPwmoNgOMrhgl5m5sJJu2UNVqZnRY7oLaSXWDlRZuFGjZ3LlVYOFpg5c6+fxVB0XeLjV07OP7LwosfFs7YxGjvGsI3Nkl5iJTW/nz3Zvey+1Mm+rA7y6uyEI9LGNWqahlOY59Ogh1HXPAA51Va2ne4gv86GazqQlPhn/fMOFCXB3qxOMu+YCASXud80RNFzC7Yx/9YAYijKrotd1LZP8OTtKG6viCSvcL16AGF6cXNATFohJbubqnffefruG+M/51FVlWaDQE3b+OYAgOyqQTKKTATEZT6YXQieAOXNIzR2Tf4N0DQNVVVZXV1FURQURcHrF8m4beTsgwFaewTKm0c4qjcy5RNJJBJJoTpN04jH40QiEUKhEKIoJuOemuFBs40rFWbuN9kYFzwEg0HC4TCSJK3/QiKRQJZlZFkmHo//N7IsI0kSiqKgaRq/AbKDgxgo7zYPAAAAAElFTkSuQmCC</os:Image>
-<SearchForm>http://packages.trisquel.info/</SearchForm>
-<os:Url type="text/html" method="GET" template="http://packages.trisquel.info/search?suite=default&section=all&arch=any&searchon=names&keywords={searchTerms}">
-</os:Url>
-</SearchPlugin>
-EOF
-
-cat << EOF > searchplugins/trisquel.xml
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Trisquel</os:ShortName>
-<os:Description>Trisquel GNU/Linux</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACi0lEQVQ4jY2T3UtTARiH92/0DxR0E10EZTeBF3VhBEqF9EEXUURUpn2AmohNS60oUrRMQ1D86ItKKz+atjmd25w5S82zlXPOqfNsc27nzOPOeboQJlakL/xuXnifi+d9Xx1bLEVZxTHhxzjsRZJXkn3dVob9gQhp+d1kFhs5rv9C6s1ufnjEjQDHhJ+bNXbOlJsprHfwyxdMAgrrHbzvcxONxXF7F6l47eRUaR+qqq4BWgwCO85+5KjeyMm7Jraf62DnhU5aDZMA3KodJByR0DSNmjdDCFML7L/Wy4IYQReNxUm52oXB7sEzG6Lb5sEx7uNgXi8pOT04JuYwO308bB3mrclNfbuTFoNAWoGJmLSCzusPcij3M6GlGJUvhzDYpymuH6Tvq5cDuX0cKzHjW1jCMxtk1DWPecRLZqkFfcPwmoNgOMrhgl5m5sJJu2UNVqZnRY7oLaSXWDlRZuFGjZ3LlVYOFpg5c6+fxVB0XeLjV07OP7LwosfFs7YxGjvGsI3Nkl5iJTW/nz3Zvey+1Mm+rA7y6uyEI9LGNWqahlOY59Ogh1HXPAA51Va2ne4gv86GazqQlPhn/fMOFCXB3qxOMu+YCASXud80RNFzC7Yx/9YAYijKrotd1LZP8OTtKG6viCSvcL16AGF6cXNATFohJbubqnffefruG+M/51FVlWaDQE3b+OYAgOyqQTKKTATEZT6YXQieAOXNIzR2Tf4N0DQNVVVZXV1FURQURcHrF8m4beTsgwFaewTKm0c4qjcy5RNJJBJJoTpN04jH40QiEUKhEKIoJuOemuFBs40rFWbuN9kYFzwEg0HC4TCSJK3/QiKRQJZlZFkmHo//N7IsI0kSiqKgaRq/AbKDgxgo7zYPAAAAAElFTkSuQmCC</os:Image>
-<os:Url type="text/html" method="GET" template="http://trisquel.info/search/node/{searchTerms}?page={startPage}">
-</os:Url><os:Url type="application/rss+xml" method="GET" template="http://trisquel.info/opensearch/node/{searchTerms}?page={startPage}">
-</os:Url>
-</SearchPlugin>
-EOF
-
 sed '/You can uninstall/d; s/ask.com/Duck Duck GO!/; /Add the following options/d; /Get help on-line/d; /Help translating/d; /Trisquel Release/d; ' debian/control -i
 
 replace Mozilla GNU .

=== added file 'helpers/oneiric/make-unar'
--- a/helpers/oneiric/make-unar	1970-01-01 00:00:00 +0000
+++ b/helpers/oneiric/make-unar	2012-04-05 03:02:38 +0000
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+#    Copyright (C) 2011  Rub��n Rodr��guez <ruben en 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
+#    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
+EXTERNAL='deb-src http://ppa.launchpad.net/dns/misc/ubuntu oneiric main '
+
+. ./config
+
+changelog "Imported into Trisquel"
+
+compile

=== modified file 'helpers/oneiric/make-update-manager'
--- a/helpers/oneiric/make-update-manager	2012-03-15 00:04:50 +0000
+++ b/helpers/oneiric/make-update-manager	2012-04-05 03:02:38 +0000
@@ -21,7 +21,7 @@
 # gpg -ba release_name.tar.gz
 # Also, don't forget to update the meta-release files at archive and packages.t.i
 
-VERSION=3
+VERSION=4
 
 . ./config
 
@@ -229,7 +229,7 @@
 ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools
 # hints for for stuff that should be done early
 PostUpgradePurge=ltsp-client, ltspfsd
-PostUpgradeRemove=libflashsupport, kvm-source, gtk-qt-engine, libparted1.8-12, usplash, printconf, foomatic-db-gutenprint, ebox-printers, kbluetooth, kde-plasmoid-cwp, gdm, gnome-session gnome-shell abrowser-globalmenu appmenu-gtk3 appmenu-gtk 
+PostUpgradeRemove=libflashsupport, kvm-source, gtk-qt-engine, libparted1.8-12, usplash, printconf, foomatic-db-gutenprint, ebox-printers, kbluetooth, kde-plasmoid-cwp, gnome-session, gnome-shell, abrowser-globalmenu, appmenu-gtk3, appmenu-gtk 
 PostUpgradeUpgrade=brasero
 #PostUpgradeInstall=apt
 PostInstallScripts=./trisquel-postinstall.sh
@@ -249,7 +249,7 @@
 [trisquel]
 KeyDependencies=lightdm, trisquel-gtk-theme, trisquel-sounds
 # those pkgs will be marked remove right after the distUpgrade in the cache
-PostUpgradeRemove=gdm, gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner, 
+PostUpgradeRemove=gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner, gnome-session, gnome-shell, abrowser-globalmenu, appmenu-gtk3, appmenu-gtk
 ForcedObsoletes=desktop-effects, cups-pdf, policykit-gnome, gnome-mount
 
 [trisquel-mini]
@@ -319,7 +319,7 @@
 
 # Let's do some extra purging
 export DEBIAN_FRONTEND=noninteractive
-apt-get -y --force-yes remove gdm gnome-session gnome-shell abrowser-globalmenu appmenu-gtk3 appmenu-gtk gnome-screensaver
+apt-get -y --force-yes remove gnome-session gnome-shell abrowser-globalmenu appmenu-gtk3 appmenu-gtk
 dpkg -l trisquel |grep ii -q && apt-get -y --force-yes install trisquel-recommended
 dpkg -l trisquel-mini |grep ii -q && apt-get -y --force-yes install trisquel-mini-recommended
 

=== modified file 'makepackage'
--- a/makepackage	2012-03-15 00:04:50 +0000
+++ b/makepackage	2012-04-05 03:02:38 +0000
@@ -154,7 +154,7 @@
 }
 
 tmpumount(){
-[ $PACKAGE = "linux" ] && return
+  echo $PACKAGE | grep -q "linux" && return
   umount jails/$DISTRO-$ARCH/tmp && return
   fuser -k -m jails/$DISTRO-$ARCH/tmp
   umount jails/$DISTRO-$ARCH/tmp && return
@@ -162,7 +162,7 @@
   exit 1
 }
 tmpmount(){
-[ $PACKAGE = "linux" ] && return
+  echo $PACKAGE | grep -q "linux" && return
   grep jails/$DISTRO-$ARCH/tmp /proc/mounts -q && tmpumount
   mount -t tmpfs -o size=15G none jails/$DISTRO-$ARCH/tmp
 }

More information about the Trisquel-devel mailing list