--- firefox-3.6.18+build2+nobinonly.orig/mozilla-1.9.2-3.6.18+build2-source.tar.bz2.cdbs-config_list +++ firefox-3.6.18+build2+nobinonly/mozilla-1.9.2-3.6.18+build2-source.tar.bz2.cdbs-config_list @@ -0,0 +1,93 @@ +mozilla/tools/leaky/config.h +mozilla/tools/jprof/stub/config.h +mozilla/toolkit/themes/winstripe/global/config.css +mozilla/toolkit/themes/pinstripe/global/config.css +mozilla/toolkit/locales/en-US/chrome/global/config.properties +mozilla/toolkit/locales/en-US/chrome/global/config.dtd +mozilla/toolkit/crashreporter/google-breakpad/src/config.h.in +mozilla/toolkit/crashreporter/google-breakpad/autotools/config.sub +mozilla/toolkit/crashreporter/google-breakpad/autotools/config.guess +mozilla/toolkit/components/viewconfig/content/config.xul +mozilla/toolkit/components/viewconfig/content/config.js +mozilla/security/nss/tests/pkcs11/netscape/trivial/config.h.in +mozilla/security/nss/tests/pkcs11/netscape/suites/security/ssl/config.mk +mozilla/security/nss/tests/pkcs11/netscape/suites/security/pkcs11/config.mk +mozilla/security/nss/tests/pkcs11/netscape/suites/security/config.mk +mozilla/security/nss/tests/pkcs11/netscape/suites/config.mk +mozilla/security/nss/lib/zlib/config.mk +mozilla/security/nss/lib/util/config.mk +mozilla/security/nss/lib/sysinit/config.mk +mozilla/security/nss/lib/ssl/config.mk +mozilla/security/nss/lib/sqlite/config.mk +mozilla/security/nss/lib/softoken/legacydb/config.mk +mozilla/security/nss/lib/softoken/config.mk +mozilla/security/nss/lib/smime/config.mk +mozilla/security/nss/lib/pki/config.mk +mozilla/security/nss/lib/pkcs7/config.mk +mozilla/security/nss/lib/pkcs12/config.mk +mozilla/security/nss/lib/pk11wrap/config.mk +mozilla/security/nss/lib/nss/config.mk +mozilla/security/nss/lib/libpkix/pkix_pl_nss/system/config.mk +mozilla/security/nss/lib/libpkix/pkix_pl_nss/pki/config.mk +mozilla/security/nss/lib/libpkix/pkix_pl_nss/module/config.mk +mozilla/security/nss/lib/libpkix/pkix_pl_nss/config.mk +mozilla/security/nss/lib/libpkix/pkix/util/config.mk +mozilla/security/nss/lib/libpkix/pkix/top/config.mk +mozilla/security/nss/lib/libpkix/pkix/store/config.mk +mozilla/security/nss/lib/libpkix/pkix/results/config.mk +mozilla/security/nss/lib/libpkix/pkix/params/config.mk +mozilla/security/nss/lib/libpkix/pkix/crlsel/config.mk +mozilla/security/nss/lib/libpkix/pkix/config.mk +mozilla/security/nss/lib/libpkix/pkix/checker/config.mk +mozilla/security/nss/lib/libpkix/pkix/certsel/config.mk +mozilla/security/nss/lib/libpkix/include/config.mk +mozilla/security/nss/lib/libpkix/config.mk +mozilla/security/nss/lib/jar/config.mk +mozilla/security/nss/lib/freebl/config.mk +mozilla/security/nss/lib/dev/config.mk +mozilla/security/nss/lib/cryptohi/config.mk +mozilla/security/nss/lib/crmf/config.mk +mozilla/security/nss/lib/ckfw/nssmkey/config.mk +mozilla/security/nss/lib/ckfw/dbm/config.mk +mozilla/security/nss/lib/ckfw/config.mk +mozilla/security/nss/lib/ckfw/capi/config.mk +mozilla/security/nss/lib/ckfw/builtins/config.mk +mozilla/security/nss/lib/certhigh/config.mk +mozilla/security/nss/lib/certdb/config.mk +mozilla/security/nss/lib/base/config.mk +mozilla/security/nss/cmd/libpkix/testutil/config.mk +mozilla/security/nss/cmd/libpkix/config.mk +mozilla/security/nss/cmd/lib/config.mk +mozilla/security/nss/cmd/crmftest/config.mk +mozilla/security/nss/cmd/crmf-cgi/config.mk +mozilla/security/dbm/src/config.mk +mozilla/security/dbm/config/config.mk +mozilla/security/coreconf/config.mk +mozilla/nsprpub/config/config.mk +mozilla/nsprpub/build/autoconf/config.sub +mozilla/nsprpub/build/autoconf/config.guess +mozilla/modules/freetype2/builds/unix/config.sub +mozilla/modules/freetype2/builds/unix/config.guess +mozilla/media/libtheora/lib/config.h +mozilla/media/libtheora/include/theora/config.h +mozilla/media/liboggz/include/oggz/config.h +mozilla/media/liboggplay/src/liboggplay/config.h +mozilla/media/libfishsound/src/libfishsound/config.h +mozilla/media/libfishsound/include/fishsound/config.h +mozilla/js/src/tracevis/config.py +mozilla/js/src/tests/config.sh +mozilla/js/src/tests/config.mk +mozilla/js/src/config/config.mk +mozilla/js/src/config.mk +mozilla/js/src/build/autoconf/config.sub +mozilla/js/src/build/autoconf/config.guess +mozilla/js/ctypes/libffi/config.sub +mozilla/js/ctypes/libffi/config.guess +mozilla/ipc/chromium/src/third_party/libevent/mac/config.h +mozilla/ipc/chromium/src/third_party/libevent/linux/config.h +mozilla/ipc/chromium/src/third_party/libevent/config.sub +mozilla/ipc/chromium/src/third_party/libevent/config.h.in +mozilla/ipc/chromium/src/third_party/libevent/config.guess +mozilla/config/config.mk +mozilla/build/autoconf/config.sub +mozilla/build/autoconf/config.guess --- firefox-3.6.18+build2+nobinonly.orig/debian/firefox.menu +++ firefox-3.6.18+build2+nobinonly/debian/firefox.menu @@ -0,0 +1,3 @@ +?package(firefox):needs="x11" section="Applications/Network/Web Browsing" \ + title="Firefox Browser" command="/usr/bin/firefox" hints="Web browsers" \ + icon="/usr/share/pixmaps/firefox.png" --- firefox-3.6.18+build2+nobinonly.orig/debian/abrowser.desktop +++ firefox-3.6.18+build2+nobinonly/debian/abrowser.desktop @@ -0,0 +1,75 @@ +[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 +Name[ru]=Веб-браузер +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 +Comment[ru]=Доступ в Интернет +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 +GenericName[ru]=Веб-браузер +Exec=abrowser %u +Terminal=false +X-MultipleArgs=false +Type=Application +Icon=abrowser +Categories=Application;Internet;Network;WebBrowser; +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=Web Browser +StartupNotify=true --- firefox-3.6.18+build2+nobinonly.orig/debian/disable-patches.sh +++ firefox-3.6.18+build2+nobinonly/debian/disable-patches.sh @@ -0,0 +1,43 @@ +#!/bin/sh + +# Copyright (C) 2010 Canonical Ltd +# +# 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. +# +# Authored by Chris Coulson + +BASEDIR=$2 +DISABLE_PATCHES_LIST=$1 + +if [ "x" = "x${BASEDIR}" ] ; then + BASEDIR=`pwd` +fi + +if [ "x" = "x${DISABLE_PATCHES_LIST}" ] || [ ! -f ${DISABLE_PATCHES_LIST} ] ; then + if [ -f ${BASEDIR}/debian/patches/series-disable-patches.${DISABLE_PATCHES_LIST} ] ; then + DISABLE_PATCHES_LIST="${BASEDIR}/debian/patches/series-disable-patches.${DISABLE_PATCHES_LIST}" + else + echo "Must specify a valid list of patches to disable" + exit 1 + fi +fi + +cp ${BASEDIR}/debian/patches/series ${BASEDIR}/debian/patches/series.orig + +while read line +do + cmd="/^"${line}"$/d" + sed -ri $cmd ${BASEDIR}/debian/patches/series +done < ${DISABLE_PATCHES_LIST} --- firefox-3.6.18+build2+nobinonly.orig/debian/presubj +++ firefox-3.6.18+build2+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.6.18+build2+nobinonly.orig/debian/firefox.dirs +++ firefox-3.6.18+build2+nobinonly/debian/firefox.dirs @@ -0,0 +1,4 @@ +usr/lib/firefox-addons/extensions +usr/lib/firefox-addons/plugins +usr/lib/firefox-addons/searchplugins +etc/apparmor.d/disable --- firefox-3.6.18+build2+nobinonly.orig/debian/debsearch.gif.uu +++ firefox-3.6.18+build2+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.6.18+build2+nobinonly.orig/debian/firefox.preinst.in +++ firefox-3.6.18+build2+nobinonly/debian/firefox.preinst.in @@ -0,0 +1,46 @@ +#!/bin/sh + +set -e + +APP_DIR="/etc/apparmor.d" +APP_PROFILE="usr.bin.@APPNAME@" +APP_CONFFILE="$APP_DIR/$APP_PROFILE" +APP_DISABLE="$APP_DIR/disable/$APP_PROFILE" + +disable_profile() { + # Create a symlink to the yet-to-be-unpacked profile + if [ ! -e "$APP_CONFFILE" ]; then + mkdir -p `dirname $APP_DISABLE` 2>/dev/null || true + ln -sf $APP_CONFFILE $APP_DISABLE + fi +} + +# Unconditionally disable AppArmor profile for Ubuntu 9.04 and under, since +# it requires abstractions found only in 9.10 and higher. +major=`lsb_release -r | awk '{print $2}' | cut -d '.' -f 1` +version=`lsb_release -r | awk '{print $2}'` +if [ "$major" -lt 10 ] && [ "$version" != "9.10" ]; then + disable_profile +else + if [ "$1" = "install" ]; then + # Disable AppArmor profile on install, unless the last profile they + # modified is enabled. + base=`echo $APP_PROFILE | cut -d '-' -f 1` + last_modified=`ls -rt $APP_DIR/$base* 2>/dev/null | grep -v '\.dpkg' | tail -n1` + if [ -s "$last_modified" ]; then + if [ -e "$APP_DIR/disable/`basename $last_modified`" ]; then + disable_profile + fi + else + # Fresh install and no other firefox profiles exist, so disable. + disable_profile + fi + elif [ "$1" = "upgrade" ]; then + # Disable AppArmor on 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.6~b6~hg20091208" ; then + disable_profile + fi + fi +fi + --- firefox-3.6.18+build2+nobinonly.orig/debian/firefox-namoroka.desktop +++ firefox-3.6.18+build2+nobinonly/debian/firefox-namoroka.desktop @@ -0,0 +1,14 @@ +[Desktop Entry] +Version=1.0 +Name=Namoroka Web Browser +Comment=Firefox pre-release +GenericName=Preview Browser +Exec=firefox %u +Terminal=false +X-MultipleArgs=false +Type=Application +Icon=firefox +Categories=Application;Internet;Network;WebBrowser; +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=Namoroka +StartupNotify=true --- firefox-3.6.18+build2+nobinonly.orig/debian/firefox.png.uu +++ firefox-3.6.18+build2+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.6.18+build2+nobinonly.orig/debian/debsearch.src +++ firefox-3.6.18+build2+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.6.18+build2+nobinonly.orig/debian/firefox.sh.in +++ firefox-3.6.18+build2+nobinonly/debian/firefox.sh.in @@ -0,0 +1,133 @@ +#!/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@ +GDB=/usr/bin/gdb +DROPPED=abandoned + +NAME="$0" +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 + 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)" +} + +script_args="" +while [ $# -gt 0 ]; do + case "$1" in + -h | --help | -help ) + usage + exit 0 ;; + -g | --debug ) + script_args="$script_args -g" + 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 firefox-3.6; 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-beta-profile-migration-dialog + result=$? + if [ $result = 1 ]; then + mv $MOZDIR/$FOUND $MOZDIR/$FOUND.3.5-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.5 profile." + else + echo " use firefox 3.5 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 [ -x $LIBDIR/$APPNAME-bin ] ; then + # This is an all-in-one build + exec $LIBDIR/$APPNAME $script_args "$@" +else + # This is a build with external xulrunner + exec $LIBDIR/run-mozilla.sh $script_args $LIBDIR/$APPNAME "$@" +fi --- firefox-3.6.18+build2+nobinonly.orig/debian/firefox.postinst.in +++ firefox-3.6.18+build2+nobinonly/debian/firefox.postinst.in @@ -0,0 +1,105 @@ +#!/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 + + # + # AppArmor + # + # Unconditionally move aside the old firefox 3.5 profile on upgrades + # to a firefox release that provides firefox-3.5 + if dpkg --compare-versions "$2" le-nl "3.6+nobinonly-0ubuntu2"; then + OLDCONFFILE="/etc/apparmor.d/usr.bin.firefox-3.5" + if [ -f "$OLDCONFFILE" ]; then + # first unload the old profile + apparmor_parser -R "$OLDCONFFILE" || true + mv -f "$OLDCONFFILE" "$OLDCONFFILE".dpkg-old + fi + fi + + APP_PROFILE="/etc/apparmor.d/usr.bin.$APPNAME" + if [ -f "$APP_PROFILE" ]; then + if [ -e /etc/lsb-release ] ; then + ubuntu_version=`grep ^DISTRIB_RELEASE /etc/lsb-release | cut -d= -f2 | cut -d '.' -f-2 | tr -d '.'` + else + ubuntu_version=`lsb_release -rs | cut -d '.' -f-2 | tr -d '.'` + fi + + # Setup the extra include files for Ubuntu 10.10 and higher + if [ "$ubuntu_version" -ge '1010' ]; then + # Add the local/ include + LOCAL_APP_PROFILE="/etc/apparmor.d/local/usr.bin.$APPNAME" + test -e "$LOCAL_APP_PROFILE" || { + tmp=`mktemp` + cat < "$tmp" +# Site-specific additions and overrides for usr.bin.firefox. +# For more details, please see /etc/apparmor.d/local/README. +EOM + mkdir `dirname $LOCAL_APP_PROFILE` 2>/dev/null || true + mv -f "$tmp" "$LOCAL_APP_PROFILE" + chmod 644 "$LOCAL_APP_PROFILE" + } + + # Add the addons include + ADDONS_APP_PROFILE="/etc/apparmor.d/abstractions/ubuntu-browsers.d/$APPNAME" + test -e "$ADDONS_APP_PROFILE" || { + tmp=`mktemp` + cat < "$tmp" +# This file is updated by 'aa-update-browser' and may be overwritten on +# upgrades. +# +# For site-specific adjustments, please see /etc/apparmor.d/local/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +EOM + mkdir -p `dirname $ADDONS_APP_PROFILE` 2>/dev/null || true + mv -f "$tmp" "$ADDONS_APP_PROFILE" + chmod 644 "$ADDONS_APP_PROFILE" + } + fi + + # Reload AppArmor profile + DISABLE_APP_PROFILE="/etc/apparmor.d/disable/usr.bin.$APPNAME" + if [ ! -f "$DISABLE_APP_PROFILE" ] && aa-status --enabled 2>/dev/null; then + apparmor_parser -r -T -W "$APP_PROFILE" || true + fi + fi + # + # End AppArmor + # +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.6.18+build2+nobinonly.orig/debian/moz-rev.sh +++ firefox-3.6.18+build2+nobinonly/debian/moz-rev.sh @@ -0,0 +1,48 @@ +#!/bin/sh + +# Copyright (c) 2009 Fabien Tassin +# +# 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. + +URL=$1 +BRANCH=$2 + +set -e + +if [ Z$1 = Z ] ; then + echo "Usage: $0 MOZ_URL [BRANCH]" + echo + echo "Ex: $0 http://hg.mozilla.org/releases/mozilla-1.9.2 default" + exit 1 +fi + +if [ Z$BRANCH = Z ] ; then + BRANCH="default" +fi + +# Get the tip of $BRANCH +URL_BASE=`echo $URL | sed -e 's,^\(http://[^/]*\)/.*,\1,'` +TIP=`wget -qO- $URL/summary | sed -e '1,/>branches$BRANCH<" | \ + sed -e 's,.*'$BRANCH'changeset.*,\1,'` + +# Get the rev-id and hash of this top +REVS=`wget -qO- $URL_BASE$TIP | grep '^' | sed -e 's/.* changeset \([^<]*\).*/\1/'` +REV=`echo $REVS | cut -d: -f1` +HASH=`echo $REVS | cut -d: -f2` + +# Get the date of this tip +DATE=`wget -qO- "$URL/pushlog?changeset=$HASH" | grep '^ <updated>' | tr '<>' '"' | cut -d'"' -f3 | cut -dT -f1 | tr -d '-'` + +echo "${DATE}r${REV}" --- firefox-3.6.18+build2+nobinonly.orig/debian/firefox.links +++ firefox-3.6.18+build2+nobinonly/debian/firefox.links @@ -0,0 +1,3 @@ +## /usr/bin/firefox-3.6 /usr/bin/firefox +/usr/bin/firefox /usr/bin/abrowser +/usr/lib/firefox-addons/searchplugins /usr/lib/firefox-addons/searchplugins/common --- firefox-3.6.18+build2+nobinonly.orig/debian/usr.bin.firefox.apparmor.10.10 +++ firefox-3.6.18+build2+nobinonly/debian/usr.bin.firefox.apparmor.10.10 @@ -0,0 +1,126 @@ +# vim:syntax=apparmor +# Author: Jamie Strandboge <jamie@canonical.com> + +#include <tunables/global> + +@LIBDIR@/firefox-*bin { + #include <abstractions/audio> + #include <abstractions/base> + #include <abstractions/cups-client> + #include <abstractions/dbus-session> + #include <abstractions/fonts> + #include <abstractions/freedesktop.org> + #include <abstractions/gnome> + #include <abstractions/nameservice> + #include <abstractions/user-tmp> + + # Addons + #include <abstractions/ubuntu-browsers.d/firefox> + + # for networking + network inet stream, + network inet6 stream, + @{PROC}/[0-9]*/net/if_inet6 r, + @{PROC}/[0-9]*/net/ipv6_route r, + + # should maybe be in abstractions + /etc/ r, + /etc/mime.types r, + /etc/mailcap r, + /etc/xdg/{,xdg-}xubuntu/applications/defaults.list r, + owner @{HOME}/.local/share/applications/defaults.list r, + owner @{HOME}/.local/share/applications/mimeinfo.cache r, + owner /tmp/** m, + owner /var/tmp/** m, + + /etc/timezone r, + /etc/wildmidi/wildmidi.cfg r, + + # firefox specific + /etc/firefox*/ r, + /etc/firefox*/** r, + /etc/xul-ext/** r, + /etc/xulrunner-1.9*/ r, + /etc/xulrunner-1.9*/** r, + /etc/gre.d/ r, + /etc/gre.d/* r, + + # noisy + deny @LIBDIR@/** w, + deny /usr/lib/firefox-addons/** w, + deny /usr/lib/xulrunner-addons/** w, + deny /usr/lib/xulrunner-*/components/*.tmp w, + deny /.suspended r, + deny /boot/initrd.img* r, + deny /boot/vmlinuz* r, + deny /var/cache/fontconfig/ w, + + # These are needed when a new user starts firefox and firefox.sh is used + @LIBDIR@/** ixr, + /usr/bin/basename ixr, + /usr/bin/dirname ixr, + /usr/bin/pwd ixr, + /sbin/killall5 ixr, + /bin/which ixr, + /usr/bin/tr ixr, + @{PROC}/ r, + @{PROC}/[0-9]*/cmdline r, + @{PROC}/[0-9]*/stat r, + @{PROC}/[0-9]*/status r, + @{PROC}/filesystems r, + + /etc/mtab r, + /etc/fstab r, + + # Needed for the crash reporter + owner @{PROC}/[0-9]*/environ r, + owner @{PROC}/[0-9]*/auxv r, + /etc/lsb-release r, + /usr/bin/expr ix, + + # Needed for container to work in xul builds + /usr/lib/xulrunner-*/plugin-container ixr, + + # 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, + + # Default profile allows downloads to ~/Downloads and uploads from ~/Public + owner @{HOME}/ r, + owner @{HOME}/Public/ r, + owner @{HOME}/Public/* r, + owner @{HOME}/Downloads/ r, + owner @{HOME}/Downloads/* rw, + + # per-user firefox configuration + owner @{HOME}/.mozilla/ rw, + owner @{HOME}/.mozilla/** rw, + owner @{HOME}/.mozilla/**/*.{db,parentlock,sqlite}* k, + owner @{HOME}/.mozilla/plugins/** rm, + owner @{HOME}/.mozilla/**/plugins/** rm, + + # + # Extensions + # /usr/share/.../extensions/... is already covered by '/usr/** r', above. + # Allow 'x' for downloaded extensions, but inherit policy for safety + owner @{HOME}/.mozilla/**/extensions/** mixr, + + deny @LIBDIR@/update.test w, + deny /usr/lib/mozilla/extensions/**/ w, + deny /usr/lib/xulrunner-addons/extensions/**/ w, + deny /usr/share/mozilla/extensions/**/ w, + deny /usr/share/mozilla/ w, + + # Miscellaneous (to be abstracted) + /usr/bin/mkfifo Uxr, # TODO: investigate + /bin/ps Uxr, # TODO: child profile + /bin/uname Uxr, # TODO: child profile + + # Site-specific additions and overrides. See local/README for details. + #include <local/usr.bin.firefox> +} --- firefox-3.6.18+build2+nobinonly.orig/debian/firefox.install +++ firefox-3.6.18+build2+nobinonly/debian/firefox.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/components.list + +debian/tmp/usr/lib/firefox-*/modules/ + +debian/tmp/usr/lib/firefox-*/run-mozilla.sh + +debian/tmp/usr/lib/firefox-*/defaults/profile etc/firefox/ +debian/tmp/usr/lib/firefox-*/browserconfig.properties +debian/tmp/usr/lib/firefox-*/blocklist.xml + +debian/presubj usr/share/bug/firefox + +debian/firefox.js etc/firefox/pref + +#debian/debsearch.gif usr/lib/firefox-addons/searchplugins +#debian/debsearch.src usr/lib/firefox-addons/searchplugins + +debian/tmp/usr/lib/firefox-*/extensions/\{972ce4c6-7e08-4474-a285-3208198ce6fd\} usr/lib/firefox-addons/extensions + +# debian/tmp/usr/lib/firefox-*/plugins/*.so usr/lib/firefox-addons/plugins + +debian/tmp/usr/lib/firefox-*/*.ini + +# Install the apport hook for now. +debian/apport/firefox.py usr/share/apport/package-hooks/ --- firefox-3.6.18+build2+nobinonly.orig/debian/compat +++ firefox-3.6.18+build2+nobinonly/debian/compat @@ -0,0 +1 @@ +5 --- firefox-3.6.18+build2+nobinonly.orig/debian/control +++ firefox-3.6.18+build2+nobinonly/debian/control @@ -0,0 +1,134 @@ +Source: firefox +Section: web +Priority: optional +Maintainer: Ubuntu Mozilla Team <ubuntu-mozillateam@lists.ubuntu.com> +Vcs-Bzr: https://code.launchpad.net/~mozillateam/firefox/firefox-3.6.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, + libcurl4-openssl-dev, + libhunspell-dev, + libdbus-glib-1-dev (>= 0.60), + libnspr4-dev, libnss3-dev, + mozilla-devscripts (>= 0.10~), + hardening-wrapper, + lsb-release, + libiw-dev, + libnotify-dev (>= 0.4) +Standards-Version: 3.8.1 + +Package: firefox +Architecture: any +Depends: fontconfig, + psmisc, + lsb-release, + debianutils (>= 1.16), + ${misc:Depends}, + ${shlibs:Depends}, + firefox-branding | abrowser-branding +Recommends: ubufox +Suggests: firefox-gnome-support (= ${binary:Version}), + firefox-kde-support, + ttf-lyx, + libthai0 +Provides: www-browser, + iceweasel +XB-Xul-AppId: {ec8030f7-c20a-464f-9b0e-13a3a9e97384} +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-branding +Architecture: any +Depends: firefox (= ${binary:Version}), + ${misc:Depends} +Replaces: kubuntu-firefox-installer +Conflicts: abrowser-branding +Provides: abrowser-branding +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-gnome-support +Architecture: any +Section: gnome +Depends: ${shlibs:Depends}, + ${misc:Depends}, + firefox (= ${binary:Version}) +Provides: gnome-www-browser +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-mozsymbols +Architecture: amd64 i386 armel +Section: debug +Priority: extra +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: firefox debug symbols for mozilla + package containing the firefox symbols in a format expected by mozilla's + breakpad. eventually this package should go away and the symbol upload be + implemented in soyuz (or other builders that build this package) + +Package: firefox-dbg +Architecture: any +Section: debug +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + firefox (= ${binary:Version}) +Description: firefox debug symbols + Debug symbols for Firefox. + +Package: firefox-gnome-support-dbg +Architecture: any +Section: debug +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + firefox-gnome-support (= ${binary:Version}), + firefox-dbg (= ${binary:Version}) +Description: firefox gnome support debug symbols + Debug symbols for the GNOME support files of Firefox. + +Package: abrowser-branding +Architecture: any +Depends: firefox (= ${binary:Version}), ${misc:Depends} +Conflicts: firefox-branding +Provides: firefox-branding +Description: package that ships the abrowser branding + The ABrowser refers to the unbranded build of firefox. + 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 +Architecture: all +Depends: firefox, + abrowser-branding, + ${misc:Depends} +XB-Xul-AppId: {ec8030f7-c20a-464f-9b0e-13a3a9e97384} +Description: metapackage for the unbranded abrowser + ABrowser 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. --- firefox-3.6.18+build2+nobinonly.orig/debian/ubuntu-abrowser.js.tmpl +++ firefox-3.6.18+build2+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.6.18+build2+nobinonly.orig/debian/firefox-gnome-support.install +++ firefox-3.6.18+build2+nobinonly/debian/firefox-gnome-support.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/firefox-*/components/libnkgnomevfs.so +#debian/firefox*.xml usr/share/gnome-control-center/default-apps --- firefox-3.6.18+build2+nobinonly.orig/debian/usr.bin.firefox.apparmor.10.04 +++ firefox-3.6.18+build2+nobinonly/debian/usr.bin.firefox.apparmor.10.04 @@ -0,0 +1,336 @@ +# vim:syntax=apparmor +# Author: Jamie Strandboge <jamie@canonical.com> + +#include <tunables/global> + +@LIBDIR@/firefox-*bin { + #include <abstractions/audio> + #include <abstractions/base> + #include <abstractions/cups-client> + #include <abstractions/dbus> + #include <abstractions/fonts> + #include <abstractions/freedesktop.org> + #include <abstractions/gnome> + #include <abstractions/kde> + #include <abstractions/nameservice> + #include <abstractions/user-tmp> + #include <abstractions/X> + + # for networking + network inet stream, + network inet6 stream, + @{PROC}/[0-9]*/net/if_inet6 r, + @{PROC}/[0-9]*/net/ipv6_route r, + + # should maybe be in abstractions + /etc/ r, + /etc/mime.types r, + /etc/mailcap r, + /etc/timezone r, + /etc/wildmidi/wildmidi.cfg r, + /etc/xdg/xubuntu/applications/defaults.list r, + /usr/bin/dbus-launch ixr, + /usr/bin/scim Ux, + /usr/bin/scim-bridge Ux, + /usr/bin/apport-bug Ux, + /usr/local/lib{,32,64}/*.so* mr, + /usr/lib/gstreamer0.10/gstreamer-0.10/gst-plugin-scanner ix, + /usr/bin/apturl Uxr, + + # firefox specific + /etc/firefox*/ r, + /etc/firefox*/** r, + /etc/xul-ext/** r, + /etc/xulrunner-1.9*/ r, + /etc/xulrunner-1.9*/** r, + /etc/gre.d/ r, + /etc/gre.d/* r, + + # noisy + deny @LIBDIR@/** w, + deny /usr/lib/firefox-addons/** w, + deny /usr/lib/xulrunner-addons/** w, + deny /usr/lib/xulrunner-*/components/*.tmp w, + deny /.suspended r, + deny /boot/initrd.img* r, + deny /boot/vmlinuz* r, + + # These are needed when a new user starts firefox and firefox.sh is used + @LIBDIR@/** ixr, + /usr/bin/basename ixr, + /usr/bin/dirname ixr, + /usr/bin/pwd ixr, + /sbin/killall5 ixr, + /bin/which ixr, + /usr/bin/tr ixr, + @{PROC}/ r, + @{PROC}/[0-9]*/cmdline r, + @{PROC}/[0-9]*/stat r, + @{PROC}/[0-9]*/status r, + @{PROC}/filesystems r, + + /etc/mtab r, + /etc/fstab r, + + # Needed for the crash reporter + owner @{PROC}/[0-9]*/environ r, + owner @{PROC}/[0-9]*/auxv r, + /etc/lsb-release r, + /usr/bin/expr ix, + + # 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}/** r, + owner @{HOME}/** w, + owner @{HOME}/Desktop/** r, + + # removable media and filesystems + /media/** r, + /mnt/** r, + /srv/** r, + owner /media/** w, + owner /mnt/** w, + owner /srv/** w, + + #include <abstractions/private-files> + 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 + owner @{HOME}/.mozilla/ rw, + owner @{HOME}/.mozilla/** rw, + owner @{HOME}/.mozilla/**/*.{db,parentlock,sqlite}* k, + owner @{HOME}/.mozilla/plugins/** rm, + owner @{HOME}/.mozilla/**/plugins/** rm, + + # + # Extensions + # /usr/share/.../extensions/... is already covered by '/usr/** r', above. + # Allow 'x' for downloaded extensions, but inherit policy for safety + owner @{HOME}/.mozilla/**/extensions/** mixr, + + deny @LIBDIR@/update.test w, + deny /usr/lib/mozilla/extensions/**/ w, + deny /usr/lib/xulrunner-addons/extensions/**/ w, + deny /usr/share/mozilla/extensions/**/ w, + deny /usr/share/mozilla/ w, + + # + # Plugins/helpers + # + @{PROC}/[0-9]*/fd/ r, + /usr/lib/** rm, + /bin/bash ixr, + /bin/dash ixr, + /bin/grep ixr, + /bin/sed ixr, + /bin/ps Uxr, + /bin/uname Uxr, + /usr/bin/gnome-codec-install Uxr, + /usr/bin/m4 ixr, + /usr/bin/mkfifo Uxr, + /usr/lib/nspluginwrapper/i386/linux/npviewer Uxr, + /usr/bin/pulseaudio ixr, + /var/lib/ r, + /var/lib/** mr, + + # Needed for container to work in xul builds + /usr/lib/xulrunner-*/plugin-container ixr, + + # 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 + # + + # for PDFs + owner @{HOME}/.adobe/** rw, + /opt/Adobe/Reader9/bin/acroread Uxr, + /opt/Adobe/Reader9/** r, + /usr/bin/evince PUxr, + /usr/bin/okular Uxr, + + # Image viewers + /usr/bin/eog Uxr, + /usr/bin/gimp* Uxr, + + # Openoffice.org + /usr/bin/ooffice Uxr, + /usr/bin/oocalc Uxr, + /usr/bin/oodraw Uxr, + /usr/bin/ooimpress Uxr, + /usr/bin/oowriter Uxr, + /usr/lib/openoffice/program/soffice Uxr, + + # Multimedia + #include <abstractions/ubuntu-media-players> + owner @{HOME}/.macromedia/** rw, + /opt/real/RealPlayer/mozilla/nphelix.so rm, + + # Bittorrent clients + #include <abstractions/ubuntu-bittorrent-clients> + + # Archivers + /usr/bin/ark Uxr, + /usr/bin/file-roller Uxr, + /usr/bin/xarchiver Uxr, + + # Text editors (It's All Text [https://addons.mozilla.org/en-US/firefox/addon/4125]) + /usr/bin/emacsclient.emacs-snapshot Uxr, + /usr/bin/emacsclient.emacs22 Uxr, + /usr/bin/gedit Uxr, + /usr/bin/vim.gnome Uxr, + /usr/bin/leafpad Uxr, + /usr/bin/mousepad Uxr, + + # Mozplugger + /etc/mozpluggerrc r, + /usr/bin/mozplugger-helper Uxr, + + # Java + @{HOME}/.java/deployment/deployment.properties k, + /etc/java-*/ r, + /etc/java-*/** r, + /usr/lib/jvm/java-6-openjdk/jre/bin/java cx -> firefox_openjdk, + /usr/lib/jvm/java-*-sun-1.*/jre/bin/java{,_vm} cx -> firefox_java, + /usr/lib/jvm/java-*-sun-1.*/jre/lib/*/libnp*.so cx -> firefox_java, + /usr/lib/j2*-ibm/jre/bin/java cx -> firefox_java, + + # for mailto: + #include <abstractions/ubuntu-email> + #include <abstractions/ubuntu-console-email> + + # Terminals for using console applications. These abstractions should ideally + # have 'ix' to restrct access to what only firefox is allowed to do + #include <abstractions/ubuntu-gnome-terminal> + + # 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 <abstractions/ubuntu-xterm> + ##include <abstractions/ubuntu-konsole> + + # Miscellaneous (to be abstracted) + /usr/bin/nautilus Uxr, + /usr/bin/thunar Uxr, + /usr/bin/liferea-add-feed Uxr, + + + # + # Child profiles + # + + # Profile for the supported OpenJDK in Ubuntu. This doesn't require the + # unfortunate workarounds of the proprietary Javas, so have a separate + # profile. + profile firefox_openjdk { + #include <abstractions/base> + #include <abstractions/fonts> + #include <abstractions/gnome> + #include <abstractions/kde> + #include <abstractions/nameservice> + #include <abstractions/ssl_certs> + #include <abstractions/user-tmp> + #include <abstractions/private-files-strict> + + network inet stream, + network inet6 stream, + @{PROC}/[0-9]*/net/if_inet6 r, + @{PROC}/[0-9]*/net/ipv6_route r, + + /etc/java-*/ r, + /etc/java-*/** r, + /etc/lsb-release r, + /etc/ssl/certs/java/* r, + /etc/timezone r, + + @{PROC}/[0-9]*/ r, + @{PROC}/[0-9]*/fd/ r, + @{PROC}/filesystems r, + /sys/devices/system/cpu/ r, + /sys/devices/system/cpu/** r, + /usr/share/** r, + /var/lib/dbus/machine-id r, + + /usr/bin/env ix, + /usr/lib/jvm/java-6-openjdk/jre/bin/java ix, + /usr/lib/jvm/java-6-openjdk/jre/lib/i386/client/classes.jsa m, + + # Why would java need this? + deny /usr/bin/gconftool-2 x, + + owner @{HOME}/ r, + owner @{HOME}/** rwk, + } + + # Profile for commercial Javas. These need workarounds to work right (eg + # Sun's forcing of an executable stack (LP: #535247)). + profile firefox_java { + #include <abstractions/base> + #include <abstractions/fonts> + #include <abstractions/gnome> + #include <abstractions/kde> + #include <abstractions/nameservice> + #include <abstractions/ssl_certs> + #include <abstractions/user-tmp> + #include <abstractions/private-files-strict> + + network inet stream, + network inet6 stream, + @{PROC}/[0-9]*/net/if_inet6 r, + @{PROC}/[0-9]*/net/ipv6_route r, + @{PROC}/loadavg r, + + /etc/debian_version r, + /etc/java-*/ r, + /etc/java-*/** r, + /etc/lsb-release r, + /etc/ssl/certs/java/* r, + /etc/timezone r, + + @{PROC}/[0-9]*/ r, + @{PROC}/[0-9]*/fd/ r, + @{PROC}/filesystems r, + /sys/devices/system/cpu/ r, + /sys/devices/system/cpu/** r, + /usr/share/** r, + /var/lib/dbus/machine-id r, + + /usr/bin/env ix, + /usr/lib/jvm/java-*-sun-1.*/jre/bin/java{,_vm} ix, + /usr/lib/jvm/java-*-sun-1.*/jre/lib/i386/client/classes.jsa m, + /usr/lib/j2*-ibm/jre/bin/java ix, + + # noisy, can't write here anyway + deny /etc/.java/ w, + deny /etc/.java/** w, + + deny /usr/bin/gconftool-2 x, + + owner @{HOME}/ r, + owner @{HOME}/** rwk, + owner @{HOME}/.fontconfig/*.cache* m, + + # These are seriously unfortunate, but required due to LP: #535247 + /etc/passwd m, + owner @{HOME}/.java/**/cache/** m, + owner /tmp/** m, + /usr/lib{,32,64}/jvm/**/*.jar mr, + /usr/share/fonts/** m, + } +} --- firefox-3.6.18+build2+nobinonly.orig/debian/changelog +++ firefox-3.6.18+build2+nobinonly/debian/changelog @@ -0,0 +1,5758 @@ +firefox (3.6.18+build2+nobinonly-0ubuntu0.10.10.2) maverick-security; urgency=low + + * fix LP: #801778 - Regression: Firefox 3.6.18 does not set cookie when + talking to single letter hostname + - add debian/patches/lp801778_bz667087_att542125-fix-cookie-regression.patch + - update debian/patches/series + + -- Micah Gersten <micahg@ubuntu.com> Tue, 28 Jun 2011 23:21:04 +0100 + +firefox (3.6.18+build2+nobinonly-0ubuntu0.10.10.1) maverick-security; urgency=low + + * New upstream release v3.6.18 build2 (FIREFOX_3_6_18_BUILD2) + - see USN-1149-1 + + -- Micah Gersten <micahg@ubuntu.com> Wed, 15 Jun 2011 02:39:32 -0500 + +firefox (3.6.17+build3+nobinonly-0ubuntu0.10.10.1) maverick-security; urgency=low + + * New upstream release v3.6.17 build3 (FIREFOX_3_6_17_BUILD3) + - see USN-1112-1 + + -- Micah Gersten <micahg@ubuntu.com> Thu, 21 Apr 2011 23:47:06 -0500 + +firefox (3.6.16+build1+nobinonly-0ubuntu0.10.10.1) maverick-security; urgency=low + + * New upstream release v3.6.16 (FIREFOX_3_6_16_BUILD1) + - see USN-1091-1 + + -- Micah Gersten <micahg@ubuntu.com> Wed, 23 Mar 2011 09:14:39 -0500 + +firefox (3.6.15+build1+nobinonly-0ubuntu0.10.10.1) maverick-security; urgency=low + + * New upstream release v3.6.15 (FIREFOX_3_6_15_BUILD1) + - see USN-1049-2 + + -- Chris Coulson <chris.coulson@canonical.com> Thu, 03 Mar 2011 10:27:43 -0600 + +firefox (3.6.14+build3+nobinonly-0ubuntu0.10.10.1) maverick-security; urgency=low + + * New upstream release v3.6.14 (FIREFOX_3_6_14_BUILD3) + - see USN-1049-1 + + -- Micah Gersten <micahg@ubuntu.com> Sun, 20 Feb 2011 23:18:06 -0600 + +firefox (3.6.13+build3+nobinonly-0ubuntu0.10.10.1) maverick-security; urgency=low + + * New upstream release v3.6.13 (FIREFOX_3_6_13_BUILD3) + - see USN-1019-1 + + * Drop patch after upstream landing of bmo: 551152 aka Symlinked components + break everything + - remove debian/patches/lp518422.patch + - update debian/patches/series + + -- Chris Coulson <chris.coulson@canonical.com> Mon, 06 Dec 2010 11:47:50 +0000 + +firefox (3.6.12+build1+nobinonly-0ubuntu0.10.10.1) maverick-security; urgency=low + + * New upstream release v3.6.12 (FIREFOX_3_6_12_BUILD1) + - see USN-1011-1 + + [ Jamie Strandboge ] + * AppArmor: + - allow mmap for temporary files that we own (LP: #662918) + - add owner read to environ and auxv in @{PROC} as well as + /etc/lsb-release read and expr ix for the crash reporter + - update path for Xubuntu default settings (LP: #664093) + + -- Chris Coulson <chris.coulson@canonical.com> Wed, 27 Oct 2010 08:31:06 -0400 + +firefox (3.6.11+build3+nobinonly-0ubuntu0.10.10.1) maverick-security; urgency=low + + * New upstream release v3.6.11 (FIREFOX_3_6_11_BUILD3) + - see USN-997-1 + + [ Jamie Strandboge <jamie@ubuntu.com> ] + * AppArmor: + - fix for Google Gears (LP: #644976) + + [ Chris Coulson <chris.coulson@canonical.com> ] + * Refresh patches after landing of (bmo: 327323) aka Can't "Open with" files + that are send as application/octet-stream (or other "unknown to firefox" + mime types) + - update debian/patches/mozilla-kde.patch + - update debian/patches/series + - remove debian/patches/bz327323_att471859_lp239952_launch_from_extension.patch + * Bump minimum system NSS to 3.12.8 after landing of (bmo: 600104) aka + Bump minimum required version for system NSS to 3.12.8 + - update debian/rules + * Bump minimum system NSPR to 4.8.6 after landing of (bmo: 567620) aka + Bump minimum required version for system NSPR to 4.8.6 + - update debian/rules + * Bump minimum version of sqlite to 3.7.1 after landing of (bmo: 583611) aka + Upgrade to SQLite 3.7.1 + - update debian/rules + + -- Chris Coulson <chris.coulson@canonical.com> Wed, 13 Oct 2010 12:23:34 +0100 + +firefox (3.6.10+build1+nobinonly-0ubuntu3) maverick; urgency=low + + * Fix LP: #239952 - the associated helper application does not exist. + Where a launcher doesn't exist for a particular mimetype, use the file + extension instead + - add debian/patches/bz327323_att471859_lp239952_launch_from_extension.patch + - update debian/patches/series + + -- Chris Coulson <chris.coulson@canonical.com> Tue, 21 Sep 2010 23:09:29 +0100 + +firefox (3.6.10+build1+nobinonly-0ubuntu2) maverick; urgency=low + + * Add the following .desktop translations; Thanks to David Planella for + organizing the translations and to those who contributed the translations + - update debian/firefox-final.desktop + + Asturian + + Croatian + + Galician + + German + + Hebrew + + Uyghur + * Update the Italian Name for Firefox + - update debian/firefox-final.desktop + + -- Micah Gersten <micahg@ubuntu.com> Wed, 15 Sep 2010 22:51:30 -0500 + +firefox (3.6.10+build1+nobinonly-0ubuntu1) maverick; urgency=low + + * New upstream release v3.6.10 (FIREFOX_3_6_10_BUILD1) + + [ Chris Coulson <chris.coulson@canonical.com> ] + * Fix "ISO C++ forbids braced-groups within expressions" error on + GCC < 4.4 (which is also a warning on GCC >= 4.4) + - update debian/patches/bz591331_att469858_breakpad_allow_ptrace.patch + * Blacklist plugin-container in Apport + - update debian/apport/blacklist + * Fix LP: #637434 - components.list is not installed + - update debian/firefox.install + * De-fuzz patches + - update debian/patches/mozilla-kde.patch + + [ Jamie Strandboge <jamie@ubuntu.com> ] + * adjust apparmor profile for non-maverick dailies for latest sun-java6 + plugin (LP: #633369) + * ignore writes to /var/cache/fontconfig for 10.10 + + -- Chris Coulson <chris.coulson@canonical.com> Wed, 15 Sep 2010 17:50:08 +0100 + +firefox (3.6.9+build1+nobinonly-0ubuntu1) maverick; urgency=low + + * New upstream release v3.6.9 build1 (FIREFOX_3_6_9_BUILD1) + + * Drop patch after landing of (bmo: 569836) aka Build fails on + Fedora Core 13 + - remove debian/patches/ftbfs_crashreporter.patch + - update debian/patches/series + * Don't suggest the transitional kmozillahelper now we've branched + for Maverick. This stops it from being displayed as an addon + for Firefox in software-center + - update debian/control + * Don't suggest the transitional latex-xft-fonts. Use ttf-lyx + instead + - update debian/control + * Fix LP: #623509 - Firefox is creating empty crash reports due to + kernel ptrace hardening + - add debian/patches/bz591331_att469858_breakpad_allow_ptrace.patch + - update debian/patches/series + * Build with MOZILLA_OFFICIAL=1 again and in turn, enable the crashreporter + - update debian/rules + * Really fix LP: #605336 - "Report Broken Web Site" option missing - make + sure that we install the reporter chrome + - update debian/rules + + -- Chris Coulson <chris.coulson@canonical.com> Fri, 27 Aug 2010 20:14:45 +0100 + +firefox (3.6.8+build1+nobinonly-0ubuntu3) maverick; urgency=low + + [ Chris Coulson <chris.coulson@canonical.com> ] + * Fix LP: #605336 - "Report Broken Web Site" option missing - don't + disable the reporter extension when building with DEB_MIN_SYSDEPS=1 + - update debian/rules + * Add DEB_HOST_GNU_CPU to MOZ_SYMBOLS_EXTRA_BUILDID to avoid the + possibility of filename collisions on the server if our builds + happen to run at the same time + - update debian/rules + * Build without MOZILLA_OFFICIAL=1 for beta until LP #623509 is fixed, + so we're not sending empty crash reports + - update debian/rules + + [ Jamie Strandboge <jamie@ubuntu.com> ] + * add debian/usr.bin.firefox.apparmor.10.10 (LP: #565756, LP: #592121) + * debian/rules: updated for usr.bin.firefox.apparmor.10.10 + * debian/firefox.postinst.in: + - remove old code for the dailies + - update for local include file + - update for addons include file + - use '-T -W' with apparmor_parser to pull in abstraction updates + * debian/firefox.postrm.in: + - update for local include file + - update for addons include file + + [ Micah Gersten <micahg@ubuntu.com> ] + * fix LP: #559154 - KDE users installing Firefox from archive don't know + about kmozillahelper; kmozillahelper was renamed to firefox-kde-support + so update Suggests + - update debian/control + + -- Chris Coulson <chris.coulson@canonical.com> Thu, 26 Aug 2010 00:09:49 +0100 + +firefox (3.6.8+build1+nobinonly-0ubuntu2) maverick; urgency=low + + [ Chris Coulson <chris.coulson@canonical.com> ] + * Provide iceweasel + - update debian/control + * Really build with MOZILLA_OFFICIAL=1 this time, so that the crash + reporter is actually enabled + - update debian/rules + * Only enable the crashreporter and build the Breakpad symbols on i386, + amd64 and armel + - update debian/control + - update debian/rules + * Blacklist Firefox in Apport on architectures where we use the Mozilla + crash reporter + - add debian/apport/blacklist + - update debian/rules + * Drop the DEBIAN_META_NAME stuff - we don't need this now we are always + using unversioned sources for the official in-archive version. This + simplifies the wrapper script a little + - update debian/rules + - update debian/firefox.sh.in + * Rework how abrowser is launched a little. Drop an unnecessary patch + and ship both abrowser and abrowser-bin files in LIBDIR. With the + DEBIAN_META_NAME bits gone, the wrapper script will always search for + $LIBDIR/abrowser if you launch /usr/bin/abrowser. From there, the Mozilla + scripts already handle this properly + - update debian/firefox.sh.in + - update debian/rules + - remove debian/patches/abrowser_run_mozilla.patch + - update debian/patches/series + * Don't handle launching GDB in our wrapper script, run-mozilla.sh + already does all this. Just make sure that we pass the right arguments + - update debian/firefox.sh.in + * Fix LP: #613049 - Default website link in Maverick firefox is invalid + - update debian/patches/ubuntu_bookmarks.patch + * Refresh favicon's in the default bookmark collection, so they display + the latest Ubuntu branding on a fresh profile + - update debian/patches/ubuntu_bookmarks.patch + * Drop the mips-specific binutils build-depend - we don't even build + on this arch + - update debian/control + * Only try to install the crashreporter binary when building with the + bundled xulrunner library + - update debian/firefox.install + - update debian/rules + * Fix LP: #615889 - Add Ubuntu One bookmark to Firefox fresh install + - update debian/patches/ubuntu_bookmarks.patch + * Fix LP: #612185 - Apport leaks the secret name of the Firefox + profile directory + - update debian/apport/firefox.py + * Fix LP: #614190 - Chinese update for firefox.desktop. Thanks to + Cheng-Chia Tseng and Aron Xu + - update debian/firefox-final.desktop + * Fix LP: #559083 - Incomplete Vietnamese translation for items listed + in desktop main menu. Thanks to Vu Do Quynh for the translations + - update debian/firefox-final.desktop + + [ Igor Zubarev <igor.zubarev@gmail.com> ] + * Fix LP: #569762 - Add Russian translations to desktop files + - update debian/abrowser.desktop + - update debian/firefox-final.desktop + + -- Chris Coulson <chris.coulson@canonical.com> Thu, 12 Aug 2010 21:52:18 +0100 + +firefox (3.6.8+build1+nobinonly-0ubuntu1) maverick; urgency=low + + * New upstream release v3.6.8build1 (FIREFOX_3_6_8_BUILD1) + + [ Alexander Sack <asac@linaro.org> ] + * add support for mozilla breakpad symbols and in turn enable + crashreporter + - add debian/patches/ftbfs_crashreporter.patch + - update debian/patches/series + - update debian/control + - update debian/rules + + [ Chris Coulson <chris.coulson@canonical.com> ] + * Drop all the transitional packages and conflicts/replaces cruft built + up from the pre-LTS releases + - update debian/control + * Install the crash reporter + - update debian/firefox.install + * Build with MOZILLA_OFFICIAL=1. This is required to enable the crash + reporter in application.ini + - update debian/rules + + [ Micah Gersten <micahg@ubuntu.com> ] + * Add build depends on libcurl4-openssl-dev for building the crash reporter + - update debian/control + + -- Chris Coulson <chris.coulson@canonical.com> Fri, 23 Jul 2010 16:40:54 +0200 + +firefox (3.6.7+build2+nobinonly-0ubuntu1) maverick; urgency=low + + * New upstream release v3.6.7build2 (FIREFOX_3_6_7_BUILD2) + + * Make it possible to disable patches on a per-release basis. This + makes it easier to share packaging branches across releases, and makes + it possible to disable the patches which make the Hardy daily builds fail + - update debian/rules + - add debian/disable-patches.sh + - add debian/patches/series-disable-patches.8.04 + * Make the debian/usr.bin.firefox.apparmor.in target a dependency of + pre-build rather than makebuilddir. Whilst this doesn't really change + much, it is technically slightly more correct (makebuilddir is just for + creating the build directory, whilst pre-build is for doing all the + preparation work) + - update debian/rules + * Merge the debian/firefox.sh target in to the match-all target, this + just de-clutters things a little + - update debian/rules + * Remove debian/stamp-autotools-files-moz in the clean target + - update debian/rules + * Drop the empty firefox-dev and firefox-*-dev transitional packages. We + didn't install anything in to firefox-dev, and we can reintroduce it in + the future if anything in the archive depends on the browser specific + interfaces + - update debian/control + - remove debian/firefox-dev.install + - remove debian/firefox-dev.links + * Fix some Lintian warnings + - add debian/README.source + - update debian/control + * Make debian/migrator/ffox-beta-profile-migration-dialog a dependency of + post-patches rather than pre-build. This avoids the need for having to + build the profile migrator when unpacking the source tarball + - update debian/rules + + -- Chris Coulson <chris.coulson@canonical.com> Thu, 15 Jul 2010 23:51:25 +0200 + +firefox (3.6.7+build1+nobinonly-0ubuntu1) maverick; urgency=low + + * New upstream release v3.6.7 (FIREFOX_3_6_7_BUILD1) + * Set the StartupWMClass to the same value as the WM_CLASS property on the + browser window. This makes startup notification work for all branding + and also makes it work properly with Docky + - update debian/firefox-minefield.desktop + - update debian/firefox-namoroka.desktop + - update debian/abrowser.desktop + + -- Chris Coulson <chris.coulson@canonical.com> Fri, 09 Jul 2010 12:16:23 +0100 + +firefox (3.6.6+nobinonly-0ubuntu1) maverick; urgency=low + + * New upstream release v3.6.6 (FIREFOX_3_6_6_RELEASE) + + * fix LP: #590450 - Firefox should use the hunspell directory for dictionaries + - update debian/rules + + -- Micah Gersten <micahg@ubuntu.com> Sun, 27 Jun 2010 01:30:09 -0500 + +firefox (3.6.4+build7+nobinonly-0ubuntu1) maverick; urgency=low + + * New upstream release v3.6.4 (FIREFOX_3_6_4_BUILD7) + + [ Micah Gersten <micahg@ubuntu.com> ] + * Rebase patch after upstream landing of Lorentz branch + - update debian/patches/bz460917_att350845_reload_new_plugins.patch + * Drop patch after upstream landing of (bmo: 544481) aka + Build fails on Ubuntu Lucid Lynx using 'dash' shell + - drop debian/patches/fix-build-glitch.patch + - update debian/patches/series + + [ Jamie Strandboge <jamie@ubuntu.com> ] + * AppArmor: + - allow ixr access to /usr/lib/xulrunner-*/plugin-container for xul builds + - finetune Adobe Reader access (LP: #570337) + - silence noisy denial on /boot/vmlinuz* and /boot/initrd.img* caused by + readlinking symlinks in / (LP: #571761) + - allow 'm' for java's 'classes.jsa' file (LP: #574459) + - transition to firefox_java on Sun's jre/bin/java_vm too (LP: #570128) + - allow Uxr for gnome-codec-install (LP: #577097) + + [ Chris Coulson <chris.coulson@canonical.com> ] + * Rebase patches for 3.6.4 release + - update debian/patches/firefox-kde.patch + - update debian/patches/mozilla-kde.patch + - update debian/patches/add_syspref_dir.patch + * Build with --enable-ipc on amd64, i386 and armel. These are the only + architectures where OOPP is supported. Build with --disable-ipc on all + other architectures + - update debian/rules + * Fix LP: #513887 - Install the plugin-container binary for OOPP support + when building with --enable-ipc + - update debian/rules + * Fix build failure with fontconfig 2.5 + - update debian/patches/lp512615_cairo_lcd_filter.patch + * Fix LP: #469752 - KDE/Gnome startup notification not disappearing + when app window is up - build with --enable-startup-notification + - update debian/rules + + -- Chris Coulson <chris.coulson@canonical.com> Wed, 23 Jun 2010 15:31:44 +0100 + +firefox (3.6.3+nobinonly-0ubuntu4) lucid; urgency=low + + * fix LP: #443147 - Firefox on ARM inappropriately adds scroll bars to many + frames and images; this is a workaround that forces -O2 for the whole + mozilla tree build on armel; the scroll bar only manifests on lucid toolchain + when using the upstream optimization flag mix + - update debian/rules + + -- Alexander Sack <asac@ubuntu.com> Wed, 21 Apr 2010 17:14:28 +0200 + +firefox (3.6.3+nobinonly-0ubuntu3) lucid; urgency=low + + [ Jamie Strandboge <jamie@ubuntu.com> ] + * AppArmor: add read access to /etc/xul-ext/**, now needed by adblock + + [ Chris Coulson <chris.coulson@canonical.com> ] + * Create checksums for NSS libraries to make FIPS mode work (LP: #559881) + - update debian/rules + + -- Chris Coulson <chris.coulson@canonical.com> Tue, 13 Apr 2010 22:20:28 +0100 + +firefox (3.6.3+nobinonly-0ubuntu2) lucid; urgency=low + + [ Chris Coulson <chris.coulson@canonical.com> ] + * Fix LP: #526291 - abrowser menu entry has Firefox icon. After changing the + branding in common-post-build-arch, ensure that the firefox icons in + dist/bin/icons are replaced with the abrowser icons + - update debian/rules + * Fix LP: #408238 - does not provide gnome-www-browser + - update debian/firefox-gnome-support.postinst.in + - add debian/firefox-gnome-support.prerm.in + - update debian/rules + * Update Google and Yahoo! search URL's + - add debian/patches/ubuntu_codes_google.patch + - update debian/patches/series + - update debian/firefox.js + * Fix LP: #520166 - Restore ability to set a preferred plugin for a given + mime-type, which regressed since we are not using the system xulrunner + - add debian/patches/bzXXX_plugin_for_mimetype_pref.patch + - update debian/patches/series + * Fix LP: #557640 - nrf-003 testcase failed Default "Welcome to Ubuntu" page + doesn't appear without connectivity - re-enable the NetworkManager + integration + - update debian/firefox.js + * Fix LP: #541951 - Firefox 3.6 does not honour lockPref - resurrect the + patch used in xulrunner to reimplement this + - add debian/patches/bz467738_att351145_lockPref_everywhere.patch + - update debian/patches/series + + [ Jamie Strandboge <jamie@ubuntu.com> ] + * AppArmor: + - add apturl (LP: #558432) + + -- Chris Coulson <chris.coulson@canonical.com> Fri, 09 Apr 2010 12:29:53 +0100 + +firefox (3.6.3+nobinonly-0ubuntu1) lucid; urgency=low + + * New upstream release v3.6.3 (FIREFOX_3_6_3_RELEASE) + + [ Jamie Strandboge <jamie@ubuntu.com> ] + * AppArmor: + - add leafpad and mousepad text editors for XFCE users (LP: #543587) + + [ Micah Gersten <micahg@ubuntu.com> ] + * fix LP: #548866 - forgets middlemouse.contentLoadURL on upgrade; add patch + from xulrunner-1.9.1 + - update debian/patches/series + - add debian/patches/lp548866_bz467766_att351173-dont-reset-user-prefs-on-upgrade.patch + + [ Chris Coulson <chris.coulson@canonical.com> ] + * Add a cairo LCD filter to use Freetype LCD colour filtering features, + based on the same patch applied to our system cairo package. Thanks to + Marc Deslauriers for helping to make this work. (LP: #512615) + - add debian/patches/lp512615_cairo_lcd_filter.patch + - update debian/patches/series + * Fix LP: #546490 - "Firefox will not start in debug mode" + - update debian/firefox.sh.in + * Fix a build issue installing ubuntu-abrowser.js when building with + DEB_MIN_SYSDEPS=0 + - update debian/rules + + -- Chris Coulson <chris.coulson@canonical.com> Fri, 02 Apr 2010 16:44:02 +0100 + +firefox (3.6.2+nobinonly-0ubuntu1) lucid; urgency=low + + * New upstream release v3.6.2 (FIREFOX_3_6_2_RELEASE) + + [ Felix Geyer <debfx-pkg@fobos.de> ] + * Rebase mozilla-kde.patch for 3.6.2 + - update debian/patches/mozilla-kde.patch + + [ Jamie Strandboge <jamie@ubuntu.com > ] + * AppArmor profile cleanup for Lucid users: + - remove sys_ptrace now that the kernel DTRT (LP: #498317) + - don't use @{PROC}/[0-9]*/mounts or /etc/gnome/defaults.list (part of + gnome abstraction now) + - don't use @{PROC}/[0-9]*/maps (part of base abstraction) + - don't use /etc/sound (part of audio abstraction) + - use 'owner' for Desktop and all dot files and directories in @{HOME} + - use ubuntu-bittorrent-clients abstraction + - use ubuntu-media-players abstraction + - allow access to xubuntu default app list (LP: #500231) + - add ark and xarchiver for KDE and XFCE archive managers + - add thunar for XFCE + - add editors supported by It's All Text, thanks to James Troup + (LP: #507711) + - allow RealPlayer plugin and access to /usr/local/lib (LP: #501822) + - allow Ux for scim and scim-bridge + - allow ix for gst-plugin-scanner + * ship different AppArmor profiles for different releases: + - move usr.bin.firefox.apparmor.in to usr.bin.firefox.apparmor.9.10 + - add usr.bin.firefox.apparmor.10.04 + - debian/rules: ship AppArmor profile based on release: + + add DISTRIB, DISTRIB_VERSION_MAJOR and DISTRIB_VERSION_MINOR + + ship 9.10 profile for Karmic and under and 10.04 profile for Lucid + and later + * update AppArmor profile to transition to a java child profile rather + than Ux. This has the added benefit of restricting java a bit more than + before. This is needed since the java plugins are expecting certain + environment variables to be present, which get scrubbed with Ux. 'cx' + doesn't remove these from the environment but allows for better profiling + over 'ux'. Thanks to John Johansen for discussion and idea. (LP: #484148) + + [ Alexander Sack <asac@ubuntu.com> ] + * fix LP: #518422 - Firefox does not start with certain addons installed; + don't normalize paths for xpti.dat + - add debian/patches/lp518422.patch + - update debian/series + + [ Micah Gersten <micahg@ubuntu.com> ] + * Bump minimum system NSS to 3.12.6 after upstream landing of (bmo: 545755) + aka Update Mozilla stable branches to NSS 3.12.6 and minimal support for + RFC 5746 + - update debian/rules + * Really fix FTBFS for sparc; Add configure flag to correct variable + - update debian/rules + + -- Micah Gersten <micahg@ubuntu.com> Wed, 24 Mar 2010 01:17:46 -0500 + +firefox (3.6+nobinonly-0ubuntu6) lucid; urgency=low + + [ Jamie Strandboge <jamie@ubuntu.com> ] + * adjust AppArmor profile to allow scim + + [ Felix Geyer <debfx-pkg@fobos.de>] + * Apply KDE integration from openSUSE (LP: #494067) + - add debian/patches/mozilla-kde.patch + - add debian/patches/firefox-kde.patch + - update debian/patches/series + - update debian/rules + * Add kmozillahelper to suggests of firefox + - update debian/control + + [ Kees Cook <kees@ubuntu.com> ] + * fix LP: #531581 - cannot report bugs or crashes when profile names contains + spaces; concatenate non alnum characters in profile name for apport use + - update debian/apport/firefox.py + + [ Micah Gersten <micahg@ubuntu.com> ] + * fix LP: #531895 - Firefox isn't in Ubuntu Software Center's "Internet" or + "Web Browsers" sections; Add Internet and WebBrowser Categories to .desktop + - update debian/abrowser.desktop + - update debian/firefox-final.desktop + - update debian/firefox-namoroka.desktop + * fix FTBFS on sparc; disable jit on sparc until bmo 502369 is fixable + - update debian/rules + + -- Micah Gersten <micahg@ubuntu.com> Sat, 06 Mar 2010 23:47:38 -0600 + +firefox (3.6+nobinonly-0ubuntu5) lucid; urgency=low + + [ Micah Gersten <micahg@ubuntu.com> ] + * fix LP: #514108 - Cookie Accept Dialog Not Shown on Firefox 3.6; install chrome/comm.* libraries + - update debian/rules + * fix LP: #525181 - "Make a Support Request to the Ubuntu Community" bookmark + woefully out of date; update bookmark + - update debian/patches/ubuntu_bookmarks.patch + + [ Felix Geyer <debfx-pkg@fobos.de> ] + * fix LP: #396786 - Default theme missing in Firefox 3.6 + - update debian/firefox.install + + [ Alexander Sack <asac@ubuntu.com> ] + * use preference way to set yahoo search code 'chr-ubuntu-os' rather + than patching source + - update debian/firefox.js + - delete debian/patches/ubuntu_codes_yahoo.patch + - update debian/patches/series + + -- Alexander Sack <asac@ubuntu.com> Mon, 22 Feb 2010 12:53:08 +0100 + +firefox (3.6+nobinonly-0ubuntu4) lucid; urgency=low + + * fix LP: #523569 - No search providers or default search provider + in 3.6+nobinonly-0ubuntu3; fix syntax issue in bugfix for bmo 534663 + - update debian/patches/bz534663_attXXX_normalize_distribution_searchplugins.patch + + -- Alexander Sack <asac@ubuntu.com> Thu, 18 Feb 2010 03:16:19 +0100 + +firefox (3.6+nobinonly-0ubuntu3) lucid; urgency=low + + [ Alexander Sack <asac@ubuntu.com> ] + * fix LP: #520963 - sysprefs not honoured since firefox is built without + system xulrunner; resurrect the patch we ship in xulrunner + - add debian/patches/add_syspref_dir.patch + - update debian/patches/series + * fix LP: #520682 - Only search provider is Ask.com; set en-US as + distribution.searchplugins.defaultLocale in syspref firefox.js + - update debian/firefox.js + * fix LP: #428306 - default search engines are removed and readded (keywords + wiped) with upgrade + - add debian/patches/bz534663_attXXX_normalize_distribution_searchplugins.patch + - update debian/patches/series + * add ubuntu fr code for yahoo (en-US) searchplugin + - add debian/patches/ubuntu_codes_yahoo.patch + - update debian/patches/series + + [ Micah Gersten <micahg@ubuntu.com> ] + * Rename apport hook to firefox.py (unversioned) + - rename debian/apport/firefox-3.6.py => debian/apport/firefox.py + * Update apport hook to pull from unversioned profile directory + * Update apport hook to report on non-distro package and tag PPA + * Collect version info for firefox/abrowser packages + - update debian/apport/firefox.py + * Install apport hook again + - update debian/firefox.install + + [ Jamie Strandboge <jamie@ubuntu.com> ] + * debian/firefox.postinst.in: move aside the old firefox-3.5 AppArmor + profile + + -- Alexander Sack <asac@ubuntu.com> Wed, 17 Feb 2010 21:48:12 +0100 + +firefox (3.6+nobinonly-0ubuntu2) lucid; urgency=low + + [ Alexander Sack <asac@ubuntu.com> ] + * fix firefox-3.5-gnome-support transitional package typo; depend + on firefox-gnome-support instead of firefox-3.5-gnome-support + - update debian/control + + [ Michael Vogt <mvo@ubuntu.com> ] + * add missing Replace: firefox-3.0 for the firefox-branding package + (LP: #518747). This fixes a upgrade issues from hardy to lucid. + - update debian/control + + [ Jamie Strandboge <jamie@ubuntu.com> ] + * debian/firefox.postinst.in: + - remove AppArmor profile from dailies on upgrades (LP: #512470) + - remove extraneous -T -W from apparmor_parser + - check for disabled profile ourselves, since apparmor_parser on Ubuntu + 9.04 and earlier didn't honor the disable/ directory + * debian/firefox.preinst.in: unconditionally disable the AppArmor profile + on Ubuntu 9.04 and earlier, since it requires abstractions found only + in 9.10 + * debian/control: have firefox Depends on lsb-release (needed in preinst) + * debian/usr.bin.firefox.apparmor.in: + - adjustments in rules for name change (LP: #513160) + - allow /usr/bin/tr + + [ Micah Gersten <micahg@ubuntu.com> ] + * Add replaces to firefox-branding on kubuntu-firefox-installer (LP: #439431) + - update debian/control + * Add firefox 3 transitional packages and Replaces/Provides/Conflicts + (LP: #513074) + - update debian/control + * Don't install firefox.xml for adding entries to + gnome-default-applications-properties (LP: #519606) + - update debian/control + * Update rosetta template name to firefox-3.6 + - update debian/translation-support/install.rdf.in + * Update EM_TRANSLATION variables for firefox 3.6 + - update debian/rules + + -- Micah Gersten <micahg@ubuntu.com> Wed, 10 Feb 2010 14:52:12 -0600 + +firefox (3.6+nobinonly-0ubuntu1) lucid; urgency=low + + * New upstream release v3.6 (FIREFOX_3_6_RELEASE) + + fix LP: #449744 - Firefox crashes when attempting to load Firebug 1.5 + + fix LP: #66015 - Duplicate spell checking dictionaries for every entry + + fix LP: #132938 - tooltips dont work in sidebar + + fix LP: #195698 - Password asked separately for each tab that requires it + (proxy) + + fix LP: #239462 - tooltips disappear too fast + + fix LP: #385816 - Resize corner grab stays visible after maximize + + fix LP: #429476 - firefox crash on javascript page + + fix LP: #432876 - Icons missing in Firefox searchbox drop down list + + fix LP: #486284 - maxlength on input box can be overriden by autocomplete + + fix LP: #501393 - Integrate Firefox notifications with notify-osd bling + + [ H. Montoliu <hmontoliu@ubuntu.com> ] + * fix LP: #361052 - firefox apport hook fails to retrieve pluginreg.dat file + * update debian/apport/firefox-3.6.py - removed unused code and minor refactoring. + + [ Fabien Tassin <fta@ubuntu.com> ] + * Update the location of the upsteam branch now that 3.6/Namoroka has its own + branch, and trunk moved on to 3.7 + - update debian/mozclient/firefox-3.6.conf + * Use Namoroka instead of Shiretoko as brand name and use it for snapshots. + Name it Namoroka in the Preferred Application UI too + - update debian/firefox-3.6-shiretoko.desktop => debian/firefox-3.6-namoroka.desktop + - update debian/firefox-3.6.xml + - update debian/rules + * Target the 'default' branch instead of tip + - add debian/moz-rev.sh + - update debian/mozclient/firefox-3.6.conf + * Add firefox 3.6 to the list of Preferred Applications in Gnome + - add debian/firefox-3.6.xml + - update debian/firefox-3.6-gnome-support.install + * Add ${misc:Depends} to all non-transitional packages, make firefox-3.6-dbg + depend on firefox-3.6 with the exact same version, move -dbg packges to + priority extra and add firefox-3.6-gnome-support-dbg + - update debian/control + * Update diverged patches: + - update debian/patches/browser_branding.patch + - update debian/patches/firefox-profilename + - update debian/patches/ubuntu_bookmarks.patch + - update debian/patches/lp185622_system_path_default_browser.patch + - update debian/patches/dont_depend_on_nspr_sources.patch + + [ Alexander Sack <asac@ubuntu.com> ] + * add libnotify-dev to build-depends + - update debian/control + * add libiw-dev to build-depends to fix build failure + - update debian/control + * until we move searchplugins to a separate package provided only by the current default + firefox, we need to make firefox-3.6 replace all the older firefox binary packages: + firefox-3.5, firefox-3.2, firefox-3.1, firefox-3.0 + - update debian/control + * implement MIN_SYS_DEPS approach that does not use system xulrunner + and only a minimal set of system dependencies. + + drop patches not required anymore: + - delete debian/patches/dont_depend_on_nspr_sources.patch + - update debian/patches/series + + update browser directory provider patch + - update debian/patches/bz515232_att399338_distro_locale_searchplugins.patch + + move .install lines that depend on whether MIN_SYS_DEPS is used or not + to debian/rules in ifneq (,$(MIN_SYS_DEPS)) blocks + - update debian/rules + - update debian/firefox-3.5.install + + ship gnome support .so's inside of the main package, but keep dependencies in + the (now empty) gnome-support package; to achieve this, we first install + the gnome support files in the -gnome-support package and move them to the + main package _after_ shlib depends where generated + - update debian/rules + + do not build-depend on xulrunner dev package anymore; local xulrunner builds + with MIN_SYS_DEPS=0 should still work though + - update debian/control + + make firefox-3.5 conflict firefox-3.5-gnome-support as it shipps the gnome + files directly now + - update debian/control + * add patch for armv7 support + - add debian/patches/bz532198_lp488354_ns_invokebyindex_not_thumb2_safe.patch + - update debian/patches/series + * move to unversioned binary and source package name for "archive" firefox + + generalize final version dependent pieces in debian/rules + - update debian/rules + + update mozclient/ files to create unversioned sources/tarballs + - rename debian/mozclient/firefox-3.6.conf => debian/mozclient/firefox.conf + - update debian/mozclient/firefox.conf + - rename debian/mozclient/firefox-3.6.mk => debian/mozclient/firefox.mk + + rename and update previously versioned debhelper files + - rename debian/firefox-3.6-dev.install => debian/firefox-dev.install + - rename debian/firefox-3.6-dev.links => debian/firefox-dev.links + - rename debian/firefox-3.6-gnome-support.install => debian/firefox-gnome-support.install + - rename debian/firefox-3.6-gnome-support.postinst.in => debian/firefox-gnome-support.postinst.in + - rename debian/firefox-3.6.dirs => debian/firefox.dirs + - rename debian/firefox-3.6.install => debian/firefox.install + - update debian/firefox.install + - rename debian/firefox-3.6.links => debian/firefox.links + - update debian/firefox.links + + rename versioned maintainer scripts + - rename debian/firefox-3.6.postinst.in => debian/firefox.postinst.in + - rename debian/firefox-3.6.postrm.in => debian/firefox.postrm.in + - rename debian/firefox-3.6.preinst.in => debian/firefox.preinst.in + - rename debian/firefox-3.6.prerm.in => debian/firefox.prerm.in + + rename and update previously versioned .desktop, gnome helper and other debian + integration files + - rename debian/abrowser-3.6.desktop => debian/abrowser.desktop + - rename debian/firefox-3.6-final.desktop => debian/firefox-final.desktop + - update debian/firefox-final.desktop + - rename debian/firefox-3.6-minefield.desktop => debian/firefox-minefield.desktop + - update debian/firefox-minefield.desktop + - rename debian/firefox-3.6-namoroka.desktop => debian/firefox-namoroka.desktop + - update debian/firefox-namoroka.desktop + - rename debian/firefox-3.6.menu => debian/firefox.menu + - update debian/firefox.menu + - rename debian/firefox-3.6.xml => debian/firefox.xml + - update debian/firefox.xml + - rename debian/firefox-3.6-restart-required.update-notifier => debian/firefox-restart-required.update-notifier + - update debian/firefox-restart-required.update-notifier + - update debian/control + + disable patches for versioned directories and binaries + - update debian/patches/series + + add fix issues in libpr0n for make syntax issues after lucid dash/bash update; + patch by Kees Cook <kees@ubuntu.com> + - add debian/patches/fix-build-glitch.patch + - update debian/patches/series + * ease transition for daily firefox-3.6 users by adding conflicts/replaces on firefox-3.6-gnome-support + to firefox binary package which now ships bits previously in there. + - update debian/control + * update to firefox.sh.in start script from firefox-3.5 branch and add firefox-3.6 transition + accordingly; also adjust a bunch of wrongly worded debug messages + - update debian/firefox.sh.in + * fix version number used in profile migration dialog + - update debian/migrator/main.c + * fix wrapper startscript to properly handle all-static firefox build + - update debian/firefox.sh.in + * fix DEBIAN_NAME_OTHER to work for non-versioned abrowser main packages + - update debian/rules + * fix startscript for abrowser; set CMDNAME_USER=firefox for run-mozilla.sh; + and also use META_NAME to guess the -bin binary + - update debian/firefox.sh.in + * add CMDNAME_USER feature to overwrite cmdname for abrowser in run-mozilla.sh + - add debian/patches/abrowser_run_mozilla.patch + - update debian/patches/series + * fix abrowser.desktop; use unversioned icon and exec name + - update debian/abrowser.desktop + * copy abrowser.desktop translations from firefox-3.5.head branch + - update debian/abrowser.desktop + * add firefox-2* transitional packages for hardy users + - update debian/control + + [ Micah Gersten <micahg@ubuntu.com> ] + * Rebase/minor code change after upstream landing of unified manifest (bmo: 511642) + - update debian/patches/awesome_browser_branding_install.patch + - update debian/patches/browser_branding.patch + - update debian/patches/bzXXX_moz_app_name_inconsistencies.patch + + [ Jamie Strandboge <jamie@ubuntu.com> ] + * add AppArmor profile (disabled by default) + - debian/firefox-3.6.dirs: add etc/apparmor.d/disable + - add debian/firefox-3.6.preinst.in: disable the profile on new installs, + installs where the last modified profile is disabled and upgrades to + this version + - debian/firefox-3.6.postinst.in: reload profile + - add debian/firefox-3.5.postrm.in: cleanup force-complain and disable + directories + - add debian/usr.bin.firefox.apparmor.in + - add debian/README.Debian.in with note about AppArmor + - debian/apport/firefox-3.6.py: add AppArmor information if the profile is + not disabled + - debian/rules: install profile and update subst_files + - allow dirname and pwd. Thanks to Thomas Templin. (LP: #510644) + - allow the IBM jre + - debian/usr.bin.firefox.apparmor.in: use @LIBDIR@/firefox-*bin as binary + confined by AppArmor + + [ Kees Cook <kees@ubuntu.com> ] + * enable PIE build for stronger security (LP: #507744) + - update debian/rules + - update debian/control + + -- Alexander Sack <asac@ubuntu.com> Sat, 23 Jan 2010 16:46:32 +0100 + +firefox-3.5 (3.5.7+nobinonly-0ubuntu1) lucid; urgency=low + + * New upstream release v3.5.7 (FIREFOX_3_5_7_RELEASE) + - see USN-878-1 + + [ Benjamin Drung <bdrung@ubuntu.com> ] + * Add metadata for mozilla-devscripts + - update debian/control + + -- Micah Gersten <micahg@ubuntu.com> Tue, 05 Jan 2010 18:02:04 -0600 + +firefox-3.5 (3.5.6+nobinonly-0ubuntu1) lucid; urgency=low + + * New upstream release v3.5.6 (FIREFOX_3_5_6_RELEASE) + - see USN-874-1 + + [ Micah Gersten <launchpad@micahscomputing.com> ] + * Bump minimum system cairo to 1.8.8 + - update debian/rules + * Fix .desktop Name field for Slovak translation (LP: 448683) + - update debian/firefox-3.5-final.desktop + * Fix .desktop Name field for Estonian and Arabic translations + (LP: 419507, LP: 321239) + - update debian/firefox-3.5-final.desktop + + [ Jamie Strandboge <jamie@ubuntu.com> ] + * AppArmor fixes: + - allow access to nautilus, to allow "Open containing folder" to work + (LP: #452591) + - allow access for deluge (LP: #455792) + - work better with KDE by adding kde abstraction, allow access to soffice, + allow access to okular and read access to /etc/fstab (for print dialog) + (LP: #447006) + - allow access to acroread (LP: #473268) + - allow access to eog (LP: #464016) + - allow access to transmission (LP: #476299) + - deny noisy write attempts to deny /usr/lib/xulrunner-*/components/*.tmp + as seen with 'firefox --help') + - deny noisy read to /.suspended (when navigating directories) + - allow access to /usr/bin/liferea-add-feed (LP: #488851) + - allow access to azureus (LP: #482677) + - don't require 'owner' for /media (LP: #479580) + - adjust AppArmor profile binary globbing to match other branches + - allow ixr access to sed (for first runs) + + [ Alexander Sack <asac@ubuntu.com> ] + * bump lower bound for system sqlite3 to >= 3.6.16.1 + - update debian/rules + + -- Alexander Sack <asac@ubuntu.com> Wed, 16 Dec 2009 00:43:08 +0100 + +firefox-3.5 (3.5.5+nobinonly-0ubuntu2) lucid; urgency=low + + * New upstream release v3.5.5 (FIREFOX_3_5_5_RELEASE) + * fixes regressions/crashes + + -- Alexander Sack <asac@ubuntu.com> Mon, 09 Nov 2009 11:40:35 +0100 + +firefox-3.5 (3.5.4+nobinonly-0ubuntu1) lucid; urgency=low + + * New upstream release v1.9.1.4 (FIREFOX_3_5_4_RELEASE) + - see USN-853-1 + + [ Alexander Sack <asac@ubuntu.com> ] + * use awesome-browser-branch-3.5 during tarball creation + - update debian/mozclient/firefox-3.5.conf + * drop branding patch for lp:396156 as new upstream tarballs + automatically contain this fix now. + - delete debian/patches/lp396156_prepatch_abrowser_branding.patch + - update debian/patches/series + + [ Fabien Tassin <fta@ubuntu.com> ] + * Don't enable the AppArmor profile by default for backports coming + from the Mozilla daily PPA. It's still possible for users to + enable that themselves though + - update debian/firefox-3.5.preinst.in + + -- Alexander Sack <asac@ubuntu.com> Mon, 09 Nov 2009 11:21:28 +0100 + +firefox-3.5 (3.5.3+build1+nobinonly-0ubuntu6) karmic; urgency=low + + [ Fabien Tassin <fta@ubuntu.com> ] + * fix LP: #454166 - target the 'default' branch instead of tip + - add debian/moz-rev.sh + - update debian/mozclient/firefox-3.5.conf + + [ Alexander Sack <asac@ubuntu.com> ] + * fix LP: #455504 - abrowser does not run from Applications Menu; + create the unversioned link in debian/rules like we do for the + firefox name + - update debian/rules + * fix LP: #455517 - supersede firefox 3.0 and xulrunner-1.9 in karmic; + add transitional packages and add Conflicts/Replaces/Provides + accordingly. + - update debian/control + * fix LP: #396156 - Help→About does not function (abrowser-3.5, + jaunty-proposed); we prepatch the required changes to + browser/branding/awesome-browser/ tree taken from the 3.5 branding + branch: lp:~mozillateam/firefox/awesome-browser-branding-3.5 + - add debian/patches/lp396156_prepatch_abrowser_branding.patch + - update debian/patches/series + + -- Alexander Sack <asac@ubuntu.com> Tue, 20 Oct 2009 10:42:56 +0200 + +firefox-3.5 (3.5.3+build1+nobinonly-0ubuntu5) karmic; urgency=low + + * fix LP: #411691 - many Exception... "update.locale file doesn't exist" in + console"; patch by Micah Gersten <launchpad@micahscomputing.com> + - update debian/rules + + -- Alexander Sack <asac@ubuntu.com> Thu, 15 Oct 2009 02:49:12 +0200 + +firefox-3.5 (3.5.3+build1+nobinonly-0ubuntu4) karmic; urgency=low + + [ Fabien Tassin <fta@ubuntu.com> ] + * Bump requirement for system sqlite to >= 3.6.16 (bmo 508104) + - update debian/rules + + [ Alexander Sack <asac@ubuntu.com> ] + * 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 <jamie@ubuntu.com> ] + * 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 <asac@ubuntu.com> Thu, 15 Oct 2009 02:30:48 +0200 + +firefox-3.5 (3.5.3+build1+nobinonly-0ubuntu3) karmic; urgency=low + + [ Jamie Strandboge <jamie@ubuntu.com> ] + * disable profile on upgrades from earlier Ubuntu releases (LP: #436221) + - update debian/firefox-3.5.preinst.in + + -- Alexander Sack <asac@ubuntu.com> 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 <asac@ubuntu.com> ] + * 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 <jamie@ubuntu.com> ] + * 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 <asac@ubuntu.com> 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 <fta@ubuntu.com> ] + * 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 <asac@ubuntu.com> ] + * 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 <asac@ubuntu.com> 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 <fta@ubuntu.com> ] + * 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 <asac@ubuntu.com> 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 <asac@ubuntu.com> 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 <fta@ubuntu.com> 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 <fta@ubuntu.com> 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 <asac@ubuntu.com> 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 <asac@ubuntu.com> 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 <fta@ubuntu.com> 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 <fta@ubuntu.com> Sat, 07 Mar 2009 15:27:58 +0100 + +firefox-3.1 (3.1~b3~hg20090205r23182+nobinonly-0ubuntu1) jaunty; urgency=low + + [ Fabien Tassin <fta@ubuntu.com> ] + * 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 <asac@ubuntu.com> ] + * add lower bound for xulrunner-1.9.1-dev build-depends to >= + 1.9.1~b3~ + - update debian/control + + -- Alexander Sack <asac@ubuntu.com> 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 <fta@ubuntu.com> 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 <fta@ubuntu.com> ] + * 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 <video> tag + - update debian/control + * Drop dom-inspector, venkman and legacy firefox-{,trunk,granparadiso} + packages + - update debian/control + * Resurrect the -dbg package, at least until bug 156575 is fixed + - update debian/control + * Update diverged patches: + - update debian/patches/nspr_flags_by_pkg_config_hack.patch + - update debian/patches/bzXXX_reload_new_plugins.patch + - update debian/patches/firefox-fsh + - update debian/patches/firefox-profilename + - update debian/patches/lp185622_system_path_default_browser.patch + - update debian/patches/browser_branding.patch + * Drop patches applied upstream + - drop debian/patches/lp269656_know_your_rights.patch + (See https://bugzilla.mozilla.org/show_bug.cgi?id=456439) + - drop debian/patches/installer_use_stdout_for_missing_files.patch + - drop debian/patches/bz412610_att335369_realpath_overflow.patch + - drop debian/patches/bz436133_att322801.patch + - drop debian/patches/bz421977_att334578.patch + - update debian/patches/series + + [ Alexander Sack <asac@ubuntu.com> ] + * ship $MOZ_APP_DIR/distribution/distribution.ini + - add debian/distribution.ini + - update debian/rules + + -- Fabien Tassin <fta@ubuntu.com> Fri, 28 Nov 2008 16:02:43 +0100 + +firefox-3.0 (3.0.4+nobinonly-0ubuntu3) UNRELEASED; urgency=low + + [ Nick Ellery <nick.ellery@ubuntu.com> ] + * fix LP: #270477 - firefox-3.0-branding has errors in it's package description + - update debian/control + + -- Alexander Sack <asac@ubuntu.com> Wed, 26 Nov 2008 21:56:44 +0100 + +firefox-3.0 (3.0.4+nobinonly-0ubuntu2) jaunty; urgency=low + + * ship $MOZ_APP_DIR/distribution/distribution.ini + - add debian/distribution.ini + - update debian/rules + + -- Alexander Sack <asac@ubuntu.com> Mon, 24 Nov 2008 12:40:07 +0100 + +firefox-3.0 (3.0.4+nobinonly-0ubuntu1) jaunty; urgency=low + + * new security/stability update FIREFOX_3_0_4_RELEASE (v3.0.4) + - see USN-667-1 + + [ Fabien Tassin <fta@ubuntu.com> ] + * Fix missing comma in Build-Depends breaking older dpkg-dev + - update debian/control + + -- Alexander Sack <asac@ubuntu.com> Sun, 16 Nov 2008 17:12:57 +0100 + +firefox-3.0 (3.0.3+nobinonly-0ubuntu2) intrepid; urgency=low + + * fix LP: #282875: about:rights does not display; the latest update + of the know your right page contained illegal xml. + - update debian/patches/lp269656_know_your_rights.patch + + -- Alexander Sack <asac@ubuntu.com> Mon, 20 Oct 2008 17:37:05 +0200 + +firefox-3.0 (3.0.3+nobinonly-0ubuntu1) intrepid; urgency=low + + [ Steve Langasek <steve.langasek@ubuntu.com> ] + * Fix the wrapper script to handle all possible invocations. + LP: #275410. + + [ Fabien Tassin <fta@ubuntu.com> ] + * Remove some hardcoded 3.0 to make the merge in the 3.1 branch smoother + - update debian/rules + - update debian/firefox.sh.in + * Fix abrowser symlink in libdir which must be versioned unless control + ships a meta package. Add versioned symlinks in libdir for firefox and + abrowser now that the launcher script uses $0 + - update debian/rules + * Fix the desktop file for abrowser to call it abrowser-3.0 instead + of firefox-3.0, and move the desktop icons to the branding packages + - update debian/rules + * Add a ubuntu-abrowser.js file dedicated to abrowser and set useragent + to Firefox/version + - add debian/ubuntu-abrowser.js.tmpl + - update debian/rules + * Fix typo in branding patch for unofficial branding + - update debian/patches/browser_branding.patch + + [ Alexander Sack <asac@ubuntu.com> ] + * add ubuntu code to preferences for yahoo searchplugin + - update debian/firefox.js + * fix gnome integration systempath patch in such a way that it properly + refers to "abrowser" and not awesome-browser + - update debian/patches/lp185622_system_path_default_browser.patch + * update aboutRights.xhtml to v1 + - update debian/patches/lp269656_know_your_rights.patch + * resurrecting ubuntu default bookmarks + - update debian/patches/browser_branding.patch + - update debian/patches/series + * add explicit minimum version to firefox-3.0 depend on firefox-3.0-branding + and abrowser-3.0-branding (>= 3.0.3+nobinonly-0ubuntu1), to reflect + that the desktop launcher icon has been moved from firefox-3.0 to + -branding + - update debian/control + + -- Fabien Tassin <fta@ubuntu.com> Mon, 13 Oct 2008 16:05:14 +0200 + +firefox-3.0 (3.0.3+build1+nobinonly-0ubuntu1) intrepid; urgency=low + + new regression fix release (v3.0.3 build1) + - see USN-645-3 + * fixes LP: #270429: [MASTER] passwords lost from 3.0.1 to 3.0.2 + * improve about:rights wording slightly to read "... offers optional + web site ..." while previously it read "... uses web sitweb sitee ..."; + thanks to PJ for the initial suggestion + - update debian/patches/lp269656_know_your_rights.patch + + -- Alexander Sack <asac@ubuntu.com> Thu, 25 Sep 2008 12:01:59 +0200 + +firefox-3.0 (3.0.2+build6+nobinonly-0ubuntu2) intrepid; urgency=low + + * fix LP: #273907 - abrowser does not start: :$pkglibdir/abrowser link + missing; we introduce the proper link in the firefox-3.0 package + - update debian/rules + * fix LP: #269795 - abrowser shouldn't display the EULA; we fix this by + using brand.properties to determine whether we have official branding or + not. In turn the about:rights notification only gets displayed when + official build is running. + - update debian/patches/lp269656_know_your_rights.patch + * fix LP: #206191 - Firefox 3 "set as Desktop background" does not work + properly; we cherry-pick latest upstream patch from bugzilla + - add debian/patches/bz421977_att334578.patch + - update debian/patches/series + + -- Alexander Sack <asac@ubuntu.com> Wed, 24 Sep 2008 18:48:23 +0200 + +firefox-3.0 (3.0.2+build6+nobinonly-0ubuntu1) intrepid; urgency=low + + Security/Stability update (v3.0.2 build6) + - see USN-645-1 + + [ Fabien Tassin <fta@ubuntu.com> ] + * Add a -g/--debug switch to the launcher script to start firefox inside gdb. + Note that it must be specified first on the command line. + - update debian/firefox.sh.in + * Make the branding patch also work for non official branding. + - update debian/patches/browser_branding.patch + + [ Alexander Sack <asac@ubuntu.com> ] + * Fix branding code in debian/rules: a) fix .desktop target filename + to be unversioned if and only if control ships a meta package name + - update debian/rules + * Don't cp debian/$(DESKTOP) debian/$(DEBIAN_APP_NAME).desktop in + pre-build:: which is a left over from previous branding split + approaches and unused now. + - update debian/rules + * Use APPNAME=`basename $0` in firefox start script; fix bug that would + trick abrowser into restarting itself through the "firefox" command. + - debian/firefox.sh.in + * Fix LP: #269656 - AN IRRELEVANT LICENSE IS PRESENTED TO + YOU FREE-OF-CHARGE ON STARTUP; we implement the "Know Your Rights..." + approach based on the mocked-up's published by mozilla + http://blog.lizardwrangler.com/2008/09/17/mock-ups-available-for-notices-previously-was-eula/ + - add debian/patches/lp269656_know_your_rights.patch + - update debian/patches/series + * abrowser Provides: firefox to ease transition of rdepends + - update debian/control + + -- Alexander Sack <asac@ubuntu.com> Tue, 23 Sep 2008 17:44:47 +0200 + +firefox-3.0 (3.0.2+build3+nobinonly-0ubuntu2) intrepid; urgency=low + + [ Alexander Sack ] + * new patch that adds canonical affiliate code to en-US amazon searchplugin + - add debian/patches/ubuntu_codes_amazon.patch + - update debian/patches/series + * rename the webbrowser and webbrowser-3.0-branding package to abrowser and + abrowser-3.0-branding; in turn we rename the desktop file and the links + to the binaries + - rename debian/webbrowser-3.0.desktop + - update debian/control + - update debian/rules + - update debian/firefox-3.0.links + + -- Alexander Sack <asac@ubuntu.com> Thu, 11 Sep 2008 17:25:42 +0200 + +firefox-3.0 (3.0.2+build3+nobinonly-0ubuntu1) intrepid; urgency=low + + [ Alexander Sack <asac@ubuntu.com> ] + * Fix: LP #246775 - "wrong user-agent string in hardy build" by adding proper + build-depends + - update debian/control + * Fix: LP #240880 - Remove "previously known as" paragraph + - update debian/control + * webbrowser-3.0-branding split using the awesome branding (LP: #263938) + + we add a new .desktop file to the source and teach the debian/rules + code about it + - add debian/webbrowser-3.0.desktop + - update debian/rules + + we magically run config.status on just the Makefiles of our branding + in the binary-install/webbrowser-3.0-branding target + - update debian/rules + + we introduce a firefox-3.0-branding package as well as an + webbrowser-3.0-branding package in control; webbrowser-3.0-branding + conflicts firefox-3.0-branding, while firefox-3.0 depends on + firefox-3.0-branding | webbrowser-3.0-branding; we update the firefox + meta package to depend on the firefox-3.0-branding; we add a new + metapackage "webbrowser" that tracks the stable webbrowser branch, just + like firefox, but with the difference that it depends on + webbrower-3.0-branding package + - update debian/control + + higher mozilla-devscripts bar to 0.10 to reflect that we need that + version to properly produce awesome-browser branded original tarballs + - update debian/control + + patch browser/installer packages-static file to install awesome-browser + content and locale bits + - add debian/patches/awesome_browser_branding_install.patch + - update debian/patches/series + + patch firefox to ship branding chrome bits in separate jar files. + - debian/patches/browser_branding.patch + - debian/patches/series + + install firefox branding bits to the firefox-3.0-branding package + and remove them from the firefox-3.0 package so that we ship the awesome + browser chrome by default; in turn we fix that not all awesome branding + bits were available by doing a full make install + DESTDIR=debian/tmp-awesome. + - update debian/rules + - update debian/firefox-3.0.install + + dpkg-divert non-chrome branding bits; add firefox-3.0-branding.preinst.in + and firefox-3.0-branding.postrm.in maintainer script templates and + register them for substitution in debian/rules; for chrome the trick is + to not divert the whole branding, but just disable the + awesome-browser.manifest when the firefox-3.0-branding package gets + installed; doing so disables the locales override and unhooks the + awesome branding in a way that the offcial branding will take over. We + also try to cleanup diverts that have disappeared during upgrade in + old-postrm of the branding package; this is required to properly cleanup + during major firefox version upgrades - where pkglibdir changes. + - add debian/firefox-3.0-branding.postrm.in + - add debian/firefox-3.0-branding.preinst.in + - update debian/rules + + introduce rules variable APP_NAME_OTHER, which is used as a placeholder + for awesome-browser + - update debian/rules + + special case when \"Web Browser\" is found + to be shortBrandName. In that case we use /usr/bin/webbrowser as + exePath in nsGNOMEShellService (for settin default browser) + - update debian/patches/lp185622_system_path_default_browser.patch + + ship /usr/bin/webbrowser and /usr/bin/webbrowser-3.0 links in + firefox-3.0 package + - update debian/firefox-3.0.links + + ship awesome branding in webbrowser-3.0-branding package + - update debian/rules + + [ Fabien Tassin ] + * Drop more firefox-3.0 references to ease merge with the 3.1 branch + - update debian/rules + * Fix buffer overflow in realpath() at runtime and drop -U_FORTIFY_SOURCE + from CPPFLAGS (LP: #263014) + - add debian/patches/bz412610_att335369_realpath_overflow.patch + - update debian/patches/series + + -- Alexander Sack <asac@ubuntu.com> Tue, 02 Sep 2008 11:59:53 +0200 + +firefox-3.0 (3.0.1+build1+nobinonly-0ubuntu2) intrepid; urgency=low + + RELEASE 3.0.1+build1+nobinonly-0ubuntu2 to ubuntu/intrepid + * Fix: #246775 - "wrong user-agent string in hardy build" by adding proper + build-depends + - update debian/control + + -- Alexander Sack <asac@ubuntu.com> Sat, 26 Jul 2008 16:08:26 +0200 + +firefox-3.0 (3.0.1+build1+nobinonly-0ubuntu1) intrepid; urgency=low + + * LP: #247494 - new security/stability release (v3.0.1 build1) + - see USN-626-1 + + [ Alexander Sack <asac@ubuntu.com> ] + * bump build dependencies for xulrunner 1.9 dev to >= 1.9+nobinonly-0ubuntu3~ + in order to force jemalloc build; bump binary depends accordingly + - update debian/control + * add useragent config file and install it in $pkglibdir/defaults/preferences; + replace @VENDOR@, @VENDOR_SUB@ and @VENDOR_COMMENT@ tokens with lsb_release + id, release, codename + - add debian/ubuntu-useragent.js.tmpl + - update debian/rules + * bump maxVersion to 1.9.0.* to ease future upgrades of firefox-3.0/xulrunner-1.9 + tandem and lower minVersion to 1.9.0.1 in post-install; in turn adjust binary + and build depends accordingly. + - update debian/rules + - update debian/control + + [ Fabien Tassin <fta@sofaraway.org> ] + * Add an empty chrome.manifest in all extensions missing that + file so it prevents the "failure in Chrome Registration" popup + - update debian/rules + * Don't use wildcards to detect xulrunner paths, it fails when + more that one xulrunner is installed + - update debian/rules + * Get DEBIAN_NAME and DEBIAN_APP_NAME from changelog and make more use + of variables to make the merge with the 3.1 branch easier + - update debian/rules + - update debian/firefox-3.0.postinst.in + - update debian/firefox-3.0.prerm + + -- Alexander Sack <asac@ubuntu.com> Fri, 18 Jul 2008 17:39:57 +0200 + +firefox-3.0 (3.0+nobinonly-0ubuntu2) intrepid; urgency=low + + * New upstream release: 3.0 RC2 (LP: #237690) + + [ Alexander Sack <asac@ubuntu.com> ] + * Fix LP: #236266 - "Build Failure on HPPA architecture" by applying patch + from bugzilla https://bugzilla.mozilla.org/show_bug.cgi?id=436133 + - add debian/patches/bz436133_att322801.patch + - update debian/patches/series + * drop left-over patch that disabled parts of safe-browsing by default. + - delete debian/patches/force_safebrowsing_off.patch + - update debian/firefox.js + - update debian/patches/series + + -- Alexander Sack <asac@ubuntu.com> Tue, 10 Jun 2008 12:51:01 +0200 + +firefox-3.0 (3.0~rc1+nobinonly-0ubuntu1) intrepid; urgency=low + + * new upstream release 3.0 RC1 (LP: #233922) + + [ Fabien Tassin <fta@sofaraway.org> ] + * Bump xulrunner-1.9 dependencies to ~rc + - update debian/control + * Bump EM_TRANSLATION_VERSION and EM_TRANSLATION_{MIN,MAX}_VERSION to 3.0 + and clean-up the code to avoid unnecessary complexity + - update debian/rules + * Refresh diverged patches + - update debian/patches/bzXXX_reload_new_plugins.patch + * Fix 'Categories' field in desktop file by changing GTK into Application + to make KDE happy (LP: #220325) + - update debian/firefox-3.0-final.desktop + * Build with default gcc (hardy: 4.2, intrepid: 4.3) + - update debian/rules + - update debian/control + * Prevent EULA dialog to popup on first run by setting the browser.EULA.override + key to true + - update debian/firefox.js + * Drop LDFLAGS workaround now that jemalloc is no longer a static lib + - udate debian/rules + * Workaround multiple crashes in Intrepid caused by Intrepid shipping gcc 4.3 + with -D_FORTIFY_SOURCE=2 by default + - udate debian/rules + + [ Alexander Sack <asac@ubuntu.com> ] + * Fix LP: #218865 - "ubufox is not suggested or recommended by firefox-3.0"; + we add ubufox to recommends of firefox-3.0 package. + - update debian/control + * Fix apport hook to properly detect global gre extensions + - update debian/apport/firefox-3.0.py + * disable app.update feature in code so the auto app update feature will + never be enabled (independent from the pref setting) + - add debian/patches/ubuntu_no_app_updates.patch + - update debian/patches/series + * install firefox.cfg as an example using dh_installdocs rather than + dh_install as it wasn't used at all + - update debian/rules + + -- Fabien Tassin <fta@sofaraway.org> Wed, 21 May 2008 16:25:00 +0200 + +firefox-3.0 (3.0~b5+nobinonly-0ubuntu3) hardy; urgency=low + + * improve translation support by shipping a crafted install.rdf. We ship a + template install.rdf.in in debian/translation-support and replace the + em:{version,maxVersion,minVersion} during build. For now those versions + are maintained manually because we need maintainer attention on upgrades + considering the upstream string freeze. To increase failsafeness, we fail + the build if the version appears to be out of sync with the upstream + version in the post-install target. The install.rdf is finally added to + the zip file in the binary-post-install rule used to produce the + en-US.xpi. + - add debian/translation-support/install.rdf.in + - update debian/rules + + * remove unused debian/firefoxrc (aka /etc/firefox-3.0/firefoxrc) file from + files shipped. Its not considered by firefox startscript anymore and just + causes confusion. + - remove debian/firefoxrc + - update debian/firefox-3.0.install + + -- Alexander Sack <asac@ubuntu.com> Sun, 20 Apr 2008 15:47:10 +0200 + +firefox-3.0 (3.0~b5+nobinonly-0ubuntu2) hardy; urgency=low + + * fix "firefox-3.0 gets removed on dist-upgrade when firefox-3.0 build is + not available on mirror". We deal with this situation by dropping the + Break: field from xulrunner-1.9 and adding upper bounds on xulrunner-1.9 + to firefox-3.0 binary. + - update debian/control + + * fix extension and theme reporting in apport hook. we now list gre, + app and local extensions/themes separately + - update debian/apport/firefox-3.0.py + + * fix "update-notifier hint gets installed in postinst even when firefox is + not running" - LP: #214620. The fix now uses pgrep -x to test more + accurately for the firefox itsself. Thanks to Colin Watson for the idea. + We use the same pgrep test in the notifiers DisplayIf: expression as well. + - update debian/firefox-3.0-restart-required.update-notifier + - update debian/firefox-3.0.postinst.in + + -- Alexander Sack <asac@ubuntu.com> Tue, 15 Apr 2008 12:12:13 +0200 + +firefox-3.0 (3.0~b5+nobinonly-0ubuntu1) hardy; urgency=low + + * Firefox 3.0 Beta 5 package - "ready for prime-time"! + + * Multiple fixes and improvements to debian/rules: "rewrite substitution + rules", "bad .autoreg install path makes package ftbfs", "Firefox must not + ship reporter extension; its shipped in xulrunner-1.9", "enable + mozilla-devscript's in binary-post-install", "--disable-debug passed twice + in configure" + - update debian/rules + + * Alexander Sack <asac@ubuntu.com> + * Fabien Tassin <fta@sofaraway.org> + + * Multiple fixes to the apport hook: "remove .pyc file garbage during prerm", + "bad install path", "bad extension directories used to gather data" + - update debian/apport/firefox-3.0.py + - update debian/firefox-3.0.prerm + - update debian/firefox-3.0.install + + * Alexander Sack <asac@ubuntu.com> + * Fabien Tassin <fta@sofaraway.org> + + * Multiple fixes required by libxul linkage with jemalloc: "libjemalloc.so + cannot be installed - doesn't exist", "-Wl,-Bsymbolic-functions in LDFLAGS + cause crashes at startup" + - update debian/firefox-3.0.install + - update debian/rules + + * Fabien Tassin <fta@sofaraway.org> + + * Fix multiple misc bugs: "migration creates double dots for abandoned + profiles", "Wikipedia search plugin shipped upstream", "blocklist.xml not + installed", "use LIBDIR when touching .autoreg in postinst", "Fix restart + notification misbehaviour", "Improve package description (LP: #207199)" + - update debian/firefox.sh.in + - drop debian/wikipedia.* + - update debian/firefox-3.0.install + - update debian/rules + - update debian/firefox-3.0.postinst.in + - update debian/firefox-3.0-restart-required.update-notifier + + * Alexander Sack <asac@ubuntu.com> + * Fabien Tassin <fta@sofaraway.org> + + * Misc package housekeeping changes: "Bump xulrunner-1.9 + dependencies to b5", "Adjust patches", "desktop files not valid + (LP: #194970)", "relax dependencies on xulrunner. no upper bounds": + - update debian/control + - update debian/patches/dont_depend_on_nspr_sources.patch + - update debian/patches/nspr_flags_by_pkg_config_hack.patch + + * Fabien Tassin <fta@sofaraway.org> + + * Multiple Translation related fixes and improvements: "Reuse translations + from firefox 2 .desktop file", "include lp-export-xpi.mk from + mozilla-devscripts and export en-US.xpi to debian/lp-export-xpis/ + directory" + - update debian/firefox-final.desktop + - update debian/rules + - update debian/control + + * Alexander Sack <asac@ubuntu.com> + * Fabien Tassin <fta@sofaraway.org> + + * Fixing chrome registration issues by properly shipping + $(DEBIAN_FF3_DIR)/.autoreg and touching it in postinst maintainer scripts + - update debian/rules + - update debian/firefox-3.0.postinst.in + - add debian/firefox-3.0-gnome-support.postinst + + * Alexander Sack <asac@ubuntu.com> + * Fabien Tassin <fta@sofaraway.org> + + * fix LP: #185622 - "Firefox 3 doesn't act as the default browser"; we + always check for and use /usr/bin/firefox now. Don't use " to delimit + the parameters of the preferred browser command used to update gconf + protocol-handler. + - add debian/patches/lp185622_system_path_default_browser.patch + - update debian/patches/series + + * Alexander Sack <asac@ubuntu.com> + + * fix "New plugins only recognized _after_ restarting firefox"; the gecko + 1.9 plugin host doesn't scan plugin directories automatically for + previously not available mime-types and extensions anymore. This fix + assures that the browser receives a NewPluginInstalled through the + tabbrowser.selectedBrowser by registering a special listener before + starting the plugin installer wizard. After plugins are properly installed + we remove that listener again. + - add debian/patches/bzXXX_reload_new_plugins.patch + - update debian/patches/series + + * Alexander Sack <asac@ubuntu.com> + + -- Fabien Tassin <fta@sofaraway.org> Fri, 04 Apr 2008 21:26:23 +0200 + +firefox-3.0 (3.0~b4+nobinonly-0ubuntu1) hardy; urgency=low + + [ Fabien Tassin <fta@sofaraway.org> ] + * Bump xulrunner-1.9 dependencies to b4 + - update debian/control + * Refresh diverged patches: + - update debian/patches/dont_depend_on_nspr_sources.patch + - update debian/patches/force_safebrowsing_off.patch + * Drop extension from desktop launchers icons (LP: #190688) + - update debian/firefox-3.0-*.desktop + * Install new libjemalloc.so + - update debian/firefox-3.0.install + * Add optional support for system sqlite3 (we need >= 3.5 not in hardy) + - update debian/rules + * Fix debsearch.src to work with new packages.ubuntu.com codebase (LP: #194681) + Contributed by David Futcher <bobbocanfly@gmail.com> + - update debian/debsearch.src + * Bump gtk+ requirement to 2.10 because of the new Print Dialog + - update debian/control + * Add Polish translation to deskstop launcher (LP: #196953) + Contributed by Tomasz Dominikowski <dominikowski@gmail.com> + - update debian/firefox-3.0-final.desktop + * Change $(shell) into $(wildcard) for XUL SDK detection + - update debian/rules + * Drop DEB_AUTO_UPDATE_DEBIAN_CONTROL cdbs variable completely. It was + wrongly set to zero + - update debian/rules + * Stop build-tree/mozilla/README to be shipped as a doc by setting + cdbs DEB_INSTALL_DOCS_ALL to $(NULL) + - update debian/rules + + [ Alexander Sack <asac@ubuntu.com> ] + * reuse apport hook from firefox 2 package initially developed by Hilario J. + Montoliu <hmontoliu@gmail.com> (LP: #199666) + - add debian/apport/firefox-3.0.py + - update debian/firefox-3.0.install + + -- Alexander Sack <asac@ubuntu.com> Thu, 13 Mar 2008 16:52:36 +0100 + +firefox-3.0 (3.0~b3+nobinonly-0ubuntu4) hardy; urgency=low + + * fix firefox.desktop install (ftbfs) + - update debian/firefox-3.0.install + * fix StartupWMClass in desktop file + - update debian/firefox-3.0-final.desktop + * fix Name and Description and Exec in desktop file + - update debian/firefox-3.0-final.desktop + + -- Alexander Sack <asac@ubuntu.com> Mon, 25 Feb 2008 14:37:43 +0100 + +firefox-3.0 (3.0~b3+nobinonly-0ubuntu3) hardy; urgency=low + + * introduce transitional dummy package for firefox-libthai => firefox-3.0 + (thai line break is now done by pango) (LP: #193542) + - update debian/control + * ship firefox.desktop again to not break existing launchers (LP: #193902) + - update debian/rules + + -- Alexander Sack <asac@ubuntu.com> Mon, 25 Feb 2008 11:46:11 +0100 + +firefox-3.0 (3.0~b3+nobinonly-0ubuntu2) hardy; urgency=low + + * make aptitude happy by using versioned Replaces on firefox* + - update debian/control + * make firefox-{dom-inspector,gnome-support} meta packages depend on + firefox-3.0-* instead of xulrunner-1.9-* to improve transition behaviour. + - update debian/control + + -- Alexander Sack <asac@ubuntu.com> Thu, 14 Feb 2008 13:40:37 +0100 + +firefox-3.0 (3.0~b3+nobinonly-0ubuntu1) hardy; urgency=low + + * Firefox 3 Beta 3 release (FIREFOX_3_0b3_RELEASE) + + [ Alexander Sack ] + * use default upstream gcc tweaks for improved performance - especially of + the javascript engine + - update debian/rules + * add gtk based profile migrator dialog, build it during |pre-build| and clean + it in |clean| target of debian/rules; finally, install the binary in firefox + pkglibdir. + - add debian/migrator/main.c + - update debian/rules + * drop version suffix from MOZ_APP and application.ini (going back to + upstreams plain |firefox|) and drop patches accordingly + - drop debian/patches/firefox-fsh + - drop debian/patches/firefox-profilename + - update debian/patches/series + * install firefox binary instead of firefox-3.0 (after MOZ_APP_NAME + tweakage was dropped in on of the previous commits + - update debian/firefox-3.0.install + * reuse firefox.sh.in script to determine on whether the user was a beta + user and if thats the case ask the user (by running the profile migrator + added above) which profile to use in future + - update debian/firefox.sh.in + * fix DEBIAN_FF3_DIR, which diverged from install dir after dropping + special application name and profile dir tweaks + - update debian/rules + * drop development version disclaimer from package description and improve + the package description by stripping technical details and referrals to + other browser applications that are less known than firefox and thus don't + provide any valuable info to normal users. + - update debian/control + * bump build dependency for xulrunner-1.9-dev to >= 1.9~b3 + - update debian/control + * bump bin dependency on xulrunner-1.9 and on xulrunner-1.9-gnome-support + to >= 1.9~b3 + - update debian/control + * introduce (empty) firefox meta package that automatically upgrades users + to latest major releases of firefox; firefox 2 will be reuploaded as + firefox-2 and then be demoted to universe + - update debian/control + * make firefox-3.0 conflict/replace old firefox 2 package to force upgrade + - update debian/control + * remove "Development Version" disclaimer from package short descriptions + - update debian/control + * introduce empty meta packages for firefox, firefox-dom-inspector, + firefox-gnome-support and firefox-dev to provide a seamingless upgrade path + from previous firefox versions. Add Conficts/Replaces accordingly and make + firefox-3.0 Conflicts/Replaces/Provides firefox-libthai which is now fully + integrated in the core as pango line breaking feature is used. + - update debian/control + * provide link /usr/bin/firefox => /usr/bin/firefox-4.0 + - add debian/firefox-3.0.links + + [ Fabien Tassin ] + * Add support for mozilla-devscripts and clean-up rules file accordingly + - update debian/rules + * Clean-up rules file to make more use of $(EXTRA_SYSTEM_CONFIGURE_FLAGS) + - update debian/rules + * Update diverged patch: + - update debian/patches/ftbfs-with-branding-dir + * Add #DEBHELPER# token to prerm script + - update debian/firefox-3.0.prerm + * Replace deprecated ${Source-Version} by ${binary:Version} + - update debian/control + * Bump requirement for system cairo to >= 1.5.8 as we now need + the newly added cairo_path_extents() + - update debian/rules + * Add a menu file + - add debian/firefox-3.0.menu + * Include mozilla-devscripts file using -include so ifneq could be omitted + - update debian/rules + * Improve migration script to take care of all previously used profile + directories (during alpha and beta phases) + - update debian/firefox.sh.in + + -- Alexander Sack <asac@ubuntu.com> Wed, 13 Feb 2008 16:55:10 +0100 + +firefox-3.0 (3.0~b3~cvs20080101t1000+nobinonly-0ubuntu1) hardy; urgency=low + + * new years upstream snapshot (3.0b3 pre, CVS 20080101t1000) features: + - new firefox 3 version (LP: #178066) + - file upload dialog has preview for images (LP: #89381) + - gnome/gtk theme icons for main navigation and mime-type icons work + properly now (LP: #160942) + - honours proper plugin/extension locations now (LP: #123118) + (see https://wiki.ubuntu.com/XulrunnerGecko) + - import bookmarks from ffox 2 properly (LP: #163746) + - proper implementation for adding security exceptions (LP: #179706) + + [ Alexander Sack ] + * new upstream snapshot (3.0b3 pre, CVS 20080101t1000) + * update firefox-profile patch because of changed upstream codebase + - update debian/patches/firefox-profilename + * firefox-3.0 now has its own extensions directory because latest + xulrunner-1.9 supports extensions (and plugins) in three directories: + PROFILE, APP (ffox), GRE (xul) + - update debian/firefox-3.0.dirs + - update debian/rules + * exceptional official branding release for cvs version to hardy: add easy to + use FORCE_OFFICIAL_BRANDING switch in rules and enable it for this release + - update debian/rules + + [ Fabien Tassin ] + * Move xulrunner-1.9 dependencies to b3 + - update debian/control + + -- Alexander Sack <asac@ubuntu.com> Wed, 02 Jan 2008 15:43:50 +0100 + +firefox-3.0 (3.0~b2+nobinonly-0ubuntu1) hardy; urgency=low + + [ Fabien Tassin ] + * new upstream snapshot (3.0b2 from FIREFOX_3_0b2_RELEASE) + - update debian/changelog + * Drop debian/patches/no-have-stdint-h-ftbfs.patch integrated + upstream and bump xulrunner requirements to 1.9~b2~cvs20071119 + - update debian/control + - drop debian/patches/no-have-stdint-h-ftbfs.patch + - update debian/patches/series + * Add libdbus-glib-1-dev >= 0.60 to build-deps. See MozBug #388743. + - update debian/control + * Update rules to use system cairo if cairo >= 1.5.4 is found + - update debian/rules + * Add libpixman-1-dev to build-deps, needed by system cairo + - update debian/control + * Update Standards-Version to 3.7.3 + - update debian/control + * Drop -1.9 suffix of expected xulrunner-1.9 pkg-config files + - update debian/patches/nspr_flags_by_pkg_config_hack.patch + * Fold Build-Depends line making changes easier to track in diffs + - update debian/control + + [ Alexander Sack ] + * use system nspr and system nss; add build-depends accordingly + - update debian/control + - update debian/rules + * add versioned depends on xulrunner-1.9 >= 1.9~b2+nobinonly which is the + first xulrunner-1.9 that officially uses system nspr/nss. + * tighten dependency on xulrunner-1.9 << 1.9~b3~ + - update debian/control + * drop DEV_PACKAGE_INDICATION business because xulrunner pkg-config files + properly reference system-nss/nspr since 1.9+b2+nobinonly + - update debian/rules + + -- Fabien Tassin <fta@sofaraway.org> Wed, 19 Dec 2007 20:23:23 +0100 + +firefox-3.0 (3.0~b1+nobinonly-0ubuntu1) hardy; urgency=low + + * new upstream snapshot (3.0b1 from FIREFOX_3_0b1_RELEASE) + - update debian/changelog + * Rename desktop file firefox-3.0-final.desktop so it doesn't + get cleaned out + - update debian/rules + - rename debian/firefox-3.0.desktop to firefox-3.0-final.desktop + * Install extensions in /usr/lib/xulrunner-addons/extensions + - update debian/firefox-3.0.install + - update debian/rules + * Use official branding for beta too as homepage/releasenotes URLs + are maintained that way. Disable crash reporter. + - update debian/patches/firefox-profilename + - update debian/rules + - update debian/firefox-3.0-final.desktop + * Fix URLs for addons/themes/plugins + - update debian/patches/firefox-profilename + * Revert hardcoded lib path to the upstream path, move searchplugins to + /usr/lib/firefox-addons/searchplugins and plugins to + /usr/lib/firefox-addons/plugins. + - update debian/patches/firefox-fsh + - update debian/rules + - divert debian/firefox-3.0.postinst => debian/firefox-3.0.postinst.in + - divert debian/firefox.sh => debian/firefox.sh.in + - add debian/firefox-3.0.dirs + - drop debian/firefox-3.0.links + - update debian/firefox-3.0{,-gnome-support}.install + * Drop --with-default-mozilla-five-home, prefer default value + - update debian/rules + + -- Fabien Tassin <fta@sofaraway.org> Tue, 27 Nov 2007 02:27:42 +0100 + +firefox-3.0 (3.0~b1~rc3+nobinonly-0ubuntu1) hardy; urgency=low + + RELEASE: 3.0~b1~rc3+nobinonly-0ubuntu1 to ubuntu/hardy + + [ Fabien Tassin ] + * new upstream snapshot: 3.0a9pre cvs20071105t0828 + * Add a dependency on firefox-3.0-gnome-support to xulrunner-1.9-gnome-support + - update debian/control + * Fix a typo in rules file (non ascii char) + - update debian/rules + * new upstream snapshot (1.9b1 rc3 from FIREFOX_3_0b1_RC3) + - update debian/changelogs + * Update depends/build-depends for xulrunner-1.9 to >= 1.9~b1~rc + - update debian/control + + [ Alexander Sack ] + * Use granparadiso branding for alpha and beta builds and official branding + for final builds: + - update debian/rules + * Use --enable-official-branding for final builds + - update debian/rules + - add debian/firefox-3.0.desktop + * fix places regression by shipping usr/lib/firefox-3.0/modules + - update debian/firefox-3.0.install + + -- Fabien Tassin <fta@sofaraway.org> Tue, 14 Nov 2007 14:34:50 +0100 + +firefox-3.0 (3.0~alpha9~cvs20071003t0648-0ubuntu1~mt1) gutsy; urgency=low + + RELEASE: 3.0~alpha9~cvs20071003t0648-0ubuntu1~mt1 to gutsy/ppa + + [ Fabien Tassin ] + * update diverged debian/patches/firefox-fsh + * build with or without nss/nspr depending on version like xulrunner-1.9 + - update debian/rules + + -- Fabien Tassin <fta@sofaraway.org> Mon, 08 Oct 2007 16:28:50 +0200 + +firefox-3.0 (3.0~alpha8+nobinonly-0ubuntu1) gutsy; urgency=low + + RELEASE: 3.0~alpha8+nobinonly-0ubuntu1 to gutsy/universe. + + * new orig.tar.gz without binary only files (LP: #121734). + * debian/firefox.sh: fix typo in firefox.sh profile migration code + (LP: #150529). + + -- Alexander Sack <asac@ubuntu.com> Tue, 09 Oct 2007 10:48:36 +0200 + +firefox-3.0 (3.0~alpha8-0ubuntu2) gutsy; urgency=low + + * debian/control: add missing Depends: on xulrunner-1.9 (LP: #149916). + + -- Alexander Sack <asac@ubuntu.com> Mon, 08 Oct 2007 10:45:06 +0200 + +firefox-3.0 (3.0~alpha8-0ubuntu1) gutsy; urgency=low + + RELEASE: 3.0~alpha8-0ubuntu1 to gutsy/universe. + + [ Alexander Sack ] + * drop libnspr4-dev and libnss3-dev build-depends for gutsy upload. + * don't build with system-nspr/-nss for gutsy universe upload. + * add nspr_flags_by_pkg_config_hack.patch to use pkg-config to get + nspr libs and cflags from xulrunner-1.9-dev package. + + -- Alexander Sack <asac@ubuntu.com> Fri, 05 Oct 2007 02:38:08 +0200 + +firefox-3.0 (3.0~alpha8-0ubuntu1~mt3) gutsy; urgency=low + + RELEASE: 3.0~alpha8-0ubuntu1~mt3 to gutsy/PPA. + + [ Fabien Tassin ] + * Unset browser.safebrowsing.enabled by default + Update debian/firefox.js + * Compile with gcc/g++ 4.2 for all archs. + * Add debian/patches/force_safebrowsing_off.patch forcing + the default to off so users could decide to turn it if they + want to. + * Fix a typo in debian/control (Fixes LP #146694) + * Fix a FTBFS introduced by gcc-4.2 that fixed a visibility bug + [GCC bug 26905] triggering WRAP_SYSTEM_INCLUDES in firefox. + This WRAP_SYSTEM_INCLUDES triggered code depending on nspr + sources that are no longer accessible because of the stripped + tarball. + - add debian/patches/dont_depend_on_nspr_sources.patch + - update debian/patches/series + - update debian/changelog + * Clean a possible left over from trunk in update-notifier user + directory + - update debian/firefox-3.0.postinst + + -- Alexander Sack <asac@ubuntu.com> Wed, 03 Oct 2007 21:46:15 +0200 + +firefox-3.0 (3.0~alpha8-0ubuntu1~mt2) gutsy; urgency=low + + [ Fabien Tassin ] + * dummify firefox-3.0-dom-inspector and firefox-3.0-venkman + now that we ship those two extensions with xulrunner + + [ Alexander Sack ] + * make debian/firefox.sh executable in pre-build:: target. + + -- Alexander Sack <asac@ubuntu.com> Thu, 27 Sep 2007 20:05:10 +0200 + +firefox-3.0 (3.0~alpha8-0ubuntu1~mt1) gutsy; urgency=low + + Upstream Release: 3.0~a8 aka MOZILLA_1_9a8_RELEASE + + [ Fabien Tassin ] + * new release: GranParadiso 3.0 alpha 8 + * Fix debian/rules to detect which xul-dev package is installed + * Change branding based on Version (use MineField if version + matches cvs, otherwise use GranParadiso) + * Move gnome component into firefox-3.0-gnome-support + + -- Alexander Sack <asac@ubuntu.com> Tue, 25 Sep 2007 02:30:07 +0200 + +firefox-3.0 (3.0~a8~cvs20070914t1713-0ubuntu1~mt2) gutsy; urgency=low + + RELEASE: 3.0~a8~cvs20070914t1713-0ubuntu1~mt2 to gutsy/PPA. + + [ Fabien Tassin ] + * Massive app-name change from firefox-trunk to firefox-3.0 + * Add a migration profile script: + add debian/firefox.sh, update debian/firefox-3.0.install + debian/firefox-3.0.links + + -- Alexander Sack <asac@ubuntu.com> Fri, 21 Sep 2007 20:47:20 +0200 + +firefox-trunk (3.0~a8~cvs20070914t1713-0ubuntu1~mt1) gutsy; urgency=low + + RELEASE: 3.0~a8~cvs20070914t1713-0ubuntu1~mt1 to gutsy/PPA. + + [ Fabien Tassin ] + * new cvs snapshot: 3.0a8pre cvs20070914t1713 using a stripped tarball + produced my mozclient + * update debian/control to fix xulrunner version (1.9a8pre vs 1.9~a8) + * drop patches no longer useful: + bz386844_java_plugin_crash_in_xsync.patch + bz392722_fix_nsinstall_on_double_slash.patch + bz386866_ftbfs_toolkit_xre_Makefile_in.patch + * Link venkman from xulrunner-1.9 + * Update firefox-dom-inspector package to just link the + extension from xulrunner-1.9 + * Update debian/firefox-trunk.install to install browserconfig.properties + * Make the installer complain about missing files on stdout + instead of stderr so logs are easier to read. + Add debian/patches/installer_use_stdout_for_missing_files.patch + and update debian/patches/series + + [ Alexander Sack ] + * Use --disable-install-strip to prevent packager from stripping symbols: + - debian/rules: add --disable-install-strip as configure option. + - debian/patches/installer_shouldnt_skip_strip_if_disable_strip_configured, + series: drop patch to disable stripping symbols during |make install| in + favour of generic upstream solution provided by --disable-install-strip. + + -- Alexander Sack <asac@ubuntu.com> Tue, 18 Sep 2007 00:14:51 +0200 + +firefox-trunk (3.0~a8~cvs20070829-0ubuntu1) gutsy; urgency=low + + RELEASE: 3.0~a8~cvs20070829-0ubuntu1 to gutsy/PPA. + + [ Fabien Tassin ] + * new cvs snapshot: 3.0a8pre cvs20070829 + * update debian/rules to use system xulrunner by adding: + --with-libxul-sdk=/usr/lib/xulrunner-devel-1.9a8pre + * update debian/patches/trunk-fsh to use $(MOZ_APP_NAME) while copying + xulrunner-stub + * add debian/patches/installer_shouldnt_copy_xulrunner.patch to prevent + the installer to dump xulrunner files into firefox install dir, + update debian/patches/series + * fix debian/firefox-trunk-dev.install and debian/firefox-trunk-dev.links + to reflect new install scheme + * temporary disable debian/firefox-trunk-dev.* as 'make install' is not + properly installing those files upstream. + * update debian/changelog + + -- Alexander Sack <asac@ubuntu.com> Wed, 29 Aug 2007 20:53:27 +0200 + +firefox-trunk (3.0~a8~cvs20070825-0ubuntu1) gutsy; urgency=low + + RELEASE: 3.0~a8~cvs20070825-0ubuntu1 to gutsy/PPA. + + [ Fabien Tassin ] + * new cvs snapshot: 3.0a8pre cvs20070825 + * Add debian/patches/installer_shouldnt_skip_strip_if_disable_strip_configured + contributed by asac, fixing --disable-strip (was being ignored) + * Drop debian/patches/bz390451_master_password_lost.patch now fully integrated + upstream. Update debian/patches/series + * Update debian/patches/bz392722_fix_nsinstall_on_double_slash.patch to + also fix security/coreconf/nsinstall/nsinstall.c + + -- Alexander Sack <asac@ubuntu.com> Sat, 25 Aug 2007 16:56:07 +0000 + +firefox-trunk (3.0~a8~cvs20070818-0ubuntu1) gutsy; urgency=low + + RELEASE: 3.0~a8~cvs20070818-0ubuntu1 to gutsy/PPA. + + [ Fabien Tassin ] + * new cvs snapshot: 3.0a8pre cvs20070818 + (bump version from 2.99 to 3.0a8pre, as that's what it really is + in mozilla/browser/config/version.txt) + * Update debian/patches/trunk-profilename to patch firefox-branding.js + in the right place now that we no longer specify a branding. + * Update to cvs20070818 and patch clean-up + - debian/rules: drop --disable-airbag, add --disable-crashreporter + - debian/patches/config_rules_install_dist_files => + debian/patches/bz386904_config_rules_install_dist_files.patch + - debian/patches/fix_nsinstall_on_double_slash.patch => + debian/patches/bz392722_fix_nsinstall_on_double_slash.patch + - debian/patches/ftbfs_toolkit_xre_Makefile_in => + debian/patches/bz386866_ftbfs_toolkit_xre_Makefile_in.patch + - update debian/patches/bz390451_master_password_lost.patch: + Fix committed but work-around still in place upstream + - remove unused debian/patches/fix_make_install + - refresh diverging debian/patches/no-have-stdint-h-ftbfs.patch + - update debian/patches/series + + -- Alexander Sack <asac@ubuntu.com> Sat, 18 Aug 2007 14:27:09 +0000 + +firefox-trunk (2.99+2cvs20070813-0ubuntu1) gutsy; urgency=low + + RELEASE: 2.99+2cvs20070813-0ubuntu1 to gutsy/PPA. + + [ Fabien Tassin ] New cvs snapshot: 2.99+2cvs20070813 + * Fix crash in java plugin in XSync(). See Mozilla Bug #386844. + Closes LP Bug #132235 + * Minefield. Update debian/rules to remove forced unofficial branding + that produced Granparadiso branding. Update debian/firefox-trunk.desktop + to use the name Minefield. + * Really disable system cairo. Commit #47 was broken. + Update debian/rules. + * Fix update-notifier + - rename debian/firefox-restart-required.update-notifier into + debian/firefox-trunk-restart-required.update-notifier + - update debian/firefox-trunk-restart-required.update-notifier to + use Firefox-Trunk as application name + - update debian/firefox-trunk.install to reflect rename + - update debian/firefox-trunk.{postinst,prerm} to install/remove + that update-notifier file. + * Re-enable master password previously hidden as preventive measure. + Add debian/patches/bz390451_master_password_lost.patch and update + debian/patches/series. Fixes Mozilla Bug #390451 (not committed + in trunk yet). + * Add debian/firefox-trunk.{postinst,prerm} scripts to add a + x-www-browser alternative for /usr/bin/firefox-trunk. + Priority set to 40, lower than firefox-granparadiso (50) and + plain firefox (70). + * update debian/rules to force --disable-system-cairo until we figure out + what's causing the assert/crash on shutdown. See LP Bug #122735. + * Fix cdbs install scripts + - update debian/firefox-trunk.install and debian/firefox-trunk.links + - Fix a typo in firefox-trunk.links (LP Bug #122737) + - update debian/firefox-trunk-dev.install and add + debian/firefox-trunk-dev.links + * drop debian/control.in and set DEB_AUTO_UPDATE_DEBIAN_CONTROL=0 + in debian/rules (below the includes as the value is overwritten + otherwise) + * update Build-Depends and fix Suggests in debian/control + * Redo debian/patches/trunk-fsh like for GranParadiso: + - remove version from $installdir so that we do the right thing. + It is useless anyway and it broke the profile migration when -dev + was not installed. + * Add debian/patches/trunk-profilename: + - change application name from Firefox to Firefox-Trunk + - update startup script changing profile name + from ~/.mozilla/firefox to ~/.mozilla/firefox-trunk. + The startup script will try to initialize that new profile by + using existing firefox profile, keeping the later untouched. + - update URLs in upstream branding as changing application name + produces invalid URLs. + - update debian/patches/series + * debian/rules: --disable-airbag as we don't want it and configure + fails because we need libcurl + * update debian/patches/fix_nsinstall_on_double_slash.patch to preserve + the initial (upstream) multiple trailling slashes pruning used + for mkdir() + * new cvs snapshot: 2.99+2cvs20070805. Update debian/changelog + + -- Alexander Sack <asac@ubuntu.com> Mon, 13 Aug 2007 23:25:32 +0200 + +firefox-trunk (2.99+2cvs20070805-0ubuntu1) gutsy; urgency=low + + * new cvs snapshot: 2.99+2cvs20070805 + + -- Alexander Sack <asac@ubuntu.com> Mon, 23 Jul 2007 09:43:55 +0000 + +firefox-trunk (2.99+2cvs20070703-0ubuntu0) feisty; urgency=low + + * debian/patches/trunk-fsh: applied manually to build-tree/mozilla + /browser/app/makefile.in, due to failure to apply during build + * debian/patches/ftbfs_toolkit_xre_Makefile_in: Made and applied to fix + toolkit/xre/Makefile.in to fix failure to build to fix Mozilla bug + #386866 + * debian/patches/config_rules_install_dist_files: Made patch due to + failure to find application.ini when launched to fix Mozilla bug + #386904 (Thanks to Alexander Sack <asac@ubuntu.com>) + * debian/patches: Removed old patches that are no longer needed + - removed submakefiles-fix + - removed test + * debian/patches/series: updated as needed + * debian/firefox-trunk.install: Added lines to generate application.ini + and platform.ini + * debian/rules: Removed --with-system-png=/usr \ due to failure to + build during configure, stating system's libpng doesn't have APNG + support + * Reminder to see if we can patch libpng (asac) + + -- John Vivirito <gnomefreak@ubuntu.com> Wed, 04 Jul 2007 20:37:00 -0400 + +firefox-trunk (2.99+2cvs20070628-0ubuntu0) feisty; urgency=low + + * merging copyright file fix from granparadiso branch + * debian/copyright, debian/MPL, debian/docs: added previously missed + copyright files. + + -- Alexander Sack <asac@ubuntu.com> Fri, 15 Jun 2007 13:52:16 +0200 + +firefox-trunk (2.99+2cvs20070601-0ubuntu0) feisty; urgency=low + + * update upstream cvs + * debian/rules: don't use system-nspr and system-nss anymore + * debian/control*: drop build-depends accordingly + * debian/firefox-trunk.links: don't create link + usr/lib/firefox/libnssckbi.so ... which was the wrong place + anyway + * debian/patches/series, debian/patches/nspr_macro_backport_for_gfx_thebes: + drop nspr hack as we don't build against system nss/nspr for the time being + + -- Alexander Sack <asac@ubuntu.com> Fri, 25 May 2007 10:10:00 +0200 + +firefox-trunk (2.99+2cvs20070417-0ubuntu0) feisty; urgency=low + + * update upstream cvs + * debian/rules, debian/control[.in]: build against system-nspr and + system-nss for gutsy; drop explicity depends on libnspr and libnss + as those are now properly detected + + -- Alexander Sack <asac@ubuntu.com> Wed, 18 Apr 2007 13:00:00 +0200 + +firefox-trunk (2.99+1-3.0a.20070201-0ubuntu0) feisty; urgency=low + + * package firefox 3 preview + * rewrite packaging, make use of cdbs with quilt patch + system. + + imported initial patches + + -- Alexander Sack <asac@ubuntu.com> Thu, 22 Feb 2007 09:00:00 +0200 + +firefox (2.0.0.1+1-0ubuntu2) feisty; urgency=low + + * browser/app/Makefile.in: link firefox-bin with + --no-as-needed again. (regression from + 2.0.0.1+1-0ubuntu1) + * browser/components/feeds/src/FeedWriter.js: fix + RSS preview/subscription for flat chrome + (Closes lp#61182) + * debian/rules: set BUILD_OFFICIAL and MOZILLA_OFFICIAL environment + so build gets a proper BUILD_ID (Closes LP#). + + -- Alexander Sack <asac@ubuntu.com> Mon, 19 Feb 2007 12:45:00 +0100 + +firefox (2.0.0.1+1-0ubuntu1) feisty; urgency=low + + * repackage with new upstream mozilla.org and split up patches + into distinct feature patches available at + http://people.ubuntu.com/~asac/firefox-patches/ + * make use of original source tarball as distributed from + ftp.mozilla.org + * debian/rules: use --enable-official-branding to produce + official firefox branding; remove icons in debian/ dir; + add more garbage cleanup + * debian/firefox.links: /usr/share/pixmaps/firefox.png and + usr/share/pixmaps/mozilla-firefox.png now link to + usr/share/firefox/icons/mozicon128.png + * drop FeedWriter.js patch, no rational available. + * xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp, + xpcom/reflect/xptcall/src/md/unix/Makefile.in, + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp, + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_m68k.cpp, + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s, + configure.in, config/rules.mk, security/coreconf/Linux.mk: + drop debian architecture patches for + not ubuntu platforms + * debian/control: taking over maintainership + * configure.in: update hidden visibility patch from bugzilla + * configure.in: drop + * Makefile.in: drop explicit export of nss as build system is not + broken anymore + * browser/app/Makefile.in: drop linker tweaks for now. + * browser/app/profile/firefox.js: drop override for homepage + * browser/locales/en-US/chrome/branding/brand.properties: drop further + branding hacks not needed anymore + * browser/components/search/nsSearchService.js: drop not needed + official browser hacks + * prefs-size.diff: removed garbage file from source + + -- Alexander Sack <asac@ubuntu.com> Wed, 15 Feb 2007 23:15:00 +0100 + +firefox (2.0.0.1+0dfsg-0ubuntu2) feisty; urgency=low + + * Build using hunspell instead of myspell. + - debian/control: Build-depend on libhunspell-dev instead of libmyspell-dev. + - config/autoconf.mk.in: Add MOZ_MYSPELL_CFLAGS. + - extensions/spellcheck/myspell/src/Makefile.in: Use MOZ_MYSPELL_CFLAGS. + - extensions/spellcheck/myspell/src/mozMySpell.h: Include hunspell.cxx + instead of myspell.cxx. + - configure.in, configure: Overwrite myspell detection with hunspell. + + -- Matthias Klose <doko@ubuntu.com> Thu, 18 Jan 2007 11:57:14 +0000 + +firefox (2.0.0.1+0dfsg-0ubuntu1) feisty; urgency=low + + * New upstream security update: + - CVE-2006-6507, MFSA 2006-76: XSS using outer window's Function object. + - CVE-2006-6506, MFSA 2006-75: RSS Feed-preview referrer leak. + - CVE-2006-6504, MFSA 2006-73: SVG Processing Remote Code Execution. + - CVE-2006-6503, MFSA 2006-72: XSS by setting img.src to javascript: URI. + - CVE-2006-6502, MFSA 2006-71: LiveConnect crash finalizing JS objects. + - CVE-2006-6501, MFSA 2006-70: Privilege escallation using watch point. + - CVE-2006-6497, CVE-2006-6498, CVE-2006-6499, MFSA 2006-68: Crashes + with evidence of memory corruption. + * debian/rules: use original upstream icons (Closes LP#68180). + * debian/debsearch.src: make feisty the default debsearch target. + * browser/base/content/utilityOverlay.js: change Launchpad translation/help + pages for Feisty. + + -- Kees Cook <kees@ubuntu.com> Thu, 21 Dec 2006 09:51:22 -0800 + +firefox (2.0+0dfsg-0ubuntu3) edgy; urgency=low + + * Patch from upstream CVS to fix RSS preview/subscription, thanks to Mike + Connor and Martin Jürgens (Closes: LP#61182) + + -- Matt Zimmerman <mdz@ubuntu.com> Mon, 23 Oct 2006 10:20:25 +0100 + +firefox (2.0+0dfsg-0ubuntu2) edgy; urgency=low + + * uudecode debsearch.gif too. Fixes FTBFS + * Make edgy the default debsearch target. Closes: Malone: #61687 + + -- Tollef Fog Heen <tfheen@ubuntu.com> Mon, 23 Oct 2006 08:52:11 +0200 + +firefox (2.0+0dfsg-0ubuntu1) edgy; urgency=low + + * Bump version to 2.0 (no upstream changes from rc3) + * browser/components/search/nsSearchService.js + - Set MOZ_OFFICIAL to "official", distributionID to "com.ubuntu" + * debian/branding: new subdirectory with images + * debian/rules: + - build: uudecode and substitute images in source tree, use debian/branding/icon64.png + instead of debian/firefox.png + - clean: restore images in source tree, remove uudecoded versions + + -- Matt Zimmerman <mdz@ubuntu.com> Fri, 20 Oct 2006 15:56:42 -0700 + +firefox (1.99+2.0rc3+dfsg-0ubuntu1) edgy; urgency=low + + * New upstream version 2.0rc3, UVF exception approved by Matt Zimmerman. + * configure: Fix bashism to let the gcc visibility=hidden bug detection + work. + * configure{,.in}: Change MOZ_APP_DISPLAYNAME from 'BonEcho' to 'Firefox' to + make UserAgent string work with web sites which evaluate it. + * browser/base/content/utilityOverlay.js: Open the Launchpad + translation/help pages for Edgy, not Dapper. + * For the sake of automatic vulnerability tracking: All 1.5.0.x and earlier + vulnerabilities were fixed in the 2.0 branch as well: + CVE-2005-0752 CVE-2005-1531 CVE-2005-1532 CVE-2005-2114 CVE-2006-0749 + CVE-2006-1731 CVE-2006-1732 CVE-2006-1733 CVE-2006-1734 CVE-2006-1735 + CVE-2006-1736 CVE-2006-1737 CVE-2006-1738 CVE-2006-1739 CVE-2006-1740 + CVE-2006-1741 CVE-2006-1742 CVE-2006-1790 CVE-2006-2775 CVE-2006-2776 + CVE-2006-2777 CVE-2006-2778 CVE-2006-2779 CVE-2006-2780 CVE-2006-2782 + CVE-2006-2783 CVE-2006-2784 CVE-2006-2785 CVE-2006-2786 CVE-2006-2787 + CVE-2006-2788 CVE-2006-3113 CVE-2006-3677 CVE-2006-3801 CVE-2006-3802 + CVE-2006-3803 CVE-2006-3805 CVE-2006-3806 CVE-2006-3807 CVE-2006-3808 + CVE-2006-3809 CVE-2006-3810 CVE-2006-3811 CVE-2006-3812 CVE-2006-4253 + CVE-2006-4340 CVE-2006-4565 CVE-2006-4566 CVE-2006-4567 CVE-2006-4568 + CVE-2006-4569 CVE-2006-4571 + + -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 19 Oct 2006 09:28:15 +0200 + +firefox (1.99+2.0rc2+dfsg-0ubuntu3) edgy; urgency=low + + * debian/firefox-runner: Disable Pango if a Sinhala locale is present. LP + 66270. + + -- Colin Watson <cjwatson@ubuntu.com> Sun, 15 Oct 2006 20:29:26 +0100 + +firefox (1.99+2.0rc2+dfsg-0ubuntu2) edgy; urgency=low + + * Delete /usr/lib/firefox/components/compreg.dat in the postinst. + This is a partial workaround for LP 30791. + + -- Ian Jackson <iwj@ubuntu.com> Thu, 12 Oct 2006 12:19:11 +0100 + +firefox (1.99+2.0rc2+dfsg-0ubuntu1) edgy; urgency=low + + * New upstream version 2.0rc2. + * Fix/workaround for epiphany GtkSocket lifetype crash: + apply patch id=241087 from Mozilla Bugzilla #241535 to fix LP #63814. + * Change application name to `Firefox', as requested by mdz. + Files changed: + - browser/locales/en-US/chrome/branding/brand.dtd + - browser/locales/en-US/chrome/branding/brand.properties; + New values: + - brandShortName and brandFullName: `Bon Echo' => `Firefox' + - vendorShortName: `Mozilla' => `Ubuntu' + * Make preferences dialogue fit again (bah!). + + -- Ian Jackson <iwj@ubuntu.com> Tue, 10 Oct 2006 18:49:32 +0100 + +firefox (1.99+2.0b2+dfsg-1ubuntu3) edgy; urgency=low + + * Remove /usr/lib/mozilla-thunderbird from the LD_LIBRARY_PATH + if we find it there. Workaround for LP 57923. + * Remove pocket name (eg `-security') from distribution identifier in + the browser user agent string. LP 55289. + + -- Ian Jackson <iwj@ubuntu.com> Tue, 3 Oct 2006 19:01:34 +0100 + +firefox (1.99+2.0b2+dfsg-1ubuntu2) edgy; urgency=low + + * Ship xpidl et al, in firefox-dev. Relates to Debian #362190. + Fixes Malone #61160. + + -- Ian Jackson <iwj@ubuntu.com> Thu, 21 Sep 2006 16:33:50 +0100 + +firefox (1.99+2.0b2+dfsg-1ubuntu1) edgy; urgency=low + + * Merged from Debian unstable; new upstream version. + * Remaining differences between + Debian and Ubuntu in no particular order: + - Build libnspr and libnss and corresponding -dev packages from this + source package. Plus changes to make these libs build nicely. + - Various changes to preferences, default bookmarks and search engines. + - Support for `Get Help Online' and `Translate This Application'. + - Size changes for various dialogue boxes to make the contents fit. + - Downloads go to separate `Desktop' folder by default. + - Fix some underquoted m4 arguments. + - Minor changes in directories, symlinks and debian/control + to cope with Ubuntu and Debian's different histories. + - disable File / Import (wizard is nonfunctional). + Malone #28563, Debian #350599, Mozilla Bugzilla 117844. + - Change `Latest Headlines' to `Latest BBC Headlines' to properly + disclose the source up front, and use a corresponding RSS URL. + - Default for FIREFOX_DSP is none. + - Pango support is enabled only if an installed locale seems to need + it. + - Note in README.Debian about how to run xpcshell. + - Disable xprint. + - No build dependency on libxp-dev; build-depend on zip instead. + - Various icon changes. + - Some currently-unused directory merging code in firefox.preinst. + - Less detail in the user agent string. + - Belt-and-braces removal for some cruft left over by some versions of + the Mozilla build system. + - Better firefox.menu entry (says `Firefox Web Browser'). + - Build dynamically linked, since in Ubuntu embedders use firefox. + - EbmedWindow::GetVisibility bugfix, Malone 40320, upstream 312998. + - Pass FC_ANY_METRICS to Fontconfig where appropriate. + - Extensive Thai language patch. + - Print in serif by default even though default display is sans. + - Some fixes to the (upstream-unused) nss makefiles. + - Strip PostScript/ from printer names. + - Better message about updates of read-only extension. + - Include pointer to the Gecko Runtime (GRE registration). + - Prevent websites from disabling context menus. + All of these changes are fully documented in the changelog below. + Please see those changelog entries for full details. Much historical + information about changes either taken up by Debian or upstream, or + dropped by us, is retained in this changelog. + + -- Ian Jackson <iwj@ubuntu.com> Wed, 13 Sep 2006 16:40:06 +0100 + +firefox (1.99+2.0b2+dfsg-1) experimental; urgency=low + + * New upstream beta release. + + * extensions/inspector/build/src/Makefile.in, + extensions/inspector/build/src/inspector.pkg, + extensions/inspector/build/src/nsInspectorModule.cpp: Removed, the problem + was lying in debian/rules. /me goes hiding under a rock. + * layout/inspector/public/Makefile.in: Reverted previous changes. + * debian/rules: Don't exclude inspector files when dh_installing the firefox + package. We need the inspector.xpt file from the components directory. The + files for the dom-inspector package are already excluded from the + firefox.install file anyway. + * debian/firefox-dom-inspector.install, + debian/firefox-dom-inspector.links: Simplified. + * debian/control: + + Turn firefox-dom-inspector into an arch: all package, since the binary + component has been merged into the firefox binary. + + Adjust dependencies for binNMU safety. + * xpcom/reflect/xptcall/src/md/unix/Makefile.in, configure.in, configure: + Use ${host_cpu} instead of uname -m so that firefox can safely build on + s390x with a s390 target, and on amd64 with an x86 target. + * uriloader/exthandler/unix/nsGNOMERegistry.cpp, + uriloader/exthandler/unix/nsGNOMERegistry.h, + uriloader/exthandler/unix/nsOSHelperAppService.cpp, + uriloader/exthandler/unix/nsMIMEInfoUnix.cpp, + uriloader/exthandler/unix/nsMIMEInfoUnix.h: Adapted patch from bz#273524 to + make helper applications with parameters work. (Closes: #355511) + * debian/copyright: Adjusted with updated information for firefox 2.0, which + is now properly tri-licensed \o/. (Closes: #330295) + * debian/rules: Install the MPL file taken from the upstream LICENSE file. + + -- Mike Hommey <glandium@debian.org> Fri, 1 Sep 2006 08:36:26 +0200 + +firefox (1.5.dfsg+1.5.0.6-3) unstable; urgency=low + + * browser/app/Makefile.in: Workaround to force link the xpcom library to + the firefox binary despite -Wl,--as-needed in the LDFLAGS. + (Closes: #378667) + * debian/firefox.install: Don't install xpt_link, xpt_dump, xpidl, + xpicleanup, xpcshell nor regxpcom. They are of no use to firefox users and + are provided with xulrunner anyway. (Closes: #362190) + + -- Mike Hommey <glandium@debian.org> Sun, 20 Aug 2006 19:49:25 +0200 + +firefox (1.5.dfsg+1.5.0.6-2) unstable; urgency=low + + * debian/firefox.desktop: + - Polish translation from Ian Jackson by way of an Ubuntu user. + (Closes: #382079) + - Patch from Ian Jackson to stop claiming dav:// URLs when firefox + doesn't understand them. (Closes: #382080) + * editor/libeditor/text/nsPlaintextEditor.cpp: Apply patch from + bz#271815 to fix OverTheSpot mode used by many Asian language input + modules. (Closes: #379935) + + -- Eric Dorland <eric@debian.org> Tue, 15 Aug 2006 00:09:55 -0400 + +firefox (1.5.dfsg+1.5.0.6-1) unstable; urgency=low + + * New upstream release. + + -- Eric Dorland <eric@debian.org> Thu, 3 Aug 2006 13:17:45 -0400 + +firefox (1.5.dfsg+1.5.0.5-1) unstable; urgency=high + + [ Eric Dorland ] + * New upstream release. Urgency high because it fixes MFSA 2006-44 to + MFSA 2006-56 excluiding MFSA-2006-49. (Closes: #380463) + + [ Mike Hommey ] + * debian/firefox.prerm: Remove /usr/lib/firefox/.autoreg instead of + /var/lib/firefox/.autoreg. + * browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in: + Removed very old and now useless changes. + * xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp: Removed + useless new line that showed up in the diff.gz. + + -- Eric Dorland <eric@debian.org> Sun, 30 Jul 2006 17:08:38 -0400 + +firefox (1.99+2.0b1+dfsg-1) experimental; urgency=low + + * New upstream beta targetted at experimental: + - Much better search plugins handling. They can be added and removed at + will, and even better, system-wise search plugins can be ignored at the + profile level. (Closes: #352195, #320957, #296425, #308005) + * browser/components/shell/src/Makefile.in: Correctly install the + setDefaultBrowser component. + * config/rules.mk: Don't install extensions in the chrome. + * debian/firefox.links: Link /usr/lib/firefox/dictionaries to + /usr/share/myspell/dicts. + * config/autoconf.mk.in, configure, configure.in: Add the + --enable-system-myspell argument to configure to use the system myspell + library. + * extensions/spellcheck/myspell/src/Makefile.in: Use the system myspell + library when asked to. + * debian/rules: + - Add --enable-system-myspell to configure call. + - Do shlibsign libfreebl's (there can be several depending on the arch). + * debian/control: Add libmyspell-dev to build dependencies. + * browser/components/microsummaries/src/Makefile.in, config/Makefile.in: + Add rules so that make clean cleans everything. + * allmakefiles.sh: Removed references to nonexisting Makefiles in + extensions/xmlextras/base. + * configure, configure.in: Apply patches from bz#334866, bz#319012 and + bz#335949 + fixups to workaround gcc visibility hidden bugs, especially + #331460 (an instance of which is actually still present in C++, + see gcc#26905). + * extensions/inspector/build/src/Makefile.in, + extensions/inspector/build/src/inspector.pkg, + extensions/inspector/build/src/nsInspectorModule.cpp: Added missing files + for the DOM Inspector component. + * extensions/inspector/build/src/Makefile.in, + layout/inspector/public/Makefile.in: Adapted so that the DOM Inspector + component would build correctly and the xpt would be installed in + the extensions directory. + * extensions/reporter/Makefile.in: Install missing reporter's preference. + + -- Mike Hommey <glandium@debian.org> Fri, 21 Jul 2006 07:05:25 +0200 + +firefox (1.5.dfsg+1.5.0.4-3) unstable; urgency=low + + [ Eric Dorland ] + * debian/control: + - Fix silly typo of binutils. (Closes: #378582) + - Standards-Version to 3.7.2.1. + + [ Mike Hommey ] + * debian/rules: + - Use a specific LD_LIBRARY_PATH at link time so that we don't need to + link against indirect dependencies. (Closes: #378378) + - Run shlibsign after the files are stripped so that it is accurate and + FIPS mode can correctly work. + - Removed old commented out OPTFLAGS that were kept in case gcc 4.0 did + no better than gcc 3.x. + - Removed old exported variables that are useless nowadays. + - Removed dh_strip call in binary-indep. Who wants to strip + arch-independant files ;) + * debian/presubj: Added notes about plugins and crash reports. + * security/manager/Makefile.in, security/nss/cmd/shlibsign/Makefile: + Don't build nor install the .chk files but still build shlibsign. + * debian/firefox.install: Don't install .chk files since we generate them + after dh_strip. + * security/nss/cmd/shlibsign/manifest.mn: Don't build in shlibsign/mangle. + It doesn't build anyway. + + -- Eric Dorland <eric@debian.org> Wed, 19 Jul 2006 23:56:22 -0400 + +firefox (1.5.dfsg+1.5.0.4-2) unstable; urgency=low + + [ Eric Dorland ] + * netwerk/base/public/security-prefs.js: Disable SSLv2 by default. I + thought the weak cipher warning took care of this. (Closes: #371153) + * debian/firefox-runner: Simplify the dsp autodetection and add aoss to + the roster. (Closes: #372848) + * firefox-restart-required.update-notifier, firefox.postinst, + firefox.install: Add update-notifier to indicate that firefox needs to + be restarted on upgrade. Based on Ian Jackson's patch, but reworked a + little. Also with a bad French translation. Translators, assemble! + (Closes: #365865) + * config/rules.mk, debian/control: Apply patch from Thiemo Seufer to + remove mips -xgot hack and build depend on the appropriate binutils on + mips and mipsel. (Closes: #374372) + * debian/presubj, debian/README.Debian: Add a bit more information about + disabling Pango, which often seems to be the source of problems. + * debian/firefox-runner: + - Print out MOZ_NO_REMOTE in verbose mode. + - Fix some unreachable logic, Thanks Daniel Jacobowitz. + + [ Mike Hommey ] + * debian/rules: + - Fix for Gecko date extraction from client.mk. + - Disabled strict aliasing from optimized builds. + - Added -Wl,--as-needed to the LDFLAGS, so that we don't get indirect + libraries linked. + * config/static-config.mk: Add MOZ_XFT_LIBS to STATIC_EXTRA_LIBS. It used to + get linked as a side effect of linking to indirect libraries, but should + be linked directly since Xft symbols are used. + * debian/firefox-restart-required.update-notifier: Fixed the french + translation. ;) + * content/html/content/src/nsGenericHTMLElement.cpp, + content/html/content/src/nsHTMLInputElement.cpp, + dom/src/base/nsGlobalWindow.cpp: Fixed crasher and potential crashers. + Reported bz#343953. + + -- Eric Dorland <eric@debian.org> Sun, 9 Jul 2006 02:37:28 -0400 + +firefox (1.5.dfsg+1.5.0.4-1) unstable; urgency=low + + * The "Post-DebConf Hangover" release. + + [ Eric Dorland ] + * New upstream release. Fixes various security issues. MFSA 2006-31 to + MFSA 2006-43, excluding MFSA 2006-40. + * debian/control: + - Standards-Version to 3.7.2.0. + - Set priority of -dbg to extra and Section to devel. + * gfx/src/gtk/nsFontMetricsPango.cpp, + intl/lwbrk/src/nsJISx4501LineBreaker.cpp, + intl/unicharutil/util/nsUnicharUtils.h, + intl/unicharutil/util/nsUnicharUtils.cpp, + layout/generic/nsTextFrame.cpp: Patch from Jurij Smakov (from + bz#161826) to fix alignment issues on sparc64. (Closes: #354725) + + [ Mike Hommey ] + * Applied distclean patch from xulrunner (in + debian/patches/01_distclean.dpatch), except for the javaxpcom stuff we + don't build anyway. + * browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}, + config/static-rules.mk: More cleaning for firefox. + * nsprpub/configure: Apply change to nsprpub/configure.in. + (Closes: #350616) + * gfx/src/gtk/nsFontMetricsPango.cpp: Some more changes so that it + actually builds without errors, and use PR_Malloc and PR_Free instead + of malloc and free. + + -- Eric Dorland <eric@debian.org> Fri, 2 Jun 2006 12:13:18 -0400 + +firefox (1.5.dfsg+1.5.0.3-2) unstable; urgency=low + + * debian/firefox.desktop: Add spanish translation, just in time for + DebConf 6! Thanks Ian Jackson. (Closes: #365870) + * debian/firefox-runner: Actually apply the patch from Morita Sho in + #364566. I'm a moron. (Closes: #365956, #365960) + * debian/control: Standards-Version to 3.7.1.0. Go policy team! + + -- Eric Dorland <eric@debian.org> Thu, 4 May 2006 01:38:18 -0400 + +firefox (1.5.dfsg+1.5.0.3-1) unstable; urgency=critical + + * The "secure enough for ya!" release. + * New upstream release. Contains security fixes, hence severity + critical. + - Fixes CVE-2006-1993 aka MFSA 2006-30. (Closes: #364810) + + [ Mike Hommey ] + * security/manager/Makefile.in, debian/firefox.install: Build and + install the .chk file again. That will make the FIPS mode work again. + * debian/control: Bumped Standards-Version to 3.7.0.0. No changes. + * debian/rules: Fix the navigator.ProductSub value for dumb scripts. + Closes: #364640, #365099. We now use the date of the client.mk file, + which is likely to be the closest value to the release date, instead of + useless build date. + Add the debian version after the firefox version string. + * debian/rules: Use dpkg-architecture to find out the host and build that + we want to pass to the configure script. (Closes: #365738) + + [ Eric Dorland ] + * debian/firefox-runner: + - Quote the APPLICATION_ID variable to handle profiles with a space + in the name. Inspired by Morita Sho's patch. (Closes: #364566) + - echo MOZ_DISABLE_PANGO on verbose. + * debian/rules: It's baaaackkk. Reenable xprint. + + -- Eric Dorland <eric@debian.org> Wed, 3 May 2006 00:32:49 -0400 + +firefox (1.5.dfsg+1.5.0.3-0ubuntu3) dapper; urgency=low + + * Thai-related crash fix (Malone 45395): + - nsCopySupport.cpp, nsCopySupport::HTMLCopy: + do not crash if htmlConverter->Convert fails. + - nsHTMLFormatConverter.cpp, nsHTMLFormatConverter::Convert: + properly report failure if dataStr.IsEmpty. + - nsJISx4501LineBreaker.cpp: fix printf(stderr -> fprintf. + * Add Polish translation for firefox.desktop (Malone 45447). + Thanks to contribution from Tomasz Dominikowski. + * Do not attempt to merge /usr/lib/mozilla-firefox and /usr/lib/firefox + and make the former a link to the latter; this is unfortunately + error-prone and makes more problems than it solves. + Fixes Malone 44487; regresses the plugins directory confusion bug. + * Include MFSA and CVE numbers in changelog entry for 1.5.dfsg-1. + + -- Ian Jackson <iwj@ubuntu.com> Tue, 23 May 2006 17:45:30 +0100 + +firefox (1.5.dfsg+1.5.0.3-0ubuntu2) dapper; urgency=low + + * Fix memory leak in large clipboard handling. Malone 41093. + Mozilla Bugzilla 289897; applied attachments 218749, 218753. + * Provide symlink /usr/lib/mozilla-firefox -> /usr/lib/firefox + (and shuffle stuff across if both directories exist). + * Remove update-notifier `restart required' on removal so that if you + remove firefox you're no longer asked to restart it. Malone 36739. + * Increase size of prefs window explicitly. Malone 43528. + * Suppress the error if /var/lib/locales/supported.d/* can't be read + (probably because it doesn't exist). If you get EIO or EACCES or some + such then having pango mysteriously disabled will be the least of your + worries. Malone 44016. + * Really use firefox_1.5.dfsg+1.5.0.3.orig.tar.gz from Debian. + + -- Ian Jackson <iwj@ubuntu.com> Fri, 12 May 2006 19:20:30 +0100 + +firefox (1.5.dfsg+1.5.0.3-0ubuntu1) dapper; urgency=low + + * New upstream version, 1.5.0.3, security/stability fix from upstream: + MFSA 2006-30, CVE-2006-1993: Deleted + object reference when designMode="on" + This package is based on Debian's firefox_1.5.dfsg+1.5.0.3.orig.tar.gz + but has none of the corresponding Debian changes. + + -- Ian Jackson <iwj@ubuntu.com> Wed, 10 May 2006 12:13:30 +0100 + +firefox (1.5.dfsg+1.5.0.2-3) unstable; urgency=low + + * debian/rules, debian/control: Build the -dbg package again. + * debian/firefox.1: Fix some incorrect references to mozilla. Thanks + Loïc Minier. (Closes: #364101) + * debian/firefox-runner: Patch from Mikhail Gusarov to be able to use + Network Audio Server's dsp wrapper. (Closes: #363124) + * debian/firefox.install: Fix screwed up path to firefox.xpm. (Closes: + #364359) + * debian/README.Debian: Document that firefox doesn't allow connections + on certain ports. Thanks W. Borgert. (Closes: #362785) + + -- Eric Dorland <eric@debian.org> Sun, 23 Apr 2006 22:41:15 -0400 + +firefox (1.5.dfsg+1.5.0.2-2) unstable; urgency=critical + + * The "ftp-master's aren't my friends today" release. + * debian/rules, debian/control: Don't build the -dbg package for now, to + get around NEW queue processing. + + -- Eric Dorland <eric@debian.org> Thu, 20 Apr 2006 22:33:18 -0400 + +firefox (1.5.dfsg+1.5.0.2-1) unstable; urgency=critical + + [ Eric Dorland ] + * New upstream release. Contains security fixes, hence severity + critical. + - Fixes the following vulnerabilites (Thanks Alexander Sack for + compiling the list): CVE-2006-1724, CVE-2006-0884, + CVE-2006-1730, CVE-2006-1729, CVE-2006-1728, CVE-2006-1727, + CVE-2006-1045, CVE-2006-0748, CVE-2006-1726, CVE-2006-1725, + CVE-2005-2353. (Closes: #362656) + * debian/firefox-runner: Patch from Paul Collins to fix some lingering + ProfileManager launch issues. (Closes: #356250) + * browser/components/preferences/privacy.xul, + browser/locales/en-US/chrome/browser/preferences/preferences.dtd: + Patch from Ian Jackson to make the preferences window bigger for + people with high rez displays. His changelog entry reads: + * Make Preferences window not chop off various elements: + - specify a width of 50em instead of 42em + - do not specify a height + - add another <separator/> to the bottom of privacy.xul's prefpane. + I have no idea why this is necessary :-(. + Malone 36985. + * configure.in, configure: Small typo in configure.in that wasn't + setting TARGET_XPCOM_ABI properly and breaking binary extensions on + some arches. (Closes: #359228) + + [ Mike Hommey ] + * debian/rules: Disable elf-dynstr-gc, which is pretty useless nowadays. + * security/coreconf/rules.mk: Fix perl code that got broken by newer make. + Taken from bz#325148. + * browser/app/Makefile.in: Apply patch from bz#314927 to install default.xpm + in the correct place. + * debian/rules, debian/firefox.dirs, debian/firefox.install: Updated to fit + this change. + * security/coreconf/rules.mk: Force use of the -g flag in the CFLAGS. + + -- Eric Dorland <eric@debian.org> Sun, 16 Apr 2006 18:40:02 -0400 + +firefox (1.5.dfsg+1.5.0.2-0ubuntu2) dapper; urgency=low + + * Increase sizes of various dialogue boxes so that all of the contents + fit. Malone 26225, 36985, and probably others. + * Set MOZ_DISABLE_PANGO=1 to disable pango, unless some locale is + selected as supported which would need pango for rendering; the + default can be overridden by setting MOZ_DISABLE_PANGO to 0 or 1. + Malone 32561 (workaround). + * Use update-notifier to request a firefox restart. Malone 36739. + * Added Spanish translation to firefox.desktop. + Malone 39972. Thanks to Rocco Stanzione for the patch. + * Add a couple of missing trailing newlines. + Malone 39972 again. Thanks Rocco Stanzione for the report. + * EbmedWindow::GetVisibility bugfix, Malone 40320, upstream 312998, + thanks to chpe for the patch and discussion. + * Add FC_ANY_METRICS set to FcTrue to all patterns that are going to be + used for finding (rather than enumerating) fonts. Malone 42559. + + -- Ian Jackson <iwj@ubuntu.com> Tue, 2 May 2006 18:59:32 +0100 + +firefox (1.5.dfsg+1.5.0.2-0ubuntu1) dapper; urgency=low + + * New upstream version, 1.5.0.2. + Described as `stability and security fixes' by upstream but many + changes are included and producing a complete list is infeasible :-(. + Fixes are known to be included for: + - MFSA 2006-29, CVE-2006-1725: Spoofing with translucent windows + - MFSA 2006-28, CVE-2006-1726: Security check of + js_ValueToFunctionObject() can be circumvented + - MFSA 2006-27, CVE-2006-0748: Table Rebuilding Code Execution + Vulnerability + - MFSA 2006-25, CVE-2006-1727: Privilege escalation through Print Preview + - MFSA 2006-24, CVE-2006-1728: Privilege escalation using + crypto.generateCRMFRequest + - MFSA 2006-23, CVE-2006-1729: File stealing by changing input type + - MFSA 2006-22, CVE-2006-1730: CSS Letter-Spacing Heap Overflow + Vulnerability + - MFSA 2006-20, CVE-2006-1529, CVE-2006-1530, CVE-2006-1531, + CVE-2006-1723, CVE-2006-1724: Crashes with evidence of memory + corruption. + This package is based on Debian's firefox_1.5.dfsg+1.5.0.2.orig.tar.gz + but has none of the corresponding Debian changes. + + -- Ian Jackson <iwj@ubuntu.com> Wed, 26 Apr 2006 16:53:22 +0100 + +firefox (1.5.dfsg+1.5.0.1-5) unstable; urgency=low + + [ Mike Hommey ] + * debian/rules: + - Add -g to the build flags when building with DEB_BUILD_OPTIONS=nostrip. + If we ask for nostrip, we want the debugging + symbols, right? ;) + - Changed the way we identificate ourselves in vendor.js. + * layout/build/Makefile.in, layout/build/nsLayoutModule.cpp: Remove useless + useragent setter at startup so that general.useragent.product and + general.useragent.productSub set in our vendor.js preference file work at + startup time. + * security/coreconf/Linux.mk: + - Patch from Martin Michlmayr for mips64 builds. + - Don't use x86 as CPU_ARCH when building on an unsupported architecture. + * security/manager/Makefile.in, security/nss/lib/ckfw/builtins/Makefile, + security/nss/lib/manifest.mn: Don't build the stuff we don't need, and + dynamically link libnssckbi to both libplc4 and libplds4 instead of + linking statically. + * debian/firefox.postinst, debian/firefox.prerm, + debian/firefox-gnome-support.postinst, debian/firefox-gnome-support.prerm: + Touch a .autoreg file at configure time, or removal of gnome-support and + remove it with the package. This will trigger autoregistration of the + components if the compreg.dat and xpti.dat files are older than the + .autoreg file. We used to remove compatibility.ini for that reason, but + stopped doing that because firefox was supposed to do that correctly, + which actually only correctly works on new upstream versions, not new + debian revisions, or installation of gnome-support. + * xpfe/components/killAll/Makefile.in: Correctly install the killAll + component. + + [ Eric Dorland ] + * debian/control: + - Set Section of firefox-gnome-support and + mozilla-firefox-gnome-support to gnome. + - Standards-Version to 3.6.2.2. + - debhelper build-dep to >= 5.0. + - Add firefox-dbg package. + * debian/compat: Set to 5. + * debian/rules: + - Remove silly CVS tarball cleanup target. + - Add arch-independant debhelper calls, and make other debhelper + calls arch-dependent. + - Add --dbg-package=firefox-dbg to dh_strip call. + - Always build with the -g flag. (Based on a change Mike made) + - Patch from Andreas Jochens to use -mminimal-toc when building on + ppc64. (Closes: #361035) + - Use --disable-strip, --disable-strip-libs in configure parameters. + Thanks Ian Jackson. + - Use .upstream instead of .orig to make it more clear and not + confuse the clean target. Thanks Ian Jackson. (Closes: #362186) + - Disable xprint support for now, while the Xorg 7 transition sorts + itself out. Should be reenabled next release. + * debian/firefox.xpm: Add more Debian compliant menu icon. + * debian/firefox.install, debian/rules: Install new Debian compliant + icon. + * debian/firefox.desktop: Add StartupNotify=true for pretty waiting + cursor. Thanks Sven Arvidsson. (Closes: #361527) + * debian/firefox-dom-inspector.preinst, + debian/firefox-dom-inspector.links, + debian/firefox-dom-inspector.install: Install non-architecture + specific bits of the inspector into /usr/share/firefox. + * debian/firefoxrc: Disable the dsp wrapper by default. esddsp is just + too buggy to allow this to continue. May reenable later if they clean + up their act. Leaving the bugs open for now. + * debian/firefox.NEWS: + - Document the dsp wrapper changes. + - Remove old mozilla-firefox entries. + * debian/firefox.1: Fix typo of firefox, thanks Andrew Rendle. (Closes: + #362413) + * debian/firefox.install: We don't get .chk files anymore for some + reason. + + -- Eric Dorland <eric@debian.org> Fri, 14 Apr 2006 15:52:41 -0400 + +firefox (1.5.dfsg+1.5.0.1-4) unstable; urgency=low + + [ Mike Hommey ] + * debian/firefox-runner, debian/firefox.1: Patch from Ian Jackson to + make -P, -CreateProfile and -ProfileManager options correctly work + again, and improve the manual page. (Closes: #356250) + * debian/firefox.desktop: + - Fix trivial syntax problems. (Closes: #356263) + - Added Japanese and Korean translations. + * debian/firefox.dirs: Removed remainings of the time when we had a file + in /usr/sbin. (Closes: #356268) + * debian/firefox-gnome-support.prerm, + debian/firefox-gnome-support.postinst: Removed bashisms. (Closes: + #349946) + * debian/README.Debian: + - Replaced the bug reporting information by an invitation to read + /usr/share/bug/firefox/presubj. (Closes: #356269) + - Changed the heading to "Firefox for Debian". + + [ Eric Dorland ] + * debian/firefox-gnome-support.postinst, + debian/firefox-gnome-support.prerm: Add forgotten #DEBHELPER# token. + + -- Eric Dorland <eric@debian.org> Sun, 12 Mar 2006 21:34:14 -0500 + +firefox (1.5.dfsg+1.5.0.1-3) unstable; urgency=low + + [ Eric Dorland ] + * debian/control: Use strict dependencies for the transition packages, + no reason a transition package should be upgraded before the real + package. + * debian/README.Debian: Fix all references to + /etc/mozilla-firefox/mozilla-firefoxrc. (Closes: #351956) + * debian/firefox.desktop: Patch from Ian Jackson to add more + translations and more inline with the GNOME HIG. (Closes: #351807) + * widget/src/gtk2/nsWindow.cpp: Apply new ignore extended mouse buttons + patch from Peter Colberg (Closes: #351972) + * debian/firefox.1: Lower case first letter of -ContentLocale. + * debian/firefox.1, debian/firefox-runner: Add -no-remote switch to turn + on MOZ_NO_REMOTE. Use it for profile related commands as + well. (Closes: #351717, #344849) + * wikipedia.gif.uu, wikipedia.src, rules, firefox.install: Patch from + Ian Jackson to add wikipedia search engine. (Closes: #354107) + + [ Mike Hommey ] + * modules/libpref/src/init/all.js: Set default fonts for all languages to + serif, sans-serif and monospace. It might solve a lot of fonts problems. + * config/config.mk, config/make-jars.pl, configure.in, + security/nss/lib/fortcrypt/swfort/pkcs11/config.mk, + extensions/inspector/Makefile.in: Allow building without zip when + building flat chrome. + * configure: Ran autoconf accordingly to changes in configure.in. + * debian/control: Removed build dependency on zip. + * debian/rules: Build flat chrome. + * debian/firefox.install: Changed wildcards accordingly. + * config/rules.mk: + + Don't build chromelist.txt files. + + Fixed "jar" build so that inspector files don't get duplicated in the + extension directory. + + -- Eric Dorland <eric@debian.org> Sun, 26 Feb 2006 11:45:15 -0500 + +firefox (1.5.dfsg+1.5.0.1-2) unstable; urgency=low + + [ Mike Hommey ] + * debian/firefox-runner: export MOZ_DISABLE_PANGO. (Closes: #351959) + * debian/README.Debian: changed reference to the rc file in /etc. + (Closes: #351956) + + [ Eric Dorland ] + * debian/firefox.preinst: Fix {}'s bashism. Thanks Jeff King. (Closes: + #351811) + * modules/libpref/src/init/all.js: Make print.postscript.print_command + space-safe. Thanks Ian Jackson. (Closes: #351809) + * debian/firefox-runner: Don't completely override + $MOZ_PLUGIN_PATH. Thanks Ian Jackson. (Closes: #351806) + + -- Eric Dorland <eric@debian.org> Thu, 9 Feb 2006 01:23:35 -0500 + +firefox (1.5.dfsg+1.5.0.1-1ubuntu12) dapper; urgency=low + + * Sponsored upload for Theppitak Karoonboonyanan + * Updated Thai word breaking patch: + - load `libthai.so.0' instead of `libthai.so'. + - print debug message only when DEBUG is defined. + - debian/control: Suggests libthai0 + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 13 Apr 2006 13:25:14 +0200 + +firefox (1.5.dfsg+1.5.0.1-1ubuntu11) dapper; urgency=low + + * Fix silly lack of [ ] quoting in AC_DEFUN use. + Malone 36659, Mozilla bugzilla 298457. + * Make Preferences window not chop off various elements: + - specify a width of 50em instead of 42em + - do not specify a height + - add another <separator/> to the bottom of privacy.xul's prefpane. + I have no idea why this is necessary :-(. + Malone 36985. + * Fix broken UTF-8 in .desktop file (again). Malone 37779. + * Document how to use xpcshell in README.Debian. Malone 35333. + * Clarify updateReadOnlyMessage to refer to `system package manager' + which will help the misunderstanding in Malone 31284. + + -- Ian Jackson <iwj@ubuntu.com> Wed, 12 Apr 2006 17:18:52 +0100 + +firefox (1.5.dfsg+1.5.0.1-1ubuntu10) dapper; urgency=low + + * Generate `firefox-dbg' package with debugging symbols. + This involves changing debian/compat to 5, which should be safe. + * Fix Norwegian translation in firefox.desktop. (Malone 30603.) + * Fix trivial syntax problems in firefox.desktop. (Malone 33567.) + * Remove x-directory/webdav x-directory/webdav-prefer-directory + from MimeType list in desktop file. (Malone 35928.) + * Use `about.png.upstream' instead of `about.png.orig' is the saved + original version for the branding; *.orig tends to get clobbered. + + -- Ian Jackson <iwj@ubuntu.com> Fri, 24 Mar 2006 18:49:46 +0000 + +firefox (1.5.dfsg+1.5.0.1-1ubuntu9) dapper; urgency=low + + * added thai linebreaking support (thanks to Theppitak Karoonboonyanan) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 14 Mar 2006 15:16:52 +0000 + +firefox (1.5.dfsg+1.5.0.1-1ubuntu8) dapper; urgency=low + + * debian/rules: + - renamed the idl directory to match the .pc name, + replace mozilla-firefox by firefox for firefox-config too + + -- Sebastien Bacher <seb128@canonical.com> Mon, 13 Mar 2006 15:12:43 +0100 + +firefox (1.5.dfsg+1.5.0.1-1ubuntu7) dapper; urgency=low + + * Pointing the .pc files to /usr/include/firefox is not enough, + better install the headers there too. + + -- Matthias Klose <doko@ubuntu.com> Sat, 11 Mar 2006 17:41:24 +0000 + +firefox (1.5.dfsg+1.5.0.1-1ubuntu6) dapper; urgency=low + + * Replace Ubuntu Bugzilla bookmark with Launchpad's `Request + support with Ubuntu' ticket creation page. (Malone 28896.) + * Reinstate `Translate This Application' in Help menu, despite the fact + that Launchpad doesn't do this yet - you just get a page saying there + are no translations for Firefox. mdz assures us that this will be + done some time during dapper's service life. + * Make -P, -CreateProfile and -ProfileManager imply sensible + values for -a, and document -a in firefox(1). (Malone 31746.) + * Fix md5sum mismatch which causes spurious conffile prompt on + bookmarks.html. + * Set browser.startup.homepage_override.mstone to ignore, + to avoid the silly thing where the first time after the upgrade, + firefox looks like it has lost your home page because it is so keen to + tell you about the release notes. (Malone 33895.) + * Change `Latest Headlines' to `Latest BBC Headlines' to properly + disclose the source up front, and use a corresponding RSS URL. + * Revert the `you have chosen to open' dialogue, as discussed on + ubuntu-devel. + * Fix firefox-*.pc files to contain correct references to libs and + includes, just like the mozilla-*.pc files. (Malone 34200.) + + -- Ian Jackson <iwj@ubuntu.com> Thu, 9 Mar 2006 19:56:58 +0000 + +firefox (1.5.dfsg+1.5.0.1-1ubuntu5) dapper; urgency=low + + * Disable `Translate This Application' and don't try to have `Get Help + Online' translated because we don't know how to translate firefox: + https://launchpad.net/products/rosetta/+spec/rosetta-firefox-support + + -- Ian Jackson <iwj@ubuntu.com> Fri, 24 Feb 2006 14:49:23 +0000 + +firefox (1.5.dfsg+1.5.0.1-1ubuntu4) dapper; urgency=low + + * Disable (by default) the `you have chosen to open' dialogue box; + instead, we just take the default (which is to open with the + application from the Gnome MIME database). This behaviour is + controlled by browser.helperApps.defaultNoAsk.openFile. + + Bookmark, search and translation reference regression fixes: + * Restore `Translate This Application' and `Get Help Online' + * Add Ubuntu and Free Software links back to bookmarks + + Bookmark, search and translation references improvements: + * Add Wikipedia to search box. + * Remove `Quick searches' from bookmarks (these just replicate + entries from the search box, and are broken anyway). + + * Get rid of README.Ubuntu - the contents are now no longer relevant. + + -- Ian Jackson <iwj@ubuntu.com> Thu, 23 Feb 2006 14:44:42 +0000 + +firefox (1.5.dfsg+1.5.0.1-1ubuntu3) dapper; urgency=low + + * Move /usr/lib/libxpcom*.so etc. back to /usr/lib/firefox; avoids + clashes with other packages (eg mozilla). + * Add rpath setting for /usr/lib/firefox to all .pc files in + firefox-dev. This is suboptimal, but at least it allows programs + which use firefox-dev at compile-time to find firefox's .so's. + * Take some redundant and perhaps privacy-leaking information out + of the default User-Agent (Malone 30677). + + -- Ian Jackson <iwj@ubuntu.com> Fri, 10 Feb 2006 17:42:12 +0000 + +firefox (1.5.dfsg+1.5.0.1-1ubuntu2) dapper; urgency=low + + * Fix stupid FTBFS on default.xpm introduced in last upload. + * Retrospectively insert CVE numbers into 1ubuntu1 changelog entry. + + -- Ian Jackson <iwj@ubuntu.com> Thu, 9 Feb 2006 12:45:15 +0000 + +firefox (1.5.dfsg+1.5.0.1-1ubuntu1) dapper; urgency=low + + Changes since 1.5.dfsg-4ubuntu6: + * New upstream version (1.5.0.1) - security and stability fixes, + allegedly. (About 7000 lines of diff, so not reviewed for Ubuntu.) + Security fixes included: + - CVE-2006-0292, CVE-2006-0293, MFSA 2006-01: JavaScript garbage-collection + hazards + - CVE-2006-0294, MFSA 2006-02: Changing position:relative to static + corrupts memory + - CVE-2005-4134, MFSA 2006-03: Long document title causes startup denial of + Service + - CVE-2006-0295, MFSA 2006-04: Memory corruption via QueryInterface on + Location, Navigator objects + - CVE-2006-0296, MFSA 2006-05: Localstore.rdf XML injection through + XULDocument.persist() + - CVE-2006-0297, MFSA 2006-06: Integer overflows in E4X, SVG and Canvas + - CVE-2006-0298, MFSA 2006-07: Read beyond buffer while parsing XML + - CVE-2006-0299, MFSA 2006-08: "AnyName" entrainment and access control + hazard + * Fix Norwegian translation in .desktop file. (Malone #30603.) + * mkdir /usr/include/mozilla in firefox-dev.preinst to avoid + maintainer script sometimes preventing installation. + * Move the shlibs needed for gtkmozembed to /usr/lib (avoids + need for rpath and nonsense in firefox-gtkmozembed.pc). + * Work around new GNU make braindamage by adding seddery to + security/coreconf/rules.mk. + + Expected-permanent differences between Ubuntu and Debian: + * Build nspr and nss for use by all other programs in the distribution + (Packages: libnspr-dev, libnss-dev, libnspr4, libnss3. Fairly main + changes to parts of the build system.) This is so that mozilla + can be in Ubuntu universe. + * Disable xprint. (xprint is not used in Ubuntu.) + * Slightly different arrangements do with with transitional arrangements + related to package renaming from mozilla-firefox-*. + * Removed transitional packages mozilla-firefox-dom-inspector and + mozilla-firefox-gnome-support (not needed in Ubuntu). + * Build firefox-dev; applications which embed a browser in Ubuntu + generally embed Firefox rather than mozilla. This also means that we + build firefox with dynamic linking so that embedders and load ff. + * Debian package search replaced by Ubuntu package search (and defaults + to searching only in dapper, not all releases). + * Changes to various icons (and their installation paths). + * Strip CUPS/ from the front of displayed printer names, since + all printing in Ubuntu is done via CUPS. + + Other differences remaining between Ubuntu and Debian: + * debian/rules clean removes various junk left over by the mozilla build + system. (Debian #350616.) + * Exclude libssl3.so from dpkg_shlibdeps as this triggers a bug in + fakeroot on amd64 in Ubuntu. + * Set FIREFOX_DSP=none by default. Will sometimes break sound from eg + Flash. See https://launchpad.net/malone/bugs/29760 for rationale. + (Debian maintainers notified but no bug filed.) + * Append our plugin path to any previous value of MOZ_PLUGIN_PATH. + (Malone 29412. Debian #351806) + * firefox.desktop file has more translations and consistently calls the + application `Firefox Web Browser' (for better UI in the menus - this + change is also in firefox.menu). Debian #351807. + * Default printing command doesn't break if printer name contains + spaces (actually a preference, in all.js). (Debian #351809, + Mozilla Bugzilla #326245). + * security/coreconf/rules.mk adjusted with awful seddery to cope with + GNU make change to POSIXly interpretation of backslash line-joining. + See http://lists.debian.org/debian-devel/2005/12/msg00988.html. + Mozilla Bugzilla #325148. + * security/coreconf/ruleset.mk has a set -e added. + * Use GNOME mime database instead of mailcap. Patch imported from Red + Hat; see debian/gnome-mime-handling.diff. + * Change various preferences: + - Ubuntu-specific default homepage + - Ubuntu-specific release notes + - default homepage can be locale-specific + - middlebutton paste disabled + - do not load a special home page on first start after an upgrade + - disable File / Import (wizard is nonfunctional). + Malone #28563, Debian #350599, Mozilla Bugzilla 117844. + - save files to Desktop by default + - README.Ubuntu file (still rather full of junk) + - Prevent websites disabling the right-button context menu. + - Default font for display is sans, but: + - Default CSS for printing uses a serif font. + + -- Ian Jackson <iwj@ubuntu.com> Tue, 7 Feb 2006 17:14:17 +0000 + +firefox (1.5.dfsg+1.5.0.1-1) unstable; urgency=low + + * The "those Ubuntu guys are great after all" release. + * New upstream release. (Closes: #351442) + + [ Mike Hommey ] + * debian/presubj: Added indications to try to reproduce without extensions + before actually filing a bug, and a hint to the safe mode. + * debian/firefox.install: added the reporter chrome files. (Closes: #344888) + * widget/src/gtk2/nsWindow.cpp: Revert additional stale patch for + extended mouse buttons support. + * debian/firefox.postinst, debian/firefox.prerm: unbashified. + (Closes: #349946) + * debian/control, debian/firefox-gnome-support.postinst, + debian/firefox-gnome-support.prerm: Let the firefox-gnome-support + package provide gnome-www-browser and handle a gnome-www-browser + alternative. Thanks Loïc Minier. (Closes: #350788) + * debian/firefox-runner: Enable Pango support by default. The + MOZ_ENABLE_PANGO environment variable is now useless. (Closes: #338716) + * debian/README.Debian: Change the paragraph about Pango to hint about + the MOZ_DISABLE_PANGO variable. + + [ Eric Dorland ] + * content/events/src/nsEventStateManager.cpp, + modules/libpref/src/init/all.js, widget/public/nsGUIEvent.h: Apply + patch from Ian Jackson to revert a stale patch for multiple mouse + button support that was fixed in a different way in 1.5 + (Closes: #348375) + * debian/firefox.preinst: Check md5sum's of old conffiles before cp'ing + them on upgrade. This won't stop all unnecessary conffile prompting in + all situations (especially from really old versions), but should + definitely should work for upgrading from testing or stable. (Closes: + #345112) + * debian/firefox.install: + - Remove run-mozilla.sh. (Closes: #348902) + - Reorganize things a bit. + - Move profile into /etc/firefox here, instead of in the rules file. + * debian/firefox.install, debian/firefox.preinst, debian/firefox.links, + debian/firefox.dirs, debian/rules: Move chrome, defaults, greprefs + into /usr/share/firefox for more FHS goodnesss. + * debian/firefox.1: Document -new-tab and -new-window options, and + remove deprecated -remote option. (Closes: #348699) + * debian/firefox-runner: Apply patch to properly URL escape local + files. Thanks Morita Sho. (Closes: #348451) + * browser/app/profile/firefox.js: + - Reallow 40-bit ciphers, since now firefox warns people who + use them. (Closes: #349624) + - Enable bidi UI elements for our bi-directional friends. + (Closes: #348069) + * debian/rules: Remove glob pattern from dh_install invocation. Thanks + Ian Jackson. (Closes: #350571) + * browser/base/content/aboutDialog.xul: Fix spurious scrollbar in the + about dialog box. Thanks Ian Jackson. (Closes: #350608) + * js/src/fdlibm/fdlibm.h: Patch to fix little endianess of + mipsel. Thanks Ian Jackson and Thiemo Seufer. (Closes: #350621) + * browser/base/content/search.xml: Patch from Ian Jackson to remove + misleading Clear option from search box context menu. (Closes: #350611) + * debian/watch: Fix regex to actually find the upstream tarballs. + * modules/libpref/src/init/all.js: Cope better with printers with spaces + in the name. Thanks Ian Jackson. + * toolkit/components/passwordmgr/base/nsPasswordManager.cpp: Take patch + from bz#235336 as suggested by Ian Jackson to allow password manager + to work with sites that only have a password field, no username. + + -- Eric Dorland <eric@debian.org> Mon, 6 Feb 2006 23:10:29 -0500 + +firefox (1.5.dfsg-4) unstable; urgency=low + + [ Eric Dorland ] + * debian/control, debian/rules: + - Remove Kerberos options, it is now loaded dynamically. + - Use /usr/share/firefox now for finding default.xpm. + * debian/firefox.install, debian/firefox.links, debian/firefox.preinst: + Start moving some clearly non-arch specific things + (/usr/lib/firefox/searchplugins, /usr/lib/firefox/icons, + /usr/lib/firefox/res) out of /usr/lib/firefox and into + /usr/share/firefox to make things more FHS friendly. Can't believe no + one ever called me on this before. + * toolkit/components/remote/nsGTKRemoteService.cpp, + widget/src/xremoteclient/XRemoteClient.cpp: Apply patch from bz#312154 + to fix remote interface on PPC (and probably other arches). (Closes: + #343913) + * xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_m68k.cpp: Patch from + Zack Weinberg to fix FTBFS on m68k. (Closes: #343687) + * xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp: Patch from Antti + P Miettinen to fix small optimization problem with newer gcc's + (Closes: #344846) + + [ Mike Hommey ] + * debian/firefox-runner: Cleaned up now useless variables. + + -- Eric Dorland <eric@debian.org> Tue, 10 Jan 2006 10:11:34 -0500 + +firefox (1.5.dfsg-3) unstable; urgency=low + + * debian/control: + - Need explicit build dependency on gtk >= 2.8. + - Upgrade Standards-Version to 3.6.2.1. No changes. + - Add compatibility packages for mozilla-firefox-dom-inspector + and mozilla-firefox-gnome-support and make all the upgrade packages + Architecture: all. (Closes: #343879, #344379) + * debian/watch: Add watch file. + * debian/about.png.uu: Add uuencoded version of previous about box + graphic. + * debian/rules: uudecode and install the about.png into the right + location. + * debian/firefox-runner: Add MOZ_PLUGIN_PATH to include plugins at the + old location for now. (Closes: #344085, #341682) + * widget/src/gtk2/nsWindow.cpp: Patch from bz#305970 to fix broken + contextual menu on Save File As. (Closes: #344430) + + * config/mkdepend/imakemdep.h, security/nss/lib/pki1/pki1.h: Remove some + patches that are now useless (suggested by Mike Hommey). + * mailnews/extensions/palmsync/palm.html, + browser/themes/pinstripe/browser/browser.css, + gfx/src/mac/nsNativeThemeMac.h, + directory/c-sdk/ldap/docs/draft-ietf-ldapext-ldap-c-api-05.txt, + layout/html/tests/table/bugs/bug123862.html, + layout/html/tests/table/bugs/bug119786.html, + layout/html/tests/table/bugs/bug101759.html, + layout/html/tests/table/bugs/bug14489.html, + layout/html/tests/table/bugs/bug222846.html, + layout/html/tests/block/bugs/155333-1.html, + layout/html/tests/block/bugs/185411-2.html, + layout/html/tests/block/bugs/13599.html, + layout/html/tests/block/bugs/53960.html, + layout/html/tests/block/bugs/155333-2.html, + layout/html/tests/block/bugs/38157-a.html, + layout/html/tests/block/bugs/38157-b.html, + layout/html/tests/block/bugs/46918.html, + layout/html/tests/block/printing/145305-11.html, + layout/html/tests/block/printing/145305-21.html, + layout/html/tests/block/printing/145305-13.html, + layout/html/tests/block/printing/145305-17.html, + layout/html/tests/block/printing/145305-19.html, + layout/html/tests/block/printing/145305-4.html, + layout/html/tests/block/printing/127145-1.html, + layout/html/tests/block/printing/145305-3.html, + layout/html/tests/block/printing/145305-7.html, + layout/html/tests/block/printing/145305-9.html, + layout/html/tests/frameset/core/r3.html, + layout/html/tests/frameset/core/r4.html, + layout/html/tests/frameset/core/blank2.html, + xpinstall/packager/stage_mfcembed.pl, xpinstall/packager/stage_gre.pl, + embedding/qa/testembed/Tests.cpp, + embedding/qa/testembed/nsihttpchanneltests.cpp, + embedding/qa/testembed/BrowserImpl.cpp, + embedding/qa/testembed/Tests.h, embedding/qa/testembed/QaUtils.cpp, + embedding/qa/testembed/resource.h, + embedding/qa/testembed/DomWindow.cpp, + embedding/qa/testembed/QaUtils.h, build/unix/abs2rel.pl, + xpfe/bootstrap/icons/windows/readme.txt, + security/nss/cmd/ssltap/ssltap-manual.html: Fix mess my subversion + repository made of line endings. This should reduce the size of the + diff.gz dramatically. + + -- Eric Dorland <eric@debian.org> Sat, 24 Dec 2005 03:23:02 -0500 + +firefox (1.5.dfsg-2) unstable; urgency=low + + * browser/locales/en-US/chrome/branding/brand.dtd, + browser/locales/en-US/chrome/branding/brand.properties: Change brand + name from Deer Park to Firefox. About box graphic still needs to be + fixed. *grumble* *grumble* (Closes: #343704) + + -- Eric Dorland <eric@debian.org> Sat, 17 Dec 2005 13:45:14 -0500 + +firefox (1.5.dfsg-1) unstable; urgency=low + + * New upstream release. No actual code changes from RC3. Took the + opportunity to completely empty the /other-licenses directory of the + upstream tarball. + * configure, configure.in: Change MOZ_APP_DISPLAYNAME to Firefox, so we + can be called Firefox without using + --enable-official-branding. *grumble* + * config/autoconf.mk.in, gfx/src/gtk/mozilla-decoder.cpp, configure.in: + Apply patch from bz#305185 to fix problems building against gtk+ 2.8. + * debian/control: + - Build-Depend on libfreetype6-dev since we do link + against it directly. + - Add mozilla-firefox package for easy transition. + - Conflict against older mozilla-firefox packages. + * debian/firefox-runner: + - Fix typo. (Closes: #341113) + - Check /usr/lib/mozilla-firefox/plugins for plugins too for the + time being. (Closes: #341682) + * debian/firefox-dom-inspector.preinst: Remove, not needed since the + name change. + * debian/firefox.preinst: + - Remove old upgrade code. + - Move old mozilla-firefox configs into place on install. + * debian/mozilla-firefox.preinst: Move upgrade code in here. Remove + mozilla-firefox alternative. + * debian/mozilla-firefox.postrm: Remove /etc/mozilla-firefox on purge. + + * Some patches missed when merging from Mike Hommey: + * browser/locales/en-US/searchplugins/answers.src: Change updateDays to + 0. + * config/mkdepend/imakemdep.h: Define for amd64. + * configure, configure.in: Visibility patch for recent gcc's. (Closes: + #341766) + * modules/libpref/src/nsPrefService.cpp: Patch to load preferences from + defaults/syspref. + * content/events/src/nsEventStateManager.cpp: Extended mouse events + patch. + * gfx/idl/nsIFreeType2.idl, gfx/src/freetype/nsFreeType.cpp, + gfx/src/freetype/nsFreeType.h, gfx/src/ps/nsFontMetricsPS.h, + gfx/src/x11shared/nsFontFreeType.cpp, + gfx/src/x11shared/nsFontFreeType.h, + layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp: Patch to + use new freetype API. + + -- Eric Dorland <eric@debian.org> Fri, 16 Dec 2005 11:37:23 -0500 + +firefox (1.4.99+1.5rc3.dfsg-2) unstable; urgency=low + + * The "Grand Renaming" release. Thanks to Mike Hommey for sherperding + the 1.5 series through experimental. Now it's my turn to muck it up. A + transition packages will be in the next release. + * debian/mozilla-firefox*: Rename to firefox*. + * debian/firefox.install, debian/firefox-dom-inspector.install, + debian/firefox-gnome-support.install, debian/firefox-runner, + firefox-xremote-client, firefox.1, firefox.desktop, firefox.dirs, + debian/firefox.js, debian/firefox.links, debian/firefox.manpages, + debian/firefox.menu, debian/firefox.mime, debian/firefox.postinst, + debian/firefox.prerm, debian/firefox.png.uu, debian/README.Debian, + debian/control, debian/rules: Search/Replace mozilla-firefox -> + firefox where appropriate. + * debian/firefox.links: Link old icon name to new. + * debian/README.Debian: Fix path to .mozilla/firefox/rc. (Closes: + #335433) + * config/autoconf.mk.in: Set mozappdir to /usr/lib/firefox. + + -- Eric Dorland <eric@debian.org> Sun, 27 Nov 2005 20:03:02 -0500 + +mozilla-firefox (1.4.99+1.5rc3.dfsg-1) experimental; urgency=low + + * New upstream 1.5 preview release. Release Candidate 3. + * debian/mozilla-firefox-runner: Removed the ping stuff, it's now done by + firefox itself. + + -- Mike Hommey <glandium@debian.org> Fri, 18 Nov 2005 07:24:05 +0100 + +mozilla-firefox (1.4.99+1.5rc2.dfsg-1) experimental; urgency=low + + * New upstream 1.5 preview release. Release Candidate 2. + * xpcom/typelib/xpidl/xpidl.c: Fix crash when no file is given on the + command line (Closes: #323639). Also fix the error message about extra + arguments given showing before the crash. + * configure.in, configure: Work around dash's bug #337294 so that we can + build fine when sh is dash (Closes: #211010, #256384). + * debian/mozilla-firefox-runner: + - Removed the code to detect the JVM and set LD_ASSUME_KERNEL=2.2.5 for + b0rked 1.3 JVMs: it's been a long time they've not been ABI compatible. + - Removed setting of MOZILLA_FIVE_HOME. We already have a default one + built-in. + - Removed /usr/lib/mozilla/plugins from EXTENT_LD_LIB_PATH, since we never + get the plugins from there. + - Removed cleanup of the profile. It is correctly done by firefox, now. + + -- Mike Hommey <glandium@debian.org> Fri, 11 Nov 2005 08:07:05 +0100 + +mozilla-firefox (1.4.99+1.5rc1.dfsg-1) experimental; urgency=low + + * New upstream 1.5 preview release. Release Candidate 1. + * debian/mozilla-firefox.install: Don't install + /usr/lib/mozilla-firefox/extensions/reporter@mozilla.org, it got moved in + the chrome. + + -- Mike Hommey <glandium@debian.org> Tue, 1 Nov 2005 22:01:15 +0100 + +mozilla-firefox (1.4.99+1.5beta2.dfsg-1) experimental; urgency=low + + * build/unix/run-mozilla.sh, netwerk/base/src/nsStandardURL.cpp: + Reverted debian changes: they got applied upstream. + * configure: Applied configure.in changes by hand. + * debian/rules: Disabled both the installer and the updater, we don't need + them. + + -- Mike Hommey <glandium@debian.org> Fri, 7 Oct 2005 15:06:05 +0200 + +mozilla-firefox (1.4.99+1.5beta1.dfsg-5) experimental; urgency=low + + * debian/control: Bumped Standards-Version to 3.6.2. + * nsprpub/configure.in: Reverted changed. + * configure.in: Use -fvisibility=hidden in all cases. There is another bug + in gcc that makes it generate position dependent code when using the + system wrappers. + * configure, nsprpub/configure: Applied configure.in changes with + autoconf2.13. + * debian/rules: Put back the /usr/share/pixmaps/mozilla-firefox.xpm file. + + -- Mike Hommey <glandium@debian.org> Mon, 3 Oct 2005 18:46:50 +0200 + +mozilla-firefox (1.4.99+1.5beta1.dfsg-4) experimental; urgency=low + + * xpcom/typelib/xpt/src/Makefile.in: Reverted changes. + * configure.in, nsprpub/configure.in: Added a detection of the gcc bug about + visibility for builtins, and use -fvisibility=hidden instead of the system + wrappers in case the bug is found. + * configure, nsprpub/configure: Applied configure.in changes with + autoconf2.13. (Really closes: #329642) + + -- Mike Hommey <glandium@debian.org> Tue, 27 Sep 2005 20:16:34 +0200 + +mozilla-firefox (1.4.99+1.5beta1.dfsg-3) experimental; urgency=low + + * Sync with unstable branch. + * xpcom/typelib/xpt/src/Makefile.in: disable visibility stuff for ppc, as a + workaround for FTBFS. (Closes: #329642) + + -- Mike Hommey <glandium@debian.org> Mon, 26 Sep 2005 18:35:11 +0200 + +mozilla-firefox (1.0.7-1) unstable; urgency=high + + * New upstream release. Contains fixes for various security issues. + * debian/mozilla-firefox-runner: Remove /usr/lib from + LD_LIBRARY_PATH. (Closes: #321789) + + -- Eric Dorland <eric@debian.org> Thu, 22 Sep 2005 01:23:10 -0400 + +mozilla-firefox (1.4.99+1.5beta1.dfsg-2) experimental; urgency=low + + * debian/rules: enabled support for canvas. + + -- Mike Hommey <glandium@debian.org> Tue, 20 Sep 2005 07:56:01 +0200 + +mozilla-firefox (1.4.99+1.5beta1.dfsg-1) experimental; urgency=low + + * Cleaned-up source tarball from trademarked content and CVS directories. + * debian/mozilla-firefox-small.xpm, debian/mozilla-firefox.xpm: Removed. + * debian/mozilla-firefox.dirs, debian/rules: + + Create /usr/lib/mozilla-firefox/chrome/icons/default and move + default.xpm in it. (Closes: #327828) + + Stop using our own xpm icons, upstream provide them, now. + * debian/rules: changed the build system a bit. + * xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s: Somewhat these + files disappeared. Put them back. (Closes: #328074) + + -- Mike Hommey <glandium@debian.org> Tue, 13 Sep 2005 18:25:48 +0200 + +mozilla-firefox (1.4.99+1.5beta1-2) experimental; urgency=critical + + * Sync with unstable branch. + * netwerk/base/src/nsStandardURL.cpp: Apply the patch for the 1.8 branch + from bz#307259 to fix CAN-2005-2871. (Closes: #327452) + * debian/mozilla-firefox-gnome-support.install, debian/rules: Move out + imgicon module in mozilla-firefox-gnome-support. (Closes: #327451) + + -- Mike Hommey <glandium@debian.org> Sun, 11 Sep 2005 10:45:34 +0200 + +mozilla-firefox (1.0.6-5) unstable; urgency=critical + + * xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp: Fix for previous + arm fix. Thanks Steve. (Closes: #325535) + * netwerk/base/src/nsStandardURL.cpp: Patch from bz#307259 to fix + CAN-2005-2871, a buffer overflow vulnerability in IDN + processing. (Closes: #327452) + + -- Eric Dorland <eric@debian.org> Sat, 10 Sep 2005 23:03:26 -0400 + +mozilla-firefox (1.4.99+1.5beta1-1) experimental; urgency=low + + * New upstream beta release. + + Find toolbar doesn't show up when in text fields. Closes: #280852. + + Better use of GTK2 themes. The most common case was highlighted menu + item text appearing in white on a white background. Closes: #223696, + #257430, #258181, #266334, #278559, #289326, #297320, #310098. + + Download manager correctly closes. Closes: #259015, #269975. + + Doesn't crash with the http://ln.hixie.ch/resources/style/orange + stylesheet. Closes: #277987. + + Locale extensions can properly be disabled. Closes: #279749 (to check). + + Doesn't crash on + http://einsteinmg.dyndns.org/cgi-bin/remangle.cgi?=0x27b9b660 anymore. + Closes: #294372. + + Downloads don't freeze when a modal window opens. Closes: #211332. + + Use GTK stock images. Closes: #281660. + * Sync with unstable branch changes. + * browser/app/profile/firefox.js, debian/firefox.js: + + Removed outdated extensions.update.autoUpdateEnabled and + extensions.update.autoUpdate; + + Removed general.useragent.locale. + + Allow extensions updates. It works correctly with system-wide installed + ones, now. + * netwerk/protocol/http/src/nsHttpConnectionMgr.cpp, + nsprpub/pr/include/md/_linux.cfg, widget/src/gtk2/mozdrawingarea.c, + widget/src/gtk2/nsDragService.cpp: Reversed changes, since they got + applied upstream. + * xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp: correctly set + __attribute__. Closes: #325535. + * debian/rules: + + set --enable-extensions=default instead of a full list. + We will get the default set of extensions provided by upstream, and + won't need to check if they changed. + + set --enable-pango. + + set --enable-system-cairo. + * debian/control: added build dependency on libgnomeui-dev and libcairo2-dev. + * debian/mozilla-firefox.install, debian/rules: don't install files in + /usr/lib/mozilla-firefox/chrome/icons/ anymore. + * debian/mozilla-firefox-runner: Force MOZ_DISABLE_PANGO to 1 if + MOZ_ENABLE_PANGO is not set. + * debian/README.Debian: + + Removed the note about IDN, it is now enabled by default, with correct + whitelist set. + + Added a note about MOZ_ENABLE_PANGO. + + Changed notes about application update, extensions, and packaged + extensions. + * modules/libpref/src/init/all.js: + + Set general.config.obscure_value to 0, we don't care about the config + file not to be "obscured". + + Set general.config.filename to firefox.cfg. + * debian/firefox.cfg: Create configuration to lock some properties. + * debian/mozilla-firefox.install: Install this firefox.cfg in + /usr/lib/mozilla-firefox + + -- Mike Hommey <glandium@debian.org> Fri, 9 Sep 2005 17:40:40 +0200 + +mozilla-firefox (1.0.6-4) unstable; urgency=low + + * xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp: Patch + from Steve Langasek to fix unused vs. used gcc attribute on alpha and + arm. (Closes: #325535) + * browser/app/profile/firefox.js: Revert patch to remove the "I'm + feeling lucky" search. Some like it, some hate it, so upstream + behaviour wins. If you still feel strongly about it, make your case + upstream. + * gfx/src/gtk/nsFontMetricsXft.cpp: Apply patch from bz#252033 to work + around a bug in XRender that might be causing #319349. + + -- Eric Dorland <eric@debian.org> Tue, 6 Sep 2005 02:10:07 -0400 + +mozilla-firefox (1.0.99+deerpark-alpha2-2) experimental; urgency=low + + * Sync with unstable branch changes, except the controversial "I'm feeling + lucky" change. I prefer waiting for the controversy to get to a + conclusion. + * debian/rules, debian/control: Remove build dependency on libmng-dev and + the --with-system-mng option to configure, the MNG support has been + removed upstream. + * debian/rules: Explicitely set the svg-renderer as cairo. It will use an + old cairo version bundled with firefox, but there's no other solution for + the moment. We have to wait for upstream 0.9.x and greater support + (hoped for 1.5). + + -- Mike Hommey <glandium@debian.org> Sun, 4 Sep 2005 09:01:54 +0200 + +mozilla-firefox (1.0.6-3) unstable; urgency=low + + * debian/rules, nsprpub/pr/include/md/_linux.cfg, + security/coreconf/Linux.mk: Apply patch from Andreas Jochens to allow + ppc64 builds. (Closes: #322617) + * debian/mozilla-firefox.prerm: Move -depth option to find to suppress + warnings. Thanks Mike Hommey. + * debian/presubj: Have bugzilla bug URL point to a page where you can + enter a bug. + * browser/app/profile/firefox.js: removed the "I'm feeling lucky" from + the keyword.URL, so now if you enter search terms in the address bar + you will be presented with search results and not taken to the first + result. Thanks Torok Edwin. (Closes: #321823) + + -- Eric Dorland <eric@debian.org> Mon, 22 Aug 2005 01:20:28 -0400 + +mozilla-firefox (1.0.6-2) unstable; urgency=medium + + * modules/libpr0n/src/imgLoader.cpp, modules/libpr0n/src/imgLoader.h: + Apply ported patch from Serge Belyshev from bz#293307 to fix problem + with gcc-4.0 on amd64. (Closes: #319336) + * debian/rules: Remove silly --enable-freetype configure line. Thanks + Antony Gelberg. (Closes: #319886) + + -- Eric Dorland <eric@debian.org> Sat, 30 Jul 2005 02:11:03 -0400 + +mozilla-firefox (1.0.6-1) unstable; urgency=low + + * New upstream release. (Closes: #318672) + * debian/rules: Remove hack to use gcc 3.4 on amd64, since now we're all + on gcc 4.0. (Closes: #318684) + * debian/control: + - Remove gcc 3.4 build depends on amd64 + - Explicitly build depend on libxinerama-dev. + * gfx/src/gtk/nsScreenGtk.cpp: Patch from Loic Minier to fix + gdk_property_get warnings. + * widget/src/gtk2/mozdrawingarea.c: Patch from Loic Minier to fix + crashes under GTK 2.7. (Closes: #318903) + + -- Eric Dorland <eric@debian.org> Wed, 20 Jul 2005 02:57:44 -0400 + +mozilla-firefox (1.0.99+deerpark-alpha2-1) experimental; urgency=low + + * New upstream alpha release. Be aware that you WILL have troubles with + debian packages for firefox extensions. + * Reverted patches that got incorporated upstream. + * content/events/src/nsEventStateManager.cpp: Some changes to the previous + patch to fit changes in API. + * debian/update-mozilla-firefox-chrome, + debian/update-mozilla-firefox-chrome.8, + debian/mozilla-firefox-dom-inspector.post(inst|rm), + debian/mozilla-firefox-gnome-support.post(inst|rm), + debian/theme/*, debian/inspector/*: Removed. + * debian/mozilla-firefox.postinst: Removed call to + update-mozilla-firefox-chrome. + * debian/mozilla-firefox-dom-inspector.install: Only install files from + /usr/lib/mozilla-firefox/extensions/inspector@mozilla.org + * debian/mozilla-firefox.dirs: Don't create /var/lib/mozilla-firefox/*, + /usr/lib/mozilla-firefox/extensions nor /usr/lib/mozilla-firefox/plugins. + * debian/mozilla-firefox.install: + - Don't install regxpchrome, chrome/pipnss.jar and chrome/help.jar which + don't exist anymore. + - Install manifest files in addition to jar files in chrome. + - Install classic.jar in the normal chrome directory (awaiting EM + modifications so that it can actually go back in the extensions + directory). + - Don't install debian/theme/00classic and debian/theme/Uninstall, + which got removed. + - Get the theme in the correct directory (it's not in + defaults/profile/extensions anymore). + - Install the reporter extension. + - Selectively install subdirectories of /usr/lib/mozilla-firefox/defaults, + since some of them are useless. + - Install the unixprint plugin. + * debian/mozilla-firefox.manpages: Removed manual page for + update-mozilla-firefox-chrome. + * debian/mozilla-firefox.links: Removed all links in + /var/lib/mozilla-firefox/. + * debian/rules: + - Enable freetype in the build, we'll see if deerpark is any better than + 1.0.x. + - Commented out OPTFLAGS set for some architectures. We will see if gcc + 4.0 is doing any better. + - Enabled SVG support. (Closes: #215990) + - Enabled some more extensions to fit extensions provided by upstream. + - Added needed --enable-application=browser to the ./configure call. + - Don't install update-mozilla-firefox-chrome. + - Don't create installed-chrome.txt. + - Don't remove installed-extensions.txt, it doesn't exist anyway. + - Don't move classic theme's install.rdf, it's already at the correct + place. + - Remove unneeded removals of preferences files which are not there + anymore. + * debian/mozilla-firefox.preinst: Clean-up old generated files (those in + /var/lib/mozilla-firefox and + /usr/lib/mozilla-firefox/extensions/*/uninstall/Uninstall. (Note that for + the latter, some packages do provide them, but they were overwritten by + update-mozilla-firefox-chrome. They have actually no use, and it is safe + to remove them. Extensions packages will eventually remove them anyway) + * debian/mozilla-firefox.prerm: Put -depth option of find before -type d. + + -- Mike Hommey <glandium@debian.org> Sat, 16 Jul 2005 10:18:40 +0200 + +mozilla-firefox (1.0.5-1) unstable; urgency=high + + * New upstream release, fixes security issues. (Closes: #318061) + * debian/rules: Disable freetype in the build for the time being. This + *might* break printing in some cases. + * gfx/idl/nsIFreeType2.idl, gfx/src/freetype/nsFreeType.cpp, + gfx/src/freetype/nsFreeType.h, gfx/src/ps/nsFontMetricsPS.cpp, + gfx/src/ps/nsFontMetricsPS.h, gfx/src/x11shared/nsFontFreeType.cpp, + gfx/src/x11shared/nsFontFreeType.h, + layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp: Patch + from bz#234035 to try to get building with the new freetype. (Closes: + #314243) + + -- Eric Dorland <eric@debian.org> Sat, 16 Jul 2005 00:43:54 -0400 + +mozilla-firefox (1.0.4-3) unstable; urgency=low + + * debian/mozilla-firefox.desktop: Add Czech translation from Jan + Outrata. (Closes: #311376) + * xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_ipf64.cpp, + xpcom/reflect/xptcall/public/xptcstubsdecl.inc: Revert patch from + David Mosberger for 7+ args on ia64 that was added 1.0.3-2. + * xpcom/reflect/xptcall/src/md/unix/xptcstubs_ipf32.cpp, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf32.s, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_ipf64.cpp, + xpcom/reflect/xptcall/public/genstubs.pl: Better patch from bz#291378 + which has been accepted upstream for ia64 7+ args fix. + * xpcom/reflect/xptcall/public/xptcstubsdecl.inc: Call genstubs.pl to + regenerate this file. + * dom/src/base/nsGlobalWindow.cpp, + embedding/components/windowwatcher/src/nsWindowWatcher.cpp: Fix + injection spoofing, patch from bz#296850. Fixes CAN-2004-0718. + + -- Eric Dorland <eric@debian.org> Thu, 9 Jun 2005 23:54:41 -0400 + +mozilla-firefox (1.0.4-2) unstable; urgency=critical + + * debian/control: Build-depend on libxft-dev not libxft2-dev to appease + finicky sparc buildd. + + -- Eric Dorland <eric@debian.org> Mon, 16 May 2005 21:17:57 -0400 + +mozilla-firefox (1.0.4-1) unstable; urgency=critical + + * New upstream release. Fixes CAN-2005-1477 and CAN-2005-1476. (Closes: #308620) + * debian/update-mozilla-firefox-chrome.8: Patch from A Costa to fix the + spelling of maintenace. (Closes: #305968) + * debian/mozilla-firefox.desktop: Patch from Steinar H. Gunderson to add + a Norwegian translation. (Closes: #305983) + + -- Eric Dorland <eric@debian.org> Thu, 12 May 2005 22:59:47 -0400 + +mozilla-firefox (1.0.3-2) unstable; urgency=high + + * browser/app/profile/firefox.js: Disable SSLv2 and 40-bit ciphers by + default. + * debian/mozilla-firefox.NEWS: Explain the SSL change. + * extensions/transformiix/source/base/Double.cpp: Patch from David + Mosberger-Tang (fixed up by me) to fix unaligned access on ia64 (and + perhaps other platforms). (Closes: #303518) + * xpcom/reflect/xptcall/public/xptcstubsdecl.inc, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_ipf64.cpp: Another patch + from David Mosberger-Tang to fix extension loading on ia64. (Closes: + #303515) + + -- Eric Dorland <eric@debian.org> Thu, 21 Apr 2005 01:25:02 -0400 + +mozilla-firefox (1.0.3-1) unstable; urgency=low + + * New upstream release, fixes various security issues, so urgency high. + * js/src/fdlibm/fdlibm.h: Fix from David Mosberger to define ia64 as + little-endian arch (also added for mipsel). (Closes: #303438) + + -- Eric Dorland <eric@debian.org> Sun, 17 Apr 2005 23:13:01 -0400 + +mozilla-firefox (1.0.2-3) unstable; urgency=high + + * gfx/src/freetype/nsFreeType.cpp, + netwerk/protocol/http/src/nsHttpConnectionMgr.cpp, + security/nss/lib/pki1/oiddata.h, security/nss/lib/pki1/pki1.h, + widget/src/gtk2/nsDragService.cpp: Fixes for gcc-4.0, + bz#289238. (Closes: #301485) + * js/src/jsstr.c: Fix for JS memory access security bug, patch from + bz#288688. (Closes: #302775) + + -- Eric Dorland <eric@debian.org> Wed, 6 Apr 2005 01:36:11 -0400 + +mozilla-firefox (1.0.2-2) unstable; urgency=high + + * Last upload should of been marked urgency=high because of the security + fixes. + * debian/mozilla-firefox.postinst: Fix ridiculous typos. (Closes: + #300685) + * debian/mozilla-firefox-runner: Use pgrep to detect esd and arts + instead. Thanks Craig Small for the advice. (Closes: #302086) + + -- Eric Dorland <eric@debian.org> Fri, 1 Apr 2005 01:18:18 -0500 + +mozilla-firefox (1.0.2-1) unstable; urgency=low + + * New upstream release. Fixes CAN-2005-0399, CAN-2005-0401, + CAN-2005-0402. (Closes: #301243) + * debian/control: Update suggest for xprint rename. (Closes: #300976) + * xpcom/reflect/xptcall/src/md/unix/{Makefile.in, + xptcinvoke_asm_parisc_linux.s, xptcstubs_asm_parisc_linux.s}: Apply + patch from Ivar (Contributed by Randolph Chung) to fix Firefox on + hppa. (Closes: #286038) + + -- Eric Dorland <eric@debian.org> Fri, 25 Mar 2005 02:30:10 -0500 + +mozilla-firefox (1.0.1-3) unstable; urgency=low + + * widget/src/gtk2/nsGtkKeyUtils.cpp: Patch from bz#108170 to fix broken + keymap for Germans. (Closes: #299781) + * toolkit/mozapps/extensions/src/nsExtensionManager.js.in: avoid + crashing when extension's install.rdf is broken. (Closes: #298796) + (MH) + * debian/mozilla-firefox.prerm: Remove + /usr/lib/mozilla-firefox/defaults/profile/extensions/Extensions.rdf on + uninstall. (Closes: #298636) + * debian/mozilla-firefox.postinst: Add little echo to tell people to + restart firefox after upgrades. + * debian/presubj: Add a note there about restarting firefox before + submitting bugs. + * debian/mozilla-firefox-runner: Properly quote $@ expansion. (Closes: + #300195) + * browser/locales/en-US/searchplugins/ + {yahoo.src,google.src,eBay.src,dictionary.src,creativecommons.src, + amazondotcom.src}: Set updateCheckDays to 0, which avoids duplicated + search entries in the menu. (Closes: #299006, #299813) + + -- Eric Dorland <eric@debian.org> Sun, 20 Mar 2005 17:08:12 -0500 + +mozilla-firefox (1.0.1-2) unstable; urgency=high + + * Changes by Mike Hommey: + * Urgency: high due to RC bug fix. + * debian/update-mozilla-firefox-chrome: Re-initialize Extensions.rdf + inside the script instead of relying on mozilla-firefox's default + behaviour, which just fails when defaults/profile/extensions/ \ + Extensions.rdf doesn't exist (and it seems some people like to remove + files in /etc). (Closes: #294175) + + * Changes by Eric Dorland: + * debian/mozilla-firefox.menu: Capitalize "browsers". Thanks Gerfried + Fuchs. + * debian/mozilla-firefox-runner: Fix from Marc Horowitz to fix sound + device detection. (Closes: #297088) + * toolkit/content/widgets/tabbrowser.xml: Apply patch from bz#283063, to + fix a memory leak when closing tabs. (Closes: #296749) + * xpfe/global/resources/content/bindings/browser.xml, + xpfe/global/resources/content/bindings/tabbrowser.xml, + toolkit/content/widgets/browser.xml, + toolkit/content/widgets/tabbrowser.xml: Apply patches from bz#131456 + to fix various tab related memory leaks. (Closes: #280586) + * netwerk/protocol/http/src/nsHttpHandler.cpp: Patch from bz#265536 to + differentiate between AMD64 and i386. (Closes: #282592) + + -- Eric Dorland <eric@debian.org> Sat, 5 Mar 2005 18:46:09 -0500 + +mozilla-firefox (1.0.1-1) unstable; urgency=high + + * New upstream release. (Closes: #296851) + - This release fixes the Secunia window injection bug, + CAN-2004-1156. (Closes: #293664) + + * Changes by Mike Hommey: + * debian/rules: Some clean-up. + * debian/control: Changed my maintainer address. + * debian/README.Debian: Add a note about automatic updates for + extensions. (Closes: #296761) + + * Changes by Eric Dorland: + * browser/app/profile/firefox.js: Remove disable IDN pref, it's the + default now anyway. + + -- Eric Dorland <eric@debian.org> Tue, 1 Mar 2005 02:03:48 -0500 + +mozilla-firefox (1.0+dfsg.1-6) unstable; urgency=high + + * The "And I thought IE had security bugs!" release. + * toolkit/content/widgets/tabbrowser.xml, + xpfe/global/resources/content/bindings/tabbrowser.xml: Fix + "Firetabbing" vulnerability from bugzilla#280056, fixes + CAN-2005-0231. (Closes: #294415) + * modules/plugin/base/src/nsPluginHostImpl.cpp: Fix "Fireflashing" + vulnerability from bugzilla#280664, fixes CAN-2005-0232. (Also Closes: + #294415) + * build/unix/run-mozilla.sh: Patch from Javier Fernández-Sanguino Peña + to fix insecure temp file usage in run-mozilla.sh. (Closes: #294127) + * netwerk/base/src/nsStandardURL.cpp, netwerk/base/src/nsStandardURL.h: + Patch from bugzilla#261934 to make the network.enableIDN preference + work and again. + * browser/app/profile/firefox.js: Disable IDN by default. This doesn't + close #293975, but drops its severity. + * debian/README.Debian: Add warning and describe how to enable IDN. + + -- Eric Dorland <eric@debian.org> Wed, 9 Feb 2005 22:56:17 -0500 + +mozilla-firefox (1.0+dfsg.1-5) unstable; urgency=low + + * debian/mozilla-firefox.desktop: Don't translate "Mozilla Firefox" into + French. + * browser/app/profile/firefox.js: Set mozilla.widget.raise-on-setfocus + to false to prevent unecessary window raising. (Closes: #292049) + * debian/rules: Don't compile statically on mips and mipsel, since it's + broken for now. + + -- Eric Dorland <eric@debian.org> Sun, 6 Feb 2005 15:02:36 -0500 + +mozilla-firefox (1.0+dfsg.1-4) unstable; urgency=low + + * debian/mozilla-firefox.desktop: Add French translations from Jerome + Warnier. I will accept more, but closing this bug. (Closes: #292506) + * debian/README.Debian: Update the Emacs keybindings instructions. + (Closes: #291691) + * debian/mozilla-firefox.1: + - Remove -splash from the manpage, it has never worked. (Closes: + #287088) + - Add units to -height and -width description. (Closes: #285142) + + -- Eric Dorland <eric@debian.org> Wed, 2 Feb 2005 01:42:53 -0500 + +mozilla-firefox (1.0+dfsg.1-3) experimental; urgency=low + + * debian/mozilla-firefox.desktop: Add %u to the exec line so that apps + know it can handle URLs. (Closes: #290132) + * debian/README.Debian: + - Improve button reversal instructions. Thanks Christian Mayrhuber + - Fix reference to ~/.firefox. + * debian/rules: Enable static building. This will build firefox as one + large binary (mostly) and should speed a few things up, especially + program load time. I'd like to hear about any speedup (or slow down) + you exprience. Porters, please build this for your arch to make sure + this doesn't break anything. + + -- Eric Dorland <eric@debian.org> Thu, 20 Jan 2005 01:40:34 -0500 + +mozilla-firefox (1.0+dfsg.1-2) unstable; urgency=medium + + * debian/mozilla-firefox-gnome-support.postrm, + debian/mozilla-firefox-dom-inspector.postrm: Don't die if + update-mozilla-firefox-chrome dies. (Closes: #287355) + + -- Eric Dorland <eric@debian.org> Sun, 9 Jan 2005 23:51:10 -0500 + +mozilla-firefox (1.0+dfsg.1-1) unstable; urgency=low + + * Not a new upstream release. + * other-licenses/branding/firefox, other-licenses/7zstub/firefox: Remove + these from the .orig.tar.gz, since they are not DFSG-free. We're not + using the files anyway, so out they go. (Not sure the 7zstub stuff is + non-free, but it's Windows only so no harm) + * debian/rules: + - Remove explicit low-optimization on alpha, since Falk + Hueffner claims it works. + - Move entire defaults/profile directory into /etc/mozilla-firefox, + rather than just the bookmarks.html. (Closes: #285538) + * debian/mozilla-firefox.links: Link entire defaults/profile now. + * debian/mozilla-firefox.preinst: Add upgrade code to remove old + defaults/profile to make way for new symlink. + * debian/mozilla-firefox.dirs: Just create etc/mozilla-firefox. + + -- Eric Dorland <eric@debian.org> Sun, 19 Dec 2004 01:31:44 -0500 + +mozilla-firefox (1.0-5) unstable; urgency=medium + + * Changes by Mike Hommey: + * toolkit/mozapps/extensions/src/nsExtensionManager.js.in: Make the + extensions upgrade work again. (Closes: #282143) + * debian/rules: Better DEB_BUILD_OPTIONS handling, better debugging + build (DEB_BUILD_OPTIONS="nostrip debug") + * toolkit/mozapps/extensions/src/nsExtensionManager.js.in, + toolkit/mozapps/extensions/content/extensions.js: Allow users to + disable globally installed extensions. + + * Changes by Eric Dorland: + * debian/rules: Remove explicit low-optimization on sparc. Apparently + there was an issue for a number of arches that required lower + optimization settings, but it is now resolved. So porters, please + check -O2 on arm, alpha, powerpc and ia64 and let me know if it's + safe. Thanks David S. Miller. (Closes: #284533) + + -- Eric Dorland <eric@debian.org> Tue, 7 Dec 2004 01:06:48 -0500 + +mozilla-firefox (1.0-4) unstable; urgency=medium + + * debian/control: Make mozilla-firefox-gnome-support and xprt-xprintorg + Suggests, no Recommends after a look at policy. (Closes: #282432) + * debian/README.Debian: + - Refer to .mozilla/firefox, not .firefox. + - Explain how to reenable emacs style keybindings. (Closes: #282321) + + -- Eric Dorland <eric@debian.org> Sat, 27 Nov 2004 20:40:10 -0500 + +mozilla-firefox (1.0-3) unstable; urgency=low + + * Changes by Mike Hommey + * The "becoming more and more an iceweasel" release. + * debian/firefox.js: + + Enable firefox's internal locale autodetection. + + Disable default browser question at startup. (Closes: #280752) + * debian/mozilla-firefox-runner: Removed our locale autodetection. + That means now locales installed in user profiles are automatically + used, and that there is no need for /var/lib/mozilla-firefox/locales.d + anymore. + * debian/mozilla-firefox.dirs: Removed creation of + /var/lib/mozilla-firefox/locales.d. + * debian/rules: Removed creation of the locale file in + /var/lib/mozilla-firefox/locales.d. + * debian/presubj: Put some more recent information. + * htmlparser/src/nsParser.cpp: Applied patch from bz#57717 so that empty + html files don't get <html><body></body></html> when viewing source. + * browser/base/content/aboutDialog.css: increase the User Agent element + height as in bz#238137 (but up to MacOSX's height) to show the full User + Agent string. + * xpcom/io/nsAppDirectoryServiceDefs.h, + xpcom/io/nsAppFileLocationProvider.cpp, + xpfe/components/search/src/nsInternetSearchService.cpp: Applied patch from + bz#123315 so that Internet search services in user profiles are supported. + (Closes: #219053) + * debian/mozilla-firefox-runner: + + Remove compatibility.ini only if it is older than + /usr/lib/mozilla-firefox/components.ini. That way, we only rebuild it + after an update-mozilla-firefox-chrome. + + Detect if we're being run through sudo without the -H option, in which + case we force setting of $HOME. (Closes: #218156) + * browser/app/profile/firefox.js: Sync'ed with debian/firefox.js. + * toolkit/mozapps/extensions/src/nsExtensionManager.js.in: + + Removed some error messages that get there because firefox is trying to + write in the /usr/lib/mozilla-firefox directory as a user. They are + useless and lead users to think something is going wrong while it's the + (stupid but) normal way firefox works. + + Avoid creation of directories when attempting to read files, that + throwed uncaught exceptions breaking some stuff in several different + ways when extensions don't follow the new scheme for extensions. + + Avoid copying stuff from + /usr/lib/mozilla-firefox/defaults/profile/extensions/ to + /usr/lib/mozilla-firefox/extensions/, that's the *very* old way of + installing extensions, which, since the old scheme has been thrown away, + won't work anyway, if any extension provides files out there. + + CheckForMismatches: Avoid to disable already disabled global extensions, + and don't propose to upgrade the locked extensions. That fixes a + never-ending loop occuring when running firefox for the first time in a + user account, while some global extensions are expired. + (Closes: #278722, #281537) + * debian/mozilla-firefox.prerm, debian/mozilla-firefox.preinst: Moved + removal of links to /usr/lib/mozilla-firefox/defaults/profile/extensions/ + sitting in /usr/lib/mozilla-firefox/extensions/, if any remaining, from + prerm to preinst. We remove them once and for all, they won't be created + by us anymore. + * debian/update-mozilla-firefox-chrome: + + Removed support for extensions in + /usr/lib/mozilla-firefox/defaults/profile/extensions/. + + Removed some clean-up that had been introduced to help the Extensions + Manager not to die, and which, actually, did not work out quite so well. + Anyways, with the changes this time, the EM is supposed to support much + more problems than ever before (as usual ;) ) so we don't need that + anymore. + + Avoid stupid mv error messages when firefox-bin -register fails (which + is not supposed to happen, but you're never too careful) + * debian/update-mozilla-firefox-chrome, debian/mozilla-firefox.preinst: + Move removal of some very old stuff to preinst, to do it once and for all + instead of doing it every time we run update-mozilla-firefox-chrome. + * netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp: Applied patch from + bz#124561 to get a prompt for username/password in case anonymous login + fails. + * debian/mozilla-firefox-runner: + + Added check for more arguments so that the url in the command line get + detected more accurately. + + When a file name is given on the command line, prepend "file://" and + change spaces into %20. (Closes: #281800) + + * Changes by Eric Dorland + * debian/mozilla-firefox.prerm: Patch from Philipp Weis to fix order of + find arguments. (Closes: #280852) + * debian/mozilla-firefox.desktop: Support new mime type handler in Gnome + 2.8. (Closes: #281274) (MH: I added some more myme-types) + * debian/mozilla-firefox.postinst: Run update-desktop-database if it + exists. + * widget/src/gtk/nsWidget.cpp: We don't use gtk anymore, might as well + revert these patches. Thanks Stephane Despret. + + -- Eric Dorland <eric@debian.org> Thu, 18 Nov 2004 22:16:28 -0500 + +mozilla-firefox (1.0-2) unstable; urgency=low + + * Changes by Mike Hommey + * The "don't do too much on the same day, it's bad for health" release. + * debian/firefox.js: Re-activated the extensions update service, and + removed the update url. + * browser/app/profile/firefox.js: Sync'ed with debian/firefox.js. + * debian/mozilla-firefox-dom-inspector.preinst: Removed old inspector.js + file. + * toolkit/mozapps/extensions/src/nsExtensionManager.js.in, + toolkit/mozapps/extensions/content/extensions.js: Disabled possibility + to update locked extensions and themes. Locked extensions being the + ones installed by the packaging system, they should be updated through + that. + * toolkit/mozapps/update/src/nsUpdateService.js.in: Disabled application + update functionnality. Firefox should be updated through the packaging + system. + * browser/components/prefwindow/content/pref-advanced.xul: Removed the + preferences panel item to activate application update, since it is + totally disabled. + * debian/mozilla-firefox-runner: Remove compatibility.ini instead of + compreg.dat. (Eric: This will cause a rebuild of the compreg.dat) + + * Changes by Eric Dorland: + * debian/mozilla-firefox.NEWS: Fix typos. + * README.Debian: + - Add note about application update being completely disabled. + - Fix path to XUL.mfsal + + -- Eric Dorland <eric@debian.org> Wed, 10 Nov 2004 22:56:22 -0500 + +mozilla-firefox (1.0-1) unstable; urgency=medium + + * New upstream release (Closes: #280449) + + * Changes by Mike Hommey: + * netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp: Apply new patch + #164795 from bz#266835 + some tweaks as previously. This might lead to + encoding problems with the password, but it is supposed to be ASCII + anyway. + * toolkit/mozapps/extensions/src/nsExtensionManager.js.in: Reworked the + previous patches so that the Extensions Manager shows extensions that + have been disabled due to version mismatch, and added a workaround so + that components registration works correctly. + * debian/update-mozilla-firefox-chrome: Removed part that is useless due + to last changes in the Extensions Manager. + * Make the inspector a real extension again: + - debian/inspector/00dom-inspector: File for + /var/lib/mozilla-firefox/extensions.d. + - debian/inspector/Uninstall: Uninstall file needed in extension + directory. + - debian/inspector/install.rdf: install.rdf taken from older versions, + and adapted to newer versions, adding registered chrome. + - debian/mozilla-firefox-dom-inspector.dirs: Removed. Everything will + be created by dh_install. + - debian/mozilla-firefox-dom-inspector.install: install + debian/inspector.rdf and most inspector files in the right place in + /usr/lib/mozilla-firefox/extensions/{641d8d09-7dda-4850-8228-ac0ab65e2ac9} + and /var/lib/mozilla-firefox + * Make the classic theme a real extension, even though it's still in + the main package: + - debian/theme/00classic: File for + /var/lib/mozilla-firefox/extensions.d. + - debian/theme/Uninstall: Uninstall file needed in extension + directory. + - debian/mozilla-firefox.install: Install all files in the right + place in + /usr/lib/mozilla-firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} + - debian/mozilla-firefox.dirs: Removed creation of + /usr/lib/mozilla-firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome, + it will be done by dh_install. + - browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in: + Added chrome to be registered. + * Removed support for /var/lib/mozilla-firefox/chrome.d: + - debian/mozilla-firefox.dirs: Removed creation of the directory. + - debian/rules: Removed creation of files there, and put the + installed-chrome.txt, excluding inspector and classic theme stuff, + directly in /usr/lib/mozilla-firefox/chrome. + - debian/update-mozilla-firefox-chrome: Removed all + /var/lib/mozilla-firefox/chrome.d related stuff. + - debian/mozilla-firefox.links: Removed installed-chrome.txt link. + - toolkit/mozapps/extensions/src/nsExtensionManager.js.in: disable + extensions that fail to install chrome. + * debian/mozilla-firefox-runner: Remove user profile compreg.dat at + launch time. + * Moved some files in /var/lib/mozilla-firefox: + - debian/mozilla-firefox.links: Add a symlink for Extensions.rdf + and components.ini, from /usr to /var. + - debian/mozilla-firefox.prerm: Don't remove files we don't + provide and remove files at their new locations. + - debian/mozilla-firefox.preinst: Remove + /var/lib/mozilla-firefox/installed-chrome.txt. + - debian/update-mozilla-firefox-chrome: Create links for + Extensions.rdf and components.ini after register call, and remove + components.ini before. + * Clean-up in files generated by update-mozilla-firefox-chrome: + - debian/mozilla-firefox.links: Put all the links generated by + update-mozilla-firefox-chrome into the package. + - debian/mozilla-firefox.prerm: Remove all /var files generated + in the remove target, and changed the way we clean-up + /var/lib/mozilla-firefox. + * debian/mozilla-firefox.install: Removed chromelist.txt. + * Add support for extensions preferences: + - debian/update-mozilla-firefox-chrome: Handle + /usr/lib/mozilla-firefox/defaults.ini file. + - debian/mozilla-firefox.links: Add a symlink to /var for + defaults.ini. + - toolkit/mozapps/extensions/src/nsExtensionManager.js.in: Added + defaults registration in -register command. + - mozilla-firefox-dom-inspector.install: Move inspector.js into + the appropriate extension specific directory. + * Move preferences back into /usr: + - debian/rules: Don't move the prefs into + /etc/mozilla-firefox/pref, and put the vendor thing into /usr + as well, and remove firefox-l10.js file. + - debian/mozilla-firefox.preinst: remove old prefs in /etc and + old symlink /usr/lib/mozilla-firefox/defaults/pref. + - debian/firefox.js: new Debian default preferences file. + - debian/mozilla-firefox.install: install firefox.js in + /etc/mozilla-firefox/pref. + - debian/mozilla-firefox.links: rename + /usr/lib/mozilla-firefox/defaults/pref symlink to + /usr/lib/mozilla-firefox/defaults/syspref. + - toolkit/mozapps/extensions/src/nsExtensionManager.js.in: Added + a hook so that defaults/syspref gets registered in defaults.ini + after all other extensions preferences. + * debian/mozilla-firefox.preinst: only clean-up stuff if we are + upgrading from a version known to still have the files. Added some + more clean-up. + * debian/mozilla-firefox.install: Removed useless init.d. + * modules/libpref/src/init/all.js: Fixed all chrome URLs which refered to + mozilla stuff. + * debian/update-mozilla-firefox-chrome: Remove some more files before running + firefox-bin -register. + + * Changes by Eric Dorland: + * debian/mozilla-firefox.NEWS: Add warning about broken extension and + locale packages with this release. + * debian/mozilla-firefox-runner: Comment out warning about xprint, + xprint isn't necessarily needed for printing since postscript was + reenabled. (Closes: #279858) + + -- Eric Dorland <eric@debian.org> Wed, 10 Nov 2004 00:33:44 -0500 + +mozilla-firefox (0.99+1.0RC1-4) unstable; urgency=low + + * debian/mozilla-firefox-runner: + - Fixed to run properly with dash. (Closes: #279549). + - Fixed indentation. + - Added a basic debugger support. + * debian/mozilla-firefox.1: Added information about debugger options. + * debian/rules: Added a debug option to DEB_BUILD_OPTIONS. If you want to + build a fully gdb'able package, use DEB_BUILD_OPTIONS="noopt nostrip + debug" + * netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp: Apply new patch from + bz#266835. + - Further change this patch to use Append rather than AppendLiteral, + which doesn't seem to exist. (ED) + + -- Mike Hommey <mh@glandium.org> Thu, 4 Nov 2004 22:01:51 +0900 + +mozilla-firefox (0.99+1.0RC1-3) unstable; urgency=low + + * netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp: Apply patch from + bz#266835 to fix anonymous user password issue. (Closes: #226784) + * toolkit/mozapps/extensions/src/nsExtensionManager.js.in: (MH) + - Fully apply previous patches, which for some reason left a spurious code + line which made the extensions manager not like expired extensions + anymore. (Closes: #279140) + - Enhanced extensions manager so that the behaviour described in + https://bugzilla.mozilla.org/show_bug.cgi?id=247846#c14 *actually* + works. Extensions packagers are invited to move their chrome files + accordingly, and remove /var/lib/mozilla-firefox/chrome.d files so that + extensions chrome don't get registered when they are forced-disable due + to version mismatch or some other reason. + * debian/mozilla-firefox-runner: + - Fix some thinkos. (MH) + - Fix for loading files from the command line. (Closes: #279018) (MH) + - Removed setting --display from $DISPLAY, let it get it from the + environment, but pass --display if it is set. (Mike, + I'm worried this will screw up some session + managers, let me know what you think, we can revert it) + - Removed FIREFOX_OPEN_IN stuff, so that firefox now obeys to "open + links from other applications in" setting. (Closes: #279073) (MH) + - Enhanced command line parsing, and drop empty arguments. + (Closes: #279138) (MH) + - No need for a find to look for XUL.mfasl, we already have its + location from the path list taken from profiles.ini. (MH) + - Better detection of dsp wrapper, when FIREFOX_DSP=auto. + (Closes: #254611) (MH) + - Correctly open local files even when firefox was not previously + running. (Closes: #279018) (MH) + * debian/mozilla-firefox.1: (MH) + - Removed references to FIREFOX_OPEN_IN. + - Added the -safe-mode option. + * debian/mozilla-firefoxrc: Removed FIREFOX_OPEN_IN. (MH) + + -- Eric Dorland <eric@debian.org> Tue, 2 Nov 2004 00:46:28 -0500 + +mozilla-firefox (0.99+1.0RC1-2) unstable; urgency=medium + + * browser/app/profile/firefox.js: Disable browser update checking by + default. + * debian/mozilla-firefox-runner: Apply patch from Aurelien Jarno to fix + variable name typo. (Closes: #278844) + + -- Eric Dorland <eric@debian.org> Fri, 29 Oct 2004 23:50:59 -0400 + +mozilla-firefox (0.99+1.0RC1-1) unstable; urgency=medium + + * New upstream release. + * layout/xul/base/src/nsImageBoxFrame.{cpp,h}: Remove some conflicts + from a previous patch. + + -- Eric Dorland <eric@debian.org> Thu, 28 Oct 2004 23:33:46 -0400 + +mozilla-firefox (0.10.1+1.0PR-5) unstable; urgency=low + + * debian/rules: (MH) + - Use upstream extensions set. This will eventually get a + correct help menu and fix some yet undiscovered UI issues. + (Closes: #257946) + - Added support for DEB_BUILD_OPTIONS=noopt. + - Changed OPTFLAGS assignment. + - Remove whitespace characters in version number for UserAgent + branding. + - Install mozilla-firefox-runner into /usr/lib/mozilla-firefox/firefox + (Closes: #278477) + * debian/mozilla-firefox.links: (MH) + - Link /usr/bin/firefox and /usr/bin/mozilla-firefox to + /usr/lib/mozilla-firefox/firefox. + - Removed obsolete profile/US links. + * debian/mozilla-firefox.dirs: Create /etc/mozilla/profile instead of + /etc/mozilla/profile/US. (MH) + * toolkit/xre/nsAppRunner.cpp: Fix crash in nsCmdLineService::Initialize + when argc is changed by gtk (when treating gtk specific arguments) + (MH) + * debian/mozilla-firefox-runner (Changes by MH): + - Removed workaround for bug #122990. First, xmlterm is not an activated + extension, and secondly, if it still requires the TERM environment + variable, it is the user's duty to set it to whatever he wants, not + firefox's start script's. + - Removed the ulimit -c setting. First, it is set by default to 0 on a + newly installed debian, and secondly, it is user's choice to set it or + not if he needs to get core files. + - Removed unused shell variables. + - Removed unsetting AUDIODEV variable. If it still crashes, it does belong + to some other code than firefox. The AUDIODEV environment variable is + used nowhere in firefox code: + http://lxr.mozilla.org/aviarybranch/search?string=AUDIODEV + Note that there is a "A crash which occurred when AUDIODEV doesn't + contain "/" was fixed." log message in esound version 0.2.33 changes and + that the bug may have belonged there. + - Replaced ${HOME}/.mozilla-firefoxrc file by a ${HOME}/.mozilla/firefox/rc + file. The former is still supported, though, but will bring a warning + message. If both are present, only the latter is taken into account. + - Changed the way system and user FIREFOX_DSP and FIREFOX_OPEN_IN + variables are handled. First, use system values defined in + /etc/mozilla-firefox/mozilla-firefoxrc, then override with + ${HOME}/.mozilla/firefox/rc and then with runtime environment variables. + - Don't die when DISPLAY is not set. Display can be passed by --display + option, and if not set and needed (some options don't require it), + firefox will complain. + - Some shell code simplifications by using some coreutils. + - Added better command line parsing. + - Added verbosity mode. + - Removed setting of FONTCONFIG_PATH, /usr/lib/mozilla-firefox/res/Xft + doesn't exist + - Factorized localization detection. + * debian/mozilla-firefox.1 (MH): + - Made some clean-up between dashes and hyphens. + - Removed obsolete options and added new ones. + - Added informations about some debian specific stuff. + * debian/update-mozilla-firefox-chrome: Changed the way we move files to + /var/lib/mozilla-firefox. It will avoid creating files with a * in their + name whenever registration failed. (MH) + * debian/README.Debian: Update java instructions, tell them to just use + java-package. + + -- Eric Dorland <eric@debian.org> Thu, 28 Oct 2004 21:30:40 -0400 + +mozilla-firefox (0.10.1+1.0PR-4) unstable; urgency=medium + + * This release mostly courtesy Mike Hommey. + * layout/src/xul/base/src/nsImageBoxFrame.*: Backported patch from + bz#255372. (Closes: #278046) + * toolkit/mozapps/extensions/src/nsExtensionManager.js.in: Force locking + globally installed extensions, that will prevent extensions packages + files to be unexpectedly removed by firefox. + * debian/control: Add Mike Hommey as an Uploader. + * debian/mozilla-firefox.install: Removed content-packs.jar which is + mozilla-browser specific. + * debian/mozilla-firefox.dirs: + - Remove leading /'s. + - Create + /usr/lib/mozilla-firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} + /chrome directory so that preview is shown in the Themes Manager. Yes, + this is stupid, but it is the way firefox wants it (and it's not even + created by make install, nor in the official binary tarball. It is + only created at run time, but you know what ? under *nix, a normal + user can't create that directory) (Closes: #276404) + * debian/rules: Add a /etc/mozilla-firefox/pref/vendor.js file adding + the debian package version to the UserAgent. (Closes: #268654) + * debian/README.Debian: Update java instructions. I'd love some more + definitive pointers. (Closes: #277983) + + -- Eric Dorland <eric@debian.org> Tue, 26 Oct 2004 00:11:48 -0400 + +mozilla-firefox (0.10.1+1.0PR-3) experimental; urgency=low + + * debian/control: + - Rename the mozilla-firefox-gnome-vfs package + mozilla-firefox-gnome-support since it does more than vfs. No + need for Replaces or anything, since it never actually made it to + the archive. + - Remove strict build dependencies on g++ and binutils, since the + fixed versions have hit sarge. + - Remove hppa build depends, since gcc has also been fixed there. + - Build-depend on libgnome2-dev and libgconf2-dev to build in more + gnome support. + - Have mozilla-firefox recommend it's gnome support. + * debian/rules: + - Remove hppa CC redefinitions. + - Exclude *gnome* not just *gnomevfs*. + - dh_install for gnome-support. + * debian/mozilla-firefox-gnome-vfs.*: Rename to + mozilla-firefox-gnome-support.*. + * debian/mozilla-firefox-gnome-support.install: Grab *gnome*, not just + *gnomevfs*. + + -- Eric Dorland <eric@debian.org> Thu, 21 Oct 2004 23:04:53 -0400 + +mozilla-firefox (0.10.1+1.0PR-2) experimental; urgency=low + + * debian/mozilla-firefox-runner: + - Patch from Sam Morris to handle cleanup of directories with + unusual names. + - Fix return value check, patch from rgselk. (Closes: #269690) + * debian/mozilla-firefox.1: List full path to firefox-bin. (Closes: + #275563) + * debian/rules: + - --with-gssapi=/usr, enable Negotiate extension. (Closes: + #274258) + - Enable gnomevfs support, + * debian/control: + - Build-depend on libkrb5-dev. + - Build-depend on libgnomevfs2-dev. + - New gnomevfs package, based on work by Mike Hommey. (Closes: + #262062) + * debian/mozilla-firefox-gnome-vfs.post{inst,rm}: Added, same as + corresponding files from mozilla-firefox-dom-inspector. + * debian/mozilla-firefox-gnome-vfs.install: Install gnomevfs components. + * browser/app/profile/firefox.js: Set + network.negotiate-auth.trusted-uris to https:// to enable the + negotiate extension over secure links. + * config/rules.mk: Tweak patch from Thiemo Seufer to include svg_doc in + non-optimization. (Closes: #273353) + + -- Eric Dorland <eric@debian.org> Sun, 17 Oct 2004 21:25:08 -0400 + +mozilla-firefox (0.10.1+1.0PR-1) experimental; urgency=critical + + * New upstream release, fixes security issue bz#259708. (Closes: + #274493) + + -- Eric Dorland <eric@debian.org> Sun, 3 Oct 2004 03:32:43 -0400 + +mozilla-firefox (0.10+1.0PR-1) experimental; urgency=low + + * New upstream release. (Closes: #273700, #267003) + * toolkit/mozapps/extensions/src/nsExtensionManager.js.in, + netwerk/dns/src/nsIDNService.cpp, + modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp, + gfx/src/windows/nsImageWin.cpp, gfx/src/shared/gfxImageFrame.cpp, + browser/app/profile/firefox.js: Resolve conflicts between my tree and + upstream. + * browser/app/Makefile.in: Fix $(DESTDIR) variable. + * accessible/src/atk/nsAccessibleWrap.cpp, + accessible/src/atk/nsAccessibleWrap.h: Apply patch from bugzilla for + alpha fix that's more likely to make it into CVS. + * debian/update-mozilla-firefox-chrome: Patch from Mike Hommey to make + update-mozilla-firefox-chrome more verbose on -v. + * debian/rules: + - Remove typeaheadfind for new find toolbar to work. (Mike Hommey) + (Closes: #267170) + - Changes to reflect new upstream files. + * debian/control: + - Remove build-depend on libcairo-dev. + - Build depend on libxt-dev, seems to be necessary now. (Closes: + #274311) + * debian/docs: Removed, as browser/README.html disappeared. (Mike Hommey) + * debian/mozilla-firefox.dirs: + - Changes to reflect new upstream files. + - Removed obsolete libnullplugin.so. + * debian/mozilla-firefox.install: + - Remove .jar's that aren't there anymore. + - Removed obsolete libnullplugin.so. + * debian/mozilla-firefox-dom-inspector.dirs, + debian/mozilla-firefox-dom-inspector.install, debian/rules: Upstream + doesn't consider DOM Inspector as a real extension, and do not provide + the appropriate files to make it appear in the extensions + manager. Removed all the extension related stuff in the package. (Mike + Hommey) + * other-licenses/libart_lgpl: Removed, was for SVG, no longer needed. + * modules/plugin/samples/default/unix/*: Reverted debian specific + changes, we don't want them in the diff since libnullplugin won't get + installed. + + -- Eric Dorland <eric@debian.org> Fri, 1 Oct 2004 18:50:46 -0400 + +mozilla-firefox (0.9.3-6) unstable; urgency=high + + * gfx/src/gtk/fontEncoding.properties: Uncomment symbol fonts. (Closes: + #272927) + * debian/control: Build-depend on binutils (>= 2.15-4) but only on mips + and mipsel. (Closes: #273353) + * configure.in, configure, rules.mk: Patch from Thiemo Seufer to + increase stability and performance on mips. (Closes: #272159) + * debian/mozilla-firefox-runner: Detect failure of ping() + better. (Closes: #267393) + * layout/html/document/src/html.css: Testing fix for xprint problems. + + -- Eric Dorland <eric@debian.org> Mon, 27 Sep 2004 17:07:37 -0400 + +mozilla-firefox (0.9.3-5) unstable; urgency=high + + * debian/update-mozilla-firefox-chrome: Apply another patch form Mike + Hommey to fix a few more issues in the script. (Closes: #271480) + * Fixes to Secunia security bugs, ported from bugzilla: + (Closes: #271888) + - browser/base/content/browser.js, + xpfe/communicator/resources/content/contentAreaDD.js: Fix for + drag and drop exploit, bz#250862. + - caps/include/nsScriptSecurityManager.h, caps/src/caps.properties, + caps/src/nsScriptSecurityManager.cpp: Fix for enablePrivilege + exploit, bz#253942. + - gfx/src/shared/gfxImageFrame.cpp, gfx/src/windows/nsImageWin.cpp, + modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp: Fix for various + overflows in the BMP code, bz#255067. + - netwerk/dns/src/nsIDNService.cpp: Fix for bug in non-ASCII + characters in domain names, bz#256316 + - content/xbl/src/nsXBLPrototypeHandler.cpp: Clipboard injection + fix, bz#257523. + + -- Eric Dorland <eric@debian.org> Thu, 16 Sep 2004 20:06:47 -0400 + +mozilla-firefox (0.9.3-4) unstable; urgency=high + + * Urgency high, go into testing dammit! + * Apply patch from Mike Hommey as -3.1, which wasn't actually + released. See below. (Closes: #271480) + * debian/rules: Patch from Matthew Mueller to fix underquoted + argument. (Closes: #271432) + * debian/control: Build depend on binutils (>= 2.15-3) with fixed mips + support. We still need a fixed gcc. + + -- Eric Dorland <eric@debian.org> Mon, 13 Sep 2004 20:41:27 -0400 + +mozilla-firefox (0.9.3-3.1) unstable; urgency=low + + * debian/rules: removed + /usr/lib/mozilla-firefox/defaults/profile/extensions/installed-extensions.txt + * debian/update-mozilla-firefox-chrome: + + Added a "verbose" mode. + + Added warning messages (only shown in verbose mode) about some + extensions specific issues. This is intended to be useful for extensions + maintainers. + + Check if the installed-extensions.txt file disappears, which tells if the + mozilla-firefox -register went ok. + * debian/update-mozilla-firefox-chrome.8: + + Fixed typos. + + Added reference to the -v option for the verbose mode. + * debian/mozilla-firefox-runner: enhanced the profile directory check. It + didn't work if the path indicated in the profiles.ini was not absolute. + + -- Mike Hommey <mh@glandium.org> Mon, 13 Sep 2004 20:31:21 +0900 + +mozilla-firefox (0.9.3-3) unstable; urgency=high + + * Acknowlege NMU from Mike Hommey. He did a fantastic job in porting a + large amount of fixes from upstream CVS. I owe him several large + beverages of his choice. (Closes: #259046, #259836) + * Port all of Mike's changes to my local CVS. + * debian/mozilla-firefox-runner: + - Pass command-line arguments to get_locale so they can actually + be used. (Closes: #240058) + - Apply patch from Mike Hommey to use the profiles.ini to find the + path to the profile to clean XUL.mfasl. (Closes: #267326) + * debian/update-mozilla-firefox-chrome: Patch from Mike Hommey to fix + some bashisms introduced by his NMU. + * xpcom/reflect/xptcall/src/md/unix/Makefile.in, + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s, + xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.m4, + xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s: Patch from + Thiemo Seufer to fix mips. This requires patches to gcc and binutils + to work and fully close #270621. + + -- Eric Dorland <eric@debian.org> Wed, 8 Sep 2004 21:13:35 -0400 + +mozilla-firefox (0.9.3-2.2) unstable; urgency=high + + * The "never edit the diff file unless you're sure nothing will be + missing" release. + * debian/mozilla-firefox.prerm: restore the uncut version. + * debian/control, debian/rules: Use gcc-3.2 to build on hppa, because of + toolchain bug #254549. + + -- Mike Hommey <mh@glandium.org> Mon, 23 Aug 2004 19:45:54 +0900 + +mozilla-firefox (0.9.3-2.1) unstable; urgency=high + + * Non Maintainer Upload for RC Fixes. + * Applied changes to toolkit/mozapps/extensions/src/nsExtensionManager.js.in + and toolkit/mozapps/extensions/locale/extensions.properties to solve some + issues with extensions management. (taken from CVS) + * Applied other changes to + toolkit/mozapps/extensions/src/nsExtensionManager.js.in, + toolkit/mozapps/extensions/public/nsIExtensionManager.idl and + mozilla/toolkit/xre/nsAppRunner.cpp to be able to use -register + instead of -list-global-items for extensions/components/chrome + registration through update-mozilla-firefox-chrome, thus not needing + Xvfb anymore (-register option doesn't require a X server). + (taken from CVS) + * Applied some more changes to + toolkit/mozapps/extensions/src/nsExtensionManager.js.in in order to + avoir overlayinfo deletion during extensions registration process. + (taken from CVS) + * Final changes to toolkit/mozapps/extensions/src/nsExtensionManager.js.in + to avoid registering out of date extensions so that firefox doesn't enter + a loop at startup when no profile was found, and to only write in the + installed-extensions-processed.txt file the list of actually installed + extensions. Note that for packaged extensions installing their files + directly into the chrome or components directories, that only means they + won't appear in the Extensions Manager. They will still be available in + the GUI. + * All these fixes improve the Extensions Manager. Closes: #259046. + * accessible/src/atk/nsAccessibleWrap.cpp, + accessible/src/atk/nsAccessibleWrap.h: fixed 32-bit abuse of gobject + (Steve Langasek). Closes: #259836. + * debian/control: Removed dependency upon xvfb. + * debian/update-mozilla-firefox-chrome: + + Removed use of Xvfb. + + Removed creation of a root default profile, but kept the fake home + hack to avoid creation of a .mozilla directory in root's home. + + Changed extensions handling so that the overall process is cleaner. + Extensions packages will have to move extensions {uid} directories + to /usr/lib/mozilla-firefox/extensions/, while the current location + is still supported for compatibility purpose (but is strongly not + recommended). + + Removed use of regxpcom and regchrome, since what they both do is + done by firefox-bin -register. + * debian/rules: force GnomeVFS support to be disabled. (Josselin Mouette) + * debian/README.Debian: + + Added a note about potential problems with packaged "old" extensions. + + Added a note about how to manually disable packaged extensions in user + profile. + + Removed some old notes that don't apply anymore. + * debian/mozilla-firefox-dom-inspector.install, debian/rules: Move + extensions files to /usr/lib/mozilla-firefox/extensions/ instead of + /usr/lib/mozilla-firefox/defaults/profile/extensions/. + * debian/mozilla-firefox.links: Move installed-extensions.txt symlink + from /usr/lib/mozilla-firefox/defaults/profile/extensions/ to + /usr/lib/mozilla-firefox/extensions/. + * debian/mozilla-firefox.prerm: More cleanup on removal of package. + + -- Mike Hommey <mh@glandium.org> Sun, 22 Aug 2004 21:43:47 +0900 + +mozilla-firefox (0.9.3-2) unstable; urgency=low + + * xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.m4: Comment out + NARGSAVE, like I did in 0.9.1-7, should fully fix #262571. + * debian/mozilla-firefox.preinst: Remove brace expansion + bashism. (Closes: #264200) + * debian/control: Depend on debianutils (>= 1.16) since we use mktemp + -d. (Closes: #263958) + * debian/mozilla-firefox-runner: Make -contentLocale COUNTRY, not + lang-COUNTRY. (Closes: #263940) + + -- Eric Dorland <eric@debian.org> Sun, 8 Aug 2004 23:41:02 -0400 + +mozilla-firefox (0.9.3-1) unstable; urgency=low + + * New upstream release. (Closes: #263193) + * debian/update-mozilla-firefox-chrome.8: Add manpage from Mark Suter + for update-mozilla-firefox-chrome.8. (Closes: #263149) + * debian/mozilla-firefox.manpages: Add update-mozilla-firefox-chrome.8. + * debian/control: Add build-deps on gcc-3.4 for amd64. (Closes: #262679) + + -- Eric Dorland <eric@debian.org> Wed, 4 Aug 2004 20:21:22 -0400 + +mozilla-firefox (0.9.1-7) unstable; urgency=low + + * debian/mozilla-firefox-runner: + - Reintroduce check for command-line arguments (I broke this last + release). (Closes: #262692, #262462, #262537, #262588, #262727) + - Allow overriding of -contentLocale and -UILocale. (Closes: + #240058) + * xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s: Comment out + NARGSAVE reassignment, it is defined elsewhere. (Closes: #262571) + * debian/rules: Force amd64 to build with gcc 3.4. (Closes: #262679) + + -- Eric Dorland <eric@debian.org> Mon, 2 Aug 2004 10:16:46 -0400 + +mozilla-firefox (0.9.1-6) unstable; urgency=low + + * widget/src/gtk2/keysym2ucs.c: Patch from Eugeniy Meshcheryakov to + allow mozilla firefox to enter a ghe with upturn. (Closes: #261543) + * debian/mozilla-firefox-runner: + - Remove some mail and composer cruft. + - Add warning if DISPLAY is not set. (Closes: #261465) + + -- Eric Dorland <eric@debian.org> Thu, 29 Jul 2004 22:49:59 -0400 + +mozilla-firefox (0.9.1-5) unstable; urgency=low + + * debian/control: Goodbye mozilla-firebird transition package. + * debian/mozilla-firefox-runner: Add -a firefox flag when running + firefox-bin. (Closes: #259237) + * debian/mozilla-firefox.desktop: Add GenericName field. + * debian/update-mozilla-firefox-chrome: Fix quoting problem with + {*}. (Closes: #257243) + * debian/rules: + - Re-enable postscript printing support, since the security + issues turned out to be bogus. (Closes: #257628) + - Disable SVG support, it's still too broken to be usable. + (Closes: #259544) + + -- Eric Dorland <eric@debian.org> Sun, 18 Jul 2004 20:09:14 -0400 + +mozilla-firefox (0.9.1-4) unstable; urgency=low + + * The "Let's try unstable" release. There are still issues, but there + are issues with 0.8 as well, so no more point in waiting. + * debian/update-mozilla-firefox-chrome: + - Copy over empty Extensions.rdf file on update. (Closes: #257243) + - Increase sleep to 15 seconds, hopefully this will work on most + people's machines. + * My apologies to Mike Hommey for mispelling his name in last release. + + -- Eric Dorland <eric@debian.org> Sun, 11 Jul 2004 23:51:24 -0400 + +mozilla-firefox (0.9.1-3) experimental; urgency=low + + * Ok, I was wrong, we're still in experimental. I think we need to fix a + few more issues before getting this in unstable, like #257258, and + make sure the hacky extensions mechanism is more bullet-proof. + * debian/rules: --disable-installer, since we don't use it. + * debian/update-mozilla-firefox-chrome: + - Wait 8 seconds instead of 5 for the hack, might help some + people reporting problems. + - Remove ${LIBDIR}/extensions/{*}. I may move that to + /var/lib/mozilla-firefox eventually, but let's leave it for now. + * debian/mozilla-firefox.png.uu: Make a nicer png icon, based on the + about box graphic. + * debian/mozilla-firefox.preinst: Remove old config files in + /etc/mozilla-firefox/pref. (Closes: #257711, 257557) + * browser/app/profile: firefox.js: Revert change to app.version, + apparently it breaks extensions. (Closes: #257941) + + -- Eric Dorland <eric@debian.org> Wed, 7 Jul 2004 21:26:55 -0400 + +mozilla-firefox (0.9.1-2) experimental; urgency=low + + * The "Mike Homey, lord of the bugs" release. Thanks to Mike for being a + huge help with bug triage. That's right, help with bugs and your name + could have a prestigious place in the changelog. + * I'd like my next release to be to unstable, so let me know about + profile transition bugs, etc. + * debian/control: Build-depend on libcairo1-dev. + * debian/rules: Enable svg support using cairo renderer. (Closes: + #215990) + * debian/mozilla-firefox-xremote-client: Add -a firefox switch to make + the remote client find firefox only. Thanks Jonathan Black. (Closes: + #256967) + * debian/mozilla-firefox.desktop: Make comment Gnome HIG + compliant. (Closes: #257592) + * browser/app/profile/firefox.js: + - app.version = 0.9.1. + - Disable app updates by default. We're debian, we handle updates. + * debian/update-mozilla-firefox-chrome: + - Remove installed-extensions-processed.txt before regenerating. + (Closes: #257243) + - Take some, but not all advice from Alexandru Fomin. Improve Xvfb + and extension registration hacks. + + -- Eric Dorland <eric@debian.org> Sun, 4 Jul 2004 16:58:17 -0400 + +mozilla-firefox (0.9.1-1) experimental; urgency=low + + * New upstream release. + * config/autoconf.mk.in: Alright, /usr/lib/firefox-0.9 was a bad idea, + use /usr/lib/mozilla-firefox. Change all the instances + /usr/lib/firefox-0.9 back to /usr/lib/mozilla-firefox. I feel + silly. (Closes: #256991) + * debian/mozilla-firefox-runner: Actually check for the existence of the + .mozilla/firefox directory before trying to clean it. + * debian/update-mozilla-firefox-runner: + - Call firefox-bin, not firefox you silly goose. + - Use mozilla-firefox tempfile, not mozilla-browser. + - The horrible hackiness continues: For my previous hack to work, + I need to preseed a profile directory in the home directory I + create. Now things should work. (Closes: #256812) + + -- Eric Dorland <eric@debian.org> Thu, 1 Jul 2004 17:16:29 -0400 + +mozilla-firefox (0.9-1) experimental; urgency=low + + * New upstream release. There may be regressions from 0.8. (Closes: + #254522) + * widget/src/gtk/nsGtkMozRemoteHelper.cpp, + widget/src/gtk2/nsGtkMozRemoteHelper.cpp, + widget/src/xremoteclient/XRemoteClient.cpp: Fix previously applied to + fix -remote behaviour undone. Mozilla now includes the program name in + the properties to distinguish between various Mozilla apps. + * xpcom/reflect/xptcall/src/md/unix/Makefile.in: remove extra endif. + * dom/public/idl/core/nsIDOMNSDocument.idl: Reintroduce referrer + attribute that got lost somehow. + * content/events/src/nsEventStateManager.cpp: Fix a strange broken + function call to GetContainer. + + * debian/rules: + - Follow upstream and --enable-single-profile and + --disable-profilesharing. + - Replace /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9. + - --user-app-dir=.mozilla to jive with new location. + - Remove dom-inspector extension dir from the regular package. + * debian/control: Depend on xvfb for insane hack below. + * debian/mozilla-firefox.install: + - Replace /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9. + - Remove ipc dir, mozipcd. + - Add init.d, greprefs dirs. + * debian/mozilla-firefox.dirs: + - Add /var/lib/mozilla-firefox/extensions{,.d} + * debian/mozilla-firefox-dom-inspector.dirs: Add + /var/lib/mozilla-firefox/extensions.d. + * debian/mozilla-firefox-dom-inspector.install: + - Replace /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9. + - Install dom-inspector extension dir. + * debian/mozilla-firefox.links: + - Replace /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9. + - Link /usr/lib/mozilla-firefox to /usr/lib/firefox-0.9. + - Link installed-extensions.txt to our place in + /var/lib/mozilla-firefox. + * debian/mozilla-firefox-runner: + - Replace /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9. + - Fix xprintorg typo. (Closes: #255706) + - Search .mozilla/firefox for XUL.mfasl files. + * debian/mozilla-firefox-xremote-client: Replace + /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9. + * debian/update-mozilla-firefox-chrome: + - Replace /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9. + - Capture return values from reg* commands on error, stolen + from mozilla source. + - Remove returns from check_running. + - Pull in snippets from /var/lib/mozilla-firefox/extensions.d + to generate installed-extensions.txt for new extensions mechanism. + - An insane hack, but necessary because of upstream: Launch a Xvfb + to run firefox to generate the necessary extension metadata. I've + been told this will not be necessary in the next version. + + -- Eric Dorland <eric@debian.org> Mon, 28 Jun 2004 23:40:59 -0400 + +mozilla-firefox (0.8-12) unstable; urgency=low + + * The "Last Chance Before 0.9" release. + * debian/mozilla-firefox-runner: Fix unescaped \n, thanks Olly + Betts. (Closes: #252436) + * debian/update-mozilla-firefox-chrome: Watch out for empty + LD_LIBRARY_PATH. Thanks George Cristian Birzan. (Closes: #254142) + * debian/README.Debian: Restructure and update a bit. + * debian/presubj: Add bug information from README.Debian for reportbug. + * debian/mozilla-firefox.install: Install the presubj. + + -- Eric Dorland <eric@debian.org> Mon, 14 Jun 2004 19:39:27 -0400 + +mozilla-firefox (0.8-11) unstable; urgency=low + + * Apply amd64 fix from #249211. + * debian/README.Debian: Shamelessly stole the java plugin installation + instructions from the mozilla package. (Closes: #243513) + * nsCommonWidget.cpp, nsCommonWidget.h, nsWindow.cpp: Apply patch (with + some hand massaging) from upstream bugzilla bug #209342 to fix initial + window placement. (Closes: #235209, 241519) + * nsprpub/pr/src/misc/prnetdb.c: Apply patch from Miquel van Smoorenburg + to prevent unless reverse DNS lookups. (Closes: #251978) + * debian/mozilla-firefox-runner: Apply patch from Jasper Spaans to fix + remote xprint printing. (Closes: #252072) + + -- Eric Dorland <eric@debian.org> Tue, 1 Jun 2004 23:12:36 -0400 + +mozilla-firefox (0.8-10) unstable; urgency=low + + * debian/mozilla-firefox.install: Don't install uuencoded file. (Closes: + #251441) + * debian/mozilla-firefox-runner: unset AUDIODEV which can cause + crashes. Thanks Christopher Armstrong. (Closes: #236231) + * update-mozilla-firefox-chrome: Port security fix from #249613 to + handle insecure tempfile creation. + * debian/rules: Following the advice of #247585 I'm disabling postscript + printing. Perhaps this will alleviate some of the other printing + problems. + + -- Eric Dorland <eric@debian.org> Sun, 30 May 2004 01:47:52 -0400 + +mozilla-firefox (0.8-9) unstable; urgency=low + + * debian/control: + - Suggest latex-xft-fonts for MathML fonts. Thanks Michael + JasonSmith. (Closes: #216925) + - Build depend on libx11-dev & libxp-dev instead of xlibs-dev to + reflect new X packages. + * widget/src/gtk2/nsWindow.cpp: Apply patch from Peter Colberg to ignore + unused mouse buttons. (Closes: #244305) + * debian/README.Debian: Document the fact that the loopback interface + has to be up and unfiltered for things to work right. + + -- Eric Dorland <eric@debian.org> Wed, 5 May 2004 23:30:42 -0400 + +mozilla-firefox (0.8-8) unstable; urgency=low + + * security/nss/lib/freebl/unix_rand.c: Remove code that called netstat + to gain so entropy. It's pretty useless on a Linux system. Thanks + Wichert. (Closes: #241200) + * debian/README.Debian: Add note about changing the button order in the + dialog boxes. (Closes: #240261) + * debian/control: Add dummy package for mozilla-firebird to smooth + upgrades. (Closes: #235577) + + -- Eric Dorland <eric@debian.org> Sat, 3 Apr 2004 16:19:34 -0500 + +mozilla-firefox (0.8-7) unstable; urgency=low + + * debian/mozilla-firefox-runner: + - Cleanup XUL.mfasl whenever firefox is run with no + command-line. (Closes: #238717) + - Add patch from Laurent Buffler to add config to allow + new tabs to be opened instead of new windows. (Closes: #239323) + * debian/mozilla-firefoxrc: Put the new FIREFOX_OPEN_IN variable in + there and document it's use. + + -- Eric Dorland <eric@debian.org> Sat, 27 Mar 2004 17:21:51 -0500 + +mozilla-firefox (0.8-6) unstable; urgency=low + + * debian/control: Build-depend on g++-3.3 (>= 3.3.3-4) to work around + broken 3.3.3-3 release. (Closes: #238318, #238241, #238441, #238523, + #238534) + * debian/rules: Install new small-firefox icon. + * debian/mozilla-firefox{.png, .xpm, -small.xpm}: Use the new DFSG-free + icons, the old pretty ones are trademarked and not DSFG-free. I know, + it's stupid. Complain to the Mozilla Foundation, not me. (Closes: + #234869) + + -- Eric Dorland <eric@debian.org> Sun, 21 Mar 2004 22:09:16 -0500 + +mozilla-firefox (0.8-5) unstable; urgency=low + + * Rebuild with g++-3.3 3.3.3-2 to work around broken g++. (Closes: + #238318) + + -- Eric Dorland <eric@debian.org> Wed, 17 Mar 2004 21:38:58 -0500 + +mozilla-firefox (0.8-4) unstable; urgency=low + + * debian/README.Debian: + - Tell people not to remove their ~/.firefox directory. Just move it + out of the way. (Closes: #235594) + - Add notes about the sound dsp. (Closes: #236678) + * debian/mozilla-firefox-runner: + - Don't redirect stderr. (Closes: #236160) + - Add get_locale code from Aurelien Jarno (Closes: #235521) + - Fix dsp auto-detection code. (Closes: #236678) + * debian/rules: Add default locale file. + * debian/mozilla-firefox.dirs: Add locales dir. + + * browser/app/profile/all.js, + content/events/src/nsEventStateManager.cpp, + modules/libpref/src/init/all.js, widget/public/nsGUIEvent.h, + widget/src/gtk/nsWidget.cpp: Reapply extended mouse events patch from + Derek Upham. (Closes: #235385, #230876) + * browser/base/content/browser-sets.inc: Make ESC stop animations + again. (Closes: #235474) + + -- Eric Dorland <eric@debian.org> Tue, 16 Mar 2004 00:31:19 -0500 + +mozilla-firefox (0.8-3) unstable; urgency=low + + * debian/mozilla.firefox.menu: Change the case of + mozilla-Firefox. (Closes: #234982, #234755) + * debian/NEWS.Debian: Move to debian/mozilla-firefox.NEWS so that it + actually gets installed. (Closes: #234700) + * debian/update-mozilla-firefox-chrome: Setup dummy home directory to + capture silly .firefox directory. (Closes: #234855) + * debian/mozilla-firefox.png.uu, debian/mozilla-firefox.xpm: Use the + new, pretty mozilla-firefox icons. (Closes: #234869) + * debian/rules: Install the pretty icon in the right places. + + -- Eric Dorland <eric@debian.org> Thu, 26 Feb 2004 21:10:27 -0500 + +mozilla-firefox (0.8-2) unstable; urgency=low + + * The "what he taketh, he giveth back" release. + * debian/rules: + - Disable the wallet extension, this really closes #222447. + - Remove some more cruft left over from the patch system. + - Reinstall the dom-inspector. + * debian/control: Add the dom-inspector back, now that it is supported + upstream. + * debian/mozilla-firefox-dom-inspector.{install,dirs,postinst,postrm}: + Bring these files back. + * docshell/base/nsWebShell.cpp: Only do keyword lookup on when DNS + entries don't exist. (Closes: #233916, #218033, #211524) + + -- Eric Dorland <eric@debian.org> Mon, 23 Feb 2004 21:48:03 -0500 + +mozilla-firefox (0.8-1) unstable; urgency=low + + * The "Let's Change Our Name Every Other Day" release. + * New upstream release, mozilla-firebird has been renamed to + mozilla-firefox. Let's hope it lasts. (Closes: #231903, #222447) + * debian/mozilla-firebird.*: Renamed to debian/mozilla-firefox.*. + + * debian/README.Debian: Update for firefox, remove blurb about the + inspector. + * debian/NEWS.Debian: Explain how to move your configs over. I may make + this automatic if enough people complain, but I'm loathe to muck + around in pople's home directories. + + * debian/control: + - Rename the package. + - Tweak description to list Firefox's previous aliases. + - Remove conflicts on mozilla-firebird-dom-inspector. + + * debian/rules: + - s/firebird/firefox/g, s/MozillaFirebird/firebird/g. + - Comment out some old inspector code. + - Remove unused patch subsystem. + - Disable gtktest. We don't need no stinking tests. + - Remove disable plaintext editor line, not sure why it's there. + - Disable LDAP support. We don't use it. + - Remove executable bit on *.so files. + - Remove useless preference files. + - Exclude the inspector files. + - Don't remove installed-chrome, we don't install it anymore. + - user-app-dir = .firefox. (Closes: #212301) + - export MOZILLA_OFFICIAL for the build ID. (Closes: #231133) + + * debian/mozilla-firefox-runner: + - s/firebird/firefox/g. + - Remove composer and editor functions. + - Use .firefox directory. + + * debian/mozilla-firefox.install: + - s/firebird/firefox/g, s/MozillaFirebird/firefox/g. + - Don't install timebombgen. + - Install icons directory. + - Don't install installed-chrome.txt, we just remove it anyway. + + * debian/mozilla-firefox.desktop, debian/mozilla-firefox.dirs, + debian/mozilla-firefox.manpages, debian/mozilla-firefox.links, + debian/mozilla-firefox.menu, debian/mozilla-firefox.mime, + debian/mozilla-firefoxrc, debian/mozilla-firefox.postinst, + debian/mozilla-firefox.prerm, debian/update-mozilla-firefox-chrome, + debian/mozilla-firefox.1, debian/mozilla-firefox-xremote-client: + s/firebird/firefox/g, s/MozillaFirebird/firefox/g. + + * debian/mozilla-firefox.links: Link mozilla-firefox.1 to firefox.1. + + * debian/mozilla-firefox.preinst: Remove, at least with the rename I can + erase some of my previous blunders. + + * debian/mozilla-firefox.{png.uu,xpm}: Use the package icon. + + * browser/app/nsBrowserApp.cpp: Change package name to Firefox, so now + the ~/.firefox is used. (Closes: #196550) + + * browser/app/profile/all.js: Merge in autoscroll fixes. + * browser/base/content/browser-sets.inc: Merge in upstream stop button + fix. + * modules/plugin/samples/default/unix/nullplugin.c: Merge in removal of + commented code. + * nsprpub/pr/include/md/_linux.cfg, nsprpub/pr/include/md/_linux.h, + security/coreconf/Linux.mk: Merge in hppa build fixes from upstream. + * config/autoconf.mk.in: Install into /usr/lib/mozilla-firefox now. + * content/base/src/nsDocumentViewer.cpp: Remove redundant stop patch + since it has been merged upstream. + * content/events/src/nsEventStateManager.cpp, + modules/libpref/src/init/all.js, widget/src/gtk/nsWidget.cpp: Revert + back to upstream version. There was a patch here to add support for + extended mouse buttons, but I'm removing it since I don't trust that + it works in the new version correctly. Send me another patch if you + want this functionality back. + * toolkit/components/passwordmgr/base/nsPasswordManager.cpp: Revert this + back to upstream, I'm not sure which patches I applied to this file, + likely something to try and fix the double password prompt. + * widget/src/xremoteclient/XRemoteClient.cpp, + widget/src/xremoteclient/XRemoteClient.h: Revert to upstream version, + I believe it does the right thing now, but the patch I used does not + apppear to have been used. Restore the properties to _FIREFOX_* + though. + * widget/src/gtk/nsGtkMozRemoteHelper.cpp, + widget/src/gtk2/nsGtkMozRemoteHelper.cpp: Change the _FIREBIRD_* to + _FIREFOX_* here as well. + * content/base/src/nsDocument.cpp: Comment out nsDocument::GetDomConfig, + needed to get things to compile. + + -- Eric Dorland <eric@debian.org> Sun, 15 Feb 2004 21:28:45 -0500 + +mozilla-firebird (0.7-7) unstable; urgency=low + + * debian/mozilla-firebird-runner: Open a new window when loading a + regular file. (Closes: #228853) + + -- Eric Dorland <eric@debian.org> Thu, 29 Jan 2004 22:12:30 -0500 + +mozilla-firebird (0.7-6) unstable; urgency=medium + + * The "Indian-giver-christmas" release. + * Urgency medium since we're closing some critical bugs that need to get + in before a freeze. + * Completely remove mozilla-firebird-dom-browser. No one stepped up to + help fix it's brokeness in 0.7 and I don't use it or particularly care + about it. So it is no more. If someone steps up to take responsibility + I might put it back, but otherwise it may RIP. (Closes: #222085) + * debian/mozilla-firebird-runner: Remove XUL.mfasl uncoditionally + now. There is a corner case where this file is corrupted on upgrade + when firebird was running. This is a total hack, and not an elegant + solution, but at least it fixes the problem. (Closes: #224779, + #224323) + * debian/control: Conflict against old mozilla-firebird-dom-inspector + since it doesn't work anymore. + + -- Eric Dorland <eric@debian.org> Thu, 25 Dec 2003 15:54:21 -0500 + +mozilla-firebird (0.7-5) unstable; urgency=low + + * browser/base/content/browser-sets.inc: Patch to make ESC stop actually + work. (Closes: #223382) + * debian/rules: Turn down optimizations on sparc. (Closes: #223760) + + -- Eric Dorland <eric@debian.org> Sun, 14 Dec 2003 23:01:59 -0500 + +mozilla-firebird (0.7-4) unstable; urgency=low + + * The "All of Takuo's hard work really pays off" release. + * toolkit/components/passwordmgr/base/nsPasswordManager.cpp: Patch from + upstream bugzilla (#220214) to fix double password prompt + problem. (Closes: #222696) + * xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.m4: Stolen + patch from mozilla package to make mozilla-firebird build on + mips. (Closes: #222743) + * content/base/src/nsDocumentViewer.cpp: Port yet another patch to allow + the ESC key to stop animated gifs. (Closes: #223382) + + -- Eric Dorland <eric@debian.org> Mon, 8 Dec 2003 23:59:16 -0500 + +mozilla-firebird (0.7-3) unstable; urgency=low + + * debian/control: Add dependency on psmisc since we use fuser. Thanks + Daniel Schröter. + * widget/src/xremoteclient/XRemoteClient.{cpp,h}: Apply patch from + bugzilla to fix -remote behaviour on modern WMs. Thanks Nikolai + Prokoschenko. (Closes: #197632) + * nsprpub/pr/src/misc/prdtoa.c: Apply fix from mozilla package (#215067) + to fix building on arm. This is a partial fix to #222743. + * debian/patches: Remove these. Put everything in CVS. + + -- Eric Dorland <eric@debian.org> Fri, 5 Dec 2003 20:03:46 -0500 + +mozilla-firebird (0.7-2) unstable; urgency=low + + * Apply excellent patch from Alexander Sack <asac@jwsdot.com> to fix the + issues with mozilla running and firebird not starting. (Closes: + #216264) + * browser/app/profile/all.js: Set the default of "general.autoScroll" to + false because it annoyes me. (Closes: #221661) + + -- Eric Dorland <eric@debian.org> Wed, 19 Nov 2003 20:59:55 -0500 + +mozilla-firebird (0.7-1) unstable; urgency=low + + * New upstream release. (Closes: #216019) + * debian/patches/dom-inspector.diff: Remove, and apply directly into my + CVS. + * debian/patches/pref.diff: Removed, doesn't seem applicable anymore. + * debian/rules: export MOZ_FIREBIRD=1. + * debian/control: + - Change Chimera to Camino. (Closes: #220821) + - Fix typos in descriptions. (Closes: #218202) + - Add build-deps on m4. (Closes: #219681) + + -- Eric Dorland <eric@debian.org> Wed, 12 Nov 2003 23:01:35 -0500 + +mozilla-firebird (0.6.1-8) unstable; urgency=low + + * Apply patch to make forward and back buttons work on mice. (Closes: + #211606) + * debian/rules: Use -O optimization on alpha, so it will build + again. (Closes: #213603) + + -- Eric Dorland <eric@debian.org> Fri, 3 Oct 2003 00:07:44 -0400 + +mozilla-firebird (0.6.1-7) unstable; urgency=low + + * Rebuild with the latest and greatest from unstable. This seems to fix + the problems with bookmarks people were having, at least for me. No + idea why. Please reopen if this doesn't fix it for you. (Closes: + #209339, #211706, #211286, #211146, #212011) + + -- Eric Dorland <eric@debian.org> Mon, 22 Sep 2003 00:00:08 -0400 + +mozilla-firebird (0.6.1-6) unstable; urgency=low + + * Patch from Eric Wong <normalperson@yhbt.net> to make plugin requests + less annoying. (Closes: #196609) + * debian/rules: Stop building libart. + * debian/mozilla-firebird.links: Fix path to bookmarks file. (Partial + fix to #211286) + + -- Eric Dorland <eric@debian.org> Wed, 17 Sep 2003 20:22:56 -0400 + +mozilla-firebird (0.6.1-5) unstable; urgency=low + + * The "sorry Chris Gray" release. + * debian/rules: disable SVG. This was causing drag and drop to lock up + X and possibly fixes #208630. (Closes: #209371) + * debian/mozilla-firebird-runner: Remove XUL.mfasl if we have upgraded, + since it can cause problems. (Closes: #200073, #202130, #207351) + + -- Eric Dorland <eric@debian.org> Sat, 13 Sep 2003 20:15:37 -0400 + +mozilla-firebird (0.6.1-4) unstable; urgency=low + + * The "pleasing Chris Gray" release. + * other-licenses/libart_gpl: Add this library for svg. + * debian/rules: + - Enable svg. + - Move bookmarks.html file into /etc. (Closes: #207398) + * debian/mozilla-firebird.links: Add links back to files moved to /etc. + * security/coreconf/Linux2.6.mk: Add this as a copy of Linux2.5.mk to + get mozilla-firebird to build on 2.6. (Closes: #207821) + + -- Eric Dorland <eric@debian.org> Sun, 31 Aug 2003 04:40:30 -0400 + +mozilla-firebird (0.6.1-3) unstable; urgency=low + + * debian/mozilla-firebird.prerm: Remove mozilla alternative on + remove. (Closes: #205310) + * debian/debsearch.{gif.uu,src}: Debian search plugin graciously + contributed by Fergus McKenzie-Kay <Linux@NerdIT.com>. + * debian/rules: + - uudecode and clean up debsearch.gif.uu. + - Steal platform specific optimization code from mozilla + package. Thanks Brian Nelson. (Closes: #206309) + * debian/mozilla-firebird.install: Install the above files. + * debian/control: Update Standards-Version to 3.6.1. + + -- Eric Dorland <eric@debian.org> Sun, 24 Aug 2003 19:09:11 -0400 + +mozilla-firebird (0.6.1-2) unstable; urgency=low + + * The "Stop Pestering Me Already!" release. + * debian/control: Only recommend xprt-xprintorg, don't require + it. (Closes: #204176) + + -- Eric Dorland <eric@debian.org> Sun, 10 Aug 2003 20:00:11 -0400 + +mozilla-firebird (0.6.1-1) unstable; urgency=low + + * New upstream release. (Closes: #203518, #201203) + * debian/control: + - Standards-Version to 3.6.0. + - Don't provide www-browser anymore. (Closes: #201035) + - Depend on xprt-xprintorg so printing will work. (Closes: #202418) + * debian/mozilla-firebird.preinst: Remove www-browser alternative. + * debian/mozilla-firebird.postinst: Don't install www-browser alternative. + * debian/mozilla-firebird.prerm: Don't remove www-browser alternative + anymore. + * debian/README.Debian: Added note about configuration breaking on + upgrade. (Closes: #202130) + * debian/patches/classic.diff: Removed. Not sure what it's point was. + * debian/rules: Add --disable-pedantic to the configure options. + + -- Eric Dorland <eric@debian.org> Sun, 3 Aug 2003 14:58:12 -0400 + +mozilla-firebird (0.6-8) unstable; urgency=low + + * debian/patches/alpha-build-fix.diff: Steal patch from mozilla to allow + building on alpha. (Closes: #198638) + * debian/patches/hppa-build-fix.diff: Steal patch from mozilla to allow + building on hppa, clean it up so it applies cleanly. (Closes: #199068) + * debian/mozilla-firebird.png.uu: Added uuencoded nice png icon. + * debian/rules: Add code to decode and clean up the new icon file. + * debian/mozilla-firebird.install: Install new icon. + * debian/mozilla-firebird.desktop: Use the new icon. + + -- Eric Dorland <eric@debian.org> Fri, 27 Jun 2003 23:21:56 -0400 + +mozilla-firebird (0.6-7) unstable; urgency=low + + * debian/mozilla-firebird.1: Stole the mozilla manpage for my own + nefarious purposes. (Closes: #196638) + * debian/mozilla-firebird.postrm: Add slave links to the + mozilla-firebird manpage. (Closes: #197145) + * debian/mozilla-firebird-xremote-client: Set up the environment + properly so it returns correct information. (Closes: #197632) + * debian/mozilla-firebird.xpm: Added icon from + http://iconpacks.mozdev.org/phoenix/iconshots/flame48true.png to have + a nice menu icon. (Closes: #197565) + * Updated the README.Debian with some helpful bug reporting tips. + * debian/rules: Replaced dh_installmanpages with dh_installman. + + -- Eric Dorland <eric@debian.org> Sun, 22 Jun 2003 15:15:37 -0400 + +mozilla-firebird (0.6-6) unstable; urgency=low + + * debian/mozilla-firebird.postinst: Add priority 0 alternative on + mozilla. (Closes: #196444) + * debian/control: Add build-depends on libxrender-dev, libmng-dev, + libpng12-dev, libjpeg62-dev. + * debian/rules: + - Build with system jpeg, mng and png libs. + - Exclude inspector files from mozilla-firebird. + (Closes: #196432, #196509) + + -- Eric Dorland <eric@debian.org> Sat, 7 Jun 2003 15:19:23 -0400 + +mozilla-firebird (0.6-5) unstable; urgency=low + + * The "Mike Hommey is my homey" release. + * Thanks to Mike Hommey <mh@glandium.org> for his excellent work on this + version (it's 99% his), which I've shamelessly stolen. + * Added a README.Debian file. + * Added a separate mozilla-firebird-dom-inspector package. + * debian/patches/dom-inspector.diff: + - add DOM Inspector to Tools menu. (note: DOM Inspector is still + not very well integrated with Firebird) + - remove modern skin references. + * debian/patches/xpinstall.diff: remove unneeded chrome registrations + from xpinstall/packager/unix/browser.jst. + * debian/patches/classic.diff: remove + themes/classic/global/win/preview.gif from jar file and modify + preview image reference in rdf file to Preview.png. + * debian/patches/pref.diff: remove preview image constraints in + browser/components/prefwindow/skin/pref.css file to avoid deformation + of preview image in classic theme. + * debian/mozilla-firebird.preinst: added #DEBHELPER#. + * debian/mozilla-firebird.install: + - Don't install the modern.jar and embed-sample.jar files. + - Remove files related to dom-inspector. + * debian/rules: + - enabling xinerama support. + - disabling build of chatzilla and venkman. + - moved /var/lib/mozilla-firebird/chrome.d/99default to + /var/lib/mozilla-firebird/chrome.d/00all + - remove references to embed-sample.jar in + /var/lib/mozilla-firebird/chrome.d/00all + - Add some comments. + - Change == to =, for more strict /bin/sh's. + * debian/control: Build-Depend on libidl-dev (>= 0.8.0) because the + configure script requires at least this version. + * debian/copyright: Make this a real debian copyright file. + + -- Eric Dorland <eric@debian.org> Thu, 5 Jun 2003 01:00:32 -0400 + +mozilla-firebird (0.6-4) unstable; urgency=low + + * debian/rules: Change -O2 to -O for building on powerpc. + * debian/mozilla-firebird.preinst: Delete + /usr/lib/mozilla-firebird/defaults/pref on upgrade to facilitate + transition to prefs in /etc. Thanks to all who reported this. + + -- Eric Dorland <eric@debian.org> Tue, 27 May 2003 21:45:06 -0400 + +mozilla-firebird (0.6-3) unstable; urgency=low + + * First attempt at a debian upload. (Closes: #163270) + * debian/rules: + + Small fix to Mike Hommey's chrome patch. + + Suggestion from Bernhard R. Link to install + /usr/lib/mozilla-firebird/defaults/pref to + /etc/mozilla-firebird/pref + + Add dh_installmime call. + * debian/mozilla-firebird.mime: Install mime type handlers for firebird. + * debian/mozilla-firebird.links: Link + /usr/lib/mozilla-firebird/defaults/pref to /etc/mozilla-firebird/pref + * debian/mozilla-firebird.install: Don't install the inspector.jar. + + -- Eric Dorland <eric@debian.org> Mon, 26 May 2003 00:28:40 -0400 + +mozilla-firebird (0.6-2) unstable; urgency=low + + * debian/rules: + + Add --with-user-appdir=.mozilla-firebird, since it still + defaults to .phoenix. + + Don't use the ${prefix} variable, use /usr, since ${prefix} + doesn't seem to work. + + Use --without-system-nspr. + * debian/mozilla-firebird.install: + + Be picky about what chrome files we install, since there's + quite a few we don't need, and a bunch of empty dirs. + * Excellent patch from Mike Hommey <mh@glandium.org> to add a + update-mozilla-firebird-chrome script. + + -- Eric Dorland <eric@debian.org> Sat, 24 May 2003 13:00:44 -0400 + +mozilla-firebird (0.6-1) unstable; urgency=low + + * New upstream release. + * Renamed to mozilla-firebird. + * Changed phoenix to mozilla-firebird where appropriate. + * debian/mozilla-firebird.links: Add link mozilla-firebird to + MozillaFirebird. + * debian/control: + + Standars-Version to 3.5.10.0. + + Build-depend on gtk2 libs now. + + Build-depend on libidl-dev. + + Add Provides x-www-browser. + * debian/rules: + + Enable building with the gtk2 libs. + + Make mozilla-firebird-xremote-client executable in install target. + * debian/mozilla-firebird.desktop: Added gnome menu entry. + * debian/mozilla-firebird.{prerm,postinst}: Add alternatives to + www-browser and x-www-browser. + + -- Eric Dorland <eric@debian.org> Mon, 19 May 2003 20:43:39 -0400 + +phoenix (0.5-4) unstable; urgency=low + + * debian/control: Depend on fontconfig. + * debian/rules: Add source-tarball-from-cvs to build a orig tarball from + a checked out cvs tree. Now I can provide source package. And there + was much rejoicing. + + -- Eric Dorland <eric@debian.org> Fri, 17 Jan 2003 21:06:47 -0500 + +phoenix (0.5-3) unstable; urgency=low + + * debian/phoenix-xremote-client: Added to send remote commands to + phoenix. Just a wrapper that calls phoenix-bin -remote. + * debian/phoenix-runner: + + Use phoenix-xremote-client. + + Replace MOZILLA_DSP with PHOENIX_DSP. + * debian/phoenixrc: phoenix-runner uses this file to determine what dsp + to start. + * debian/phoenix.install: + + Install phoenix-xremote-client, and don't install + mozilla-xremote-client. + + Install phoenixrc. + + -- Eric Dorland <eric@debian.org> Mon, 23 Dec 2002 02:52:21 -0500 + +phoenix (0.5-2) unstable; urgency=low + + * debian/control: + + Add Provides: www-browser. + + Build-depend on libxft2-dev, libnspr-dev. + * debian/rules: + + Use xft and the system nspr. + + Install phoenix-runner. + * debian/phoenix-runner: Stolen from the mozilla package to run phoenix. + + -- Eric Dorland <eric@debian.org> Sat, 21 Dec 2002 02:03:11 -0500 + +phoenix (0.5-1) unstable; urgency=low + + * New upstream release. + * debian/phoenix.install: Fix paths to phoenix libs. + * debian/control: + + Standards-Version to 3.5.8 + + Improve build-deps. + * debian/rules: + + Have configure options here, no more .mozconfig. + + Steal some patch code from Colin. + * debian/patches/mozappdir.diff: Change the mozappdir. + + -- Eric Dorland <eric@debian.org> Mon, 9 Dec 2002 02:43:13 -0500 + +phoenix (0.4-3) unstable; urgency=low + + * debian/phoenix.menu: Add menu entry. + * Rebuild to fix libstdc++ dependency. + * .mozonfig: Disable more tests. + + -- Eric Dorland <eric@debian.org> Wed, 20 Nov 2002 19:13:18 -0500 + +phoenix (0.4-2) unstable; urgency=low + + * debian/control: + + Add build-depends. + + Fix section and description. + * .mozconfig: + + Use system zlib. + + -- Eric Dorland <eric@debian.org> Wed, 13 Nov 2002 19:03:52 -0500 + +phoenix (0.4-1) unstable; urgency=low + + * Initial release. + + -- Eric Dorland <eric@debian.org> Mon, 11 Nov 2002 23:09:41 -0500 --- firefox-3.6.18+build2+nobinonly.orig/debian/firefox-final.desktop +++ firefox-3.6.18+build2+nobinonly/debian/firefox-final.desktop @@ -0,0 +1,107 @@ +[Desktop Entry] +Version=1.0 +Name=Firefox Web Browser +Name[ar]=متصفح الوِب فَيَرفُكْس +Name[ast]=Restolador web Firefox +Name[ca]=Navegador web Firefox +Name[cs]=Firefox Webový prohlížeč +Name[de]=Firefox-Webbrowser +Name[es]=Navegador web Firefox +Name[et]=Firefoxi veebibrauser +Name[fa]=مرورگر اینترنتی Firefox +Name[fi]=Firefox-selain +Name[fr]=Navigateur Web Firefox +Name[gl]=Navegador web Firefox +Nmme[he]=דפדפן האינטרנט Firefox +Name[hr]=Firefox web preglednik +Name[hu]=Firefox webböngésző +Name[it]=Browser web Firefox +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]=Firefox - internetový prehliadač +Name[sv]=Webbläsaren Firefox +Name[ru]=Веб-браузер Firefox +Name[ug]=Firefox توركۆرگۈ +Name[vi]=Trình duyệt web Firefox +Name[zh_CN]=Firefox 网络浏览器 +Name[zh_TW]=Firefox 網路瀏覽器 +Comment=Browse the World Wide Web +Comment[ar]=تصفح الشبكة العنكبوتية العالمية +Comment[ast]=Restola pela Rede +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[et]=Lehitse veebi +Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید +Comment[fi]=Selaa Internetin WWW-sivuja +Comment[fr]=Navigue sur Internet +Comment[gl]=Navegar pola Rede +Comment[he]=גלישה ברחבי האינטרנט +Comment[hr]=Pretražite we +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 +Comment[ru]=Доступ в Интернет +Comment[vi]=Để duyệt các trang web +Comment[ug]=دۇنيادىكى توربەتلىرىنى كۆرگىلى بولىدۇ +Comment[zh_CN]=浏览互联网 +Comment[zh_TW]=瀏覽網際網路 +GenericName=Web Browser +GenericName[ar]=متصفح وب +GenericName[ast]=Restolador Web +GenericName[ca]=Navegador web +GenericName[cs]=Webový prohlížeč +GenericName[de]=Webbrowser +GenericName[es]=Navegador web +GenericName[et]=Veebibrauser +GenericName[fa]=مرورگر اینترنتی +GenericName[fi]=WWW-selain +GenericName[fr]=Navigateur Web +GenericName[gl]=Navegador Web +GenericName[he]=דפדפן אינטרנט +GenericName[hr]=Web preglednik +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 +GenericName[ru]=Веб-браузер +GenericName[ug]=توركۆرگۈ +GenericName[vi]=Trình duyệt Web +GenericName[zh_CN]=网络浏览器 +GenericName[zh_TW]=網路瀏覽器 +Exec=firefox %u +Terminal=false +X-MultipleArgs=false +Type=Application +Icon=firefox +Categories=Application;Internet;Network;WebBrowser; +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.6.18+build2+nobinonly.orig/debian/MPL +++ firefox-3.6.18+build2+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.6.18+build2+nobinonly.orig/debian/docs +++ firefox-3.6.18+build2+nobinonly/debian/docs @@ -0,0 +1 @@ +debian/MPL --- firefox-3.6.18+build2+nobinonly.orig/debian/copyright +++ firefox-3.6.18+build2+nobinonly/debian/copyright @@ -0,0 +1,738 @@ +This package was debianized by Eric Dorland <eric@debian.org> 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.6.18+build2+nobinonly.orig/debian/firefox.js +++ firefox-3.6.18+build2+nobinonly/debian/firefox.js @@ -0,0 +1,26 @@ +// 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 default locale to use if no /usr/lib/firefox-addons/searchplugins/LOCALE +// exists for the current used LOCALE +pref("distribution.searchplugins.defaultLocale", "en-US"); + +// Enable the NetworkManager integration +pref("toolkit.networkmanager.disable", false); --- firefox-3.6.18+build2+nobinonly.orig/debian/README.source +++ firefox-3.6.18+build2+nobinonly/debian/README.source @@ -0,0 +1,33 @@ +1) To create the fully patched source, just run "debian/rules apply-patches" in the source directory. The fully patched source will be available in build-tree/mozilla + +2) This package uses the quilt patch system. To create or edit patches which are applied at build time, you must first extract the source tarball. To do this, run "debian/rules pre-build". cd in to build-tree/mozilla and use quilt in the usual fashion (see "man quilt"). + +Your life will be much easier if you add the following to ~/.quiltrc: + +for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do + if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then + export QUILT_PATCHES=${where}debian/patches + fi +done + +So, basically: + + a) debian/rules pre-build + b) cd build-tree/mozilla + c) quilt push <patchname> + .....or..... + quilt push + .....or..... + quilt push -a + .....or..... + quilt new + +You get the idea..... + +3) To remove any changes applied to the packaging, run "fakeroot debian/rules clean". This will remove all patches and delete auto-generated files + +4) It is possible to disable quilt patches on a per-release basis. To do this, create a debian/patches/series-disable-patches.<major_version>.<minor_version> file, and list the patches that you don't want to apply for a particular release. Eg, for Ubuntu 8.04, create a file named debian/patches/series-disable-patches.8.04. + +You can still edit patches in the usual fashion - when manually applying patches, no patches are disabled (this only happens at build time). + +To manually disable the patches for your current release, run "debian/rules debian/disable-patches-for-release". To re-enable them again, run the clean target (but any changes you made to the temporary debian/patches/series will be lost here) --- firefox-3.6.18+build2+nobinonly.orig/debian/firefox.postrm.in +++ firefox-3.6.18+build2+nobinonly/debian/firefox.postrm.in @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +if [ "$1" = "purge" ]; then + APP_PROFILE="usr.bin.@APPNAME@" + rm -f /etc/apparmor.d/force-complain/$APP_PROFILE || true + rm -f /etc/apparmor.d/disable/$APP_PROFILE || true + rm -f /etc/apparmor.d/local/$APP_PROFILE || true + rm -f "/etc/apparmor.d/abstractions/ubuntu-browsers.d/@APPNAME@" || true + rmdir /etc/apparmor.d/local 2>/dev/null || true +fi --- firefox-3.6.18+build2+nobinonly.orig/debian/ubuntu-useragent.js.tmpl +++ firefox-3.6.18+build2+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.6.18+build2+nobinonly.orig/debian/firefox.cfg +++ firefox-3.6.18+build2+nobinonly/debian/firefox.cfg @@ -0,0 +1,2 @@ +// +lockPref("app.update.enabled", false); --- firefox-3.6.18+build2+nobinonly.orig/debian/firefox-gnome-support.prerm.in +++ firefox-3.6.18+build2+nobinonly/debian/firefox-gnome-support.prerm.in @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +APPNAME=@APPNAME@ + +if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then + update-alternatives --remove gnome-www-browser /usr/bin/$APPNAME +fi + +#DEBHELPER# --- firefox-3.6.18+build2+nobinonly.orig/debian/firefox-gnome-support.postinst.in +++ firefox-3.6.18+build2+nobinonly/debian/firefox-gnome-support.postinst.in @@ -0,0 +1,17 @@ +#!/bin/sh + +set -e + +APPNAME=@APPNAME@ + +if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] ; then + update-alternatives --install /usr/bin/gnome-www-browser \ + gnome-www-browser /usr/bin/$APPNAME 40 + + for dir in `ls -d /usr/lib/firefox-3.6* || true`; do + if test -d $dir -a -e $dir/.autoreg; then + touch $dir/.autoreg + fi + done +fi + --- firefox-3.6.18+build2+nobinonly.orig/debian/usr.bin.firefox.apparmor.9.10 +++ firefox-3.6.18+build2+nobinonly/debian/usr.bin.firefox.apparmor.9.10 @@ -0,0 +1,330 @@ +# vim:syntax=apparmor +# Author: Jamie Strandboge <jamie@canonical.com> + +#include <tunables/global> + +@LIBDIR@/firefox-*bin { + #include <abstractions/audio> + #include <abstractions/base> + #include <abstractions/cups-client> + #include <abstractions/dbus> + #include <abstractions/fonts> + #include <abstractions/freedesktop.org> + #include <abstractions/gnome> + #include <abstractions/kde> + #include <abstractions/nameservice> + #include <abstractions/user-tmp> + #include <abstractions/X> + + # 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, + /etc/timezone r, + /usr/bin/dbus-launch ixr, + /usr/bin/apport-bug Ux, + /usr/bin/scim Ux, + /usr/bin/scim-bridge Ux, + /usr/lib/gstreamer0.10/gstreamer-0.10/gst-plugin-scanner ix, + /usr/bin/apturl Uxr, + + # firefox specific + /etc/firefox*/ r, + /etc/firefox*/** r, + /etc/xul-ext/** r, + /etc/xulrunner-1.9*/ r, + /etc/xulrunner-1.9*/** r, + /etc/gre.d/ r, + /etc/gre.d/* r, + + # noisy + deny @LIBDIR@/** w, + deny /usr/lib/firefox-addons/** w, + deny /usr/lib/xulrunner-addons/** w, + deny /usr/lib/xulrunner-*/components/*.tmp w, + deny /.suspended r, + deny /boot/initrd.img* r, + deny /boot/vmlinuz* r, + + # These are needed when a new user starts firefox and firefox.sh is used + @LIBDIR@/** ixr, + /usr/bin/basename ixr, + /usr/bin/dirname ixr, + /usr/bin/pwd ixr, + /sbin/killall5 ixr, + /bin/which ixr, + /usr/bin/tr 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, + /etc/fstab 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, + /media/** rw, + owner /mnt/** rw, + owner /srv/** rw, + + #include <abstractions/private-files> + 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/**/*.{db,parentlock,sqlite}* k, + @{HOME}/.mozilla/plugins/** rm, + @{HOME}/.mozilla/**/plugins/** rm, + + # per-user common plugin configuration + @{HOME}/.adobe/ rw, + @{HOME}/.adobe/** rw, + @{HOME}/.macromedia/ rw, + @{HOME}/.macromedia/** rw, + + # + # 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 @LIBDIR@/update.test w, + deny /usr/lib/mozilla/extensions/**/ w, + deny /usr/lib/xulrunner-addons/extensions/**/ w, + deny /usr/share/mozilla/extensions/**/ w, + deny /usr/share/mozilla/ w, + + # + # Plugins/helpers + # + @{PROC}/[0-9]*/fd/ r, + /usr/lib/** rm, + /bin/bash ixr, + /bin/dash ixr, + /bin/grep ixr, + /bin/sed ixr, + /bin/ps Uxr, + /bin/uname Uxr, + /usr/bin/gnome-codec-install Uxr, + /usr/bin/m4 ixr, + /usr/bin/mkfifo Uxr, + /usr/lib/nspluginwrapper/i386/linux/npviewer Uxr, + /var/lib/ r, + /var/lib/** mr, + + # Needed for container to work in xul builds + /usr/lib/xulrunner-*/plugin-container ixr, + + # 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/lib/openoffice/program/soffice Uxr, + /usr/bin/gtk-gnash ixr, + /usr/bin/pulseaudio ixr, + /usr/bin/nautilus Uxr, + /usr/bin/deluge Uxr, + /usr/bin/okular Uxr, + /usr/bin/transmission Uxr, + /usr/bin/liferea-add-feed Uxr, + /usr/bin/azureus Uxr, + /usr/bin/leafpad Uxr, + /usr/bin/mousepad Uxr, + + # Adobe Acrobat Reader + /opt/Adobe/Reader9/bin/acroread Uxr, + /opt/Adobe/Reader9/** r, + + # 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 + @{HOME}/.java/deployment/deployment.properties k, + /etc/java-*/ r, + /etc/java-*/** r, + /usr/lib/jvm/java-6-openjdk/jre/bin/java cx -> firefox_openjdk, + /usr/lib/jvm/java-*-sun-1.*/jre/bin/java{,_vm} cx -> firefox_java, + /usr/lib/jvm/java-*-sun-1.*/jre/lib/*/libnp*.so cx -> firefox_java, + /usr/lib/j2*-ibm/jre/bin/java cx -> firefox_java, + + # for mailto: + #include <abstractions/ubuntu-email> + #include <abstractions/ubuntu-console-email> + + # Terminals for using console applications. These abstractions should ideally + # have 'ix' to restrct access to what only firefox is allowed to do + #include <abstractions/ubuntu-gnome-terminal> + + # 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 <abstractions/ubuntu-xterm> + ##include <abstractions/ubuntu-konsole> + + + # + # Child profiles + # + + # Profile for the supported OpenJDK in Ubuntu. This doesn't require the + # unfortunate workarounds of the proprietary Javas, so have a separate + # profile. + profile firefox_openjdk { + #include <abstractions/base> + #include <abstractions/fonts> + #include <abstractions/gnome> + #include <abstractions/kde> + #include <abstractions/nameservice> + #include <abstractions/ssl_certs> + #include <abstractions/user-tmp> + #include <abstractions/private-files-strict> + + network inet stream, + network inet6 stream, + @{PROC}/[0-9]*/net/if_inet6 r, + @{PROC}/[0-9]*/net/ipv6_route r, + + /etc/java-*/ r, + /etc/java-*/** r, + /etc/lsb-release r, + /etc/ssl/certs/java/* r, + /etc/timezone r, + + @{PROC}/[0-9]*/ r, + @{PROC}/[0-9]*/fd/ r, + @{PROC}/filesystems r, + /sys/devices/system/cpu/ r, + /sys/devices/system/cpu/** r, + /usr/share/** r, + /var/lib/dbus/machine-id r, + + /usr/bin/env ix, + /usr/lib/jvm/java-6-openjdk/jre/bin/java ix, + /usr/lib/jvm/java-6-openjdk/jre/lib/i386/client/classes.jsa m, + + # Why would java need this? + deny /usr/bin/gconftool-2 x, + + owner @{HOME}/ r, + owner @{HOME}/** rwk, + } + + # Profile for commercial Javas. These need workarounds to work right (eg + # Sun's forcing of an executable stack (LP: #535247)). + profile firefox_java { + #include <abstractions/base> + #include <abstractions/fonts> + #include <abstractions/gnome> + #include <abstractions/kde> + #include <abstractions/nameservice> + #include <abstractions/ssl_certs> + #include <abstractions/user-tmp> + #include <abstractions/private-files-strict> + + network inet stream, + network inet6 stream, + @{PROC}/[0-9]*/net/if_inet6 r, + @{PROC}/[0-9]*/net/ipv6_route r, + @{PROC}/loadavg r, + + /etc/debian_version r, + /etc/java-*/ r, + /etc/java-*/** r, + /etc/lsb-release r, + /etc/ssl/certs/java/* r, + /etc/timezone r, + + @{PROC}/[0-9]*/ r, + @{PROC}/[0-9]*/fd/ r, + @{PROC}/filesystems r, + /sys/devices/system/cpu/ r, + /sys/devices/system/cpu/** r, + /usr/share/** r, + /var/lib/dbus/machine-id r, + + /usr/bin/env ix, + /usr/lib/jvm/java-*-sun-1.*/jre/bin/java{,_vm} ix, + /usr/lib/jvm/java-*-sun-1.*/jre/lib/i386/client/classes.jsa m, + /usr/lib/j2*-ibm/jre/bin/java ix, + + # noisy, can't write here anyway + deny /etc/.java/ w, + deny /etc/.java/** w, + + deny /usr/bin/gconftool-2 x, + + owner @{HOME}/ r, + owner @{HOME}/** rwk, + owner @{HOME}/.fontconfig/*.cache* m, + + # These are seriously unfortunate, but required due to LP: #535247 + /etc/passwd m, + owner @{HOME}/.java/**/cache/** m, + owner /tmp/** m, + /usr/lib{,32,64}/jvm/**/*.jar mr, + /usr/share/fonts/** m, + } +} --- firefox-3.6.18+build2+nobinonly.orig/debian/firefox.prerm.in +++ firefox-3.6.18+build2+nobinonly/debian/firefox.prerm.in @@ -0,0 +1,16 @@ +#!/bin/sh + +set -e + +APPNAME=@APPNAME@ + +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.6.18+build2+nobinonly.orig/debian/firefox-restart-required.update-notifier +++ firefox-3.6.18+build2+nobinonly/debian/firefox-restart-required.update-notifier @@ -0,0 +1,10 @@ +Name: Firefox restart required +Name-fr: Relancement de Firefox 3.6 requis +Priority: High +Terminal: False +DontShowAfterReboot: True +DisplayIf: pgrep -x firefox -U $(id -u) > /dev/null +Description: Firefox has been upgraded (or reinstalled) and must be restarted. + Please quit and restart your web browser now. +Description-fr: Firefox a été mis à jour (ou réinstallé) et doit être relancé. + Veuillez quitter et redémarrer for navigateur. --- firefox-3.6.18+build2+nobinonly.orig/debian/remove.binonly.sh +++ firefox-3.6.18+build2+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.6.18+build2+nobinonly.orig/debian/README.Debian.in +++ firefox-3.6.18+build2+nobinonly/debian/README.Debian.in @@ -0,0 +1,15 @@ +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@ + +The profile can be disabled by performing: +$ sudo aparmor_parser -R /etc/apparmor.d/usr.bin.@APPNAME@ +$ sudo ln -s /etc/apparmor.d/usr.bin.@APPNAME@ /etc/apparmor.d/disable/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.6.18+build2+nobinonly.orig/debian/firefox.xml +++ firefox-3.6.18+build2+nobinonly/debian/firefox.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE default-apps SYSTEM "gnome-da-list.dtd"> +<default-apps> + <web-browsers> + <web-browser> + <name>Namoroka</name> + <executable>firefox</executable> + <command>firefox %s</command> + <icon-name>firefox</icon-name> + <run-in-terminal>false</run-in-terminal> + <netscape-remote>true</netscape-remote> + <tab-command>firefox -new-tab "%s"</tab-command> + <win-command>firefox -new-window "%s"</win-command> + </web-browser> + </web-browsers> +</default-apps> + --- firefox-3.6.18+build2+nobinonly.orig/debian/rules +++ firefox-3.6.18+build2+nobinonly/debian/rules @@ -0,0 +1,531 @@ +#!/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) + +DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) + +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/^[^-]*-\{0,1\}\([^-]*\)$$/\1/') +DEBIAN_APP_NAME_OTHER := abrowser + +DEBIAN_NAME_OTHER := $(shell echo $(DEBIAN_NAME) | sed -e 's/$(DEBIAN_APP_NAME)/$(DEBIAN_APP_NAME_OTHER)/') + +BRANDING_NAME_OTHER := awesome-browser + +DEBIAN_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: *\(.*\)$$/\1/ p') +DEBIAN_XUL_VER := $(shell MALLOC_OPTIONS=O xulrunner-1.9.2 --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 + +WANT_UNIT_TESTS ?= 1 +DEB_MIN_SYSDEPS ?= 1 + +MOZCLIENT_PROJECTNAME := $(DEBIAN_NAME) +MOZCLIENT_PROJECTDIR := $(CURDIR)/debian/mozclient + +DISTRIB := $(shell lsb_release -i -s) +ifneq (,$(filter $(DISTRIB),Ubuntu)) + DISTRIB_VERSION_MAJOR := $(shell lsb_release -s -r | cut -d '.' -f 1) + DISTRIB_VERSION_MINOR := $(shell lsb_release -s -r | cut -d '.' -f 2) +endif + +# minVersion and maxVersion used in install.rdf +EM_TRANSLATION_VERSION = 3.6 +EM_TRANSLATION_MIN_VERSION = $(EM_TRANSLATION_VERSION) +EM_TRANSLATION_MAX_VERSION = $(EM_TRANSLATION_VERSION).* + +EXTRA_SYSTEM_CONFIGURE_FLAGS = $(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)-namoroka.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 + +# We need to do this before including patchsys-quilt.mk +# because we don't want the pre-build target to depend on this, but +# we want to ensure that appropriate patches are disabled before the +# apply-patches target is called +post-patches:: debian/disable-patches-for-release + +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 + +export DEB_BUILD_HARDENING=1 + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) +ifneq (armel, $(DEB_BUILD_ARCH)) + EXTRA_SYSTEM_CONFIGURE_FLAGS += --enable-optimize +else + EXTRA_SYSTEM_CONFIGURE_FLAGS += --enable-optimize=-O2 +endif +else + EXTRA_SYSTEM_CONFIGURE_FLAGS += --disable-optimize +endif + +# enable IPC and the crash reporter only on i386, amd64 and armel +ENABLE_IPC ?= 1 +ENABLE_BREAKPAD ?= 1 +ifeq (,$(findstring i386,$(DEB_BUILD_ARCH))) +ifeq (,$(findstring amd64,$(DEB_BUILD_ARCH))) +ifeq (,$(findstring armel,$(DEB_BUILD_ARCH))) + ENABLE_IPC=0 + ENABLE_BREAKPAD=0 +endif +endif +endif + +ifeq (1,$(ENABLE_IPC)) + EXTRA_SYSTEM_CONFIGURE_FLAGS += --enable-ipc +else + EXTRA_SYSTEM_CONFIGURE_FLAGS += --disable-ipc +endif + +# disable jit on sparc until bmo 502369 is fixable +ifneq (,$(findstring sparc,$(DEB_BUILD_ARCH))) + EXTRA_SYSTEM_CONFIGURE_FLAGS += --disable-jit +endif + +$(info WANT_UNIT_TESTS=$(WANT_UNIT_TESTS)) +ifeq (1,$(WANT_UNIT_TESTS)) + EXTRA_SYSTEM_CONFIGURE_FLAGS += --enable-tests --enable-mochitest +# Uncomment when the IPC test-suite works +#ifeq (1,$(ENABLE_IPC)) +# EXTRA_SYSTEM_CONFIGURE_FLAGS += --enable-ipdl-tests +#else +# EXTRA_SYSTEM_CONFIGURE_FLAGS += --disable-ipdl-tests +#endif +else + EXTRA_SYSTEM_CONFIGURE_FLAGS += --disable-tests --disable-mochitest --disable-ipdl-tests +endif + +ifneq (1, $(DEB_MIN_SYSDEPS)) + USE_SYSTEM_CAIRO := $(shell pkg-config --exists 'cairo >= 1.8.8'; a=$$?; if test $$a != 1; then echo 1; fi) +endif +# 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 + +ifneq (1, $(DEB_MIN_SYSDEPS)) + USE_SYSTEM_SQLITE := $(shell pkg-config --exists 'sqlite3 >= 3.7.1'; a=$$?; if test $$a != 1; then echo 1; fi) +endif +ifeq (1,$(USE_SYSTEM_SQLITE)) + EXTRA_SYSTEM_CONFIGURE_FLAGS += --enable-system-sqlite +else + EXTRA_SYSTEM_CONFIGURE_FLAGS += --disable-system-sqlite +endif + +ifneq (1, $(DEB_MIN_SYSDEPS)) + USE_SYSTEM_NSPR := $(shell pkg-config --exists 'nspr >= 4.8.6'; a=$$?; if test $$a != 1; then echo 1; fi) +endif +ifeq (1,$(USE_SYSTEM_NSPR)) + EXTRA_SYSTEM_CONFIGURE_FLAGS += --with-system-nspr +else + EXTRA_SYSTEM_CONFIGURE_FLAGS += --without-system-nspr +endif + +ifneq (1, $(DEB_MIN_SYSDEPS)) +USE_SYSTEM_NSS := $(shell pkg-config --exists 'nss >= 3.12.8'; a=$$?; if test $$a != 1; then echo 1; fi) +endif +ifeq (1,$(USE_SYSTEM_NSS)) + EXTRA_SYSTEM_CONFIGURE_FLAGS += --with-system-nss +else + EXTRA_SYSTEM_CONFIGURE_FLAGS += --without-system-nss +endif + +ifneq (1, $(DEB_MIN_SYSDEPS)) + EXTRA_SYSTEM_CONFIGURE_FLAGS += --enable-extensions=default,-reporter +else + EXTRA_SYSTEM_CONFIGURE_FLAGS += --enable-extensions=default +endif + +ifneq (1, $(DEB_MIN_SYSDEPS)) + system_jpeg_configure_flags := --with-system-jpeg=/usr + system_zlib_configure_flags := --with-system-zlib=/usr + system_myspell_configure_flags := --disable-system-myspell + system_xul_configure_flags := --with-libxul-sdk=$(DEBIAN_XUL_DEV) --with-system-libxul +else + system_jpeg_configure_flags := --without-system-jpeg + system_zlib_configure_flags := --without-system-zlib + system_myspell_configure_flags := --enable-system-myspell +endif + +ifeq (1, $(ENABLE_BREAKPAD)) + export MOZILLA_OFFICIAL = 1 + EXTRA_SYSTEM_CONFIGURE_FLAGS += --enable-crashreporter +else + EXTRA_SYSTEM_CONFIGURE_FLAGS += --disable-crashreporter +endif + +# required for various features +BUILD_OFFICIAL = 1 +export BUILD_OFFICIAL + +DEB_CONFIGURE_USER_FLAGS= \ + $(EXTRA_SYSTEM_CONFIGURE_FLAGS) \ + --disable-debug \ + --with-user-appdir=.mozilla \ + $(system_jpeg_configure_flags) \ + $(system_zlib_configure_flags) \ + $(system_xul_configure_flags) \ + $(system_myspell_configure_flags) \ + --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-pango \ + --enable-postscript \ + --enable-svg \ + --enable-mathml \ + --enable-xft \ + --enable-xinerama \ + --enable-safe-browsing \ + --enable-single-profile \ + --with-distribution-id=com.ubuntu \ + --enable-startup-notification \ + $(BRANDING) + +UUDECODE = \ + debsearch.gif \ + $(NULL) + +DEBIAN_EXECUTABLES = \ + firefox.sh \ + $(NULL) + +subst_files = \ + debian/$(DEBIAN_NAME)-gnome-support.postinst \ + debian/$(DEBIAN_NAME)-gnome-support.prerm \ + debian/$(DEBIAN_NAME).postinst \ + debian/$(DEBIAN_NAME).postrm \ + debian/$(DEBIAN_NAME).prerm \ + debian/$(DEBIAN_NAME).preinst \ + debian/usr.bin.firefox.apparmor \ + debian/README.Debian \ + debian/firefox.sh \ + debian/apport/$(DEBIAN_NAME) \ + $(NULL) + +%:: %.in + sed -e 's,@LIBDIR@,/$(DEBIAN_FF3_DIR),g' \ + -e 's,@APPNAME@,$(DEBIAN_NAME),g' \ + -e 's,@APPVER@,$(DEBIAN_APP_NAME_VER),g' < $< > $@ + +debian/apport/$(DEBIAN_NAME).in: + cp $(CURDIR)/debian/apport/blacklist $(CURDIR)/debian/apport/$(DEBIAN_NAME).in + +debian/disable-patches-for-release: + if [ -f "$(CURDIR)/debian/patches/series-disable-patches.$(DISTRIB_VERSION_MAJOR).$(DISTRIB_VERSION_MINOR)" ] ; then \ + /bin/sh $(CURDIR)/debian/disable-patches.sh $(CURDIR)/debian/patches/series-disable-patches.$(DISTRIB_VERSION_MAJOR).$(DISTRIB_VERSION_MINOR) $(CURDIR) ; \ + fi + touch $@ + +debian/usr.bin.firefox.apparmor.in: + if [ '$(DISTRIB_VERSION_MAJOR)$(DISTRIB_VERSION_MINOR)' -ge '1010' ]; then \ + cp $(CURDIR)/debian/usr.bin.firefox.apparmor.10.10 $(CURDIR)/debian/usr.bin.firefox.apparmor.in ; \ + elif [ "$(DISTRIB_VERSION_MAJOR)" -ge "10" ]; then \ + cp $(CURDIR)/debian/usr.bin.firefox.apparmor.10.04 $(CURDIR)/debian/usr.bin.firefox.apparmor.in ; \ + else \ + cp $(CURDIR)/debian/usr.bin.firefox.apparmor.9.10 $(CURDIR)/debian/usr.bin.firefox.apparmor.in ; \ + fi + +debian/migrator/ffox-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) + +ifeq (1, $(DEB_MIN_SYSDEPS)) +post-patches:: debian/stamp-autotools-files-moz +debian/stamp-autotools-files-moz: + # Number of processors: $(PROCESSORS) [$(shell grep 'model name' /proc/cpuinfo | head -1)] + if [ "Z$(DEB_AUTO_UPDATE_AUTOCONF)" != Z ] || [ ! -e $(DEB_SRCDIR)/js/src/configure ]; \ + then cd $(DEB_SRCDIR)/js/src && `which autoconf$(DEB_AUTO_UPDATE_AUTOCONF) || which autoconf`; fi + touch $@ +endif + +post-patches:: debian/migrator/ffox-beta-profile-migration-dialog + +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)/; \ + $(MAKE) -C ../../browser/app/ + 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 +ifeq (1, $(DEB_MIN_SYSDEPS)) + dh_install -p$(DEBIAN_NAME) \ + debian/tmp-$(DEBIAN_NAME_OTHER)-branding/$(DEBIAN_FF3_DIR)/chrome/pippki.* \ + debian/tmp-$(DEBIAN_NAME_OTHER)-branding/$(DEBIAN_FF3_DIR)/chrome/toolkit.* \ + debian/tmp-$(DEBIAN_NAME_OTHER)-branding/$(DEBIAN_FF3_DIR)/chrome/comm.* \ + debian/tmp-$(DEBIAN_NAME_OTHER)-branding/$(DEBIAN_FF3_DIR)/chrome/reporter.* \ + $(DEBIAN_FF3_DIR)/chrome + dh_install -p$(DEBIAN_NAME) \ + debian/tmp-$(DEBIAN_NAME_OTHER)-branding/$(DEBIAN_FF3_DIR)/*.so \ + $(DEBIAN_FF3_DIR) + + $(foreach i,$(wildcard debian/tmp/usr/lib/firefox-*/components/*.so), \ + dh_install -p$(DEBIAN_NAME) $(i);) true + dh_install -p$(DEBIAN_NAME) \ + debian/tmp/usr/lib/firefox-*/firefox-bin $(DEBIAN_FF3_DIR) + dh_link $(DEBIAN_FF3_DIR)/firefox-bin $(DEBIAN_FF3_DIR)/$(DEBIAN_APP_NAME_OTHER)-bin + dh_install -p$(DEBIAN_NAME) \ + debian/tmp/usr/lib/firefox-*/defaults/autoconfig + dh_install -p$(DEBIAN_NAME) \ + debian/tmp/usr/lib/firefox-*/defaults/pref + dh_install -p$(DEBIAN_NAME) \ + debian/tmp/usr/lib/firefox-*/greprefs + dh_install -p$(DEBIAN_NAME) \ + debian/tmp/usr/lib/firefox-*/res + +else + dh_install -p$(DEBIAN_NAME) \ + debian/tmp/usr/lib/firefox-*/components/libbrowsercomps.so + dh_install -p$(DEBIAN_NAME) \ + debian/tmp/usr/lib/firefox-*/components/libbrowserdirprovider.so + dh_install -p$(DEBIAN_NAME) \ + debian/tmp/usr/lib/firefox-*/defaults/preferences +endif +ifeq (1,$(ENABLE_IPC)) + dh_install -p$(DEBIAN_NAME) \ + debian/tmp/usr/lib/firefox-*/plugin-container +endif + 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-beta-profile-migration-dialog $(DEBIAN_FF3_DIR) + dh_link $(DEBIAN_FF3_DIR)/firefox.sh usr/bin/$(DEBIAN_NAME) + dh_install debian/tmp/$(DEBIAN_FF3_DIR)/firefox $(DEBIAN_FF3_DIR) + dh_link $(DEBIAN_FF3_DIR)/$(DEBIAN_NAME) $(DEBIAN_FF3_DIR)/$(DEBIAN_APP_NAME_OTHER) +ifneq ($(DEBIAN_NAME),$(DEBIAN_APP_NAME)) + dh_link $(DEBIAN_FF3_DIR)/firefox $(DEBIAN_FF3_DIR)/$(DEBIAN_APP_NAME)-$(DEBIAN_APP_NAME_VER) + dh_link $(DEBIAN_FF3_DIR)/firefox $(DEBIAN_FF3_DIR)/$(DEBIAN_APP_NAME_OTHER)-$(DEBIAN_APP_NAME_VER) + dh_link $(DEBIAN_FF3_DIR)/firefox-bin $(DEBIAN_FF3_DIR)/$(DEBIAN_APP_NAME)-$(DEBIAN_APP_NAME_VER)-bin + dh_link $(DEBIAN_FF3_DIR)/firefox-bin $(DEBIAN_FF3_DIR)/$(DEBIAN_APP_NAME_OTHER)-$(DEBIAN_APP_NAME_VER)-bin +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 usr/lib/firefox-addons/searchplugins $(DEBIAN_FF3_DIR)/searchplugins + dh_link etc/$(DEBIAN_NAME)/pref $(DEBIAN_FF3_DIR)/defaults/syspref + dh_link etc/$(DEBIAN_NAME)/profile $(DEBIAN_FF3_DIR)/defaults/profile + #Dictionary Transition in Maverick (LP: #590450) + if [ '$(DISTRIB_VERSION_MAJOR)$(DISTRIB_VERSION_MINOR)' -ge '1010' ]; then \ + dh_link usr/share/hunspell $(DEBIAN_FF3_DIR)/dictionaries ; \ + else \ + dh_link usr/share/myspell/dicts $(DEBIAN_FF3_DIR)/dictionaries ; \ + fi + rm -f debian/$(DEBIAN_NAME)/$(DEBIAN_FF3_DIR)/chrome/browser-branding* + cp debian/usr.bin.firefox.apparmor debian/$(DEBIAN_NAME)/etc/apparmor.d/usr.bin.$(DEBIAN_NAME) + dh_install debian/distribution.ini $(DEBIAN_FF3_DIR)/distribution/ + dh_link usr/lib/firefox-addons/searchplugins $(DEBIAN_FF3_DIR)/distribution/searchplugins + install -m 644 debian/tmp/$(DEBIAN_FF3_DIR)/searchplugins/* debian/$(DEBIAN_NAME)/usr/lib/firefox-addons/searchplugins/en-US/ +ifeq (1, $(ENABLE_BREAKPAD)) + # create build symbols + cd build-tree/mozilla/; \ + $(MAKE) buildsymbols MOZ_SYMBOLS_EXTRA_BUILDID=$(shell date -d "`dpkg-parsechangelog | grep Date: | sed -e 's/^Date: //'`" +%y%m%d%H%M%S)-$(DEB_HOST_GNU_CPU) + dh_install -p$(DEBIAN_NAME) debian/apport/$(DEBIAN_NAME) etc/apport/blacklist.d/ + dh_install -p$(DEBIAN_NAME)-mozsymbols build-tree/mozilla/dist/*symbols.zip $(DEBIAN_FF3_DIR)/ +ifeq (1, $(DEB_MIN_SYSDEPS)) + dh_install -p$(DEBIAN_NAME) debian/tmp/usr/lib/firefox-*/crashreporter $(DEBIAN_FF3_DIR)/ +endif +endif + +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 + mkdir -p debian/$(DEBIAN_NAME_OTHER)-branding/usr/share/applications/ + cp -f debian/$(DESKTOP) \ + debian/$(DEBIAN_NAME_OTHER)-branding/usr/share/applications/$(DEBIAN_NAME_OTHER).desktop +ifeq (1, $(DEB_MIN_SYSDEPS)) + dh_installdirs -p$(DEBIAN_NAME_OTHER)-branding $(DEBIAN_FF3_DIR)/defaults/pref/ +else + dh_installdirs -p$(DEBIAN_NAME_OTHER)-branding $(DEBIAN_FF3_DIR)/defaults/preferences/ +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/ + + cp -f debian/$(DESKTOP_BRANDED) \ + debian/$(DEBIAN_NAME)-branding/usr/share/applications/$(DEBIAN_NAME).desktop + +ifeq (1, $(DEB_MIN_SYSDEPS)) +pref_target = debian/$(DEBIAN_NAME)/$(DEBIAN_FF3_DIR)/defaults/pref/ubuntu-useragent.js +else +pref_target = debian/$(DEBIAN_NAME)/$(DEBIAN_FF3_DIR)/defaults/preferences/ubuntu-useragent.js +endif + +binary-install/$(DEBIAN_NAME):: $(pref_target) + +$(pref_target): 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' \ + < $< > $@ + +ifeq (1, $(DEB_MIN_SYSDEPS)) +abrowser_pref_target = debian/$(DEBIAN_NAME_OTHER)-branding/$(DEBIAN_FF3_DIR)/defaults/pref/ubuntu-abrowser.js +else +abrowser_pref_target = debian/$(DEBIAN_NAME_OTHER)-branding/$(DEBIAN_FF3_DIR)/defaults/preferences/ubuntu-abrowser.js +endif + +binary-install/$(DEBIAN_NAME_OTHER)-branding:: $(abrowser_pref_target) + +$(abrowser_pref_target): 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 '~') + +ifeq (1, $(DEB_MIN_SYSDEPS)) +GNOME_SUPPORT_FILES = libmozgnome.so libnkgnomevfs.so +endif + +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 + $(foreach file,$(GNOME_SUPPORT_FILES),rm -fv debian/$(DEBIAN_NAME)/usr/lib/firefox-*/components/$(file);) true + +ifeq (1, $(DEB_MIN_SYSDEPS)) +# we want the gnome dependencies not to be in the main package at shlibdeps runtime, hence we dont +# install them at binary-install/* stage, but copy them over _after_ the shlibdeps had been generated +binary-predeb/$(DEBIAN_NAME):: + $(foreach file,$(GNOME_SUPPORT_FILES),cp -vf debian/tmp/usr/lib/firefox-*/components/$(file) debian/$(DEBIAN_NAME)/usr/lib/firefox-*/components/;) true + + $(foreach lib,libsoftokn3.so libfreebl3.so libnssdbm3.so, \ + LD_LIBRARY_PATH=debian/$(DEBIAN_NAME)/$(DEBIAN_FF3_DIR):$$LD_LIBRARY_PATH \ + build-tree/mozilla/dist/bin/shlibsign -v -i debian/$(DEBIAN_NAME)/$(DEBIAN_FF3_DIR)/$(lib);) + +# ... and remove them from the -gnome-support package accordingly +binary-predeb/$(DEBIAN_NAME)-gnome-support:: + $(foreach file,$(GNOME_SUPPORT_FILES),rm -vf debian/$(DEBIAN_NAME)-gnome-support/usr/lib/firefox-*/components/$(file);) true +endif + +pre-build:: debian/usr.bin.firefox.apparmor.in $(subst_files) + 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 + + # KDE integration + cp $(DEB_SRCDIR)/toolkit/content/widgets/dialog.xml $(DEB_SRCDIR)/toolkit/content/widgets/dialog-kde.xml + cp $(DEB_SRCDIR)/toolkit/content/widgets/preferences.xml $(DEB_SRCDIR)/toolkit/content/widgets/preferences-kde.xml + cp $(DEB_SRCDIR)/browser/base/content/browser.xul $(DEB_SRCDIR)/browser/base/content/browser-kde.xul + +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 debian/apport/$(DEBIAN_NAME).in + rm -f debian/migrator/ffox-beta-profile-migration-dialog + rm -f debian/migrator/*~ + rm -rf debian/tmp-* + rm -f debian/stamp-autotools-files-moz + rm -f debian/usr.bin.firefox.apparmor.in + if [ -f "$(CURDIR)/debian/patches/series.orig" ] ; then \ + mv -f $(CURDIR)/debian/patches/series.orig $(CURDIR)/debian/patches/series ; \ + fi + rm -f debian/disable-patches-for-release --- firefox-3.6.18+build2+nobinonly.orig/debian/distribution.ini +++ firefox-3.6.18+build2+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.6.18+build2+nobinonly.orig/debian/firefox-minefield.desktop +++ firefox-3.6.18+build2+nobinonly/debian/firefox-minefield.desktop @@ -0,0 +1,15 @@ +[Desktop Entry] +Version=1.0 +Encoding=UTF-8 +Name=Minefield Web Browser +Comment=Browse the Bleeding Edge +GenericName=Bleed Browser +Exec=firefox %u +Terminal=false +X-MultipleArgs=false +Type=Application +Icon=firefox +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=Minefield +StartupNotify=true --- firefox-3.6.18+build2+nobinonly.orig/debian/migrator/main.c +++ firefox-3.6.18+build2+nobinonly/debian/migrator/main.c @@ -0,0 +1,96 @@ +/* + * Copyright (C) 2008 Canonical Ltd. + * Author: Alexander Sack <asac@jwsdot.com> + * + * 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.png" + +#include <glib/gi18n.h> +#include <gtk/gtk.h> + +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.6 - Beta Support", + NULL, + GTK_DIALOG_MODAL, + _("Keep Firefox 3.6 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.5, replacing your settings " + "from Firefox 3.6 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.6.18+build2+nobinonly.orig/debian/apport/blacklist +++ firefox-3.6.18+build2+nobinonly/debian/apport/blacklist @@ -0,0 +1,2 @@ +@LIBDIR@/@APPNAME@-bin +@LIBDIR@/plugin-container --- firefox-3.6.18+build2+nobinonly.orig/debian/apport/firefox.py +++ firefox-3.6.18+build2+nobinonly/debian/apport/firefox.py @@ -0,0 +1,232 @@ +'''firefox apport hook draft + +/usr/share/apport/package-hooks/firefox.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 <hmontoliu@gmail.com> + +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 +import re + +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, profile_path, 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''' % re.sub(profile_path, '/<hidden_local_profile>', 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): + if not apport.packaging.is_distro_package(report['Package'].split()[0]): + report['ThirdParty'] = 'True' + report['CrashDB'] = 'ubuntu-mozilla-ppa-bugs' + + packages = ['firefox', + 'firefox-gnome-support', + 'firefox-branding', + 'abroswer', + 'abrowser-branding'] + + versions = '' + for package in packages: + try: + version = packaging.get_version(package) + except ValueError: + version = 'N/A' + if version is None: + version = 'N/A' + versions += '%s %s\n' % (package, version) + report['FirefoxPackages'] = versions + + + '''adds hooked info 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): + profiles_ini_contents = "" + for line in open(profiles_ini).readlines(): + if not 'Path=' in line: + profiles_ini_contents += line + pbuffer = cStringIO.StringIO() + print >> pbuffer, profiles_ini_contents + pbuffer.seek(0) + report['profiles.ini'] = pbuffer.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_name_apport = "".join(x for x in profile_name if x.isalnum()) + 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'] = re.sub(profile_path, '/<hidden_local_profile>', open(pluginreg_dat).read()) + else: + report['profile_%s_pluginreg.dat' % profile_name_apport] = re.sub(profile_path, '/<hidden_local_profile>', 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', profile_path) + extension_summary += extension_summary_helper(extensions_dict['app_extensions'], 'Application Extensions', profile_path) + extension_summary += extension_summary_helper(extensions_dict['local_extensions'], 'Local Extensions', profile_path) + extension_summary += extension_summary_helper(themes_dict['gre_theme'], 'GRE Theme', profile_path, 0) + extension_summary += extension_summary_helper(themes_dict['app_theme'], 'Application Theme', profile_path, 0) + extension_summary += extension_summary_helper(themes_dict['local_theme'], 'Local Theme', profile_path, 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] --- firefox-3.6.18+build2+nobinonly.orig/debian/mozclient/firefox.conf +++ firefox-3.6.18+build2+nobinonly/debian/mozclient/firefox.conf @@ -0,0 +1,28 @@ +# Copyright (c) 2008-2009 Fabien Tassin <fta@sofaraway.org> +# Description: Project firefox 3.6 +# +# 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 +MOZCLIENT_PROJECT = mozilla-1.9.2 +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 = sh debian/moz-rev.sh http://hg.mozilla.org/releases/mozilla-1.9.2 default +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.6.18+build2+nobinonly.orig/debian/mozclient/firefox.mk +++ firefox-3.6.18+build2+nobinonly/debian/mozclient/firefox.mk @@ -0,0 +1,52 @@ +# -*- mode: makefile; coding: utf-8 -*- + +# Copyright (c) 2008 Fabien Tassin <fta@sofaraway.org> +# Description: Project firefox 3.6 +# +# 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-13.6 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.6[^/]*/,,' \ + $(NULL) + +COMPARE_FILTER_IN := sed \ + -e 's,^usr/lib/firefox-3.6[^/]*/searchplugins,usr/lib/firefox-addons/searchplugins,' \ + -e 's,^usr/lib/firefox-3.6[^/]*/extensions/inspector@mozilla.org/.*,,' \ + -e 's,^usr/lib/firefox-3.6[^/]*/extensions,usr/lib/xulrunner-addons/extensions,' \ + -e 's,^usr/lib/firefox-3.6[^/]*/defaults/profile,etc/firefox-3.6/profile,' \ + -e 's,^usr/lib/firefox-3.6[^/]*/\(old-homepage-default.properties\|README.txt\|removed-files\),,' \ + -e 's,^usr/lib/firefox-3.6[^/]*/.autoreg,,' \ + -e 's,^etc/firefox-3.6[^/]*/.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.6/presubj,,' \ + -e 's,^etc/firefox-3.6/\(firefoxrc\|pref/firefox.js\),,' \ + -e 's,^usr/lib/firefox-addons/searchplugins/\(debsearch\|wikipedia\).\(gif\|src\),,' \ + -e 's,^usr/lib/firefox-3.6[^/]*/\(firefox-3.6-restart-required.update-notifier\|firefox.cfg\|firefox.sh\|ffox-4-beta-profile-migration-dialog\),,' \ + $(NULL) + +include /usr/share/mozilla-devscripts/compare.mk --- firefox-3.6.18+build2+nobinonly.orig/debian/patches/firefox-fsh +++ firefox-3.6.18+build2+nobinonly/debian/patches/firefox-fsh @@ -0,0 +1,63 @@ +--- + browser/app/Makefile.in | 2 +- + browser/confvars.sh | 2 +- + config/autoconf.mk.in | 8 ++++---- + 3 files changed, 6 insertions(+), 6 deletions(-) + +Index: mozilla/config/autoconf.mk.in +=================================================================== +--- mozilla.orig/config/autoconf.mk.in ++++ mozilla/config/autoconf.mk.in +@@ -52,24 +52,24 @@ + MOZ_APP_DISPLAYNAME = @MOZ_APP_DISPLAYNAME@ + MOZ_APP_VERSION = @MOZ_APP_VERSION@ + + MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@ + + prefix = @prefix@ + exec_prefix = @exec_prefix@ + bindir = @bindir@ +-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++includedir = @includedir@/firefox-$(MOZ_APP_VERSION) + libdir = @libdir@ + datadir = @datadir@ + mandir = @mandir@ +-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++idldir = $(datadir)/idl/firefox-$(MOZ_APP_VERSION) + +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++installdir = $(libdir)/firefox-$(MOZ_APP_VERSION) ++sdkdir = $(libdir)/firefox-devel-$(MOZ_APP_VERSION) + + DIST = $(DEPTH)/dist + LIBXUL_SDK = @LIBXUL_SDK@ + + MOZ_FS_LAYOUT = @MOZ_FS_LAYOUT@ + + L10NBASEDIR = @L10NBASEDIR@ + +Index: mozilla/browser/confvars.sh +=================================================================== +--- mozilla.orig/browser/confvars.sh ++++ mozilla/browser/confvars.sh +@@ -31,17 +31,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 ***** + +-MOZ_APP_NAME=firefox ++MOZ_APP_NAME=firefox-3.6 + MOZ_UPDATER=1 + MOZ_PHOENIX=1 + + MOZ_ENABLE_LIBXUL=1 + MOZ_STATIC_BUILD_UNSUPPORTED=1 + MOZ_PLACES=1 + # always enabled for form history + MOZ_MORKREADER=1 + --- firefox-3.6.18+build2+nobinonly.orig/debian/patches/bz515232_att399338_distro_locale_searchplugins.patch +++ firefox-3.6.18+build2+nobinonly/debian/patches/bz515232_att399338_distro_locale_searchplugins.patch @@ -0,0 +1,144 @@ +--- + browser/components/dirprovider/Makefile.in | 1 + browser/components/dirprovider/nsBrowserDirectoryProvider.cpp | 54 +++++----- + 2 files changed, 32 insertions(+), 23 deletions(-) + +Index: mozilla/browser/components/dirprovider/nsBrowserDirectoryProvider.cpp +=================================================================== +--- mozilla.orig/browser/components/dirprovider/nsBrowserDirectoryProvider.cpp ++++ mozilla/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<nsIFile> 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; + +- nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID)); +- if (prefs) { +- +- nsCOMPtr<nsIFile> localePlugins; +- rv = searchPlugins->Clone(getter_AddRefs(localePlugins)); +- if (NS_FAILED(rv)) +- return; ++ nsCAutoString locale; ++ nsCOMPtr<nsIFile> localePlugins; ++ rv = searchPlugins->Clone(getter_AddRefs(localePlugins)); ++ if (NS_FAILED(rv)) ++ return; + +- localePlugins->AppendNative(NS_LITERAL_CSTRING("locale")); ++ nsCOMPtr<nsIXULChromeRegistry> chromeReg = ++ do_GetService(NS_CHROMEREGISTRY_CONTRACTID); ++ if (!chromeReg) ++ return; + +- nsCString locale; +- rv = prefs->GetCharPref("general.useragent.locale", getter_Copies(locale)); ++ chromeReg->GetSelectedLocale(NS_LITERAL_CSTRING("global"), locale); ++ if (NS_SUCCEEDED(rv)) { ++ nsCOMPtr<nsIFile> curLocalePlugins; ++ rv = localePlugins->Clone(getter_AddRefs(curLocalePlugins)); + if (NS_SUCCEEDED(rv)) { +- +- nsCOMPtr<nsIFile> 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 +- } ++ curLocalePlugins->AppendNative(locale); ++ rv = curLocalePlugins->Exists(&exists); ++ if (NS_SUCCEEDED(rv) && exists) { ++ array.AppendObject(curLocalePlugins); ++ if (commonPlugins) ++ array.AppendObject(commonPlugins); ++ return; // all done + } + } ++ } + ++ nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID)); ++ if (prefs) { + // 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<nsIFile> 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; + +Index: mozilla/browser/components/dirprovider/Makefile.in +=================================================================== +--- mozilla.orig/browser/components/dirprovider/Makefile.in ++++ mozilla/browser/components/dirprovider/Makefile.in +@@ -53,16 +53,17 @@ FORCE_SHARED_LIB = 1 + + # Because we are an application component, link against the CRT statically + # (on Windows, but only if we're not building our own CRT for jemalloc) + ifndef MOZ_MEMORY + USE_STATIC_LIBS = 1 + endif + + REQUIRES = \ ++ content \ + xpcom \ + string \ + pref \ + xulapp \ + $(NULL) + + CPPSRCS = nsBrowserDirectoryProvider.cpp + --- firefox-3.6.18+build2+nobinonly.orig/debian/patches/firefox-profilename +++ firefox-3.6.18+build2+nobinonly/debian/patches/firefox-profilename @@ -0,0 +1,274 @@ +--- + browser/app/application.ini | 2 - + browser/app/profile/firefox.js | 22 +++++++------- + browser/branding/awesome-browser/pref/firefox-branding.js | 10 +++--- + browser/branding/nightly/pref/firefox-branding.js | 10 +++--- + browser/branding/unofficial/pref/firefox-branding.js | 10 +++--- + other-licenses/branding/firefox/pref/firefox-branding.js | 8 ++--- + 6 files changed, 31 insertions(+), 31 deletions(-) + +Index: mozilla/browser/app/application.ini +=================================================================== +--- mozilla.orig/browser/app/application.ini ++++ mozilla/browser/app/application.ini +@@ -33,17 +33,17 @@ + ; 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 ***** + + #filter substitution + [App] + Vendor=Mozilla +-Name=Firefox ++Name=Firefox-3.6 + Version=@APP_VERSION@ + BuildID=@GRE_BUILDID@ + #ifdef MOZ_SOURCE_REPO + SourceRepository=@MOZ_SOURCE_REPO@ + #endif + #ifdef MOZ_SOURCE_STAMP + SourceStamp=@MOZ_SOURCE_STAMP@ + #endif +Index: mozilla/browser/branding/unofficial/pref/firefox-branding.js +=================================================================== +--- mozilla.orig/browser/branding/unofficial/pref/firefox-branding.js ++++ mozilla/browser/branding/unofficial/pref/firefox-branding.js +@@ -1,22 +1,22 @@ +-pref("startup.homepage_override_url","http://www.mozilla.org/projects/%APP%/%VERSION%/whatsnew/"); +-pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/"); ++pref("startup.homepage_override_url","http://www.mozilla.com/%LOCALE%/firefox/%VERSION%/whatsnew/"); ++pref("startup.homepage_welcome_url","http://www.mozilla.com/%LOCALE%/firefox/%VERSION%/firstrun/"); + // The time interval between checks for a new version (in seconds) + // nightly=8 hours, official=24 hours + pref("app.update.interval", 28800); + // The time interval between the downloading of mar file chunks in the + // background (in seconds) + pref("app.update.download.backgroundInterval", 60); + // URL user can browse to manually if for some reason all update installation + // attempts fail. +-pref("app.update.url.manual", "http://www.mozilla.org/products/%APP%/"); ++pref("app.update.url.manual", "http://www.mozilla.org/products/firefox/"); + // A default value for the "More information about this update" link + // supplied in the "An update is available" page of the update wizard. +-pref("app.update.url.details", "http://www.mozilla.org/projects/%APP%/"); ++pref("app.update.url.details", "http://www.mozilla.org/projects/firefox/"); + + // Release notes URL +-pref("app.releaseNotesURL", "http://www.mozilla.org/projects/%APP%/%VERSION%/releasenotes/"); ++pref("app.releaseNotesURL", "http://www.mozilla.com/%LOCALE%/firefox/%VERSION%/releasenotes/"); + + // Search codes belong only in builds with official branding + pref("browser.search.param.yahoo-fr", ""); + pref("browser.search.param.yahoo-fr-cjkt", ""); + pref("browser.search.param.yahoo-f-CN", ""); +Index: mozilla/browser/branding/awesome-browser/pref/firefox-branding.js +=================================================================== +--- mozilla.orig/browser/branding/awesome-browser/pref/firefox-branding.js ++++ mozilla/browser/branding/awesome-browser/pref/firefox-branding.js +@@ -1,16 +1,16 @@ +-pref("startup.homepage_override_url","http://www.mozilla.org/projects/%APP%/%VERSION%/whatsnew/"); +-pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/"); ++pref("startup.homepage_override_url","http://www.mozilla.com/%LOCALE%/firefox/%VERSION%/whatsnew/"); ++pref("startup.homepage_welcome_url","http://www.mozilla.com/%LOCALE%/firefox/%VERSION%/firstrun/"); + // URL user can browse to manually if for some reason all update installation + // attempts fail. +-pref("app.update.url.manual", "http://www.mozilla.org/products/%APP%/"); ++pref("app.update.url.manual", "http://www.mozilla.org/products/firefox/"); + // A default value for the "More information about this update" link + // supplied in the "An update is available" page of the update wizard. +-pref("app.update.url.details", "http://www.mozilla.org/projects/%APP%/"); ++pref("app.update.url.details", "http://www.mozilla.org/projects/firefox/"); + + // Release notes URL +-pref("app.releaseNotesURL", "http://www.mozilla.org/projects/%APP%/%VERSION%/releasenotes/"); ++pref("app.releaseNotesURL", "http://www.mozilla.com/%LOCALE%/firefox/%VERSION%/releasenotes/"); + + // Search codes belong only in builds with official branding + pref("browser.search.param.yahoo-fr", ""); + pref("browser.search.param.yahoo-fr-cjkt", ""); + pref("browser.search.param.yahoo-f-CN", ""); +Index: mozilla/other-licenses/branding/firefox/pref/firefox-branding.js +=================================================================== +--- mozilla.orig/other-licenses/branding/firefox/pref/firefox-branding.js ++++ mozilla/other-licenses/branding/firefox/pref/firefox-branding.js +@@ -1,20 +1,20 @@ +-pref("startup.homepage_override_url","http://www.mozilla.com/%LOCALE%/%APP%/%VERSION%/whatsnew/"); +-pref("startup.homepage_welcome_url","http://www.mozilla.com/%LOCALE%/%APP%/%VERSION%/firstrun/"); ++pref("startup.homepage_override_url","http://www.mozilla.com/%LOCALE%/firefox/%VERSION%/whatsnew/"); ++pref("startup.homepage_welcome_url","http://www.mozilla.com/%LOCALE%/firefox/%VERSION%/firstrun/"); + // Interval: Time between checks for a new version (in seconds) + // nightly=6 hours, official=24 hours + pref("app.update.interval", 86400); + // The time interval between the downloading of mar file chunks in the + // background (in seconds) + pref("app.update.download.backgroundInterval", 600); + // URL user can browse to manually if for some reason all update installation + // attempts fail. + pref("app.update.url.manual", "http://www.firefox.com"); + // A default value for the "More information about this update" link + // supplied in the "An update is available" page of the update wizard. +-pref("app.update.url.details", "http://www.mozilla.com/%LOCALE%/%APP%/releases/"); ++pref("app.update.url.details", "http://www.mozilla.com/%LOCALE%/firefox/releases/"); + + // Release notes URL +-pref("app.releaseNotesURL", "http://www.mozilla.com/%LOCALE%/%APP%/%VERSION%/releasenotes/"); ++pref("app.releaseNotesURL", "http://www.mozilla.com/%LOCALE%/firefox/%VERSION%/releasenotes/"); + + pref("browser.search.param.yahoo-fr", "moz35"); + pref("browser.search.param.yahoo-fr-cjkt", "moz35"); +Index: mozilla/browser/app/profile/firefox.js +=================================================================== +--- mozilla.orig/browser/app/profile/firefox.js ++++ mozilla/browser/app/profile/firefox.js +@@ -65,34 +65,34 @@ + pref("extensions.ignoreMTimeChanges", false); + // Enables some extra Extension System Logging (can reduce performance) + pref("extensions.logging.enabled", false); + // Hides the install button in the add-ons mgr + pref("extensions.hideInstallButton", true); + + // Preferences for the Get Add-ons pane + pref("extensions.getAddons.showPane", true); +-pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/%APP%"); ++pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/firefox"); + pref("extensions.getAddons.maxResults", 5); +-pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/recommended"); +-pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/featured/all/10/%OS%/%VERSION%"); +-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%"); +-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/10/%OS%/%VERSION%"); ++pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/recommended"); ++pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/list/featured/all/10/%OS%/%VERSION%"); ++pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%"); ++pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/10/%OS%/%VERSION%"); + + // Blocklist preferences + pref("extensions.blocklist.enabled", true); + pref("extensions.blocklist.interval", 86400); + // Controls what level the blocklist switches from warning about items to forcibly + // blocking them. + pref("extensions.blocklist.level", 2); + pref("extensions.blocklist.url", "https://addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/"); + pref("extensions.blocklist.detailsURL", "https://www.mozilla.com/%LOCALE%/blocklist/"); + + // Dictionary download preference +-pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/%APP%/dictionaries/"); ++pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); + + // Update Timer Manager preferences + // Interval: When all registered timers should be checked (in milliseconds) + // default=10 minutes + pref("app.update.timer", 600000); + + // App-specific update preferences + +@@ -160,17 +160,17 @@ + // extensions.{GUID}.update.url + // .. etc .. + // + pref("extensions.update.enabled", true); + pref("extensions.update.url", "https://versioncheck.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%"); + pref("extensions.update.interval", 86400); // Check for updates to Extensions and + // Themes every day + // Non-symmetric (not shared by extensions) extension-specific [update] preferences +-pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/%APP%/getpersonas"); ++pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/firefox/getpersonas"); + pref("extensions.dss.enabled", false); // Dynamic Skin Switching + pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next + // restart. + + pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name", "chrome://browser/locale/browser.properties"); + pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description", "chrome://browser/locale/browser.properties"); + + pref("xpinstall.whitelist.add", "addons.mozilla.org"); +@@ -274,17 +274,17 @@ + pref("browser.download.manager.focusWhenStarting", false); + pref("browser.download.manager.flashCount", 2); + pref("browser.download.manager.addToRecentDocs", true); + pref("browser.download.manager.quitBehavior", 0); + pref("browser.download.manager.scanWhenDone", true); + pref("browser.download.manager.resumeOnWakeDelay", 10000); + + // search engines URL +-pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search-engines/"); ++pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/"); + + // pointer to the default engine name + pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); + + // disable logging for the search service by default + pref("browser.search.log", false); + + // Ordering of Search Engines in the Engine list. +@@ -707,18 +707,18 @@ + // HTML report pages + pref("browser.safebrowsing.provider.0.reportGenericURL", "http://{moz:locale}.phish-generic.mozilla.com/?hl={moz:locale}"); + pref("browser.safebrowsing.provider.0.reportErrorURL", "http://{moz:locale}.phish-error.mozilla.com/?hl={moz:locale}"); + pref("browser.safebrowsing.provider.0.reportPhishURL", "http://{moz:locale}.phish-report.mozilla.com/?hl={moz:locale}"); + pref("browser.safebrowsing.provider.0.reportMalwareURL", "http://{moz:locale}.malware-report.mozilla.com/?hl={moz:locale}"); + pref("browser.safebrowsing.provider.0.reportMalwareErrorURL", "http://{moz:locale}.malware-error.mozilla.com/?hl={moz:locale}"); + + // FAQ URLs +-pref("browser.safebrowsing.warning.infoURL", "http://www.mozilla.com/%LOCALE%/%APP%/phishing-protection/"); +-pref("browser.geolocation.warning.infoURL", "http://www.mozilla.com/%LOCALE%/%APP%/geolocation/"); ++pref("browser.safebrowsing.warning.infoURL", "http://www.mozilla.com/%LOCALE%/firefox/phishing-protection/"); ++pref("browser.geolocation.warning.infoURL", "http://www.mozilla.com/%LOCALE%/firefox/geolocation/"); + + // Name of the about: page contributed by safebrowsing to handle display of error + // pages on phishing/malware hits. (bug 399233) + pref("urlclassifier.alternate_error_page", "blocked"); + + // The number of random entries to send with a gethash request. + pref("urlclassifier.gethashnoise", 4); + +@@ -843,17 +843,17 @@ + + // replace newlines with spaces when pasting into <input type="text"> fields + pref("editor.singleLine.pasteNewlines", 2); + + // The breakpad report server to link to in about:crashes + pref("breakpad.reportURL", "http://crash-stats.mozilla.com/report/index/"); + + // base URL for web-based support pages +-pref("app.support.baseURL", "http://support.mozilla.com/1/%APP%/%VERSION%/%OS%/%LOCALE%/"); ++pref("app.support.baseURL", "http://support.mozilla.com/1/firefox/%VERSION%/%OS%/%LOCALE%/"); + + // Name of alternate about: page for certificate errors (when undefined, defaults to about:neterror) + pref("security.alternate_certificate_error_page", "certerror"); + + // Whether to start the private browsing mode at application startup + pref("browser.privatebrowsing.autostart", false); + + // Whether we should skip prompting before starting the private browsing mode +Index: mozilla/browser/branding/nightly/pref/firefox-branding.js +=================================================================== +--- mozilla.orig/browser/branding/nightly/pref/firefox-branding.js ++++ mozilla/browser/branding/nightly/pref/firefox-branding.js +@@ -1,22 +1,22 @@ +-pref("startup.homepage_override_url","http://www.mozilla.org/projects/%APP%/%VERSION%/whatsnew/"); +-pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/"); ++pref("startup.homepage_override_url","http://www.mozilla.com/%LOCALE%/firefox/%VERSION%/whatsnew/"); ++pref("startup.homepage_welcome_url","http://www.mozilla.com/%LOCALE%/firefox/%VERSION%/firstrun/"); + // The time interval between checks for a new version (in seconds) + // nightly=8 hours, official=24 hours + pref("app.update.interval", 28800); + // The time interval between the downloading of mar file chunks in the + // background (in seconds) + pref("app.update.download.backgroundInterval", 60); + // URL user can browse to manually if for some reason all update installation + // attempts fail. +-pref("app.update.url.manual", "http://www.mozilla.org/products/%APP%/"); ++pref("app.update.url.manual", "http://www.mozilla.org/products/firefox/"); + // A default value for the "More information about this update" link + // supplied in the "An update is available" page of the update wizard. +-pref("app.update.url.details", "http://www.mozilla.org/projects/%APP%/"); ++pref("app.update.url.details", "http://www.mozilla.org/projects/firefox/"); + + // Release notes URL +-pref("app.releaseNotesURL", "http://www.mozilla.org/projects/%APP%/%VERSION%/releasenotes/"); ++pref("app.releaseNotesURL", "http://www.mozilla.com/%LOCALE%/firefox/%VERSION%/releasenotes/"); + + // Search codes belong only in builds with official branding + pref("browser.search.param.yahoo-fr", ""); + pref("browser.search.param.yahoo-fr-cjkt", ""); + pref("browser.search.param.yahoo-f-CN", ""); --- firefox-3.6.18+build2+nobinonly.orig/debian/patches/lp185622_system_path_default_browser.patch +++ firefox-3.6.18+build2+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 <glib.h> + #include <glib-object.h> + #include <gtk/gtk.h> + #include <gdk/gdk.h> + #include <gdk-pixbuf/gdk-pixbuf.h> + #include <limits.h> + #include <stdlib.h> + ++#define SYSTEM_PATH_BUILD 1 ++ + struct ProtocolAssociation + { + const char *name; + PRBool essential; + }; + + struct MimeTypeAssociation + { +@@ -129,25 +131,42 @@ + nsCOMPtr<nsILocalFile> 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<nsIStringBundleService> bundleService = ++ do_GetService(NS_STRINGBUNDLE_CONTRACTID); ++ NS_ENSURE_TRUE(bundleService, NS_ERROR_OUT_OF_MEMORY); ++ ++ nsCOMPtr<nsIStringBundle> 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<nsIGConfService> 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.6.18+build2+nobinonly.orig/debian/patches/ubuntu_codes_amazon.patch +++ firefox-3.6.18+build2+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 @@ + <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/"> + <ShortName>Amazon.com</ShortName> + <Description>Amazon.com Search</Description> + <InputEncoding>ISO-8859-1</InputEncoding> + <Image width="16" height="16">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=</Image> + <Url type="text/html" method="GET" template="http://www.amazon.com/exec/obidos/external-search/"> + <Param name="field-keywords" value="{searchTerms}"/> + <Param name="mode" value="blended"/> +- <Param name="tag" value="mozilla-20"/> ++ <Param name="tag" value="wwwcanoniccom-20"/> + <Param name="sourceid" value="Mozilla-search"/> + </Url> + <SearchForm>http://www.amazon.com/</SearchForm> + </SearchPlugin> --- firefox-3.6.18+build2+nobinonly.orig/debian/patches/bzXXX_plugin_for_mimetype_pref.patch +++ firefox-3.6.18+build2+nobinonly/debian/patches/bzXXX_plugin_for_mimetype_pref.patch @@ -0,0 +1,72 @@ +We introduce a new preference that allows users to set a preferred +plugin for a given mime-type. + +For example: + + pref ("modules.plugins.mimetype.application/x-shockwave-flash", "/usr/lib/firefox-3.0.1/plugins/libflashplayer.so") + +would make the flashplyer installed in that location the preferred one to use. + +In case the path is not valid, we just go ahead and search for the first match +given the mime-type. + +--- + modules/plugin/base/src/nsPluginHost.cpp | 33 +++++++++++++++++++++++++++++++ + 1 file changed, 33 insertions(+) + +Index: mozilla/modules/plugin/base/src/nsPluginHost.cpp +=================================================================== +--- mozilla.orig/modules/plugin/base/src/nsPluginHost.cpp ++++ mozilla/modules/plugin/base/src/nsPluginHost.cpp +@@ -3929,18 +3929,51 @@ + nsPluginTag *plugins = nsnull; + PRInt32 variants, cnt; + + LoadPlugins(); + + // if we have a mimetype passed in, search the mPlugins + // linked list for a match + if (nsnull != aMimeType) { ++ nsresult res; ++ nsCOMPtr<nsIPrefBranch> prefB (do_QueryInterface(mPrefService)); ++ ++ char *preferredPluginPath = NULL; ++ nsCAutoString mimetypePrefString ("modules.plugins.mimetype."); ++ mimetypePrefString.Append(aMimeType); ++ const char *mimetypePrefChar = mimetypePrefString.get(); ++ res = prefB->GetCharPref(mimetypePrefChar, &preferredPluginPath); ++ ++ if(!NS_SUCCEEDED(res)) preferredPluginPath = NULL; ++ + plugins = mPlugins; ++ if(preferredPluginPath) { ++ while (nsnull != plugins) { ++ if (0 == PL_strcasecmp(plugins->mFileName.get(), preferredPluginPath) || ++ 0 == PL_strcasecmp(plugins->mFullPath.get(), preferredPluginPath)) { ++ return plugins; ++ } ++ plugins = plugins->mNext; ++ } ++ ++ // now lets search for substrings ++ plugins=mPlugins; ++ while (nsnull != plugins) { ++ if (nsnull != PL_strstr(plugins->mFileName.get(), preferredPluginPath) || ++ nsnull != PL_strstr(plugins->mFullPath.get(), preferredPluginPath)) { ++ return plugins; ++ } ++ plugins = plugins->mNext; ++ } ++ } + ++ // if there is no pref for this mime-type, or if the plugin named in pref ++ // isn't found, we pick the first that matches for this mime-type ++ plugins = mPlugins; + while (nsnull != plugins) { + variants = plugins->mVariants; + for (cnt = 0; cnt < variants; cnt++) { + if ((!aCheckEnabled || plugins->IsEnabled()) && + plugins->mMimeTypeArray[cnt] && + (0 == PL_strcasecmp(plugins->mMimeTypeArray[cnt], aMimeType))) { + return plugins; + } --- firefox-3.6.18+build2+nobinonly.orig/debian/patches/browser_branding.patch +++ firefox-3.6.18+build2+nobinonly/debian/patches/browser_branding.patch @@ -0,0 +1,114 @@ +--- + browser/branding/nightly/content/jar.mn | 2 +- + browser/branding/nightly/locales/jar.mn | 2 +- + browser/branding/unofficial/content/jar.mn | 2 +- + browser/branding/unofficial/locales/jar.mn | 2 +- + browser/installer/package-manifest.in | 6 ++++++ + other-licenses/branding/firefox/content/jar.mn | 2 +- + other-licenses/branding/firefox/locales/jar.mn | 2 +- + 7 files changed, 12 insertions(+), 6 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/package-manifest.in +=================================================================== +--- mozilla.orig/browser/installer/package-manifest.in ++++ mozilla/browser/installer/package-manifest.in +@@ -368,16 +368,22 @@ + @BINPATH@/chrome/comm.jar + @BINPATH@/chrome/comm.manifest + @BINPATH@/chrome/reporter.jar + @BINPATH@/chrome/reporter.manifest + @BINPATH@/chrome/toolkit.jar + @BINPATH@/chrome/toolkit.manifest + @BINPATH@/@PREF_DIR@/reporter.js + #ifdef XP_UNIX ++; ubuntu official branding ++@BINPATH@/chrome/browser-branding.jar ++@BINPATH@/chrome/browser-branding.manifest ++@BINPATH@/chrome/browser-branding-en-US.jar ++@BINPATH@/chrome/browser-branding-en-US.manifest ++ + ; ubuntu awesome browser branding + @BINPATH@/chrome/awesome-branding.jar + @BINPATH@/chrome/awesome-branding.manifest + @BINPATH@/chrome/awesome-branding-en-US.jar + @BINPATH@/chrome/awesome-branding-en-US.manifest + #ifndef XP_MACOSX + @BINPATH@/chrome/icons/default/default16.png + @BINPATH@/chrome/icons/default/default32.png +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/branding/nightly/content/jar.mn +=================================================================== +--- mozilla.orig/browser/branding/nightly/content/jar.mn ++++ mozilla/browser/branding/nightly/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/nightly/locales/jar.mn +=================================================================== +--- mozilla.orig/browser/branding/nightly/locales/jar.mn ++++ mozilla/browser/branding/nightly/locales/jar.mn +@@ -1,7 +1,7 @@ + #filter substitution + +-@AB_CD@.jar: ++browser-branding-@AB_CD@.jar: + % locale branding @AB_CD@ %locale/branding/ + # Nightly branding only exists in en-US + locale/branding/brand.dtd (en-US/brand.dtd) + * locale/branding/brand.properties (en-US/brand.properties) --- firefox-3.6.18+build2+nobinonly.orig/debian/patches/bz386904_config_rules_install_dist_files.patch +++ firefox-3.6.18+build2+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.6.18+build2+nobinonly.orig/debian/patches/bzXXX_libxul_sdk_nspr.patch +++ firefox-3.6.18+build2+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.6.18+build2+nobinonly.orig/debian/patches/lp548866_bz467766_att351173-dont-reset-user-prefs-on-upgrade.patch +++ firefox-3.6.18+build2+nobinonly/debian/patches/lp548866_bz467766_att351173-dont-reset-user-prefs-on-upgrade.patch @@ -0,0 +1,102 @@ + +This bug is due to the fact, applications are restarted before extension +defaults are loaded. + +To reproduce, choose any preference and set the values like: +system default: + pref("prefkey",systemvalue); +extension default: + pref("prefkey", extensiondefault); +user pref: + user_pref("prefkey", systemvalue); + +Next, trigger application behaviour similar to upgrade by removing compreg.dat +from profile and start the application. + +Result: +User sees extensiondefault after upgrade, because the user_pref has been +eliminated ... which is definitly not what the user expects because he explicitly +had *systemvalue* set before the upgrade. + +Evaluation: +The bug happens because restart is performed *before* extension defaults have been +loaded and the prefapi.cpp always eliminate user preference if the user preference +is equal to the actual default (which happens to be extensiondefault normally - so +no reset, but is systemvalue during restart). + +Fix: +1. savePrefs should not try to be smart ... this patch removes the heuristic that guesses +whether a setting can be eliminated or not; it should be sufficient to only eliminate +prefs in hashPrefs. + +2. This patch prevents hashPrefs from eliminating the user pref in case we are in +*startup* ... unfortunately no such state info exists, which lets us guess that +we are in startup for the previously not dealt case: !set_default && +!pref_ValueChanged(pref->defaultPref, value, type) && !PREF_HAS_USER_VALUE(pref). + +If is the case we explicitly remember that this setting is a user-pref ... +even though it might be temporarily equal to the default pref. + +--- + modules/libpref/src/prefapi.cpp | 20 ++++++++++++++------ + 1 file changed, 14 insertions(+), 6 deletions(-) + +Index: mozilla/modules/libpref/src/prefapi.cpp +=================================================================== +--- mozilla.orig/modules/libpref/src/prefapi.cpp ++++ mozilla/modules/libpref/src/prefapi.cpp +@@ -324,23 +324,20 @@ + if (!pref) + return PL_DHASH_NEXT; + + nsCAutoString prefValue; + + // where we're getting our pref from + PrefValue* sourcePref; + +- if (PREF_HAS_USER_VALUE(pref) && +- pref_ValueChanged(pref->defaultPref, +- pref->userPref, +- (PrefType) PREF_TYPE(pref))) +- sourcePref = &pref->userPref; +- else if (PREF_IS_LOCKED(pref)) ++ if (PREF_IS_LOCKED(pref)) + sourcePref = &pref->defaultPref; ++ else if (PREF_HAS_USER_VALUE(pref)) ++ sourcePref = &pref->userPref; + else + // do not save default prefs that haven't changed + return PL_DHASH_NEXT; + + // strings are in quotes! + if (pref->flags & PREF_STRING) { + prefValue = '\"'; + str_escape(sourcePref->stringVal, prefValue); +@@ -742,16 +739,27 @@ + Otherwise, set the user value only if it has changed */ + if ( !pref_ValueChanged(pref->defaultPref, value, type) ) + { + if (PREF_HAS_USER_VALUE(pref)) + { + pref->flags &= ~PREF_USERSET; + if (!PREF_IS_LOCKED(pref)) + valueChanged = PR_TRUE; ++ } else { ++ // this is tricky: we have !set_default ... ++ // thus we are setting a user pref; however the user ++ // pref set is same as *current default*; this normally ++ // means to un-set ... however since we have ++ // !PREF_HAS_USER_VALUE(pref) this can only be during ++ // startup ++ pref_SetValue(&pref->userPref, value, type); ++ pref->flags |= PREF_USERSET; ++ if (!PREF_IS_LOCKED(pref)) ++ valueChanged = PR_TRUE; + } + } + else if ( !PREF_HAS_USER_VALUE(pref) || + pref_ValueChanged(pref->userPref, value, type) ) + { + pref_SetValue(&pref->userPref, value, type); + pref->flags |= PREF_USERSET; + if (!PREF_IS_LOCKED(pref)) --- firefox-3.6.18+build2+nobinonly.orig/debian/patches/series-disable-patches.8.04 +++ firefox-3.6.18+build2+nobinonly/debian/patches/series-disable-patches.8.04 @@ -0,0 +1,2 @@ +mozilla-kde.patch +firefox-kde.patch --- firefox-3.6.18+build2+nobinonly.orig/debian/patches/ubuntu_bookmarks.patch +++ firefox-3.6.18+build2+nobinonly/debian/patches/ubuntu_bookmarks.patch @@ -0,0 +1,23 @@ +--- + browser/locales/generic/profile/bookmarks.html.in | 9 +++++++++ + 1 file changed, 9 insertions(+) + +--- a/browser/locales/generic/profile/bookmarks.html.in ++++ b/browser/locales/generic/profile/bookmarks.html.in +@@ -17,6 +17,16 @@ + <DT><A HREF="http://fxfeeds.mozilla.com/@AB_CD@/firefox/livebookmarks/" FEEDURL="http://fxfeeds.mozilla.com/@AB_CD@/firefox/headlines.xml" ID="rdf:#$HvPhC3">@latest_headlines@</A> + </DL><p> + <HR> ++ <DT><H3 ADD_DATE="1181129907" LAST_MODIFIED="1180687506" ID="rdf:#$jYrW.3">Ubuntu and Free Software links</H3> ++<DD>Information and resources about Ubuntu, Debian and Free Software in general ++ <DL><p> ++ <DT><A HREF="http://www.ubuntulinux.org/" ADD_DATE="1181129907" LAST_MODIFIED="1181129907" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACSklEQVQ4jX1TXWhSYRj+ZMxRN7vpZuwiRrBREchgxS6CQXTn1EULyWiFdIQQRCu6yI0Yg4KUJIOhNCSiusqLbmSMLroQ2WgRw5Oxc456NHeOOmPqMX/W4ekm/46uF76bl/d53p/n+QhRRImLjWf9Djdvm9xmZ1UyO6uSedvkdtbvcJe42LiyvisKQZedMQzWWC1Bv8cYBmuFoMveA6RpWv3z0aWNo4CslqDOx9BIMw1Wp5IzzsvrNE2rWwSi59arLoBOhZzHitLGW5Q/vYewNIc6t4NGhgOrU4HVEmT9DjchhBBpd0vD6lRyE5yyTkNcMaGyuY5m1PkYhKU5JG+e6mwil5mvZ4jopXzNZPzaCVS/b6KeoBE3jiB5ewKJ66PIeayQpSL+HOTB3znXIskFHj4hSfMY10wUXi8DAPKrD3pukHVRAAAp/LGVS1omYoTVEvx69xTybwl7Tj3qfAzx+eEeAu7KcRRDARwEX7ZV0Q80CKMfaBTWFiFLRaTtMzjMpsAZ1H2VSNsugrdoOkiPVUh8YTTdWmFtEQCw59T3gu0zAIBiKNC9gvjM9KZ1xPlh1H58QTUaQdw4gsSNk+AMagjLRjQyHA73M11KCF7LKqlEw1OdncQVE7IuCuXPH9oycjsQHl9F0nxaIeO3s4QQQoTnCwHlyPkXNhRDARRDAaTunkc1GkE1Gmk38lK+lhMZhhlK37sQ+Z+V/60ms1qC9P3pcJeVmyT9JlE+0Uv5GIYZOvJHVqLhKdFL+ToNljSPcaKX8km7Wxpl/V9ZLTo82gQ36wAAAABJRU5ErkJggg==" ID="rdf:#$kYrW.3">Ubuntu</A> ++ <DT><A HREF="http://wiki.ubuntu.com" ADD_DATE="1181129907" LAST_MODIFIED="1181129907" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACmklEQVQ4jY2TX0hTcRzFj+7v3b+7zS0357wuNTfM9bB7g2tbGGaEYkhhJbUeRiiSpkEoSKRFUgjLFgRa/qE/SBGWYGgzNMg07EGEIvxDWZnggyCUhuZ2fz2IkTbJ8/4533MOfIEtqsXnUw9XleRW+nzqLQFdRXGKkfMWfuis+eAVnrKMpSv7CEeT5ymKXgCaTcHum8my8ixlbLiBmScBGyEBG/Hn6+6Ppak+EI4mvamKKQDpEeHafK126i47cnSv3nfnuOHRmsFcnfXHiVRZfbFB2rkvXtYEwBLRYMDvbCdBD5lsZb9uUyLbYRJf1spx8YBd3jhaGTe95GcWhQYmnOOQewFEr4PddvUOoccdJkEPqT1pfQuAMxqhKuBBuXSg1WJ4Ji5YpknARl5XmN4DMAEAPDapc7Dc3F6WSRe/ueF8t9DJ/6KkqNTr1w9VAIjOuNVVoetMeNnPrOhlyAYADJ8z95CAjXyvT1goyTM3jbe65gFkA4jaWDEB0MVIcEorQQUAFkAUqvdrakINTOiB1zjZWJbUv9DJL8vFyIq0UbNN7hVYzUrIpV42ScCtHdFLRShkjJLScLc7RIIeUl1obUwGZH/DLxMhn96lGiUcTYYcytmNKcUAFC+upfWToIdMtLFzFjH4W3GUtS0R8kE7xc84Va8IRxPBpRFyaVEHANs/Ec20xDXR6prJ43VPbzPUY4HVCAKrCRGOJg+T5B9PGyR9RUZpEMBhANJINUVqChlJUhxbcWkWCUcTwtHkWQr1rcZrHVjqyvh5yWttBqCPBAMAaoHoeIAyiHAohxY1F2jFHdul0Vc/32O/kKCHjLewswAcmxqsKXN1Fy2AWAD6I3tiSoN1Oz/l7tY/AWD/r0EEKQFwWH2kP/1/Aw7z2faOzA5FAAAAAElFTkSuQmCC" ID="rdf:#$mYrW.3">Ubuntu Wiki (community-edited website)</A> ++ <DT><A HREF="https://answers.launchpad.net/ubuntu/+addquestion" ADD_DATE="1181129907" LAST_MODIFIED="1181129907" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAEgSURBVDiNpZO7SgNBGIW/2awDaTRJs7FaEdfCylcQsbT2AcTSN/ABtvAJAj6AlfYWIjaCjYWwBC0kWISQgBd0sxfntwi6Jibrmpxy5sx3Dv/MKBERZpA1upAkCXEcTwcIggDf92m1WtMBoijCGFP48C/AqKR/j3m9AkkwT2fI+y0wPDI7D5A+HGC6xyhdR+L2IHFhg7m1UyjN/93gO2WlgV6/plTfwzyfkz4eFmvwJau2PTAvLfPRPkJeLrK9IoAsroayq0jSzQdMelvydoOkPVTZy5g/DVprADqdDp6XmdK7XVAa0zsBoLS4Px7gui6O4xCG4XBy2ETCJqq8iu01sCqbQ3UnKg52pH+Za5H/DXGMcq/Rqm6h7EouQM36nT8B8aKcEoKd93oAAAAASUVORK5CYII=" ID="rdf:#$nYrW.3">Make a Support Request to the Ubuntu Community</A> ++ <DT><A HREF="http://www.debian.org/" ADD_DATE="1181129907" LAST_MODIFIED="1181129907" ICON="data:image/x-icon;base64,AAABAAQAICAAAAEACACoCAAARgAAACAgEAABAAQA6AIAAO4IAAAQEAAAAQAIAGgFAADWCwAAEBAQAAEABAAoAQAAPhEAACgAAAAgAAAAQAAAAAEACAAAAAAAgAQAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAwMDAAMDcwADwyqYAACBAAAAgYAAAIIAAACCgAAAgwAAAIOAAAEAAAABAIAAAQEAAAEBgAABAgAAAQKAAAEDAAABA4AAAYAAAAGAgAABgQAAAYGAAAGCAAABgoAAAYMAAAGDgAACAAAAAgCAAAIBAAACAYAAAgIAAAICgAACAwAAAgOAAAKAAAACgIAAAoEAAAKBgAACggAAAoKAAAKDAAACg4AAAwAAAAMAgAADAQAAAwGAAAMCAAADAoAAAwMAAAMDgAADgAAAA4CAAAOBAAADgYAAA4IAAAOCgAADgwAAA4OAAQAAAAEAAIABAAEAAQABgAEAAgABAAKAAQADAAEAA4ABAIAAAQCAgAEAgQABAIGAAQCCAAEAgoABAIMAAQCDgAEBAAABAQCAAQEBAAEBAYABAQIAAQECgAEBAwABAQOAAQGAAAEBgIABAYEAAQGBgAEBggABAYKAAQGDAAEBg4ABAgAAAQIAgAECAQABAgGAAQICAAECAoABAgMAAQIDgAECgAABAoCAAQKBAAECgYABAoIAAQKCgAECgwABAoOAAQMAAAEDAIABAwEAAQMBgAEDAgABAwKAAQMDAAEDA4ABA4AAAQOAgAEDgQABA4GAAQOCAAEDgoABA4MAAQODgAIAAAACAACAAgABAAIAAYACAAIAAgACgAIAAwACAAOAAgCAAAIAgIACAIEAAgCBgAIAggACAIKAAgCDAAIAg4ACAQAAAgEAgAIBAQACAQGAAgECAAIBAoACAQMAAgEDgAIBgAACAYCAAgGBAAIBgYACAYIAAgGCgAIBgwACAYOAAgIAAAICAIACAgEAAgIBgAICAgACAgKAAgIDAAICA4ACAoAAAgKAgAICgQACAoGAAgKCAAICgoACAoMAAgKDgAIDAAACAwCAAgMBAAIDAYACAwIAAgMCgAIDAwACAwOAAgOAAAIDgIACA4EAAgOBgAIDggACA4KAAgODAAIDg4ADAAAAAwAAgAMAAQADAAGAAwACAAMAAoADAAMAAwADgAMAgAADAICAAwCBAAMAgYADAIIAAwCCgAMAgwADAIOAAwEAAAMBAIADAQEAAwEBgAMBAgADAQKAAwEDAAMBA4ADAYAAAwGAgAMBgQADAYGAAwGCAAMBgoADAYMAAwGDgAMCAAADAgCAAwIBAAMCAYADAgIAAwICgAMCAwADAgOAAwKAAAMCgIADAoEAAwKBgAMCggADAoKAAwKDAAMCg4ADAwAAAwMAgAMDAQADAwGAAwMCAAMDAoADw+/8ApKCgAICAgAAAAP8AAP8AAAD//wD/AAAA/wD/AP//AAD///8AAAAAAAAAAAAAAAAAAADnTpenAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAl0YAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAl0ZOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEZGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABGTgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARkYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEZGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACXRpcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEZGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABORgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEZGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRkYAAAAAAAAAAAAA75ef7wAAAAAAAAAAAAAAAAAAAJ9GAAAAAAAAAAAAV05ORkZGRp8AAAAAAAAAAAAAAAAARkYAAAAAAAAAp05OTqcAAADvRkbvAAAAAAAAAAAAAKdGRgAAAAAAAADvTp8AAAAAAAAA70aXAAAAAAAAAAAAp0aXAAAAAAAAAE5GAAAAp1cAAAAA70bvAAAAAAAAAACnRqcAAAAAAACnRu8AAAAAAABXAAAATkbvAAAAAAAAAJdGlwAAAAAAAKdGAAAAAAAAAKcAAAAARu8AAAAAAAAAp0ZOAAAAAAAAp0YAAAAAAAAAAAAAAABGTgAAAAAAAACnRkYAAAAAAAAARgAAAAAAAAAA5wAAAEZG7wAAAAAAAJ9GRgAAAAAAAADvnwAAAAAAAAAAAAAARkbvAAAAAAAA70ZGpwAAAAAAAABO7wAAAAAApwAAAABGTqcAAAAAAADvV0ZOAAAAAAAAAKdGpwAAAADvAAAA70ZO7wAAAAAAAO9GRkYAAAAAAAAAAO9ORkZGpwAAAACfRlfvAAAAAAAAAABGRk4AAAAAAAAAAAAAAAAAAAAAAEZGp6cAAAAAAAAApwBGRk4AAAAAAAAAAAAAAAAAAACnRkZGAAAAAAAAAAAAAJ9GRkbvAAAAAAAAAAAAAAAAAEZGRk4AAAAAAAAAAAAAAEZGRkanAAAAAAAAAAAAAABGRkZGAAAAAAAAAAAAAAAAAEZGRkZGlwAAAAAAAABORkZGRgAAAAAAAAAAAAAAAAAAAE5GRkZGRkZGRkZGRkZGRkYAAAAAAAAAAAAAAAAAAAAAAABGRkZGRkZGRkZGRk7vAAAAAAAAAAAAAAAAAAAAAAAAAAAATkZGTleXn6cAAAAAAAAAAAAAAP/8P///+f///+P////P////n////z////5////8f////P////n////5////8f+H//P+Af/z+Dh/4/j+P+P5zx/j8fuP4/P7z+Pz/8/j+/3H4/n/x+H8+8fh/HuH4f4Hh/j//4f0f/8P/B//D/4P/h//A/g//4AAf//gAP//+Af/KAAAACAAAABAAAAAAQAEAAAAAACAAgAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAIAAAIAAAACAgACAAAAAgACAAICAAACAgIAAwMDAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAAAAAAAAAACZkAAAAAAAAAAAAAAAAACZAAAAAAAAAAAAAAAAAACZkAAAAAAAAAAAAAAAAAAJkAAAAAAAAAAAAAAAAAAAmQAAAAAAAAAAAAAAAAAACZAAAAAAAAAAAAAAAAAAAJkAAAAAAAAAAAAAAAAAAAmZAAAAAAAAAAAAAAAAAAAJkAAAAAAAAAAAAAAAAAAAmZAAAAAAAAAAAAAAAAAAAJmQAAAAAAAAAAAAAAAAAACZAAAAAAAJkAAAAAAAAAAJkAAAAACZmZmZAAAAAAAACZAAAAAJmQAACZkAAAAAAAmQAAAAmQAAAAAJkAAAAAAJkAAAAJAAAJAAAJkAAAAAmZAAAAmQAAAAkACZAAAAAJmQAAAJkAAAAAkACQAAAACZkAAACQAAAAAAAAmQAAAAmZAAAAmQAAAACQAJkAAAAJmQAAAAmQAAAAAACZkAAAAJkAAAAAkAAAAJAAmZAAAACZkAAAAAkAAAkAAJmQAAAACZAAAAAAmZkAAAmZAAAAAAmZAAAAAAAAAAAJmQAAAAAAmZAAAAAAAAAAmZkAAAAAAJmZAAAAAAAAAJmQAAAAAAAJmZAAAAAAAAmZkAAAAAAAAJmZmQAAAAmZmQAAAAAAAAAJmZmZmZmZmZAAAAAAAAAAAAmZmZmZmZAAAAAAAAAAAAAACZmZmQAAAAAAAP/+P///+f///+P////P////n////z////5////8f////P////j////4////+f/P//P+Af/z/Hx/8/n/P/P775/j8/uf4/P93+P3/8/j8/3P4/n/x/P9/cfx/vvH+f8Pj/j//4/8f/8P/D//H/4f/h//A/g//4AAf//gAf//+A//KAAAABAAAAAgAAAAAQAIAAAAAABAAQAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAIAAAIAAAACAgACAAAAAgACAAICAAADAwMAAwNzAAPDKpgAAIEAAACBgAAAggAAAIKAAACDAAAAg4AAAQAAAAEAgAABAQAAAQGAAAECAAABAoAAAQMAAAEDgAABgAAAAYCAAAGBAAABgYAAAYIAAAGCgAABgwAAAYOAAAIAAAACAIAAAgEAAAIBgAACAgAAAgKAAAIDAAACA4AAAoAAAAKAgAACgQAAAoGAAAKCAAACgoAAAoMAAAKDgAADAAAAAwCAAAMBAAADAYAAAwIAAAMCgAADAwAAAwOAAAOAAAADgIAAA4EAAAOBgAADggAAA4KAAAODAAADg4ABAAAAAQAAgAEAAQABAAGAAQACAAEAAoABAAMAAQADgAEAgAABAICAAQCBAAEAgYABAIIAAQCCgAEAgwABAIOAAQEAAAEBAIABAQEAAQEBgAEBAgABAQKAAQEDAAEBA4ABAYAAAQGAgAEBgQABAYGAAQGCAAEBgoABAYMAAQGDgAECAAABAgCAAQIBAAECAYABAgIAAQICgAECAwABAgOAAQKAAAECgIABAoEAAQKBgAECggABAoKAAQKDAAECg4ABAwAAAQMAgAEDAQABAwGAAQMCAAEDAoABAwMAAQMDgAEDgAABA4CAAQOBAAEDgYABA4IAAQOCgAEDgwABA4OAAgAAAAIAAIACAAEAAgABgAIAAgACAAKAAgADAAIAA4ACAIAAAgCAgAIAgQACAIGAAgCCAAIAgoACAIMAAgCDgAIBAAACAQCAAgEBAAIBAYACAQIAAgECgAIBAwACAQOAAgGAAAIBgIACAYEAAgGBgAIBggACAYKAAgGDAAIBg4ACAgAAAgIAgAICAQACAgGAAgICAAICAoACAgMAAgIDgAICgAACAoCAAgKBAAICgYACAoIAAgKCgAICgwACAoOAAgMAAAIDAIACAwEAAgMBgAIDAgACAwKAAgMDAAIDA4ACA4AAAgOAgAIDgQACA4GAAgOCAAIDgoACA4MAAgODgAMAAAADAACAAwABAAMAAYADAAIAAwACgAMAAwADAAOAAwCAAAMAgIADAIEAAwCBgAMAggADAIKAAwCDAAMAg4ADAQAAAwEAgAMBAQADAQGAAwECAAMBAoADAQMAAwEDgAMBgAADAYCAAwGBAAMBgYADAYIAAwGCgAMBgwADAYOAAwIAAAMCAIADAgEAAwIBgAMCAgADAgKAAwIDAAMCA4ADAoAAAwKAgAMCgQADAoGAAwKCAAMCgoADAoMAAwKDgAMDAAADAwCAAwMBAAMDAYADAwIAAwMCgAPD7/wCkoKAAgICAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAAAAAAAADvTqfvAAAAAAAAAAAAAACXTu8AAAAAAAAAAAAAAACfTu8AAAAAAAAAAAAAAACfTu8AAAAAAAAAAAAAAADvRqcAAAAAAAAAAAAAAAAAVkYAAAAAp6fvAAAAAAAA70bvAACnl05GRpfvAAAAAKdGAAAAl6cAAABOTu8AAACfRgAAp1YA76cAAJeXAAAAn04AAKdWAAAApwCfTu8AAKdGAAAAnwAAAAAAp0bvAADvRp8AAACfl58AAJdO7wAAAJdO7wAAAAAAAO9GlwAAAADvTkanAAAAAO+XRu8AAAAAAO9ORlaXl1ZORu8AAAAAAAAA76dWRkZWp+8AAAAA/D/vgfj/74Hx/wAA4/86AMf/AgDPHysBjAcAApzjAgCZM0oBmdEAAp3xBACOMVgBx+OBAcPDAALgB08C8A/OAigAAAAQAAAAIAAAAAEABAAAAAAAwAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP//AAD///8AAAAACZAAAAAAAAmQAAAAAAAAmQAAAAAAAAmQAAAAAAAAmQAAAAAAAACQAAmZkAAACZAAmQCZkAAJkAmQAACZAAmQCQCZAJkACZAJAACQCZAJkACQAJAJkACZAAmZAAmQAJmQAAAAmQAACZkAAAmZAAAAmZmZmZAAAAAJmZmQAAD+f++B+f/vgfP/PALn/+sCz/8CAN4fCgKcx+sCmfMGAJszJwKb2RICndmAAs456wLH8wIA4+M1AvAH6wL4H++B" ID="rdf:#$pYrW.3">Debian (Ubuntu is based on Debian)</A> ++ <DT><A HREF="https://one.ubuntu.com/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAB9ElEQVQ4jb2Rz0uTARjH3z8j6BR1CIqMYAQeOnSIQQUdrCg7tZMjEBTEi5ewIJACiwgPYcnaq85MHfYqm2vbO7e9Tt2m7/byirG9urfN/XC8WESHfboVI9g89b0+z/fD9/s8gvA/FbXfRTrfybEN5Rf3sF4/pPTkOvNnLqJ3OZA77e0BxelzCIIgHI4+oCEO0hh3Yg5cxnPqbHvzoXSVxoqN8pztz7LhPE195DY/nl7jaKhNhe/BW/xa6iAj/hu1MmiDRyeoDF1pninjw9Tf9lJ85aAS7qEe7EZJKCRTm7jcrqblUn8HRt+lZkDBM0LD1cfR6H3KoX7qygC6rqHrGn6/r33vb6ZJbuoZpv8Ndd9NfqYfk1E+IUdCLHjnEARBEKdF3De6UE5eQLbf+QtNpZKUSkU2NhJkttapBbph5zl7K06Wlz+zKC2wvZ3Gsiw0dYtZRw9uZ29zqnQ6yVpCIRqLkJKGsRKDBOZfUikfsL9vUK1WqNWqqKpKobBHVsvw/sN462ri2BiGkeegfIBlWeSNHLquoapp1hJxJibetQbk8l8plYqYZoHd3R2ymkpWy7AalZHlIItL3taAvJFjc3OdtUScaCxCLB4lshpGjoSQIyFC4WD77wS++PH5JKQlL/MLs3hmJpn5OMmUR2TC1eYGx9VvRTF1ghnsWBgAAAAASUVORK5CYII=">Ubuntu One - The personal cloud that brings your digital life together</A> ++ </DL> ++ </DT> + <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3> + <DL><p> + <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A> --- firefox-3.6.18+build2+nobinonly.orig/debian/patches/lp512615_cairo_lcd_filter.patch +++ firefox-3.6.18+build2+nobinonly/debian/patches/lp512615_cairo_lcd_filter.patch @@ -0,0 +1,1075 @@ +Description: Add a Cairo LCD filter to use FreeType LCD colour filtering features +Origin: other, based on git rev 5d887ad5dca5af0f8216830d1b04d08a5aba9bee +Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=404637 +Bug-Cairo: http://bugs.freedesktop.org/show_bug.cgi?id=10301 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/512615 + +Index: mozilla/config/system-headers +=================================================================== +--- mozilla.orig/config/system-headers 2010-04-16 17:31:32.000000000 +0100 ++++ mozilla/config/system-headers 2010-04-23 00:44:38.560196628 +0100 +@@ -267,6 +267,7 @@ + freetype/freetype.h + freetype/ftcache.h + freetype/ftglyph.h ++freetype/ftlcdfil.h + freetype/ftsynth.h + freetype/ftoutln.h + freetype/ttnameid.h +Index: mozilla/gfx/cairo/cairo/src/cairo-font-options.c +=================================================================== +--- mozilla.orig/gfx/cairo/cairo/src/cairo-font-options.c 2010-04-16 17:31:47.000000000 +0100 ++++ mozilla/gfx/cairo/cairo/src/cairo-font-options.c 2010-04-23 00:44:38.560196628 +0100 +@@ -39,6 +39,7 @@ + static const cairo_font_options_t _cairo_font_options_nil = { + CAIRO_ANTIALIAS_DEFAULT, + CAIRO_SUBPIXEL_ORDER_DEFAULT, ++ CAIRO_LCD_FILTER_DEFAULT, + CAIRO_HINT_STYLE_DEFAULT, + CAIRO_HINT_METRICS_DEFAULT + }; +@@ -54,6 +55,7 @@ + { + options->antialias = CAIRO_ANTIALIAS_DEFAULT; + options->subpixel_order = CAIRO_SUBPIXEL_ORDER_DEFAULT; ++ options->lcd_filter = CAIRO_LCD_FILTER_DEFAULT; + options->hint_style = CAIRO_HINT_STYLE_DEFAULT; + options->hint_metrics = CAIRO_HINT_METRICS_DEFAULT; + } +@@ -64,6 +66,7 @@ + { + options->antialias = other->antialias; + options->subpixel_order = other->subpixel_order; ++ options->lcd_filter = other->lcd_filter; + options->hint_style = other->hint_style; + options->hint_metrics = other->hint_metrics; + } +@@ -189,6 +192,8 @@ + options->antialias = other->antialias; + if (other->subpixel_order != CAIRO_SUBPIXEL_ORDER_DEFAULT) + options->subpixel_order = other->subpixel_order; ++ if (other->lcd_filter != CAIRO_LCD_FILTER_DEFAULT) ++ options->lcd_filter = other->lcd_filter; + if (other->hint_style != CAIRO_HINT_STYLE_DEFAULT) + options->hint_style = other->hint_style; + if (other->hint_metrics != CAIRO_HINT_METRICS_DEFAULT) +@@ -221,6 +226,7 @@ + + return (options->antialias == other->antialias && + options->subpixel_order == other->subpixel_order && ++ options->lcd_filter == other->lcd_filter && + options->hint_style == other->hint_style && + options->hint_metrics == other->hint_metrics); + } +@@ -246,7 +252,8 @@ + + return ((options->antialias) | + (options->subpixel_order << 4) | +- (options->hint_style << 8) | ++ (options->lcd_filter << 8) | ++ (options->hint_style << 12) | + (options->hint_metrics << 16)); + } + slim_hidden_def (cairo_font_options_hash); +@@ -328,6 +335,48 @@ + } + + /** ++ * _cairo_font_options_set_lcd_filter: ++ * @options: a #cairo_font_options_t ++ * @lcd_filter: the new LCD filter ++ * ++ * Sets the LCD filter for the font options object. The LCD filter ++ * specifies how pixels are filtered when rendered with an antialiasing ++ * mode of %CAIRO_ANTIALIAS_SUBPIXEL. See the documentation for ++ * #cairo_lcd_filter_t for full details. ++ * ++ * Since: 1.8 ++ **/ ++void ++_cairo_font_options_set_lcd_filter (cairo_font_options_t *options, ++ cairo_lcd_filter_t lcd_filter) ++{ ++ if (cairo_font_options_status (options)) ++ return; ++ ++ options->lcd_filter = lcd_filter; ++} ++ ++/** ++ * _cairo_font_options_get_lcd_filter: ++ * @options: a #cairo_font_options_t ++ * ++ * Gets the LCD filter for the font options object. ++ * See the documentation for #cairo_lcd_filter_t for full details. ++ * ++ * Return value: the LCD filter for the font options object ++ * ++ * Since: 1.8 ++ **/ ++cairo_lcd_filter_t ++_cairo_font_options_get_lcd_filter (const cairo_font_options_t *options) ++{ ++ if (cairo_font_options_status ((cairo_font_options_t *) options)) ++ return CAIRO_LCD_FILTER_DEFAULT; ++ ++ return options->lcd_filter; ++} ++ ++/** + * cairo_font_options_set_hint_style: + * @options: a #cairo_font_options_t + * @hint_style: the new hint style +Index: mozilla/gfx/cairo/cairo/src/cairo-ft-font.c +=================================================================== +--- mozilla.orig/gfx/cairo/cairo/src/cairo-ft-font.c 2010-04-16 17:31:47.000000000 +0100 ++++ mozilla/gfx/cairo/cairo/src/cairo-ft-font.c 2010-04-23 00:44:38.570193499 +0100 +@@ -59,6 +59,28 @@ + #include FT_SYNTHESIS_H + #endif + ++#include FT_LCD_FILTER_H ++ ++/* Fontconfig version older than 2.6 didn't have these options */ ++#ifndef FC_LCD_FILTER ++#define FC_LCD_FILTER "lcdfilter" ++#endif ++/* Some Ubuntu versions defined FC_LCD_FILTER without defining the following */ ++#ifndef FC_LCD_NONE ++#define FC_LCD_NONE 0 ++#define FC_LCD_DEFAULT 1 ++#define FC_LCD_LIGHT 2 ++#define FC_LCD_LEGACY 3 ++#endif ++ ++/* FreeType version older than 2.3.5(?) didn't have these options */ ++#ifndef FT_LCD_FILTER_NONE ++#define FT_LCD_FILTER_NONE 0 ++#define FT_LCD_FILTER_DEFAULT 1 ++#define FT_LCD_FILTER_LIGHT 2 ++#define FT_LCD_FILTER_LEGACY 16 ++#endif ++ + #define DOUBLE_TO_26_6(d) ((FT_F26Dot6)((d) * 64.0)) + #define DOUBLE_FROM_26_6(t) ((double)(t) / 64.0) + #define DOUBLE_TO_16_16(d) ((FT_Fixed)((d) * 65536.0)) +@@ -777,23 +799,286 @@ + return CAIRO_STATUS_SUCCESS; + } + +-/* Empirically-derived subpixel filtering values thanks to Keith +- * Packard and libXft. */ +-static const int filters[3][3] = { +- /* red */ +-#if 0 +- { 65538*4/7,65538*2/7,65538*1/7 }, +- /* green */ +- { 65536*1/4, 65536*2/4, 65537*1/4 }, +- /* blue */ +- { 65538*1/7,65538*2/7,65538*4/7 }, +-#endif +- { 65538*9/13,65538*3/13,65538*1/13 }, +- /* green */ +- { 65538*1/6, 65538*4/6, 65538*1/6 }, +- /* blue */ +- { 65538*1/13,65538*3/13,65538*9/13 }, +-}; ++/* we sometimes need to convert the glyph bitmap in a FT_GlyphSlot ++ * into a different format. For example, we want to convert a ++ * FT_PIXEL_MODE_LCD or FT_PIXEL_MODE_LCD_V bitmap into a 32-bit ++ * ARGB or ABGR bitmap. ++ * ++ * this function prepares a target descriptor for this operation. ++ * ++ * input :: target bitmap descriptor. The function will set its ++ * 'width', 'rows' and 'pitch' fields, and only these ++ * ++ * slot :: the glyph slot containing the source bitmap. this ++ * function assumes that slot->format == FT_GLYPH_FORMAT_BITMAP ++ * ++ * mode :: the requested final rendering mode. supported values are ++ * MONO, NORMAL (i.e. gray), LCD and LCD_V ++ * ++ * the function returns the size in bytes of the corresponding buffer, ++ * it's up to the caller to allocate the corresponding memory block ++ * before calling _fill_xrender_bitmap ++ * ++ * it also returns -1 in case of error (e.g. incompatible arguments, ++ * like trying to convert a gray bitmap into a monochrome one) ++ */ ++static int ++_compute_xrender_bitmap_size(FT_Bitmap *target, ++ FT_GlyphSlot slot, ++ FT_Render_Mode mode) ++{ ++ FT_Bitmap *ftbit; ++ int width, height, pitch; ++ ++ if (slot->format != FT_GLYPH_FORMAT_BITMAP) ++ return -1; ++ ++ /* compute the size of the final bitmap */ ++ ftbit = &slot->bitmap; ++ ++ width = ftbit->width; ++ height = ftbit->rows; ++ pitch = (width + 3) & ~3; ++ ++ switch (ftbit->pixel_mode) { ++ case FT_PIXEL_MODE_MONO: ++ if (mode == FT_RENDER_MODE_MONO) { ++ pitch = (((width + 31) & ~31) >> 3); ++ break; ++ } ++ /* fall-through */ ++ ++ case FT_PIXEL_MODE_GRAY: ++ if (mode == FT_RENDER_MODE_LCD || ++ mode == FT_RENDER_MODE_LCD_V) ++ { ++ /* each pixel is replicated into a 32-bit ARGB value */ ++ pitch = width * 4; ++ } ++ break; ++ ++ case FT_PIXEL_MODE_LCD: ++ if (mode != FT_RENDER_MODE_LCD) ++ return -1; ++ ++ /* horz pixel triplets are packed into 32-bit ARGB values */ ++ width /= 3; ++ pitch = width * 4; ++ break; ++ ++ case FT_PIXEL_MODE_LCD_V: ++ if (mode != FT_RENDER_MODE_LCD_V) ++ return -1; ++ ++ /* vert pixel triplets are packed into 32-bit ARGB values */ ++ height /= 3; ++ pitch = width * 4; ++ break; ++ ++ default: /* unsupported source format */ ++ return -1; ++ } ++ ++ target->width = width; ++ target->rows = height; ++ target->pitch = pitch; ++ target->buffer = NULL; ++ ++ return pitch * height; ++} ++ ++/* this functions converts the glyph bitmap found in a FT_GlyphSlot ++ * into a different format (see _compute_xrender_bitmap_size) ++ * ++ * you should call this function after _compute_xrender_bitmap_size ++ * ++ * target :: target bitmap descriptor. Note that its 'buffer' pointer ++ * must point to memory allocated by the caller ++ * ++ * slot :: the glyph slot containing the source bitmap ++ * ++ * mode :: the requested final rendering mode ++ * ++ * bgr :: boolean, set if BGR or VBGR pixel ordering is needed ++ */ ++static void ++_fill_xrender_bitmap(FT_Bitmap *target, ++ FT_GlyphSlot slot, ++ FT_Render_Mode mode, ++ int bgr) ++{ ++ FT_Bitmap *ftbit = &slot->bitmap; ++ unsigned char *srcLine = ftbit->buffer; ++ unsigned char *dstLine = target->buffer; ++ int src_pitch = ftbit->pitch; ++ int width = target->width; ++ int height = target->rows; ++ int pitch = target->pitch; ++ int subpixel; ++ int h; ++ ++ subpixel = (mode == FT_RENDER_MODE_LCD || ++ mode == FT_RENDER_MODE_LCD_V); ++ ++ if (src_pitch < 0) ++ srcLine -= src_pitch * (ftbit->rows - 1); ++ ++ target->pixel_mode = ftbit->pixel_mode; ++ ++ switch (ftbit->pixel_mode) { ++ case FT_PIXEL_MODE_MONO: ++ if (subpixel) { ++ /* convert mono to ARGB32 values */ ++ ++ for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch) { ++ int x; ++ ++ for (x = 0; x < width; x++) { ++ if (srcLine[(x >> 3)] & (0x80 >> (x & 7))) ++ ((unsigned int *) dstLine)[x] = 0xffffffffU; ++ } ++ } ++ target->pixel_mode = FT_PIXEL_MODE_LCD; ++ ++ } else if (mode == FT_RENDER_MODE_NORMAL) { ++ /* convert mono to 8-bit gray */ ++ ++ for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch) { ++ int x; ++ ++ for (x = 0; x < width; x++) { ++ if (srcLine[(x >> 3)] & (0x80 >> (x & 7))) ++ dstLine[x] = 0xff; ++ } ++ } ++ target->pixel_mode = FT_PIXEL_MODE_GRAY; ++ ++ } else { ++ /* copy mono to mono */ ++ ++ int bytes = (width + 7) >> 3; ++ ++ for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch) ++ memcpy (dstLine, srcLine, bytes); ++ } ++ break; ++ ++ case FT_PIXEL_MODE_GRAY: ++ if (subpixel) { ++ /* convert gray to ARGB32 values */ ++ ++ for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch) { ++ int x; ++ unsigned int *dst = (unsigned int *) dstLine; ++ ++ for (x = 0; x < width; x++) { ++ unsigned int pix = srcLine[x]; ++ ++ pix |= (pix << 8); ++ pix |= (pix << 16); ++ ++ dst[x] = pix; ++ } ++ } ++ target->pixel_mode = FT_PIXEL_MODE_LCD; ++ } else { ++ /* copy gray into gray */ ++ ++ for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch) ++ memcpy (dstLine, srcLine, width); ++ } ++ break; ++ ++ case FT_PIXEL_MODE_LCD: ++ if (!bgr) { ++ /* convert horizontal RGB into ARGB32 */ ++ ++ for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch) { ++ int x; ++ unsigned char *src = srcLine; ++ unsigned int *dst = (unsigned int *) dstLine; ++ ++ for (x = 0; x < width; x++, src += 3) { ++ unsigned int pix; ++ ++ pix = ((unsigned int)src[0] << 16) | ++ ((unsigned int)src[1] << 8) | ++ ((unsigned int)src[2] ) | ++ ((unsigned int)src[1] << 24) ; ++ ++ dst[x] = pix; ++ } ++ } ++ } else { ++ /* convert horizontal BGR into ARGB32 */ ++ ++ for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch) { ++ ++ int x; ++ unsigned char *src = srcLine; ++ unsigned int *dst = (unsigned int *) dstLine; ++ ++ for (x = 0; x < width; x++, src += 3) { ++ unsigned int pix; ++ ++ pix = ((unsigned int)src[2] << 16) | ++ ((unsigned int)src[1] << 8) | ++ ((unsigned int)src[0] ) | ++ ((unsigned int)src[1] << 24) ; ++ ++ dst[x] = pix; ++ } ++ } ++ } ++ break; ++ ++ default: /* FT_PIXEL_MODE_LCD_V */ ++ /* convert vertical RGB into ARGB32 */ ++ if (!bgr) { ++ ++ for (h = height; h > 0; h--, srcLine += 3 * src_pitch, dstLine += pitch) { ++ int x; ++ unsigned char* src = srcLine; ++ unsigned int* dst = (unsigned int *) dstLine; ++ ++ for (x = 0; x < width; x++, src += 1) { ++ unsigned int pix; ++#if 1 ++ pix = ((unsigned int)src[0] << 16) | ++ ((unsigned int)src[src_pitch] << 8) | ++ ((unsigned int)src[src_pitch*2] ) | ++ 0xFF000000 ; ++#else ++ pix = ((unsigned int)src[0] << 16) | ++ ((unsigned int)src[src_pitch] << 8) | ++ ((unsigned int)src[src_pitch*2] ) | ++ ((unsigned int)src[src_pitch] << 24) ; ++#endif ++ dst[x] = pix; ++ } ++ } ++ } else { ++ ++ for (h = height; h > 0; h--, srcLine += 3*src_pitch, dstLine += pitch) { ++ int x; ++ unsigned char *src = srcLine; ++ unsigned int *dst = (unsigned int *) dstLine; ++ ++ for (x = 0; x < width; x++, src += 1) { ++ unsigned int pix; ++ ++ pix = ((unsigned int)src[src_pitch * 2] << 16) | ++ ((unsigned int)src[src_pitch] << 8) | ++ ((unsigned int)src[0] ) | ++ ((unsigned int)src[src_pitch] << 24) ; ++ ++ dst[x] = pix; ++ } ++ } ++ } ++ } ++} ++ + + /* Fills in val->image with an image surface created from @bitmap + */ +@@ -806,7 +1091,7 @@ + int width, height, stride; + unsigned char *data; + int format = CAIRO_FORMAT_A8; +- cairo_bool_t subpixel = FALSE; ++ cairo_image_surface_t *image; + + width = bitmap->width; + height = bitmap->rows; +@@ -863,11 +1148,7 @@ + case FT_PIXEL_MODE_LCD: + case FT_PIXEL_MODE_LCD_V: + case FT_PIXEL_MODE_GRAY: +- switch (font_options->antialias) { +- case CAIRO_ANTIALIAS_DEFAULT: +- case CAIRO_ANTIALIAS_GRAY: +- case CAIRO_ANTIALIAS_NONE: +- default: ++ if (font_options->antialias != CAIRO_ANTIALIAS_SUBPIXEL) { + stride = bitmap->pitch; + if (own_buffer) { + data = bitmap->buffer; +@@ -879,104 +1160,16 @@ + memcpy (data, bitmap->buffer, stride * height); + } + format = CAIRO_FORMAT_A8; +- break; +- case CAIRO_ANTIALIAS_SUBPIXEL: { +- int x, y; +- unsigned char *in_line, *out_line, *in; +- unsigned int *out; +- unsigned int red, green, blue; +- int rf, gf, bf; +- int s; +- int o, os; +- unsigned char *data_rgba; +- unsigned int width_rgba, stride_rgba; +- int vmul = 1; +- int hmul = 1; ++ } else { ++ /* if we get there, the data from the source bitmap ++ * really comes from _fill_xrender_bitmap, and is ++ * made of 32-bit ARGB or ABGR values */ ++ assert (own_buffer != 0); ++ assert (bitmap->pixel_mode != FT_PIXEL_MODE_GRAY); + +- switch (font_options->subpixel_order) { +- case CAIRO_SUBPIXEL_ORDER_DEFAULT: +- case CAIRO_SUBPIXEL_ORDER_RGB: +- case CAIRO_SUBPIXEL_ORDER_BGR: +- default: +- width /= 3; +- hmul = 3; +- break; +- case CAIRO_SUBPIXEL_ORDER_VRGB: +- case CAIRO_SUBPIXEL_ORDER_VBGR: +- vmul = 3; +- height /= 3; +- break; +- } +- /* +- * Filter the glyph to soften the color fringes +- */ +- width_rgba = width; ++ data = bitmap->buffer; + stride = bitmap->pitch; +- stride_rgba = (width_rgba * 4 + 3) & ~3; +- data_rgba = calloc (stride_rgba, height); +- if (unlikely (data_rgba == NULL)) { +- if (own_buffer) +- free (bitmap->buffer); +- return _cairo_error (CAIRO_STATUS_NO_MEMORY); +- } +- +- os = 1; +- switch (font_options->subpixel_order) { +- case CAIRO_SUBPIXEL_ORDER_VRGB: +- os = stride; +- case CAIRO_SUBPIXEL_ORDER_DEFAULT: +- case CAIRO_SUBPIXEL_ORDER_RGB: +- default: +- rf = 0; +- gf = 1; +- bf = 2; +- break; +- case CAIRO_SUBPIXEL_ORDER_VBGR: +- os = stride; +- case CAIRO_SUBPIXEL_ORDER_BGR: +- bf = 0; +- gf = 1; +- rf = 2; +- break; +- } +- in_line = bitmap->buffer; +- out_line = data_rgba; +- for (y = 0; y < height; y++) +- { +- in = in_line; +- out = (unsigned int *) out_line; +- in_line += stride * vmul; +- out_line += stride_rgba; +- for (x = 0; x < width * hmul; x += hmul) +- { +- red = green = blue = 0; +- o = 0; +- for (s = 0; s < 3; s++) +- { +- red += filters[rf][s]*in[x+o]; +- green += filters[gf][s]*in[x+o]; +- blue += filters[bf][s]*in[x+o]; +- o += os; +- } +- red = red / 65536; +- green = green / 65536; +- blue = blue / 65536; +- *out++ = (green << 24) | (red << 16) | (green << 8) | blue; +- } +- } +- +- /* Images here are stored in native format. The +- * backend must convert to its own format as needed +- */ +- +- if (own_buffer) +- free (bitmap->buffer); +- data = data_rgba; +- stride = stride_rgba; + format = CAIRO_FORMAT_ARGB32; +- subpixel = TRUE; +- break; +- } + } + break; + case FT_PIXEL_MODE_GRAY2: +@@ -988,19 +1181,20 @@ + return _cairo_error (CAIRO_STATUS_NO_MEMORY); + } + +- *surface = (cairo_image_surface_t *) ++ /* XXX */ ++ *surface = image = (cairo_image_surface_t *) + cairo_image_surface_create_for_data (data, + format, + width, height, stride); +- if ((*surface)->base.status) { ++ if (image->base.status) { + free (data); + return (*surface)->base.status; + } + +- if (subpixel) +- pixman_image_set_component_alpha ((*surface)->pixman_image, TRUE); ++ if (font_options->antialias == CAIRO_ANTIALIAS_SUBPIXEL) ++ pixman_image_set_component_alpha (image->pixman_image, TRUE); + +- _cairo_image_surface_assume_ownership_of_data ((*surface)); ++ _cairo_image_surface_assume_ownership_of_data (image); + + _cairo_debug_check_image_surface_is_defined (&(*surface)->base); + +@@ -1027,16 +1221,59 @@ + cairo_font_options_t *font_options, + cairo_image_surface_t **surface) + { ++ int rgba = FC_RGBA_UNKNOWN; ++ int lcd_filter = FT_LCD_FILTER_LEGACY; + FT_GlyphSlot glyphslot = face->glyph; + FT_Outline *outline = &glyphslot->outline; + FT_Bitmap bitmap; + FT_BBox cbox; +- FT_Matrix matrix; +- int hmul = 1; +- int vmul = 1; +- unsigned int width, height, stride; +- cairo_bool_t subpixel = FALSE; ++ unsigned int width, height; + cairo_status_t status; ++ FT_Error fterror; ++ FT_Library library = glyphslot->library; ++ FT_Render_Mode render_mode = FT_RENDER_MODE_NORMAL; ++ ++ switch (font_options->antialias) { ++ case CAIRO_ANTIALIAS_NONE: ++ render_mode = FT_RENDER_MODE_MONO; ++ break; ++ ++ case CAIRO_ANTIALIAS_SUBPIXEL: ++ switch (font_options->subpixel_order) { ++ case CAIRO_SUBPIXEL_ORDER_DEFAULT: ++ case CAIRO_SUBPIXEL_ORDER_RGB: ++ case CAIRO_SUBPIXEL_ORDER_BGR: ++ render_mode = FT_RENDER_MODE_LCD; ++ break; ++ ++ case CAIRO_SUBPIXEL_ORDER_VRGB: ++ case CAIRO_SUBPIXEL_ORDER_VBGR: ++ render_mode = FT_RENDER_MODE_LCD_V; ++ break; ++ } ++ ++ switch (font_options->lcd_filter) { ++ case CAIRO_LCD_FILTER_NONE: ++ lcd_filter = FT_LCD_FILTER_NONE; ++ break; ++ case CAIRO_LCD_FILTER_DEFAULT: ++ case CAIRO_LCD_FILTER_INTRA_PIXEL: ++ lcd_filter = FT_LCD_FILTER_LEGACY; ++ break; ++ case CAIRO_LCD_FILTER_FIR3: ++ lcd_filter = FT_LCD_FILTER_LIGHT; ++ break; ++ case CAIRO_LCD_FILTER_FIR5: ++ lcd_filter = FT_LCD_FILTER_DEFAULT; ++ break; ++ } ++ ++ break; ++ ++ case CAIRO_ANTIALIAS_DEFAULT: ++ case CAIRO_ANTIALIAS_GRAY: ++ render_mode = FT_RENDER_MODE_NORMAL; ++ } + + FT_Outline_Get_CBox (outline, &cbox); + +@@ -1047,20 +1284,21 @@ + + width = (unsigned int) ((cbox.xMax - cbox.xMin) >> 6); + height = (unsigned int) ((cbox.yMax - cbox.yMin) >> 6); +- stride = (width * hmul + 3) & ~3; + + if (width * height == 0) { + cairo_format_t format; + /* Looks like fb handles zero-sized images just fine */ +- switch (font_options->antialias) { +- case CAIRO_ANTIALIAS_NONE: ++ switch (render_mode) { ++ case FT_RENDER_MODE_MONO: + format = CAIRO_FORMAT_A1; + break; +- case CAIRO_ANTIALIAS_SUBPIXEL: ++ case FT_RENDER_MODE_LCD: ++ case FT_RENDER_MODE_LCD_V: + format= CAIRO_FORMAT_ARGB32; + break; +- case CAIRO_ANTIALIAS_DEFAULT: +- case CAIRO_ANTIALIAS_GRAY: ++ case FT_RENDER_MODE_LIGHT: ++ case FT_RENDER_MODE_NORMAL: ++ case FT_RENDER_MODE_MAX: + default: + format = CAIRO_FORMAT_A8; + break; +@@ -1072,73 +1310,69 @@ + return (*surface)->base.status; + } else { + +- matrix.xx = matrix.yy = 0x10000L; +- matrix.xy = matrix.yx = 0; ++ int bitmap_size; + +- switch (font_options->antialias) { +- case CAIRO_ANTIALIAS_NONE: +- bitmap.pixel_mode = FT_PIXEL_MODE_MONO; +- bitmap.num_grays = 1; +- stride = ((width + 31) & -32) >> 3; +- break; +- case CAIRO_ANTIALIAS_DEFAULT: +- case CAIRO_ANTIALIAS_GRAY: +- bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; +- bitmap.num_grays = 256; +- stride = (width + 3) & -4; ++ switch (render_mode) { ++ case FT_RENDER_MODE_LCD: ++ if (font_options->subpixel_order == CAIRO_SUBPIXEL_ORDER_BGR) { ++ rgba = FC_RGBA_BGR; ++ } else { ++ rgba = FC_RGBA_RGB; ++ } + break; +- case CAIRO_ANTIALIAS_SUBPIXEL: +- switch (font_options->subpixel_order) { +- case CAIRO_SUBPIXEL_ORDER_RGB: +- case CAIRO_SUBPIXEL_ORDER_BGR: +- case CAIRO_SUBPIXEL_ORDER_DEFAULT: +- default: +- matrix.xx *= 3; +- hmul = 3; +- subpixel = TRUE; +- break; +- case CAIRO_SUBPIXEL_ORDER_VRGB: +- case CAIRO_SUBPIXEL_ORDER_VBGR: +- matrix.yy *= 3; +- vmul = 3; +- subpixel = TRUE; +- break; ++ case FT_RENDER_MODE_LCD_V: ++ if (font_options->subpixel_order == CAIRO_SUBPIXEL_ORDER_VBGR) { ++ rgba = FC_RGBA_VBGR; ++ } else { ++ rgba = FC_RGBA_VRGB; + } +- FT_Outline_Transform (outline, &matrix); +- +- bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; +- bitmap.num_grays = 256; +- stride = (width * hmul + 3) & -4; ++ break; ++ case FT_RENDER_MODE_MONO: ++ case FT_RENDER_MODE_LIGHT: ++ case FT_RENDER_MODE_NORMAL: ++ case FT_RENDER_MODE_MAX: ++ default: ++ break; + } + +- bitmap.pitch = stride; +- bitmap.width = width * hmul; +- bitmap.rows = height * vmul; +- bitmap.buffer = calloc (stride, bitmap.rows); +- if (unlikely (bitmap.buffer == NULL)) ++ FT_Library_SetLcdFilter (library, lcd_filter); ++ ++ fterror = FT_Render_Glyph (face->glyph, render_mode); ++ ++ FT_Library_SetLcdFilter (library, FT_LCD_FILTER_NONE); ++ ++ if (fterror != 0) + return _cairo_error (CAIRO_STATUS_NO_MEMORY); + +- FT_Outline_Translate (outline, -cbox.xMin*hmul, -cbox.yMin*vmul); ++ bitmap_size = _compute_xrender_bitmap_size (&bitmap, ++ face->glyph, ++ render_mode); ++ if (bitmap_size < 0) ++ return _cairo_error (CAIRO_STATUS_NO_MEMORY); + +- if (FT_Outline_Get_Bitmap (glyphslot->library, outline, &bitmap) != 0) { +- free (bitmap.buffer); ++ bitmap.buffer = calloc (1, bitmap_size); ++ if (unlikely (bitmap.buffer == NULL)) + return _cairo_error (CAIRO_STATUS_NO_MEMORY); +- } + ++ _fill_xrender_bitmap (&bitmap, face->glyph, render_mode, ++ (rgba == FC_RGBA_BGR || rgba == FC_RGBA_VBGR)); ++ ++ /* Note: ++ * _get_bitmap_surface will free bitmap.buffer if there is an error ++ */ + status = _get_bitmap_surface (&bitmap, TRUE, font_options, surface); + if (unlikely (status)) + return status; +- } + +- /* +- * Note: the font's coordinate system is upside down from ours, so the +- * Y coordinate of the control box needs to be negated. Moreover, device +- * offsets are position of glyph origin relative to top left while xMin +- * and yMax are offsets of top left relative to origin. Another negation. +- */ +- cairo_surface_set_device_offset (&(*surface)->base, +- floor (-(double) cbox.xMin / 64.0), +- floor (+(double) cbox.yMax / 64.0)); ++ /* Note: the font's coordinate system is upside down from ours, so the ++ * Y coordinate of the control box needs to be negated. Moreover, device ++ * offsets are position of glyph origin relative to top left while xMin ++ * and yMax are offsets of top left relative to origin. Another negation. ++ */ ++ cairo_surface_set_device_offset (&(*surface)->base, ++ (double)-glyphslot->bitmap_left, ++ (double)+glyphslot->bitmap_top); ++ } + + return CAIRO_STATUS_SUCCESS; + } +@@ -1359,6 +1593,7 @@ + + if (antialias) { + cairo_subpixel_order_t subpixel_order; ++ int lcd_filter; + + /* disable hinting if requested */ + if (FcPatternGetBool (pattern, +@@ -1394,6 +1629,25 @@ + ft_options.base.antialias = CAIRO_ANTIALIAS_SUBPIXEL; + } + ++ if (FcPatternGetInteger (pattern, ++ FC_LCD_FILTER, 0, &lcd_filter) == FcResultMatch) ++ { ++ switch (lcd_filter) { ++ case FC_LCD_NONE: ++ ft_options.base.lcd_filter = CAIRO_LCD_FILTER_NONE; ++ break; ++ case FC_LCD_DEFAULT: ++ ft_options.base.lcd_filter = CAIRO_LCD_FILTER_FIR5; ++ break; ++ case FC_LCD_LIGHT: ++ ft_options.base.lcd_filter = CAIRO_LCD_FILTER_FIR3; ++ break; ++ case FC_LCD_LEGACY: ++ ft_options.base.lcd_filter = CAIRO_LCD_FILTER_INTRA_PIXEL; ++ break; ++ } ++ } ++ + #ifdef FC_HINT_STYLE + if (FcPatternGetInteger (pattern, + FC_HINT_STYLE, 0, &hintstyle) != FcResultMatch) +@@ -1495,6 +1749,12 @@ + if (other->base.hint_style == CAIRO_HINT_STYLE_NONE) + options->base.hint_style = CAIRO_HINT_STYLE_NONE; + ++ if (options->base.lcd_filter == CAIRO_LCD_FILTER_DEFAULT) ++ options->base.lcd_filter = other->base.lcd_filter; ++ ++ if (other->base.lcd_filter == CAIRO_LCD_FILTER_NONE) ++ options->base.lcd_filter = CAIRO_LCD_FILTER_NONE; ++ + if (options->base.antialias == CAIRO_ANTIALIAS_NONE) { + if (options->base.hint_style == CAIRO_HINT_STYLE_NONE) + load_flags |= FT_LOAD_NO_HINTING; +@@ -1518,11 +1778,11 @@ + case CAIRO_SUBPIXEL_ORDER_DEFAULT: + case CAIRO_SUBPIXEL_ORDER_RGB: + case CAIRO_SUBPIXEL_ORDER_BGR: +- load_target |= FT_LOAD_TARGET_LCD; ++ load_target = FT_LOAD_TARGET_LCD; + break; + case CAIRO_SUBPIXEL_ORDER_VRGB: + case CAIRO_SUBPIXEL_ORDER_VBGR: +- load_target |= FT_LOAD_TARGET_LCD_V; ++ load_target = FT_LOAD_TARGET_LCD_V; + break; + } + } +@@ -2515,6 +2775,34 @@ + } + } + ++ if (options->lcd_filter != CAIRO_LCD_FILTER_DEFAULT) ++ { ++ if (FcPatternGet (pattern, FC_LCD_FILTER, 0, &v) == FcResultNoMatch) ++ { ++ int lcd_filter; ++ ++ switch (options->lcd_filter) { ++ case CAIRO_LCD_FILTER_NONE: ++ lcd_filter = FT_LCD_FILTER_NONE; ++ break; ++ case CAIRO_LCD_FILTER_DEFAULT: ++ case CAIRO_LCD_FILTER_INTRA_PIXEL: ++ lcd_filter = FT_LCD_FILTER_LEGACY; ++ break; ++ case CAIRO_LCD_FILTER_FIR3: ++ lcd_filter = FT_LCD_FILTER_LIGHT; ++ break; ++ default: ++ case CAIRO_LCD_FILTER_FIR5: ++ lcd_filter = FT_LCD_FILTER_DEFAULT; ++ break; ++ } ++ ++ if (! FcPatternAddInteger (pattern, FC_LCD_FILTER, lcd_filter)) ++ return _cairo_error (CAIRO_STATUS_NO_MEMORY); ++ } ++ } ++ + if (options->hint_style != CAIRO_HINT_STYLE_DEFAULT) + { + if (FcPatternGet (pattern, FC_HINTING, 0, &v) == FcResultNoMatch) +Index: mozilla/gfx/cairo/cairo/src/cairoint.h +=================================================================== +--- mozilla.orig/gfx/cairo/cairo/src/cairoint.h 2010-04-16 17:31:48.000000000 +0100 ++++ mozilla/gfx/cairo/cairo/src/cairoint.h 2010-04-23 00:44:38.580184783 +0100 +@@ -1449,6 +1449,13 @@ + _cairo_font_options_init_copy (cairo_font_options_t *options, + const cairo_font_options_t *other); + ++cairo_private void ++_cairo_font_options_set_lcd_filter (cairo_font_options_t *options, ++ cairo_lcd_filter_t lcd_filter); ++ ++cairo_private cairo_lcd_filter_t ++_cairo_font_options_get_lcd_filter (const cairo_font_options_t *options); ++ + /* cairo-hull.c */ + cairo_private cairo_status_t + _cairo_hull_compute (cairo_pen_vertex_t *vertices, int *num_vertices); +Index: mozilla/gfx/cairo/cairo/src/cairo-surface.c +=================================================================== +--- mozilla.orig/gfx/cairo/cairo/src/cairo-surface.c 2010-04-16 17:31:48.000000000 +0100 ++++ mozilla/gfx/cairo/cairo/src/cairo-surface.c 2010-04-23 00:44:38.580184783 +0100 +@@ -65,6 +65,7 @@ + FALSE, /* has_font_options */ \ + { CAIRO_ANTIALIAS_DEFAULT, /* antialias */ \ + CAIRO_SUBPIXEL_ORDER_DEFAULT, /* subpixel_order */ \ ++ CAIRO_LCD_FILTER_DEFAULT, /* lcd_filter */ \ + CAIRO_HINT_STYLE_DEFAULT, /* hint_style */ \ + CAIRO_HINT_METRICS_DEFAULT /* hint_metrics */ \ + } /* font_options */ \ +Index: mozilla/gfx/cairo/cairo/src/cairo-types-private.h +=================================================================== +--- mozilla.orig/gfx/cairo/cairo/src/cairo-types-private.h 2010-04-16 17:31:48.000000000 +0100 ++++ mozilla/gfx/cairo/cairo/src/cairo-types-private.h 2010-04-23 00:44:38.590194365 +0100 +@@ -115,9 +115,35 @@ + cairo_bool_t is_snapshot; + }; + ++ ++/** ++ * cairo_lcd_filter_t: ++ * @CAIRO_LCD_FILTER_DEFAULT: Use the default LCD filter for ++ * font backend and target device ++ * @CAIRO_LCD_FILTER_NONE: Do not perform LCD filtering ++ * @CAIRO_LCD_FILTER_INTRA_PIXEL: Intra-pixel filter ++ * @CAIRO_LCD_FILTER_FIR3: FIR filter with a 3x3 kernel ++ * @CAIRO_LCD_FILTER_FIR5: FIR filter with a 5x5 kernel ++ * ++ * The LCD filter specifies the low-pass filter applied to LCD-optimized ++ * bitmaps generated with an antialiasing mode of %CAIRO_ANTIALIAS_SUBPIXEL. ++ * ++ * Note: This API was temporarily made available in the public ++ * interface during the 1.7.x development series, but was made private ++ * before 1.8. ++ **/ ++typedef enum _cairo_lcd_filter { ++ CAIRO_LCD_FILTER_DEFAULT, ++ CAIRO_LCD_FILTER_NONE, ++ CAIRO_LCD_FILTER_INTRA_PIXEL, ++ CAIRO_LCD_FILTER_FIR3, ++ CAIRO_LCD_FILTER_FIR5 ++} cairo_lcd_filter_t; ++ + struct _cairo_font_options { + cairo_antialias_t antialias; + cairo_subpixel_order_t subpixel_order; ++ cairo_lcd_filter_t lcd_filter; + cairo_hint_style_t hint_style; + cairo_hint_metrics_t hint_metrics; + }; +Index: mozilla/gfx/cairo/cairo/src/cairo-xlib-screen.c +=================================================================== +--- mozilla.orig/gfx/cairo/cairo/src/cairo-xlib-screen.c 2010-04-16 17:31:48.000000000 +0100 ++++ mozilla/gfx/cairo/cairo/src/cairo-xlib-screen.c 2010-04-23 01:26:51.310212208 +0100 +@@ -61,6 +61,13 @@ + + #include <fontconfig/fontconfig.h> + ++#ifndef FC_LCD_NONE ++#define FC_LCD_NONE 0 ++#define FC_LCD_DEFAULT 1 ++#define FC_LCD_LIGHT 2 ++#define FC_LCD_LEGACY 3 ++#endif ++ + static int + parse_boolean (const char *v) + { +@@ -150,13 +157,22 @@ + cairo_bool_t xft_antialias; + int xft_hintstyle; + int xft_rgba; ++ int xft_lcdfilter; + cairo_antialias_t antialias; + cairo_subpixel_order_t subpixel_order; ++ cairo_lcd_filter_t lcd_filter; + cairo_hint_style_t hint_style; + + if (!get_boolean_default (dpy, "antialias", &xft_antialias)) + xft_antialias = TRUE; + ++ if (!get_integer_default (dpy, "lcdfilter", &xft_lcdfilter)) { ++ /* -1 is an non-existant Fontconfig constant used to differentiate ++ * the case when no lcdfilter property is available. ++ */ ++ xft_lcdfilter = -1; ++ } ++ + if (!get_boolean_default (dpy, "hinting", &xft_hinting)) + xft_hinting = TRUE; + +@@ -239,6 +255,24 @@ + subpixel_order = CAIRO_SUBPIXEL_ORDER_DEFAULT; + } + ++ switch (xft_lcdfilter) { ++ case FC_LCD_NONE: ++ lcd_filter = CAIRO_LCD_FILTER_NONE; ++ break; ++ case FC_LCD_DEFAULT: ++ lcd_filter = CAIRO_LCD_FILTER_FIR5; ++ break; ++ case FC_LCD_LIGHT: ++ lcd_filter = CAIRO_LCD_FILTER_FIR3; ++ break; ++ case FC_LCD_LEGACY: ++ lcd_filter = CAIRO_LCD_FILTER_INTRA_PIXEL; ++ break; ++ default: ++ lcd_filter = CAIRO_LCD_FILTER_DEFAULT; ++ break; ++ } ++ + if (xft_antialias) { + if (subpixel_order == CAIRO_SUBPIXEL_ORDER_DEFAULT) + antialias = CAIRO_ANTIALIAS_GRAY; +@@ -251,6 +285,7 @@ + cairo_font_options_set_hint_style (&info->font_options, hint_style); + cairo_font_options_set_antialias (&info->font_options, antialias); + cairo_font_options_set_subpixel_order (&info->font_options, subpixel_order); ++ _cairo_font_options_set_lcd_filter (&info->font_options, lcd_filter); + cairo_font_options_set_hint_metrics (&info->font_options, CAIRO_HINT_METRICS_ON); + } + --- firefox-3.6.18+build2+nobinonly.orig/debian/patches/firefox-kde.patch +++ firefox-3.6.18+build2+nobinonly/debian/patches/firefox-kde.patch @@ -0,0 +1,490 @@ +Index: mozilla/browser/app/Makefile.in +=================================================================== +--- mozilla.orig/browser/app/Makefile.in 2010-05-04 15:35:55.000000000 +0100 ++++ mozilla/browser/app/Makefile.in 2010-05-04 16:05:16.317923511 +0100 +@@ -49,6 +49,7 @@ + + PREF_JS_EXPORTS = $(srcdir)/profile/firefox.js \ + $(srcdir)/profile/channel-prefs.js \ ++ $(srcdir)/profile/kde.js \ + $(NULL) + + +Index: mozilla/browser/base/content/browser-kde.xul +=================================================================== +--- mozilla.orig/browser/base/content/browser-kde.xul 2010-05-04 15:58:05.587928144 +0100 ++++ mozilla/browser/base/content/browser-kde.xul 2010-05-04 16:05:16.317923511 +0100 +@@ -162,7 +162,7 @@ + class="editBookmarkPanelBottomButton" + label="&editBookmark.cancel.label;" + oncommand="StarUI.cancelButtonOnCommand();"/> +-#else ++#elif XP_UNIX_GNOME + <button id="editBookmarkPanelDeleteButton" + class="editBookmarkPanelBottomButton" + label="&editBookmark.cancel.label;" +@@ -172,6 +172,14 @@ + label="&editBookmark.done.label;" + default="true" + oncommand="StarUI.panel.hidePopup();"/> ++#else ++ <button id="editBookmarkPanelDoneButton" ++ label="&editBookmark.done.label;" ++ default="true" ++ oncommand="StarUI.panel.hidePopup();"/> ++ <button id="editBookmarkPanelDeleteButton" ++ label="&editBookmark.cancel.label;" ++ oncommand="StarUI.cancelButtonOnCommand();"/> + #endif + </hbox> + </panel> +Index: mozilla/browser/base/jar.mn +=================================================================== +--- mozilla.orig/browser/base/jar.mn 2010-05-04 15:35:55.000000000 +0100 ++++ mozilla/browser/base/jar.mn 2010-05-04 16:05:16.317923511 +0100 +@@ -22,6 +22,8 @@ + * content/browser/browser.css (content/browser.css) + * content/browser/browser.js (content/browser.js) + * content/browser/browser.xul (content/browser.xul) ++* content/browser/browser-kde.xul (content/browser-kde.xul) ++% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde + * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) + * content/browser/credits.xhtml (content/credits.xhtml) + * content/browser/fullscreen-video.xhtml (content/fullscreen-video.xhtml) +Index: mozilla/browser/components/build/nsModule.cpp +=================================================================== +--- mozilla.orig/browser/components/build/nsModule.cpp 2010-05-04 15:35:55.000000000 +0100 ++++ mozilla/browser/components/build/nsModule.cpp 2010-05-04 16:05:16.347949602 +0100 +@@ -46,7 +46,7 @@ + #elif defined(XP_MACOSX) + #include "nsMacShellService.h" + #elif defined(MOZ_WIDGET_GTK2) +-#include "nsGNOMEShellService.h" ++#include "nsUnixShellService.h" + #endif + + #ifndef WINCE +@@ -90,7 +90,8 @@ + #elif defined(XP_MACOSX) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService) + #elif defined(MOZ_WIDGET_GTK2) +-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) ++// in nsUnixShellService ++//NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsUnixShellService, Init) + #endif + + #ifndef WINCE +@@ -134,7 +135,7 @@ + { "Browser Shell Service", + NS_SHELLSERVICE_CID, + NS_SHELLSERVICE_CONTRACTID, +- nsGNOMEShellServiceConstructor }, ++ nsUnixShellServiceConstructor }, + + #endif + +Index: mozilla/browser/components/shell/src/Makefile.in +=================================================================== +--- mozilla.orig/browser/components/shell/src/Makefile.in 2010-05-04 15:35:57.000000000 +0100 ++++ mozilla/browser/components/shell/src/Makefile.in 2010-05-04 16:05:16.347949602 +0100 +@@ -75,11 +75,12 @@ + CPPSRCS = nsMacShellService.cpp + else + ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2) +-CPPSRCS = nsGNOMEShellService.cpp ++CPPSRCS = nsUnixShellService.cpp nsGNOMEShellService.cpp nsKDEShellService.cpp + REQUIRES += \ + mozgnome \ + thebes \ + $(NULL) ++LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre + endif + endif + endif +Index: mozilla/browser/components/shell/src/nsKDEShellService.cpp +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ mozilla/browser/components/shell/src/nsKDEShellService.cpp 2010-05-04 16:05:16.347949602 +0100 +@@ -0,0 +1,193 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* ***** 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 Shell Service. ++ * ++ * The Initial Developer of the Original Code is mozilla.org. ++ * Portions created by the Initial Developer are Copyright (C) 2004 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either 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 ***** */ ++ ++#include "nsKDEShellService.h" ++#include "nsShellService.h" ++#include "nsKDEUtils.h" ++#include "nsCOMPtr.h" ++#include "nsIPrefService.h" ++#include "nsIProcess.h" ++#include "nsILocalFile.h" ++#include "nsServiceManagerUtils.h" ++#include "nsComponentManagerUtils.h" ++ ++nsresult ++nsKDEShellService::Init() ++ { ++ if( !nsKDEUtils::kdeSupport()) ++ return NS_ERROR_NOT_AVAILABLE; ++ return NS_OK; ++ } ++ ++NS_IMPL_ISUPPORTS1(nsKDEShellService, nsIShellService) ++ ++NS_IMETHODIMP ++nsKDEShellService::IsDefaultBrowser(PRBool aStartupCheck, ++ PRBool* aIsDefaultBrowser) ++ { ++ *aIsDefaultBrowser = PR_FALSE; ++ if (aStartupCheck) ++ mCheckedThisSession = PR_TRUE; ++ nsCStringArray command; ++ command.AppendCString( NS_LITERAL_CSTRING( "ISDEFAULTBROWSER" )); ++ if( nsKDEUtils::command( command )) ++ *aIsDefaultBrowser = PR_TRUE; ++ return NS_OK; ++ } ++ ++NS_IMETHODIMP ++nsKDEShellService::SetDefaultBrowser(PRBool aClaimAllTypes, ++ PRBool aForAllUsers) ++ { ++ nsCStringArray command; ++ command.AppendCString( NS_LITERAL_CSTRING( "SETDEFAULTBROWSER" )); ++ command.AppendCString( aClaimAllTypes ? NS_LITERAL_CSTRING( "ALLTYPES" ) : NS_LITERAL_CSTRING( "NORMAL" )); ++ return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; ++ } ++ ++NS_IMETHODIMP ++nsKDEShellService::GetShouldCheckDefaultBrowser(PRBool* aResult) ++{ ++ // If we've already checked, the browser has been started and this is a ++ // new window open, and we don't want to check again. ++ if (mCheckedThisSession) { ++ *aResult = PR_FALSE; ++ return NS_OK; ++ } ++ ++ nsCOMPtr<nsIPrefBranch> prefs; ++ nsCOMPtr<nsIPrefService> pserve(do_GetService(NS_PREFSERVICE_CONTRACTID)); ++ if (pserve) ++ pserve->GetBranch("", getter_AddRefs(prefs)); ++ ++ if (prefs) ++ prefs->GetBoolPref(PREF_CHECKDEFAULTBROWSER, aResult); ++ ++ return NS_OK; ++} ++ ++NS_IMETHODIMP ++nsKDEShellService::SetShouldCheckDefaultBrowser(PRBool aShouldCheck) ++{ ++ nsCOMPtr<nsIPrefBranch> prefs; ++ nsCOMPtr<nsIPrefService> pserve(do_GetService(NS_PREFSERVICE_CONTRACTID)); ++ if (pserve) ++ pserve->GetBranch("", getter_AddRefs(prefs)); ++ ++ if (prefs) ++ prefs->SetBoolPref(PREF_CHECKDEFAULTBROWSER, aShouldCheck); ++ ++ return NS_OK; ++} ++ ++NS_IMETHODIMP ++nsKDEShellService::SetDesktopBackground(nsIDOMElement* aElement, ++ PRInt32 aPosition) ++ { ++ return NS_ERROR_NOT_IMPLEMENTED; ++ } ++ ++NS_IMETHODIMP ++nsKDEShellService::GetDesktopBackgroundColor(PRUint32 *aColor) ++ { ++ return NS_ERROR_NOT_IMPLEMENTED; ++ } ++ ++NS_IMETHODIMP ++nsKDEShellService::SetDesktopBackgroundColor(PRUint32 aColor) ++ { ++ return NS_ERROR_NOT_IMPLEMENTED; ++ } ++ ++NS_IMETHODIMP ++nsKDEShellService::OpenApplication(PRInt32 aApplication) ++ { ++ nsCStringArray command; ++ if( aApplication == APPLICATION_MAIL ) ++ command.AppendCString( NS_LITERAL_CSTRING( "OPENMAIL" )); ++ else if( aApplication == APPLICATION_NEWS ) ++ command.AppendCString( NS_LITERAL_CSTRING( "OPENNEWS" )); ++ else ++ return NS_ERROR_NOT_IMPLEMENTED; ++ return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; ++ } ++ ++NS_IMETHODIMP ++nsKDEShellService::OpenApplicationWithURI(nsILocalFile* aApplication, const nsACString& aURI) ++ { ++ nsCStringArray command; ++ command.AppendCString( NS_LITERAL_CSTRING( "RUN" )); ++ nsCString app; ++ nsresult rv = aApplication->GetNativePath( app ); ++ NS_ENSURE_SUCCESS( rv, rv ); ++ command.AppendCString( app ); ++ command.AppendCString( aURI ); ++ return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; ++ } ++ ++NS_IMETHODIMP ++nsKDEShellService::GetDefaultFeedReader(nsILocalFile** _retval) ++ { ++ *_retval = nsnull; ++ ++ nsCStringArray command; ++ command.AppendCString( NS_LITERAL_CSTRING( "GETDEFAULTFEEDREADER" )); ++ nsCStringArray output; ++ if( !nsKDEUtils::command( command, &output ) || output.Count() != 1 ) ++ return NS_ERROR_FAILURE; ++ ++ nsCString path; ++ path = *output[ 0 ]; ++ if (path.IsEmpty()) ++ return NS_ERROR_FAILURE; ++ ++ nsresult rv; ++ nsCOMPtr<nsILocalFile> defaultReader = ++ do_CreateInstance("@mozilla.org/file/local;1", &rv); ++ NS_ENSURE_SUCCESS(rv, rv); ++ ++ rv = defaultReader->InitWithNativePath(path); ++ NS_ENSURE_SUCCESS(rv, rv); ++ ++ PRBool exists; ++ rv = defaultReader->Exists(&exists); ++ NS_ENSURE_SUCCESS(rv, rv); ++ if (!exists) ++ return NS_ERROR_FAILURE; ++ ++ NS_ADDREF(*_retval = defaultReader); ++ return NS_OK; ++ } +Index: mozilla/browser/components/shell/src/nsKDEShellService.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ mozilla/browser/components/shell/src/nsKDEShellService.h 2010-05-04 16:05:16.347949602 +0100 +@@ -0,0 +1,59 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* ***** 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 Shell Service. ++ * ++ * The Initial Developer of the Original Code is mozilla.org. ++ * Portions created by the Initial Developer are Copyright (C) 2004 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either 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 ***** */ ++ ++#ifndef nskdeshellservice_h____ ++#define nskdeshellservice_h____ ++ ++#include "nsIShellService.h" ++#include "nsStringAPI.h" ++ ++class nsKDEShellService : public nsIShellService ++{ ++public: ++ nsKDEShellService() : mCheckedThisSession(PR_FALSE) { } ++ ++ NS_DECL_ISUPPORTS ++ NS_DECL_NSISHELLSERVICE ++ ++ nsresult Init() NS_HIDDEN; ++ ++private: ++ ~nsKDEShellService() {} ++ ++ PRPackedBool mCheckedThisSession; ++}; ++ ++#endif // nskdeshellservice_h____ +Index: mozilla/browser/components/shell/src/nsUnixShellService.cpp +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ mozilla/browser/components/shell/src/nsUnixShellService.cpp 2010-05-04 16:05:16.347949602 +0100 +@@ -0,0 +1,52 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* ***** 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 Shell Service. ++ * ++ * The Initial Developer of the Original Code is mozilla.org. ++ * Portions created by the Initial Developer are Copyright (C) 2004 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either 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 ***** */ ++ ++#include "nsUnixShellService.h" ++#include "nsGNOMEShellService.h" ++#include "nsKDEShellService.h" ++#include "nsKDEUtils.h" ++#include "nsIGenericFactory.h" ++ ++NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) ++NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsKDEShellService, Init) ++ ++NS_METHOD ++nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult) ++{ ++ if( nsKDEUtils::kdeSupport()) ++ return nsKDEShellServiceConstructor( aOuter, aIID, aResult ); ++ return nsGNOMEShellServiceConstructor( aOuter, aIID, aResult ); ++} +Index: mozilla/browser/components/shell/src/nsUnixShellService.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ mozilla/browser/components/shell/src/nsUnixShellService.h 2010-05-04 16:05:16.367948792 +0100 +@@ -0,0 +1,45 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* ***** 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 Shell Service. ++ * ++ * The Initial Developer of the Original Code is mozilla.org. ++ * Portions created by the Initial Developer are Copyright (C) 2004 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either 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 ***** */ ++ ++#ifndef nsunixshellservice_h____ ++#define nsunixshellservice_h____ ++ ++#include "nsIShellService.h" ++ ++NS_METHOD ++nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult); ++ ++#endif // nsunixshellservice_h____ +Index: mozilla/browser/installer/package-manifest.in +=================================================================== +--- mozilla.orig/browser/installer/package-manifest.in 2010-05-04 15:59:04.920446384 +0100 ++++ mozilla/browser/installer/package-manifest.in 2010-05-04 16:05:16.367948792 +0100 +@@ -416,6 +416,7 @@ + @BINPATH@/@PREF_DIR@/firefox.js + @BINPATH@/@PREF_DIR@/firefox-branding.js + @BINPATH@/@PREF_DIR@/channel-prefs.js ++@BINPATH@/@PREF_DIR@/kde.js + @BINPATH@/greprefs/all.js + @BINPATH@/greprefs/security-prefs.js + @BINPATH@/greprefs/xpinstall.js +Index: mozilla/browser/app/profile/kde.js +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ mozilla/browser/app/profile/kde.js 2010-05-04 16:05:16.367948792 +0100 +@@ -0,0 +1 @@ ++pref("browser.preferences.instantApply", false); --- firefox-3.6.18+build2+nobinonly.orig/debian/patches/awesome_browser_branding_install.patch +++ firefox-3.6.18+build2+nobinonly/debian/patches/awesome_browser_branding_install.patch @@ -0,0 +1,30 @@ +--- + browser/installer/package-manifest.in | 5 +++++ + 1 file changed, 5 insertions(+) + +Index: mozilla/browser/installer/package-manifest.in +=================================================================== +--- mozilla.orig/browser/installer/package-manifest.in ++++ mozilla/browser/installer/package-manifest.in +@@ -368,16 +368,21 @@ + @BINPATH@/chrome/comm.jar + @BINPATH@/chrome/comm.manifest + @BINPATH@/chrome/reporter.jar + @BINPATH@/chrome/reporter.manifest + @BINPATH@/chrome/toolkit.jar + @BINPATH@/chrome/toolkit.manifest + @BINPATH@/@PREF_DIR@/reporter.js + #ifdef XP_UNIX ++; ubuntu awesome browser branding ++@BINPATH@/chrome/awesome-branding.jar ++@BINPATH@/chrome/awesome-branding.manifest ++@BINPATH@/chrome/awesome-branding-en-US.jar ++@BINPATH@/chrome/awesome-branding-en-US.manifest + #ifndef XP_MACOSX + @BINPATH@/chrome/icons/default/default16.png + @BINPATH@/chrome/icons/default/default32.png + @BINPATH@/chrome/icons/default/default48.png + #endif + #endif + + --- firefox-3.6.18+build2+nobinonly.orig/debian/patches/ubuntu_no_app_updates.patch +++ firefox-3.6.18+build2+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 +@@ -403,50 +403,48 @@ + { + var aus = + Components.classes["@mozilla.org/updates/update-service;1"]. + getService(Components.interfaces.nsIApplicationUpdateService2); + + var enabledPref = document.getElementById("app.update.enabled"); + var enableAppUpdate = document.getElementById("enableAppUpdate"); + +- enableAppUpdate.disabled = !aus.canCheckForUpdates || 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.6.18+build2+nobinonly.orig/debian/patches/bz534663_attXXX_normalize_distribution_searchplugins.patch +++ firefox-3.6.18+build2+nobinonly/debian/patches/bz534663_attXXX_normalize_distribution_searchplugins.patch @@ -0,0 +1,50 @@ +--- + toolkit/components/search/nsSearchService.js | 9 +++++++++ + 1 file changed, 9 insertions(+) + +Index: mozilla/toolkit/components/search/nsSearchService.js +=================================================================== +--- mozilla.orig/toolkit/components/search/nsSearchService.js ++++ mozilla/toolkit/components/search/nsSearchService.js +@@ -47,16 +47,17 @@ const PERMS_DIRECTORY = 0755; + + const MODE_RDONLY = 0x01; + const MODE_WRONLY = 0x02; + const MODE_CREATE = 0x08; + const MODE_APPEND = 0x10; + const MODE_TRUNCATE = 0x20; + + // Directory service keys ++const NS_XPCOM_CURRENT_PROCESS_DIR = "XCurProcD"; + const NS_APP_SEARCH_DIR_LIST = "SrchPluginsDL"; + const NS_APP_USER_SEARCH_DIR = "UsrSrchPlugns"; + const NS_APP_SEARCH_DIR = "SrchPlugns"; + const NS_APP_USER_PROFILE_50_DIR = "ProfD"; + + // Search engine "locations". If this list is changed, be sure to update + // the engine's _isDefault function accordingly. + const SEARCH_APP_DIR = 1; +@@ -2797,16 +2798,23 @@ SearchService.prototype = { + + while (files.hasMoreElements()) { + var file = files.nextFile; + + // Ignore hidden and empty files, and directories + if (!file.isFile() || file.fileSize == 0 || file.isHidden()) + continue; + ++ var appdirstr = getDir (NS_XPCOM_CURRENT_PROCESS_DIR).path ++ + "/distribution/searchplugins"; ++ ++ // normalize distribution searchplugins if they are following links ++ if (file.path.indexOf(appdirstr) == 0) ++ file.normalize(); ++ + var fileURL = gIoSvc.newFileURI(file).QueryInterface(Ci.nsIURL); + var fileExtension = fileURL.fileExtension.toLowerCase(); + var isWritable = isInProfile && file.isWritable(); + + var dataType; + switch (fileExtension) { + case XML_FILE_EXT: + dataType = SEARCH_DATA_XML; --- firefox-3.6.18+build2+nobinonly.orig/debian/patches/drop_bz418016.patch +++ firefox-3.6.18+build2+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.6.18+build2+nobinonly.orig/debian/patches/lp801778_bz667087_att542125-fix-cookie-regression.patch +++ firefox-3.6.18+build2+nobinonly/debian/patches/lp801778_bz667087_att542125-fix-cookie-regression.patch @@ -0,0 +1,93 @@ +Description: Fix cookie regression from Firefox 3.6.18 + When talking to an hostname consisting of a single letter, Firefox 3.6.18 does + not set cookie. Previous versions did fine, as well as other browser such as + chromium. +Author: Chris Coulson <chris.coulson@canonical.com> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/801778 +Forwarded: https://bugzilla.mozilla.org/show_bug.cgi?id=667087 +Origin: https://bug667087.bugzilla.mozilla.org/attachment.cgi?id=542125 + +diff --git a/extensions/cookie/test/unit/test_bug667087.js b/extensions/cookie/test/unit/test_bug667087.js +new file mode 100644 +--- /dev/null ++++ b/extensions/cookie/test/unit/test_bug667087.js +@@ -0,0 +1,19 @@ ++/* Any copyright is dedicated to the Public Domain. ++ http://creativecommons.org/publicdomain/zero/1.0/ */ ++ ++const Cc = Components.classes; ++const Ci = Components.interfaces; ++ ++Components.utils.import("resource://gre/modules/NetUtil.jsm"); ++ ++function run_test() { ++ var cs = Cc["@mozilla.org/cookieService;1"].getService(Ci.nsICookieService); ++ var cm = Cc["@mozilla.org/cookiemanager;1"].getService(Ci.nsICookieManager2); ++ var expiry = (Date.now() + 1000) * 1000; ++ ++ // Test our handling of host names with a single character consisting only ++ // of a single character ++ cm.add("a", "/", "foo", "bar", false, false, true, expiry); ++ do_check_eq(cm.countCookiesFromHost("a"), 1); ++ do_check_eq(cs.getCookieString(NetUtil.newURI("http://a"), null), "foo=bar"); ++} +diff --git a/netwerk/cookie/src/nsCookieService.cpp b/netwerk/cookie/src/nsCookieService.cpp +--- a/netwerk/cookie/src/nsCookieService.cpp ++++ b/netwerk/cookie/src/nsCookieService.cpp +@@ -1343,17 +1343,17 @@ nsCookieService::GetCookieInternal(nsIUR + } + + // all checks passed - add to list and check if lastAccessed stamp needs updating + foundCookieList.AppendElement(cookie); + if (currentTimeInUsec - cookie->LastAccessed() > kCookieStaleThreshold) + stale = PR_TRUE; + } + +- if (!nextDot || (nextDot <= end && *(nextDot + 1) == '\0')) ++ if (!nextDot || (nextDot <= end && *(nextDot + 1) == '\0' && *nextDot == '.')) + break; + + currentDot = nextDot; + nextDot = *currentDot ? strchr(currentDot + 1, '.') : nsnull; + } while (1); + + PRInt32 count = foundCookieList.Length(); + if (count == 0) +@@ -2223,17 +2223,17 @@ nsCookieService::CountCookiesFromHostInt + // check if we've found the oldest cookie so far + if (aData.oldestTime > iter.current->LastAccessed()) { + aData.oldestTime = iter.current->LastAccessed(); + aData.iter = iter; + } + } + } + +- if (!nextDot || (nextDot <= end && *(nextDot + 1) == '\0')) ++ if (!nextDot || (nextDot <= end && *(nextDot + 1) == '\0' && *nextDot == '.')) + break; + + currentDot = nextDot; + nextDot = *currentDot ? strchr(currentDot + 1, '.') : nsnull; + } while (1); + + return countFromHost; + } +@@ -2276,17 +2276,17 @@ nsCookieService::GetCookiesFromHost(cons + do { + nsCookieEntry *entry = mDBState->hostTable.GetEntry(currentDot); + for (nsListIter iter(entry); iter.current; ++iter) { + // only append non-expired cookies + if (iter.current->Expiry() > currentTime) + cookieList.AppendObject(iter.current); + } + +- if (!nextDot || (nextDot <= end && *(nextDot + 1) == '\0')) ++ if (!nextDot || (nextDot <= end && *(nextDot + 1) == '\0' && *nextDot == '.')) + break; + + currentDot = nextDot; + nextDot = *currentDot ? strchr(currentDot + 1, '.') : nsnull; + } while (1); + + return NS_NewArrayEnumerator(aEnumerator, cookieList); + } --- firefox-3.6.18+build2+nobinonly.orig/debian/patches/bz532198_lp488354_ns_invokebyindex_not_thumb2_safe.patch +++ firefox-3.6.18+build2+nobinonly/debian/patches/bz532198_lp488354_ns_invokebyindex_not_thumb2_safe.patch @@ -0,0 +1,44 @@ +diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp +index e2c71a5..df78163 100644 +--- a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp ++++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp +@@ -205,16 +205,25 @@ NS_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, + "ldr r1, [%1, #12] \n\t" /* prepare to call invoke_count_words */ + "ldr ip, [%1, #16] \n\t" /* r0=paramCount, r1=params */ + "ldr r0, [%1, #8] \n\t" ++#ifdef __thumb__ ++ "blx ip \n\t" /* call it... */ ++#else + "mov lr, pc \n\t" /* call it... */ + "mov pc, ip \n\t" ++#endif + "mov r4, r0, lsl #2 \n\t" /* This is the amount of bytes needed. */ + "sub sp, sp, r4 \n\t" /* use stack space for the args... */ + "mov r0, sp \n\t" /* prepare a pointer an the stack */ + "ldr r1, [%1, #8] \n\t" /* =paramCount */ + "ldr r2, [%1, #12] \n\t" /* =params */ + "ldr ip, [%1, #20] \n\t" /* =invoke_copy_to_stack */ ++#ifdef __thumb__ ++ "blx ip \n\t" /* copy args to the stack like the ++ * compiler would */ ++#else + "mov lr, pc \n\t" /* copy args to the stack like the */ + "mov pc, ip \n\t" /* compiler would. */ ++#endif + "ldr r0, [%1] \n\t" /* =that */ + "ldr r1, [r0, #0] \n\t" /* get that->vtable offset */ + "ldr r2, [%1, #4] \n\t" +@@ -238,8 +247,12 @@ NS_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, + "addle sp, sp, r4 \n\t" /* and restore stack pointer */ + "movle r4, #0 \n\t" /* a mark for restoring sp */ + "ldr r0, [%1, #0] \n\t" /* get (self) */ +- "mov lr, pc \n\t" /* call mathod */ ++#ifdef __thumb__ ++ "blx ip \n\t" /* call method */ ++#else ++ "mov lr, pc \n\t" /* call method */ + "mov pc, ip \n\t" ++#endif + "add sp, sp, r4 \n\t" /* restore stack pointer */ + "mov %0, r0 \n\t" /* the result... */ + : "=r" (result) --- firefox-3.6.18+build2+nobinonly.orig/debian/patches/bz467738_att351145_lockPref_everywhere.patch +++ firefox-3.6.18+build2+nobinonly/debian/patches/bz467738_att351145_lockPref_everywhere.patch @@ -0,0 +1,94 @@ +--- xulrunner-1.9~rc2.orig/modules/libpref/src/prefread.cpp ++++ xulrunner-1.9~rc2/modules/libpref/src/prefread.cpp +@@ -75,6 +75,7 @@ + #define BITS_PER_HEX_DIGIT 4 + + static const char kUserPref[] = "user_pref"; ++static const char kLockPref[] = "lockPref"; + static const char kPref[] = "pref"; + static const char kTrue[] = "true"; + static const char kFalse[] = "false"; +@@ -161,7 +162,7 @@ + default: + break; + } +- (*ps->reader)(ps->closure, ps->lb, value, ps->vtype, ps->fdefault); ++ (*ps->reader)(ps->closure, ps->lb, value, ps->vtype, ps->fdefault, ps->flock); + return PR_TRUE; + } + +@@ -220,6 +221,7 @@ + ps->vb = NULL; + ps->vtype = PREF_INVALID; + ps->fdefault = PR_FALSE; ++ ps->flock = PR_FALSE; + } + switch (c) { + case '/': /* begin comment block or line? */ +@@ -230,7 +232,9 @@ + break; + case 'u': /* indicating user_pref */ + case 'p': /* indicating pref */ +- ps->smatch = (c == 'u' ? kUserPref : kPref); ++ case 'l': /* indicating lockPref */ ++ ps->smatch = (c == 'u' ? kUserPref : ++ (c == 'p' ? kPref : kLockPref)); + ps->sindex = 1; + ps->nextstate = PREF_PARSE_UNTIL_OPEN_PAREN; + state = PREF_PARSE_MATCH_STRING; +@@ -274,7 +278,8 @@ + /* name parsing */ + case PREF_PARSE_UNTIL_NAME: + if (c == '\"' || c == '\'') { +- ps->fdefault = (ps->smatch == kPref); ++ ps->fdefault = (ps->smatch != kUserPref); ++ ps->flock = (ps->smatch == kLockPref); + ps->quotechar = c; + ps->nextstate = PREF_PARSE_UNTIL_COMMA; /* return here when done */ + state = PREF_PARSE_QUOTED_STRING; +--- xulrunner-1.9~rc2.orig/modules/libpref/src/prefread.h ++++ xulrunner-1.9~rc2/modules/libpref/src/prefread.h +@@ -62,7 +62,8 @@ + const char *pref, + PrefValue val, + PrefType type, +- PRBool defPref); ++ PRBool defPref, ++ PRBool lockPref); + + /* structure fields are private */ + typedef struct PrefParseState { +@@ -83,6 +84,7 @@ + char *vb; /* value buffer (ptr into lb) */ + PrefType vtype; /* PREF_STRING,INT,BOOL */ + PRBool fdefault; /* PR_TRUE if (default) pref */ ++ PRBool flock; /* PR_TRUE if pref to be locked */ + } PrefParseState; + + /** +--- xulrunner-1.9~rc2.orig/modules/libpref/src/prefapi.cpp ++++ xulrunner-1.9~rc2/modules/libpref/src/prefapi.cpp +@@ -957,7 +957,10 @@ + const char *pref, + PrefValue value, + PrefType type, +- PRBool isDefault) ++ PRBool isDefault, ++ PRBool isLocked) + { + pref_HashPref(pref, value, type, isDefault); ++ if (isLocked) ++ PREF_LockPref(pref, PR_TRUE); + } +--- xulrunner-1.9~rc2.orig/modules/libpref/src/prefapi.h ++++ xulrunner-1.9~rc2/modules/libpref/src/prefapi.h +@@ -207,7 +207,8 @@ + const char *pref, + PrefValue value, + PrefType type, +- PRBool isDefault); ++ PRBool isDefault, ++ PRBool isLocked); + + NSPR_END_EXTERN_C + #endif --- firefox-3.6.18+build2+nobinonly.orig/debian/patches/ubuntu_codes_google.patch +++ firefox-3.6.18+build2+nobinonly/debian/patches/ubuntu_codes_google.patch @@ -0,0 +1,20 @@ +Index: mozilla/browser/locales/en-US/searchplugins/google.xml +=================================================================== +--- mozilla.orig/browser/locales/en-US/searchplugins/google.xml 2010-04-02 16:57:47.000000000 +0100 ++++ mozilla/browser/locales/en-US/searchplugins/google.xml 2010-04-09 12:07:53.932668434 +0100 +@@ -5,13 +5,11 @@ + <Image width="16" height="16">data:image/png;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADs9Pt8xetPtu9FsfFNtu%2BTzvb2%2B%2Fne4dFJeBw0egA%2FfAJAfAA8ewBBegAAAAD%2B%2FPtft98Mp%2BwWsfAVsvEbs%2FQeqvF8xO7%2F%2F%2F63yqkxdgM7gwE%2FggM%2BfQA%2BegBDeQDe7PIbotgQufcMufEPtfIPsvAbs%2FQvq%2Bfz%2Bf%2F%2B%2B%2FZKhR05hgBBhQI8hgBAgAI9ewD0%2B%2Fg3pswAtO8Cxf4Kw%2FsJvvYAqupKsNv%2B%2Fv7%2F%2FP5VkSU0iQA7jQA9hgBDgQU%2BfQH%2F%2Ff%2FQ6fM4sM4KsN8AteMCruIqqdbZ7PH8%2Fv%2Fg6Nc%2Fhg05kAA8jAM9iQI%2BhQA%2BgQDQu6b97uv%2F%2F%2F7V8Pqw3eiWz97q8%2Ff%2F%2F%2F%2F7%2FPptpkkqjQE4kwA7kAA5iwI8iAA8hQCOSSKdXjiyflbAkG7u2s%2F%2B%2F%2F39%2F%2F7r8utrqEYtjQE8lgA7kwA7kwA9jwA9igA9hACiWSekVRyeSgiYSBHx6N%2F%2B%2Fv7k7OFRmiYtlAA5lwI7lwI4lAA7kgI9jwE9iwI4iQCoVhWcTxCmb0K%2BooT8%2Fv%2F7%2F%2F%2FJ2r8fdwI1mwA3mQA3mgA8lAE8lAE4jwA9iwE%2BhwGfXifWvqz%2B%2Ff%2F58u%2Fev6Dt4tr%2B%2F%2F2ZuIUsggA7mgM6mAM3lgA5lgA6kQE%2FkwBChwHt4dv%2F%2F%2F728ei1bCi7VAC5XQ7kz7n%2F%2F%2F6bsZkgcB03lQA9lgM7kwA2iQktZToPK4r9%2F%2F%2F9%2F%2F%2FSqYK5UwDKZAS9WALIkFn%2B%2F%2F3%2F%2BP8oKccGGcIRJrERILYFEMwAAuEAAdX%2F%2Ff7%2F%2FP%2B%2BfDvGXQLIZgLEWgLOjlf7%2F%2F%2F%2F%2F%2F9QU90EAPQAAf8DAP0AAfMAAOUDAtr%2F%2F%2F%2F7%2B%2Fu2bCTIYwDPZgDBWQDSr4P%2F%2Fv%2F%2F%2FP5GRuABAPkAA%2FwBAfkDAPAAAesAAN%2F%2F%2B%2Fz%2F%2F%2F64g1C5VwDMYwK8Yg7y5tz8%2Fv%2FV1PYKDOcAAP0DAf4AAf0AAfYEAOwAAuAAAAD%2F%2FPvi28ymXyChTATRrIb8%2F%2F3v8fk6P8MAAdUCAvoAAP0CAP0AAfYAAO4AAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAA</Image> + <Url type="application/x-suggestions+json" method="GET" template="http://suggestqueries.google.com/complete/search?output=firefox&client=firefox&hl={moz:locale}&q={searchTerms}"/> + <Url type="text/html" method="GET" template="http://www.google.com/search"> ++ <Param name="client" value="ubuntu"/> ++ <Param name="channel" value="fs"/> + <Param name="q" value="{searchTerms}"/> + <Param name="ie" value="utf-8"/> + <Param name="oe" value="utf-8"/> +- <Param name="aq" value="t"/> +- <!-- Dynamic parameters --> +- <Param name="rls" value="{moz:distributionID}:{moz:locale}:{moz:official}"/> +- <MozParam name="client" condition="defaultEngine" trueValue="firefox-a" falseValue="firefox"/> + </Url> + <SearchForm>http://www.google.com/firefox</SearchForm> + </SearchPlugin> --- firefox-3.6.18+build2+nobinonly.orig/debian/patches/add_syspref_dir.patch +++ firefox-3.6.18+build2+nobinonly/debian/patches/add_syspref_dir.patch @@ -0,0 +1,88 @@ +--- + modules/libpref/src/nsPrefService.cpp | 8 ++++++++ + toolkit/xre/nsXREDirProvider.cpp | 4 ++++ + xpcom/io/nsAppDirectoryServiceDefs.h | 1 + + xpcom/io/nsAppFileLocationProvider.cpp | 10 ++++++++++ + 4 files changed, 23 insertions(+) + +Index: mozilla/toolkit/xre/nsXREDirProvider.cpp +=================================================================== +--- mozilla.orig/toolkit/xre/nsXREDirProvider.cpp 2010-05-14 14:29:11.752797157 +0200 ++++ mozilla/toolkit/xre/nsXREDirProvider.cpp 2010-05-14 14:30:03.682805860 +0200 +@@ -621,6 +621,7 @@ + } + + static const char *const kAppendPrefDir[] = { "defaults", "preferences", nsnull }; ++static const char *const kAppendSysPrefDir[] = { "defaults", "syspref", nsnull }; + + #ifdef DEBUG_bsmedberg + static void +@@ -677,6 +678,9 @@ + LoadAppDirIntoArray(mXULAppDir, kAppendPrefDir, directories); + LoadDirsIntoArray(mAppBundleDirectories, + kAppendPrefDir, directories); ++ LoadAppDirIntoArray(mXULAppDir, kAppendSysPrefDir, directories); ++ LoadDirsIntoArray(mAppBundleDirectories, ++ kAppendSysPrefDir, directories); + + rv = NS_NewArrayEnumerator(aResult, directories); + } +Index: mozilla/modules/libpref/src/nsPrefService.cpp +=================================================================== +--- mozilla.orig/modules/libpref/src/nsPrefService.cpp 2010-05-14 14:29:11.702794922 +0200 ++++ mozilla/modules/libpref/src/nsPrefService.cpp 2010-05-14 14:30:03.682805860 +0200 +@@ -697,6 +697,14 @@ + NS_WARNING("Error parsing application default preferences."); + } + ++ /* now, parse the "application" default system preferences */ ++ rv = NS_GetSpecialDirectory(NS_APP_SYSPREF_DEFAULTS_50_DIR, getter_AddRefs(defaultPrefDir)); ++ NS_ENSURE_SUCCESS(rv, rv); ++ rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, NS_ARRAY_LENGTH(specialFiles)); ++ if (NS_FAILED(rv)) { ++ NS_WARNING("Error parsing application default preferences."); ++ } ++ + rv = pref_LoadPrefsInDirList(NS_APP_PREFS_DEFAULTS_DIR_LIST); + NS_ENSURE_SUCCESS(rv, rv); + +Index: mozilla/xpcom/io/nsAppDirectoryServiceDefs.h +=================================================================== +--- mozilla.orig/xpcom/io/nsAppDirectoryServiceDefs.h 2010-05-14 14:29:11.742796863 +0200 ++++ mozilla/xpcom/io/nsAppDirectoryServiceDefs.h 2010-05-14 14:30:03.682805860 +0200 +@@ -63,6 +63,7 @@ + + #define NS_APP_DEFAULTS_50_DIR "DefRt" // The root dir of all defaults dirs + #define NS_APP_PREF_DEFAULTS_50_DIR "PrfDef" ++#define NS_APP_SYSPREF_DEFAULTS_50_DIR "SysPrfDef" + #define NS_APP_PROFILE_DEFAULTS_50_DIR "profDef" // The profile defaults of the "current" + // locale. Should be first choice. + #define NS_APP_PROFILE_DEFAULTS_NLOC_50_DIR "ProfDefNoLoc" // The profile defaults of the "default" +Index: mozilla/xpcom/io/nsAppFileLocationProvider.cpp +=================================================================== +--- mozilla.orig/xpcom/io/nsAppFileLocationProvider.cpp 2010-05-14 14:29:11.722799559 +0200 ++++ mozilla/xpcom/io/nsAppFileLocationProvider.cpp 2010-05-14 14:30:03.682805860 +0200 +@@ -97,6 +97,7 @@ + + #define DEFAULTS_DIR_NAME NS_LITERAL_CSTRING("defaults") + #define DEFAULTS_PREF_DIR_NAME NS_LITERAL_CSTRING("pref") ++#define DEFAULTS_SYSPREF_DIR_NAME NS_LITERAL_CSTRING("syspref") + #define DEFAULTS_PROFILE_DIR_NAME NS_LITERAL_CSTRING("profile") + #define RES_DIR_NAME NS_LITERAL_CSTRING("res") + #define CHROME_DIR_NAME NS_LITERAL_CSTRING("chrome") +@@ -161,6 +162,15 @@ + rv = localFile->AppendRelativeNativePath(DEFAULTS_PREF_DIR_NAME); + } + } ++ else if (nsCRT::strcmp(prop, NS_APP_SYSPREF_DEFAULTS_50_DIR) == 0) ++ { ++ rv = CloneMozBinDirectory(getter_AddRefs(localFile)); ++ if (NS_SUCCEEDED(rv)) { ++ rv = localFile->AppendRelativeNativePath(DEFAULTS_DIR_NAME); ++ if (NS_SUCCEEDED(rv)) ++ rv = localFile->AppendRelativeNativePath(DEFAULTS_SYSPREF_DIR_NAME); ++ } ++ } + else if (nsCRT::strcmp(prop, NS_APP_PROFILE_DEFAULTS_50_DIR) == 0 || + nsCRT::strcmp(prop, NS_APP_PROFILE_DEFAULTS_NLOC_50_DIR) == 0) + { --- firefox-3.6.18+build2+nobinonly.orig/debian/patches/series +++ firefox-3.6.18+build2+nobinonly/debian/patches/series @@ -0,0 +1,22 @@ +bz386904_config_rules_install_dist_files.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 +bz532198_lp488354_ns_invokebyindex_not_thumb2_safe.patch +add_syspref_dir.patch +bz534663_attXXX_normalize_distribution_searchplugins.patch +mozilla-kde.patch +firefox-kde.patch +lp548866_bz467766_att351173-dont-reset-user-prefs-on-upgrade.patch +lp512615_cairo_lcd_filter.patch +ubuntu_codes_google.patch +bzXXX_plugin_for_mimetype_pref.patch +bz467738_att351145_lockPref_everywhere.patch +bz591331_att469858_breakpad_allow_ptrace.patch +lp801778_bz667087_att542125-fix-cookie-regression.patch --- firefox-3.6.18+build2+nobinonly.orig/debian/patches/bz591331_att469858_breakpad_allow_ptrace.patch +++ firefox-3.6.18+build2+nobinonly/debian/patches/bz591331_att469858_breakpad_allow_ptrace.patch @@ -0,0 +1,142 @@ +--- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc ++++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc +@@ -72,6 +72,7 @@ + #include <signal.h> + #include <stdio.h> + #include <sys/mman.h> ++#include <sys/prctl.h> + #include <sys/signal.h> + #include <sys/syscall.h> + #include <sys/ucontext.h> +@@ -88,6 +89,11 @@ + #include "common/linux/memory.h" + #include "client/linux/minidump_writer/minidump_writer.h" + #include "common/linux/guid_creator.h" ++#include "common/linux/eintr_wrapper.h" ++ ++#ifndef PR_SET_PTRACER ++#define PR_SET_PTRACER 0x59616d61 ++#endif + + // A wrapper for the tgkill syscall: send a signal to a specific thread. + static int tgkill(pid_t tgid, pid_t tid, int sig) { +@@ -285,6 +291,11 @@ struct ThreadArgument { + // static + int ExceptionHandler::ThreadEntry(void *arg) { + const ThreadArgument *thread_arg = reinterpret_cast<ThreadArgument*>(arg); ++ ++ // Block here until the crashing process unblocks us when ++ // we're allowed to use ptrace ++ thread_arg->handler->WaitForContinueSignal(); ++ + return thread_arg->handler->DoDump(thread_arg->pid, thread_arg->context, + thread_arg->context_size) == false; + } +@@ -339,14 +350,35 @@ bool ExceptionHandler::GenerateDump(Cras + thread_arg.context = context; + thread_arg.context_size = sizeof(*context); + ++ // We need to explicitly enable ptrace of parent processes on some ++ // kernels, but we need to know the PID of the cloned process before we ++ // can do this. Create a pipe here which we can use to block the ++ // cloned process after creating it, until we have explicitly enabled ptrace ++ if(sys_pipe(fdes) == -1) { ++ // Creating the pipe failed. We'll log an error but carry on anyway, ++ // as we'll probably still get a useful crash report. All that will happen ++ // is the write() and read() calls will fail with EBADF ++ static const char no_pipe_msg[] = "ExceptionHandler::GenerateDump \ ++ sys_pipe failed:"; ++ sys_write(2, no_pipe_msg, sizeof(no_pipe_msg) - 1); ++ sys_write(2, strerror(errno), strlen(strerror(errno))); ++ sys_write(2, "\n", 1); ++ } ++ + const pid_t child = sys_clone( + ThreadEntry, stack, CLONE_FILES | CLONE_FS | CLONE_UNTRACED, + &thread_arg, NULL, NULL, NULL); + int r, status; ++ // Allow the child to ptrace us ++ prctl(PR_SET_PTRACER, child, 0, 0, 0); ++ SendContinueSignalToChild(); + do { + r = sys_waitpid(child, &status, __WALL); + } while (r == -1 && errno == EINTR); + ++ sys_close(fdes[0]); ++ sys_close(fdes[1]); ++ + if (r == -1) { + static const char msg[] = "ExceptionHandler::GenerateDump waitpid failed:"; + sys_write(2, msg, sizeof(msg) - 1); +@@ -364,6 +396,35 @@ bool ExceptionHandler::GenerateDump(Cras + } + + // This function runs in a compromised context: see the top of the file. ++void ExceptionHandler::SendContinueSignalToChild() { ++ static const char okToContinueMessage = 'a'; ++ int r; ++ r = HANDLE_EINTR(sys_write(fdes[1], &okToContinueMessage, sizeof(char))); ++ if(r == -1) { ++ static const char msg[] = "ExceptionHandler::SendContinueSignalToChild \ ++ sys_write failed:"; ++ sys_write(2, msg, sizeof(msg) - 1); ++ sys_write(2, strerror(errno), strlen(strerror(errno))); ++ sys_write(2, "\n", 1); ++ } ++} ++ ++// This function runs in a compromised context: see the top of the file. ++// Runs on the cloned process. ++void ExceptionHandler::WaitForContinueSignal() { ++ int r; ++ char receivedMessage; ++ r = HANDLE_EINTR(sys_read(fdes[0], &receivedMessage, sizeof(char))); ++ if(r == -1) { ++ static const char msg[] = "ExceptionHandler::WaitForContinueSignal \ ++ sys_read failed:"; ++ sys_write(2, msg, sizeof(msg) - 1); ++ sys_write(2, strerror(errno), strlen(strerror(errno))); ++ sys_write(2, "\n", 1); ++ } ++} ++ ++// This function runs in a compromised context: see the top of the file. + // Runs on the cloned process. + bool ExceptionHandler::DoDump(pid_t crashing_process, const void* context, + size_t context_size) { +--- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.h ++++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.h +@@ -212,6 +212,8 @@ class ExceptionHandler { + void UninstallHandlers(); + void PreresolveSymbols(); + bool GenerateDump(CrashContext *context); ++ void SendContinueSignalToChild(); ++ void WaitForContinueSignal(); + + void UpdateNextID(); + static void SignalHandler(int sig, siginfo_t* info, void* uc); +@@ -251,6 +253,13 @@ class ExceptionHandler { + + // A vector of the old signal handlers. + std::vector<std::pair<int, struct sigaction *> > old_handlers_; ++ ++ // We need to explicitly enable ptrace of parent processes on some ++ // kernels, but we need to know the PID of the cloned process before we ++ // can do this. We create a pipe which we can use to block the ++ // cloned process after creating it, until we have explicitly enabled ++ // ptrace. This is used to store the file descriptors for the pipe ++ int fdes[2]; + }; + + } // namespace google_breakpad +--- a/toolkit/crashreporter/google-breakpad/src/common/linux/eintr_wrapper.h ++++ b/toolkit/crashreporter/google-breakpad/src/common/linux/eintr_wrapper.h +@@ -36,7 +36,7 @@ + // signal and return EINTR. See man 7 signal. + // + +-#define HANDLE_EINTR(x) ({ \ ++#define HANDLE_EINTR(x) __extension__ ({ \ + typeof(x) __eintr_result__; \ + do { \ + __eintr_result__ = x; \ --- firefox-3.6.18+build2+nobinonly.orig/debian/patches/mozilla-kde.patch +++ firefox-3.6.18+build2+nobinonly/debian/patches/mozilla-kde.patch @@ -0,0 +1,1766 @@ +--- a/chrome/src/Makefile.in ++++ b/chrome/src/Makefile.in +@@ -86,6 +86,7 @@ EXTRA_DSO_LDOPTS = \ + + ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT))) + EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) ++LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre + endif + + ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) +--- a/chrome/src/nsChromeRegistry.cpp ++++ b/chrome/src/nsChromeRegistry.cpp +@@ -114,6 +114,7 @@ + #include "nsIXULAppInfo.h" + #include "nsIXULRuntime.h" + #include "nsPresShellIterator.h" ++#include "nsKDEUtils.h" + + #define UILOCALE_CMD_LINE_ARG "UILocale" + +@@ -1613,6 +1614,7 @@ nsChromeRegistry::ProcessManifestBuffer( + NS_NAMED_LITERAL_STRING(kAppVersion, "appversion"); + NS_NAMED_LITERAL_STRING(kOs, "os"); + NS_NAMED_LITERAL_STRING(kOsVersion, "osversion"); ++ NS_NAMED_LITERAL_STRING(kDesktop, "desktop"); + + nsCOMPtr<nsIIOService> io (do_GetIOService()); + if (!io) return NS_ERROR_FAILURE; +@@ -1656,6 +1658,7 @@ nsChromeRegistry::ProcessManifestBuffer( + } + + nsAutoString osVersion; ++ nsAutoString desktop; + #if defined(XP_WIN) + OSVERSIONINFO info = { sizeof(OSVERSIONINFO) }; + if (GetVersionEx(&info)) { +@@ -1663,6 +1666,7 @@ nsChromeRegistry::ProcessManifestBuffer( + info.dwMajorVersion, + info.dwMinorVersion); + } ++ desktop = NS_LITERAL_STRING("win"); + #elif defined(XP_MACOSX) + long majorVersion, minorVersion; + if ((Gestalt(gestaltSystemVersionMajor, &majorVersion) == noErr) && +@@ -1671,10 +1675,12 @@ nsChromeRegistry::ProcessManifestBuffer( + majorVersion, + minorVersion); + } ++ desktop = NS_LITERAL_STRING("macosx"); + #elif defined(MOZ_WIDGET_GTK2) + nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(), + gtk_major_version, + gtk_minor_version); ++ desktop = nsKDEUtils::kdeSession() ? NS_LITERAL_STRING("kde") : NS_LITERAL_STRING("gnome"); // TODO others? + #endif + + char *token; +@@ -1718,6 +1724,7 @@ nsChromeRegistry::ProcessManifestBuffer( + TriState stApp = eUnspecified; + TriState stOsVersion = eUnspecified; + TriState stOs = eUnspecified; ++ TriState stDesktop = eUnspecified; + + PRBool badFlag = PR_FALSE; + +@@ -1731,6 +1738,7 @@ nsChromeRegistry::ProcessManifestBuffer( + CheckFlag(kContentAccessible, wtoken, contentAccessible) || + CheckStringFlag(kApplication, wtoken, appID, stApp) || + CheckStringFlag(kOs, wtoken, osTarget, stOs) || ++ CheckStringFlag(kDesktop, wtoken, desktop, stDesktop) || + CheckVersionFlag(kOsVersion, wtoken, osVersion, vc, stOsVersion) || + CheckVersionFlag(kAppVersion, wtoken, appVersion, vc, stAppVersion)) + continue; +@@ -1742,7 +1750,7 @@ nsChromeRegistry::ProcessManifestBuffer( + } + + if (badFlag || stApp == eBad || stAppVersion == eBad || +- stOs == eBad || stOsVersion == eBad) ++ stOs == eBad || stOsVersion == eBad || stDesktop == eBad) + continue; + + nsCOMPtr<nsIURI> resolved; +@@ -1803,6 +1811,7 @@ nsChromeRegistry::ProcessManifestBuffer( + TriState stApp = eUnspecified; + TriState stOs = eUnspecified; + TriState stOsVersion = eUnspecified; ++ TriState stDesktop = eUnspecified; + + PRBool badFlag = PR_FALSE; + +@@ -1813,6 +1822,7 @@ nsChromeRegistry::ProcessManifestBuffer( + + if (CheckStringFlag(kApplication, wtoken, appID, stApp) || + CheckStringFlag(kOs, wtoken, osTarget, stOs) || ++ CheckStringFlag(kDesktop, wtoken, desktop, stDesktop) || + CheckVersionFlag(kOsVersion, wtoken, osVersion, vc, stOsVersion) || + CheckVersionFlag(kAppVersion, wtoken, appVersion, vc, stAppVersion)) + continue; +@@ -1824,7 +1834,7 @@ nsChromeRegistry::ProcessManifestBuffer( + } + + if (badFlag || stApp == eBad || stAppVersion == eBad || +- stOs == eBad || stOsVersion == eBad) ++ stOs == eBad || stOsVersion == eBad || stDesktop == eBad) + continue; + + nsCOMPtr<nsIURI> resolved; +@@ -1865,6 +1875,7 @@ nsChromeRegistry::ProcessManifestBuffer( + TriState stApp = eUnspecified; + TriState stOs = eUnspecified; + TriState stOsVersion = eUnspecified; ++ TriState stDesktop = eUnspecified; + + PRBool badFlag = PR_FALSE; + +@@ -1875,6 +1886,7 @@ nsChromeRegistry::ProcessManifestBuffer( + + if (CheckStringFlag(kApplication, wtoken, appID, stApp) || + CheckStringFlag(kOs, wtoken, osTarget, stOs) || ++ CheckStringFlag(kDesktop, wtoken, desktop, stDesktop) || + CheckVersionFlag(kOsVersion, wtoken, osVersion, vc, stOsVersion) || + CheckVersionFlag(kAppVersion, wtoken, appVersion, vc, stAppVersion)) + continue; +@@ -1886,7 +1898,7 @@ nsChromeRegistry::ProcessManifestBuffer( + } + + if (badFlag || stApp == eBad || stAppVersion == eBad || +- stOs == eBad || stOsVersion == eBad) ++ stOs == eBad || stOsVersion == eBad || stDesktop == eBad) + continue; + + nsCOMPtr<nsIURI> resolved; +@@ -1929,6 +1941,7 @@ nsChromeRegistry::ProcessManifestBuffer( + TriState stApp = eUnspecified; + TriState stOs = eUnspecified; + TriState stOsVersion = eUnspecified; ++ TriState stDesktop = eUnspecified; + + PRBool badFlag = PR_FALSE; + +@@ -1939,6 +1952,7 @@ nsChromeRegistry::ProcessManifestBuffer( + + if (CheckStringFlag(kApplication, wtoken, appID, stApp) || + CheckStringFlag(kOs, wtoken, osTarget, stOs) || ++ CheckStringFlag(kDesktop, wtoken, desktop, stDesktop) || + CheckVersionFlag(kOsVersion, wtoken, osVersion, vc, stOsVersion) || + CheckVersionFlag(kAppVersion, wtoken, appVersion, vc, stAppVersion)) + continue; +@@ -1950,7 +1964,7 @@ nsChromeRegistry::ProcessManifestBuffer( + } + + if (badFlag || stApp == eBad || stAppVersion == eBad || +- stOs == eBad || stOsVersion == eBad) ++ stOs == eBad || stOsVersion == eBad || stDesktop == eBad) + continue; + + nsCOMPtr<nsIURI> baseuri, overlayuri; +@@ -1985,6 +1999,7 @@ nsChromeRegistry::ProcessManifestBuffer( + TriState stApp = eUnspecified; + TriState stOs = eUnspecified; + TriState stOsVersion = eUnspecified; ++ TriState stDesktop = eUnspecified; + + PRBool badFlag = PR_FALSE; + +@@ -1995,6 +2010,7 @@ nsChromeRegistry::ProcessManifestBuffer( + + if (CheckStringFlag(kApplication, wtoken, appID, stApp) || + CheckStringFlag(kOs, wtoken, osTarget, stOs) || ++ CheckStringFlag(kDesktop, wtoken, desktop, stDesktop) || + CheckVersionFlag(kOsVersion, wtoken, osVersion, vc, stOsVersion) || + CheckVersionFlag(kAppVersion, wtoken, appVersion, vc, stAppVersion)) + continue; +@@ -2006,7 +2022,7 @@ nsChromeRegistry::ProcessManifestBuffer( + } + + if (badFlag || stApp == eBad || stAppVersion == eBad || +- stOs == eBad || stOsVersion == eBad) ++ stOs == eBad || stOsVersion == eBad || stDesktop == eBad) + continue; + + nsCOMPtr<nsIURI> baseuri, overlayuri; +@@ -2045,6 +2061,7 @@ nsChromeRegistry::ProcessManifestBuffer( + TriState stApp = eUnspecified; + TriState stOs = eUnspecified; + TriState stOsVersion = eUnspecified; ++ TriState stDesktop = eUnspecified; + + PRBool badFlag = PR_FALSE; + +@@ -2055,6 +2072,7 @@ nsChromeRegistry::ProcessManifestBuffer( + + if (CheckStringFlag(kApplication, wtoken, appID, stApp) || + CheckStringFlag(kOs, wtoken, osTarget, stOs) || ++ CheckStringFlag(kDesktop, wtoken, desktop, stDesktop) || + CheckVersionFlag(kOsVersion, wtoken, osVersion, vc, stOsVersion) || + CheckVersionFlag(kAppVersion, wtoken, appVersion, vc, stAppVersion)) + continue; +@@ -2066,7 +2084,7 @@ nsChromeRegistry::ProcessManifestBuffer( + } + + if (badFlag || stApp == eBad || stAppVersion == eBad || +- stOs == eBad || stOsVersion == eBad) ++ stOs == eBad || stOsVersion == eBad || stDesktop == eBad) + continue; + + nsCOMPtr<nsIURI> chromeuri, resolveduri; +@@ -2107,6 +2125,7 @@ nsChromeRegistry::ProcessManifestBuffer( + TriState stApp = eUnspecified; + TriState stOsVersion = eUnspecified; + TriState stOs = eUnspecified; ++ TriState stDesktop = eUnspecified; + + PRBool badFlag = PR_FALSE; + +@@ -2117,6 +2136,7 @@ nsChromeRegistry::ProcessManifestBuffer( + + if (CheckStringFlag(kApplication, wtoken, appID, stApp) || + CheckStringFlag(kOs, wtoken, osTarget, stOs) || ++ CheckStringFlag(kDesktop, wtoken, desktop, stDesktop) || + CheckVersionFlag(kOsVersion, wtoken, osVersion, vc, stOsVersion) || + CheckVersionFlag(kAppVersion, wtoken, appVersion, vc, stAppVersion)) + continue; +@@ -2128,7 +2148,7 @@ nsChromeRegistry::ProcessManifestBuffer( + } + + if (badFlag || stApp == eBad || stAppVersion == eBad || +- stOs == eBad || stOsVersion == eBad) ++ stOs == eBad || stOsVersion == eBad || stDesktop == eBad) + continue; + + nsDependentCString host(package); +--- a/modules/libpref/src/Makefile.in ++++ b/modules/libpref/src/Makefile.in +@@ -102,3 +102,5 @@ nsPrefService.$(OBJ_SUFFIX): nsPrefServi + @$(MAKE_DEPS_AUTO_CXX) + $(ELOG) $(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS:-O2=-O1) $(_VPATH_SRCS) + endif ++ ++LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre +--- a/modules/libpref/src/nsPrefService.cpp ++++ b/modules/libpref/src/nsPrefService.cpp +@@ -52,6 +52,7 @@ + #include "nsCOMArray.h" + #include "nsXPCOMCID.h" + #include "nsAutoPtr.h" ++#include "nsKDEUtils.h" + + #include "nsQuickSort.h" + #include "prmem.h" +@@ -615,7 +616,8 @@ pref_LoadPrefsInDir(nsIFile* aDir, char + return rv; + } + +-static nsresult pref_LoadPrefsInDirList(const char *listId) ++static nsresult pref_LoadPrefsInDirList(const char *listId, ++ char const *const *aSpecialFiles = NULL, PRUint32 aSpecialFilesCount = 0) + { + nsresult rv; + nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv)); +@@ -634,7 +636,7 @@ static nsresult pref_LoadPrefsInDirList( + nsCOMPtr<nsIFile> dir = do_QueryInterface(elem); + if (dir) { + // Do we care if a file provided by this process fails to load? +- pref_LoadPrefsInDir(dir, nsnull, 0); ++ pref_LoadPrefsInDir(dir, aSpecialFiles, aSpecialFilesCount); + } + } + } +@@ -685,6 +687,7 @@ static nsresult pref_InitInitialObjects( + #if defined(MOZ_WIDGET_PHOTON) + , "photon.js" + #endif ++ , "" // placeholder for KDE (empty is otherwise harmless) + #elif defined(XP_OS2) + "os2pref.js" + #elif defined(XP_BEOS) +@@ -692,6 +695,17 @@ static nsresult pref_InitInitialObjects( + #endif + }; + ++ if( nsKDEUtils::kdeSession()) { // TODO what if some setup actually requires the helper? ++ for( int i = 0; ++ i < NS_ARRAY_LENGTH(specialFiles); ++ ++i ) { ++ if( *specialFiles[ i ] == '\0' ) { ++ specialFiles[ i ] = "kde.js"; ++ break; ++ } ++ } ++ } ++ + rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, NS_ARRAY_LENGTH(specialFiles)); + if (NS_FAILED(rv)) { + NS_WARNING("Error parsing application default preferences."); +@@ -705,7 +719,7 @@ static nsresult pref_InitInitialObjects( + NS_WARNING("Error parsing application default preferences."); + } + +- rv = pref_LoadPrefsInDirList(NS_APP_PREFS_DEFAULTS_DIR_LIST); ++ rv = pref_LoadPrefsInDirList(NS_APP_PREFS_DEFAULTS_DIR_LIST, specialFiles, NS_ARRAY_LENGTH(specialFiles)); + NS_ENSURE_SUCCESS(rv, rv); + + NS_CreateServicesFromCategory(NS_PREFSERVICE_APPDEFAULTS_TOPIC_ID, +--- a/toolkit/components/downloads/src/Makefile.in ++++ b/toolkit/components/downloads/src/Makefile.in +@@ -97,3 +97,4 @@ include $(topsrcdir)/config/rules.mk + + EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) + ++LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre +--- a/toolkit/components/downloads/src/nsDownloadManager.cpp ++++ b/toolkit/components/downloads/src/nsDownloadManager.cpp +@@ -80,6 +80,10 @@ + #include <CoreFoundation/CoreFoundation.h> + #endif + ++#if defined(XP_UNIX) && !defined(XP_MACOSX) ++#include "nsKDEUtils.h" ++#endif ++ + #define DOWNLOAD_MANAGER_BUNDLE "chrome://mozapps/locale/downloads/downloads.properties" + #define DOWNLOAD_MANAGER_ALERT_ICON "chrome://mozapps/skin/downloads/downloadIcon.png" + #define PREF_BDM_SHOWALERTONCOMPLETE "browser.download.manager.showAlertOnComplete" +@@ -2165,6 +2169,15 @@ nsDownload::SetState(DownloadState aStat + pref->GetBoolPref(PREF_BDM_SHOWALERTONCOMPLETE, &showTaskbarAlert); + + if (showTaskbarAlert) { ++ if( nsKDEUtils::kdeSupport()) { ++ nsCStringArray command; ++ command.AppendCString( NS_LITERAL_CSTRING( "DOWNLOADFINISHED" )); ++ nsAutoString displayName; ++ GetDisplayName( displayName ); ++ command.AppendCString( nsCAutoString( ToNewUTF8String( displayName ))); ++ nsKDEUtils::command( command ); ++ } else { ++ // begin non-KDE block + PRInt32 alertInterval = 2000; + if (pref) + pref->GetIntPref(PREF_BDM_SHOWALERTINTERVAL, &alertInterval); +@@ -2200,6 +2213,7 @@ nsDownload::SetState(DownloadState aStat + EmptyString()); + } + } ++ } // end non-KDE block + } + #if (defined(XP_WIN) && !defined(WINCE)) || defined(XP_MACOSX) + nsCOMPtr<nsIFileURL> fileURL = do_QueryInterface(mTarget); +--- a/toolkit/content/jar.mn ++++ b/toolkit/content/jar.mn +@@ -49,6 +49,8 @@ toolkit.jar: + *+ content/global/bindings/colorpicker.xml (widgets/colorpicker.xml) + *+ content/global/bindings/datetimepicker.xml (widgets/datetimepicker.xml) + *+ content/global/bindings/dialog.xml (widgets/dialog.xml) ++*+ content/global/bindings/dialog-kde.xml (widgets/dialog-kde.xml) ++% override chrome://global/content/bindings/dialog.xml chrome://global/content/bindings/dialog-kde.xml desktop=kde + *+ content/global/bindings/editor.xml (widgets/editor.xml) + * content/global/bindings/expander.xml (widgets/expander.xml) + * content/global/bindings/filefield.xml (widgets/filefield.xml) +@@ -62,6 +64,8 @@ toolkit.jar: + *+ content/global/bindings/numberbox.xml (widgets/numberbox.xml) + *+ content/global/bindings/popup.xml (widgets/popup.xml) + *+ content/global/bindings/preferences.xml (widgets/preferences.xml) ++*+ content/global/bindings/preferences-kde.xml (widgets/preferences-kde.xml) ++% override chrome://global/content/bindings/preferences.xml chrome://global/content/bindings/preferences-kde.xml desktop=kde + *+ content/global/bindings/progressmeter.xml (widgets/progressmeter.xml) + *+ content/global/bindings/radio.xml (widgets/radio.xml) + *+ content/global/bindings/resizer.xml (widgets/resizer.xml) +--- a/toolkit/content/widgets/dialog-kde.xml ++++ b/toolkit/content/widgets/dialog-kde.xml +@@ -16,7 +16,7 @@ + + <xul:hbox class="dialog-button-box" anonid="buttons" + xbl:inherits="pack=buttonpack,align=buttonalign,dir=buttondir,orient=buttonorient" +-#ifdef XP_UNIX ++#ifdef XP_UNIX_GNOME + > + <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/> + <xul:button dlgtype="help" class="dialog-button" hidden="true"/> +@@ -25,6 +25,15 @@ + <xul:spacer anonid="spacer" flex="1"/> + <xul:button dlgtype="cancel" class="dialog-button"/> + <xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/> ++#elif XP_UNIX ++ pack="end"> ++ <xul:button dlgtype="help" class="dialog-button" hidden="true"/> ++ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> ++ <xul:spacer anonid="spacer" flex="1" hidden="true"/> ++ <xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/> ++ <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/> ++ <xul:button dlgtype="cancel" class="dialog-button"/> ++ <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/> + #else + pack="end"> + <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> +--- a/toolkit/content/widgets/preferences-kde.xml ++++ b/toolkit/content/widgets/preferences-kde.xml +@@ -573,7 +573,7 @@ + </xul:deck> + </xul:hbox> + <xul:hbox anonid="dlg-buttons" class="prefWindow-dlgbuttons" +-#ifdef XP_UNIX ++#ifdef XP_UNIX_GNOME + > + <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/> + <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/> +@@ -582,6 +582,15 @@ + <xul:spacer anonid="spacer" flex="1"/> + <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/> + <xul:button dlgtype="accept" class="dialog-button" icon="accept"/> ++#elif XP_UNIX ++ pack="end"> ++ <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/> ++ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> ++ <xul:spacer anonid="spacer" flex="1"/> ++ <xul:button dlgtype="accept" class="dialog-button" icon="accept"/> ++ <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/> ++ <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/> ++ <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/> + #else + pack="end"> + <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> +--- a/toolkit/system/unixproxy/Makefile.in ++++ b/toolkit/system/unixproxy/Makefile.in +@@ -58,6 +58,8 @@ REQUIRES = \ + mozgnome \ + $(NULL) + ++LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre ++ + EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) + + CPPSRCS = \ +--- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp ++++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp +@@ -49,6 +49,8 @@ + #include "nsPrintfCString.h" + #include "nsNetUtil.h" + #include "nsISupportsPrimitives.h" ++#include "nsVoidArray.h" ++#include "nsKDEUtils.h" + + class nsUnixSystemProxySettings : public nsISystemProxySettings { + public: +@@ -65,6 +67,7 @@ private: + PRBool IsProxyMode(const char* aMode); + nsresult SetProxyResultFromGConf(const char* aKeyBase, const char* aType, nsACString& aResult); + nsresult GetProxyFromGConf(const nsACString& aScheme, const nsACString& aHost, PRInt32 aPort, nsACString& aResult); ++ nsresult GetProxyFromKDE(const nsACString& aScheme, const nsACString& aHost, PRInt32 aPort, nsACString& aResult); + }; + + NS_IMPL_ISUPPORTS1(nsUnixSystemProxySettings, nsISystemProxySettings) +@@ -406,6 +409,9 @@ nsUnixSystemProxySettings::GetProxyForUR + rv = aURI->GetPort(&port); + NS_ENSURE_SUCCESS(rv, rv); + ++ if( nsKDEUtils::kdeSupport()) ++ return GetProxyFromKDE( scheme, host, port, aResult ); ++ + if (!mGConf) + return GetProxyFromEnvironment(scheme, host, port, aResult); + +@@ -426,3 +432,28 @@ static const nsModuleComponentInfo compo + }; + + NS_IMPL_NSGETMODULE(nsUnixProxyModule, components) ++ ++nsresult ++nsUnixSystemProxySettings::GetProxyFromKDE(const nsACString& aScheme, ++ const nsACString& aHost, ++ PRInt32 aPort, ++ nsACString& aResult) ++{ ++ nsCAutoString url; ++ url = aScheme; ++ url += "://"; ++ url += aHost; ++ if( aPort >= 0 ) ++ { ++ url += ":"; ++ url += nsPrintfCString("%d", aPort); ++ } ++ nsCStringArray command; ++ command.AppendCString( NS_LITERAL_CSTRING( "GETPROXY" )); ++ command.AppendCString( url ); ++ nsCStringArray result; ++ if( !nsKDEUtils::command( command, &result ) || result.Count() != 1 ) ++ return NS_ERROR_FAILURE; ++ aResult = *result[ 0 ]; ++ return NS_OK; ++} +--- a/toolkit/xre/Makefile.in ++++ b/toolkit/xre/Makefile.in +@@ -47,6 +47,8 @@ MODULE = xulapp + LIBRARY_NAME = xulapp_s + LIBXUL_LIBRARY = 1 + ++EXPORTS = nsKDEUtils.h ++ + REQUIRES = \ + appcomps \ + toolkitcomps \ +@@ -138,7 +140,7 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),beos) + CPPSRCS += nsNativeAppSupportBeOS.cpp + else + ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) +-CPPSRCS += nsNativeAppSupportUnix.cpp ++CPPSRCS += nsNativeAppSupportUnix.cpp nsKDEUtils.cpp + else + CPPSRCS += nsNativeAppSupportDefault.cpp + endif +--- /dev/null ++++ b/toolkit/xre/nsKDEUtils.cpp +@@ -0,0 +1,334 @@ ++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ ++/* ***** 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 Unix Native App Support. ++ * ++ * The Initial Developer of the Original Code is ++ * Mozilla Corporation. ++ * Portions created by the Initial Developer are Copyright (C) 2007 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either 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 ***** */ ++ ++#include "nsKDEUtils.h" ++#include "nsIWidget.h" ++ ++#include <gtk/gtk.h> ++ ++#include <limits.h> ++#include <stdio.h> ++#include <sys/wait.h> ++#include <unistd.h> ++#include <X11/Xlib.h> ++ ++//#define DEBUG_KDE ++#ifdef DEBUG_KDE ++#define KMOZILLAHELPER "kmozillahelper" ++#else ++// not need for lib64, it's a binary ++#define KMOZILLAHELPER "/usr/lib/mozilla/kmozillahelper" ++#endif ++ ++#define KMOZILLAHELPER_VERSION 6 ++#define MAKE_STR2( n ) #n ++#define MAKE_STR( n ) MAKE_STR2( n ) ++ ++static bool getKdeSession() ++ { ++ Display* dpy = XOpenDisplay( NULL ); ++ if( dpy == NULL ) ++ return false; ++ Atom kde_full_session = XInternAtom( dpy, "KDE_FULL_SESSION", True ); ++ bool kde = false; ++ if( kde_full_session != None ) ++ { ++ int cnt; ++ if( Atom* props = XListProperties( dpy, DefaultRootWindow( dpy ), &cnt )) ++ { ++ for( int i = 0; ++ i < cnt; ++ ++i ) ++ { ++ if( props[ i ] == kde_full_session ) ++ { ++ kde = true; ++#ifdef DEBUG_KDE ++ fprintf( stderr, "KDE SESSION %d\n", kde ); ++#endif ++ break; ++ } ++ } ++ XFree( props ); ++ } ++ } ++ XCloseDisplay( dpy ); ++ return kde; ++ } ++ ++static bool getKdeSupport() ++ { ++ nsCStringArray command; ++ command.AppendCString( NS_LITERAL_CSTRING( "CHECK" )); ++ command.AppendCString( NS_LITERAL_CSTRING( MAKE_STR( KMOZILLAHELPER_VERSION ))); ++ bool kde = nsKDEUtils::command( command ); ++#ifdef DEBUG_KDE ++ fprintf( stderr, "KDE RUNNING %d\n", kde ); ++#endif ++ return kde; ++ } ++ ++nsKDEUtils::nsKDEUtils() ++ : commandFile( NULL ) ++ , replyFile( NULL ) ++ { ++ } ++ ++nsKDEUtils::~nsKDEUtils() ++ { ++// closeHelper(); not actually useful, exiting will close the fd too ++ } ++ ++nsKDEUtils* nsKDEUtils::self() ++ { ++ static nsKDEUtils s; ++ return &s; ++ } ++ ++static bool helperRunning = false; ++static bool helperFailed = false; ++ ++bool nsKDEUtils::kdeSession() ++ { ++ static bool session = getKdeSession(); ++ return session; ++ } ++ ++bool nsKDEUtils::kdeSupport() ++ { ++ static bool support = kdeSession() && getKdeSupport(); ++ return support && helperRunning; ++ } ++ ++struct nsKDECommandData ++ { ++ FILE* file; ++ nsCStringArray* output; ++ GMainLoop* loop; ++ bool success; ++ }; ++ ++static gboolean kdeReadFunc( GIOChannel*, GIOCondition, gpointer data ) ++ { ++ nsKDECommandData* p = static_cast< nsKDECommandData* >( data ); ++ char buf[ 8192 ]; // TODO big enough ++ bool command_done = false; ++ bool command_failed = false; ++ while( !command_done && !command_failed && fgets( buf, 8192, p->file ) != NULL ) ++ { // TODO what if the kernel splits a line into two chunks? ++//#ifdef DEBUG_KDE ++// fprintf( stderr, "READ: %s %d\n", buf, feof( p->file )); ++//#endif ++ if( char* eol = strchr( buf, '\n' )) ++ *eol = '\0'; ++ command_done = ( strcmp( buf, "\\1" ) == 0 ); ++ command_failed = ( strcmp( buf, "\\0" ) == 0 ); ++ nsCAutoString line( buf ); ++ line.ReplaceSubstring( "\\n", "\n" ); ++ line.ReplaceSubstring( "\\" "\\", "\\" ); // \\ -> \ , i.e. unescape ++ if( p->output && !( command_done || command_failed )) ++ p->output->AppendCString( nsCString( buf )); // TODO utf8? ++ } ++ bool quit = false; ++ if( feof( p->file ) || command_failed ) ++ { ++ quit = true; ++ p->success = false; ++ } ++ if( command_done ) ++ { // reading one reply finished ++ quit = true; ++ p->success = true; ++ } ++ if( quit ) ++ { ++ if( p->loop ) ++ g_main_loop_quit( p->loop ); ++ return FALSE; ++ } ++ return TRUE; ++ } ++ ++bool nsKDEUtils::command( const nsCStringArray& command, nsCStringArray* output ) ++ { ++ return self()->internalCommand( command, NULL, false, output ); ++ } ++ ++bool nsKDEUtils::commandBlockUi( const nsCStringArray& command, const GtkWindow* parent, nsCStringArray* output ) ++ { ++ return self()->internalCommand( command, parent, true, output ); ++ } ++ ++bool nsKDEUtils::internalCommand( const nsCStringArray& command, const GtkWindow* parent, bool blockUi, ++ nsCStringArray* output ) ++ { ++ if( !startHelper()) ++ return false; ++ // if Gtk has meanwhile gotten a grab (bnc#555202, somehow the file dialog ++ // is called with a delay), then do not do anything, as this app would keep ++ // the grabs but block waiting for the helper, which would be unable to do ++ // anything because of the grab ++ if( blockUi && gdk_pointer_is_grabbed()) ++ return false; ++ feedCommand( command ); ++ // do not store the data in 'this' but in extra structure, just in case there ++ // is reentrancy (can there be? the event loop is re-entered) ++ nsKDECommandData data; ++ data.file = replyFile; ++ data.output = output; ++ data.success = false; ++ if( blockUi ) ++ { ++ data.loop = g_main_loop_new( NULL, FALSE ); ++ GtkWidget* window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); ++ if( parent && parent->group ) ++ gtk_window_group_add_window( parent->group, GTK_WINDOW( window )); ++ gtk_widget_realize( window ); ++ gtk_widget_set_sensitive( window, TRUE ); ++ gtk_grab_add( window ); ++ GIOChannel* channel = g_io_channel_unix_new( fileno( data.file )); ++ g_io_add_watch( channel, static_cast< GIOCondition >( G_IO_IN | G_IO_ERR | G_IO_HUP ), kdeReadFunc, &data ); ++ g_io_channel_unref( channel ); ++ g_main_loop_run( data.loop ); ++ g_main_loop_unref( data.loop ); ++ gtk_grab_remove( window ); ++ gtk_widget_destroy( window ); ++ } ++ else ++ { ++ data.loop = NULL; ++ while( kdeReadFunc( NULL, static_cast< GIOCondition >( 0 ), &data )) ++ ; ++ } ++ return data.success; ++ } ++ ++bool nsKDEUtils::startHelper() ++ { ++ if( helperRunning ) ++ return true; ++ if( helperFailed ) ++ return false; ++ helperFailed = true; ++ int fdcommand[ 2 ]; ++ int fdreply[ 2 ]; ++ if( pipe( fdcommand ) < 0 ) ++ return false; ++ if( pipe( fdreply ) < 0 ) ++ { ++ close( fdcommand[ 0 ] ); ++ close( fdcommand[ 1 ] ); ++ return false; ++ } ++ char* args[ 2 ] = { const_cast< char* >( KMOZILLAHELPER ), NULL }; ++ switch( fork()) ++ { ++ case -1: ++ { ++ close( fdcommand[ 0 ] ); ++ close( fdcommand[ 1 ] ); ++ close( fdreply[ 0 ] ); ++ close( fdreply[ 1 ] ); ++ return false; ++ } ++ case 0: // child ++ { ++ if( dup2( fdcommand[ 0 ], STDIN_FILENO ) < 0 ) ++ _exit( 1 ); ++ if( dup2( fdreply[ 1 ], STDOUT_FILENO ) < 0 ) ++ _exit( 1 ); ++ int maxfd = 1024; // close all other fds ++ struct rlimit rl; ++ if( getrlimit( RLIMIT_NOFILE, &rl ) == 0 ) ++ maxfd = rl.rlim_max; ++ for( int i = 3; ++ i < maxfd; ++ ++i ) ++ close( i ); ++#ifdef DEBUG_KDE ++ execvp( KMOZILLAHELPER, args ); ++#else ++ execv( KMOZILLAHELPER, args ); ++#endif ++ _exit( 1 ); // failed ++ } ++ default: // parent ++ { ++ commandFile = fdopen( fdcommand[ 1 ], "w" ); ++ replyFile = fdopen( fdreply[ 0 ], "r" ); ++ close( fdcommand[ 0 ] ); ++ close( fdreply[ 1 ] ); ++ if( commandFile == NULL || replyFile == NULL ) ++ { ++ closeHelper(); ++ return false; ++ } ++ // ok, helper ready, getKdeRunning() will check if it works ++ } ++ } ++ helperFailed = false; ++ helperRunning = true; ++ return true; ++ } ++ ++void nsKDEUtils::closeHelper() ++ { ++ if( commandFile != NULL ) ++ fclose( commandFile ); // this will also make the helper quit ++ if( replyFile != NULL ) ++ fclose( replyFile ); ++ helperRunning = false; ++ } ++ ++void nsKDEUtils::feedCommand( const nsCStringArray& command ) ++ { ++ for( int i = 0; ++ i < command.Count(); ++ ++i ) ++ { ++ nsCString line = *command[ i ]; ++ line.ReplaceSubstring( "\\", "\\" "\\" ); // \ -> \\ , i.e. escape ++ line.ReplaceSubstring( "\n", "\\n" ); ++#ifdef DEBUG_KDE ++ fprintf( stderr, "COMM: %s\n", line.get()); ++#endif ++ fputs( line.get(), commandFile ); ++ fputs( "\n", commandFile ); ++ } ++ fputs( "\\E\n", commandFile ); // done as \E, so it cannot happen in normal data ++ fflush( commandFile ); ++ } +--- /dev/null ++++ b/toolkit/xre/nsKDEUtils.h +@@ -0,0 +1,77 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- ++ * ++ * ***** 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 Communicator client code. ++ * ++ * The Initial Developer of the Original Code is ++ * Netscape Communications Corporation. ++ * Portions created by the Initial Developer are Copyright (C) 1998 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * ++ * 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 ***** */ ++ ++#ifndef nsKDEUtils_h__ ++#define nsKDEUtils_h__ ++ ++#include "nsStringGlue.h" ++#include "nsVoidArray.h" ++#include <stdio.h> ++ ++typedef struct _GtkWindow GtkWindow; ++ ++class NS_EXPORT nsKDEUtils ++ { ++ public: ++ /* Returns true if running inside a KDE session (regardless of whether there is KDE ++ support available for Firefox). This should be used e.g. when determining ++ dialog button order but not for code that requires the KDE support. */ ++ static bool kdeSession(); ++ /* Returns true if running inside a KDE session and KDE support is available ++ for Firefox. This should be used everywhere where the external helper is needed. */ ++ static bool kdeSupport(); ++ /* Executes the given helper command, returns true if helper returned success. */ ++ static bool command( const nsCStringArray& command, nsCStringArray* output = NULL ); ++ /* Like command(), but additionally blocks the parent widget like if there was ++ a modal dialog shown and enters the event loop (i.e. there are still paint updates, ++ this is for commands that take long). */ ++ static bool commandBlockUi( const nsCStringArray& command, const GtkWindow* parent, nsCStringArray* output = NULL ); ++ private: ++ nsKDEUtils(); ++ ~nsKDEUtils(); ++ static nsKDEUtils* self(); ++ bool startHelper(); ++ void closeHelper(); ++ void feedCommand( const nsCStringArray& command ); ++ bool internalCommand( const nsCStringArray& command, const GtkWindow* parent, bool isParent, ++ nsCStringArray* output ); ++ FILE* commandFile; ++ FILE* replyFile; ++ }; ++ ++#endif // nsKDEUtils +--- a/uriloader/exthandler/Makefile.in ++++ b/uriloader/exthandler/Makefile.in +@@ -107,8 +107,9 @@ endif + LOCAL_INCLUDES = -I$(srcdir) + + ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) +-OSHELPER += nsGNOMERegistry.cpp ++OSHELPER += nsCommonRegistry.cpp nsGNOMERegistry.cpp nsKDERegistry.cpp + OSHELPER += nsMIMEInfoUnix.cpp ++LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre + endif + + ifeq ($(MOZ_WIDGET_TOOLKIT),qt) +--- /dev/null ++++ b/uriloader/exthandler/unix/nsCommonRegistry.cpp +@@ -0,0 +1,87 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* ***** 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 the GNOME helper app implementation. ++ * ++ * The Initial Developer of the Original Code is ++ * IBM Corporation. ++ * Portions created by the Initial Developer are Copyright (C) 2003 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * Brian Ryner <bryner@brianryner.com> (Original Author) ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either 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 ***** */ ++ ++#include "nsCommonRegistry.h" ++ ++#include "nsGNOMERegistry.h" ++#include "nsKDERegistry.h" ++#include "nsString.h" ++#include "nsVoidArray.h" ++#include "nsKDEUtils.h" ++ ++/* static */ PRBool ++nsCommonRegistry::HandlerExists(const char *aProtocolScheme) ++{ ++ if( nsKDEUtils::kdeSupport()) ++ return nsKDERegistry::HandlerExists( aProtocolScheme ); ++ return nsGNOMERegistry::HandlerExists( aProtocolScheme ); ++} ++ ++/* static */ nsresult ++nsCommonRegistry::LoadURL(nsIURI *aURL) ++{ ++ if( nsKDEUtils::kdeSupport()) ++ return nsKDERegistry::LoadURL( aURL ); ++ return nsGNOMERegistry::LoadURL( aURL ); ++} ++ ++/* static */ void ++nsCommonRegistry::GetAppDescForScheme(const nsACString& aScheme, ++ nsAString& aDesc) ++{ ++ if( nsKDEUtils::kdeSupport()) ++ return nsKDERegistry::GetAppDescForScheme( aScheme, aDesc ); ++ return nsGNOMERegistry::GetAppDescForScheme( aScheme, aDesc ); ++} ++ ++ ++/* static */ already_AddRefed<nsMIMEInfoBase> ++nsCommonRegistry::GetFromExtension(const nsACString& aFileExt) ++{ ++ if( nsKDEUtils::kdeSupport()) ++ return nsKDERegistry::GetFromExtension( aFileExt ); ++ return nsGNOMERegistry::GetFromExtension( aFileExt ); ++} ++ ++/* static */ already_AddRefed<nsMIMEInfoBase> ++nsCommonRegistry::GetFromType(const nsACString& aMIMEType) ++{ ++ if( nsKDEUtils::kdeSupport()) ++ return nsKDERegistry::GetFromType( aMIMEType ); ++ return nsGNOMERegistry::GetFromType( aMIMEType ); ++} +--- /dev/null ++++ b/uriloader/exthandler/unix/nsCommonRegistry.h +@@ -0,0 +1,56 @@ ++/* ***** 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 the GNOME helper app implementation. ++ * ++ * The Initial Developer of the Original Code is ++ * IBM Corporation. ++ * Portions created by the Initial Developer are Copyright (C) 2003 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * Brian Ryner <bryner@brianryner.com> (Original Author) ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either 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 ***** */ ++ ++#include "nsIURI.h" ++#include "nsCOMPtr.h" ++ ++class nsMIMEInfoBase; ++ ++class nsCommonRegistry ++{ ++ public: ++ static PRBool HandlerExists(const char *aProtocolScheme); ++ ++ static nsresult LoadURL(nsIURI *aURL); ++ ++ static void GetAppDescForScheme(const nsACString& aScheme, ++ nsAString& aDesc); ++ ++ static already_AddRefed<nsMIMEInfoBase> GetFromExtension(const nsACString& aFileExt); ++ ++ static already_AddRefed<nsMIMEInfoBase> GetFromType(const nsACString& aMIMEType); ++}; +--- /dev/null ++++ b/uriloader/exthandler/unix/nsKDERegistry.cpp +@@ -0,0 +1,119 @@ ++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* ***** 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 the GNOME helper app implementation. ++ * ++ * The Initial Developer of the Original Code is ++ * IBM Corporation. ++ * Portions created by the Initial Developer are Copyright (C) 2003 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * Brian Ryner <bryner@brianryner.com> (Original Author) ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either 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 ***** */ ++ ++#include "nsKDERegistry.h" ++#include "prlink.h" ++#include "prmem.h" ++#include "nsString.h" ++#include "nsILocalFile.h" ++#include "nsMIMEInfoUnix.h" ++#include "nsAutoPtr.h" ++#include "nsKDEUtils.h" ++ ++/* static */ PRBool ++nsKDERegistry::HandlerExists(const char *aProtocolScheme) ++{ ++ nsCStringArray command; ++ command.AppendCString( NS_LITERAL_CSTRING( "HANDLEREXISTS" )); ++ command.AppendCString( nsCAutoString( aProtocolScheme )); ++ return nsKDEUtils::command( command ); ++} ++ ++/* static */ nsresult ++nsKDERegistry::LoadURL(nsIURI *aURL) ++{ ++ nsCStringArray command; ++ command.AppendCString( NS_LITERAL_CSTRING( "OPEN" )); ++ nsCString url; ++ aURL->GetSpec( url ); ++ command.AppendCString( url ); ++ return nsKDEUtils::command( command ); ++} ++ ++/* static */ void ++nsKDERegistry::GetAppDescForScheme(const nsACString& aScheme, ++ nsAString& aDesc) ++{ ++ nsCStringArray command; ++ command.AppendCString( NS_LITERAL_CSTRING( "GETAPPDESCFORSCHEME" )); ++ command.AppendCString( aScheme ); ++ nsCStringArray output; ++ if( nsKDEUtils::command( command, &output ) && output.Count() == 1 ) ++ CopyUTF8toUTF16( *output[ 0 ], aDesc ); ++} ++ ++ ++/* static */ already_AddRefed<nsMIMEInfoBase> ++nsKDERegistry::GetFromExtension(const nsACString& aFileExt) ++{ ++ NS_ASSERTION(aFileExt[0] != '.', "aFileExt shouldn't start with a dot"); ++ nsCStringArray command; ++ command.AppendCString( NS_LITERAL_CSTRING( "GETFROMEXTENSION" )); ++ command.AppendCString( aFileExt ); ++ return GetFromHelper( command ); ++} ++ ++/* static */ already_AddRefed<nsMIMEInfoBase> ++nsKDERegistry::GetFromType(const nsACString& aMIMEType) ++{ ++ nsCStringArray command; ++ command.AppendCString( NS_LITERAL_CSTRING( "GETFROMTYPE" )); ++ command.AppendCString( aMIMEType ); ++ return GetFromHelper( command ); ++} ++ ++/* static */ already_AddRefed<nsMIMEInfoBase> ++nsKDERegistry::GetFromHelper(const nsCStringArray& command) ++{ ++ nsCStringArray output; ++ if( nsKDEUtils::command( command, &output ) && output.Count() == 3 ) ++ { ++ nsCString mimetype = *output[ 0 ]; ++ nsRefPtr<nsMIMEInfoUnix> mimeInfo = new nsMIMEInfoUnix( mimetype ); ++ NS_ENSURE_TRUE(mimeInfo, nsnull); ++ nsCString description = *output[ 1 ]; ++ mimeInfo->SetDescription(NS_ConvertUTF8toUTF16(description)); ++ nsCString handlerAppName = *output[ 2 ]; ++ mimeInfo->SetDefaultDescription(NS_ConvertUTF8toUTF16(handlerAppName)); ++ mimeInfo->SetPreferredAction(nsIMIMEInfo::useSystemDefault); ++ nsMIMEInfoBase* retval; ++ NS_ADDREF((retval = mimeInfo)); ++ return retval; ++ } ++ return nsnull; ++} +--- /dev/null ++++ b/uriloader/exthandler/unix/nsKDERegistry.h +@@ -0,0 +1,61 @@ ++/* ***** 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 the GNOME helper app implementation. ++ * ++ * The Initial Developer of the Original Code is ++ * IBM Corporation. ++ * Portions created by the Initial Developer are Copyright (C) 2003 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * Brian Ryner <bryner@brianryner.com> (Original Author) ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either 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 ***** */ ++ ++#include "nsIURI.h" ++#include "nsCOMPtr.h" ++ ++class nsMIMEInfoBase; ++class nsCAutoString; ++class nsCStringArray; ++ ++class nsKDERegistry ++{ ++ public: ++ static PRBool HandlerExists(const char *aProtocolScheme); ++ ++ static nsresult LoadURL(nsIURI *aURL); ++ ++ static void GetAppDescForScheme(const nsACString& aScheme, ++ nsAString& aDesc); ++ ++ static already_AddRefed<nsMIMEInfoBase> GetFromExtension(const nsACString& aFileExt); ++ ++ static already_AddRefed<nsMIMEInfoBase> GetFromType(const nsACString& aMIMEType); ++ private: ++ static already_AddRefed<nsMIMEInfoBase> GetFromHelper(const nsCStringArray& command); ++ ++}; +--- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp ++++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp +@@ -45,17 +45,20 @@ + #endif + + #include "nsMIMEInfoUnix.h" +-#include "nsGNOMERegistry.h" ++#include "nsCommonRegistry.h" + #include "nsIGnomeVFSService.h" + #include "nsAutoPtr.h" + #ifdef MOZ_ENABLE_DBUS + #include "nsDBusHandlerApp.h" + #endif ++#if defined(XP_UNIX) && !defined(XP_MACOSX) ++#include "nsKDEUtils.h" ++#endif + + nsresult + nsMIMEInfoUnix::LoadUriInternal(nsIURI * aURI) + { +- nsresult rv = nsGNOMERegistry::LoadURL(aURI); ++ nsresult rv = nsCommonRegistry::LoadURL(aURI); + #if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS) + if (NS_FAILED(rv)){ + HildonURIAction *action = hildon_uri_get_default_action(mType.get(), nsnull); +@@ -75,11 +78,11 @@ NS_IMETHODIMP + nsMIMEInfoUnix::GetHasDefaultHandler(PRBool *_retval) + { + *_retval = PR_FALSE; +- nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromType(mType); ++ nsRefPtr<nsMIMEInfoBase> mimeInfo = nsCommonRegistry::GetFromType(mType); + if (!mimeInfo) { + nsCAutoString ext; + GetPrimaryExtension(ext); +- mimeInfo = nsGNOMERegistry::GetFromExtension(ext); ++ mimeInfo = nsCommonRegistry::GetFromExtension(ext); + } + if (mimeInfo) + *_retval = PR_TRUE; +@@ -105,6 +108,25 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns + { + nsCAutoString nativePath; + aFile->GetNativePath(nativePath); ++ ++ if( nsKDEUtils::kdeSupport()) ++ { ++ PRBool supports; ++ if( NS_SUCCEEDED( GetHasDefaultHandler( &supports )) && supports ) ++ { ++ nsCStringArray command; ++ command.AppendCString( NS_LITERAL_CSTRING( "OPEN" )); ++ command.AppendCString( nativePath ); ++ command.AppendCString( NS_LITERAL_CSTRING( "MIMETYPE" )); ++ command.AppendCString( mType ); ++ if( nsKDEUtils::command( command )) ++ return NS_OK; ++ } ++ if (!mDefaultApplication) ++ return NS_ERROR_FILE_NOT_FOUND; ++ ++ return LaunchWithIProcess(mDefaultApplication, nativePath); ++ } + + #if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS) + if(NS_SUCCEEDED(LaunchDefaultWithDBus(PromiseFlatCString(nativePath).get()))) +@@ -120,7 +142,7 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns + + // If we haven't got an app we try to get a valid one by searching for the + // extension mapped type +- nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromExtension(nativePath); ++ nsRefPtr<nsMIMEInfoBase> mimeInfo = nsCommonRegistry::GetFromExtension(nativePath); + if (mimeInfo) { + nsCAutoString type; + mimeInfo->GetType(type); +--- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp ++++ b/uriloader/exthandler/unix/nsOSHelperAppService.cpp +@@ -44,7 +44,7 @@ + #include "nsOSHelperAppService.h" + #include "nsMIMEInfoUnix.h" + #ifdef MOZ_WIDGET_GTK2 +-#include "nsGNOMERegistry.h" ++#include "nsCommonRegistry.h" + #endif + #include "nsISupports.h" + #include "nsString.h" +@@ -1210,7 +1210,7 @@ nsresult nsOSHelperAppService::OSProtoco + + #ifdef MOZ_WIDGET_GTK2 + // Check the GConf registry for a protocol handler +- *aHandlerExists = nsGNOMERegistry::HandlerExists(aProtocolScheme); ++ *aHandlerExists = nsCommonRegistry::HandlerExists(aProtocolScheme); + #ifdef MOZ_PLATFORM_MAEMO + *aHandlerExists = nsMIMEInfoUnix::HandlerExists(aProtocolScheme); + #endif +@@ -1222,7 +1222,7 @@ nsresult nsOSHelperAppService::OSProtoco + NS_IMETHODIMP nsOSHelperAppService::GetApplicationDescription(const nsACString& aScheme, nsAString& _retval) + { + #ifdef MOZ_WIDGET_GTK2 +- nsGNOMERegistry::GetAppDescForScheme(aScheme, _retval); ++ nsCommonRegistry::GetAppDescForScheme(aScheme, _retval); + return _retval.IsEmpty() ? NS_ERROR_NOT_AVAILABLE : NS_OK; + #else + return NS_ERROR_NOT_AVAILABLE; +@@ -1318,7 +1318,7 @@ nsOSHelperAppService::GetFromExtension(c + + #ifdef MOZ_WIDGET_GTK2 + LOG(("Looking in GNOME registry\n")); +- nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromExtension(aFileExt).get(); ++ nsMIMEInfoBase *gnomeInfo = nsCommonRegistry::GetFromExtension(aFileExt).get(); + if (gnomeInfo) { + LOG(("Got MIMEInfo from GNOME registry\n")); + return gnomeInfo; +@@ -1444,7 +1444,7 @@ nsOSHelperAppService::GetFromType(const + // get back a MIMEInfo without any extensions set. In that case we'll have + // to look in our mime.types files for the extensions. + LOG(("Looking in GNOME registry\n")); +- gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType).get(); ++ gnomeInfo = nsCommonRegistry::GetFromType(aMIMEType).get(); + if (gnomeInfo && gnomeInfo->HasExtensions()) { + LOG(("Got MIMEInfo from GNOME registry, and it has extensions set\n")); + return gnomeInfo; +--- a/widget/src/gtk2/Makefile.in ++++ b/widget/src/gtk2/Makefile.in +@@ -190,3 +190,6 @@ INCLUDES += \ + -I$(srcdir)/../xpwidgets \ + -I$(topsrcdir)/other-licenses/atk-1.0 \ + $(NULL) ++ ++LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre ++ +--- a/widget/src/gtk2/nsFilePicker.cpp ++++ b/widget/src/gtk2/nsFilePicker.cpp +@@ -36,6 +36,7 @@ + * ***** END LICENSE BLOCK ***** */ + + #include <gtk/gtk.h> ++#include <gdk/gdkx.h> + + #include "nsIFileURL.h" + #include "nsIURI.h" +@@ -55,6 +56,7 @@ + + #include "nsFilePicker.h" + #include "nsAccessibilityHelper.h" ++#include "nsKDEUtils.h" + + #ifdef MOZ_PLATFORM_MAEMO + #include <hildon-fm-2/hildon/hildon-file-chooser-dialog.h> +@@ -275,7 +277,9 @@ nsFilePicker::AppendFilter(const nsAStri + { + if (aFilter.EqualsLiteral("..apps")) { + // No platform specific thing we can do here, really.... +- return NS_OK; ++ // Unless it's KDE. ++ if( mMode != modeOpen || !nsKDEUtils::kdeSupport()) ++ return NS_OK; + } + + nsCAutoString filter, name; +@@ -423,6 +427,9 @@ confirm_overwrite_file(GtkWidget *parent + NS_IMETHODIMP + nsFilePicker::Show(PRInt16 *aReturn) + { ++ if( nsKDEUtils::kdeSupport()) ++ return kdeFileDialog( aReturn ); ++ + NS_ENSURE_ARG_POINTER(aReturn); + + nsXPIDLCString title; +@@ -573,3 +580,229 @@ nsFilePicker::Show(PRInt16 *aReturn) + + return NS_OK; + } ++ ++nsCString nsFilePicker::kdeMakeFilter( int index ) ++ { ++ nsCString buf = mFilters[ index ]; ++ for( PRUint32 i = 0; ++ i < buf.Length(); ++ ++i ) ++ if( buf[ i ] == ';' ) // KDE separates just using spaces ++ buf.SetCharAt( ' ', i ); ++ if (!mFilterNames[index].IsEmpty()) ++ { ++ buf += "|"; ++ buf += mFilterNames[index].get(); ++ } ++ return buf; ++ } ++ ++static PRInt32 windowToXid( nsIWidget* widget ) ++ { ++ GtkWindow *parent_widget = get_gtk_window_for_nsiwidget( widget ); ++ GdkWindow* gdk_window = gtk_widget_get_window( gtk_widget_get_toplevel( GTK_WIDGET( parent_widget ))); ++ return GDK_WINDOW_XID( gdk_window ); ++ } ++ ++NS_IMETHODIMP nsFilePicker::kdeFileDialog(PRInt16 *aReturn) ++ { ++ NS_ENSURE_ARG_POINTER(aReturn); ++ ++ if( mMode == modeOpen && mFilters.Length() == 1 && mFilters[ 0 ].EqualsLiteral( "..apps" )) ++ return kdeAppsDialog( aReturn ); ++ ++ nsXPIDLCString title; ++ title.Adopt(ToNewUTF8String(mTitle)); ++ ++ const char* arg = NULL; ++ if( mAllowURLs ) ++ { ++ switch( mMode ) ++ { ++ case nsIFilePicker::modeOpen: ++ case nsIFilePicker::modeOpenMultiple: ++ arg = "GETOPENURL"; ++ break; ++ case nsIFilePicker::modeSave: ++ arg = "GETSAVEURL"; ++ break; ++ case nsIFilePicker::modeGetFolder: ++ arg = "GETDIRECTORYURL"; ++ break; ++ } ++ } ++ else ++ { ++ switch( mMode ) ++ { ++ case nsIFilePicker::modeOpen: ++ case nsIFilePicker::modeOpenMultiple: ++ arg = "GETOPENFILENAME"; ++ break; ++ case nsIFilePicker::modeSave: ++ arg = "GETSAVEFILENAME"; ++ break; ++ case nsIFilePicker::modeGetFolder: ++ arg = "GETDIRECTORYFILENAME"; ++ break; ++ } ++ } ++ ++ nsCAutoString directory; ++ if (mDisplayDirectory) { ++ mDisplayDirectory->GetNativePath(directory); ++ } else if (mPrevDisplayDirectory) { ++ mPrevDisplayDirectory->GetNativePath(directory); ++ } ++ ++ nsCAutoString startdir; ++ if (!directory.IsEmpty()) { ++ startdir = directory; ++ } ++ if (mMode == nsIFilePicker::modeSave) { ++ if( !startdir.IsEmpty()) ++ { ++ startdir += "/"; ++ startdir += ToNewUTF8String(mDefault); ++ } ++ else ++ startdir = ToNewUTF8String(mDefault); ++ } ++ if( startdir.IsEmpty()) ++ startdir = "."; ++ ++ nsCAutoString filters; ++ PRInt32 count = mFilters.Length(); ++ if( count == 0 ) //just in case ++ filters = "*"; ++ else ++ { ++ filters = kdeMakeFilter( 0 ); ++ for (PRInt32 i = 1; i < count; ++i) ++ { ++ filters += "\n"; ++ filters += kdeMakeFilter( i ); ++ } ++ } ++ ++ nsCStringArray command; ++ command.AppendCString( nsCAutoString( arg )); ++ command.AppendCString( startdir ); ++ if( mMode != nsIFilePicker::modeGetFolder ) ++ { ++ command.AppendCString( filters ); ++ nsCAutoString selected; ++ selected.AppendInt( mSelectedType ); ++ command.AppendCString( selected ); ++ } ++ command.AppendCString( title ); ++ if( mMode == nsIFilePicker::modeOpenMultiple ) ++ command.AppendCString( NS_LITERAL_CSTRING( "MULTIPLE" )); ++ if( PRInt32 xid = windowToXid( mParentWidget )) ++ { ++ command.AppendCString( NS_LITERAL_CSTRING( "PARENT" )); ++ nsCAutoString parent; ++ parent.AppendInt( xid ); ++ command.AppendCString( parent ); ++ } ++ ++ nsCStringArray output; ++ if( nsKDEUtils::commandBlockUi( command, get_gtk_window_for_nsiwidget( mParentWidget ), &output )) ++ { ++ *aReturn = nsIFilePicker::returnOK; ++ mFiles.Clear(); ++ if( mMode != nsIFilePicker::modeGetFolder ) ++ { ++ mSelectedType = atoi( output[ 0 ]->get()); ++ output.RemoveCStringAt( 0 ); ++ } ++ if (mMode == nsIFilePicker::modeOpenMultiple) ++ { ++ mFileURL.Truncate(); ++ PRUint32 count = output.Count(); ++ for( PRUint32 i = 0; ++ i < count; ++ ++i ) ++ { ++ nsCOMPtr<nsILocalFile> localfile; ++ nsresult rv = NS_NewNativeLocalFile( *output[ i ], ++ PR_FALSE, ++ getter_AddRefs(localfile)); ++ if (NS_SUCCEEDED(rv)) ++ mFiles.AppendObject(localfile); ++ } ++ } ++ else ++ { ++ if( output.Count() == 0 ) ++ mFileURL = nsCString(); ++ else if( mAllowURLs ) ++ mFileURL = *output[ 0 ]; ++ else // GetFile() actually requires it to be url even for local files :-/ ++ { ++ mFileURL = nsCString( "file://" ); ++ mFileURL.Append( *output[ 0 ] ); ++ } ++ } ++ // Remember last used directory. ++ nsCOMPtr<nsILocalFile> file; ++ GetFile(getter_AddRefs(file)); ++ if (file) { ++ nsCOMPtr<nsIFile> dir; ++ file->GetParent(getter_AddRefs(dir)); ++ nsCOMPtr<nsILocalFile> localDir(do_QueryInterface(dir)); ++ if (localDir) { ++ localDir.swap(mPrevDisplayDirectory); ++ } ++ } ++ if (mMode == nsIFilePicker::modeSave) ++ { ++ nsCOMPtr<nsILocalFile> file; ++ GetFile(getter_AddRefs(file)); ++ if (file) ++ { ++ PRBool exists = PR_FALSE; ++ file->Exists(&exists); ++ if (exists) // TODO do overwrite check in the helper app ++ *aReturn = nsIFilePicker::returnReplace; ++ } ++ } ++ } ++ else ++ { ++ *aReturn = nsIFilePicker::returnCancel; ++ } ++ return NS_OK; ++ } ++ ++ ++NS_IMETHODIMP nsFilePicker::kdeAppsDialog(PRInt16 *aReturn) ++ { ++ NS_ENSURE_ARG_POINTER(aReturn); ++ ++ nsXPIDLCString title; ++ title.Adopt(ToNewUTF8String(mTitle)); ++ ++ nsCStringArray command; ++ command.AppendCString( NS_LITERAL_CSTRING( "APPSDIALOG" )); ++ command.AppendCString( title ); ++ if( PRInt32 xid = windowToXid( mParentWidget )) ++ { ++ command.AppendCString( NS_LITERAL_CSTRING( "PARENT" )); ++ nsCAutoString parent; ++ parent.AppendInt( xid ); ++ command.AppendCString( parent ); ++ } ++ ++ nsCStringArray output; ++ if( nsKDEUtils::commandBlockUi( command, get_gtk_window_for_nsiwidget( mParentWidget ), &output )) ++ { ++ *aReturn = nsIFilePicker::returnOK; ++ mFileURL = output.Count() > 0 ? *output[ 0 ] : nsCString(); ++ } ++ else ++ { ++ *aReturn = nsIFilePicker::returnCancel; ++ } ++ return NS_OK; ++ } +--- a/widget/src/gtk2/nsFilePicker.h ++++ b/widget/src/gtk2/nsFilePicker.h +@@ -94,6 +94,12 @@ protected: + + private: + static nsILocalFile *mPrevDisplayDirectory; ++ ++ bool kdeRunning(); ++ bool getKdeRunning(); ++ NS_IMETHODIMP kdeFileDialog(PRInt16 *aReturn); ++ NS_IMETHODIMP kdeAppsDialog(PRInt16 *aReturn); ++ nsCString kdeMakeFilter( int index ); + }; + + #endif +--- a/xpcom/io/Makefile.in ++++ b/xpcom/io/Makefile.in +@@ -200,6 +200,7 @@ endif + endif + + LOCAL_INCLUDES = -I.. ++LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre + + ifeq ($(MOZ_PLATFORM_MAEMO), 5) + CFLAGS += $(MOZ_DBUS_CFLAGS) $(MOZ_PLATFORM_MAEMO_CFLAGS) +--- a/xpcom/io/nsLocalFileUnix.cpp ++++ b/xpcom/io/nsLocalFileUnix.cpp +@@ -84,6 +84,7 @@ + + #ifdef MOZ_WIDGET_GTK2 + #include "nsIGnomeVFSService.h" ++#include "nsKDEUtils.h" + #endif + + #if (MOZ_PLATFORM_MAEMO == 5) +@@ -1632,16 +1633,13 @@ NS_IMETHODIMP + nsLocalFile::Reveal() + { + #ifdef MOZ_WIDGET_GTK2 +- nsCOMPtr<nsIGnomeVFSService> vfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID); +- if (!vfs) +- return NS_ERROR_FAILURE; +- ++ nsCAutoString url; + PRBool isDirectory; + if (NS_FAILED(IsDirectory(&isDirectory))) + return NS_ERROR_FAILURE; + + if (isDirectory) { +- return vfs->ShowURIForInput(mPath); ++ url = mPath; + } else { + nsCOMPtr<nsIFile> parentDir; + nsCAutoString dirPath; +@@ -1650,8 +1648,21 @@ nsLocalFile::Reveal() + if (NS_FAILED(parentDir->GetNativePath(dirPath))) + return NS_ERROR_FAILURE; + +- return vfs->ShowURIForInput(dirPath); ++ url = dirPath; + } ++ ++ if( nsKDEUtils::kdeSupport()) { ++ nsCStringArray command; ++ command.AppendCString( NS_LITERAL_CSTRING( "OPEN" )); ++ command.AppendCString( url ); ++ return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; ++ } ++ ++ nsCOMPtr<nsIGnomeVFSService> vfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID); ++ if (!vfs) ++ return NS_ERROR_FAILURE; ++ return vfs->ShowURIForInput(url); ++ + #else + return NS_ERROR_FAILURE; + #endif +@@ -1679,6 +1690,13 @@ nsLocalFile::Launch() + return NS_ERROR_FAILURE; + return NS_OK; + #else ++ if( nsKDEUtils::kdeSupport()) { ++ nsCStringArray command; ++ command.AppendCString( NS_LITERAL_CSTRING( "OPEN" )); ++ command.AppendCString( mPath ); ++ return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; ++ } ++ + nsCOMPtr<nsIGnomeVFSService> vfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID); + if (!vfs) + return NS_ERROR_FAILURE; --- firefox-3.6.18+build2+nobinonly.orig/debian/patches/bz460917_att350845_reload_new_plugins.patch +++ firefox-3.6.18+build2+nobinonly/debian/patches/bz460917_att350845_reload_new_plugins.patch @@ -0,0 +1,89 @@ +--- + browser/base/content/browser.js | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +Index: mozilla/browser/base/content/browser.js +=================================================================== +--- mozilla.orig/browser/base/content/browser.js ++++ mozilla/browser/base/content/browser.js +@@ -6003,19 +6003,28 @@ + + // Callback for user clicking on a missing (unsupported) plugin. + installSinglePlugin: function (aEvent) { + var missingPluginsArray = {}; + + var pluginInfo = getPluginInfo(aEvent.target); + missingPluginsArray[pluginInfo.mimetype] = pluginInfo; + ++ gBrowser.selectedBrowser.addEventListener("NewPluginInstalled", ++ gMissingPluginInstaller.refreshBrowser, ++ false); ++ + openDialog("chrome://mozapps/content/plugins/pluginInstallerWizard.xul", + "PFSWindow", "chrome,centerscreen,resizable=yes", + {plugins: missingPluginsArray, browser: gBrowser.selectedBrowser}); ++ ++ gBrowser.selectedBrowser.removeEventListener("NewPluginInstalled", ++ gMissingPluginInstaller.refreshBrowser, ++ false); ++ + }, + + // Callback for user clicking on a disabled plugin + managePlugins: function (aEvent) { + BrowserOpenAddonsMgr("plugins"); + }, + + // Callback for user clicking "submit a report" link +@@ -6101,21 +6110,27 @@ + var url = formatter.formatURLPref("plugins.update.url"); + gBrowser.loadOneTab(url, {inBackground: false}); + return true; + } + + function showPluginsMissing() { + // 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); + } + + if (aEvent.type == "PluginBlocklisted") { + if (blockedNotification || missingNotification) + return; + + let iconURL = "chrome://mozapps/skin/plugins/pluginBlocked-16.png"; + let messageString = gNavigatorBundle.getString("blockedpluginsMessage.title"); +@@ -6432,16 +6447,23 @@ + + // 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 convertFromUnicode(charset, str) + { + try { + var unicodeConverter = Components --- firefox-3.6.18+build2+nobinonly.orig/debian/translation-support/install.rdf.in +++ firefox-3.6.18+build2+nobinonly/debian/translation-support/install.rdf.in @@ -0,0 +1,24 @@ +<?xml version="1.0"?> +<!-- + +--> + +<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:em="http://www.mozilla.org/2004/em-rdf#"> + <Description about="urn:mozilla:install-manifest" + em:id="langpack-en-US@firefox-3.6.ubuntu.com" + em:name="Firefox (en-US)" + em:version="@EM_VERSION@" + em:type="8" + em:creator="http://translations.launchpad.net"> + <em:contributor></em:contributor> + + <em:targetApplication> + <Description> + <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> + <em:minVersion>@EM_FIREFOX_MIN_VERSION@</em:minVersion> + <em:maxVersion>@EM_FIREFOX_MAX_VERSION@</em:maxVersion> + </Description> + </em:targetApplication> + </Description> +</RDF>