[Trisquel-devel] Rev 53: Updated firefox for v13 changes, updated ubufox to close #5559 in file:///home/bzr/package-helpers/trunk/

Ruben Rodriguez ruben at trisquel.info
Sun Jun 10 04:38:08 CEST 2012


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

------------------------------------------------------------
revno: 53
revision-id: ruben en trisquel.info-20120610023718-20wlympj0bltp17t
parent: ruben en trisquel.info-20120610023530-b3v4n05ecqc9a2ky
committer: Ruben Rodriguez <ruben en trisquel.info>
branch nick: trunk
timestamp: Sun 2012-06-10 04:37:18 +0200
message:
  Updated firefox for v13 changes, updated ubufox to close #5559
------------ pr�xima parte ------------
=== modified file 'helpers/lucid/make-firefox'
--- a/helpers/lucid/make-firefox	2012-05-30 22:13:23 +0000
+++ b/helpers/lucid/make-firefox	2012-06-10 02:37:18 +0000
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=6
+VERSION=7
 QUILT=skip
 
 . ./config
@@ -82,7 +82,7 @@
 replace " Mozilla " " Trisquel " .
 sed -i '1s/^Source:.*/Source: firefox/' debian/control*
 replace PACKAGES/abrowser PACKAGES/firefox .
-sed s/Trisquel/Mozilla/ debian/compare-locales/scripts/compare-locales debian/compare-locales/scripts/test-locales -i
+sed s/Trisquel/Mozilla/ debian/compare-locales/scripts/compare-locales -i
 replace "iceweasel, abrowser" "iceweasel, firefox" .
 replace "Replaces: abrowser" "Replaces: firefox" .
 sed s/Ubuntu/Trisquel/g debian/rules -i
@@ -120,16 +120,16 @@
  #ifdef MENUBAR_CAN_AUTOHIDE
               toolbarname="&menubarCmd.label;"
               accesskey="&menubarCmd.accesskey;"
-@@ -503,7 +503,7 @@
+@@ -473,7 +473,7 @@
               toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;"
               fullscreentoolbar="true" mode="icons" customizable="true"
               iconsize="large"
--             defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,home-button,bookmarks-menu-button-container,fullscreenflex,window-controls"
+-             defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,home-button,bookmarks-menu-button-container,window-controls"
 +             defaultset="unified-back-forward-button,reload-button,stop-button,home-button,urlbar-container,search-container,fullscreenflex,window-controls"
               context="toolbar-context-menu">
  
        <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
-@@ -744,7 +745,7 @@
+@@ -724,7 +725,7 @@
               context="toolbar-context-menu"
               defaultset="personal-bookmarks"
               toolbarname="&personalbarCmd.label;" accesskey="&personalbarCmd.accesskey;"
@@ -244,7 +244,7 @@
 
 find -wholename '*branding/brand.dtd' |xargs sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i
 
-for STRING in community.start2 community.mozillaLink community.middle2 community.creditsLink community.end2 contribute.start contribute.getInvolvedLink contribute.end channel.description.start channel.description.end
+for STRING in community.end3 community.exp.end community.start2 community.mozillaLink community.middle2 community.creditsLink community.end2 contribute.start contribute.getInvolvedLink contribute.end channel.description.start channel.description.end
 do
  find -name aboutDialog.dtd | xargs sed -i "s/ENTITY $STRING.*/ENTITY $STRING \"\">/"
 done

=== modified file 'helpers/lucid/make-ubufox'
--- a/helpers/lucid/make-ubufox	2012-05-30 22:13:23 +0000
+++ b/helpers/lucid/make-ubufox	2012-06-10 02:37:18 +0000
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=12
+VERSION=13
 
 . ./config
 
@@ -94,7 +94,7 @@
 pref("general.useragent.compatMode.abrowser",true);
 
 // Startup pages
