Description: Customize the default bookmarks for Ubuntu
Author: Alexander Sack <asac@ubuntu.com>
Forwarded: not-needed

--- a/browser/components/places/tests/unit/head_bookmarks.js
+++ b/browser/components/places/tests/unit/head_bookmarks.js
@@ -29,7 +29,7 @@ updateAppInfo({
 
 // Default bookmarks constants.
 const DEFAULT_BOOKMARKS_ON_TOOLBAR = 1;
-const DEFAULT_BOOKMARKS_ON_MENU = 1;
+const DEFAULT_BOOKMARKS_ON_MENU = 2;
 
 function checkItemHasAnnotation(guid, name) {
   return PlacesUtils.promiseItemId(guid).then(id => {
--- a/browser/locales/generic/profile/bookmarks.html.in
+++ b/browser/locales/generic/profile/bookmarks.html.in
@@ -47,4 +47,11 @@
             <dt><a href="https://planet.mozilla.org/" icon="@mozilla_icon@">@planet@</a>
         </dl>
 #endif
+    <p><dt><h3>Ubuntu and Free Software links</h3></dt>
+        <dl><p>
+            <dt><a href="http://www.ubuntu.com/" icon="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACSklEQVQ4jX1TXWhSYRj+ZMxRN7vpZuwiRrBREchgxS6CQXTn1EULyWiFdIQQRCu6yI0Yg4KUJIOhNCSiusqLbmSMLroQ2WgRw5Oxc456NHeOOmPqMX/W4ekm/46uF76bl/d53p/n+QhRRImLjWf9Djdvm9xmZ1UyO6uSedvkdtbvcJe42LiyvisKQZedMQzWWC1Bv8cYBmuFoMveA6RpWv3z0aWNo4CslqDOx9BIMw1Wp5IzzsvrNE2rWwSi59arLoBOhZzHitLGW5Q/vYewNIc6t4NGhgOrU4HVEmT9DjchhBBpd0vD6lRyE5yyTkNcMaGyuY5m1PkYhKU5JG+e6mwil5mvZ4jopXzNZPzaCVS/b6KeoBE3jiB5ewKJ66PIeayQpSL+HOTB3znXIskFHj4hSfMY10wUXi8DAPKrD3pukHVRAAAp/LGVS1omYoTVEvx69xTybwl7Tj3qfAzx+eEeAu7KcRRDARwEX7ZV0Q80CKMfaBTWFiFLRaTtMzjMpsAZ1H2VSNsugrdoOkiPVUh8YTTdWmFtEQCw59T3gu0zAIBiKNC9gvjM9KZ1xPlh1H58QTUaQdw4gsSNk+AMagjLRjQyHA73M11KCF7LKqlEw1OdncQVE7IuCuXPH9oycjsQHl9F0nxaIeO3s4QQQoTnCwHlyPkXNhRDARRDAaTunkc1GkE1Gmk38lK+lhMZhhlK37sQ+Z+V/60ms1qC9P3pcJeVmyT9JlE+0Uv5GIYZOvJHVqLhKdFL+ToNljSPcaKX8km7Wxpl/V9ZLTo82gQ36wAAAABJRU5ErkJggg==">Ubuntu</a>
+            <dt><a href="http://wiki.ubuntu.com" icon="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACmklEQVQ4jY2TX0hTcRzFj+7v3b+7zS0357wuNTfM9bB7g2tbGGaEYkhhJbUeRiiSpkEoSKRFUgjLFgRa/qE/SBGWYGgzNMg07EGEIvxDWZnggyCUhuZ2fz2IkTbJ8/4533MOfIEtqsXnUw9XleRW+nzqLQFdRXGKkfMWfuis+eAVnrKMpSv7CEeT5ymKXgCaTcHum8my8ixlbLiBmScBGyEBG/Hn6+6Ppak+EI4mvamKKQDpEeHafK126i47cnSv3nfnuOHRmsFcnfXHiVRZfbFB2rkvXtYEwBLRYMDvbCdBD5lsZb9uUyLbYRJf1spx8YBd3jhaGTe95GcWhQYmnOOQewFEr4PddvUOoccdJkEPqT1pfQuAMxqhKuBBuXSg1WJ4Ji5YpknARl5XmN4DMAEAPDapc7Dc3F6WSRe/ueF8t9DJ/6KkqNTr1w9VAIjOuNVVoetMeNnPrOhlyAYADJ8z95CAjXyvT1goyTM3jbe65gFkA4jaWDEB0MVIcEorQQUAFkAUqvdrakINTOiB1zjZWJbUv9DJL8vFyIq0UbNN7hVYzUrIpV42ScCtHdFLRShkjJLScLc7RIIeUl1obUwGZH/DLxMhn96lGiUcTYYcytmNKcUAFC+upfWToIdMtLFzFjH4W3GUtS0R8kE7xc84Va8IRxPBpRFyaVEHANs/Ec20xDXR6prJ43VPbzPUY4HVCAKrCRGOJg+T5B9PGyR9RUZpEMBhANJINUVqChlJUhxbcWkWCUcTwtHkWQr1rcZrHVjqyvh5yWttBqCPBAMAaoHoeIAyiHAohxY1F2jFHdul0Vc/32O/kKCHjLewswAcmxqsKXN1Fy2AWAD6I3tiSoN1Oz/l7tY/AWD/r0EEKQFwWH2kP/1/Aw7z2faOzA5FAAAAAElFTkSuQmCC">Ubuntu Wiki (community-edited website)</a>
+            <dt><a href="https://answers.launchpad.net/ubuntu/+addquestion" icon="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAEgSURBVDiNpZO7SgNBGIW/2awDaTRJs7FaEdfCylcQsbT2AcTSN/ABtvAJAj6AlfYWIjaCjYWwBC0kWISQgBd0sxfntwi6Jibrmpxy5sx3Dv/MKBERZpA1upAkCXEcTwcIggDf92m1WtMBoijCGFP48C/AqKR/j3m9AkkwT2fI+y0wPDI7D5A+HGC6xyhdR+L2IHFhg7m1UyjN/93gO2WlgV6/plTfwzyfkz4eFmvwJau2PTAvLfPRPkJeLrK9IoAsroayq0jSzQdMelvydoOkPVTZy5g/DVprADqdDp6XmdK7XVAa0zsBoLS4Px7gui6O4xCG4XBy2ETCJqq8iu01sCqbQ3UnKg52pH+Za5H/DXGMcq/Rqm6h7EouQM36nT8B8aKcEoKd93oAAAAASUVORK5CYII=">Make a Support Request to the Ubuntu Community</a>
+            <dt><a href="http://www.debian.org/" icon="data:image/x-icon;base64,[encoded data, 6280 characters]">Debian (Ubuntu is based on Debian)</a>
+        </dl>
 </dl>
