[Trisquel-devel] Rev 44: Modified firefox helper to make it keep the useragent as Firefox, changes in gnome panel and menus in brigantia, icon theme fixed for brigantia in file:///home/bzr/package-helpers/trunk/
Ruben Rodriguez
ruben at trisquel.info
Mon Mar 19 20:35:33 CET 2012
At file:///home/bzr/package-helpers/trunk/
------------------------------------------------------------
revno: 44
revision-id: ruben en trisquel.info-20120319193532-dxj5dv4bohlx59yr
parent: ruben en trisquel.info-20120315000450-kxdbhznihp6lfi79
committer: Ruben Rodriguez <ruben en trisquel.info>
branch nick: trunk
timestamp: Mon 2012-03-19 20:35:32 +0100
message:
Modified firefox helper to make it keep the useragent as Firefox, changes in gnome panel and menus in brigantia, icon theme fixed for brigantia
------------ pr�xima parte ------------
=== modified file 'helpers/lucid/make-firefox'
--- a/helpers/lucid/make-firefox 2012-03-12 02:26:50 +0000
+++ b/helpers/lucid/make-firefox 2012-03-19 19:35:32 +0000
@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=3
+VERSION=5
QUILT=skip
. ./config
@@ -84,6 +84,10 @@
replace PACKAGES/abrowser PACKAGES/firefox .
sed s/Trisquel/Mozilla/ debian/compare-locales/scripts/compare-locales debian/compare-locales/scripts/test-locales -i
replace "iceweasel, abrowser" "iceweasel, firefox" .
+replace "Replaces: abrowser" "Replaces: firefox" .
+sed s/Ubuntu/Trisquel/g debian/rules -i
+sed s/ubuntu/trisquel/g debian/distribution.ini debian/config/mozconfig.in -i
+sed 's/ubuntu_version/trisquel_version/; s/Ubuntu 10.10/Trisquel 4.0/; s/1010/40/' -i debian/abrowser.postinst.in
# Redirect feedback menu
sed s:input.mozilla.com/feedback:trisquel.info/contact: -i mozilla/browser/base/content/utilityOverlay.js
@@ -217,6 +221,9 @@
pref("general.useragent.vendorComment", "$CODENAME");
pref("general.useragent.vendorSub", "$REVISION");
+// Set useragent to Firefox compatible
+pref("general.useragent.compatMode.abrowser",true);
+
pref ("browser.startup.page" , 3);
//user_pref ("browser.startup.homepage" , "http://trisquel.info");
user_pref ("startup.homepage_welcome_url", "http://trisquel.info/welcome");
@@ -324,6 +331,9 @@
replace "Trisquel Corporation" "Mozilla Corporation" .
sed -i 's/iceweasel, abrowser, icecat,/iceweasel, firefox, icecat,/g' debian/control*
+# Restore useragent to Firefox
+sed '/MOZ_UA_ABROWSER_VERSION/ s:Abrowser/:Firefox/:;' -i mozilla/netwerk/protocol/http/nsHttpHandler.cpp
+
tar -cjf $TARBALL mozilla
rm mozilla -rf
#cp $DATA/control debian/control
=== modified file 'helpers/maverick/make-firefox'
--- a/helpers/maverick/make-firefox 2012-03-12 02:26:50 +0000
+++ b/helpers/maverick/make-firefox 2012-03-19 19:35:32 +0000
@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=3
+VERSION=5
QUILT=skip
. ./config
@@ -84,6 +84,10 @@
replace PACKAGES/abrowser PACKAGES/firefox .
sed s/Trisquel/Mozilla/ debian/compare-locales/scripts/compare-locales debian/compare-locales/scripts/test-locales -i
replace "iceweasel, abrowser" "iceweasel, firefox" .
+replace "Replaces: abrowser" "Replaces: firefox" .
+sed s/Ubuntu/Trisquel/g debian/rules -i
+sed s/ubuntu/trisquel/g debian/distribution.ini debian/config/mozconfig.in -i
+sed 's/ubuntu_version/trisquel_version/; s/Ubuntu 10.10/Trisquel 4.0/; s/1010/40/' -i debian/abrowser.postinst.in
# Redirect feedback menu
sed s:input.mozilla.com/feedback:trisquel.info/contact: -i mozilla/browser/base/content/utilityOverlay.js
@@ -217,6 +221,9 @@
pref("general.useragent.vendorComment", "$CODENAME");
pref("general.useragent.vendorSub", "$REVISION");
+// Set useragent to Firefox compatible
+pref("general.useragent.compatMode.abrowser",true);
+
pref ("browser.startup.page" , 3);
//user_pref ("browser.startup.homepage" , "http://trisquel.info");
user_pref ("startup.homepage_welcome_url", "http://trisquel.info/welcome");
@@ -324,6 +331,9 @@
replace "Trisquel Corporation" "Mozilla Corporation" .
sed -i 's/iceweasel, abrowser, icecat,/iceweasel, firefox, icecat,/g' debian/control*
+# Restore useragent to Firefox
+sed '/MOZ_UA_ABROWSER_VERSION/ s:Abrowser/:Firefox/:;' -i mozilla/netwerk/protocol/http/nsHttpHandler.cpp
+
tar -cjf $TARBALL mozilla
rm mozilla -rf
#cp $DATA/control debian/control
=== modified file 'helpers/natty/make-firefox'
--- a/helpers/natty/make-firefox 2012-03-12 02:26:50 +0000
+++ b/helpers/natty/make-firefox 2012-03-19 19:35:32 +0000
@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=3
+VERSION=5
QUILT=skip
. ./config
@@ -84,6 +84,10 @@
replace PACKAGES/abrowser PACKAGES/firefox .
sed s/Trisquel/Mozilla/ debian/compare-locales/scripts/compare-locales debian/compare-locales/scripts/test-locales -i
replace "iceweasel, abrowser" "iceweasel, firefox" .
+replace "Replaces: abrowser" "Replaces: firefox" .
+sed s/Ubuntu/Trisquel/g debian/rules -i
+sed s/ubuntu/trisquel/g debian/distribution.ini debian/config/mozconfig.in -i
+sed 's/ubuntu_version/trisquel_version/; s/Ubuntu 10.10/Trisquel 4.0/; s/1010/40/' -i debian/abrowser.postinst.in
# Redirect feedback menu
sed s:input.mozilla.com/feedback:trisquel.info/contact: -i mozilla/browser/base/content/utilityOverlay.js
@@ -217,6 +221,9 @@
pref("general.useragent.vendorComment", "$CODENAME");
pref("general.useragent.vendorSub", "$REVISION");
+// Set useragent to Firefox compatible
+pref("general.useragent.compatMode.abrowser",true);
+
pref ("browser.startup.page" , 3);
//user_pref ("browser.startup.homepage" , "http://trisquel.info");
user_pref ("startup.homepage_welcome_url", "http://trisquel.info/welcome");
@@ -324,6 +331,9 @@
replace "Trisquel Corporation" "Mozilla Corporation" .
sed -i 's/iceweasel, abrowser, icecat,/iceweasel, firefox, icecat,/g' debian/control*
+# Restore useragent to Firefox
+sed '/MOZ_UA_ABROWSER_VERSION/ s:Abrowser/:Firefox/:;' -i mozilla/netwerk/protocol/http/nsHttpHandler.cpp
+
tar -cjf $TARBALL mozilla
rm mozilla -rf
#cp $DATA/control debian/control
=== modified file 'helpers/oneiric/DATA/gnome-menus/applications.menu'
--- a/helpers/oneiric/DATA/gnome-menus/applications.menu 2012-03-12 02:26:50 +0000
+++ b/helpers/oneiric/DATA/gnome-menus/applications.menu 2012-03-19 19:35:32 +0000
@@ -228,6 +228,7 @@
<Include>
<Filename>gnome-app-install.desktop</Filename>
+ <Filename>gnome-control-center.desktop</Filename>
</Include>
<!-- Separator between menus and gnome-app-install -->
@@ -247,6 +248,7 @@
<Menuname>wine-wine</Menuname>
<Separator/>
<Filename>gnome-app-install.desktop</Filename>
+ <Filename>gnome-control-center.desktop</Filename>
</Layout>
</Menu> <!-- End Applications -->
=== added file 'helpers/oneiric/DATA/gnome-panel/hide-online-accounts-menu.patch'
--- a/helpers/oneiric/DATA/gnome-panel/hide-online-accounts-menu.patch 1970-01-01 00:00:00 +0000
+++ b/helpers/oneiric/DATA/gnome-panel/hide-online-accounts-menu.patch 2012-03-19 19:35:32 +0000
@@ -0,0 +1,17 @@
+diff -ru gnome-panel-3.2.0.orig//gnome-panel/menu.c gnome-panel-3.2.0/gnome-panel/menu.c
+--- gnome-panel-3.2.0.orig//gnome-panel/menu.c 2011-08-01 17:39:56.000000000 +0000
++++ gnome-panel-3.2.0/gnome-panel/menu.c 2012-03-15 15:56:00.000000000 +0000
+@@ -1388,10 +1388,10 @@
+ gtk_menu_shell_append (GTK_MENU_SHELL (main_menu), item);
+ gtk_widget_show (item);
+
+- item = panel_desktop_menu_item_new (TRUE, FALSE);
++ /* item = panel_desktop_menu_item_new (TRUE, FALSE);
+ panel_desktop_menu_item_set_panel (item, panel);
+ gtk_menu_shell_append (GTK_MENU_SHELL (main_menu), item);
+- gtk_widget_show (item);
++ gtk_widget_show (item);*/
+
+ panel_menu_items_append_lock_logout (main_menu);
+ }
+Only in gnome-panel-3.2.0.orig/: po
=== added file 'helpers/oneiric/make-gnome-colors'
--- a/helpers/oneiric/make-gnome-colors 1970-01-01 00:00:00 +0000
+++ b/helpers/oneiric/make-gnome-colors 2012-03-19 19:35:32 +0000
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# Copyright (C) 2008-2010 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 's/Depends: gnome-colors-common,/Depends: gnome-colors-common, gnome-icon-theme-full/' -i debian/control
+
+changelog "Fixed installation problem"
+
+compile
+
=== modified file 'helpers/oneiric/make-gnome-menus'
--- a/helpers/oneiric/make-gnome-menus 2012-03-12 02:26:50 +0000
+++ b/helpers/oneiric/make-gnome-menus 2012-03-19 19:35:32 +0000
@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=2
+VERSION=4
COMPONENT=main
. ./config
=== modified file 'helpers/oneiric/make-gnome-panel'
--- a/helpers/oneiric/make-gnome-panel 2012-03-12 02:26:50 +0000
+++ b/helpers/oneiric/make-gnome-panel 2012-03-19 19:35:32 +0000
@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=5
+VERSION=6
. ./config
@@ -82,6 +82,9 @@
# This patch allows @instance-config/location in the default layout
patch -p1 < $DATA/gnome-panel-improved-default-layout-handling.patch
+# We don't want to show the gnome-online-accounts stuff yet
+patch -p1 < $DATA/hide-online-accounts-menu.patch
+
changelog "Changed default layout"
compile
More information about the Trisquel-devel
mailing list