--- firefox-3.5-3.5.3+build1+nobinonly.orig/mozilla-1.9.1-3.5.3+build1-source.tar.bz2.cdbs-config_list +++ firefox-3.5-3.5.3+build1+nobinonly/mozilla-1.9.1-3.5.3+build1-source.tar.bz2.cdbs-config_list @@ -0,0 +1,83 @@ +mozilla/build/autoconf/config.guess +mozilla/build/autoconf/config.sub +mozilla/config/config.mk +mozilla/js/src/build/autoconf/config.guess +mozilla/js/src/build/autoconf/config.sub +mozilla/js/src/config.mk +mozilla/js/src/config/config.mk +mozilla/js/tests/config.mk +mozilla/js/tests/config.sh +mozilla/media/libfishsound/include/fishsound/config.h +mozilla/media/libfishsound/src/libfishsound/config.h +mozilla/media/liboggplay/src/liboggplay/config.h +mozilla/media/liboggz/include/oggz/config.h +mozilla/media/libtheora/include/theora/config.h +mozilla/media/libtheora/lib/config.h +mozilla/nsprpub/build/autoconf/config.guess +mozilla/nsprpub/build/autoconf/config.sub +mozilla/nsprpub/config/config.mk +mozilla/security/coreconf/config.mk +mozilla/security/dbm/config/config.mk +mozilla/security/dbm/src/config.mk +mozilla/security/nss/cmd/crmf-cgi/config.mk +mozilla/security/nss/cmd/crmftest/config.mk +mozilla/security/nss/cmd/lib/config.mk +mozilla/security/nss/cmd/libpkix/config.mk +mozilla/security/nss/cmd/libpkix/testutil/config.mk +mozilla/security/nss/cmd/zlib/config.mk +mozilla/security/nss/lib/base/config.mk +mozilla/security/nss/lib/certdb/config.mk +mozilla/security/nss/lib/certhigh/config.mk +mozilla/security/nss/lib/ckfw/builtins/config.mk +mozilla/security/nss/lib/ckfw/capi/config.mk +mozilla/security/nss/lib/ckfw/config.mk +mozilla/security/nss/lib/ckfw/dbm/config.mk +mozilla/security/nss/lib/ckfw/nssmkey/config.mk +mozilla/security/nss/lib/crmf/config.mk +mozilla/security/nss/lib/cryptohi/config.mk +mozilla/security/nss/lib/dev/config.mk +mozilla/security/nss/lib/freebl/config.mk +mozilla/security/nss/lib/jar/config.mk +mozilla/security/nss/lib/libpkix/config.mk +mozilla/security/nss/lib/libpkix/include/config.mk +mozilla/security/nss/lib/libpkix/pkix/certsel/config.mk +mozilla/security/nss/lib/libpkix/pkix/checker/config.mk +mozilla/security/nss/lib/libpkix/pkix/config.mk +mozilla/security/nss/lib/libpkix/pkix/crlsel/config.mk +mozilla/security/nss/lib/libpkix/pkix/params/config.mk +mozilla/security/nss/lib/libpkix/pkix/results/config.mk +mozilla/security/nss/lib/libpkix/pkix/store/config.mk +mozilla/security/nss/lib/libpkix/pkix/top/config.mk +mozilla/security/nss/lib/libpkix/pkix/util/config.mk +mozilla/security/nss/lib/libpkix/pkix_pl_nss/config.mk +mozilla/security/nss/lib/libpkix/pkix_pl_nss/module/config.mk +mozilla/security/nss/lib/libpkix/pkix_pl_nss/pki/config.mk +mozilla/security/nss/lib/libpkix/pkix_pl_nss/system/config.mk +mozilla/security/nss/lib/nss/config.mk +mozilla/security/nss/lib/pk11wrap/config.mk +mozilla/security/nss/lib/pkcs12/config.mk +mozilla/security/nss/lib/pkcs7/config.mk +mozilla/security/nss/lib/pki/config.mk +mozilla/security/nss/lib/pki1/config.mk +mozilla/security/nss/lib/smime/config.mk +mozilla/security/nss/lib/softoken/config.mk +mozilla/security/nss/lib/softoken/legacydb/config.mk +mozilla/security/nss/lib/sqlite/config.mk +mozilla/security/nss/lib/ssl/config.mk +mozilla/security/nss/lib/util/config.mk +mozilla/security/nss/tests/pkcs11/netscape/suites/config.mk +mozilla/security/nss/tests/pkcs11/netscape/suites/security/config.mk +mozilla/security/nss/tests/pkcs11/netscape/suites/security/pkcs11/config.mk +mozilla/security/nss/tests/pkcs11/netscape/suites/security/ssl/config.mk +mozilla/security/nss/tests/pkcs11/netscape/trivial/config.h.in +mozilla/toolkit/components/viewconfig/content/config.js +mozilla/toolkit/components/viewconfig/content/config.xul +mozilla/toolkit/crashreporter/google-breakpad/autotools/config.guess +mozilla/toolkit/crashreporter/google-breakpad/autotools/config.sub +mozilla/toolkit/crashreporter/google-breakpad/src/config.h.in +mozilla/toolkit/locales/en-US/chrome/global/config.dtd +mozilla/toolkit/locales/en-US/chrome/global/config.properties +mozilla/toolkit/themes/pinstripe/global/config.css +mozilla/toolkit/themes/winstripe/global/config.css +mozilla/tools/jprof/stub/config.h +mozilla/tools/leaky/config.h --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/debsearch.gif.uu +++ firefox-3.5-3.5.3+build1+nobinonly/debian/debsearch.gif.uu @@ -0,0 +1,20 @@ +begin 664 debsearch.gif +MB5!.1PT*&@H````-24A$4@```!`````0"`8````?\_]A````!F)+1T0`_P#_ +M`/^@O:>3````"7!(67,```]A```/80&H/Z=I````!W1)344'U`D3$C`=J25# +MK0```GA)1$%4>-J%DUM(5&$0QW_?.6=WL337-AI-*B"Y)&]=I# +M)@6!3T$0!`4%/522#VD4=*.')**2BB(A,;4+^516$!1=UBZ&ZU+8;KIZ])SO +MFU[,Q+;ZPS#,,`S_F?F/$A$RX5=6`6;")SN[DB8]1-ZFS6'+M@%P^`O,R!"Z +M[[7H>"\J',4=A'AU-5K[Z.9FB6[?KC(V,("88=S;I\2Y<("0!B\:06\^"C@8 +M?,0WD_5_-/"?-8KTM1,H.X1_,XJ=_HZ52A+Z?(_H^4;\X6%RJ\HGZ]74'?C] +MCX4;ZU&NB]EP%C]4ANTXX'MX#UNP7MPEZ+J,9643JN]HL&=%]B,BB`A:!+=M +MFT@#XIV+BM??+4:$J3;2>EJ\-8B_$G%O-8D1P3%C:=SK)P0WC;-H*3IX#;.P +MEL#<"J6FC1?<6*?6?2.7,01F%\7SW!>8NQ\DI1&`7?>FF`````$E%3D2N0F"" +` +end --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/firefox-3.5.links +++ firefox-3.5-3.5.3+build1+nobinonly/debian/firefox-3.5.links @@ -0,0 +1,3 @@ +## /usr/bin/firefox-3.5 /usr/bin/firefox +/usr/bin/firefox-3.5 /usr/bin/abrowser-3.5 +/usr/lib/firefox-addons/searchplugins /usr/lib/firefox-addons/searchplugins/common --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/firefox-3.5.install +++ firefox-3.5-3.5.3+build1+nobinonly/debian/firefox-3.5.install @@ -0,0 +1,27 @@ +debian/tmp/usr/lib/firefox-*/components/*.js +debian/tmp/usr/lib/firefox-*/components/*.xpt +debian/tmp/usr/lib/firefox-*/components/libbrowsercomps.so +debian/tmp/usr/lib/firefox-*/components/libbrowserdirprovider.so + +debian/tmp/usr/lib/firefox-*/modules/ + +debian/tmp/usr/lib/firefox-*/run-mozilla.sh + +#debian/tmp/usr/lib/firefox-*/defaults/autoconfig +debian/tmp/usr/lib/firefox-*/defaults/preferences +debian/tmp/usr/lib/firefox-*/defaults/profile etc/firefox-3.5/ +debian/tmp/usr/lib/firefox-*/browserconfig.properties +debian/tmp/usr/lib/firefox-*/blocklist.xml + +debian/presubj usr/share/bug/firefox-3.5 + +debian/firefox.js etc/firefox-3.5/pref + +debian/debsearch.gif usr/lib/firefox-addons/searchplugins/en-US/ +debian/debsearch.src usr/lib/firefox-addons/searchplugins/en-US/ + +debian/tmp/usr/lib/firefox-*/extensions/\{972ce4c6-7e08-4474-a285-3208198ce6fd\} usr/lib/xulrunner-addons/extensions + +debian/tmp/usr/lib/firefox-*/*.ini + +debian/apport/firefox-3.5.py usr/share/apport/package-hooks/ --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/distribution.ini +++ firefox-3.5-3.5.3+build1+nobinonly/debian/distribution.ini @@ -0,0 +1,10 @@ +[Global] +id=canonical +version=1.0 +about=Mozilla Firefox for Ubuntu + +[Preferences] +app.distributor = “canonical” +app.distributor.channel = “ubuntu” +app.partner.ubuntu = “ubuntu” + --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/MPL +++ firefox-3.5-3.5.3+build1+nobinonly/debian/MPL @@ -0,0 +1,567 @@ + MOZILLA PUBLIC LICENSE + Version 1.1 + + --------------- + +1. Definitions. + + 1.0.1. "Commercial Use" means distribution or otherwise making the + Covered Code available to a third party. + + 1.1. "Contributor" means each entity that creates or contributes to + the creation of Modifications. + + 1.2. "Contributor Version" means the combination of the Original + Code, prior Modifications used by a Contributor, and the Modifications + made by that particular Contributor. + + 1.3. "Covered Code" means the Original Code or Modifications or the + combination of the Original Code and Modifications, in each case + including portions thereof. + + 1.4. "Electronic Distribution Mechanism" means a mechanism generally + accepted in the software development community for the electronic + transfer of data. + + 1.5. "Executable" means Covered Code in any form other than Source + Code. + + 1.6. "Initial Developer" means the individual or entity identified + as the Initial Developer in the Source Code notice required by Exhibit + A. + + 1.7. "Larger Work" means a work which combines Covered Code or + portions thereof with code not governed by the terms of this License. + + 1.8. "License" means this document. + + 1.8.1. "Licensable" means having the right to grant, to the maximum + extent possible, whether at the time of the initial grant or + subsequently acquired, any and all of the rights conveyed herein. + + 1.9. "Modifications" means any addition to or deletion from the + substance or structure of either the Original Code or any previous + Modifications. When Covered Code is released as a series of files, a + Modification is: + A. Any addition to or deletion from the contents of a file + containing Original Code or previous Modifications. + + B. Any new file that contains any part of the Original Code or + previous Modifications. + + 1.10. "Original Code" means Source Code of computer software code + which is described in the Source Code notice required by Exhibit A as + Original Code, and which, at the time of its release under this + License is not already Covered Code governed by this License. + + 1.10.1. "Patent Claims" means any patent claim(s), now owned or + hereafter acquired, including without limitation, method, process, + and apparatus claims, in any patent Licensable by grantor. + + 1.11. "Source Code" means the preferred form of the Covered Code for + making modifications to it, including all modules it contains, plus + any associated interface definition files, scripts used to control + compilation and installation of an Executable, or source code + differential comparisons against either the Original Code or another + well known, available Covered Code of the Contributor's choice. The + Source Code can be in a compressed or archival form, provided the + appropriate decompression or de-archiving software is widely available + for no charge. + + 1.12. "You" (or "Your") means an individual or a legal entity + exercising rights under, and complying with all of the terms of, this + License or a future version of this License issued under Section 6.1. + For legal entities, "You" includes any entity which controls, is + controlled by, or is under common control with You. For purposes of + this definition, "control" means (a) the power, direct or indirect, + to cause the direction or management of such entity, whether by + contract or otherwise, or (b) ownership of more than fifty percent + (50%) of the outstanding shares or beneficial ownership of such + entity. + +2. Source Code License. + + 2.1. The Initial Developer Grant. + The Initial Developer hereby grants You a world-wide, royalty-free, + non-exclusive license, subject to third party intellectual property + claims: + (a) under intellectual property rights (other than patent or + trademark) Licensable by Initial Developer to use, reproduce, + modify, display, perform, sublicense and distribute the Original + Code (or portions thereof) with or without Modifications, and/or + as part of a Larger Work; and + + (b) under Patents Claims infringed by the making, using or + selling of Original Code, to make, have made, use, practice, + sell, and offer for sale, and/or otherwise dispose of the + Original Code (or portions thereof). + + (c) the licenses granted in this Section 2.1(a) and (b) are + effective on the date Initial Developer first distributes + Original Code under the terms of this License. + + (d) Notwithstanding Section 2.1(b) above, no patent license is + granted: 1) for code that You delete from the Original Code; 2) + separate from the Original Code; or 3) for infringements caused + by: i) the modification of the Original Code or ii) the + combination of the Original Code with other software or devices. + + 2.2. Contributor Grant. + Subject to third party intellectual property claims, each Contributor + hereby grants You a world-wide, royalty-free, non-exclusive license + + (a) under intellectual property rights (other than patent or + trademark) Licensable by Contributor, to use, reproduce, modify, + display, perform, sublicense and distribute the Modifications + created by such Contributor (or portions thereof) either on an + unmodified basis, with other Modifications, as Covered Code + and/or as part of a Larger Work; and + + (b) under Patent Claims infringed by the making, using, or + selling of Modifications made by that Contributor either alone + and/or in combination with its Contributor Version (or portions + of such combination), to make, use, sell, offer for sale, have + made, and/or otherwise dispose of: 1) Modifications made by that + Contributor (or portions thereof); and 2) the combination of + Modifications made by that Contributor with its Contributor + Version (or portions of such combination). + + (c) the licenses granted in Sections 2.2(a) and 2.2(b) are + effective on the date Contributor first makes Commercial Use of + the Covered Code. + + (d) Notwithstanding Section 2.2(b) above, no patent license is + granted: 1) for any code that Contributor has deleted from the + Contributor Version; 2) separate from the Contributor Version; + 3) for infringements caused by: i) third party modifications of + Contributor Version or ii) the combination of Modifications made + by that Contributor with other software (except as part of the + Contributor Version) or other devices; or 4) under Patent Claims + infringed by Covered Code in the absence of Modifications made by + that Contributor. + +3. Distribution Obligations. + + 3.1. Application of License. + The Modifications which You create or to which You contribute are + governed by the terms of this License, including without limitation + Section 2.2. The Source Code version of Covered Code may be + distributed only under the terms of this License or a future version + of this License released under Section 6.1, and You must include a + copy of this License with every copy of the Source Code You + distribute. You may not offer or impose any terms on any Source Code + version that alters or restricts the applicable version of this + License or the recipients' rights hereunder. However, You may include + an additional document offering the additional rights described in + Section 3.5. + + 3.2. Availability of Source Code. + Any Modification which You create or to which You contribute must be + made available in Source Code form under the terms of this License + either on the same media as an Executable version or via an accepted + Electronic Distribution Mechanism to anyone to whom you made an + Executable version available; and if made available via Electronic + Distribution Mechanism, must remain available for at least twelve (12) + months after the date it initially became available, or at least six + (6) months after a subsequent version of that particular Modification + has been made available to such recipients. You are responsible for + ensuring that the Source Code version remains available even if the + Electronic Distribution Mechanism is maintained by a third party. + + 3.3. Description of Modifications. + You must cause all Covered Code to which You contribute to contain a + file documenting the changes You made to create that Covered Code and + the date of any change. You must include a prominent statement that + the Modification is derived, directly or indirectly, from Original + Code provided by the Initial Developer and including the name of the + Initial Developer in (a) the Source Code, and (b) in any notice in an + Executable version or related documentation in which You describe the + origin or ownership of the Covered Code. + + 3.4. Intellectual Property Matters + (a) Third Party Claims. + If Contributor has knowledge that a license under a third party's + intellectual property rights is required to exercise the rights + granted by such Contributor under Sections 2.1 or 2.2, + Contributor must include a text file with the Source Code + distribution titled "LEGAL" which describes the claim and the + party making the claim in sufficient detail that a recipient will + know whom to contact. If Contributor obtains such knowledge after + the Modification is made available as described in Section 3.2, + Contributor shall promptly modify the LEGAL file in all copies + Contributor makes available thereafter and shall take other steps + (such as notifying appropriate mailing lists or newsgroups) + reasonably calculated to inform those who received the Covered + Code that new knowledge has been obtained. + + (b) Contributor APIs. + If Contributor's Modifications include an application programming + interface and Contributor has knowledge of patent licenses which + are reasonably necessary to implement that API, Contributor must + also include this information in the LEGAL file. + + (c) Representations. + Contributor represents that, except as disclosed pursuant to + Section 3.4(a) above, Contributor believes that Contributor's + Modifications are Contributor's original creation(s) and/or + Contributor has sufficient rights to grant the rights conveyed by + this License. + + 3.5. Required Notices. + You must duplicate the notice in Exhibit A in each file of the Source + Code. If it is not possible to put such notice in a particular Source + Code file due to its structure, then You must include such notice in a + location (such as a relevant directory) where a user would be likely + to look for such a notice. If You created one or more Modification(s) + You may add your name as a Contributor to the notice described in + Exhibit A. You must also duplicate this License in any documentation + for the Source Code where You describe recipients' rights or ownership + rights relating to Covered Code. You may choose to offer, and to + charge a fee for, warranty, support, indemnity or liability + obligations to one or more recipients of Covered Code. However, You + may do so only on Your own behalf, and not on behalf of the Initial + Developer or any Contributor. You must make it absolutely clear than + any such warranty, support, indemnity or liability obligation is + offered by You alone, and You hereby agree to indemnify the Initial + Developer and every Contributor for any liability incurred by the + Initial Developer or such Contributor as a result of warranty, + support, indemnity or liability terms You offer. + + 3.6. Distribution of Executable Versions. + You may distribute Covered Code in Executable form only if the + requirements of Section 3.1-3.5 have been met for that Covered Code, + and if You include a notice stating that the Source Code version of + the Covered Code is available under the terms of this License, + including a description of how and where You have fulfilled the + obligations of Section 3.2. The notice must be conspicuously included + in any notice in an Executable version, related documentation or + collateral in which You describe recipients' rights relating to the + Covered Code. You may distribute the Executable version of Covered + Code or ownership rights under a license of Your choice, which may + contain terms different from this License, provided that You are in + compliance with the terms of this License and that the license for the + Executable version does not attempt to limit or alter the recipient's + rights in the Source Code version from the rights set forth in this + License. If You distribute the Executable version under a different + license You must make it absolutely clear that any terms which differ + from this License are offered by You alone, not by the Initial + Developer or any Contributor. You hereby agree to indemnify the + Initial Developer and every Contributor for any liability incurred by + the Initial Developer or such Contributor as a result of any such + terms You offer. + + 3.7. Larger Works. + You may create a Larger Work by combining Covered Code with other code + not governed by the terms of this License and distribute the Larger + Work as a single product. In such a case, You must make sure the + requirements of this License are fulfilled for the Covered Code. + +4. Inability to Comply Due to Statute or Regulation. + + If it is impossible for You to comply with any of the terms of this + License with respect to some or all of the Covered Code due to + statute, judicial order, or regulation then You must: (a) comply with + the terms of this License to the maximum extent possible; and (b) + describe the limitations and the code they affect. Such description + must be included in the LEGAL file described in Section 3.4 and must + be included with all distributions of the Source Code. Except to the + extent prohibited by statute or regulation, such description must be + sufficiently detailed for a recipient of ordinary skill to be able to + understand it. + +5. Application of this License. + + This License applies to code to which the Initial Developer has + attached the notice in Exhibit A and to related Covered Code. + +6. Versions of the License. + + 6.1. New Versions. + Netscape Communications Corporation ("Netscape") may publish revised + and/or new versions of the License from time to time. Each version + will be given a distinguishing version number. + + 6.2. Effect of New Versions. + Once Covered Code has been published under a particular version of the + License, You may always continue to use it under the terms of that + version. You may also choose to use such Covered Code under the terms + of any subsequent version of the License published by Netscape. No one + other than Netscape has the right to modify the terms applicable to + Covered Code created under this License. + + 6.3. Derivative Works. + If You create or use a modified version of this License (which you may + only do in order to apply it to code which is not already Covered Code + governed by this License), You must (a) rename Your license so that + the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", + "MPL", "NPL" or any confusingly similar phrase do not appear in your + license (except to note that your license differs from this License) + and (b) otherwise make it clear that Your version of the license + contains terms which differ from the Mozilla Public License and + Netscape Public License. (Filling in the name of the Initial + Developer, Original Code or Contributor in the notice described in + Exhibit A shall not of themselves be deemed to be modifications of + this License.) + +7. DISCLAIMER OF WARRANTY. + + COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF + DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. + THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE + IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, + YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE + COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER + OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF + ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + +8. TERMINATION. + + 8.1. This License and the rights granted hereunder will terminate + automatically if You fail to comply with terms herein and fail to cure + such breach within 30 days of becoming aware of the breach. All + sublicenses to the Covered Code which are properly granted shall + survive any termination of this License. Provisions which, by their + nature, must remain in effect beyond the termination of this License + shall survive. + + 8.2. If You initiate litigation by asserting a patent infringement + claim (excluding declatory judgment actions) against Initial Developer + or a Contributor (the Initial Developer or Contributor against whom + You file such action is referred to as "Participant") alleging that: + + (a) such Participant's Contributor Version directly or indirectly + infringes any patent, then any and all rights granted by such + Participant to You under Sections 2.1 and/or 2.2 of this License + shall, upon 60 days notice from Participant terminate prospectively, + unless if within 60 days after receipt of notice You either: (i) + agree in writing to pay Participant a mutually agreeable reasonable + royalty for Your past and future use of Modifications made by such + Participant, or (ii) withdraw Your litigation claim with respect to + the Contributor Version against such Participant. If within 60 days + of notice, a reasonable royalty and payment arrangement are not + mutually agreed upon in writing by the parties or the litigation claim + is not withdrawn, the rights granted by Participant to You under + Sections 2.1 and/or 2.2 automatically terminate at the expiration of + the 60 day notice period specified above. + + (b) any software, hardware, or device, other than such Participant's + Contributor Version, directly or indirectly infringes any patent, then + any rights granted to You by such Participant under Sections 2.1(b) + and 2.2(b) are revoked effective as of the date You first made, used, + sold, distributed, or had made, Modifications made by that + Participant. + + 8.3. If You assert a patent infringement claim against Participant + alleging that such Participant's Contributor Version directly or + indirectly infringes any patent where such claim is resolved (such as + by license or settlement) prior to the initiation of patent + infringement litigation, then the reasonable value of the licenses + granted by such Participant under Sections 2.1 or 2.2 shall be taken + into account in determining the amount or value of any payment or + license. + + 8.4. In the event of termination under Sections 8.1 or 8.2 above, + all end user license agreements (excluding distributors and resellers) + which have been validly granted by You or any distributor hereunder + prior to termination shall survive termination. + +9. LIMITATION OF LIABILITY. + + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT + (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL + DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, + OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR + ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY + CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, + WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER + COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN + INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF + LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY + RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW + PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE + EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO + THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. + +10. U.S. GOVERNMENT END USERS. + + The Covered Code is a "commercial item," as that term is defined in + 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer + software" and "commercial computer software documentation," as such + terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 + C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), + all U.S. Government End Users acquire Covered Code with only those + rights set forth herein. + +11. MISCELLANEOUS. + + This License represents the complete agreement concerning subject + matter hereof. If any provision of this License is held to be + unenforceable, such provision shall be reformed only to the extent + necessary to make it enforceable. This License shall be governed by + California law provisions (except to the extent applicable law, if + any, provides otherwise), excluding its conflict-of-law provisions. + With respect to disputes in which at least one party is a citizen of, + or an entity chartered or registered to do business in the United + States of America, any litigation relating to this License shall be + subject to the jurisdiction of the Federal Courts of the Northern + District of California, with venue lying in Santa Clara County, + California, with the losing party responsible for costs, including + without limitation, court costs and reasonable attorneys' fees and + expenses. The application of the United Nations Convention on + Contracts for the International Sale of Goods is expressly excluded. + Any law or regulation which provides that the language of a contract + shall be construed against the drafter shall not apply to this + License. + +12. RESPONSIBILITY FOR CLAIMS. + + As between Initial Developer and the Contributors, each party is + responsible for claims and damages arising, directly or indirectly, + out of its utilization of rights under this License and You agree to + work with Initial Developer and Contributors to distribute such + responsibility on an equitable basis. Nothing herein is intended or + shall be deemed to constitute any admission of liability. + +13. MULTIPLE-LICENSED CODE. + + Initial Developer may designate portions of the Covered Code as + "Multiple-Licensed". "Multiple-Licensed" means that the Initial + Developer permits you to utilize portions of the Covered Code under + Your choice of the NPL or the alternative licenses, if any, specified + by the Initial Developer in the file described in Exhibit A. + +EXHIBIT A -Mozilla Public License. + + ``The contents of this file are subject to the Mozilla Public License + Version 1.1 (the "License"); you may not use this file except in + compliance with the License. You may obtain a copy of the License at + http://www.mozilla.org/MPL/ + + Software distributed under the License is distributed on an "AS IS" + basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + License for the specific language governing rights and limitations + under the License. + + The Original Code is ______________________________________. + + The Initial Developer of the Original Code is ________________________. + Portions created by ______________________ are Copyright (C) ______ + _______________________. All Rights Reserved. + + Contributor(s): ______________________________________. + + Alternatively, the contents of this file may be used under the terms + of the _____ license (the "[___] License"), in which case the + provisions of [______] License are applicable instead of those + above. If you wish to allow use of your version of this file only + under the terms of the [____] License and not to allow others to use + your version of this file under the MPL, indicate your decision by + deleting the provisions above and replace them with the notice and + other provisions required by the [___] License. If you do not delete + the provisions above, a recipient may use your version of this file + under either the MPL or the [___] License." + + [NOTE: The text of this Exhibit A may differ slightly from the text of + the notices in the Source Code files of the Original Code. You should + use the text of this Exhibit A rather than the text found in the + Original Code Source Code for Your Modifications.] + + ---------------------------------------------------------------------- + + AMENDMENTS + + The Netscape Public License Version 1.1 ("NPL") consists of the + Mozilla Public License Version 1.1 with the following Amendments, + including Exhibit A-Netscape Public License. Files identified with + "Exhibit A-Netscape Public License" are governed by the Netscape + Public License Version 1.1. + + Additional Terms applicable to the Netscape Public License. + I. Effect. + These additional terms described in this Netscape Public + License -- Amendments shall apply to the Mozilla Communicator + client code and to all Covered Code under this License. + + II. "Netscape's Branded Code" means Covered Code that Netscape + distributes and/or permits others to distribute under one or more + trademark(s) which are controlled by Netscape but which are not + licensed for use under this License. + + III. Netscape and logo. + This License does not grant any rights to use the trademarks + "Netscape", the "Netscape N and horizon" logo or the "Netscape + lighthouse" logo, "Netcenter", "Gecko", "Java" or "JavaScript", + "Smart Browsing" even if such marks are included in the Original + Code or Modifications. + + IV. Inability to Comply Due to Contractual Obligation. + Prior to licensing the Original Code under this License, Netscape + has licensed third party code for use in Netscape's Branded Code. + To the extent that Netscape is limited contractually from making + such third party code available under this License, Netscape may + choose to reintegrate such code into Covered Code without being + required to distribute such code in Source Code form, even if + such code would otherwise be considered "Modifications" under + this License. + + V. Use of Modifications and Covered Code by Initial Developer. + V.1. In General. + The obligations of Section 3 apply to Netscape, except to + the extent specified in this Amendment, Section V.2 and V.3. + + V.2. Other Products. + Netscape may include Covered Code in products other than the + Netscape's Branded Code which are released by Netscape + during the two (2) years following the release date of the + Original Code, without such additional products becoming + subject to the terms of this License, and may license such + additional products on different terms from those contained + in this License. + + V.3. Alternative Licensing. + Netscape may license the Source Code of Netscape's Branded + Code, including Modifications incorporated therein, without + such Netscape Branded Code becoming subject to the terms of + this License, and may license such Netscape Branded Code on + different terms from those contained in this License. + + VI. Litigation. + Notwithstanding the limitations of Section 11 above, the + provisions regarding litigation in Section 11(a), (b) and (c) of + the License shall apply to all disputes relating to this License. + + EXHIBIT A-Netscape Public License. + + "The contents of this file are subject to the Netscape Public + License Version 1.1 (the "License"); you may not use this file + except in compliance with the License. You may obtain a copy of + the License at http://www.mozilla.org/NPL/ + + Software distributed under the License is distributed on an "AS + IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + implied. See the License for the specific language governing + rights and limitations under the License. + + The Original Code is Mozilla Communicator client code, released + March 31, 1998. + + The Initial Developer of the Original Code is Netscape + Communications Corporation. Portions created by Netscape are + Copyright (C) 1998-1999 Netscape Communications Corporation. All + Rights Reserved. + + Contributor(s): ______________________________________. + + Alternatively, the contents of this file may be used under the + terms of the _____ license (the "[___] License"), in which case + the provisions of [______] License are applicable instead of + those above. If you wish to allow use of your version of this + file only under the terms of the [____] License and not to allow + others to use your version of this file under the NPL, indicate + your decision by deleting the provisions above and replace them + with the notice and other provisions required by the [___] + License. If you do not delete the provisions above, a recipient + may use your version of this file under either the NPL or the + [___] License." --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/firefox-3.5-minefield.desktop +++ firefox-3.5-3.5.3+build1+nobinonly/debian/firefox-3.5-minefield.desktop @@ -0,0 +1,15 @@ +[Desktop Entry] +Version=1.0 +Encoding=UTF-8 +Name=Minefield 3.5 Web Browser +Comment=Browse the Bleeding Edge +GenericName=Bleed Browser +Exec=firefox %u +Terminal=false +X-MultipleArgs=false +Type=Application +Icon=firefox-3.5 +Categories=Application;Network; +MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png +StartupWMClass=Firefox +StartupNotify=true --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/firefox-3.5-gnome-support.postinst.in +++ firefox-3.5-3.5.3+build1+nobinonly/debian/firefox-3.5-gnome-support.postinst.in @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] ; then + for dir in `ls -d /usr/lib/firefox-3.5* || true`; do + if test -d $dir -a -e $dir/.autoreg; then + touch $dir/.autoreg + fi + done +fi + --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/firefox-3.5.postinst.in +++ firefox-3.5-3.5.3+build1+nobinonly/debian/firefox-3.5.postinst.in @@ -0,0 +1,39 @@ +#!/bin/sh + +set -e + +UPDATENOTIFIERDIR=/var/lib/update-notifier/user.d +LIBDIR=@LIBDIR@ +APPNAME=@APPNAME@ + +if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] ; then + update-alternatives --install /usr/bin/x-www-browser \ + x-www-browser /usr/bin/$APPNAME 40 + touch $LIBDIR/.autoreg + + # Reload AppArmor profile + APP_PROFILE="/etc/apparmor.d/usr.bin.$APPNAME" + if [ -f "$APP_PROFILE" ] && aa-status --enabled 2>/dev/null; then + apparmor_parser -r "$APP_PROFILE" || true + fi +fi + +echo "Please restart all running instances of $APPNAME, or you will experience problems." + +if [ -d $UPDATENOTIFIERDIR ] ; then + # pgrep matches application names from /proc//status which is + # truncated according to sys/procfs.h definition. Problem is it's + # platform dependent. Either 15 or 16 chars. + if [ `/usr/bin/pgrep -x -c firefox` -ne 0 ] || + [ `/usr/bin/pgrep -x -c $APPNAME` -ne 0 ] ; then + cp -f $LIBDIR/$APPNAME-restart-required.update-notifier \ + $UPDATENOTIFIERDIR/$APPNAME-restart-required + else + rm -f $UPDATENOTIFIERDIR/$APPNAME-restart-required + fi +fi + +if [ -x /usr/bin/update-menus ] ; then + /usr/bin/update-menus +fi + --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/firefox-3.5.dirs +++ firefox-3.5-3.5.3+build1+nobinonly/debian/firefox-3.5.dirs @@ -0,0 +1,4 @@ +etc/apparmor.d/disable +usr/lib/firefox-addons/extensions +usr/lib/firefox-addons/plugins +usr/lib/firefox-addons/searchplugins --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/docs +++ firefox-3.5-3.5.3+build1+nobinonly/debian/docs @@ -0,0 +1 @@ +debian/MPL --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/compat +++ firefox-3.5-3.5.3+build1+nobinonly/debian/compat @@ -0,0 +1 @@ +5 --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/remove.binonly.sh +++ firefox-3.5-3.5.3+build1+nobinonly/debian/remove.binonly.sh @@ -0,0 +1,114 @@ +#! /bin/sh + +rm -fv ./build/wince/shunt/build/shunt.vcb +rm -fv ./build/wince/shunt/build/shunt.vco +#rm -fv ./directory/c-sdk/ldap/examples/macintosh/asearch \(2i\).68k.u +#rm -fv ./directory/c-sdk/ldap/examples/macintosh/asearch \(4i\).68k.u +#rm -fv ./directory/c-sdk/ldap/examples/macintosh/asearch PPC.u +# these are only files there; just do it quick and dirty because I don't understand how to fix the syntax it complains about: this does it: +rm -fv ./directory/c-sdk/ldap/examples/macintosh/*.u +rm -fv ./directory/c-sdk/ldap/libraries/macintosh/LDAPClient.mcp +rm -fv ./modules/oji/tests/script/killer.exe +rm -fv ./modules/plugin/samples/default/mac/NullPlugin.rsrc +rm -fv ./modules/plugin/tools/sdk/samples/basic/mac/Basic Plugin.mcp +rm -fv ./modules/plugin/tools/sdk/samples/basic/mac/Basic.rsrc +rm -fv ./modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable Plugin.mcp +rm -fv ./modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable PluginIDL.mcp +rm -fv ./modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable.rsrc +rm -fv ./other-licenses/7zstub/firefox/7zSD.sfx +rm -fv ./toolkit/mozapps/update/src/updater/macbuild/Contents/Resources/English.lproj/MainMenu.nib/keyedobjects.nib +rm -fv ./toolkit/mozapps/update/src/updater/macbuild/Contents/PkgInfo +rm -fv ./extensions/manticore/resources/manticore.psd +rm -fv ./extensions/universalchardet/doc/UniversalCharsetDetection.doc +rm -fv ./config/bin2rc.exe +rm -fv ./config/makedep.exe +rm -fv ./config/mangle.exe +rm -fv ./config/mantomak.exe +rm -fv ./embedding/browser/activex/src/pluginhostctrl/cab/redist/ATL.DLL +rm -fv ./embedding/browser/activex/tests/vbrowse/browser.frx +rm -fv ./embedding/browser/activex/tests/vbrowse/frmToolBar.frx +rm -fv ./embedding/browser/cocoa/res/English.lproj/alert.nib/objects.nib +rm -fv ./embedding/browser/powerplant/resources/cfmAlias.rsrc +rm -fv ./embedding/browser/powerplant/resources/cfmAliasDebug.rsrc +rm -fv ./embedding/minimo/mozconfig +rm -fv ./embedding/qa/testembed/testembed.aps +rm -fv ./embedding/tests/MSDotNETCSEmbed/MSDotNETCSEmbed.suo +rm -fv ./embedding/tests/cocoaEmbed/res/English.lproj/MainMenu.nib/objects.nib +rm -fv ./embedding/wrappers/DotNETEmbed/DotNETEmbed.snk +rm -fv ./intl/unicharutil/tools/data/case.dat +rm -fv ./intl/unicharutil/tools/data/cmbcl.dat +rm -fv ./intl/unicharutil/tools/data/ctype.dat +rm -fv ./intl/unicharutil/tools/data/decomp.dat +rm -fv ./intl/unicharutil/tools/data/num.dat +rm -fv ./js/src/fdlibm/fdlibm.mdp +rm -fv ./js/src/js.mdp +rm -fv ./js/src/liveconnect/jsj_nodl.c +rm -fv ./plugin/oji/JEP/MRJPlugin.plugin/Contents/MacOS/MRJPlugin +rm -fv ./plugin/oji/JEP/MRJPlugin.plugin/Contents/MacOS/MRJPlugin.jar +rm -fv ./plugin/oji/JEP/MRJPlugin.plugin/Contents/Resources/MRJPlugin.rsrc +rm -fv ./plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/MacOS/JavaEmbeddingPlugin +rm -fv ./plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/Resources/Java/JavaEmbeddingPlugin.jar +rm -fv ./plugin/oji/MRJ/plugin/Resources/Dialogs.rsrc +rm -fv ./plugin/oji/MRJ/plugin/Resources/Strings.rsrc +rm -fv ./plugin/oji/MRJ/plugin/Resources/Version.rsrc +rm -fv ./plugin/oji/MRJ/plugin/MRJPlugin.jar +rm -fv ./plugin/oji/MRJ/plugin/netscape.plugin.jar +rm -fv ./plugin/oji/MRJ/plugin/Source/JMURLConnection +rm -fv ./plugin/oji/MRJ/testing/ConsoleApplet/ConsoleApplet.mcp +rm -fv ./plugin/oji/MRJ/testing/JSApplet/JSApplet.mcp +rm -fv ./plugin/oji/MRJ/testing/SwingApplet/TestApplet.mcp +rm -fv ./plugin/oji/MRJ/testing/TrivialApplet/MyApplet.mcp +rm -fv ./plugin/oji/MRJCarbon/MRJSDK/JavaFrameworks/JavaEmbeddingLib +rm -fv ./plugin/oji/MRJCarbon/plugin/MRJPlugin.jar +rm -fv ./plugin/oji/MRJCarbon/plugin/Resources/Dialogs.rsrc +rm -fv ./plugin/oji/MRJCarbon/plugin/Resources/Strings.rsrc +rm -fv ./plugin/oji/MRJCarbon/plugin/Resources/Version.rsrc +rm -fv ./xpcom/reflect/xptcall/tests/eVC4/XPTCInvoke_Testing.cpp +rm -fv ./xpcom/tests/StringFactoringTests/StringTest.mcp +rm -fv ./xpcom/typelib/xpidl/macplugin/compiler.rsrc +rm -fv ./xpcom/typelib/xpidl/macplugin/linker.rsrc +rm -fv ./xpcom/typelib/xpidl/macplugin/panel.rsrc +rm -fv ./xpcom/typelib/xpidl/macplugin/version.rsrc +rm -fv ./xpinstall/packager/mac/ASEncoder/build/ASEncoder.mcp +rm -fv ./xpinstall/packager/mac/ASEncoder/rsrc/ASEncoder.rsrc +rm -fv ./xpinstall/packager/mac/ASEncoder/src/ASEncoderUsage.script +rm -fv ./xpinstall/test/pre_checkin.xpi +rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_Core.PPC.Lib +rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_ForeignThreads.PPC.Lib +rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_MPW.PPC.Lib +rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_MSL.PPC.Lib +rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_SIOUX.PPC.Lib +rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_Sfio.PPC.Lib +rm -fv ./xpinstall/wizard/mac/rsrc/MIWCommon.rsrc +rm -fv ./xpinstall/wizard/mac/rsrc/Mozilla.rsrc +rm -fv ./xpinstall/wizard/os2/setuprsc/box_ch_d.bmp +rm -fv ./xpinstall/wizard/os2/setuprsc/box_chec.bmp +rm -fv ./xpinstall/wizard/os2/setuprsc/box_unch.bmp +rm -fv ./gfx/cairo/libpixman/src/pixman-vc71.lib +rm -fv ./gfx/src/mac/printerplugin/Resources/English.lproj/Localizable.strings +rm -fv ./gfx/src/mac/nsMacGFX.rsrc +rm -fv ./layout/doc/SpaceMgr_BlockReflSt_OD.sda +rm -fv ./layout/doc/object_diagram_template.sda +rm -fv ./layout/html/tests/block/bugs/RealSnow.jar +rm -fv ./webshell/tests/viewer/mac/cfmAlias.rsrc +rm -fv ./webshell/tests/viewer/mac/cfmAliasDebug.rsrc +rm -fv ./webshell/tests/viewer/mac/viewer.ppob +rm -fv ./webshell/tests/viewer/mac/viewer.rsrc +rm -fv ./webshell/tests/viewer/mac/viewercarb.rsrc +rm -fv ./webshell/tests/viewer/viewer-beos.rsrc +rm -fv ./xpfe/bootstrap/appleevents/nsAppleEvents.rsrc +rm -fv ./xpfe/bootstrap/apprunner-beos.rsrc +rm -fv ./mailnews/mapi/old/tests/mapitest/mapitest.ncb +rm -fv ./mailnews/mapi/old/tests/mapitest/mapitest.opt +rm -fv ./toolkit/mozapps/installer/windows/nsis/Processes.dll +rm -fv ./toolkit/mozapps/installer/windows/nsis/ShellLink.dll +rm -fv ./toolkit/mozapps/installer/windows/nsis/nsProcess.dll + +rm -fv ./toolkit/crashreporter/tools/win32/dump_syms.exe + +rm -fvr other-licenses/7zstub/ +rm -fv README/mozilla/README.os2 + +rm -fv netwerk/protocol/ftp/doc/rfc959.txt +rm -fv directory/c-sdk/ldap/docs/draft-ietf-ldapext-ldap-c-api-05.txt + --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/firefox.cfg +++ firefox-3.5-3.5.3+build1+nobinonly/debian/firefox.cfg @@ -0,0 +1,2 @@ +// +lockPref("app.update.enabled", false); --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/firefox.sh.in +++ firefox-3.5-3.5.3+build1+nobinonly/debian/firefox.sh.in @@ -0,0 +1,148 @@ +#!/bin/sh + +# Firefox launcher containing a Profile migration helper for +# temporary profiles used during alpha and beta phases. + +# Authors: +# Alexander Sack +# Fabien Tassin +# Steve Langasek +# License: GPLv2 or later + +## profile migration disabled for now, instead, resurrect the previous code + +# If there's still no ~/mozilla/firefox-3.5 profile, try to find a previous +# firefox profile and initialize with that. +# If nothing is found, we'll go for a fresh run and let firefox create a +# default profile for us. + +MOZDIR=$HOME/.mozilla +LIBDIR=@LIBDIR@ +APPVER=@APPVER@ +META_NAME=@META_NAME@ +GDB=/usr/bin/gdb +DROPPED=abandoned + +NAME=`which "$0"` +if [ "x$META_NAME" != "x" ] ; then + NAME="${NAME%%-$APPVER}" +fi +APPNAME="$(basename "$NAME")" + +while [ ! -f "$LIBDIR/$APPNAME" ] && [ -L "$NAME" ]; do + TARGET="$(readlink "$NAME")" + if [ "x$TARGET" = "x$(basename "$TARGET")" ]; then + TARGET="$(dirname "$NAME")/$TARGET" + fi + if [ "x$META_NAME" != "x" ] ; then + TARGET=${TARGET%%-$APPVER} + fi + NAME="$TARGET" + APPNAME="$(basename "$NAME")" + if [ "x$APPNAME" = "xfirefox.sh" ]; then + APPNAME=firefox + break + fi +done + +usage () { + $LIBDIR/$APPNAME -h | sed -e 's,/.*/,,' + echo + echo " -g or --debug Start within $GDB (Must be first)" +} + +want_debug=0 +while [ $# -gt 0 ]; do + case "$1" in + -h | --help | -help ) + usage + exit 0 ;; + -g | --debug ) + want_debug=1 + shift ;; + -- ) # Stop option prcessing + shift + break ;; + * ) + break ;; + esac +done + +# if there exists a beta profile (first found: $MOZDIR/firefox-3.5, +# $MOZDIR/firefox-3.1) and there is a standard firefox profile as well, ask the +# user what to do. In case he decides to import the firefox 3.0 profile +# settings, we keep the firefox directory untouched, but rename the beta +# profile by appending the suffix |.abandoned|. In case the user decides to +# keep using the firefox 3.5 profile, we rename the original firefox profile to +# firefox.3.0-replaced and rename the beta profile to be |.mozilla/firefox|. +# +# as a third option the user can defer his final decision. This will leave the +# directories untouched, thus making the user use the old firefox profile by +# default. +# +# in addition, even older profiles are renamed too, by appending |.abandoned| +# to their name. + +FOUND="" +if [ -d $MOZDIR/firefox ] ; then + FOUND=firefox +fi + +FOUND_BETA="" +BETA_LIST="" +for betaname in firefox-3.1 firefox-3.5; do + if [ -d $MOZDIR/$betaname ]; then + BETA_LIST="$BETA_LIST $betaname" + FOUND_BETA=$betaname + fi +done + +if [ "$FOUND" != "" -a "$FOUND_BETA" != "" ] ; then + echo -n "Found Beta Participation ..." + $LIBDIR/ffox-35-beta-profile-migration-dialog + result=$? + if [ $result = 1 ]; then + mv $MOZDIR/$FOUND $MOZDIR/$FOUND.3.0-replaced + mv $MOZDIR/$FOUND_BETA $MOZDIR/$FOUND + for beta in $BETA_LIST ; do + if [ $beta != $FOUND_BETA ] ; then + mv $MOZDIR/$beta $MOZDIR/$beta.$DROPPED + fi + done + echo " keep beta profile." + elif [ $result = 2 ]; then + for beta in $BETA_LIST ; do + mv $MOZDIR/$beta $MOZDIR/$beta.$DROPPED + done + echo " use firefox 3.0 profile." + else + echo " use firefox 3.0 profile, but will ask again next time." + fi + echo " ... will check again next time." +elif [ "$FOUND_BETA" != "" -a "$FOUND" = "" ]; then + # in case we only have a beta profile the user most likely wants to use + # that. just doing, no questions asked. + mv $MOZDIR/$FOUND_BETA $MOZDIR/firefox + for beta in $BETA_LIST ; do + # Move out the older beta profiles + if [ $beta != $FOUND_BETA ] ; then + mv $MOZDIR/$beta $MOZDIR/$beta.$DROPPED + fi + done + echo "*NOTICE* Profile $FOUND_BETA found and moved as main profile" +fi + +if [ $want_debug -eq 1 ] ; then + if [ ! -x $GDB ] ; then + echo "Sorry, can't find usable $GDB. Please install it." + exit 1 + fi + tmpfile=`mktemp /tmp/mozargs.XXXXXX` || { echo "Cannot create temporary file" >&2; exit 1; } + trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15 + echo "set args ${1+"$@"}" > $tmpfile + echo "$GDB $LIBDIR/$APPNAME -x $tmpfile" + $GDB "$LIBDIR/$APPNAME" -x $tmpfile + exit $? +else + exec $LIBDIR/$APPNAME "$@" +fi --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/firefox.js +++ firefox-3.5-3.5.3+build1+nobinonly/debian/firefox.js @@ -0,0 +1,27 @@ +// This is the Debian specific preferences file for Mozilla Firefox +// You can make any change in here, it is the purpose of this file. +// You can, with this file and all files present in the +// /etc/firefox/pref directory, override any preference that is +// present in /usr/lib/firefox/defaults/pref directory. +// While your changes will be kept on upgrade if you modify files in +// /etc/firefox/pref, please note that they won't be kept if you +// do them in /usr/lib/firefox/defaults/pref. + +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); + +// identify ubuntu @ yahoo searchplugin +pref("browser.search.param.yahoo-fr", "ubuntu"); + +// identify default locale to use if no /usr/lib/firefox-addons/searchplugins/LOCALE +// exists for the current used LOCALE +pref("distribution.searchplugins.defaultLocale", "en-US"); + --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/README.Debian.in +++ firefox-3.5-3.5.3+build1+nobinonly/debian/README.Debian.in @@ -0,0 +1,11 @@ +Apparmor Profile +---------------- +If your system uses AppArmor, please note that the shipped profile is disabled +by default. The profile can be enabled by performing: + +$ sudo aa-enforce /etc/apparmor.d/usr.bin.@APPNAME@ + +This profile should work without modification for most plugins available in +Ubuntu, but may require adjusting for your environment. Please see +https://wiki.ubuntu.com/DebuggingApparmor before filing a bug against this +software. --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/debsearch.src +++ firefox-3.5-3.5.3+build1+nobinonly/debian/debsearch.src @@ -0,0 +1,27 @@ +# Firefox plugin file +# +# Debian package lookup +# by Fergus McKenzie-Kay copying code +# by Spencer Wysinger +# ported to Ubuntu by Alex Converse +# updated for new Ubuntu codebase by David Futcher +# +# Last updated: February 23, 2008 + + + + + + + + + + --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/usr.bin.firefox.apparmor.in +++ firefox-3.5-3.5.3+build1+nobinonly/debian/usr.bin.firefox.apparmor.in @@ -0,0 +1,193 @@ +# vim:syntax=apparmor +# Last Modified: Tue Jun 9 07:32:13 2009 +# Author: Jamie Strandboge + +#include + +/usr/lib/@APPNAME@.*/firefox { + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + + # for networking + network inet stream, + network inet6 stream, + @{PROC}/[0-9]*/net/if_inet6 r, + @{PROC}/[0-9]*/net/ipv6_route r, + + # sounds + /etc/sound/ r, + /etc/sound/** r, + /etc/wildmidi/wildmidi.cfg r, + + # should maybe be in abstractions + /etc/ r, + /etc/gnome/defaults.list r, + /etc/mime.types r, + /etc/mailcap r, + /usr/bin/dbus-launch ixr, + /usr/bin/apport-bug Ux, + + # firefox specific + /etc/firefox-3.*/ r, + /etc/firefox-3.*/** r, + /etc/xulrunner-1.9*/ r, + /etc/xulrunner-1.9*/** r, + /etc/gre.d/ r, + /etc/gre.d/* r, + + # noisy + deny /usr/lib/firefox-3.*/** w, + deny /usr/lib/firefox-addons/** w, + deny /usr/lib/xulrunner-addons/** w, + + # These are needed when a new user starts firefox and firefox.sh is used + /usr/lib/firefox-3.*/** ixr, + /usr/bin/basename ixr, + /sbin/killall5 ixr, + /bin/which ixr, + @{PROC}/ r, + @{PROC}/[0-9]*/cmdline r, + @{PROC}/[0-9]*/stat r, + @{PROC}/[0-9]*/status r, + @{PROC}/filesystems r, + capability sys_ptrace, + + /etc/mtab r, + @{PROC}/[0-9]*/mounts r, + @{PROC}/[0-9]*/maps r, + + # allow access to documentation and other files the user may want to look + # at in /usr + /usr/ r, + /usr/** r, + + # so browsing directories works + / r, + /**/ r, + + # allow read and write to all user's files, except explicitly denied ones + @{HOME}/ r, + @{HOME}/** rw, + @{HOME}/Desktop/** rw, + @{HOME}/Firefox_wallpaper* rw, + owner /media/** rw, + owner /mnt/** rw, + owner /srv/** rw, + + #include + audit deny @{HOME}/.ssh/** mrwkl, + audit deny @{HOME}/.gnome2_private/** mrwkl, + + # comment this out if using gpg plugin/addons + audit deny @{HOME}/.gnupg/** mrwkl, + + # per-user firefox configuration + @{HOME}/.mozilla/ rw, + @{HOME}/.mozilla/** rw, + @{HOME}/.mozilla/**/*.sqlite* k, + @{HOME}/.mozilla/**/.parentlock k, + @{HOME}/.mozilla/plugins/** rm, + @{HOME}/.mozilla/**/plugins/** rm, + + # per-user common plugin configuration + @{HOME}/.icedteaplugin/ rw, + @{HOME}/.icedteaplugin/** rw, + @{HOME}/.adobe/ rw, + @{HOME}/.adobe/** rw, + @{HOME}/.macromedia/ rw, + @{HOME}/.macromedia/** rw, + @{HOME}/.java/ rw, + @{HOME}/.java/** rwk, + + # + # Extensions + # /usr/share/.../extensions/... is already covered by '/usr/** r', above. + # Allow 'x' for downloaded extensions, but inherit policy for safety + @{HOME}/.mozilla/**/extensions/** mixr, + + deny /usr/lib/firefox-3.*/update.test w, + deny /usr/lib/mozilla/extensions/**/ w, + deny /usr/lib/xulrunner-addons/extensions/**/ w, + deny /usr/share/mozilla/extensions/**/ w, + + # + # Plugins/helpers + # + @{PROC}/[0-9]*/fd/ r, + /usr/lib/** rm, + /bin/bash ixr, + /bin/dash ixr, + /bin/grep ixr, + /bin/ps Uxr, + /bin/uname Uxr, + /usr/bin/m4 ixr, + /usr/lib/nspluginwrapper/i386/linux/npviewer Uxr, + /var/lib/ r, + /var/lib/** mr, + + # for maximum plugin/helper compatibility + #/usr/bin/* Uxr, + #/usr/lib/*/** ixr, + + # + # For stricter access, comment out the 'maximum plugin/helper compatibility' + # lines above and uncomment these + # + + # evince has its own profile, so change to it + /usr/bin/evince PUxr, + + # miscellaneous + #/usr/bin/eog Uxr, + /usr/bin/gedit Uxr, + /usr/bin/gimp* Uxr, + /usr/bin/file-roller Uxr, + /usr/bin/ooffice Uxr, + /usr/bin/oocalc Uxr, + /usr/bin/oodraw Uxr, + /usr/bin/ooimpress Uxr, + /usr/bin/oowriter Uxr, + /usr/bin/gtk-gnash ixr, + /usr/bin/pulseaudio ixr, + + # totem + /usr/lib/totem/** ixr, + /usr/bin/totem-gstreamer Uxr, + /usr/bin/totem-xine Uxr, + /usr/bin/totem Uxr, + + # mozplugger + /etc/mozpluggerrc r, + /usr/bin/mozplugger-helper Uxr, + + # mplayer plugin + /etc/mplayerplug-in.conf r, + /usr/bin/mplayer Uxr, + + # java + /usr/lib/jvm/java-6-openjdk/jre/bin/java Uxr, + /etc/java-*-sun/** r, + /usr/lib/jvm/java-*-sun-1.*/jre/bin/java Uxr, + + # for mailto: + #include + #include + + # Terminals for using console applications. These abstractions should ideally + # have 'ix' to restrct access to what only firefox is allowed to do + #include + + # By default, we won't support launching a terminal program in Xterm or + # KDE's konsole. It opens up too many unnecessary files for most users. + # People who need this functionality can uncomment the following: + ##include + ##include +} --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/firefox-3.5-dev.install +++ firefox-3.5-3.5.3+build1+nobinonly/debian/firefox-3.5-dev.install @@ -0,0 +1,11 @@ +## # debian/tmp/usr/lib/pkgconfig/*.pc usr/lib/pkgconfig +## +## debian/tmp/usr/include/firefox-*/* +## debian/tmp/usr/lib/firefox-3.0-devel-*/ +## debian/tmp/usr/share/idl/firefox-*/ +## +## # Missing bin mentionned https://bugzilla.mozilla.org/show_bug.cgi?id=389673#c9 +## build-tree/mozilla/xpcom/tools/registry/regxpcom usr/lib/firefox-3.0 +## build-tree/mozilla/xpcom/typelib/xpidl/xpidl usr/lib/firefox-3.0 +## build-tree/mozilla/xpcom/typelib/xpt/tools/xpt_dump usr/lib/firefox-3.0 +## build-tree/mozilla/xpcom/typelib/xpt/tools/xpt_link usr/lib/firefox-3.0 --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/copyright +++ firefox-3.5-3.5.3+build1+nobinonly/debian/copyright @@ -0,0 +1,738 @@ +This package was debianized by Eric Dorland on +Thu, 05 Jun 2003 01:01:22 -0400 + +It was downloaded from http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/ + +The source tarball is an aggregate of several different works in which the +main one, developed by the Mozilla Project, is firefox. + +Other works include gzip, bzip2, sqlite, libjpeg, libpng, cairo, and others. +Please see the sections following the copyright statements for firefox for +these. + +=== firefox + +Overall, the firefox project is licensed under the terms of the Mozilla +Public License version 1.1 or, at your option, under the terms of the GNU +eneral Public License version 2 or subsequent, or the terms of the GNU +Lesser General Public License version 2.1 or subsequent. + +On Debian systems, the complete text of the GNU General Public +License can be found in the file `/usr/share/common-licenses/GPL' ; +the complete text of the GNU Lesser General Public License can be +found in the file `/usr/share/common-licenses/LGPL'. + +The complete text of the Mozilla Public License can be found in the MPL file +in the same directory as this file. + +Some files may still contain licensing notices claiming licensing under +other combinations of NPL, MPL, GPL and LGPL. They are files that were missed +by the upstream relicensing script, but all the permissions required for +relicensing were indeed provided. + +The file db/mork/src/morkQuickSort.cpp is licensed under the following terms: + + Copyright (c) 1992, 1993 + The Regents of the University of California. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +The embedding/qa/mozembed/public/nsIQABrowserUIGlue.idl file and the files +under the embedding/tests directory are licensed under the following terms: + + Copyright (c) 2002 Netscape Communications Corporation and + other contributors + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this Mozilla sample software and associated documentation files + (the "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to permit + persons to whom the Software is furnished to do so, subject to the + following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + +The modules/plugin/base/public/npruntime.h file is licensed under the +following terms: + + Copyright (c) 2004, Apple Computer, Inc. and The Mozilla Foundation. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the names of Apple Computer, Inc. ("Apple") or The Mozilla + Foundation ("Mozilla") nor the names of their contributors may be used + to endorse or promote products derived from this software without + specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY APPLE, MOZILLA AND THEIR CONTRIBUTORS "AS + IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE, MOZILLA OR + THEIR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +The toolkit/mozapps/update/src/updater/bspatch.cpp and +toolkit/mozapps/update/src/updater/bspatch.h files are licensed under the +following terms: + + Copyright 2003,2004 Colin Percival + All rights reserved + + Redistribution and use in source and binary forms, with or without + modification, are permitted providing that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +Some but not all the files in netwerk/dns/src/ are licensed under the +following terms: + + Copyright (c) 2001,2002 Japan Network Information Center. + All rights reserved. + + By using this file, you agree to the terms and conditions set forth bellow. + + LICENSE TERMS AND CONDITIONS + + The following License Terms and Conditions apply, unless a different + license is obtained from Japan Network Information Center ("JPNIC"), + a Japanese association, Kokusai-Kougyou-Kanda Bldg 6F, 2-3-4 Uchi-Kanda, + Chiyoda-ku, Tokyo 101-0047, Japan. + + 1. Use, Modification and Redistribution (including distribution of any + modified or derived work) in source and/or binary forms is permitted + under this License Terms and Conditions. + + 2. Redistribution of source code must retain the copyright notices as they + appear in each source code file, this License Terms and Conditions. + + 3. Redistribution in binary form must reproduce the Copyright Notice, + this License Terms and Conditions, in the documentation and/or other + materials provided with the distribution. For the purposes of binary + distribution the "Copyright Notice" refers to the following language: + "Copyright (c) 2000-2002 Japan Network Information Center. All rights reserved." + + 4. The name of JPNIC may not be used to endorse or promote products + derived from this Software without specific prior written approval of + JPNIC. + + 5. Disclaimer/Limitation of Liability: THIS SOFTWARE IS PROVIDED BY JPNIC + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JPNIC BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +Some files in plugin/oji/JEP/ are licensed under the following terms: + + Copyright (c) 2004, Steven Michaud, All Rights Reserved + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +The extensions/auth/gssapi.h file is licensed under the following terms: + + Copyright 1993 by OpenVision Technologies, Inc. + + Permission to use, copy, modify, distribute, and sell this software + and its documentation for any purpose is hereby granted without fee, + provided that the above copyright notice appears in all copies and + that both that copyright notice and this permission notice appear in + supporting documentation, and that the name of OpenVision not be used + in advertising or publicity pertaining to distribution of the software + without specific, written prior permission. OpenVision makes no + representations about the suitability of this software for any + purpose. It is provided "as is" without express or implied warranty. + + OPENVISION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + EVENT SHALL OPENVISION BE LIABLE FOR ANY SPECIAL, INDIRECT OR + CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF + USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THIS SOFTWARE. + +The gfx/src/xlib/xregion.h and gfx/src/gtk/xregion.h are licensed under the +following terms: + + Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts, + and the Massachusetts Institute of Technology, Cambridge, Massachusetts. + + All Rights Reserved + + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, + provided that the above copyright notice appear in all copies and that + both that copyright notice and this permission notice appear in + supporting documentation, and that the names of Digital or MIT not be + used in advertising or publicity pertaining to distribution of the + software without specific, written prior permission. + + DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING + ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL + DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR + ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, + ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + SOFTWARE. + +=== sqlite + +The db/sqlite3 directory contains a copy of sqlite with the following +licensing terms: + + The author disclaims copyright to this source code. In place of + a legal notice, here is a blessing: + + May you do good and not evil. + May you find forgiveness for yourself and forgive others. + May you share freely, never taking more than you give. + +=== dbm + +The dbm directory, except some files added by the mozilla project, is +licensed under the following terms: + + Copyright (c) 1991, 1993, 1994 + The Regents of the University of California. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: + This product includes software developed by the University of + California, Berkeley and its contributors. + 4. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +=== myspell + +The extensions/spellcheck/myspell directory is licensed under the following +terms: + + Copyright 2002 Kevin B. Hendricks, Stratford, Ontario, Canada + And Contributors. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + 3. All modifications to the source code must be clearly marked as + such. Binary redistributions based on modified source code + must be clearly marked as modified versions in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY KEVIN B. HENDRICKS AND CONTRIBUTORS + ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + KEVIN B. HENDRICKS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +=== boehm + +The gc/boehm directory, except the files listed under the xulrunner section, +is licensed under the following terms: + + Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers + Copyright (c) 1991-1996 by Xerox Corporation. All rights reserved. + Copyright (c) 1996-1998 by Silicon Graphics. All rights reserved. + + THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED + OR IMPLIED. ANY USE IS AT YOUR OWN RISK. + + Permission is hereby granted to use or copy this program + for any purpose, provided the above notices are retained on all copies. + Permission to modify the code and to distribute modified code is granted, + provided the above notices are retained, and a notice that the code was + modified is included with the above copyright notice. + +=== cairo + +The gfx/cairo/cairo directory is licensed under the following terms: + + Copyright (c) 2003 University of Southern California + Copyright (c) 1999 Tom Tromey + Copyright (c) 2002, 2003 University of Southern California + Copyright (c) 2004 Calum Robinson + Copyright (c) 2004 David Reveman + Copyright (c) 2000, 2002, 2004 Keith Packard + Copyright (c) 2004, 2005 Red Hat, Inc + + Cairo is free software and is available to be redistributed and/or + modified under the terms of either the GNU Lesser General Public + License (LGPL) version 2.1 or the Mozilla Public License (MPL) version + 1.1. + +=== libpixman + +The gfx/cairo/libpixman directory is licensed under the following terms: +(from gfx/cairo/libpixman/COPYING) + + libpixregion + + Copyright 1987, 1998 The Open Group + + Permission to use, copy, modify, distribute, and sell this software and its + documentation for any purpose is hereby granted without fee, provided that + the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation. + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + Except as contained in this notice, the name of The Open Group shall not be + used in advertising or otherwise to promote the sale, use or other dealings + in this Software without prior written authorization from The Open Group. + + + Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. + + All Rights Reserved + + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, + provided that the above copyright notice appear in all copies and that + both that copyright notice and this permission notice appear in + supporting documentation, and that the name of Digital not be + used in advertising or publicity pertaining to distribution of the + software without specific, written prior permission. + + DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING + ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL + DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR + ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, + WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, + ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + SOFTWARE. + + ---------------------------------------------------------------------- + libic + + Copyright © 2001 Keith Packard + + Permission to use, copy, modify, distribute, and sell this software and its + documentation for any purpose is hereby granted without fee, provided that + the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation, and that the name of Keith Packard not be used in + advertising or publicity pertaining to distribution of the software without + specific, written prior permission. Keith Packard makes no + representations about the suitability of this software for any purpose. It + is provided "as is" without express or implied warranty. + + KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THIS SOFTWARE. + + ---------------------------------------------------------------------- + slim + + slim is Copyright © 2003 Richard Henderson + + Permission to use, copy, modify, distribute, and sell this software + and its documentation for any purpose is hereby granted without fee, + provided that the above copyright notice appear in all copies and that + both that copyright notice and this permission notice appear in + supporting documentation, and that the name of Richard Henderson not be + used in advertising or publicity pertaining to distribution of the + software without specific, written prior permission. Richard Henderson + makes no representations about the suitability of this software for + any purpose. It is provided "as is" without express or implied + warranty. + + RICHARD HENDERSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + EVENT SHALL RICHARD HENDERSON BE LIABLE FOR ANY SPECIAL, INDIRECT OR + CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF + USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THIS SOFTWARE. + +=== libjpeg + +The jpeg directory, except the files under the xulrunner section, are licensed +under the following terms: + + The authors make NO WARRANTY or representation, either express or implied, + with respect to this software, its quality, accuracy, merchantability, or + fitness for a particular purpose. This software is provided "AS IS", and you, + its user, assume the entire risk as to its quality and accuracy. + + This software is copyright (C) 1991-1998, Thomas G. Lane. + All Rights Reserved except as specified below. + + Permission is hereby granted to use, copy, modify, and distribute this + software (or portions thereof) for any purpose, without fee, subject to these + conditions: + (1) If any part of the source code for this software is distributed, then this + README file must be included, with this copyright and no-warranty notice + unaltered; and any additions, deletions, or changes to the original files + must be clearly indicated in accompanying documentation. + (2) If only executable code is distributed, then the accompanying + documentation must state that "this software is based in part on the work of + the Independent JPEG Group". + (3) Permission for use of this software is granted only if the user accepts + full responsibility for any undesirable consequences; the authors accept + NO LIABILITY for damages of any kind. + + These conditions apply to any software derived from or based on the IJG code, + not just to the unmodified library. If you use our work, you ought to + acknowledge us. + + Permission is NOT granted for the use of any IJG author's name or company name + in advertising or publicity relating to this software or products derived from + it. This software may be referred to only as "the Independent JPEG Group's + software". + + We specifically permit and encourage the use of this software as the basis of + commercial products, provided that all warranty or liability claims are + assumed by the product vendor. + +=== bzip2 + +The modules/libbz2/src directory is licensed under the following terms: +(from modules/libbz2/src/LICENSE) + + This program, "bzip2", the associated library "libbzip2", and all + documentation, are copyright (C) 1996-2005 Julian R Seward. All + rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product + documentation would be appreciated but is not required. + + 3. Altered source versions must be plainly marked as such, and must + not be misrepresented as being the original software. + + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written + permission. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS + OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE + GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + Julian Seward, Cambridge, UK. + jseward@acm.org + bzip2/libbzip2 version 1.0.3 of 15 February 2005 + +=== libpng + +The directory modules/libimg/png is licensed under the following terms: +(from modules/libimg/png/LICENSE) + + This copy of the libpng notices is provided for your convenience. In case of + any discrepancy between this copy and the notices in the file png.h that is + included in the libpng distribution, the latter shall prevail. + + COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: + + If you modify libpng you may insert additional notices immediately following + this sentence. + + libpng version 1.2.6, September 12, 2004, is + Copyright (c) 2004 Glenn Randers-Pehrson, and is + distributed according to the same disclaimer and license as libpng-1.2.5 + with the following individual added to the list of Contributing Authors + + Cosmin Truta + + libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are + Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are + distributed according to the same disclaimer and license as libpng-1.0.6 + with the following individuals added to the list of Contributing Authors + + Simon-Pierre Cadieux + Eric S. Raymond + Gilles Vollant + + and with the following additions to the disclaimer: + + There is no warranty against interference with your enjoyment of the + library or against infringement. There is no warranty that our + efforts or the library will fulfill any of your particular purposes + or needs. This library is provided with all faults, and the entire + risk of satisfactory quality, performance, accuracy, and effort is with + the user. + + libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are + Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are + distributed according to the same disclaimer and license as libpng-0.96, + with the following individuals added to the list of Contributing Authors: + + Tom Lane + Glenn Randers-Pehrson + Willem van Schaik + + libpng versions 0.89, June 1996, through 0.96, May 1997, are + Copyright (c) 1996, 1997 Andreas Dilger + Distributed according to the same disclaimer and license as libpng-0.88, + with the following individuals added to the list of Contributing Authors: + + John Bowler + Kevin Bracey + Sam Bushell + Magnus Holmgren + Greg Roelofs + Tom Tanner + + libpng versions 0.5, May 1995, through 0.88, January 1996, are + Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. + + For the purposes of this copyright and license, "Contributing Authors" + is defined as the following set of individuals: + + Andreas Dilger + Dave Martindale + Guy Eric Schalnat + Paul Schmidt + Tim Wegner + + The PNG Reference Library is supplied "AS IS". The Contributing Authors + and Group 42, Inc. disclaim all warranties, expressed or implied, + including, without limitation, the warranties of merchantability and of + fitness for any purpose. The Contributing Authors and Group 42, Inc. + assume no liability for direct, indirect, incidental, special, exemplary, + or consequential damages, which may result from the use of the PNG + Reference Library, even if advised of the possibility of such damage. + + Permission is hereby granted to use, copy, modify, and distribute this + source code, or portions hereof, for any purpose, without fee, subject + to the following restrictions: + + 1. The origin of this source code must not be misrepresented. + + 2. Altered versions must be plainly marked as such and must not + be misrepresented as being the original source. + + 3. This Copyright notice may not be removed or altered from any + source or altered source distribution. + + The Contributing Authors and Group 42, Inc. specifically permit, without + fee, and encourage the use of this source code as a component to + supporting the PNG file format in commercial products. If you use this + source code in a product, acknowledgment is not required but would be + appreciated. + + + A "png_get_copyright" function is available, for convenient use in "about" + boxes and the like: + + printf("%s",png_get_copyright(NULL)); + + Also, the PNG logo (in PNG format, of course) is supplied in the + files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). + + Libpng is OSI Certified Open Source Software. OSI Certified Open Source is a + certification mark of the Open Source Initiative. + + Glenn Randers-Pehrson + glennrp@users.sourceforge.net + September 12, 2004 + +=== zlib + +The directories modules/zlib/src and security/nss/cmd/zlib are licensed under +the following terms: + + (C) 1995-2004 Jean-loup Gailly and Mark Adler + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Jean-loup Gailly Mark Adler + jloup@gzip.org madler@alumni.caltech.edu + + If you use the zlib library in a product, we would appreciate *not* + receiving lengthy legal documents to sign. The sources are provided + for free but without warranty of any kind. The library has been + entirely written by Jean-loup Gailly and Mark Adler; it does not + include third-party code. + + If you redistribute modified sources, we would appreciate that you include + in the file ChangeLog history information documenting your changes. Please + read the FAQ for more information on the distribution of modified source + versions. + +=== expat + +The directory parser/expat is licensed under the following terms: +(from parser/expat/COPYING) + + Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd + and Clark Cooper + Copyright (c) 2001, 2002 Expat maintainers. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/firefox-3.5.preinst.in +++ firefox-3.5-3.5.3+build1+nobinonly/debian/firefox-3.5.preinst.in @@ -0,0 +1,19 @@ +#!/bin/sh + +set -e + +APP_PROFILE="usr.bin.@APPNAME@" +APP_CONFFILE="/etc/apparmor.d/$APP_PROFILE" +APP_DISABLE="/etc/apparmor.d/disable/$APP_PROFILE" +if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then + # Disable AppArmor profile on install or upgrade from earlier than when we + # first shipped the profile if the user does not already have a profile + # defined + if dpkg --compare-versions "$2" lt 3.5.2+nobinonly-0ubuntu3 || echo "$2" | egrep -q '(9.04|8.10|8.04)' ; then + if [ ! -e "$APP_CONFFILE" ]; then + mkdir -p `dirname $APP_DISABLE` 2>/dev/null || true + ln -sf $APP_CONFFILE $APP_DISABLE + fi + fi +fi + --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/firefox-3.5.prerm +++ firefox-3.5-3.5.3+build1+nobinonly/debian/firefox-3.5.prerm @@ -0,0 +1,16 @@ +#!/bin/sh + +set -e + +APPNAME=firefox-3.5 + +if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then + update-alternatives --remove x-www-browser /usr/bin/$APPNAME + rm -f /var/lib/update-notifier/user.d/$APPNAME-restart-required +fi + +if [ -f /usr/share/apport/package-hooks/$APPNAME.pyc ] ; then + rm -f /usr/share/apport/package-hooks/$APPNAME.pyc +fi + +#DEBHELPER# --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/firefox.png.uu +++ firefox-3.5-3.5.3+build1+nobinonly/debian/firefox.png.uu @@ -0,0 +1,146 @@ +begin 644 firefox.png +MB5!.1PT*&@H````-24A$4@```$````!`"`8```"J:7'>````!F)+1T0`_P#_ +M`/^@O:>3````"7!(67,```L3```+$P$`FIP8````!W1)344'U`8=!!(VV`_# +M[0``&*Y)1$%4>-KMFWF,7==]WS_GW.7M\]ZLG(WD<+B9I$QM=F18LFI;L1"G +M-EHD7H`T5ERT!EH@2(.@@.T4!5H!7=(B0`H42%P;@1T[:9JXDMO85BS9KA?) +MUF)J,2DN0W)(:3B^B_OFWN_W]_TMY]Q[ +MX>\^_W]_Q-_$29]XXNSPA0O+PW'I_=(S+QL:IQO_K,E4UN/3[ZCVJ6W*81&$`*03&`4@@K2]O?"!-] +MZ9VWC28FT7\Z4(@N?>0C]RW_K2+@D4>>S7S^H1>FDCC\M7,KS;O=:.6^>1EC +M!\I$(V6B?)8@"I"A1`0!A"$N##"`;BF2E2W$R@;%S1TF6O6%BE%?S=:;GWS_ +M>T]<^M5?>/;?=^MALPOUS<8[LOA&*I2R#I2SE0H9" +M+B:;B\C$$4$F0D0!+@A0#IJ)H=94U.H)F_46V[46C4:"6MDBN[C&='7GI6/# +M^4_<,E7YD]_^K5^:_[DAX#O?.1L\^O69>T^]M/Z[9[;5+ZZ5^RB.5!CM+S#8 +MEZ4OGR&,0\(H(,C$1$-E@BA$2`D"G`.M#4E3D;0422LA:2J:346UGK!1:[%5 +M;]&L-0F7-IANU*^\=:+PJ0^^Y\2?W'WWB6M_HP0\]/!34__M+Y_[R)6F_MVY +M7([RGG[&!XOT]^7(9B*B."2,>BP3$O7W$10R2"D10F`=&&-I-1*:M29),^F0 +MT6HF)"U%LYFP56NQ64MH-9ID5C:Y4YK9$Z-]O_$'__F#C_^XUQ_\).!_[_>_ +M?-]G'SWWA:?J^CWU_CXF1RM,]A^ +M_>-@D#\N^'_S[Q[^MY]]_.*C3S;,OOQ`D?V#1@_K@3\_??]_H-?>.[*Q]>B.!@L92EF0@_26)SUAK4XEY+0L]^E +M"@@*640;M'`$PA$`<29$2@'&2[X#O+UM/"'.>'*$->1P9'&H*.*;2]437SMU +MZ4L/_L?_O?]U(>"W/_8_'GQRK?'Q:B875O(9,E)@M<4:B[5^="8=M<4)`<4< +M3@BL32\\$R%R&?\/G4.F"@AP"&MQB>X`=MJDBK+^M\;@M.V2D:HB=H[8.4PV +MQPMCXR>^=6GC2W_V9Z\M',+7"OZ__N&C#_ZG[Z]_?./0_K#XTCR!^M_B'YXY.Q1ECB!=6D5(@`TDP/N0;FD3YC"XE,I\E +M.C!.$$FD$`3Y+$%_B;!<0$8A,JV_HJ<.6P=;"QMLSJ^1-!)THM'*8)3"*(U6 +M&J.,M[0RF)9";59Q4M`X/P>;.X1OV$>CD.7*Y@-EQ%VWP"W3<&@26\AZ192+&,!8AW$.`]C` +MM[K&.;3U9JQ#68M*CXM+.:PR6*W!.:SV9=!I@Y""N)('UPX-OU]O5JD^?1ZU +MM(Y9V227)(0"MJ=&^?JV_1>_\]$_O^9S +MV%(.=_(0QCEL7P&#P&SL8#,QC`][\+WF'-I:M&F#MQZ\<2ACT<8B0!L*XP/LO>\VAF\_Z%-'2HHS72(P!A%'A(4LQ5`B!%R>W"-?6&E\ +MYK&O?F_RQ\H!?_!?OCC]J>\N/+!Q9#^DR[-ABM,5JS=O8EEIZ9(1XHT7=X@GBPY$/#F&Z_ +M82QZ91.[4T=&$1E`6D=UN,*W7][YI__A]QZ>^)$(>/*IEVZ;M_)WDH'2KCIL +MM<48B[$6>]=A;#&+*69W@?7;-C4?Y[HC^=32X[=7=UB]LD2CUO03H6:"5J:; +M!+5/?$FM!5(P\*9#9$8JB##`:4-F%:\Y!)XYO?@/3]M(@DMKK@5I<=)ZV4N!*68(?NT>C`!MK"]I +M0B*P""$1.`06G$"XE&OA<$BL!:S]4`8\^^N3^BVO-#S=+^;0=M9TV%).6(&70QG:E[79+7)O4XSTJ:'O> +MJ\#OA383,9SQISF&M(S,VP-#]=Y+9-P(+&X3/OXS< +M:7:O5UNDL03.@A"<:;!G=:/^H=<4`C.7UMYZ;E.-(T77^VU+9V9M$I1.I6XL +MNM%"+:VCM$7MU%&+ZZAZJRO[-.-WR-"6>*R"BT)L(#SX1*7@-3K-`48;"`), +MFENL\U4ES.>P3\Y@S\SYUCN*.M6A?;V!GVNSD[[P`PFX>/%B +M-+]<_?4E&W1!I]U79X+20X#1QA-0K:,OS:&-02^NDERZAII?08]:BS+& +MDZ`MRAH2:[%12.'P&'W']Q&6\UWPJ5D@.SZ([,OWE%6+M0X+V-4=G)2XN]^` +M"V6/P]+2:"S"6%P^9GZK];8K5]:F?F`.J%8;>V<7JF]/XB@%+D`*$!:D`2%` +M:]A>Q0[T8;(QHM%$K&_ZI9U6XK-R*"$(8+,*C19.9G%"8ITA%`+C!(%PF/9Z +M0!A0.#2!BT.2K;I/:OD,4:5`V%?`!;)37:QU?NZ1"7'W'O-S!=TMBV@_9W#: +M=@DPCN<6ZFAC'P`^^JH$+"[N'+ZR7,L3]WDF>X'+M&>]^C+4&[BY"),N;8DX +MA#A$*`.1Q)D`%_IY@EO9Q`6#N$R(=0(K!8$3&`&!$'YF*$"$DMST&#DZZE19S2N`/C +M6.$\"<*O!AGA//AVLR3\S,BE#%@'KD-"VEH;Z\$G&GMM&;NVA5U8P24*F\WB +M#DU[1:C=JE`R8'ZY5E%*98%7$C`S,Y-_^IFK4YO--(:D`)&2(`QLK,/**LA4 +MWD$`@9\1:F/`1/YW48"+0@@DF``7&-BI^V4M*0BMP$B!%*1+8EV>=WU2!;B> +M[&^MP6B+5;XGL?4F=G$%M[F-:R4XO8Z5`6YXCR=`]>2N4')MJ2J!_<#I5Q"@ +ME,JO;]9/$@C_H]HV)`T8GP"1@;5U2!3MSA!C(?`9ND."#E/3G?5^F\O@*B6L +ML81.8(0/@4"`Q!,ATE`0WO=I"+B4!+^8XM+I=Y<`@QWHQRZL8I,U;**P28([ +M?18;7\(5^W`CXS@1>#S6L55-[FTV]?)%X)V]O86@,G(URV",*KN"ZU6$M\T"89A +M.%2K)YAV&+0&*U1+>]K[4G8&$%M[J!VS.( +M/7D8&P9>1&D>\#E`^,[1I6L$/02TYR'.N,YJD]4I"5ICEM>PC49'`58E6*5P +MM67@&R1ZIXAE-+![.RLF)Z>=KL($$),ZG;?KPS$>8AST-CQGI8I +M6-L&'?ACI4SC78*46*W1@<:I`!=VS=::!$V%"ZVO!*GW.WFVAX3=!+15D)*@ +M?2C8I16_?6D6DRA,DG@"$H55J24)Z`2VU\%I3.$7D%(.6&LE8'81X)PK!%)X +M\,I`?0=J6RG@'M"VQ^L=(D2J$.%)$`87R"[X(""0`:ZELQU5KJ>855"28=K?:&U;Z"64T8Y0A#V6^M +M#5Y!`!`5,!N?!XPRE +MK$!*PO9JW(TA4*N4L\JU-,0&ME=!JZZ7G4A#(04I4H^+&PD1:5V3."$QI2+N +M^%%<%&.;"8&4Z>%=`CK-$/B;*ZX]]N8!3X*K-7`OS6&;3;]LIA*LTJGW=4I" +MXG-0"ASGG92-Q'-!()M""'NS1FAM +M$E+@G7UA"`>FL'$&UU3(5/J!%#T$=+._0/B;)VTB;`\!;1+FK^,:#5P'N.YX +MW&B%U0IKE)>]T_[:<1!$#`SDKPO!JI32W*P,OES(9QC*"ZXI#:4Q#Z:QX9DD +M!=_V,%%4<^F-:"B=\`V1%&@(=$GISP&X5M.\J]:J`M75LLXE3 +M"JLU3JMT`55US(-/S?\C!#%3^\H((;8.'CSX2@5(*76QF)&C_='5:]?-%%$` +M?7NA/`&Z#JTZ5.M>^F.#7ATKU_Q)>D&+E(@@@""$,R_"OGTP-.QOATN)$6D[ +M#,BE342MA9@<1.:B3AGL5`/;)<&MK?J;)ZT$IY.4`(TU/@>X=L)SINOYU,*H +MP(ECPTMA&-I7ZP-T'$?-PP>*ET]=69UR[0L(`XC[O-4V(930-P)6@6K"ZG4/ +MVO:`%_X6%RO+?KM>AY-9F+T$(WM@9!0G\$OF:U7$BW.(/>5T%2E-A+TYP#EH +M-'&GGX?:#LYXX.W16NW/Y]HQ[WK`>[QC8Z,,CY1D&(;77XV`[2`(SK_UKK'X +MH<<6:2D!+DC+D?,>'>GSA"0:%F:@NNX9%S>`I_<[OJ+,S\/B`BPMPG$+@R-> +M$:,57#D/VB"T2W^UY'_\YIO8./-57 +MRD?.N1=N2L"A0X?LZ=.GE_?MZW=3>R(N+)IN0^(""%TZ#TCG_9M+/C?T@N\` +MQX^DA%1WX.+9[G,9ERY`L9+^!H@#:&GO./P$J$.\=1[8SK8'JY*TKG?+6Q>\ +MNZD%83]WOW7O7"83KP=!4'O5]0`AQ'?Z^TOO/GFL?&KFY:4[G0U[DE"[#78^ +M#*SR%R1Z8K\-N$-&S[85W8:_5H6F\D2UFJEDT\0:A#W$I^=.$@@R4!Z&0C\L +M78'ME9XR=R-XNDH0DO'Q26X].;H31='9*(H:KTI`%$4KN5SNVKWWC)NO?7/I +MSO6&]MYWSO<`84J$E?Z"U'8/R-3SR*YGVVJ@APCP(*M5F#T#29L`_,1KXB"4 +MAFYHAP44AR`_F.(+86=E=YGK`-_M?1%4>-,=X\\.#Y>C.(Z?/GCPH'O5-<&C +M1X_6,IG,]Z>GA]VM)TI+0FD?[[W6WM!"R%72,F=O2'B])A@$P#+]5J93MN^Z;^&XYRRN!M]*1K"^)'0)N8D:_DB"C0#=A +M9:Y+BE%=XFI;FHD_7_N&!@0O_S+^[X],1Z`;KV2A$1#-`GY(Y`=3Y.1[BE)[6WU +M@U72SN8=)(/LJ\O??HV@/][_KP%.''&93.:AP<'!ZCWW3,V_[6UC7PR"*KCUE(A6-SG59T%O[59`+\B; +M[;,W$F)`9J'O"!2/0/^;(!Q*P=\0`JU>%>R#\#B(@T`&T(!@SYXCUQ]XX-@3 +MX^.C8:%0>.3X\>-+/_+S`<>.'5L^<^;,E\;&QG[]?>^K+Z^NUJX___S%<6OK +MX')@LMYZVLWN0R\]HWN5_>WR*'-0NLW_#U'P;E$V)93=[;#=/3GR5DB?]ID" +MZO3W]YL/?>CVIZ:GQ^/^_OXKV6SVL1_[(:E\/O]8?W__P;U[)][RP`/-K]1J +MS?MG9BY,.%=+8S"7GERE@I(W>0+7W?S)W'86-PW0SGO0:7]\9S9XPWR@W14Z +M#2X!6JDU@2;%8K_^P`>./7S''?N:HZ.C]7P^_\='CARI_T3/"I\_?WZ@6JU^ +M='Y^?N_%BU>;G_C$L_=?OGQFPEJ;DD!ZUUG2?N@-QH!\"GXUE:9Z]";UL3L`P,'%`?_."=7[CKKFF]?_]^ +M/3`P\-]OO?761WZJ3XN?.W?NX-;6UF_-S\\/SIU4`5%*0)BJH`J,`@N=+NV5GWY@/`7=:ZJ'A"X!0F38O_^-BQ_XP.W? +M/'%BK]V[=Z\9'!S\8JE4^LOIZ6G[4W]<_MRY

WM[=_?<5NK]&"CT@`_3"P[24ZZF'A<^1IRI7+]WQW'-/WU:K7<6YY`;OM\.@G2#;TA4]U2/?DS/L +M#R#`$8;#3$W=>OV^^TY\Y\2)L>;X^)@9&QNSI5+I+TZ>//G7/Y,7)LZ?/]_? +M;#8_L+FY^?<6%A;4RLJ*N'IU53_^^.P=%RZ\>.OV]BS.[?2T&VWORY[V0_1T +M<<$-'=V-1,3$\1[&QHXOO.4MQY^X_?;1G>'A`3DZ.AH/#P\O%HO%/SU^_/BI +MG^D;([.SL[)>K]];J]5^975U=6!U=56NKZ_K^?DM?>K4]8,S,U>.+RU='=)Z +M&=CN*8<_Z-2]QV0(@D'*Y0GV[IV>N?WV?=\_&AMS(R(@LE\O? +MBN/X+XX=.[;^-_;.T+ESYX9;K=9[:[7:/>OKZ_'Z^KK8VMJRFYM5O;Q<=^?. +MK>R[?GWMC1L;*R-;6\LH50,46K=2-3BDC-*PR5`L]C,PL&=K:*C_V3>\861] +M__[R5G]_0?;UE:)*I<+@X*"H5"I7LMGLYW.YW/=?2[)[W=\:FYF9$4JI2:74 +M+S4:C;=L;FYFM[:V],[.3E"KU6RKE=AZ/;'-IF)[.REN;R=]]7I"K6;)9`39 +M;$0N%U*I9!:+Q=#F\QF1SV?"7"Y'H5"PY7)95BJ5H%`HS&2SV<>B*'KNZ-&C +M]9^[]P8O7KPHE%)#QIA[6ZW6'8U&XT"M5K/U>MTU&@V3)$FLE$)KG1ACG+56 +M"B&L$((@"&3D/S:?S^M<+A<7BT5;*!3J<1P_%T71M\(PO'STZ-&?VINEK^N; +MHQ%UCK66@=`&`3!"##BG*L`B1!B +KQSEW52FU$X8A412U#A\^;/B[S^O[^;\Z\7.<>GK+0@````!)14Y$KD)@@@`` +` +end --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/firefox-3.5-final.desktop +++ firefox-3.5-3.5.3+build1+nobinonly/debian/firefox-3.5-final.desktop @@ -0,0 +1,72 @@ +[Desktop Entry] +Version=1.0 +Name=Firefox Web Browser +Name[ca]=Navegador web Firefox +Name[cs]=Firefox Webový prohlížeč +Name[es]=Navegador web Firefox +Name[fa]=مرورگر اینترنتی Firefox +Name[fi]=Firefox-selain +Name[fr]=Navigateur Web Firefox +Name[hu]=Firefox webböngésző +Name[it]=Firefox Browser Web +Name[ja]=Firefox ウェブ・ブラウザ +Name[ko]=Firefox 웹 브라우저 +Name[nb]=Firefox Nettleser +Name[nl]=Firefox webbrowser +Name[nn]=Firefox Nettlesar +Name[no]=Firefox Nettleser +Name[pl]=Przeglądarka WWW Firefox +Name[pt]=Firefox Navegador Web +Name[pt_BR]=Navegador Web Firefox +Name[sk]=Internetový prehliadač Firefox +Name[sv]=Webbläsaren Firefox +Comment=Browse the World Wide Web +Comment[ca]=Navegueu per el web +Comment[cs]=Prohlížení stránek World Wide Webu +Comment[de]=Im Internet surfen +Comment[es]=Navegue por la web +Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید +Comment[fi]=Selaa Internetin WWW-sivuja +Comment[fr]=Navigue sur Internet +Comment[hu]=A világháló böngészése +Comment[it]=Esplora il web +Comment[ja]=ウェブを閲覧します +Comment[ko]=웹을 돌아 다닙니다 +Comment[nb]=Surf på nettet +Comment[nl]=Verken het internet +Comment[nn]=Surf på nettet +Comment[no]=Surf på nettet +Comment[pl]=Przeglądanie stron WWW +Comment[pt]=Navegue na Internet +Comment[pt_BR]=Navegue na Internet +Comment[sk]=Prehliadanie internetu +Comment[sv]=Surfa på webben +GenericName=Web Browser +GenericName[ca]=Navegador web +GenericName[cs]=Webový prohlížeč +GenericName[es]=Navegador web +GenericName[fa]=مرورگر اینترنتی +GenericName[fi]=WWW-selain +GenericName[fr]=Navigateur Web +GenericName[hu]=Webböngésző +GenericName[it]=Browser Web +GenericName[ja]=ウェブ・ブラウザ +GenericName[ko]=웹 브라우저 +GenericName[nb]=Nettleser +GenericName[nl]=Webbrowser +GenericName[nn]=Nettlesar +GenericName[no]=Nettleser +GenericName[pl]=Przeglądarka WWW +GenericName[pt]=Navegador Web +GenericName[pt_BR]=Navegador Web +GenericName[sk]=Internetový prehliadač +GenericName[sv]=Webbläsare +Exec=firefox %u +Terminal=false +X-MultipleArgs=false +Type=Application +Icon=firefox-3.5 +Categories=Application;Network; +MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png; +StartupWMClass=Firefox +StartupNotify=true --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/presubj +++ firefox-3.5-3.5.3+build1+nobinonly/debian/presubj @@ -0,0 +1,41 @@ +*** Please submit non packaging issue (e.g. feature requests) bugs to +the Debian BTS and the upstream bugzilla +(https://bugzilla.mozilla.org/enter_bug.cgi?product=Firefox) and put a +reference to the bugzilla bug in the Debian bug report, to ease bug +triage for the maintainers. Thank you. *** + +Firefox extensions being a big source of problems, please either try to +reproduce your bug with a clean user of with you current user in safe +mode, with the "firefox -safe-mode" command line before filing any bugs. +If your bug disappears with a clean user or in safe mode, you might want +to find which extension is responsible for it and file a bug to the +appropriate package, bug tracking system, or author. + +Also, please try running firefox with MOZ_DISABLE_PANGO=1 set in your +environment to test with Pango rendering disabled, which can cause +problems in some cases. + +If your Firefox installation pre-dates 1.0, you might have had problems +Firefox not really cleanly supporting upgrade from one release to another. +Please try moving around your ~/.mozilla/firefox directory to see if it +helps with your issue. + +Firefox requires the loopback interface (lo) to be up and unfiltered +to accept keyboard input and function correctly. Please make sure this +is the case before filing any bugs. + +If you get crashes and none of the above hints did avoid the crash, please +first try to remove plugins from the /usr/lib/firefox/plugins, +/usr/lib/mozilla-firefox/plugins and ~/.mozilla/plugins directories. + +If Firefox still crashes, please install the firefox-dbg package and run +firefox with gdb with the "firefox -g" command line. On the gdb prompt, type +the following commands: +set pagination off +run +bt full +And attach the resulting backtrace to your bug report. + +If you are seeing XML parsing errors, please make sure you kill all +running Firefoxes and reload before filing any bugs. + --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/rules +++ firefox-3.5-3.5.3+build1+nobinonly/debian/rules @@ -0,0 +1,318 @@ +#!/usr/bin/make -f + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) + +DEBIAN_NAME := $(shell dpkg-parsechangelog | sed -n 's/^Source: *\(.*\)$$/\1/ p') + +DEBIAN_APP_NAME := $(shell echo $(DEBIAN_NAME) | sed -e 's/-.*//') +DEBIAN_APP_NAME_VER := $(shell echo $(DEBIAN_NAME) | sed -e 's/.*-//g') +DEBIAN_APP_NAME_OTHER := abrowser + +DEBIAN_NAME_OTHER := $(DEBIAN_APP_NAME_OTHER)-$(DEBIAN_APP_NAME_VER) +BRANDING_NAME_OTHER := awesome-browser +DEBIAN_META_NAME := $(shell grep '^Package: $(DEBIAN_APP_NAME)$$' $(CURDIR)/debian/control | sed -e 's/^Package: //') + +DEBIAN_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: *\(.*\)$$/\1/ p') +DEBIAN_XUL_VER := $(shell MALLOC_OPTIONS=O xulrunner-1.9.1 --gre-version) +DEBIAN_XUL_DEV := /usr/lib/xulrunner-devel-$(DEBIAN_XUL_VER) +DEBIAN_XUL_DIR := usr/lib/xulrunner-$(DEBIAN_XUL_VER) +DEBIAN_FF3_VER = $(shell cat build-tree/mozilla/browser/config/version.txt) +DEBIAN_FF3_DIR = usr/lib/$(DEBIAN_APP_NAME)-$(DEBIAN_FF3_VER) +DEB_TAR_SRCDIR := mozilla + +MOZCLIENT_PROJECTNAME := $(DEBIAN_NAME) +MOZCLIENT_PROJECTDIR := $(CURDIR)/debian/mozclient + +# minVersion and maxVersion used in install.rdf +EM_TRANSLATION_VERSION = $(DEBIAN_FF3_VER) +EM_TRANSLATION_MIN_VERSION = 3.5 +EM_TRANSLATION_MAX_VERSION = 3.5.* + +EXTRA_SYSTEM_CONFIGURE_FLAGS = $(NULL) + +FORCE_OFFICIAL_BRANDING = $(NULL) + +DESKTOP = $(DEBIAN_NAME_OTHER).desktop +ifneq (,$(findstring ~hg,$(DEBIAN_VERSION))) + # codename branding for dailies + BRANDING = --with-branding=browser/branding/unofficial + DESKTOP_BRANDED = $(DEBIAN_NAME)-shiretoko.desktop +else + # official branding for releases + BRANDING = --enable-official-branding + DESKTOP_BRANDED = $(DEBIAN_NAME)-final.desktop +endif + +# translation flags +MOZ_TRANSLATION_AUTO_XPI_OUTDIR := debian/lp-export-xpis/ +MOZ_TRANSLATION_AUTO_XPI_SEARCHDIRS := debian/$(DEBIAN_NAME) +MOZ_TRANSLATION_AUTO_XPI_LOCALE := en-US + +DEB_AUTO_UPDATE_AUTOCONF=2.13 + +include /usr/share/cdbs/1/rules/tarball.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/class/autotools.mk +include $(CURDIR)/debian/mozclient/$(DEBIAN_NAME).mk +include /usr/share/mozilla-devscripts/lp-locale-export.mk + +# We don't want build-tree/mozilla/README to be shipped as a doc +DEB_INSTALL_DOCS_ALL := $(NULL) + +CFLAGS = -g +CXXFLAGS = -g + +LDFLAGS=$(shell echo $$LDFLAGS | sed -e 's/-Wl,-Bsymbolic-functions//') +export LDFLAGS + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + EXTRA_SYSTEM_CONFIGURE_FLAGS += --disable-optimize +endif + +USE_SYSTEM_CAIRO := $(shell pkg-config --exists 'cairo >= 1.5.8'; a=$$?; if test $$a != 1; then echo 1; fi) +# for old cairo versions we cannot use system cairo +ifeq (1,$(USE_SYSTEM_CAIRO)) + EXTRA_SYSTEM_CONFIGURE_FLAGS += --enable-system-cairo +else + EXTRA_SYSTEM_CONFIGURE_FLAGS += --disable-system-cairo +endif + +USE_SYSTEM_SQLITE := $(shell pkg-config --exists 'sqlite3 >= 3.6.16'; a=$$?; if test $$a != 1; then echo 1; fi) +ifeq (1,$(USE_SYSTEM_SQLITE)) + EXTRA_SYSTEM_CONFIGURE_FLAGS += --enable-system-sqlite +else + EXTRA_SYSTEM_CONFIGURE_FLAGS += --disable-system-sqlite +endif + +# required for various features such as safe browsing +BUILD_OFFICIAL = 1 +export BUILD_OFFICIAL + +DEB_CONFIGURE_USER_FLAGS= \ + $(EXTRA_SYSTEM_CONFIGURE_FLAGS) \ + --disable-debug \ + --with-user-appdir=.mozilla \ + --with-system-jpeg=/usr \ + --with-system-zlib=/usr \ + --with-libxul-sdk=$(DEBIAN_XUL_DEV) \ + --with-system-libxul \ + --without-system-nspr \ + --without-system-nss \ + --disable-crashreporter \ + --disable-composer \ + --disable-elf-dynstr-gc \ + --disable-gtktest \ + --disable-install-strip \ + --disable-installer \ + --disable-ldap \ + --disable-mailnews \ + --disable-profilesharing \ + --disable-strip \ + --disable-strip-libs \ + --disable-tests \ + --disable-mochitest \ + --disable-updater \ + --disable-xprint \ + --enable-application=browser \ + --enable-canvas \ + --enable-default-toolkit=cairo-gtk2 \ + --enable-gnomevfs \ + --enable-optimize \ + --enable-pango \ + --enable-postscript \ + --enable-svg \ + --enable-mathml \ + --enable-xft \ + --enable-xinerama \ + --enable-extensions=default,-reporter \ + --enable-safe-browsing \ + --enable-single-profile \ + --enable-system-myspell \ + --with-distribution-id=com.ubuntu \ + $(BRANDING) + +UUDECODE = \ + debsearch.gif \ + $(NULL) + +DEBIAN_EXECUTABLES = \ + firefox.sh \ + $(NULL) + +subst_files = \ + debian/$(DEBIAN_NAME)-gnome-support.postinst \ + debian/$(DEBIAN_NAME).postinst \ + debian/$(DEBIAN_NAME).postrm \ + debian/$(DEBIAN_NAME).preinst \ + debian/usr.bin.firefox.apparmor \ + debian/README.Debian \ + debian/firefox.sh \ + $(NULL) + +%: %.in + sed -e 's,@LIBDIR@,/$(DEBIAN_FF3_DIR),g' \ + -e 's,@APPNAME@,$(DEBIAN_NAME),g' < $< > $@ + +debian/firefox.sh: debian/firefox.sh.in + sed -e 's,@LIBDIR@,/$(DEBIAN_FF3_DIR),g' \ + -e 's,@META_NAME@,$(DEBIAN_META_NAME),g' \ + -e 's,@APPVER@,$(DEBIAN_APP_NAME_VER),g' < $< > $@ + +debian/migrator/ffox-35-beta-profile-migration-dialog: debian/migrator/main.c + $(CC) $(CFLAGS) -o $@ $< $(shell pkg-config --cflags --libs gtk+-2.0) + +BRANDING_MAKEFILES = ../../browser/branding/$(BRANDING_NAME_OTHER)/Makefile \ + ../../browser/branding/$(BRANDING_NAME_OTHER)/locales/Makefile \ + ../../browser/branding/$(BRANDING_NAME_OTHER)/content/Makefile \ + $(NULL) + +common-build-arch:: + cd build-tree/mozilla/browser/locales/; \ + $(MAKE) SUBMAKEFILES="$(BRANDING_MAKEFILES)" $(BRANDING_MAKEFILES) + cd build-tree/mozilla/browser/locales/; \ + $(MAKE) -C ../../browser/branding/$(BRANDING_NAME_OTHER)/content/; \ + $(MAKE) -C ../../browser/branding/$(BRANDING_NAME_OTHER)/locales/ + +common-post-build-arch:: + cd build-tree/mozilla/; \ + mkdir -p $(CURDIR)/debian/tmp-$(DEBIAN_NAME)-branding/; \ + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp-$(DEBIAN_NAME)-branding/ + cd build-tree/mozilla/browser/locales/; \ + $(MAKE) -C ../../browser/branding/$(BRANDING_NAME_OTHER)/ + cd build-tree/mozilla/; \ + mkdir -p $(CURDIR)/debian/tmp-$(DEBIAN_NAME_OTHER)-branding/; \ + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp-$(DEBIAN_NAME_OTHER)-branding/ + +binary-install/$(DEBIAN_NAME):: + dh_installdirs $(DEBIAN_FF3_DIR)/distribution/ + dh_installdirs -p$(DEBIAN_NAME) /usr/lib/firefox-addons/searchplugins/en-US + rm -rf debian/$(DEBIAN_NAME)/$(DEBIAN_FF3_DIR)/icons + rm -rf debian/$(DEBIAN_NAME)/$(DEBIAN_FF3_DIR)/chrome/icons + dh_install -p$(DEBIAN_NAME) \ + debian/tmp-$(DEBIAN_NAME_OTHER)-branding/$(DEBIAN_FF3_DIR)/chrome/classic.* \ + debian/tmp-$(DEBIAN_NAME_OTHER)-branding/$(DEBIAN_FF3_DIR)/chrome/en-US.* \ + debian/tmp-$(DEBIAN_NAME_OTHER)-branding/$(DEBIAN_FF3_DIR)/chrome/browser.* \ + $(DEBIAN_FF3_DIR)/chrome + touch debian/$(DEBIAN_NAME)/$(DEBIAN_FF3_DIR)/.autoreg + if [ -d debian/$(DEBIAN_NAME)/usr/lib/xulrunner-addons/extensions ] ; then \ + touch $(foreach dir,$(wildcard debian/$(DEBIAN_NAME)/usr/lib/xulrunner-addons/extensions/*),$(dir)/chrome.manifest) ; \ + fi + dh_install debian/firefox.sh $(DEBIAN_FF3_DIR) + dh_installdocs -p$(DEBIAN_NAME) debian/firefox.cfg + dh_install debian/$(DEBIAN_NAME)-restart-required.update-notifier $(DEBIAN_FF3_DIR) + dh_install debian/migrator/ffox-35-beta-profile-migration-dialog $(DEBIAN_FF3_DIR) + dh_link $(DEBIAN_FF3_DIR)/firefox.sh usr/bin/$(DEBIAN_NAME) +ifneq (,$(DEBIAN_META_NAME)) + dh_link usr/bin/$(DEBIAN_NAME) usr/bin/$(DEBIAN_APP_NAME) + dh_link $(DEBIAN_FF3_DIR)/$(DEBIAN_APP_NAME) $(DEBIAN_FF3_DIR)/$(DEBIAN_APP_NAME_OTHER) + dh_link $(DEBIAN_FF3_DIR)/$(DEBIAN_APP_NAME) $(DEBIAN_FF3_DIR)/$(DEBIAN_NAME_OTHER) + dh_link $(DEBIAN_FF3_DIR)/$(DEBIAN_APP_NAME) $(DEBIAN_FF3_DIR)/$(DEBIAN_APP_NAME)-$(DEBIAN_APP_NAME_VER) + dh_install debian/tmp/$(DEBIAN_FF3_DIR)/$(DEBIAN_META_NAME) $(DEBIAN_FF3_DIR)/ +else + dh_link $(DEBIAN_FF3_DIR)/$(DEBIAN_APP_NAME)-$(DEBIAN_APP_NAME_VER) $(DEBIAN_FF3_DIR)/$(DEBIAN_NAME_OTHER) + install -m 755 debian/tmp/$(DEBIAN_FF3_DIR)/$(DEBIAN_APP_NAME) debian/$(DEBIAN_NAME)/$(DEBIAN_FF3_DIR)/$(DEBIAN_APP_NAME)-$(DEBIAN_APP_NAME_VER) +endif + dh_link usr/lib/firefox-addons/extensions $(DEBIAN_FF3_DIR)/extensions + dh_link usr/lib/firefox-addons/plugins $(DEBIAN_FF3_DIR)/plugins + dh_link etc/$(DEBIAN_NAME)/pref $(DEBIAN_FF3_DIR)/defaults/syspref + dh_link etc/$(DEBIAN_NAME)/profile $(DEBIAN_FF3_DIR)/defaults/profile + dh_link usr/share/myspell/dicts $(DEBIAN_FF3_DIR)/dictionaries + rm -f debian/$(DEBIAN_NAME)/$(DEBIAN_FF3_DIR)/chrome/browser-branding* + dh_install debian/distribution.ini $(DEBIAN_FF3_DIR)/distribution/ + cp debian/usr.bin.firefox.apparmor debian/$(DEBIAN_NAME)/etc/apparmor.d/usr.bin.$(DEBIAN_NAME) + dh_link -p$(DEBIAN_NAME) usr/lib/firefox-addons/searchplugins $(DEBIAN_FF3_DIR)/distribution/searchplugins + dh_link -p$(DEBIAN_NAME) usr/lib/firefox-addons/searchplugins usr/lib/firefox-addons/searchplugins/common + install -m 644 debian/tmp/$(DEBIAN_FF3_DIR)/searchplugins/* debian/$(DEBIAN_NAME)/usr/lib/firefox-addons/searchplugins/en-US/ + +binary-install/$(DEBIAN_NAME_OTHER)-branding:: + dh_install -p$(DEBIAN_NAME_OTHER)-branding \ + debian/tmp-$(DEBIAN_NAME_OTHER)-branding/$(DEBIAN_FF3_DIR)/icons $(DEBIAN_FF3_DIR) + dh_install -p$(DEBIAN_NAME_OTHER)-branding \ + debian/tmp-$(DEBIAN_NAME_OTHER)-branding/$(DEBIAN_FF3_DIR)/chrome/icons $(DEBIAN_FF3_DIR)/chrome + dh_install -p$(DEBIAN_NAME_OTHER)-branding \ + debian/tmp-$(DEBIAN_NAME_OTHER)-branding/$(DEBIAN_FF3_DIR)/chrome/awesome-* $(DEBIAN_FF3_DIR)/chrome/ + dh_link -p$(DEBIAN_NAME_OTHER)-branding $(DEBIAN_FF3_DIR)/icons/mozicon128.png usr/share/pixmaps/$(DEBIAN_NAME_OTHER).png + dh_installdirs -p$(DEBIAN_NAME_OTHER)-branding $(DEBIAN_FF3_DIR)/defaults/preferences/ + mkdir -p debian/$(DEBIAN_NAME_OTHER)-branding/usr/share/applications/ +ifneq (,$(DEBIAN_META_NAME)) + cp -f debian/$(DESKTOP) \ + debian/$(DEBIAN_NAME_OTHER)-branding/usr/share/applications/$(DEBIAN_APP_NAME_OTHER).desktop +else + cp -f debian/$(DESKTOP) \ + debian/$(DEBIAN_NAME_OTHER)-branding/usr/share/applications/$(DEBIAN_APP_NAME_OTHER)-$(DEBIAN_APP_NAME_VER).desktop +endif + +binary-install/$(DEBIAN_NAME)-branding:: + rm -rf debian/$(DEBIAN_NAME)-branding/$(DEBIAN_FF3_DIR)/icons + rm -rf debian/$(DEBIAN_NAME)-branding/$(DEBIAN_FF3_DIR)/chrome/icons + dh_install -p$(DEBIAN_NAME)-branding \ + debian/tmp-$(DEBIAN_NAME)-branding/$(DEBIAN_FF3_DIR)/chrome/browser-branding* $(DEBIAN_FF3_DIR)/chrome + dh_install -p$(DEBIAN_NAME)-branding \ + debian/tmp-$(DEBIAN_NAME)-branding/$(DEBIAN_FF3_DIR)/icons $(DEBIAN_FF3_DIR) + dh_install -p$(DEBIAN_NAME)-branding \ + debian/tmp-$(DEBIAN_NAME)-branding/$(DEBIAN_FF3_DIR)/chrome/icons $(DEBIAN_FF3_DIR)/chrome + dh_link -p$(DEBIAN_NAME)-branding $(DEBIAN_FF3_DIR)/icons/mozicon128.png usr/share/pixmaps/$(DEBIAN_NAME).png + mkdir -p debian/$(DEBIAN_NAME)-branding/usr/share/applications/ +ifneq (,$(DEBIAN_META_NAME)) + cp -f debian/$(DESKTOP_BRANDED) \ + debian/$(DEBIAN_NAME)-branding/usr/share/applications/$(DEBIAN_APP_NAME).desktop +else + cp -f debian/$(DESKTOP_BRANDED) \ + debian/$(DEBIAN_NAME)-branding/usr/share/applications/$(DEBIAN_APP_NAME)-$(DEBIAN_APP_NAME_VER).desktop +endif + +binary-install/$(DEBIAN_NAME):: debian/$(DEBIAN_NAME)/$(DEBIAN_FF3_DIR)/defaults/preferences/ubuntu-useragent.js + +debian/$(DEBIAN_NAME)/$(DEBIAN_FF3_DIR)/defaults/preferences/ubuntu-useragent.js: debian/ubuntu-useragent.js.tmpl + sed \ + -e 's/@VENDOR@/'`lsb_release -i -s`'/g' \ + -e 's/@VENDOR_SUB@/'`lsb_release -r -s`'/g' \ + -e 's/@VENDOR_COMMENT@/'`lsb_release -c -s`'/g' \ + < $< > $@ + +binary-install/$(DEBIAN_NAME_OTHER)-branding:: debian/$(DEBIAN_NAME_OTHER)-branding/$(DEBIAN_FF3_DIR)/defaults/preferences/ubuntu-abrowser.js + +debian/$(DEBIAN_NAME_OTHER)-branding/$(DEBIAN_FF3_DIR)/defaults/preferences/ubuntu-abrowser.js: debian/ubuntu-abrowser.js.tmpl + sed \ + -e 's/@APP_VERSION@/$(DEBIAN_FF3_VER)/' \ + < $< > $@ + +LOCALE_VERSION = $(shell echo $(DEBIAN_VERSION) | sed -e 's/~hg.*/pre/' | tr -d '~') + +binary-post-install/$(DEBIAN_NAME):: auto-locale-xpi.mk/translate compare + sed \ + -e 's/@EM_VERSION@/$(EM_TRANSLATION_VERSION)/' \ + -e 's/@EM_FIREFOX_MIN_VERSION@/$(EM_TRANSLATION_MIN_VERSION)/' \ + -e 's/@EM_FIREFOX_MAX_VERSION@/$(EM_TRANSLATION_MAX_VERSION)/' \ + < debian/translation-support/install.rdf.in > debian/install.rdf + cd debian && zip lp-export-xpis/en-US.xpi install.rdf +ifeq (,$(findstring $(EM_TRANSLATION_VERSION), $(LOCALE_VERSION))) + $(warning EM_TRANSLATION_VERSION=$(EM_TRANSLATION_VERSION) LOCALE_VERSION=$(LOCALE_VERSION). You need to explicitly adjust the translation version and min/max bounds.) +endif + sed -i \ + -e 's/^MaxVersion=.*/MaxVersion=1.9.1.*/' \ + -e 's/^MinVersion=.*/MinVersion=1.9.1/' \ + debian/$(DEBIAN_NAME)/$(DEBIAN_FF3_DIR)/application.ini + +pre-build:: $(subst_files) debian/migrator/ffox-35-beta-profile-migration-dialog + set -e; for i in $(UUDECODE); do \ + uudecode -o debian/$$i debian/$$i.uu; \ + done ; \ + for i in $(DEBIAN_EXECUTABLES); do \ + chmod a+x debian/$$i; \ + done + +clean:: + set -e; for i in $(UUDECODE); do \ + rm -f debian/$$i; \ + done ; + rm -f debian/$(DEBIAN_NAME).desktop + rm -f $(subst_files) debian/install.rdf + rm -f debian/migrator/ffox-35-beta-profile-migration-dialog + rm -f debian/migrator/*~ + rm -rf debian/tmp-* --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/firefox-3.5.menu +++ firefox-3.5-3.5.3+build1+nobinonly/debian/firefox-3.5.menu @@ -0,0 +1,3 @@ +?package(firefox-3.5):needs="x11" section="Applications/Network/Web Browsing" \ + title="Firefox 3.5 Browser" command="/usr/bin/firefox-3.5" hints="Web browsers" \ + icon="/usr/share/pixmaps/firefox-3.5.png" --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/ubuntu-abrowser.js.tmpl +++ firefox-3.5-3.5.3+build1+nobinonly/debian/ubuntu-abrowser.js.tmpl @@ -0,0 +1,2 @@ +// This is the pref file for abrowser +pref("general.useragent.extra.firefox", "Firefox/@APP_VERSION@"); --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/firefox-3.5-shiretoko.desktop +++ firefox-3.5-3.5.3+build1+nobinonly/debian/firefox-3.5-shiretoko.desktop @@ -0,0 +1,14 @@ +[Desktop Entry] +Version=1.0 +Name=Shiretoko Web Browser +Comment=Firefox 3.5 +GenericName=Preview Browser +Exec=firefox %u +Terminal=false +X-MultipleArgs=false +Type=Application +Icon=firefox-3.5 +Categories=Application;Network; +MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png; +StartupWMClass=Firefox +StartupNotify=true --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/control +++ firefox-3.5-3.5.3+build1+nobinonly/debian/control @@ -0,0 +1,200 @@ +Source: firefox-3.5 +Section: web +Priority: optional +Maintainer: Ubuntu Mozilla Team +Vcs-Bzr: https://code.launchpad.net/~mozillateam/firefox/firefox-3.5.head +Build-Depends: cdbs, debhelper (>= 5), sharutils, m4, + autotools-dev, autoconf2.13, + quilt, patchutils (>= 0.2.25), + bzip2, zlib1g-dev, zip, + libx11-dev, libxt-dev, + libgtk2.0-dev (>= 2.10), + liborbit2-dev, libidl-dev (>= 0.8.0), + libxft-dev, libfreetype6-dev, + libpng12-dev, libjpeg62-dev, + libxrender-dev, libxinerama-dev, + libcairo2-dev, libpixman-1-dev, + libgnome2-dev, libgconf2-dev, libgnomevfs2-dev, libgnomeui-dev, + libstartup-notification0-dev, + libasound2-dev, + binutils (>= 2.17-1) [mips mipsel], + libhunspell-dev, + libdbus-glib-1-dev (>= 0.60), + xulrunner-1.9.1-dev (>= 1.9.1), + libnspr4-dev, libnss3-dev, + mozilla-devscripts (>= 0.10~), + lsb-release +Standards-Version: 3.8.1 + +Package: firefox-3.5 +Architecture: any +Depends: fontconfig, + psmisc, + debianutils (>= 1.16), + xulrunner-1.9.1 (>= 1.9.1), + ${shlibs:Depends}, ${misc:Depends}, + firefox-3.5-branding | abrowser-3.5-branding +Recommends: ubufox +Suggests: firefox-3.5-gnome-support (= ${binary:Version}), latex-xft-fonts, libthai0 +Provides: www-browser, firefox-3.1 +Conflicts: firefox-3.1 (<< 3.1~b4~hg20090317) +Replaces: firefox-3.1, firefox-3.0 +Description: safe and easy web browser from Mozilla + Firefox delivers safe, easy web browsing. A familiar user interface, + enhanced security features including protection from online identity theft, + and integrated search let you get the most out of the web. + +Package: firefox-3.5-branding +Architecture: any +Depends: firefox-3.5 (= ${binary:Version}), ${misc:Depends} +Replaces: firefox-3.5, firefox-3.1-branding, firefox-3.0-branding +Provides: firefox-3.1-branding +Conflicts: abrowser-3.5-branding, firefox-3.1-branding (<< 3.1~b4~hg20090317) +Description: Package that ships the firefox branding + This package ships the Firefox branding bits. If you remove this package your + user experience will become that of the abrowser. + +Package: firefox-3.5-gnome-support +Architecture: any +Section: gnome +Depends: ${shlibs:Depends}, ${misc:Depends}, firefox-3.5 (= ${binary:Version}), xulrunner-1.9.1-gnome-support +Provides: gnome-www-browser, firefox-3.1-gnome-support +Conflicts: firefox-3.1-gnome-support (<< 3.1~b4~hg20090317) +Replaces: firefox-3.1-gnome-support +Description: Support for Gnome in Mozilla Firefox + This is an extension to Firefox that allows it to use protocol + handlers from GnomeVFS, such as smb or sftp, and other GNOME + integration features. + +Package: firefox-3.5-dbg +Architecture: any +Section: debug +Priority: optional +Depends: ${shlibs:Depends}, ${misc:Depends}, firefox-3.5 (= ${binary:Version}) +Conflicts: firefox-3.1-dbg (<< 3.1~b4~hg20090317) +Replaces: firefox-3.1-dbg +Provides: firefox-3.1-dbg +Description: firefox-3.5 debug symbols + Debug symbols for Firefox 3.5. + +Package: firefox-3.5-dev +Architecture: any +Section: devel +Depends: firefox-3.5 (= ${binary:Version}), ${misc:Depends} +Conflicts: firefox-3.1-dev (<< 3.1~b4~hg20090317) +Replaces: firefox-3.1-dev +Provides: firefox-3.1-dev +Description: Development files for Mozilla Firefox + This package contains the development headers, idl files and static libraries + needed to develop applications using Mozilla Firefox. + +Package: abrowser-3.5-branding +Architecture: any +Depends: firefox-3.5 (= ${binary:Version}), ${misc:Depends} +Replaces: firefox-3.5, abrowser-3.1-branding, abrowser-3.0-branding +Conflicts: firefox-3.5-branding, abrowser-3.1-branding (<< 3.1~b4~hg20090317) +Provides: abrowser-3.1-branding +Description: package that ships the abrowser branding + The ABrowser refers to the unbranded build of firefox 3.5. + Install the firefox package if you want a branded build. + . + This is a metapackage that will point to the latest abrowser package + in your distribution. Don't remove this if you want to receive automatic major + version upgrades for this package in future. + +Package: abrowser-3.5 +Architecture: all +Depends: firefox-3.5, abrowser-3.5-branding, ${misc:Depends} +Conflicts: abrowser-3.1 (<< 3.1~b4~hg20090317) +Replaces: abrowser-3.1 +Provides: abrowser-3.1 +Description: metapackage for the unbranded abrowser + ABrowser 3.5 is an unbranded version of the popular Firefox webbrowser; it is + written in the XUL language and designed to be lightweight and cross-platform. + . + This is a metapackage that will point to the latest abrowser package in your + distribution. + Don't remove this if you want to receive automatic major version upgrades for + this package in future. + +Package: firefox +Architecture: all +Depends: firefox-3.5, firefox-3.5-branding +Description: meta package for the popular mozilla web browser + Firefox delivers safe, easy web browsing. A familiar user interface, + enhanced security features including protection from online identity theft, + and integrated search let you get the most out of the web. + . + This is a meta package that will point to the latest firefox package in ubuntu. + Don't remove this if you want to receive automatic major version upgrades for + this package in future. + +Package: abrowser +Architecture: all +Depends: firefox-3.5, abrowser-3.5-branding +Provides: firefox +Description: meta package for the unbranded abrowser + ABrowser 3.5 is an unbranded version of the popular Firefox webbrowser; it is + written in the XUL language and designed to be lightweight and cross-platform. + . + This is a meta package that will point to the latest abrowser package in your + distribution. + Don't remove this if you want to receive automatic major version upgrades for + this package in future. + +Package: firefox-gnome-support +Architecture: all +Depends: firefox-3.5-gnome-support +Description: meta package pointing to the latest gnome-support package for firefox + This is a meta package that will always point to the latest gnome-support + package for firefox. Don't remove this if you want to receive automatic major + version upgrades for this package in future. + +Package: firefox-3.1 +Architecture: all +Depends: firefox-3.5 +Description: dummy upgrade package for firefox-3.1 -> firefox-3.5 + This is a transitional package so firefox-3.1 users get firefox-3.5 on + upgrades. It can be safely removed. + +Package: firefox-3.1-gnome-support +Architecture: all +Depends: firefox-3.5-gnome-support +Description: dummy upgrade package for firefox-3.1 -> firefox-3.5 + This is a transitional package so firefox-3.1 users get firefox-3.5 on + upgrades. It can be safely removed. + +Package: firefox-3.1-dev +Architecture: all +Depends: firefox-3.5-dev +Description: dummy upgrade package for firefox-3.1 -> firefox-3.5 + This is a transitional package so firefox-3.1 users get firefox-3.5 on + upgrades. It can be safely removed. + +Package: firefox-3.1-branding +Architecture: all +Depends: firefox-3.5-branding +Description: dummy upgrade package for firefox-3.1 -> firefox-3.5 + This is a transitional package so firefox-3.1 users get firefox-3.5 on + upgrades. It can be safely removed. + +Package: firefox-3.1-dbg +Architecture: all +Depends: firefox-3.5-dbg +Description: dummy upgrade package for firefox-3.1 -> firefox-3.5 + This is a transitional package so firefox-3.1 users get firefox-3.5 on + upgrades. It can be safely removed. + +Package: abrowser-3.1-branding +Architecture: all +Depends: abrowser-3.5-branding +Description: dummy upgrade package for firefox-3.1 -> firefox-3.5 + This is a transitional package so firefox-3.1 users get firefox-3.5 on + upgrades. It can be safely removed. + +Package: abrowser-3.1 +Architecture: all +Depends: abrowser-3.5 +Description: dummy upgrade package for firefox-3.1 -> firefox-3.5 + This is a transitional package so firefox-3.1 users get firefox-3.5 on + upgrades. It can be safely removed. --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/abrowser-3.5.desktop +++ firefox-3.5-3.5.3+build1+nobinonly/debian/abrowser-3.5.desktop @@ -0,0 +1,72 @@ +[Desktop Entry] +Version=1.0 +Name=A Web Browser +Name[ca]=A Navegador web +Name[cs]=A Webový prohlížeč +Name[es]=A Navegador web +Name[fa]=A مرورگر اینترنتی +Name[fi]=A WWW-selain +Name[fr]=A Navigateur Web +Name[hu]=A webböngésző +Name[it]=A Browser Web +Name[ja]=A ウェブ・ブラウザ +Name[ko]=A 웹 브라우저 +Name[nb]=A Nettleser +Name[nl]=A webbrowser +Name[nn]=A Nettlesar +Name[no]=A Nettleser +Name[pl]=A Przeglądarka WWW +Name[pt]=A Navegador Web +Name[pt_BR]=A Navegador Web +Name[sk]=A Internetový prehliadač +Name[sv]=A Webbläsaren +Comment=Browse the World Wide Web +Comment[ca]=Navegueu per el web +Comment[cs]=Prohlížení stránek World Wide Webu +Comment[de]=Im Internet surfen +Comment[es]=Navegue por la web +Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید +Comment[fi]=Selaa Internetin WWW-sivuja +Comment[fr]=Navigue sur Internet +Comment[hu]=A világháló böngészése +Comment[it]=Esplora il web +Comment[ja]=ウェブを閲覧します +Comment[ko]=웹을 돌아 다닙니다 +Comment[nb]=Surf på nettet +Comment[nl]=Verken het internet +Comment[nn]=Surf på nettet +Comment[no]=Surf på nettet +Comment[pl]=Przeglądanie stron WWW +Comment[pt]=Navegue na Internet +Comment[pt_BR]=Navegue na Internet +Comment[sk]=Prehliadanie internetu +Comment[sv]=Surfa på webben +GenericName=Web Browser +GenericName[ca]=Navegador web +GenericName[cs]=Webový prohlížeč +GenericName[es]=Navegador web +GenericName[fa]=مرورگر اینترنتی +GenericName[fi]=WWW-selain +GenericName[fr]=Navigateur Web +GenericName[hu]=Webböngésző +GenericName[it]=Browser Web +GenericName[ja]=ウェブ・ブラウザ +GenericName[ko]=웹 브라우저 +GenericName[nb]=Nettleser +GenericName[nl]=Webbrowser +GenericName[nn]=Nettlesar +GenericName[no]=Nettleser +GenericName[pl]=Przeglądarka WWW +GenericName[pt]=Navegador Web +GenericName[pt_BR]=Navegador Web +GenericName[sk]=Internetový prehliadač +GenericName[sv]=Webbläsare +Exec=abrowser %u +Terminal=false +X-MultipleArgs=false +Type=Application +Icon=abrowser-3.5 +Categories=Application;Network; +MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png; +StartupWMClass=Firefox +StartupNotify=true --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/ubuntu-useragent.js.tmpl +++ firefox-3.5-3.5.3+build1+nobinonly/debian/ubuntu-useragent.js.tmpl @@ -0,0 +1,5 @@ + +pref ("general.useragent.vendor", "@VENDOR@"); +pref ("general.useragent.vendorSub", "@VENDOR_SUB@"); +pref ("general.useragent.vendorComment", "@VENDOR_COMMENT@"); + --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/firefox-3.5-restart-required.update-notifier +++ firefox-3.5-3.5.3+build1+nobinonly/debian/firefox-3.5-restart-required.update-notifier @@ -0,0 +1,10 @@ +Name: Firefox-3.5 restart required +Name-fr: Relancement de Firefox 3.5 requis +Priority: High +Terminal: False +DontShowAfterReboot: True +DisplayIf: pgrep -x firefox-3.5 -U $(id -u) > /dev/null +Description: Firefox-3.5 has been upgraded (or reinstalled) and must be restarted. + Please quit and restart your web browser now. +Description-fr: Firefox-3.5 a été mis à jour (ou réinstallé) et doit être relancé. + Veuillez quitter et redémarrer for navigateur. --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/changelog +++ firefox-3.5-3.5.3+build1+nobinonly/debian/changelog @@ -0,0 +1,4791 @@ +firefox-3.5 (3.5.3+build1+nobinonly-0ubuntu4) karmic; urgency=low + + [ Fabien Tassin ] + * Bump requirement for system sqlite to >= 3.6.16 (bmo 508104) + - update debian/rules + + [ Alexander Sack ] + * fix LP: #423610 - daily build failures after landing of mozilla-nss.pc droppage + (bug 422829); we drop our previously used nspr pkgconfig patch and fix + configure.in to not require in-source nspr if libxul-sdk is used + - delete debian/patches/nspr_flags_by_pkg_config_hack.patch + - add debian/patches/bzXXX_libxul_sdk_nspr.patch + - update debian/patches/series + * now that we always use libxul-sdk for getting the nspr flags we + can use --without-system-nspr and --without-system-nss all the time + - update debian/rules + * rework localized search engine patch to use ChromeRegistry locale + information rather than a char pref; also change plugin dir order to allow + locale specific searchplugins to overlay the ones shipped in + "searchplugins/common" + - add debian/patches/bz515232_att399338_distro_locale_searchplugins.patch + - update debian/patches/series + * adjust packaging to support localized searchplugins + + ship default searchplugins in /usr/lib/firefox-addons/searchplugins/en-US/ + and link that directory to $(DEBIAN_FF3_DIR)/distribution/searchplugins instead + of the main firefox APP_DIR + - update debian/rules + + set default searchplugin locale pref to en-US - which is used as a + fallback if no matching searchplugins/LOCALE directory exists for the + current locale directory + - update debian/firefox.js + + do not install upstream searchplugins through debhelper file and + install "debsearch" to the new distribution/.../en-US location + - update debian/firefox-3.0.install + + ship "common" searchplugins link that points to the old default + searchplugins location '/usr/lib/firefox-addons/searchplugins/ + - update debian/rules + + [ Jamie Strandboge ] + * fix bugs surrounding apparmor profile + + allow ixr access to gnash (LP: #429061) + + allow ixr access to pulseaudio (LP: #432702) + + allow access to plugins directory (LP: #428071) + + allow access to mounted media (LP: #433362) + + allow access to abstractions/ubuntu-console-email, + abstractions/ubuntu-email and abstractions/ubuntu-gnome-terminal + for mailto:. Add commented section for using xterm and konsole + - update debian/usr.bin.firefox-3.5 + + allow access to extensions directory (LP: #433128) + + allow 'k' access to @{HOME}/.mozilla/**/*.sqlite* (LP: #449286) + + allow Ux access to apport-bug (LP: #449423) + + allow access to /etc/mplayerplug-in.conf (LP: #439484) + + -- Alexander Sack Thu, 15 Oct 2009 02:30:48 +0200 + +firefox-3.5 (3.5.3+build1+nobinonly-0ubuntu3) karmic; urgency=low + + [ Jamie Strandboge ] + * disable profile on upgrades from earlier Ubuntu releases (LP: #436221) + - update debian/firefox-3.5.preinst.in + + -- Alexander Sack Mon, 28 Sep 2009 10:35:46 +0200 + +firefox-3.5 (3.5.3+build1+nobinonly-0ubuntu2) karmic; urgency=low + + * security/stability update v3.5.3 build1 (FIREFOX_3_5_3_BUILD1) + - see USN-821-1 + - fix LP: #333127 - Firefox 3.5 and above crash on full screen flash video + - fix LP: #236853 - firefox crashed with SIGSEGV in NSSRWLock_LockRead_Util() + + [ Alexander Sack ] + * fix LP: #422365 - apport hook fails because profiles_d is not initialized + in add_info if no profiles.ini exist; we ensure that profiles_d gets instantiated + as an empty map even if no profiles.ini exist. + - update debian/apport/firefox-3.5.py + * hook firefox-addons/searchplugins as the distribution/searchplugins + directory to support localized distro search engines. + - update debian/rules + * in case localized search engines are available the main searchplugins + directory is not scanned anymore; to fix this we provide a compatibility + link /usr/lib/firefox-addons/searchplugins/common => /usr/lib/firefox-addons/searchplugins + - update debian/firefox-3.5.links + * fix localized search engine upstream code to properly deal with general.useragent.locale + being a complex pref; also change plugin dir order to allow locale specific searchplugins + to overlay the ones shipped in "searchplugins/common" + - add debian/patches/fix_complex_locale_distro_searchplugins.patch + - update debian/patches/series + + [ Jamie Strandboge ] + * add AppArmor profile (disabled by default) (LP: #382917) + - debian/firefox-3.5.dirs: add etc/apparmor.d/disable + - add debian/firefox-3.5.preinst.in: disable the profile on new installs + and upgrades to this version + - debian/firefox-3.5.postinst.in: reload profile + - add debian/firefox-3.5.postrm.in: cleanup force-complain and disable + directories + - add debian/usr.bin.firefox.apparmor.in + - debian/rules: install profile + - add debian/README.Debian.in with note about AppArmor + - debian/apport/firefox-3.5.py: add AppArmor information if the profile is + not disabled + - debian/firefox-3.5.preinst.in: allow for when apparmor is not installed + + -- Alexander Sack Thu, 03 Sep 2009 10:03:08 +0200 + +firefox-3.5 (3.5.2+nobinonly-0ubuntu2) karmic; urgency=low + + Firefox 3.5 by default upload + + see: https://blueprints.launchpad.net/ubuntu/+spec/desktop-karmic-firefox-3.5 + + [ Fabien Tassin ] + * Make firefox-3.5 the default firefox. Use the official branding only + for releases (the -daily PPA remains branded as Shiretoko, like the + upstream nightlies). Activate the profile migrator and the apport hooks. + Add the meta packages to make the transition smoother. + - update debian/control + - drop debian/patches/firefox-fsh + - drop debian/patches/firefox-profilename + - update debian/patches/series + - update debian/firefox-3.5.install + - update debian/firefox.sh.in + - update debian/migrator/main.c + - update debian/mozclient/firefox-3.5.mk + - update debian/rules + - update debian/firefox-3.5-final.desktop + - update debian/firefox-3.5-shiretoko.desktop + - update debian/abrowser-3.5.desktop + - update debian/apport/firefox-3.5.py + + [ Alexander Sack ] + * make -final and -shiretoko .desktop file refer to unversioned "firefox" + Binary and Icon + - update debian/firefox-3.5-shiretoko.desktop + - update debian/firefox-3.5-final.desktop + - update debian/firefox-3.5-minefield.desktop + - update debian/abrowser-3.5.desktop + * add translations for .desktop file from firefox-3.0.head branch + - update debian/firefox-3.5-final.desktop + - update debian/abrowser-3.5.desktop + * set BUILD_OFFICIAL = 1 to enable all official build features + - update debian/rules + * fix LP: #404827 - Firefox doesn't warn about Attack Sites!?; add + --enable-safe-browsing to configure flags + - update debian/rules + * fix LP: #383484 - search engine plugins missing in firefox-3.5 packages; + installing searchplugins and default theme as now firefox-3.5 + Replaces: firefox-3.0 + - update debian/firefox-3.5.install + * fix restart issues by installing proper versioned binary (without a + firefox-fsh patch); in turn drop unversioned firefox link from .install + - update debian/rules + - update debian/firefox-3.0.install + + -- Alexander Sack Mon, 10 Aug 2009 17:05:37 +0200 + +firefox-3.5 (3.5.2+nobinonly-0ubuntu1) karmic; urgency=low + + * security/stability update v3.5.2 (FIREFOX_3_5_2_RELEASE) + + [ Fabien Tassin ] + * Fix postinst to also consider firefox-3.5 for the update-notifier + restart notification + - update debian/firefox-3.5.postinst.in + * Fix bogus prerm rule removing the wrong alternative + - update renamed debian/firefox-3.5.prerm + * Refresh diverged patch + - update debian/patches/nspr_flags_by_pkg_config_hack.patch + + -- Alexander Sack Mon, 03 Aug 2009 16:52:25 +0200 + +firefox-3.5 (3.5.1+build1+nobinonly-0ubuntu1) karmic; urgency=low + + * security/stability update v3.5.1 build1 (FIREFOX_3_5_1_BUILD1) + * fix LP: #396460 - Firefox 3.5 'final' version is in repos but tooltip + in menu says 'beta'; we update the shiretoko desktop file to not + say "beta" anymore + - update debian/firefox-3.5-shiretoko.desktop + * fix LP: #398121 - firefox-3.5-gnome-support failed to install/upgrade; we + make the postinst script more failsafe + - update debian/firefox-3.5-gnome-support.postinst.in + + -- Alexander Sack Thu, 16 Jul 2009 18:27:57 +0200 + +firefox-3.5 (3.5+nobinonly-0ubuntu1) karmic; urgency=low + + * New upstream release taken from tag FIREFOX_3_5_RELEASE + * Bump Depends/Build-Depends for xulrunner-1.9.1(-dev) to >= 1.9.1 + - update debian/control + * Bump EM_TRANSLATION_{MIN,MAX}_VERSION and MaxVersion/MinVersion + (from application.ini) + - update debian/rules + + -- Fabien Tassin Tue, 30 Jun 2009 20:01:33 +0200 + +firefox-3.5 (3.5~rc2+nobinonly-0ubuntu1) karmic; urgency=low + + * New upstream release taken from tag FIREFOX_3_5rc2_RELEASE + * Fix startup page, release notes and first run bogus URLs when + using non official brandings. Also fix bogus addons URLs due + to our change of appname (LP: #388880) + - update debian/patches/firefox-profilename + * Fix profile migrator broken when using abrowser-3.5 (LP: #331654) + - update debian/firefox.sh.in + * Bump Standards-Version to 3.8.1 + - update debian/control + * Call update-menus + - update debian/firefox-3.5.postinst.in + * Make firefox-3.5-dbg depend on firefox-3.5 with the exact same version + - update debian/control + * Bump Depends and Build-depends to xulrunner* >= 1.9.1~rc2 + - update debian/control + * Refresh diverged patch: + - update debian/patches/firefox-profilename + + -- Fabien Tassin Fri, 19 Jun 2009 18:55:00 +0200 + +firefox-3.5 (3.5~b4+nobinonly-0ubuntu2) karmic; urgency=low + + * bump (build-)depends version on xulrunner-1.9.1 to >= 1.9.1~b4 + - update debian/control + + -- Alexander Sack Wed, 06 May 2009 22:27:21 +0200 + +firefox-3.5 (3.5~b4+nobinonly-0ubuntu1) karmic; urgency=low + + * New upstream release 3.5 b4 + + [ H. Montoliu ] + * fix LP: #361052 - firefox apport hook fails to retrieve pluginreg.dat file + - update debian/apport/firefox-3.5.py - removed unused code and minor refactoring + + -- Alexander Sack Wed, 29 Apr 2009 15:19:59 +0200 + +firefox-3.5 (3.5~b4~hg20090330r24021+nobinonly-0ubuntu1) jaunty; urgency=low + + * New upstream snapshot, needed to initiate the firefox 3.1->3.5 transition (LP: #352995) + * Add libstartup-notification0-dev to build-deps as it now seems to be + mandatory on lpia + - update debian/control + * Fix the mozclient include to really use the local configuration + - update debian/rules + * Update MOZCLIENT_GETDATE to make it use pushlog so it is not confused by merges with + dates in the past + - update debian/mozclient/firefox-3.5.conf + + -- Fabien Tassin Mon, 30 Mar 2009 19:00:40 +0200 + +firefox-3.1 (3.1~b3+build2+nobinonly-0ubuntu1) jaunty; urgency=low + + * New upstream release taken from tag FIREFOX_3_1b3_BUILD2 (LP: #339181) + + -- Fabien Tassin Sat, 07 Mar 2009 15:27:58 +0100 + +firefox-3.1 (3.1~b3~hg20090205r23182+nobinonly-0ubuntu1) jaunty; urgency=low + + [ Fabien Tassin ] + * Drop upstreamed patch now that it has landed and add --with-system-libxul + to configure. + - update debian/rules + - drop debian/patches/installer_shouldnt_copy_xulrunner.patch + - update debian/patches/series + + [ Alexander Sack ] + * add lower bound for xulrunner-1.9.1-dev build-depends to >= + 1.9.1~b3~ + - update debian/control + + -- Alexander Sack Sat, 07 Feb 2009 15:18:30 +0100 + +firefox-3.1 (3.1~b3~hg20090122r22900+nobinonly-0ubuntu1) jaunty; urgency=low + + [ Alexander Sack ] + * improve reload plugins patch; dont rename function + - update debian/patches/bzXXX_reload_new_plugins.patch + * forward reload plugins patch upstream + - debian/patches/bzXXX_reload_new_plugins.patch => + bz460917_att350845_reload_new_plugins.patch + * fix reload new plugins patch - use variables that actually exist on 3.1 + - update debian/patches/bz460917_att350845_reload_new_plugins.patch + + [ Fabien Tassin ] + * Move mozclient project files from mozilla-descripts to this package + and update the upstream branch now that it has moved to 3.2 + - add debian/mozclient/firefox-3.1.conf + - add debian/mozclient/firefox-3.1.mk + - update debian/rules + * Fix menu still mentionning firefox 4 + - update debian/firefox-3.1.menu + * Fix WM class for minefield + - update debian/firefox-3.1-minefield.desktop + * Fix the update-notifier script to really look for firefox-3.1 + - update debian/firefox-3.1-restart-required.update-notifier + * Fix patch series after the rename of patch bz460917_* + - update debian/patches/series + * Revert to codename branding for betas + - update debian/rules + * Fix typo in control file + - update debian/control + * Drop useless patch: + - drop debian/patches/ftbfs-with-branding-dir + - update debian/patches/series + * Update diverged patches: + - update debian/patches/ubuntu_no_app_updates.patch + - update debian/patches/dont_depend_on_nspr_sources.patch + - update and rename debian/patches/ubuntu_bookmarks.html => + debian/patches/ubuntu_bookmarks.patch & d/p/series + + -- Fabien Tassin Fri, 23 Jan 2009 00:33:43 +0100 + +firefox-3.1 (3.1~b2+build1+nobinonly-0ubuntu1) jaunty; urgency=low + + New upstream release: 3.1 beta 2 from FIREFOX_3_1b2_BUILD1 (LP: #274187) + + [ Fabien Tassin ] + * Change appname and use a dedicated profile so 3.1 could run along with + 3.0 without locking/corrupting the profile. Initial 3.1 profile is + cloned from 3.0 whenever possible. + - update debian/firefox.sh.in + - add debian/patches/firefox-profilename + - add debian/patches/firefox-fsh + * Use Shiretoko, codename for 3.1 instead of Granparadiso + - rename debian/firefox-3.1-granparadiso.desktop => firefox-3.1-shiretoko.desktop + - update debian/rules + * Unset FORCE_OFFICIAL_BRANDING to return to minefield branding for + intermediate snapshots and to Shiretoko branding for milestones + - update debian/rules + * Set MALLOC_OPTIONS=O before calling xulrunner during build. This is needed + to avoid a dead-lock in jemalloc when running under fakeroot + - update debian/rules + * Drop system nspr/nss (until the soname work is stable) + - update debian/rules + * Update requirement for system sqlite3 to >= 3.6.0 + - update debian/rules + * Add libasound2-dev to Build-Depends for the new HTML5

+

@bookmarks_toolbarfolder@

+
@bookmarks_toolbarfolder_description@ +

+

@getting_started@ +
@latest_headlines@ +

+

++

Ubuntu and Free Software links

++
Information and resources about Ubuntu, Debian and Free Software in general ++

++

Ubuntu ++
Ubuntu Wiki (community-edited website) ++
Make a Support Request to the Ubuntu Community ++
Debian (Ubuntu is based on Debian) ++
++ +

@firefox_heading@

+

+

@firefox_help@ +
@firefox_customize@ +
@firefox_community@ +
@firefox_about@ +

+

--- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/patches/bz515232_att399338_distro_locale_searchplugins.patch +++ firefox-3.5-3.5.3+build1+nobinonly/debian/patches/bz515232_att399338_distro_locale_searchplugins.patch @@ -0,0 +1,120 @@ +diff --git a/browser/components/dirprovider/nsBrowserDirectoryProvider.cpp b/browser/components/dirprovider/nsBrowserDirectoryProvider.cpp +--- a/browser/components/dirprovider/nsBrowserDirectoryProvider.cpp ++++ b/browser/components/dirprovider/nsBrowserDirectoryProvider.cpp +@@ -30,16 +30,17 @@ + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + ++#include "nsIChromeRegistry.h" + #include "nsIDirectoryService.h" + + #include "nsIFile.h" + #include "nsISimpleEnumerator.h" + #include "nsIPrefService.h" + #include "nsIPrefBranch.h" + + #include "nsArrayEnumerator.h" +@@ -234,47 +235,51 @@ AppendDistroSearchDirs(nsIProperties* aD + if (NS_FAILED(rv) || !exists) + return; + + nsCOMPtr commonPlugins; + rv = searchPlugins->Clone(getter_AddRefs(commonPlugins)); + if (NS_SUCCEEDED(rv)) { + commonPlugins->AppendNative(NS_LITERAL_CSTRING("common")); + rv = commonPlugins->Exists(&exists); +- if (NS_SUCCEEDED(rv) && exists) +- array.AppendObject(commonPlugins); ++ if (NS_FAILED(rv) || !exists) ++ commonPlugins = nsnull; ++ } ++ if (NS_FAILED(rv)) ++ return; ++ ++ nsCAutoString locale; ++ nsCOMPtr localePlugins; ++ rv = searchPlugins->Clone(getter_AddRefs(localePlugins)); ++ if (NS_FAILED(rv)) ++ return; ++ ++ nsCOMPtr chromeReg = ++ do_GetService(NS_CHROMEREGISTRY_CONTRACTID); ++ if (!chromeReg) ++ return; ++ ++ chromeReg->GetSelectedLocale(NS_LITERAL_CSTRING("global"), locale); ++ if (NS_SUCCEEDED(rv)) { ++ nsCOMPtr curLocalePlugins; ++ rv = localePlugins->Clone(getter_AddRefs(curLocalePlugins)); ++ if (NS_SUCCEEDED(rv)) { ++ curLocalePlugins->AppendNative(locale); ++ rv = curLocalePlugins->Exists(&exists); ++ if (NS_SUCCEEDED(rv) && exists) { ++ array.AppendObject(curLocalePlugins); ++ if (commonPlugins) ++ array.AppendObject(commonPlugins); ++ return; // all done ++ } ++ } + } + + nsCOMPtr prefs(do_GetService(NS_PREFSERVICE_CONTRACTID)); + if (prefs) { +- +- nsCOMPtr localePlugins; +- rv = searchPlugins->Clone(getter_AddRefs(localePlugins)); +- if (NS_FAILED(rv)) +- return; +- +- localePlugins->AppendNative(NS_LITERAL_CSTRING("locale")); +- +- nsCString locale; +- rv = prefs->GetCharPref("general.useragent.locale", getter_Copies(locale)); +- if (NS_SUCCEEDED(rv)) { +- +- nsCOMPtr curLocalePlugins; +- rv = localePlugins->Clone(getter_AddRefs(curLocalePlugins)); +- if (NS_SUCCEEDED(rv)) { +- +- curLocalePlugins->AppendNative(locale); +- rv = curLocalePlugins->Exists(&exists); +- if (NS_SUCCEEDED(rv) && exists) { +- array.AppendObject(curLocalePlugins); +- return; // all done +- } +- } +- } +- + // we didn't append the locale dir - try the default one + nsCString defLocale; + rv = prefs->GetCharPref("distribution.searchplugins.defaultLocale", + getter_Copies(defLocale)); + if (NS_SUCCEEDED(rv)) { + + nsCOMPtr defLocalePlugins; + rv = localePlugins->Clone(getter_AddRefs(defLocalePlugins)); +@@ -282,16 +287,19 @@ AppendDistroSearchDirs(nsIProperties* aD + + defLocalePlugins->AppendNative(defLocale); + rv = defLocalePlugins->Exists(&exists); + if (NS_SUCCEEDED(rv) && exists) + array.AppendObject(defLocalePlugins); + } + } + } ++ ++ if (commonPlugins) ++ array.AppendObject(commonPlugins); + } + + NS_IMETHODIMP + nsBrowserDirectoryProvider::GetFiles(const char *aKey, + nsISimpleEnumerator* *aResult) + { + nsresult rv; + --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/patches/series +++ firefox-3.5-3.5.3+build1+nobinonly/debian/patches/series @@ -0,0 +1,11 @@ +bz386904_config_rules_install_dist_files.patch +dont_depend_on_nspr_sources.patch +lp185622_system_path_default_browser.patch +bz460917_att350845_reload_new_plugins.patch +ubuntu_no_app_updates.patch +awesome_browser_branding_install.patch +browser_branding.patch +ubuntu_codes_amazon.patch +ubuntu_bookmarks.patch +bz515232_att399338_distro_locale_searchplugins.patch +bzXXX_libxul_sdk_nspr.patch --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/patches/lp185622_system_path_default_browser.patch +++ firefox-3.5-3.5.3+build1+nobinonly/debian/patches/lp185622_system_path_default_browser.patch @@ -0,0 +1,140 @@ +--- + browser/components/shell/src/nsGNOMEShellService.cpp | 34 +++++++++++++++++-- + browser/components/shell/src/nsGNOMEShellService.h | 1 + 2 files changed, 33 insertions(+), 2 deletions(-) + +Index: mozilla/browser/components/shell/src/nsGNOMEShellService.cpp +=================================================================== +--- mozilla.orig/browser/components/shell/src/nsGNOMEShellService.cpp ++++ mozilla/browser/components/shell/src/nsGNOMEShellService.cpp +@@ -64,16 +64,18 @@ + #include + #include + #include + #include + #include + #include + #include + ++#define SYSTEM_PATH_BUILD 1 ++ + struct ProtocolAssociation + { + const char *name; + PRBool essential; + }; + + struct MimeTypeAssociation + { +@@ -129,25 +131,42 @@ + nsCOMPtr appPath; + rv = dirSvc->Get(NS_XPCOM_CURRENT_PROCESS_DIR, NS_GET_IID(nsILocalFile), + getter_AddRefs(appPath)); + NS_ENSURE_SUCCESS(rv, rv); + + rv = appPath->AppendNative(NS_LITERAL_CSTRING(MOZ_APP_NAME)); + NS_ENSURE_SUCCESS(rv, rv); + ++ nsCOMPtr bundleService = ++ do_GetService(NS_STRINGBUNDLE_CONTRACTID); ++ NS_ENSURE_TRUE(bundleService, NS_ERROR_OUT_OF_MEMORY); ++ ++ nsCOMPtr brandBundle; ++ bundleService->CreateBundle(BRAND_PROPERTIES, getter_AddRefs(brandBundle)); ++ NS_ENSURE_TRUE(brandBundle, NS_ERROR_FAILURE); ++ ++ nsString brandShortName; ++ rv = brandBundle->GetStringFromName(NS_LITERAL_STRING("brandShortName").get(), ++ getter_Copies(brandShortName)); ++ ++ if (brandShortName.Equals(NS_LITERAL_STRING("Web Browser"))) { ++ mSystemAppPath.Assign (NS_LITERAL_CSTRING("/usr/bin/" "abrowser")); ++ } else { ++ mSystemAppPath.Assign (NS_LITERAL_CSTRING("/usr/bin/" MOZ_APP_NAME)); ++ } ++ + return appPath->GetNativePath(mAppPath); + } + + NS_IMPL_ISUPPORTS1(nsGNOMEShellService, nsIShellService) + + PRBool + nsGNOMEShellService::KeyMatchesAppName(const char *aKeyValue) const + { +- + gchar *commandPath; + if (mUseLocaleFilenames) { + gchar *nativePath = g_filename_from_utf8(aKeyValue, -1, NULL, NULL, NULL); + if (!nativePath) { + NS_ERROR("Error converting path to filesystem encoding"); + return PR_FALSE; + } + +@@ -155,19 +174,25 @@ + g_free(nativePath); + } else { + commandPath = g_find_program_in_path(aKeyValue); + } + + if (!commandPath) + return PR_FALSE; + ++#ifdef SYSTEM_PATH_BUILD ++ PRBool matches = mSystemAppPath.Equals(commandPath); ++ g_free(commandPath); ++ return matches; ++#else + PRBool matches = mAppPath.Equals(commandPath); + g_free(commandPath); + return matches; ++#endif + } + + NS_IMETHODIMP + nsGNOMEShellService::IsDefaultBrowser(PRBool aStartupCheck, + PRBool* aIsDefaultBrowser) + { + *aIsDefaultBrowser = PR_FALSE; + if (aStartupCheck) +@@ -213,18 +238,23 @@ + #ifdef DEBUG + if (aForAllUsers) + NS_WARNING("Setting the default browser for all users is not yet supported"); + #endif + + nsCOMPtr gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID); + + nsCAutoString schemeList; ++ ++#ifdef SYSTEM_PATH_BUILD ++ nsCAutoString appKeyValue(mSystemAppPath); ++#else + nsCAutoString appKeyValue(mAppPath); +- appKeyValue.Append(" \"%s\""); ++#endif ++ appKeyValue.Append(" %s"); + unsigned int i; + + for (i = 0; i < NS_ARRAY_LENGTH(appProtocols); ++i) { + schemeList.Append(nsDependentCString(appProtocols[i].name)); + schemeList.Append(','); + + if (appProtocols[i].essential || aClaimAllTypes) { + gconf->SetAppForProtocol(nsDependentCString(appProtocols[i].name), +Index: mozilla/browser/components/shell/src/nsGNOMEShellService.h +=================================================================== +--- mozilla.orig/browser/components/shell/src/nsGNOMEShellService.h ++++ mozilla/browser/components/shell/src/nsGNOMEShellService.h +@@ -53,11 +53,12 @@ + private: + ~nsGNOMEShellService() {} + + NS_HIDDEN_(PRBool) KeyMatchesAppName(const char *aKeyValue) const; + + PRPackedBool mCheckedThisSession; + PRPackedBool mUseLocaleFilenames; + nsCString mAppPath; ++ nsCString mSystemAppPath; + }; + + #endif // nsgnomeshellservice_h____ --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/patches/browser_branding.patch +++ firefox-3.5-3.5.3+build1+nobinonly/debian/patches/browser_branding.patch @@ -0,0 +1,120 @@ +--- + browser/base/jar.mn | 8 +++++--- + browser/branding/unofficial/content/jar.mn | 2 +- + browser/branding/unofficial/locales/jar.mn | 2 +- + browser/installer/unix/packages-static | 5 +++++ + other-licenses/branding/firefox/content/jar.mn | 2 +- + other-licenses/branding/firefox/locales/jar.mn | 2 +- + 6 files changed, 14 insertions(+), 7 deletions(-) + +Index: mozilla/browser/branding/unofficial/content/jar.mn +=================================================================== +--- mozilla.orig/browser/branding/unofficial/content/jar.mn ++++ mozilla/browser/branding/unofficial/content/jar.mn +@@ -1,7 +1,7 @@ +-browser.jar: ++browser-branding.jar: + % content branding %content/branding/ xpcnativewrappers=yes + content/branding/about.png (about.png) + content/branding/aboutCredits.png (aboutCredits.png) + content/branding/aboutFooter.png (aboutFooter.png) + content/branding/icon48.png (icon48.png) + content/branding/icon64.png (icon64.png) +Index: mozilla/browser/branding/unofficial/locales/jar.mn +=================================================================== +--- mozilla.orig/browser/branding/unofficial/locales/jar.mn ++++ mozilla/browser/branding/unofficial/locales/jar.mn +@@ -1,7 +1,7 @@ + #filter substitution + +-@AB_CD@.jar: ++browser-branding-@AB_CD@.jar: + % locale branding @AB_CD@ %locale/branding/ + # Unofficial branding only exists in en-US + locale/branding/brand.dtd (en-US/brand.dtd) + * locale/branding/brand.properties (en-US/brand.properties) +Index: mozilla/browser/installer/unix/packages-static +=================================================================== +--- mozilla.orig/browser/installer/unix/packages-static ++++ mozilla/browser/installer/unix/packages-static +@@ -267,16 +267,21 @@ + bin/chrome/toolkit.manifest + bin/chrome/icons/default/default16.png + bin/chrome/icons/default/default32.png + bin/chrome/icons/default/default48.png + bin/chrome/reporter.manifest + bin/chrome/reporter.jar + bin/@PREF_DIR@/reporter.js + ++bin/chrome/browser-branding.jar ++bin/chrome/browser-branding.manifest ++bin/chrome/browser-branding-en-US.jar ++bin/chrome/browser-branding-en-US.manifest ++ + bin/chrome/awesome-branding.jar + bin/chrome/awesome-branding.manifest + bin/chrome/awesome-branding-en-US.jar + bin/chrome/awesome-branding-en-US.manifest + + + ; shell icons + bin/icons/*.xpm +Index: mozilla/other-licenses/branding/firefox/content/jar.mn +=================================================================== +--- mozilla.orig/other-licenses/branding/firefox/content/jar.mn ++++ mozilla/other-licenses/branding/firefox/content/jar.mn +@@ -1,7 +1,7 @@ +-browser.jar: ++browser-branding.jar: + % content branding %content/branding/ xpcnativewrappers=yes + content/branding/about.png (about.png) + content/branding/aboutCredits.png (aboutCredits.png) + content/branding/aboutFooter.png (aboutFooter.png) + content/branding/icon48.png (icon48.png) + content/branding/icon64.png (icon64.png) +Index: mozilla/other-licenses/branding/firefox/locales/jar.mn +=================================================================== +--- mozilla.orig/other-licenses/branding/firefox/locales/jar.mn ++++ mozilla/other-licenses/branding/firefox/locales/jar.mn +@@ -1,6 +1,6 @@ + #filter substitution + +-@AB_CD@.jar: ++browser-branding-@AB_CD@.jar: + % locale branding @AB_CD@ %locale/branding/ + locale/branding/brand.dtd (%brand.dtd) + * locale/branding/brand.properties (%brand.properties) +Index: mozilla/browser/base/jar.mn +=================================================================== +--- mozilla.orig/browser/base/jar.mn ++++ mozilla/browser/base/jar.mn +@@ -58,24 +58,26 @@ + * content/browser/extensionsManagerOverlay.xul (content/extensionsManagerOverlay.xul) + * content/browser/jsConsoleOverlay.xul (content/jsConsoleOverlay.xul) + * content/browser/softwareUpdateOverlay.xul (content/softwareUpdateOverlay.xul) + #endif + #ifdef TOOLBAR_CUSTOMIZATION_SHEET + * content/browser/customizeToolbarSheet.js (content/customizeToolbarSheet.js) + #endif + * content/browser/viewSourceOverlay.xul (content/viewSourceOverlay.xul) ++# the following files are browser-specific overrides ++* content/browser/license.html (/toolkit/content/license.html) ++% override chrome://global/content/license.html chrome://browser/content/license.html ++ + #ifdef MOZ_USE_GENERIC_BRANDING ++browser-branding.jar: + % content branding %content/branding/ xpcnativewrappers=yes + content/branding/about.png (branding/about.png) + content/branding/aboutCredits.png (branding/aboutCredits.png) + content/branding/aboutFooter.png (branding/aboutFooter.png) + content/branding/icon48.png (branding/icon48.png) + content/branding/icon64.png (branding/icon64.png) + #endif +-# the following files are browser-specific overrides +-* content/browser/license.html (/toolkit/content/license.html) +-% override chrome://global/content/license.html chrome://browser/content/license.html + + #ifdef TOOLBAR_CUSTOMIZATION_SHEET + toolkit.jar: + *+ content/global/customizeToolbar.xul (content/customizeToolbarSheet.xul) + #endif --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/patches/ubuntu_no_app_updates.patch +++ firefox-3.5-3.5.3+build1+nobinonly/debian/patches/ubuntu_no_app_updates.patch @@ -0,0 +1,63 @@ +--- +--- + browser/components/preferences/advanced.js | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +Index: mozilla/browser/components/preferences/advanced.js +=================================================================== +--- mozilla.orig/browser/components/preferences/advanced.js ++++ mozilla/browser/components/preferences/advanced.js +@@ -382,50 +382,48 @@ + { + var aus = + Components.classes["@mozilla.org/updates/update-service;1"]. + getService(Components.interfaces.nsIApplicationUpdateService); + + var enabledPref = document.getElementById("app.update.enabled"); + var enableAppUpdate = document.getElementById("enableAppUpdate"); + +- enableAppUpdate.disabled = !aus.canUpdate || enabledPref.locked; ++ enableAppUpdate.disabled = true; + }, + + /** + * Enables/disables UI for "when updates are found" based on the values, + * and "locked" states of associated preferences. + */ + updateAutoItems: function () + { + var enabledPref = document.getElementById("app.update.enabled"); + var autoPref = document.getElementById("app.update.auto"); + + var updateModeLabel = document.getElementById("updateModeLabel"); + var updateMode = document.getElementById("updateMode"); + +- var disable = enabledPref.locked || !enabledPref.value || +- autoPref.locked; ++ var disable = true; + updateModeLabel.disabled = updateMode.disabled = disable; + }, + + /** + * Enables/disables the "warn if incompatible extensions/themes exist" UI + * based on the values and "locked" states of various preferences. + */ + updateModeItems: function () + { + var enabledPref = document.getElementById("app.update.enabled"); + var autoPref = document.getElementById("app.update.auto"); + var modePref = document.getElementById("app.update.mode"); + + var warnIncompatible = document.getElementById("warnIncompatible"); + +- var disable = enabledPref.locked || !enabledPref.value || autoPref.locked || +- !autoPref.value || modePref.locked; ++ var disable = true; + warnIncompatible.disabled = disable; + }, + + /** + * Stores the value of the app.update.mode preference, which is a tristate + * integer preference. We store the value here so that we can properly + * restore the preference value if the UI reflecting the preference value + * is in a state which can represent either of two integer values (as --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/patches/bzXXX_libxul_sdk_nspr.patch +++ firefox-3.5-3.5.3+build1+nobinonly/debian/patches/bzXXX_libxul_sdk_nspr.patch @@ -0,0 +1,22 @@ +diff --git a/configure.in b/configure.in +--- a/configure.in ++++ b/configure.in +@@ -8442,17 +8442,17 @@ if test -z "$MOZ_NATIVE_NSPR"; then + fi + if test -n "$USE_ARM_KUSER"; then + ac_configure_args="$ac_configure_args --with-arm-kuser" + fi + AC_OUTPUT_SUBDIRS(nsprpub) + ac_configure_args="$_SUBDIR_CONFIG_ARGS" + fi + +-if test -z "$MOZ_NATIVE_NSPR"; then ++if test -z "$MOZ_NATIVE_NSPR" -a -z "$LIBXUL_SDK"; then + # Hack to deal with the fact that we use NSPR_CFLAGS everywhere + AC_MSG_WARN([Recreating autoconf.mk with updated nspr-config output]) + if test "$OS_ARCH" != "WINNT" && test "$OS_ARCH" != "WINCE"; then + NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --libdir=$LIBXUL_DIST/lib --libs` + $PERL -pi.bak -e "s '^NSPR_LIBS\\s*=.*'NSPR_LIBS = $NSPR_LIBS'" config/autoconf.mk + NSPR_CFLAGS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --includedir=$LIBXUL_DIST/include/nspr --cflags` + $PERL -pi.bak -e "s '^NSPR_CFLAGS\\s*=.*'NSPR_CFLAGS = $NSPR_CFLAGS'" config/autoconf.mk + fi --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/patches/drop_bz418016.patch +++ firefox-3.5-3.5.3+build1+nobinonly/debian/patches/drop_bz418016.patch @@ -0,0 +1,131 @@ +--- + browser/app/Makefile.in | 2 +- + browser/installer/removed-files.in | 1 - + browser/installer/unix/packages-static | 1 + + memory/jemalloc/Makefile.in | 9 +-------- + toolkit/library/Makefile.in | 8 -------- + 5 files changed, 3 insertions(+), 18 deletions(-) + +Index: mozilla/browser/app/Makefile.in +=================================================================== +--- mozilla.orig/browser/app/Makefile.in ++++ mozilla/browser/app/Makefile.in +@@ -68,17 +68,17 @@ + DIST_FILES = application.ini + + GRE_MILESTONE = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build Milestone) + GRE_BUILDID = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID) + + DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) -DGRE_BUILDID=$(GRE_BUILDID) + + ifdef MOZ_MEMORY +-ifeq ($(OS_ARCH),Darwin) ++ifneq ($(OS_ARCH),WINNT) + LIBS += -ljemalloc + endif + endif + + ifdef LIBXUL_SDK + include $(topsrcdir)/config/rules.mk + else + # Build a binary bootstrapping with XRE_main +Index: mozilla/browser/installer/removed-files.in +=================================================================== +--- mozilla.orig/browser/installer/removed-files.in ++++ mozilla/browser/installer/removed-files.in +@@ -584,17 +584,16 @@ + redo-prebinding.sh + res/viewer.properties + res/bloatcycle.html + #endif + #ifdef XP_UNIX + #ifndef XP_MACOSX + readme.txt + chrome/icons/default/default.xpm +-libjemalloc.so + #endif + #endif + dictionaries/PL.dic + dictionaries/PL.aff + #ifdef XP_WIN + #ifdef MOZ_MEMORY + Microsoft.VC80.CRT.manifest + msvcm80.dll +Index: mozilla/browser/installer/unix/packages-static +=================================================================== +--- mozilla.orig/browser/installer/unix/packages-static ++++ mozilla/browser/installer/unix/packages-static +@@ -46,16 +46,17 @@ + bin/@MOZ_APP_NAME@ + bin/application.ini + bin/platform.ini + bin/mozilla-xremote-client + bin/run-mozilla.sh + bin/plugins/libnullplugin.so + bin/libsqlite3.so + bin/README.txt ++bin/libjemalloc.so + + ; [Components] + bin/components/alerts.xpt + bin/components/accessibility.xpt + bin/components/appshell.xpt + bin/components/appstartup.xpt + bin/components/autocomplete.xpt + bin/components/autoconfig.xpt +Index: mozilla/memory/jemalloc/Makefile.in +=================================================================== +--- mozilla.orig/memory/jemalloc/Makefile.in ++++ mozilla/memory/jemalloc/Makefile.in +@@ -76,29 +76,22 @@ + rm $(CRT_OBJ_DIR)/build/intel/{libcmt,libcpmt}.lib + else + # Using a pre-built DLL, so just install it. + libs:: $(WIN32_CUSTOM_CRT_DIR)/mozcrt19.dll + $(INSTALL) $< $(FINAL_TARGET) + endif + + else ++# for other platforms, just build jemalloc as a shared lib + + MODULE_OPTIMIZE_FLAGS = -O2 + LIBRARY_NAME = jemalloc + +-ifeq (Darwin,$(OS_TARGET)) +-# Build jemalloc as a shared lib, so that the library init function is executed. + FORCE_SHARED_LIB= 1 +-else +-# Make jemalloc part of libxul, in order to reduce dynamic loading overhead. +-MODULE = jemalloc +-LIBXUL_LIBRARY = 1 +-FORCE_STATIC_LIB = 1 +-endif + + CSRCS = \ + jemalloc.c \ + $(NULL) + + #XXX: PGO on Linux causes problems here + # See bug 419470 + NO_PROFILE_GUIDED_OPTIMIZE = 1 +Index: mozilla/toolkit/library/Makefile.in +=================================================================== +--- mozilla.orig/toolkit/library/Makefile.in ++++ mozilla/toolkit/library/Makefile.in +@@ -244,16 +244,8 @@ + ifdef MOZ_JAVAXPCOM + dlldeps-javaxpcom.cpp: $(topsrcdir)/extensions/java/xpcom/src/dlldeps-javaxpcom.cpp + $(INSTALL) $^ . + endif + + ifneq (,$(filter layout-debug,$(MOZ_EXTENSIONS))) + DEFINES += -DMOZ_ENABLE_EXTENSION_LAYOUT_DEBUG + endif +- +-ifdef MOZ_MEMORY +-ifneq ($(OS_ARCH),WINNT) +-ifneq ($(OS_ARCH),Darwin) +-EXTRA_DSO_LDOPTS += $(DEPTH)/memory/jemalloc/$(LIB_PREFIX)jemalloc.$(LIB_SUFFIX) +-endif +-endif +-endif --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/patches/bz460917_att350845_reload_new_plugins.patch +++ firefox-3.5-3.5.3+build1+nobinonly/debian/patches/bz460917_att350845_reload_new_plugins.patch @@ -0,0 +1,90 @@ +--- + browser/base/content/browser.js | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +Index: mozilla/browser/base/content/browser.js +=================================================================== +--- mozilla.orig/browser/base/content/browser.js ++++ mozilla/browser/base/content/browser.js +@@ -5780,22 +5780,30 @@ + } + + missingPluginInstaller.prototype.installSinglePlugin = function(aEvent){ + var missingPluginsArray = {}; + + var pluginInfo = getPluginInfo(aEvent.target); + missingPluginsArray[pluginInfo.mimetype] = pluginInfo; + ++ gBrowser.selectedBrowser.addEventListener("NewPluginInstalled", ++ gMissingPluginInstaller.refreshBrowser, ++ false); ++ + if (missingPluginsArray) { + window.openDialog("chrome://mozapps/content/plugins/pluginInstallerWizard.xul", + "PFSWindow", "chrome,centerscreen,resizable=yes", + {plugins: missingPluginsArray, browser: gBrowser.selectedBrowser}); + } + ++ gBrowser.selectedBrowser.removeEventListener("NewPluginInstalled", ++ gMissingPluginInstaller.refreshBrowser, ++ false); ++ + aEvent.stopPropagation(); + } + + missingPluginInstaller.prototype.managePlugins = function(aEvent){ + BrowserOpenAddonsMgr("plugins"); + aEvent.stopPropagation(); + } + +@@ -5897,37 +5905,50 @@ + + // clear the plugin list, now that at least one plugin has been installed + browser.missingPlugins = null; + if (notification) { + // reset UI + notificationBox.removeNotification(notification); + } + // reload the browser to make the new plugin show. ++ ++ // reload plugins ++ var pm = Components.classes["@mozilla.org/plugin/manager;1"] ++ .getService(Components.interfaces.nsIPluginManager); ++ pm.reloadPlugins(false); ++ ++ // ... and reload the browser to activate new plugins available + browser.reload(); + } + + function blocklistInfo() + { + var formatter = Components.classes["@mozilla.org/toolkit/URLFormatterService;1"] + .getService(Components.interfaces.nsIURLFormatter); + var url = formatter.formatURLPref("extensions.blocklist.detailsURL"); + gBrowser.loadOneTab(url, null, null, null, false, false); + return true; + } + + function pluginsMissing() + { + // get the urls of missing plugins + var missingPluginsArray = gBrowser.selectedBrowser.missingPlugins; ++ gBrowser.selectedBrowser.addEventListener("NewPluginInstalled", ++ gMissingPluginInstaller.refreshBrowser, ++ false); + if (missingPluginsArray) { + window.openDialog("chrome://mozapps/content/plugins/pluginInstallerWizard.xul", + "PFSWindow", "chrome,centerscreen,resizable=yes", + {plugins: missingPluginsArray, browser: gBrowser.selectedBrowser}); + } ++ gBrowser.selectedBrowser.removeEventListener("NewPluginInstalled", ++ gMissingPluginInstaller.refreshBrowser, ++ false); + } + + var gMissingPluginInstaller = new missingPluginInstaller(); + + function convertFromUnicode(charset, str) + { + try { + var unicodeConverter = Components --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/patches/ubuntu_codes_amazon.patch +++ firefox-3.5-3.5.3+build1+nobinonly/debian/patches/ubuntu_codes_amazon.patch @@ -0,0 +1,23 @@ +--- + browser/locales/en-US/searchplugins/amazondotcom.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: mozilla/browser/locales/en-US/searchplugins/amazondotcom.xml +=================================================================== +--- mozilla.orig/browser/locales/en-US/searchplugins/amazondotcom.xml ++++ mozilla/browser/locales/en-US/searchplugins/amazondotcom.xml +@@ -1,13 +1,13 @@ + + Amazon.com + Amazon.com Search + ISO-8859-1 + data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHgSURBVHjalFM9TNtQEP4cB7PwM1RITUXIgsRaYEEVEyKZwhiyZAQyd0BhpFOlIjoBqhjSqVQMoVMLLAjEwECCQJkSkBqJYDOAFOMKFSf28d7DTUxiUDnp/Pzeu/vuu7t3ICKF6SLTMv2/lB0fRWKfjwDm4JJisYh0Oo3fpZLYT0SjSCQS8JAFMADNDZ3NZsnf1taiqVTKi4nGASruk5lkkmTmMB6JUKFQqO+DfX1eABWeQoVR6f7HSdM0obqu48Yw8G1tDT82NsRd1TSbU9BbGPCog8PDj+jLzurFoAVgMh4XxoNDQ6SqKi0tL9eBvAB8zZwymYxYY7EYAoEA8vm82BNTg6XUIs0MeGTZoR1mhXSnwNl4pmAbjU7mcjkKhkL1ynMnntZ4OEw3VyrV8utk7s5TdW++0QXz+1i3P7IK36t+PCfVn1OQOoOA0gXr5DPak+cPXbBK+/T3S69AtY3LJ98vZ1or/iLr+pTuvr59/A6s003UdqZFJF/PCKQ3o5CUznoBST2AfbEF/9iqYEDaIfwj73VJPEfgNTe0tWNYR0uwy9uOW0OkrgHI7z5ADo2C7v48nLV3XHKAT+x/1m1sX58xsBxg8rZJrDYD8DHHp4aJj/MK09sXjPOt46PcCzAACXY8/u34wN0AAAAASUVORK5CYII= + + + +- ++ + + + http://www.amazon.com/ + --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/patches/dont_depend_on_nspr_sources.patch +++ firefox-3.5-3.5.3+build1+nobinonly/debian/patches/dont_depend_on_nspr_sources.patch @@ -0,0 +1,92 @@ +--- + config/Makefile.in | 2 - + config/make-system-wrappers.pl | 59 +++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 60 insertions(+), 1 deletion(-) + +Index: mozilla/config/Makefile.in +=================================================================== +--- mozilla.orig/config/Makefile.in ++++ mozilla/config/Makefile.in +@@ -123,17 +123,17 @@ + -DBUILD_STATIC_LIBS=$(BUILD_STATIC_LIBS) \ + -DMOZ_TREE_CAIRO=$(MOZ_TREE_CAIRO) \ + -DMOZ_ENABLE_LIBXUL=$(MOZ_ENABLE_LIBXUL) \ + -DMOZ_NATIVE_HUNSPELL=$(MOZ_NATIVE_HUNSPELL) \ + -DMOZ_NATIVE_BZ2=$(MOZ_NATIVE_BZ2) \ + -DMOZ_NATIVE_ZLIB=$(MOZ_NATIVE_ZLIB) \ + -DMOZ_NATIVE_PNG=$(MOZ_NATIVE_PNG) \ + -DMOZ_NATIVE_JPEG=$(MOZ_NATIVE_JPEG) \ +- $(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers ++ $(srcdir)/system-headers | $(PERL) $(topsrcdir)/config/make-system-wrappers.pl system_wrappers + $(INSTALL) system_wrappers $(DIST)/include + + GARBAGE_DIRS += system_wrappers + endif + + install:: + $(SYSINSTALL) $(IFLAGS1) $(DEPTH)/mozilla-config.h $(DESTDIR)$(includedir) + +Index: mozilla/config/make-system-wrappers.pl +=================================================================== +--- /dev/null ++++ mozilla/config/make-system-wrappers.pl +@@ -0,0 +1,59 @@ ++#!/usr/bin/perl ++# ++# ***** BEGIN LICENSE BLOCK ***** ++# Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++# ++# The contents of this file are subject to the Mozilla Public License Version ++# 1.1 (the "License"); you may not use this file except in compliance with ++# the License. You may obtain a copy of the License at ++# http://www.mozilla.org/MPL/ ++# ++# Software distributed under the License is distributed on an "AS IS" basis, ++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++# for the specific language governing rights and limitations under the ++# License. ++# ++# The Original Code is mozilla.org code. ++# ++# The Initial Developer of the Original Code is ++# IBM Corporation. ++# Portions created by the Initial Developer are Copyright (C) 2004 ++# the Initial Developer. All Rights Reserved. ++# ++# Contributor(s): ++# Brian Ryner ++# ++# Alternatively, the contents of this file may be used under the terms of ++# either of the GNU General Public License Version 2 or later (the "GPL"), ++# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++# in which case the provisions of the GPL or the LGPL are applicable instead ++# of those above. If you wish to allow use of your version of this file only ++# under the terms of either the GPL or the LGPL, and not to allow others to ++# use your version of this file under the terms of the MPL, indicate your ++# decision by deleting the provisions above and replace them with the notice ++# and other provisions required by the GPL or the LGPL. If you do not delete ++# the provisions above, a recipient may use your version of this file under ++# the terms of any one of the MPL, the GPL or the LGPL. ++# ++# ***** END LICENSE BLOCK ***** ++ ++$output_dir = shift; ++ ++while () { ++ chomp; ++ if (-e "$output_dir/$_") { ++ next; ++ } ++ ++ if (/(.*)\/[^\/*]/) { ++ mkdir "$output_dir/$1"; ++ } ++ ++ open OUT, ">$output_dir/$_"; ++ print OUT "#pragma GCC system_header\n"; # suppress include_next warning ++ print OUT "#pragma GCC visibility push(default)\n"; ++ print OUT "#include_next \<$_\>\n"; ++ print OUT "#pragma GCC visibility pop\n"; ++ close OUT; ++} ++ --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/patches/bz386904_config_rules_install_dist_files.patch +++ firefox-3.5-3.5.3+build1+nobinonly/debian/patches/bz386904_config_rules_install_dist_files.patch @@ -0,0 +1,88 @@ +This is from: + https://bugzilla.mozilla.org/show_bug.cgi?id=386904 + https://bugzilla.mozilla.org/attachment.cgi?id=270967 + + + -- Summary: + +This patch implements DIST_FILES install:: target as well as +DIST_CHROME_FILES install target. + + -- Evaluation: + +DIST_FILES is now used in browser/app/Makefile.in to install +application.ini; however, DEST_FILES is only implemented for +libs::, but not for install::. + +In consequence, make install'ed installs of firefox now break +with missing application.ini file. + +When writing this fix, it became obvious that DIST_CHROME_FILES +install: target is missing too ... though it doesn't cause any +problems because its not really used. + +--- + config/rules.mk | 28 ++++++++++++++++++++++++++++ + 1 file changed, 28 insertions(+) + +Index: mozilla/config/rules.mk +=================================================================== +--- mozilla.orig/config/rules.mk 2007-08-18 15:15:17.000000000 +0000 ++++ mozilla/config/rules.mk 2007-08-18 15:15:36.000000000 +0000 +@@ -1699,28 +1699,56 @@ + @$(EXIT_ON_ERROR) \ + for f in $(DIST_FILES); do \ + dest=$(FINAL_TARGET)/`basename $$f`; \ + $(RM) -f $$dest; \ + $(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py \ + $(XULAPP_DEFINES) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) \ + $(srcdir)/$$f > $$dest; \ + done ++ ++install:: $(DIST_FILES) ++ifndef XPI_NAME ++ifndef NO_INSTALL ++ @$(EXIT_ON_ERROR) \ ++ for f in $(DIST_FILES); do \ ++ dest=$(DESTDIR)$(mozappdir)/`basename $$f`; \ ++ $(RM) -f $$dest; \ ++ $(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py \ ++ $(XULAPP_DEFINES) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) \ ++ $(srcdir)/$$f > $$dest; \ ++ done ++endif ++endif + endif + + ifneq ($(DIST_CHROME_FILES),) + libs:: $(DIST_CHROME_FILES) + @$(EXIT_ON_ERROR) \ + for f in $(DIST_CHROME_FILES); do \ + dest=$(FINAL_TARGET)/chrome/`basename $$f`; \ + $(RM) -f $$dest; \ + $(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py \ + $(XULAPP_DEFINES) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) \ + $(srcdir)/$$f > $$dest; \ + done ++ ++install:: $(DIST_CHROME_FILES) ++ifndef XPI_NAME ++ifndef NO_INSTALL ++ @$(EXIT_ON_ERROR) \ ++ for f in $(DIST_CHROME_FILES); do \ ++ dest=$(DESTDIR)$(mozappdir)/chrome/`basename $$f`; \ ++ $(RM) -f $$dest; \ ++ $(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py \ ++ $(XULAPP_DEFINES) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) \ ++ $(srcdir)/$$f > $$dest; \ ++ done ++endif ++endif + endif + + ifneq ($(XPI_PKGNAME),) + libs realchrome:: + ifdef STRIP_XPI + ifndef MOZ_DEBUG + @echo "Stripping $(XPI_PKGNAME) package directory..." + @echo $(FINAL_TARGET) --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/patches/awesome_browser_branding_install.patch +++ firefox-3.5-3.5.3+build1+nobinonly/debian/patches/awesome_browser_branding_install.patch @@ -0,0 +1,31 @@ +--- + browser/installer/unix/packages-static | 6 ++++++ + 1 file changed, 6 insertions(+) + +Index: mozilla/browser/installer/unix/packages-static +=================================================================== +--- mozilla.orig/browser/installer/unix/packages-static ++++ mozilla/browser/installer/unix/packages-static +@@ -273,16 +273,22 @@ + bin/chrome/toolkit.manifest + bin/chrome/icons/default/default16.png + bin/chrome/icons/default/default32.png + bin/chrome/icons/default/default48.png + bin/chrome/reporter.manifest + bin/chrome/reporter.jar + bin/@PREF_DIR@/reporter.js + ++bin/chrome/awesome-branding.jar ++bin/chrome/awesome-branding.manifest ++bin/chrome/awesome-branding-en-US.jar ++bin/chrome/awesome-branding-en-US.manifest ++ ++ + ; shell icons + bin/icons/*.xpm + bin/icons/*.png + + ; [Default Preferences] + ; All the pref files must be part of base to prevent migration bugs + bin/@PREF_DIR@/firefox.js + bin/@PREF_DIR@/firefox-branding.js --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/mozclient/firefox-3.5.mk +++ firefox-3.5-3.5.3+build1+nobinonly/debian/mozclient/firefox-3.5.mk @@ -0,0 +1,52 @@ +# -*- mode: makefile; coding: utf-8 -*- + +# Copyright (c) 2008 Fabien Tassin +# Description: Project firefox 3.5 +# +# 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, 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 Street, Fifth Floor, Boston, MA 02110-1301 USA. + +include /usr/share/mozilla-devscripts/mozclient.mk + +COMPARE_FILTER_PRE_IN := sed \ + -e 's,foo,bar,' \ + $(NULL) + +COMPARE_FILTER_PRE_OUT := sed \ + -e 's,^usr/lib/firefox-3.5[^/]*/,,' \ + $(NULL) + +COMPARE_FILTER_IN := sed \ + -e 's,^usr/lib/firefox-3.5[^/]*/searchplugins,usr/lib/firefox-addons/searchplugins,' \ + -e 's,^usr/lib/firefox-3.5[^/]*/extensions/inspector@mozilla.org/.*,,' \ + -e 's,^usr/lib/firefox-3.5[^/]*/extensions,usr/lib/xulrunner-addons/extensions,' \ + -e 's,^usr/lib/firefox-3.5[^/]*/defaults/profile,etc/firefox-3.5/profile,' \ + -e 's,^usr/lib/firefox-3.5[^/]*/\(old-homepage-default.properties\|README.txt\|removed-files\),,' \ + -e 's,^usr/lib/firefox-3.5[^/]*/.autoreg,,' \ + -e 's,^etc/firefox-3.5[^/]*/.autoreg,,' \ + $(NULL) + +COMPARE_FILTER_OUT := sed \ + -e 's,^DEBIAN/.*,,' \ + -e 's,^usr/lib/debug/.*,,' \ + -e 's,^usr/share/doc/.*,,' \ + -e 's,^usr/share/menu/.*,,' \ + -e 's,^usr/share/applications/.*,,' \ + -e 's,^usr/share/bug/firefox-3.5/presubj,,' \ + -e 's,^etc/firefox-3.5/\(firefoxrc\|pref/firefox.js\),,' \ + -e 's,^usr/lib/firefox-addons/searchplugins/\(debsearch\|wikipedia\).\(gif\|src\),,' \ + -e 's,^usr/lib/firefox-3.5[^/]*/\(firefox-3.5-restart-required.update-notifier\|firefox.cfg\|firefox.sh\|ffox-35-beta-profile-migration-dialog\),,' \ + $(NULL) + +include /usr/share/mozilla-devscripts/compare.mk --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/mozclient/firefox-3.5.conf +++ firefox-3.5-3.5.3+build1+nobinonly/debian/mozclient/firefox-3.5.conf @@ -0,0 +1,28 @@ +# Copyright (c) 2008 Fabien Tassin +# Description: Project firefox 3.5 +# +# 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, 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 Street, Fifth Floor, Boston, MA 02110-1301 USA. + +MOZCLIENT_APPNAME = firefox-3.5 +MOZCLIENT_PROJECT = mozilla-1.9.1 +MOZCLIENT_VCS = hg +MOZCLIENT_VCS_LOC = http://hg.mozilla.org/releases/ +MOZCLIENT_FILE = mozilla/browser/config/version.txt +MOZCLIENT_GETVERSION = sed -e 's/pre//; s/\([ab]\)\([0-9]*\)/~\1\2/' mozilla/browser/config/version.txt +#MOZCLIENT_POSTCOCMD = cd mozilla && python client.py checkout +MOZCLIENT_GETDATE = a=`wget -qO- http://hg.mozilla.org/releases/mozilla-1.9.1/pushlog | sed -e '/<\/entry>/,$d' | grep -E '^ <(link|updated)' | tr -d '\n' | tr '<>' '"' | cut -d'"' -f3,7`; (echo -n $a | cut -d'"' -f2 | cut -dT -f1 | tr -d '-' ; echo -n r ; wget -qO - `echo $a | cut -d'"' -f1` | grep 'changeset' | tr '<> ' '@' | cut -d@ -f6) | tr -d '\n' +MOZCLIENT_EMBEDDED = 1 +MOZCLIENT_WANTMOZDIR = 1 +MOZCLIENT_POSTCOCMD = bzr branch lp:~mozillateam/firefox/awesome-browser-branding && mv awesome-browser-branding mozilla/browser/branding/awesome-browser --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/migrator/main.c +++ firefox-3.5-3.5.3+build1+nobinonly/debian/migrator/main.c @@ -0,0 +1,95 @@ +/* + * Copyright (C) 2008 Canonical Ltd. + * Author: Alexander Sack + * + * 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 Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + */ + +#define GETTEXT_PACKAGE "ubuntu-migrator" +#define LOCALEDIR "po" +#define WINDOW_ICON_PATH "/usr/share/pixmaps/firefox-3.5.png" + +#include +#include + +static int main_response = 128; + +static void +do_reply(GtkWidget *dialog, + gint response, + gpointer udata) +{ + gtk_widget_destroy(dialog); + gtk_main_quit(); + main_response = response; +} + +int +main(int argc, char** argv) +{ + + GtkWidget *dialog, *label; + + /* intialize gettext */ + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); + + gtk_init(&argc, &argv); + + gtk_window_set_default_icon_from_file (WINDOW_ICON_PATH, NULL); + + /* Create the widgets */ + dialog = gtk_dialog_new_with_buttons ("Firefox 3.5 - Beta Support", + NULL, + GTK_DIALOG_MODAL, + _("Keep Firefox 3.5 Settings"), 1, + _("Decide Later"), 0, + _("Import Settings"), 2, + NULL); + + gtk_dialog_set_default_response (GTK_DIALOG(dialog), + 0); + + gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), + 2, 1, 0, + -1); + + g_signal_connect (dialog, + "response", + G_CALLBACK (do_reply), + NULL); + + GtkWidget *hbox = gtk_hbox_new(FALSE, + 5); + + GtkWidget *icon_view = gtk_image_new_from_stock(GTK_STOCK_DIALOG_QUESTION, + GTK_ICON_SIZE_DIALOG); + + label = gtk_label_new (_("Do you want to import your bookmarks and other " + "settings from Firefox 3.0, replacing your settings " + "from Firefox 3.5 (alpha/beta)?")); + gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); + + gtk_box_pack_start_defaults(GTK_BOX(hbox), icon_view); + gtk_box_pack_start_defaults(GTK_BOX(hbox), label); + + gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), + hbox, TRUE, TRUE, 10); + gtk_widget_show_all (dialog); + gtk_main(); + return main_response < 0 ? 0 : main_response; +} --- firefox-3.5-3.5.3+build1+nobinonly.orig/debian/apport/firefox-3.5.py +++ firefox-3.5-3.5.3+build1+nobinonly/debian/apport/firefox-3.5.py @@ -0,0 +1,202 @@ +'''firefox apport hook draft + +/usr/share/apport/package-hooks/firefox-3.5.py + +Appends to apport's firefox default report: the files pluginreg.dat and +profiles.ini, and also a summary of all the extensions loaded on each firefox +profile (the summary is the extension's name, it's version, and the id) +obtained by parsing each extension's install.rdf file. + +Copyright (c) 2007: Hilario J. Montoliu + +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. See http://www.gnu.org/copyleft/gpl.html for +the full text of the license. +''' + +import os +import ConfigParser +import cStringIO +from xml.dom import minidom + +def extensions_ini_parser(extensions_ini_file): + '''parses profile's extensions.ini file and returns a tuple: + ((gre extensions, app extensions, local extensions), (gre themes, app + themes, local themes))''' + parser = ConfigParser.ConfigParser() + parser.read(extensions_ini_file) + ext_ini_d = {} + for section in parser.sections(): + section_gre, section_app, section_local, my_ext = [], [], [], '' + for extension in parser.options(section): + my_ext = parser.get(section, extension) + if '/usr/lib/xulrunner' in my_ext: + section_gre.append((my_ext)) + elif '/usr/lib/firefox' in my_ext: + section_app.append((my_ext)) + else: + section_local.append((my_ext)) + ext_ini_d[section] = (section_gre, section_app, section_local) + return (ext_ini_d['ExtensionDirs'], ext_ini_d['ThemeDirs']) + +def install_ini_parser(extension_path): + '''parses each extension's install.rdf and returns string: + extension name, its version and the id.''' + rdf_file = os.path.join(extension_path, 'install.rdf') + if not os.path.exists(extension_path): + return ''' %s does not exist (old profile?)''' % extension_path + refs_dict = {'em:version': '', 'em:id': '', 'em:name': ''} + parse_err = '%s (Not Parsed)\n' % extension_path + dom_doc = minidom.parse(rdf_file) + for key in refs_dict.keys(): + this_key = '' + try: + document_ref = dom_doc.getElementsByTagName('RDF:Description')[0].attributes + this_key = document_ref[key].value + except: + try: + document_ref = dom_doc.getElementsByTagName('Description')[0].attributes + this_key = document_ref[key].value + except: + try: + this_key = dom_doc.getElementsByTagName(key)[0].childNodes[0].data + except: + return parse_err + try: # avoid problems with encodings. + print >> cStringIO.StringIO(), this_key + refs_dict[key] = this_key + except UnicodeEncodeError: + refs_dict[key] = repr(this_key) + return '''%(em:name)s (version: %(em:version)s) -\tid: %(em:id)s''' % refs_dict + +def extension_summary_helper(extension_list, section_name, alt_output = 1): + '''does some output proccessing for extensionSummary''' + summary = '' + if len(extension_list) > 0: + summary += ''' %s:\n''' % section_name + for extension in extension_list: + summary += ''' %s\n''' % install_ini_parser(extension) + else: + if alt_output == 1: # if 0, don't output anything + summary += ''' No %s in this Profile.\n''' % section_name + summary += '''\n''' + return summary + +def recent_kernlog(pattern): + '''Extract recent messages from kern.log or message which match a regex. + pattern should be a "re" object. ''' + lines = '' + if os.path.exists('/var/log/kern.log'): + file = '/var/log/kern.log' + elif os.path.exists('/var/log/messages'): + file = '/var/log/messages' + else: + return lines + + for line in open(file): + if pattern.search(line): + lines += line + return lines + +def recent_auditlog(pattern): + '''Extract recent messages from kern.log or message which match a regex. + pattern should be a "re" object. ''' + lines = '' + if os.path.exists('/var/log/audit/audit.log'): + file = '/var/log/audit/audit.log' + else: + return lines + + for line in open(file): + if pattern.search(line): + lines += line + return lines + + +def add_info(report): + '''adds hooked infor into the apport report.''' + config_dir = os.path.join(os.environ['HOME'], '.mozilla', 'firefox') + profiles_d = {} + # append profiles.ini file & parse it: + profiles_ini = os.path.join(config_dir,'profiles.ini') + if os.path.exists(profiles_ini): + report['profiles.ini'] = open(profiles_ini).read() + # parse profiles.ini: + profile_parser = ConfigParser.ConfigParser() + profile_parser.read(profiles_ini) + for section in profile_parser.sections(): + if profile_parser.has_option(section, 'Name') and profile_parser.has_option(section, 'Path'): + if profile_parser.has_option(section, 'Default'): + is_default = profile_parser.get(section, 'Default') + else: + is_default = 0 + profiles_d[profile_parser.get(section, 'Name')] = (os.path.join(config_dir, profile_parser.get(section, 'Path')), is_default) + + # summarize the extensions loaded on each profile (either global and local): + # also append the pluginreg.dat file of the default profile (maybe in a + # future append each profile's pluginreg.dat file) + extensions_dict, themes_dict, extension_summary = {}, {}, '' + for profile_name in profiles_d.keys(): + profile_path, is_default = profiles_d[profile_name] + extensions_ini = os.path.join(profile_path, 'extensions.ini') + pluginreg_dat = os.path.join(profile_path, 'pluginreg.dat') + if os.path.exists(pluginreg_dat): + if is_default == '1': + report['default_profile_pluginreg.dat'] = open(pluginreg_dat).read() + else: + report['profile_%s_pluginreg.dat' % profile_name] = open(pluginreg_dat).read() + if os.path.exists(extensions_ini): + # attach each profile's extensions.ini too (not enabled). + #report['extensions.ini (profile: %s)' % profile_name ] = open(extensions_ini).read() + (extensions_dict['gre_extensions'], extensions_dict['app_extensions'], extensions_dict['local_extensions']), \ + (themes_dict['gre_theme'], themes_dict['app_theme'], themes_dict['local_theme']) = extensions_ini_parser(extensions_ini) + if is_default == '1': + is_default_str = ''' (The Default):''' + else: is_default_str = ''':''' + extension_summary += '''Profile "%s"%s\n\n''' % (profile_name, is_default_str) + extension_summary += extension_summary_helper(extensions_dict['gre_extensions'], 'GRE Extensions') + extension_summary += extension_summary_helper(extensions_dict['app_extensions'], 'Application Extensions') + extension_summary += extension_summary_helper(extensions_dict['local_extensions'], 'Local Extensions') + extension_summary += extension_summary_helper(themes_dict['gre_theme'], 'GRE Theme', 0) + extension_summary += extension_summary_helper(themes_dict['app_theme'], 'Application Theme', 0) + extension_summary += extension_summary_helper(themes_dict['local_theme'], 'Local Theme', 0) + wbuffer = cStringIO.StringIO() # it's needed for propper apport attachments + print >> wbuffer, extension_summary + wbuffer.seek(0) + report['ExtensionSummary'] = wbuffer.read() + + # Get apparmor stuff if the profile isn't disabled. copied from + # source_apparmor.py until apport runs hooks via attach_related_packages + apparmor_disable_dir = "/etc/apparmor.d/disable" + add_apparmor = True + if os.path.isdir(apparmor_disable_dir): + for f in os.listdir(apparmor_disable_dir): + if f.startswith("usr.bin.firefox"): + add_apparmor = False + break + if add_apparmor: + attach_related_packages(report, ['apparmor', 'libapparmor1', + 'libapparmor-perl', 'apparmor-utils', 'auditd', 'libaudit0']) + + attach_file(report, '/proc/version_signature', 'ProcVersionSignature') + attach_file(report, '/proc/cmdline', 'ProcCmdline') + + sec_re = re.compile('audit\(|apparmor|selinux|security', re.IGNORECASE) + report['KernLog'] = recent_kernlog(sec_re) + + if os.path.exists("/var/log/audit"): + # this needs to be run as root + report['AuditLog'] = recent_auditlog(sec_re) + + # debug (comment on production) + # return report + +#### debug #### +# (uncomment the 'return report' at add_report()) +if __name__ == "__main__": + D = {} + REPORT = add_info(D) + for KEY in REPORT.keys(): + print '''-------------------%s: ------------------\n''' % KEY, REPORT[KEY]