Changeset 6406


Ignore:
Timestamp:
Feb 6, 2012, 2:18:13 PM (7 years ago)
Author:
pmmf
Message:

Update firefox to 10

Location:
packages/cm16/firefox
Files:
4 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • packages/cm16/firefox/cmiffy/debdiff.patch

    r5606 r6406  
    1 diff -u firefox-7.0.1+build1+nobinonly/debian/control firefox-7.0.1+build1+nobinonly/debian/control
    2 --- firefox-7.0.1+build1+nobinonly/debian/control
    3 +++ firefox-7.0.1+build1+nobinonly/debian/control
    4 @@ -60,7 +60,7 @@
    5  Replaces: abrowser,
    6         abrowser-branding,
    7         firefox-branding,
    8 -       kubuntu-firefox-installer
    9 +       caixamagicakde-firefox-installer
    10  Breaks: abrowser (<= 4.0~b11+build3+nobinonly-0ubuntu1),
    11         abrowser-branding (<= 4.0~b11+build3+nobinonly-0ubuntu1),
    12         firefox-branding (<= 4.0~b11+build3+nobinonly-0ubuntu1)
    13 diff -u firefox-7.0.1+build1+nobinonly/debian/changelog firefox-7.0.1+build1+nobinonly/debian/changelog
    14 --- firefox-7.0.1+build1+nobinonly/debian/changelog
    15 +++ firefox-7.0.1+build1+nobinonly/debian/changelog
    16 @@ -1,3 +1,14 @@
    17 +firefox (7.0.1+build1+nobinonly-0xcm0.11.04.2xcm1) horn; urgency=low
    18 +
    19 +  * debian/patches:
    20 +    - Add caixamagica bookmarks
    21 +  * debian/distribution.ini:
    22 +    - Distro is CaixaMagica
    23 +  * debian/rules:
    24 +    - Accept distro as CaixaMagica
    25 +
    26 + -- Pedro Fragoso <pedro.fragoso@caixamagica.pt>  Fri, 30 Sep 2011 12:07:49 +0100
    27 +
    28  firefox (7.0.1+build1+nobinonly-0ubuntu0.11.04.1) natty-security; urgency=low
    29  
    30    * New upstream stable release v7.0.1 (FIREFOX_7_0_1_BUILD1)
    31 diff -u firefox-7.0.1+build1+nobinonly/debian/control.in firefox-7.0.1+build1+nobinonly/debian/control.in
    32 --- firefox-7.0.1+build1+nobinonly/debian/control.in
    33 +++ firefox-7.0.1+build1+nobinonly/debian/control.in
    34 @@ -60,7 +60,7 @@
    35  Replaces: abrowser,
    36         abrowser-branding,
    37         firefox-branding,
    38 -       kubuntu-firefox-installer
    39 +       caixamagicakde-firefox-installer
    40  Breaks: abrowser (<= 4.0~b11+build3+nobinonly-0ubuntu1),
    41         abrowser-branding (<= 4.0~b11+build3+nobinonly-0ubuntu1),
    42         firefox-branding (<= 4.0~b11+build3+nobinonly-0ubuntu1)
    43 diff -u firefox-7.0.1+build1+nobinonly/debian/rules firefox-7.0.1+build1+nobinonly/debian/rules
    44 --- firefox-7.0.1+build1+nobinonly/debian/rules
    45 +++ firefox-7.0.1+build1+nobinonly/debian/rules
    46 @@ -114,6 +114,11 @@
    47         DISTRIB_VERSION_MINOR := $(shell lsb_release -s -r | cut -d '.' -f 2)
    48  endif
    49  
    50 +ifneq (,$(filter $(DISTRIB),CaixaMagica))
    51 +       DISTRIB_VERSION_MAJOR := $(shell lsb_release -s -r | cut -d '.' -f 1)
    52 +       DISTRIB_VERSION_MINOR := $(shell lsb_release -s -r | cut -d '.' -f 2)
    53 +endif
    54 +
    55  ifneq ($(MOZ_APP_NAME),$(MOZ_APP_BASENAME))
    56         # We don't want to make builds which change MOZ_APP_NAME official
    57         MOZ_BUILD_UNOFFICIAL = 1
    58 diff -u firefox-7.0.1+build1+nobinonly/debian/distribution.ini firefox-7.0.1+build1+nobinonly/debian/distribution.ini
    59 --- firefox-7.0.1+build1+nobinonly/debian/distribution.ini
    60 +++ firefox-7.0.1+build1+nobinonly/debian/distribution.ini
     1diff -u firefox-10.0+build1/debian/distribution.ini firefox-10.0+build1/debian/distribution.ini
     2--- firefox-10.0+build1/debian/distribution.ini
     3+++ firefox-10.0+build1/debian/distribution.ini
    614@@ -2,8 +2,8 @@
    625-id=canonical
     
    7316+app.distributor.channel = “caixamagica”
    7417+app.partner.ubuntu = “caixamagica”
    75 diff -u firefox-7.0.1+build1+nobinonly/debian/patches/series firefox-7.0.1+build1+nobinonly/debian/patches/series
    76 --- firefox-7.0.1+build1+nobinonly/debian/patches/series
    77 +++ firefox-7.0.1+build1+nobinonly/debian/patches/series
    78 @@ -1,17 +1,14 @@
     18diff -u firefox-10.0+build1/debian/control firefox-10.0+build1/debian/control
     19--- firefox-10.0+build1/debian/control
     20+++ firefox-10.0+build1/debian/control
     21@@ -59,7 +59,7 @@
     22 Replaces: abrowser,
     23        abrowser-branding,
     24        firefox-branding,
     25-       kubuntu-firefox-installer
     26+       caixamagicakde-firefox-installer
     27 Breaks: abrowser (<= 4.0~b11+build3+nobinonly-0ubuntu1),
     28        abrowser-branding (<= 4.0~b11+build3+nobinonly-0ubuntu1),
     29        firefox-branding (<= 4.0~b11+build3+nobinonly-0ubuntu1)
     30diff -u firefox-10.0+build1/debian/control.in firefox-10.0+build1/debian/control.in
     31--- firefox-10.0+build1/debian/control.in
     32+++ firefox-10.0+build1/debian/control.in
     33@@ -57,7 +57,7 @@
     34 Replaces: abrowser,
     35        abrowser-branding,
     36        firefox-branding,
     37-       kubuntu-firefox-installer
     38+       caixamagicakde-firefox-installer
     39 Breaks: abrowser (<= 4.0~b11+build3+nobinonly-0ubuntu1),
     40        abrowser-branding (<= 4.0~b11+build3+nobinonly-0ubuntu1),
     41        firefox-branding (<= 4.0~b11+build3+nobinonly-0ubuntu1)
     42diff -u firefox-10.0+build1/debian/rules firefox-10.0+build1/debian/rules
     43--- firefox-10.0+build1/debian/rules
     44+++ firefox-10.0+build1/debian/rules
     45@@ -133,6 +133,11 @@
     46 
     47 include $(CURDIR)/debian/build/testsuite.mk
     48 
     49+ifneq (,$(filter $(DISTRIB),CaixaMagica))
     50+       DISTRIB_VERSION_MAJOR := $(shell lsb_release -s -r | cut -d '.' -f 1)
     51+       DISTRIB_VERSION_MINOR := $(shell lsb_release -s -r | cut -d '.' -f 2)
     52+endif
     53+
     54 ifneq ($(MOZ_APP_NAME),$(MOZ_APP_BASENAME))
     55        # We don't want to make builds which change MOZ_APP_NAME official
     56        MOZ_BUILD_UNOFFICIAL = 1
     57diff -u firefox-10.0+build1/debian/changelog firefox-10.0+build1/debian/changelog
     58--- firefox-10.0+build1/debian/changelog
     59+++ firefox-10.0+build1/debian/changelog
     60@@ -1,3 +1,14 @@
     61+firefox (10.0+build1-0xcm0.11.04.2) oneiric; urgency=low
     62+
     63+  * debian/patches:
     64+    - Add caixamagica bookmarks
     65+  * debian/distribution.ini:
     66+    - Distro is CaixaMagica
     67+  * debian/rules:
     68+    - Accept distro as CaixaMagica*
     69+
     70+ -- Pedro Fragoso <pedro.fragoso@caixamagica.pt>  Mon, 06 Feb 2012 11:29:34 +0000
     71+
     72 firefox (10.0+build1-0ubuntu0.11.04.1) natty-security; urgency=low
     73 
     74   * New upstream stable release (FIREFOX_10_0_BUILD1)
     75diff -u firefox-10.0+build1/debian/patches/series firefox-10.0+build1/debian/patches/series
     76--- firefox-10.0+build1/debian/patches/series
     77+++ firefox-10.0+build1/debian/patches/series
     78@@ -1,14 +1,11 @@
    7979 reload-new-plugins.patch
    8080-ubuntu-codes-amazon.patch
    8181-ubuntu-bookmarks.patch
     82+caixamagica-bookmarks.patch
    8283 distro-locale-searchplugins.patch
    8384 normalize-distribution-searchplugins.patch
    84  #dont-reset-user-prefs-on-upgrade.patch
    8585-ubuntu-codes-google.patch
    8686 plugin-for-mimetype-pref.patch
     
    8888 mozilla-kde.patch
    8989 firefox-kde.patch
     90-ubuntu-codes-baidu.patch
    9091 unity-globalmenu-build-support.patch
    91  #fix-selection-drag-autoscroll.patch
    92 -ubuntu-codes-baidu.patch
    93 +caixamagica-bookmarks.patch
    94  printf-fix.patch
    95  only-add-ENABLE_JIT-to-CXXFLAGS-if-jit-is-enabled.patch
    96  build-fix-for-no-ENABLE_YARR_JIT.patch
     92 ubuntu-ua-string-changes.patch
     93 #@ARCH=powerpc@fix-build-failure-without-yarr-jit.patch
    9794only in patch2:
    9895unchanged:
    99 --- firefox-7.0.1+build1+nobinonly.orig/debian/patches/caixamagica-bookmarks.patch
    100 +++ firefox-7.0.1+build1+nobinonly/debian/patches/caixamagica-bookmarks.patch
     96--- firefox-10.0+build1.orig/debian/patches/caixamagica-bookmarks.patch
     97+++ firefox-10.0+build1/debian/patches/caixamagica-bookmarks.patch
    10198@@ -0,0 +1,24 @@
    10299+Description: Caixa Magica Bookmarks
Note: See TracChangeset for help on using the changeset viewer.