From cb9d51732846442bdaf601bafbfc3d902653abaf Mon Sep 17 00:00:00 2001 From: asac Date: Tue, 13 Mar 2007 20:11:07 +0100 Subject: [PATCH] ubuntu-debian-2.0.0.2+1-0ubuntu2 + package firefox-libthai + update finnish translation of .desktop file --- debian/changelog | 24 ++++++++++++++++++++++++ debian/control | 11 +++++++++-- debian/firefox-libthai.install | 1 + debian/firefox-libthai.postinst | 9 +++++++++ debian/firefox-libthai.prerm | 9 +++++++++ debian/firefox.desktop | 6 +++--- debian/rules | 6 ++++-- 7 files changed, 59 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index eb5fd45..33553ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +firefox (2.0.0.2+1-0ubuntu2) feisty; urgency=low + + * reworked patchset and updated thai patch to latest + * debian/firefox.desktop: updated finnish translation for + .desktop file (Contributed by Timo Jyrinki ) + * browser/app/profile/firefox.js: set pref browser.startup.homepage_override.mstone + to "ignore" (Closes LP#91798) + + [ Theppitak Karoonboonyanan ] + * Update Thai line breaker patch based on libthai. + - Replace old patch with componentized mozlibthai patch extracted and + adapted from submitted patch in Debian #366306, which was backported + from patch against HEAD proposed in bz#7969. + - debian/control, debian/firefox-libthai.{install,postinst,prerm}: + + Add firefox-libthai sub-package and Build-Depends: libthai-dev + + Remove Suggests: libthai0 from firefox (we don't need PR_LoadLibrary() + hack any more), and Suggests: firefox-libthai instead + - debian/rules: + + Add --enable-libthai configure option + + Exclude mozlibthai component from firefox + + Add dh_install -pfirefox-libthai. + + -- Alexander Sack Tue, 13 Mar 2007 20:00:00 +0100 + firefox (2.0.0.2+1-0ubuntu1) feisty; urgency=low * new upstream release 2.0.0.2 diff --git a/debian/control b/debian/control index d6b874b..4baca9b 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,13 @@ Source: firefox Section: web Priority: optional Maintainer: Alexander Sack -Build-Depends: debhelper (>= 5.0), libx11-dev, libxt-dev, libgtk2.0-dev (>= 2.8), zlib1g-dev, liborbit2-dev, libidl-dev (>= 0.8.0), zip, libxft-dev, libfreetype6-dev, libpng12-dev, libjpeg62-dev, libxrender-dev, libxinerama-dev, libcairo2-dev, libgnome2-dev, libgconf2-dev, libgnomevfs2-dev, libgnomeui-dev, patch, sharutils, m4, binutils (>= 2.17-1) [mips mipsel], libhunspell-dev +Build-Depends: debhelper (>= 5.0), libx11-dev, libxt-dev, libgtk2.0-dev (>= 2.8), zlib1g-dev, liborbit2-dev, libidl-dev (>= 0.8.0), zip, libxft-dev, libfreetype6-dev, libpng12-dev, libjpeg62-dev, libxrender-dev, libxinerama-dev, libcairo2-dev, libgnome2-dev, libgconf2-dev, libgnomevfs2-dev, libgnomeui-dev, patch, sharutils, m4, binutils (>= 2.17-1) [mips mipsel], libhunspell-dev, libthai-dev Standards-Version: 3.7.2.1 Package: firefox Architecture: any Depends: fontconfig, psmisc, debianutils (>= 1.16), ${shlibs:Depends}, libnspr4 (>= 2:1.firefox1.5.dfsg+1.5.0.5-0ubuntu6.06.1), libnss3 (>= 2:1.firefox1.5.dfsg+1.5.0.5-0ubuntu6.06.1) -Suggests: firefox-gnome-support (= ${Source-Version}), latex-xft-fonts, libthai0 +Suggests: firefox-gnome-support (= ${Source-Version}), latex-xft-fonts, firefox-libthai Provides: www-browser Conflicts: mozilla-firefox (<< 1.5.dfsg-1) Replaces: mozilla-firefox @@ -40,6 +40,13 @@ Description: Support for Gnome in Mozilla Firefox handlers from Gnome-VFS, such as smb or sftp, and other Gnome integration features. +Package: firefox-libthai +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Support for Thai line breaking in Firefox + This is an extension to Firefox that provides Thai line breaker + component based on libthai. + Package: firefox-dbg Architecture: any Priority: extra diff --git a/debian/firefox-libthai.install b/debian/firefox-libthai.install new file mode 100644 index 0000000..d38e75a --- /dev/null +++ b/debian/firefox-libthai.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/firefox/components/libmozlibthai.so usr/lib/firefox/components diff --git a/debian/firefox-libthai.postinst b/debian/firefox-libthai.postinst new file mode 100644 index 0000000..d481f32 --- /dev/null +++ b/debian/firefox-libthai.postinst @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then + touch /usr/lib/firefox/.autoreg +fi + +#DEBHELPER# diff --git a/debian/firefox-libthai.prerm b/debian/firefox-libthai.prerm new file mode 100644 index 0000000..093c1c2 --- /dev/null +++ b/debian/firefox-libthai.prerm @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +if [ "$1" = "remove" ]; then + touch /usr/lib/firefox/.autoreg +fi + +#DEBHELPER# diff --git a/debian/firefox.desktop b/debian/firefox.desktop index 925750e..3e694b1 100644 --- a/debian/firefox.desktop +++ b/debian/firefox.desktop @@ -5,7 +5,7 @@ Name[ca]=Navegador web Firefox Name[cs]=Firefox Webový prohlížeč Name[es]=Navegador web Firefox Name[fa]=مرورگر اینترنتی Firefox -Name[fi]=Firefox-webselain +Name[fi]=Firefox-selain Name[fr]=Navigateur Web Firefox Name[hu]=Firefox webböngésző Name[it]=Firefox Browser Web @@ -26,7 +26,7 @@ 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[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 @@ -46,7 +46,7 @@ GenericName[ca]=Navegador web GenericName[cs]=Webový prohlížeč GenericName[es]=Navegador web GenericName[fa]=مرورگر اینترنتی -GenericName[fi]=Webselain +GenericName[fi]=WWW-selain GenericName[fr]=Navigateur Web GenericName[hu]=Webböngésző GenericName[it]=Browser Web diff --git a/debian/rules b/debian/rules index f876356..0e777dd 100755 --- a/debian/rules +++ b/debian/rules @@ -77,6 +77,7 @@ CONFIGURE_OPTIONS = \ --enable-chrome-format=flat \ --disable-elf-dynstr-gc \ --enable-system-myspell \ + --enable-libthai \ --with-distribution-id=com.ubuntu \ --enable-official-branding \ $(DEBUG_FLAG) @@ -181,10 +182,11 @@ install-stamp: build-stamp dh_installdirs -plibnss-dev usr/include/firefox/nss cp dist/public/nss/* debian/libnss-dev/usr/include/firefox/nss -# Exclude gnome components from firefox - dh_install -pfirefox -Xgnome -Ximgicon +# Exclude gnome and mozlibthai components from firefox + dh_install -pfirefox -Xgnome -Ximgicon -Xmozlibthai dh_install -pfirefox-dom-inspector dh_install -pfirefox-gnome-support + dh_install -pfirefox-libthai # Sort out libnss/libnspr packages dh_install -pfirefox-dev '-Xnspr' -- 1.4.4.4