-pref ("browser.startup.page" , 3);
+//pref ("browser.startup.page" , 3);
 //pref ("browser.startup.homepage" , "http://trisquel.info");
 //pref ("startup.homepage_welcome_url", "http://trisquel.info/welcome");
 pref ("startup.homepage_override_url" , "http://trisquel.info/newbrowser");

=== modified file 'helpers/maverick/make-ubufox'
--- a/helpers/maverick/make-ubufox	2012-05-30 22:13:23 +0000
+++ b/helpers/maverick/make-ubufox	2012-06-10 02:37:18 +0000
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=12
+VERSION=13
 
 . ./config
 
@@ -94,7 +94,7 @@
 pref("general.useragent.compatMode.abrowser",true);
 
 // Startup pages
-pref ("browser.startup.page" , 3);
+//pref ("browser.startup.page" , 3);
 //pref ("browser.startup.homepage" , "http://trisquel.info");
 //pref ("startup.homepage_welcome_url", "http://trisquel.info/welcome");
 pref ("startup.homepage_override_url" , "http://trisquel.info/newbrowser");

=== modified file 'helpers/natty/make-firefox'
--- a/helpers/natty/make-firefox	2012-05-30 22:13:23 +0000
+++ b/helpers/natty/make-firefox	2012-06-10 02:37:18 +0000
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=6
+VERSION=7
 QUILT=skip
 
 . ./config
@@ -82,7 +82,7 @@
 replace " Mozilla " " Trisquel " .
 sed -i '1s/^Source:.*/Source: firefox/' debian/control*
 replace PACKAGES/abrowser PACKAGES/firefox .
-sed s/Trisquel/Mozilla/ debian/compare-locales/scripts/compare-locales debian/compare-locales/scripts/test-locales -i
+sed s/Trisquel/Mozilla/ debian/compare-locales/scripts/compare-locales -i
 replace "iceweasel, abrowser" "iceweasel, firefox" .
 replace "Replaces: abrowser" "Replaces: firefox" .
 sed s/Ubuntu/Trisquel/g debian/rules -i
@@ -120,16 +120,16 @@
  #ifdef MENUBAR_CAN_AUTOHIDE
               toolbarname="&menubarCmd.label;"
               accesskey="&menubarCmd.accesskey;"
-@@ -503,7 +503,7 @@
+@@ -473,7 +473,7 @@
               toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;"
               fullscreentoolbar="true" mode="icons" customizable="true"
               iconsize="large"
--             defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,home-button,bookmarks-menu-button-container,fullscreenflex,window-controls"
+-             defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,home-button,bookmarks-menu-button-container,window-controls"
 +             defaultset="unified-back-forward-button,reload-button,stop-button,home-button,urlbar-container,search-container,fullscreenflex,window-controls"
               context="toolbar-context-menu">
  
        <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
-@@ -744,7 +745,7 @@
+@@ -724,7 +725,7 @@
               context="toolbar-context-menu"
               defaultset="personal-bookmarks"
               toolbarname="&personalbarCmd.label;" accesskey="&personalbarCmd.accesskey;"
@@ -244,7 +244,7 @@
 
 find -wholename '*branding/brand.dtd' |xargs sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i
 
-for STRING in community.start2 community.mozillaLink community.middle2 community.creditsLink community.end2 contribute.start contribute.getInvolvedLink contribute.end channel.description.start channel.description.end
+for STRING in community.end3 community.exp.end community.start2 community.mozillaLink community.middle2 community.creditsLink community.end2 contribute.start contribute.getInvolvedLink contribute.end channel.description.start channel.description.end
 do
  find -name aboutDialog.dtd | xargs sed -i "s/ENTITY $STRING.*/ENTITY $STRING \"\">/"
 done

=== modified file 'helpers/natty/make-ubufox'
--- a/helpers/natty/make-ubufox	2012-05-30 22:13:23 +0000
+++ b/helpers/natty/make-ubufox	2012-06-10 02:37:18 +0000
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=12
+VERSION=13
 
 . ./config
 
@@ -94,7 +94,7 @@
 pref("general.useragent.compatMode.abrowser",true);
 
 // Startup pages
-pref ("browser.startup.page" , 3);
+//pref ("browser.startup.page" , 3);
 //pref ("browser.startup.homepage" , "http://trisquel.info");
 //pref ("startup.homepage_welcome_url", "http://trisquel.info/welcome");
 pref ("startup.homepage_override_url" , "http://trisquel.info/newbrowser");

=== modified file 'helpers/oneiric/make-firefox'
--- a/helpers/oneiric/make-firefox	2012-05-30 22:13:23 +0000
+++ b/helpers/oneiric/make-firefox	2012-06-10 02:37:18 +0000
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=6
+VERSION=7
 QUILT=skip
 
 . ./config
@@ -82,7 +82,7 @@
 replace " Mozilla " " Trisquel " .
 sed -i '1s/^Source:.*/Source: firefox/' debian/control*
 replace PACKAGES/abrowser PACKAGES/firefox .
-sed s/Trisquel/Mozilla/ debian/compare-locales/scripts/compare-locales debian/compare-locales/scripts/test-locales -i
+sed s/Trisquel/Mozilla/ debian/compare-locales/scripts/compare-locales -i
 replace "iceweasel, abrowser" "iceweasel, firefox" .
 replace "Replaces: abrowser" "Replaces: firefox" .
 sed s/Ubuntu/Trisquel/g debian/rules -i
@@ -120,16 +120,16 @@
  #ifdef MENUBAR_CAN_AUTOHIDE
               toolbarname="&menubarCmd.label;"
               accesskey="&menubarCmd.accesskey;"
-@@ -503,7 +503,7 @@
+@@ -473,7 +473,7 @@
               toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;"
               fullscreentoolbar="true" mode="icons" customizable="true"
               iconsize="large"
--             defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,home-button,bookmarks-menu-button-container,fullscreenflex,window-controls"
+-             defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,home-button,bookmarks-menu-button-container,window-controls"
 +             defaultset="unified-back-forward-button,reload-button,stop-button,home-button,urlbar-container,search-container,fullscreenflex,window-controls"
               context="toolbar-context-menu">
  
        <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
-@@ -744,7 +745,7 @@
+@@ -724,7 +725,7 @@
               context="toolbar-context-menu"
               defaultset="personal-bookmarks"
               toolbarname="&personalbarCmd.label;" accesskey="&personalbarCmd.accesskey;"
@@ -244,7 +244,7 @@
 
 find -wholename '*branding/brand.dtd' |xargs sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i
 
-for STRING in community.start2 community.mozillaLink community.middle2 community.creditsLink community.end2 contribute.start contribute.getInvolvedLink contribute.end channel.description.start channel.description.end
+for STRING in community.end3 community.exp.end community.start2 community.mozillaLink community.middle2 community.creditsLink community.end2 contribute.start contribute.getInvolvedLink contribute.end channel.description.start channel.description.end
 do
  find -name aboutDialog.dtd | xargs sed -i "s/ENTITY $STRING.*/ENTITY $STRING \"\">/"
 done

=== modified file 'helpers/oneiric/make-ubufox'
--- a/helpers/oneiric/make-ubufox	2012-05-30 22:13:23 +0000
+++ b/helpers/oneiric/make-ubufox	2012-06-10 02:37:18 +0000
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=12
+VERSION=13
 
 . ./config
 
@@ -94,7 +94,7 @@
 pref("general.useragent.compatMode.abrowser",true);
 
 // Startup pages
-pref ("browser.startup.page" , 3);
+//pref ("browser.startup.page" , 3);
 //pref ("browser.startup.homepage" , "http://trisquel.info");
 //pref ("startup.homepage_welcome_url", "http://trisquel.info/welcome");
 pref ("startup.homepage_override_url" , "http://trisquel.info/newbrowser");



More information about the Trisquel-devel mailing list