--- mozilla-traybiff-1.2.3.orig/debian/control +++ mozilla-traybiff-1.2.3/debian/control @@ -0,0 +1,51 @@ +Source: mozilla-traybiff +Section: mail +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Alan Woodland +Build-Depends: debhelper (>> 5.0.0), coreutils, zlib1g-dev, zip, thunderbird-dev (>= 2.0.0.4), thunderbird-dev (<< 2.0.1~), libgtk2.0-dev, dpatch, binutils (>= 2.15.94), unzip, seamonkey-dev (>= 1.1.9-5), seamonkey-dev (<< 1.2~), libnspr4-dev (>=4.7.1+1.9-0ubuntu4) +Standards-Version: 3.7.2 + +Package: thunderbird-traybiff +Architecture: any +Depends: thunderbird (>= 2.0.0.4), thunderbird (<< 2.0.1~), ${shlibs:Depends}, mozilla-traybiff-common(>= ${source:Version}) +Conflicts: thunderbird-traybiff (<= 1.2.2-7) +Suggests: gnome-desktop-environment | icewm | kdebase +Description: traybiff - new mail alert for thunderbird + Traybiff is an extension for thunderbird. It provides tray + notification of new email arrival by thunderbird. + . + Traybiff integrates with a system tray compliant with the Free Desktop + standard, which includes KDE, GNOME and IceWM (when icewmtray is running) + . + This extension is in the spirit of the xbiff mail notification program + for X11 + +Package: seamonkey-traybiff +Architecture: any +Depends: seamonkey-mailnews (>= 1.1.3), seamonkey-mailnews (<< 1.2~), ${shlibs:Depends}, mozilla-traybiff-common (>= ${source:Version}) +Suggests: gnome-desktop-environment | icewm | kdebase +Description: traybiff - new mail alert for thunderbird + Traybiff is an extension for seamonkey. It provides tray + notification of new email arrival by thunderbird. + . + Traybiff integrates with a system tray compliant with the Free Desktop + standard, which includes KDE, GNOME and IceWM (when icewmtray is running) + . + This extension is in the spirit of the xbiff mail notification program + for X11 + +Package: mozilla-traybiff-common +Architecture: all +Replaces: thunderbird-traybiff (<< 1.2.2-14) +Description: traybiff - new mail alert for thunderbird + Traybiff is an extension for seamonkey. It provides tray + notification of new email arrival by thunderbird. + . + Traybiff integrates with a system tray compliant with the Free Desktop + standard, which includes KDE, GNOME and IceWM (when icewmtray is running) + . + This extension is in the spirit of the xbiff mail notification program + for X11 + . + This package includes common files --- mozilla-traybiff-1.2.3.orig/debian/rules +++ mozilla-traybiff-1.2.3/debian/rules @@ -0,0 +1,109 @@ +#!/usr/bin/make -f + +include /usr/share/dpatch/dpatch.make + +PLATFORM = $(shell ./get-platform) + +DOVE_VERS = $(shell thunderbird-config --version) +APE_VERS = $(shell sh ./debian/seamonkey-config --version) + +VERSION = $(shell grep "^VERSION" Makefile|sed "s/VERSION[ =]*//") + +ID="{2e1b75f1-6b5a-4f1d-89b4-424f636e4fba}" + +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) + +clean: clean_patched unpatch + +clean_patched: + dh_testdir + dh_testroot + + make MOZILLA_PLATFORM=tbird MOZ_TRUNK=1 clean + + rm -f *.xpi + rm -rf platform + + rm -f build-stamp configure-stamp + rm -rf debian/temp + + # These files are generated automatically by substitution + rm -rf debian/thunderbird-traybiff.dirs \ + debian/thunderbird-traybiff.links \ + debian/thunderbird-traybiff.install + + dh_clean + +update_control: clean + cat debian/control.in | sed -e "s/%dove_vers%/$(DOVE_VERS)/g" \ + | sed -e "s/%ape_vers%/$(APE_VERS)/g" \ + > debian/control + +install: build + dh_testdir + dh_testroot + dh_clean -k + + cat debian/thunderbird-traybiff.dirs.in | sed "s/ID/${ID}/g" > debian/thunderbird-traybiff.dirs + cat debian/thunderbird-traybiff.links.in | sed "s/ID/${ID}/g" > debian/thunderbird-traybiff.links + cat debian/thunderbird-traybiff.install.in | sed "s/ID/${ID}/g" > debian/thunderbird-traybiff.install + + dh_installdirs + dh_install + +build: configure-stamp build-stamp + +configure-stamp: patch + chmod a+x ./debian/seamonkey-config #this comes out of a patch + touch configure-stamp + +build-stamp: + mkdir debian/temp + + make MOZILLA_PLATFORM=suite MOZ_TRUNK=1 components + mkdir -p debian/temp/suite && \ + cp components/libtraybiff.so components/libtraybiff.xpt debian/temp/suite/ + make MOZILLA_PLATFORM=suite clean + + make MOZILLA_PLATFORM=tbird MOZ_TRUNK=1 components install.rdf + mkdir -p debian/temp/tb && \ + cp components/libtraybiff.so components/libtraybiff.xpt debian/temp/tb/ + + cd chrome && make + + touch build-stamp + + + +binary-arch: install + dh_testdir -a + dh_testroot -a + dh_installchangelogs -a + dh_installdocs -a debian/NPL-1.1.txt + + dh_link -a + dh_strip -a + dh_compress -a + dh_fixperms -a + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-arch binary-indep + +binary-indep: + dh_testdir -i + dh_testroot -i + dh_installchangelogs -i + dh_installdocs -i debian/NPL-1.1.txt + + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +.PHONY: binary clean install build binary-arch --- mozilla-traybiff-1.2.3.orig/debian/changelog +++ mozilla-traybiff-1.2.3/debian/changelog @@ -0,0 +1,175 @@ +mozilla-traybiff (1.2.3-4.2ubuntu2) jaunty; urgency=low + + * no changes upload for nss/nspr SONAME mini-transition + + -- Alexander Sack Mon, 12 Jan 2009 16:22:04 +0100 + +mozilla-traybiff (1.2.3-4.2ubuntu1) intrepid; urgency=low + + * Sponsored upload for Fabrice Coutadeur (patch was against old version) + + [Fabrice Coutadeur] + * Substitute icedove with thunderbird and iceape with seamonkey (LP #180384) + * debian/control.in, debian/control: + - Changed icedove by thunderbird and iceape by seamonkey. + - Changed Maintainer. + * debian/seamonkey-config: created from iceape-config + * debian/seamonkey-traybiff.dirs: created from iceape-traybiff.dirs + * debian/seamonkey-traybiff.install: created from iceape-traybiff.install + * debian/seamonkey-traybiff.links: created from iceape-traybiff.links + * debian/seamonkey-traybiff.postinst: created from + iceape-traybiff.postinst + * debian/seamonkey-traybiff.postrm: created from iceape-traybiff.postrm + * debian/thunderbird-traybiff.dirs.in: created from icedove-traybiff.dirs.in + * debian/thunderbird-traybiff.install.in: created from + icedove-traybiff.install.in + * debian/thunderbird-traybiff.links.in: created from + icedove-traybiff.links.in + * debian/patches/02_makefile_fix_ubuntu-patch.patch: adapted version of + 02_makefile_fix-patch.patch + * debian/patches/06_seamonkey_support.patch: adapted version of + 06_iceape_support.patch + * debian/rules: clean before unpatch and change icedove and iceape + + -- Sarah Hobbs Wed, 17 Sep 2008 15:43:34 +1000 + +mozilla-traybiff (1.2.3-4.2) unstable; urgency=low + + * Non-maintainer upload. + * Porter NMU - remove -fshort-wchar flag + + -- Riku Voipio Fri, 01 Aug 2008 17:59:08 +0300 + +mozilla-traybiff (1.2.3-4.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/control.in, debian/control: Remove build dependency on + libxul-dev and bump iceape-dev minimal required version. + (Closes: #480822) + * debian/iceape-config: Return /usr/lib/iceape for utilities location. + + -- Mike Hommey Fri, 23 May 2008 21:29:30 +0200 + +mozilla-traybiff (1.2.3-4) unstable; urgency=low + + * Increased version for replaces:icedove-traybiff in + mozilla-traybiff-common to 1.2.2-13etch1 (Closes: #431398) + * Now showing a 'preferences' option in the context menu instead of + 'hide icon' (Closes: #433491) + * Replaced the icon it uses when the tray icon is visible, but there is no + new mail. Thanks to Damyan Ivanov (Closes: #433642) + * Updated for new version of iceape + + -- Alan Woodland Sun, 08 Jul 2007 20:24:51 +0100 + +mozilla-traybiff (1.2.3-3) unstable; urgency=low + + * Relaxed Icedove depends (Closes: #430423) + + -- Alan Woodland Wed, 27 Jun 2007 19:09:52 +0100 + +mozilla-traybiff (1.2.3-2) unstable; urgency=low + + * Updated for new version of iceape + + -- Alan Woodland Sun, 10 Jun 2007 15:10:49 +0100 + +mozilla-traybiff (1.2.3-1) unstable; urgency=low + + * New upstream source + * Adds support for Icedove 2.0 series (Closes: #426344) + * No longer requires png_icon_from_cvs patch + + -- Alan Woodland Mon, 28 May 2007 13:48:24 +0100 + +mozilla-traybiff (1.2.2-14) unstable; urgency=low + + * Added patch for kfreebsd from Cyril Brulebois. (Closes: #413613) + * Added support for iceape. + * Split the common files out into an arch: all files shared + by both the icedove and iceape versions. + * Removed thunderbird-traybiff transition package. + + -- Alan Woodland Sat, 17 Mar 2007 12:11:24 +0000 + +mozilla-traybiff (1.2.2-13) unstable; urgency=low + + * Updated for new version of icedove. + * Removed my botch PNG support patch in favour of a patch that's in + upstream CVS. (Thanks to Alexander Sack) + + -- Alan Woodland Thu, 8 Mar 2007 18:18:02 +0000 + +mozilla-traybiff (1.2.2-12) unstable; urgency=low + + * Looking for the tray icon in the right place again (Closes: #405072) + + -- Alan Woodland Sat, 6 Jan 2007 12:07:38 +0000 + +mozilla-traybiff (1.2.2-11) unstable; urgency=low + + * Updated for new icedove version (Closes: #404311) + * Fixes typos in description (Closes: #399825) + + -- Alan Woodland Fri, 29 Dec 2006 13:16:38 +0000 + +mozilla-traybiff (1.2.2-10) unstable; urgency=low + + * Updated for new thunderbird version (Closes: #402503, #401326) + + -- Alan Woodland Mon, 11 Dec 2006 19:48:11 +0000 + +mozilla-traybiff (1.2.2-9) unstable; urgency=low + + * Updated for new version of Icedove (Was FTBFS bug) + + -- Alan Woodland Sun, 19 Nov 2006 20:11:39 +0000 + +mozilla-traybiff (1.2.2-8) unstable; urgency=low + + * Updated to work with Icedove. (Closes: #398335) + + -- Alan Woodland Sat, 18 Nov 2006 17:17:28 +0000 + +mozilla-traybiff (1.2.2-7) unstable; urgency=low + + * Rebuild for new thunderbird version + + -- Alan Woodland Mon, 18 Sep 2006 18:29:42 +0100 + +mozilla-traybiff (1.2.2-6) unstable; urgency=low + + * Removed all support for Mozilla suite, which is now obsoleted. + + -- Alan Woodland Fri, 1 Sep 2006 18:14:11 +0100 + +mozilla-traybiff (1.2.2-5) unstable; urgency=low + + * New Version for updated thunderbird version + + -- Alan Woodland Mon, 14 Aug 2006 21:55:08 +0100 + +mozilla-traybiff (1.2.2-4) unstable; urgency=low + + * Fixed build-depends (was missing unzip) + + -- Alan Woodland Sun, 9 Jul 2006 11:27:18 +0100 + +mozilla-traybiff (1.2.2-3) unstable; urgency=low + + * Fixed copyright file (was missing reference to LGPL'd files) + * Added watch file + + -- Alan Woodland Mon, 26 Jun 2006 20:04:56 +0100 + +mozilla-traybiff (1.2.2-2) unstable; urgency=low + + * Updated debian/control for new thunderbird and thunderbird-dev versions + + -- Alan Woodland Sun, 18 Jun 2006 18:19:37 +0100 + +mozilla-traybiff (1.2.2-1) unstable; urgency=low + + * First upload (closes: #317382) + + -- Alan Woodland Mon, 5 Jun 2006 15:41:19 +0100 --- mozilla-traybiff-1.2.3.orig/debian/iceape-traybiff.postinst +++ mozilla-traybiff-1.2.3/debian/iceape-traybiff.postinst @@ -0,0 +1,54 @@ +#!/bin/sh + +WHICH=/usr/bin/which +if [ -x /usr/bin/which.debianutils ] +then + WHICH=/usr/bin/which.debianutils +fi + + +#UPDATEMOZ=`${WHICH} update-mozilla-chrome` > /dev/null 2>&1 +#UPDATEMOZSNAP=`${WHICH} update-mozilla-snapshot-chrome` > /dev/null 2>&1 +#UPDATEFFX=`${WHICH} update-mozilla-firefox-chrome` > /dev/null 2>&1 +#UPDATETB=`${WHICH} update-mozilla-thunderbird-chrome` > /dev/null 2>&1 +UPDATEAPE=`${WHICH} update-iceape-chrome` > /dev/null 2>&1 + +set -e + +case "$1" in + configure*) + if [ -x ${UPDATEAPE} ] + then + ${UPDATEAPE} + fi + #Plain mozilla support + #if [ -x ${UPDATEMOZ} ] + #then + # ${UPDATEMOZ} + #fi + + #Mozilla-snapshot + #if [ -x ${UPDATEMOZSNAP} ] + #then + # ${UPDATEMOZSNAP} + #fi + + #Firefox (thanks to Eric Wong for pointing this out) + #if [ -x ${UPDATEFFX} ] + #then + # ${UPDATEFFX} + #fi + + #Thunderbird support +# if [ -x ${UPDATETB} ] +# then +# ${UPDATETB} +# fi + + ;; + *) + ;; +esac + +#DEBHELPER# + --- mozilla-traybiff-1.2.3.orig/debian/control.in +++ mozilla-traybiff-1.2.3/debian/control.in @@ -0,0 +1,52 @@ +Source: mozilla-traybiff +Section: mail +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Alan Woodland +Build-Depends: debhelper (>> 5.0.0), coreutils, zlib1g-dev, zip, thunderbird-dev (>= %dove_vers%), thunderbird-dev (<< 2.0.1~), libgtk2.0-dev, dpatch, binutils (>= 2.15.94), unzip, libxul-dev (>= 1.8.0), seamonkey-dev (>= 1.1.9-5), seamonkey-dev (<< 1.2~) +Standards-Version: 3.7.2 + +Package: thunderbird-traybiff +Architecture: any +Depends: thunderbird (>= %dove_vers%), thunderbird (<< 2.0.1~), ${shlibs:Depends}, mozilla-traybiff-common(>= ${source:Version}) +Replaces: thunderbird-traybiff +Conflicts: thunderbird-traybiff (<= 1.2.2-7) +Suggests: gnome-desktop-environment | icewm | kdebase +Description: traybiff - new mail alert for thunderbird + Traybiff is an extension for thunderbird. It provides tray + notification of new email arrival by thunderbird. + . + Traybiff integrates with a system tray compliant with the Free Desktop + standard, which includes KDE, GNOME and IceWM (when icewmtray is running) + . + This extension is in the spirit of the xbiff mail notification program + for X11 + +Package: seamonkey-traybiff +Architecture: any +Depends: seamonkey-mailnews (>= %ape_vers%), seamonkey-mailnews (<< 1.2~), ${shlibs:Depends}, mozilla-traybiff-common (>= ${source:Version}) +Suggests: gnome-desktop-environment | icewm | kdebase +Description: traybiff - new mail alert for thunderbird + Traybiff is an extension for seamonkey. It provides tray + notification of new email arrival by thunderbird. + . + Traybiff integrates with a system tray compliant with the Free Desktop + standard, which includes KDE, GNOME and IceWM (when icewmtray is running) + . + This extension is in the spirit of the xbiff mail notification program + for X11 + +Package: mozilla-traybiff-common +Architecture: all +Replaces: thunderbird-traybiff (<< 1.2.2-14) +Description: traybiff - new mail alert for thunderbird + Traybiff is an extension for seamonkey. It provides tray + notification of new email arrival by thunderbird. + . + Traybiff integrates with a system tray compliant with the Free Desktop + standard, which includes KDE, GNOME and IceWM (when icewmtray is running) + . + This extension is in the spirit of the xbiff mail notification program + for X11 + . + This package includes common files --- mozilla-traybiff-1.2.3.orig/debian/chrome.manifest +++ mozilla-traybiff-1.2.3/debian/chrome.manifest @@ -0,0 +1,21 @@ + +overlay chrome://messenger/content/pref-notifications.xul chrome://traybiff/content/prefsOverlay.xul +overlay chrome://messenger/content/mailWindowOverlay.xul chrome://traybiff/content/initOverlay.xul +content traybiff jar:chrome/tray-biff.jar!/content/traybiff/ + +locale traybiff en-US jar:chrome/tray-biff.jar!/locale/en-US/traybiff/ + +locale traybiff he-IL jar:chrome/tray-biff.jar!/locale/he-IL/traybiff/ + +locale traybiff fr-FR jar:chrome/tray-biff.jar!/locale/fr-FR/traybiff/ + +locale traybiff it-IT jar:chrome/tray-biff.jar!/locale/it-IT/traybiff/ + +locale traybiff ca-AD jar:chrome/tray-biff.jar!/locale/ca-AD/traybiff/ + +locale traybiff de-DE jar:chrome/tray-biff.jar!/locale/de-DE/traybiff/ + +locale traybiff es-ES jar:chrome/tray-biff.jar!/locale/es-ES/traybiff/ + + +locale traybiff ru-RU jar:chrome/tray-biff.jar!/locale/ru-RU/traybiff/ --- mozilla-traybiff-1.2.3.orig/debian/compat +++ mozilla-traybiff-1.2.3/debian/compat @@ -0,0 +1 @@ +5 --- mozilla-traybiff-1.2.3.orig/debian/NPL-1.1.txt +++ mozilla-traybiff-1.2.3/debian/NPL-1.1.txt @@ -0,0 +1,569 @@ + + 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." + + ---------------------------------------------------------------------- + + 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.] + --- mozilla-traybiff-1.2.3.orig/debian/iceape-config +++ mozilla-traybiff-1.2.3/debian/iceape-config @@ -0,0 +1,55 @@ +#!/bin/sh + +PKG=iceape-xpcom +PKG_CONFIG=`which pkg-config` + +usage() +{ + cat <&2 +fi + +ARGS="" +PREFIX="" + +while test $# -gt 0; do + + case "$1" in + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) optarg= ;; + esac + + case "$1" in + --idlflags) + ARGS="--variable idldir" + PREFIX="-I" + ;; + --version) + ARGS="--modversion" + ;; + --libs) + ARGS="$1" + shift + ;; + --util-prefix) + PREFIX=/usr/lib/iceape + ;; + *) + ARGS="$1" + ;; + esac + shift +done + +echo $PREFIX`$PKG_CONFIG $PKG $ARGS` --- mozilla-traybiff-1.2.3.orig/debian/seamonkey-traybiff.links +++ mozilla-traybiff-1.2.3/debian/seamonkey-traybiff.links @@ -0,0 +1,3 @@ +usr/share/mozilla-extensions/traybiff/tray-biff.jar usr/share/seamonkey/chrome/tray-biff.jar +usr/share/mozilla-extensions/traybiff/50-traybiff var/lib/seamonkey/chrome.d/50-traybiff +etc/seamonkey/tray-biff.js usr/share/seamonkey/defaults/pref/tray-biff.js --- mozilla-traybiff-1.2.3.orig/debian/seamonkey-traybiff.postrm +++ mozilla-traybiff-1.2.3/debian/seamonkey-traybiff.postrm @@ -0,0 +1,50 @@ +#!/bin/sh + +WHICH=/usr/bin/which +if [ -x /usr/bin/which.debianutils ] +then + WHICH=/usr/bin/which.debianutils +fi + +UPDATEMOZ=`${WHICH} update-mozilla-chrome` > /dev/null 2>&1 +UPDATEMOZSNAP=`${WHICH} update-mozilla-snapshot-chrome` > /dev/null 2>&1 +UPDATEFFX=`${WHICH} update-mozilla-firefox-chrome` > /dev/null 2>&1 +UPDATETB=`${WHICH} update-mozilla-thunderbird-chrome` > /dev/null 2>&1 + +UPDATEAPE=`${WHICH} update-iceape-chrome` > /dev/null 2>&1 + + +set -e + +case "$1" in + remove|purge|abort-install) + if [ -x ${UPDATEAPE} ] + then + ${UPDATEAPE} + fi + if [ -x ${UPDATEMOZ} ] + then + ${UPDATEMOZ} + fi + if [ -x ${UPDATEMOZSNAP} ] + then + ${UPDATEMOZSNAP} + fi + #Firefox (thanks to Eric Wong for pointing this out) + if [ -x ${UPDATEFFX} ] + then + ${UPDATEFFX} + fi + + if [ -x ${UPDATETB} ] + then + ${UPDATETB} + fi + + + ;; + *) + ;; +esac + +#DEBHELPER# --- mozilla-traybiff-1.2.3.orig/debian/iceape-traybiff.install +++ mozilla-traybiff-1.2.3/debian/iceape-traybiff.install @@ -0,0 +1,3 @@ +debian/temp/suite/libtraybiff.xpt usr/lib/iceape/components/ +debian/temp/suite/libtraybiff.so usr/lib/iceape/components/ +defaults/preferences/tray-biff.js etc/iceape/ --- mozilla-traybiff-1.2.3.orig/debian/thunderbird-traybiff.links.in +++ mozilla-traybiff-1.2.3/debian/thunderbird-traybiff.links.in @@ -0,0 +1,2 @@ +usr/share/mozilla-extensions/traybiff/tray-biff.jar usr/lib/thunderbird/extensions/ID/chrome/tray-biff.jar +etc/thunderbird/tray-biff.js usr/lib/thunderbird/extensions/ID/defaults/preferences/tray-biff.js --- mozilla-traybiff-1.2.3.orig/debian/thunderbird-traybiff.install.in +++ mozilla-traybiff-1.2.3/debian/thunderbird-traybiff.install.in @@ -0,0 +1,5 @@ +debian/temp/tb/libtraybiff.xpt usr/lib/thunderbird/extensions/ID/components/ +debian/temp/tb/libtraybiff.so usr/lib/thunderbird/extensions/ID/components/ +install.rdf usr/lib/thunderbird/extensions/ID/ +debian/chrome.manifest usr/lib/thunderbird/extensions/ID/ +defaults/preferences/tray-biff.js etc/thunderbird/ --- mozilla-traybiff-1.2.3.orig/debian/iceape-traybiff.links +++ mozilla-traybiff-1.2.3/debian/iceape-traybiff.links @@ -0,0 +1,3 @@ +usr/share/mozilla-extensions/traybiff/tray-biff.jar usr/share/iceape/chrome/tray-biff.jar +usr/share/mozilla-extensions/traybiff/50-traybiff var/lib/iceape/chrome.d/50-traybiff +etc/iceape/tray-biff.js usr/share/iceape/defaults/pref/tray-biff.js --- mozilla-traybiff-1.2.3.orig/debian/seamonkey-config +++ mozilla-traybiff-1.2.3/debian/seamonkey-config @@ -0,0 +1,55 @@ +#!/bin/sh + +PKG=seamonkey-xpcom +PKG_CONFIG=`which pkg-config` + +usage() +{ + cat <&2 +fi + +ARGS="" +PREFIX="" + +while test $# -gt 0; do + + case "$1" in + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) optarg= ;; + esac + + case "$1" in + --idlflags) + ARGS="--variable idldir" + PREFIX="-I" + ;; + --version) + ARGS="--modversion" + ;; + --libs) + ARGS="$1" + shift + ;; + --util-prefix) + PREFIX=/usr/lib/thunderbird + ;; + *) + ARGS="$1" + ;; + esac + shift +done + +echo $PREFIX`$PKG_CONFIG $PKG $ARGS` --- mozilla-traybiff-1.2.3.orig/debian/copyright +++ mozilla-traybiff-1.2.3/debian/copyright @@ -0,0 +1,57 @@ +This package was debianized by Alan Woodland on +Mon, 10 Apr 2006 01:06:07 +0100. + +It was downloaded from http://moztraybiff.mozdev.org/ + +Copyright: + Ilya Konstantinov. + +Portions copyright: + Copyright (C) 1998 Netscape Communications Corporation + Seth Spitzer + Bhuvan Racham + Copyright (C) 2003 Sun Microsystems, Inc. + Mark McLoughlin + Copyright (C) 2002 Anders Carlsson + + +License: + + mozTrayBiff 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. + + mozTrayBiff 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 + with your Debian GNU system, in /usr/share/common-licenses/GPL-2, or + with mozTrayBiff source package as the file COPYING. If + not, write to the Free Software Foundation, Inc., + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + + Portions of mozTrayBiff are distributed under other licenses + outlined below: + + components/eggstatusicon.*, components/eggtrayicon.* are licenced + under the terms of the GNU Lesser General Public license, a copy + of which should be included with your Debian GNU system, in + /usr/share/common-licenses/LGPL-2. If not, write to the Free + Software Foundationc, Inc., 51 Franklin St, Fifth Floor, Boston, + MA 02110-1301, USA. + + components/nsMessengerFreeDesktopIntegration.* are licenced triply + under the terms of any of the Netscape Public License 1.1, + the GNU General Public License 2.0 or the GNU Lesser General + Public License 2.1 + + The full text of the NPL is in the same directory as this file with + the filename NPL-1.1.txt and may be compressed. + See the file /usr/share/common-licenses/GPL-2 for the full text of + the GPL. + See the file /usr/share/common-licenses/LGPL-2.1 for the full text + of the LGPL. + --- mozilla-traybiff-1.2.3.orig/debian/seamonkey-traybiff.install +++ mozilla-traybiff-1.2.3/debian/seamonkey-traybiff.install @@ -0,0 +1,3 @@ +debian/temp/suite/libtraybiff.xpt usr/lib/seamonkey/components/ +debian/temp/suite/libtraybiff.so usr/lib/seamonkey/components/ +defaults/preferences/tray-biff.js etc/seamonkey/ --- mozilla-traybiff-1.2.3.orig/debian/icedove-traybiff.links.in +++ mozilla-traybiff-1.2.3/debian/icedove-traybiff.links.in @@ -0,0 +1,2 @@ +usr/share/mozilla-extensions/traybiff/tray-biff.jar usr/lib/icedove/extensions/ID/chrome/tray-biff.jar +etc/icedove/tray-biff.js usr/lib/icedove/extensions/ID/defaults/preferences/tray-biff.js --- mozilla-traybiff-1.2.3.orig/debian/seamonkey-traybiff.dirs +++ mozilla-traybiff-1.2.3/debian/seamonkey-traybiff.dirs @@ -0,0 +1,2 @@ +/var/lib/seamonkey/chrome.d +/usr/share/seamonkey/chrome --- mozilla-traybiff-1.2.3.orig/debian/50-traybiff +++ mozilla-traybiff-1.2.3/debian/50-traybiff @@ -0,0 +1,10 @@ +content,install,url,jar:resource:/chrome/tray-biff.jar!/content/traybiff/ +locale,install,url,jar:resource:/chrome/tray-biff.jar!/locale/ca-AD/traybiff/ +locale,install,url,jar:resource:/chrome/tray-biff.jar!/locale/cs-CZ/traybiff/ +locale,install,url,jar:resource:/chrome/tray-biff.jar!/locale/de-DE/traybiff/ +locale,install,url,jar:resource:/chrome/tray-biff.jar!/locale/en-US/traybiff/ +locale,install,url,jar:resource:/chrome/tray-biff.jar!/locale/es-ES/traybiff/ +locale,install,url,jar:resource:/chrome/tray-biff.jar!/locale/fr-FR/traybiff/ +locale,install,url,jar:resource:/chrome/tray-biff.jar!/locale/he-IL/traybiff/ +locale,install,url,jar:resource:/chrome/tray-biff.jar!/locale/it-IT/traybiff/ +locale,install,url,jar:resource:/chrome/tray-biff.jar!/locale/ru-RU/traybiff/ --- mozilla-traybiff-1.2.3.orig/debian/watch +++ mozilla-traybiff-1.2.3/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://downloads.mozdev.org/moztraybiff/mozTrayBiff-([\d\.]+)-[^-]*.xpi --- mozilla-traybiff-1.2.3.orig/debian/thunderbird-traybiff.dirs.in +++ mozilla-traybiff-1.2.3/debian/thunderbird-traybiff.dirs.in @@ -0,0 +1,4 @@ +usr/lib/thunderbird/extensions/ID/chrome +usr/lib/thunderbird/extensions/ID/components +usr/lib/thunderbird/extensions/ID/defaults/preferences +etc/thunderbird --- mozilla-traybiff-1.2.3.orig/debian/iceape-traybiff.postrm +++ mozilla-traybiff-1.2.3/debian/iceape-traybiff.postrm @@ -0,0 +1,50 @@ +#!/bin/sh + +WHICH=/usr/bin/which +if [ -x /usr/bin/which.debianutils ] +then + WHICH=/usr/bin/which.debianutils +fi + +#UPDATEMOZ=`${WHICH} update-mozilla-chrome` > /dev/null 2>&1 +#UPDATEMOZSNAP=`${WHICH} update-mozilla-snapshot-chrome` > /dev/null 2>&1 +#UPDATEFFX=`${WHICH} update-mozilla-firefox-chrome` > /dev/null 2>&1 +#UPDATETB=`${WHICH} update-mozilla-thunderbird-chrome` > /dev/null 2>&1 + +UPDATEAPE=`${WHICH} update-iceape-chrome` > /dev/null 2>&1 + + +set -e + +case "$1" in + remove|purge|abort-install) + if [ -x ${UPDATEAPE} ] + then + ${UPDATEAPE} + fi + #if [ -x ${UPDATEMOZ} ] + #then + # ${UPDATEMOZ} + #fi + #if [ -x ${UPDATEMOZSNAP} ] + #then + # ${UPDATEMOZSNAP} + #fi + #Firefox (thanks to Eric Wong for pointing this out) + #if [ -x ${UPDATEFFX} ] + #then + # ${UPDATEFFX} + #fi + +# if [ -x ${UPDATETB} ] +# then +# ${UPDATETB} +# fi + + + ;; + *) + ;; +esac + +#DEBHELPER# --- mozilla-traybiff-1.2.3.orig/debian/seamonkey-traybiff.postinst +++ mozilla-traybiff-1.2.3/debian/seamonkey-traybiff.postinst @@ -0,0 +1,54 @@ +#!/bin/sh + +WHICH=/usr/bin/which +if [ -x /usr/bin/which.debianutils ] +then + WHICH=/usr/bin/which.debianutils +fi + + +UPDATEMOZ=`${WHICH} update-mozilla-chrome` > /dev/null 2>&1 +UPDATEMOZSNAP=`${WHICH} update-mozilla-snapshot-chrome` > /dev/null 2>&1 +UPDATEFFX=`${WHICH} update-mozilla-firefox-chrome` > /dev/null 2>&1 +UPDATETB=`${WHICH} update-mozilla-thunderbird-chrome` > /dev/null 2>&1 +UPDATEAPE=`${WHICH} update-iceape-chrome` > /dev/null 2>&1 + +set -e + +case "$1" in + configure*) + if [ -x ${UPDATEAPE} ] + then + ${UPDATEAPE} + fi + #Plain mozilla support + if [ -x ${UPDATEMOZ} ] + then + ${UPDATEMOZ} + fi + + #Mozilla-snapshot + if [ -x ${UPDATEMOZSNAP} ] + then + ${UPDATEMOZSNAP} + fi + + #Firefox (thanks to Eric Wong for pointing this out) + if [ -x ${UPDATEFFX} ] + then + ${UPDATEFFX} + fi + + #Thunderbird support + if [ -x ${UPDATETB} ] + then + ${UPDATETB} + fi + + ;; + *) + ;; +esac + +#DEBHELPER# + --- mozilla-traybiff-1.2.3.orig/debian/mozilla-traybiff-common.install +++ mozilla-traybiff-1.2.3/debian/mozilla-traybiff-common.install @@ -0,0 +1,2 @@ +chrome/tray-biff.jar usr/share/mozilla-extensions/traybiff/ +debian/50-traybiff usr/share/mozilla-extensions/traybiff/ --- mozilla-traybiff-1.2.3.orig/debian/icedove-traybiff.install.in +++ mozilla-traybiff-1.2.3/debian/icedove-traybiff.install.in @@ -0,0 +1,5 @@ +debian/temp/tb/libtraybiff.xpt usr/lib/icedove/extensions/ID/components/ +debian/temp/tb/libtraybiff.so usr/lib/icedove/extensions/ID/components/ +install.rdf usr/lib/icedove/extensions/ID/ +debian/chrome.manifest usr/lib/icedove/extensions/ID/ +defaults/preferences/tray-biff.js etc/icedove/ --- mozilla-traybiff-1.2.3.orig/debian/iceape-traybiff.dirs +++ mozilla-traybiff-1.2.3/debian/iceape-traybiff.dirs @@ -0,0 +1,2 @@ +/var/lib/iceape/chrome.d +/usr/share/iceape/chrome --- mozilla-traybiff-1.2.3.orig/debian/icedove-traybiff.dirs.in +++ mozilla-traybiff-1.2.3/debian/icedove-traybiff.dirs.in @@ -0,0 +1,4 @@ +usr/lib/icedove/extensions/ID/chrome +usr/lib/icedove/extensions/ID/components +usr/lib/icedove/extensions/ID/defaults/preferences +etc/icedove --- mozilla-traybiff-1.2.3.orig/debian/patches/00list +++ mozilla-traybiff-1.2.3/debian/patches/00list @@ -0,0 +1,6 @@ +02_makefile_fix_ubuntu-patch +03_platform_fix-patch +06_seamonkey_support +07_kfreebsd_fix +21_prefs_context +22_new_icon --- mozilla-traybiff-1.2.3.orig/debian/patches/fix_armel.dpatch +++ mozilla-traybiff-1.2.3/debian/patches/fix_armel.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## fix_armel.dpatch by > +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad mozilla-traybiff-1.2.3~/components/Makefile mozilla-traybiff-1.2.3/components/Makefile +--- mozilla-traybiff-1.2.3~/components/Makefile 2007-05-19 11:01:56.000000000 +0300 ++++ mozilla-traybiff-1.2.3/components/Makefile 2008-08-01 17:58:46.000000000 +0300 +@@ -35,7 +35,6 @@ + CXXFLAGS += \ + -fno-rtti \ + -fno-exceptions \ +- -fshort-wchar \ + -fPIC + + INTERNAL_FLAGS = -DMOZILLA_INTERNAL_API --- mozilla-traybiff-1.2.3.orig/debian/patches/02_makefile_fix_ubuntu-patch.dpatch +++ mozilla-traybiff-1.2.3/debian/patches/02_makefile_fix_ubuntu-patch.dpatch @@ -0,0 +1,53 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_makefile_fix-patch.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fixes makefile to use thunderbird-config instead of mozilla-thunderbird-config for new tb builds + +@DPATCH@ +diff -urNad mozilla-traybiff-1.2.3~/Makefile mozilla-traybiff-1.2.3/Makefile +--- mozilla-traybiff-1.2.3~/Makefile 2007-05-28 14:11:15.000000000 +0100 ++++ mozilla-traybiff-1.2.3/Makefile 2007-05-28 14:11:16.000000000 +0100 +@@ -19,7 +19,7 @@ + XPI_EXTRA_FILES = install.js + endif + ifeq ($(MOZILLA_PLATFORM),tbird) +-REAL_CONFIG = mozilla-thunderbird-config ++REAL_CONFIG = thunderbird-config + XPI_VERSION := $(XPI_VERSION)-tb${MOZILLA_VERSION} + XPI_EXTRA_FILES = install.rdf + endif +diff -urNad mozilla-traybiff-1.2.3~/components/Makefile mozilla-traybiff-1.2.3/components/Makefile +--- mozilla-traybiff-1.2.3~/components/Makefile 2007-05-28 14:11:15.000000000 +0100 ++++ mozilla-traybiff-1.2.3/components/Makefile 2007-05-28 14:11:38.000000000 +0100 +@@ -14,7 +14,7 @@ + + # This doesn't work, so we'll hardcode for now: + MOZILLA_IDLFLAGS := \ +- $(shell $(MOZILLA_CONFIG) --idlflags) ++ $(shell $(REAL_CONFIG) --idlflags) + + COMPONENT_NAME = libtraybiff + +@@ -27,7 +27,7 @@ + $(shell pkg-config --libs $(GTK_PACKAGE)) + + MOZ_INCLUDES := \ +- $(shell $(MOZILLA_CONFIG) --cflags) ++ $(shell $(MOZILLA_CONFIG) --cflags) $(shell $(REAL_CONFIG) --cflags) + + CFLAGS += \ + -fPIC +@@ -84,10 +84,10 @@ + gdk-pixbuf-csource --raw --name=tray_biff_icon $< > $@ + + trayBiffModule.o: trayBiffModule.cpp nsMessengerFreeDesktopIntegration.h nsIMessengerFreeDesktopIntegration.h +- ${CXX} ${MOZ_INCLUDES} ${GTK_CFLAGS} ${CXXFLAGS} ${INTERNAL_FLAGS} -c $< -o $@ ++ ${CXX} ${MOZILLA_IDLFLAGS} ${MOZ_INCLUDES} ${GTK_CFLAGS} ${CXXFLAGS} ${INTERNAL_FLAGS} -c $< -o $@ + + nsMessengerFreeDesktopIntegration.o: nsMessengerFreeDesktopIntegration.cpp nsMessengerFreeDesktopIntegration.h trayBiffIcon.h nsIMessengerFreeDesktopIntegration.h +- ${CXX} ${MOZ_INCLUDES} ${GTK_CFLAGS} ${CXXFLAGS} ${INTERNAL_FLAGS} -c $< -o $@ ++ ${CXX} ${MOZILLA_IDLFLAGS} ${MOZ_INCLUDES} ${GTK_CFLAGS} ${CXXFLAGS} ${INTERNAL_FLAGS} -c $< -o $@ + + eggtrayicon.o: eggtrayicon.c eggtrayicon.h + ${CC} ${GTK_CFLAGS} ${CFLAGS} -DEGG_COMPILATION -c $< -o $@ --- mozilla-traybiff-1.2.3.orig/debian/patches/06_seamonkey_support.dpatch +++ mozilla-traybiff-1.2.3/debian/patches/06_seamonkey_support.dpatch @@ -0,0 +1,49 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 06_iceape_support.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad mozilla-traybiff-1.2.2~/Makefile mozilla-traybiff-1.2.2/Makefile +--- mozilla-traybiff-1.2.2~/Makefile 2007-04-26 13:47:33.000000000 +0100 ++++ mozilla-traybiff-1.2.2/Makefile 2007-04-26 13:47:34.000000000 +0100 +@@ -14,7 +14,7 @@ + MOZILLA_VERSION = $(shell $(REAL_CONFIG) --version) + + ifeq ($(MOZILLA_PLATFORM),suite) +-REAL_CONFIG = mozilla-config ++REAL_CONFIG = $(CURDIR)/debian/seamonkey-config + XPI_VERSION := $(XPI_VERSION)-moz${MOZILLA_VERSION} + XPI_EXTRA_FILES = install.js + endif +diff -urNad mozilla-traybiff-1.2.2~/chrome/content/traybiff/prefsOverlay.xul mozilla-traybiff-1.2.2/chrome/content/traybiff/prefsOverlay.xul +--- mozilla-traybiff-1.2.2~/chrome/content/traybiff/prefsOverlay.xul 2007-04-26 13:47:28.000000000 +0100 ++++ mozilla-traybiff-1.2.2/chrome/content/traybiff/prefsOverlay.xul 2007-04-26 13:47:34.000000000 +0100 +@@ -18,7 +18,7 @@ + + + +- ++ + + + +diff -urNad mozilla-traybiff-1.2.2~/components/Makefile mozilla-traybiff-1.2.2/components/Makefile +--- mozilla-traybiff-1.2.2~/components/Makefile 2007-04-26 13:47:28.000000000 +0100 ++++ mozilla-traybiff-1.2.2/components/Makefile 2007-04-26 13:47:34.000000000 +0100 +@@ -9,8 +9,14 @@ + MOZILLA_CONFIG = ./mozilla-config --real-config $(REAL_CONFIG) + MOZILLA_LIB_PREFIX := \ + $(shell $(MOZILLA_CONFIG) --lib-prefix) ++ifeq ($(MOZILLA_PLATFORM),suite) ++MOZILLA_UTIL_PREFIX := \ ++ $(shell $(REAL_CONFIG) --util-prefix) ++endif ++ifeq ($(MOZILLA_PLATFORM),tbird) + MOZILLA_UTIL_PREFIX := \ + $(shell $(MOZILLA_CONFIG) --util-prefix) ++endif + + # This doesn't work, so we'll hardcode for now: + MOZILLA_IDLFLAGS := \ --- mozilla-traybiff-1.2.3.orig/debian/patches/07_kfreebsd_fix.dpatch +++ mozilla-traybiff-1.2.3/debian/patches/07_kfreebsd_fix.dpatch @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05_kfreebsd_fix.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad mozilla-traybiff-1.2.2~/get-platform mozilla-traybiff-1.2.2/get-platform +--- mozilla-traybiff-1.2.2~/get-platform 2007-03-17 12:09:14.000000000 +0000 ++++ mozilla-traybiff-1.2.2/get-platform 2007-03-17 12:09:35.000000000 +0000 +@@ -6,7 +6,10 @@ + if test -z "$CC"; then + CC=cc + fi +-PLATFORM=`uname -s`_ ++ ++# Replace every '/' by '_' thanks to sed to ensure that ++# filenames based on the output of this script are OK. ++PLATFORM=`uname -s|sed -e 's/\//_/g'`_ + MACHINE=`uname -p 2>/dev/null` + if [ $? != 0 ]; then + MACHINE=`uname -m` --- mozilla-traybiff-1.2.3.orig/debian/patches/21_prefs_context.dpatch +++ mozilla-traybiff-1.2.3/debian/patches/21_prefs_context.dpatch @@ -0,0 +1,176 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 21_prefs_context.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad mozilla-traybiff-1.2.3~/chrome/locale/cs-CZ/traybiff/traybiff.properties mozilla-traybiff-1.2.3/chrome/locale/cs-CZ/traybiff/traybiff.properties +--- mozilla-traybiff-1.2.3~/chrome/locale/cs-CZ/traybiff/traybiff.properties 2007-07-23 20:39:31.000000000 +0100 ++++ mozilla-traybiff-1.2.3/chrome/locale/cs-CZ/traybiff/traybiff.properties 2007-07-23 20:40:00.000000000 +0100 +@@ -3,3 +3,4 @@ + trayMenu_NewWindow=Nové okno + trayMenu_RestoreWindow=Obnov okno + trayMenu_HideWindow=Schovej okno ++trayMenu_ShowPref=Preferences +diff -urNad mozilla-traybiff-1.2.3~/chrome/locale/de-DE/traybiff/traybiff.properties mozilla-traybiff-1.2.3/chrome/locale/de-DE/traybiff/traybiff.properties +--- mozilla-traybiff-1.2.3~/chrome/locale/de-DE/traybiff/traybiff.properties 2007-07-23 20:39:31.000000000 +0100 ++++ mozilla-traybiff-1.2.3/chrome/locale/de-DE/traybiff/traybiff.properties 2007-07-23 20:40:08.000000000 +0100 +@@ -3,3 +3,4 @@ + trayMenu_NewWindow=Neues Fenster + trayMenu_RestoreWindow=Fenster wieder herstellen + trayMenu_HideWindow=Fenster ausblenden ++trayMenu_ShowPref=Preferences +diff -urNad mozilla-traybiff-1.2.3~/chrome/locale/en-US/traybiff/traybiff.properties mozilla-traybiff-1.2.3/chrome/locale/en-US/traybiff/traybiff.properties +--- mozilla-traybiff-1.2.3~/chrome/locale/en-US/traybiff/traybiff.properties 2007-07-23 20:39:31.000000000 +0100 ++++ mozilla-traybiff-1.2.3/chrome/locale/en-US/traybiff/traybiff.properties 2007-07-23 20:40:13.000000000 +0100 +@@ -3,3 +3,4 @@ + trayMenu_NewWindow=New Window + trayMenu_RestoreWindow=Restore Window + trayMenu_HideWindow=Hide Window ++trayMenu_ShowPref=Preferences +diff -urNad mozilla-traybiff-1.2.3~/chrome/locale/es-ES/traybiff/traybiff.properties mozilla-traybiff-1.2.3/chrome/locale/es-ES/traybiff/traybiff.properties +--- mozilla-traybiff-1.2.3~/chrome/locale/es-ES/traybiff/traybiff.properties 2007-07-23 20:39:31.000000000 +0100 ++++ mozilla-traybiff-1.2.3/chrome/locale/es-ES/traybiff/traybiff.properties 2007-07-23 20:40:17.000000000 +0100 +@@ -3,3 +3,4 @@ + trayMenu_NewWindow=Abrir ventana + trayMenu_RestoreWindow=Restaurar ventana + trayMenu_HideWindow=Esconder ventana ++trayMenu_ShowPref=Preferences +diff -urNad mozilla-traybiff-1.2.3~/chrome/locale/fr-FR/traybiff/traybiff.properties mozilla-traybiff-1.2.3/chrome/locale/fr-FR/traybiff/traybiff.properties +--- mozilla-traybiff-1.2.3~/chrome/locale/fr-FR/traybiff/traybiff.properties 2007-07-23 20:39:31.000000000 +0100 ++++ mozilla-traybiff-1.2.3/chrome/locale/fr-FR/traybiff/traybiff.properties 2007-07-23 20:40:22.000000000 +0100 +@@ -3,3 +3,4 @@ + trayMenu_NewWindow=Nouvelle fenêtre + trayMenu_RestoreWindow=Restaurer la fenêtre + trayMenu_HideWindow=Masquer la fenêtre ++trayMenu_ShowPref=Preferences +diff -urNad mozilla-traybiff-1.2.3~/chrome/locale/he-IL/traybiff/traybiff.properties mozilla-traybiff-1.2.3/chrome/locale/he-IL/traybiff/traybiff.properties +--- mozilla-traybiff-1.2.3~/chrome/locale/he-IL/traybiff/traybiff.properties 2007-07-23 20:39:31.000000000 +0100 ++++ mozilla-traybiff-1.2.3/chrome/locale/he-IL/traybiff/traybiff.properties 2007-07-23 20:40:27.000000000 +0100 +@@ -3,3 +3,4 @@ + trayMenu_NewWindow=New Window + trayMenu_RestoreWindow=Restore Window + trayMenu_HideWindow=Hide Window ++trayMenu_ShowPref=Preferences +diff -urNad mozilla-traybiff-1.2.3~/chrome/locale/it-IT/traybiff/traybiff.properties mozilla-traybiff-1.2.3/chrome/locale/it-IT/traybiff/traybiff.properties +--- mozilla-traybiff-1.2.3~/chrome/locale/it-IT/traybiff/traybiff.properties 2007-07-23 20:39:31.000000000 +0100 ++++ mozilla-traybiff-1.2.3/chrome/locale/it-IT/traybiff/traybiff.properties 2007-07-23 20:40:32.000000000 +0100 +@@ -3,3 +3,4 @@ + trayMenu_NewWindow=Nuova finestra + trayMenu_RestoreWindow=Ripristina la finestra + trayMenu_HideWindow=Nascondi la finestra ++trayMenu_ShowPref=Preferences +diff -urNad mozilla-traybiff-1.2.3~/chrome/locale/ru-RU/traybiff/traybiff.properties mozilla-traybiff-1.2.3/chrome/locale/ru-RU/traybiff/traybiff.properties +--- mozilla-traybiff-1.2.3~/chrome/locale/ru-RU/traybiff/traybiff.properties 2007-07-23 20:39:31.000000000 +0100 ++++ mozilla-traybiff-1.2.3/chrome/locale/ru-RU/traybiff/traybiff.properties 2007-07-23 20:40:38.000000000 +0100 +@@ -3,3 +3,4 @@ + trayMenu_NewWindow=Новое окно + trayMenu_RestoreWindow=Восстановить окно + trayMenu_HideWindow=Спрятать окно ++trayMenu_ShowPref=Preferences +diff -urNad mozilla-traybiff-1.2.3~/components/nsMessengerFreeDesktopIntegration.cpp mozilla-traybiff-1.2.3/components/nsMessengerFreeDesktopIntegration.cpp +--- mozilla-traybiff-1.2.3~/components/nsMessengerFreeDesktopIntegration.cpp 2007-07-23 20:39:31.000000000 +0100 ++++ mozilla-traybiff-1.2.3/components/nsMessengerFreeDesktopIntegration.cpp 2007-07-23 20:42:17.000000000 +0100 +@@ -939,6 +939,29 @@ + // TODO: This should ultimately popup an informational message box. + } + ++void nsMessengerFreeDesktopIntegration::OnActionShowPref() ++{ ++ nsCOMPtr domWindow; ++ ++ nsCOMPtr mediator ( do_GetService(NS_WINDOWMEDIATOR_CONTRACTID) ); ++ NS_ASSERTION(mediator, "no mediator"); ++ mediator->GetMostRecentWindow(NS_LITERAL_STRING("mail:3pane").get(), getter_AddRefs(domWindow)); ++ if (domWindow) ++ { ++ nsIDOMWindow *newWindow; ++ nsresult rv; ++ rv = domWindow->OpenDialog(NS_LITERAL_STRING("chrome://traybiff/content/settings.xul"), ++ NS_LITERAL_STRING("Preferences"), ++ NS_LITERAL_STRING("chrome,dialog,centerscreen,dependent"), ++ (nsISupports*)NULL, ++ &newWindow); ++ ++ if (!NS_SUCCEEDED(rv)) { ++ printf("Failed to show prefs chrome!\n"); ++ } ++ } ++} ++ + void nsMessengerFreeDesktopIntegration::OnBiffChange() + { + if (mHasBiff) +@@ -1005,8 +1028,11 @@ + menuItemRestoreWindow.Assign(NS_LITERAL_STRING("Restore window")); + nsXPIDLString menuItemHideWindow; + menuItemHideWindow.Assign(NS_LITERAL_STRING("Hide window")); +- nsXPIDLString menuItemHideIcon; +- menuItemHideIcon.Assign(NS_LITERAL_STRING("Hide icon")); ++ //nsXPIDLString menuItemHideIcon; ++ //menuItemHideIcon.Assign(NS_LITERAL_STRING("Hide icon")); ++ nsXPIDLString menuItemShowPref; ++ menuItemShowPref.Assign(NS_LITERAL_STRING("Preferences")); ++ + + // Retrieve menu item localizations from the string bundle, if possible + nsCOMPtr bundle; +@@ -1018,7 +1044,9 @@ + bundle->GetStringFromName(NS_LITERAL_STRING("trayMenu_NewWindow").get(), getter_Copies(menuItemNewWindow)); + bundle->GetStringFromName(NS_LITERAL_STRING("trayMenu_RestoreWindow").get(), getter_Copies(menuItemRestoreWindow)); + bundle->GetStringFromName(NS_LITERAL_STRING("trayMenu_HideWindow").get(), getter_Copies(menuItemHideWindow)); +- bundle->GetStringFromName(NS_LITERAL_STRING("trayMenu_HideIcon").get(), getter_Copies(menuItemHideIcon)); ++ //bundle->GetStringFromName(NS_LITERAL_STRING("trayMenu_HideIcon").get(), getter_Copies(menuItemHideIcon)); ++ bundle->GetStringFromName(NS_LITERAL_STRING("trayMenu_ShowPref").get(), getter_Copies(menuItemShowPref)); ++ + } + + if (mHasBiff) +@@ -1041,9 +1069,12 @@ + } + g_signal_connect(G_OBJECT(entry), "activate", G_CALLBACK(MenuToggleWindow), this); + gtk_menu_shell_append(GTK_MENU_SHELL(pTrayMenu), entry); +- entry = gtk_menu_item_new_with_label(NS_ConvertUTF16toUTF8(menuItemHideIcon).get()); +- g_signal_connect(G_OBJECT(entry), "activate", G_CALLBACK(MenuHideIcon), this); ++ //entry = gtk_menu_item_new_with_label(NS_ConvertUTF16toUTF8(menuItemHideIcon).get()); ++ //g_signal_connect(G_OBJECT(entry), "activate", G_CALLBACK(MenuHideIcon), this); + gtk_menu_shell_append(GTK_MENU_SHELL(pTrayMenu), entry); ++ entry = gtk_menu_item_new_with_label(NS_ConvertUTF16toUTF8(menuItemShowPref).get()); ++ gtk_menu_shell_append(GTK_MENU_SHELL(pTrayMenu), entry); ++ g_signal_connect(G_OBJECT(entry), "activate", G_CALLBACK(MenuShowPref), this); + + gtk_widget_show_all(pTrayMenu); + g_signal_connect(G_OBJECT(pTrayMenu), "selection-done", G_CALLBACK(TrayIconPopupMenuSelectionDone), this); +@@ -1075,6 +1106,11 @@ + reinterpret_cast(data)->OnActionHideIcon(); + } + ++void nsMessengerFreeDesktopIntegration::MenuShowPref(GtkMenuItem *menuItem, void *data) ++{ ++ reinterpret_cast(data)->OnActionShowPref(); ++} ++ + void nsMessengerFreeDesktopIntegration::MenuReadMail(GtkMenuItem *menuItem, void *data) + { + reinterpret_cast(data)->OnActionReadMail(); +diff -urNad mozilla-traybiff-1.2.3~/components/nsMessengerFreeDesktopIntegration.h mozilla-traybiff-1.2.3/components/nsMessengerFreeDesktopIntegration.h +--- mozilla-traybiff-1.2.3~/components/nsMessengerFreeDesktopIntegration.h 2007-07-23 20:39:31.000000000 +0100 ++++ mozilla-traybiff-1.2.3/components/nsMessengerFreeDesktopIntegration.h 2007-07-23 20:39:32.000000000 +0100 +@@ -130,6 +130,8 @@ + void OnActionToggleWindow(); + // Hide Icon chosen in popup menu. + void OnActionHideIcon(); ++ // Show Preferences window ++ void OnActionShowPref(); + + // GTK+ signal handlers + private: +@@ -139,6 +141,7 @@ + static void MenuReadMail(GtkMenuItem *menuItem, void *data); + static void MenuToggleWindow(GtkMenuItem *menuItem, void *data); + static void MenuHideIcon(GtkMenuItem *menuItem, void *data); ++ static void MenuShowPref(GtkMenuItem *menuItem, void *data); + + // GTK+ tray icon-related members + private: --- mozilla-traybiff-1.2.3.orig/debian/patches/22_new_icon.dpatch +++ mozilla-traybiff-1.2.3/debian/patches/22_new_icon.dpatch @@ -0,0 +1,103 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 22_new_icon.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad mozilla-traybiff-1.2.3~/components/nsMessengerFreeDesktopIntegration.cpp mozilla-traybiff-1.2.3/components/nsMessengerFreeDesktopIntegration.cpp +--- mozilla-traybiff-1.2.3~/components/nsMessengerFreeDesktopIntegration.cpp 2007-07-18 01:22:57.000000000 +0100 ++++ mozilla-traybiff-1.2.3/components/nsMessengerFreeDesktopIntegration.cpp 2007-07-18 22:17:59.000000000 +0100 +@@ -88,6 +88,7 @@ + // One day, we should use an icon from chrome. + // Meanwhile, we'll embed the icon: + #include "trayBiffIcon.h" ++#include "trayBiffIconGrey.h" + + // Path to the New Mail Led control files + const char* HW_INDICATOR_CONTROL_FILENAMES[] = { +@@ -965,7 +966,8 @@ + { + ClearToolTip(); + GError* err = NULL; +- GdkPixbuf* pixbuf = gdk_pixbuf_new_from_file_at_scale(mBrandIconPath.get(), ICON_WIDTH, ICON_HEIGHT, FALSE, &err); ++ //GdkPixbuf* pixbuf = gdk_pixbuf_new_from_file_at_scale(mBrandIconPath.get(), ICON_WIDTH, ICON_HEIGHT, FALSE, &err); ++ GdkPixbuf* pixbuf = gdk_pixbuf_new_from_inline(-1, tray_biff_icon_grey, FALSE, NULL); + if (pixbuf != NULL) + { + egg_status_icon_set_from_pixbuf(mTrayIcon, pixbuf); +diff -urNad mozilla-traybiff-1.2.3~/components/trayBiffIconGrey.h mozilla-traybiff-1.2.3/components/trayBiffIconGrey.h +--- mozilla-traybiff-1.2.3~/components/trayBiffIconGrey.h 1970-01-01 01:00:00.000000000 +0100 ++++ mozilla-traybiff-1.2.3/components/trayBiffIconGrey.h 2007-07-18 22:15:40.000000000 +0100 +@@ -0,0 +1,71 @@ ++/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */ ++ ++#ifdef __SUNPRO_C ++#pragma align 4 (tray_biff_icon_grey) ++#endif ++#ifdef __GNUC__ ++static const guint8 tray_biff_icon_grey[] __attribute__ ((__aligned__ (4))) = ++#else ++static const guint8 tray_biff_icon_grey[] = ++#endif ++{ "" ++ /* Pixbuf magic (0x47646b50) */ ++ "GdkP" ++ /* length: header (24) + pixel_data (836) */ ++ "\0\0\3\\" ++ /* pixdata_type (0x2010002) */ ++ "\2\1\0\2" ++ /* rowstride (64) */ ++ "\0\0\0@" ++ /* width (16) */ ++ "\0\0\0\20" ++ /* height (16) */ ++ "\0\0\0\20" ++ /* pixel_data: */ ++ "\211\0\0\0\0\5\243\270\277\0\0\0\0\0\227\261\267\0\0\0\0\0\227\253\263" ++ "\0\212\0\0\0\0\7\245\273\301\0\235\264\273\0\201\232\241\0\216\253\262" ++ "\0m\204\211\0\231\261\267\0\214\237\246\0\212\0\0\0\0\5\201\233\241\0" ++ "\216\245\262\0\216\230\262\0\216\243\262\0_sw\0\212\0\0\0\0\10\227\261" ++ "\267\0\216\253\262\0\216\232\262\0\216\221\262\0\216\230\262\0\216\253" ++ "\262\0\224\257\266\0\0\0\0\0\202\307\311\317\377\25\302\305\314\377\277" ++ "\301\307\377\273\276\305\377\267\273\301\377\263\267\275\377\257\263" ++ "\271\377\254\260\266\377\250\254\262\377\244\251\256\377\241\246\253" ++ "\377\235\242\247\377\231\236\243\377\225\232\237\377\0\0\0s\303\306\315" ++ "\377\311\315\321\377\360\361\362\377\374\374\374\377\371\371\373\377" ++ "\370\370\372\377\366\366\370\377\205\364\365\370\377\\\337\341\347\377" ++ "\303\307\315\377\217\224\231\377\0\0\0\221\300\303\312\377\356\357\360" ++ "\377\255\263\271\377\353\355\357\377\370\370\372\377\366\366\370\377" ++ "\364\365\370\377\362\363\366\377\361\361\365\377\364\365\370\377\355" ++ "\356\363\377\337\341\347\377\250\257\266\377\317\325\333\377\213\222" ++ "\227\377\0\0\0\223\274\277\306\377\374\374\374\377\351\353\355\377\240" ++ "\250\256\377\347\350\353\377\364\365\370\377\362\363\366\377\361\361" ++ "\365\377\360\360\364\377\355\356\363\377\337\341\347\377\236\245\254" ++ "\377\321\325\333\377\335\340\347\377\210\216\222\377\0\0\0\224\270\274" ++ "\302\377\371\371\373\377\370\370\372\377\344\345\350\377\226\236\244" ++ "\377\341\343\347\377\361\361\365\377\360\360\364\377\355\356\363\377" ++ "\336\340\346\377\224\234\242\377\316\322\330\377\335\340\347\377\330" ++ "\334\344\377\203\212\217\377\0\0\0\224\265\271\277\377\370\370\372\377" ++ "\366\366\370\377\364\365\370\377\334\336\342\377~\210\216\377\335\337" ++ "\343\377\355\356\363\377\335\337\345\377\202\213\220\377\306\313\322" ++ "\377\335\340\347\377\330\334\344\377\324\332\342\377\177\206\213\377" ++ "\0\0\0\224\261\265\273\377\366\366\370\377\364\365\370\377\354\355\360" ++ "\377\223\232\237\377\260\265\272\377\202\213\220\377\225\234\241\377" ++ "}\207\215\377\247\256\263\377\213\224\233\377\323\330\337\377\324\332" ++ "\342\377\320\326\336\377{\203\207\377\0\0\0\224\256\262\270\377\364\365" ++ "\370\377\351\352\355\377\232\242\250\377\316\321\326\377\355\356\363" ++ "\377\350\351\356\377\317\323\331\377\202\335\340\347\3779\276\303\312" ++ "\377\223\234\243\377\311\317\327\377\313\322\333\377w\177\203\377\0\0" ++ "\0\224\252\256\264\377\345\347\353\377\245\254\263\377\333\335\341\377" ++ "\355\356\363\377\352\353\360\377\345\347\355\377\341\344\353\377\335" ++ "\340\347\377\330\334\344\377\324\332\342\377\301\307\317\377\235\245" ++ "\255\377\301\311\323\377t|\200\377\0\0\0\224\246\253\260\377\303\307" ++ "\315\377\343\344\351\377\355\356\363\377\352\353\360\377\345\347\355" ++ "\377\341\344\353\377\335\340\347\377\330\334\344\377\324\332\342\377" ++ "\320\326\336\377\313\322\333\377\300\307\320\377\260\270\300\377px|\377" ++ "\0\0\0\224\240\245\252\364\237\244\251\377\233\240\245\377\227\234\241" ++ "\377\223\231\237\377\220\226\232\377\213\222\227\377\210\217\224\377" ++ "\204\213\220\377\201\211\215\377}\205\211\377y\201\205\377v~\202\377" ++ "rz~\377ksw\377\0\0\0\220\0\0\0$\0\0\0k\0\0\0\220\213\0\0\0\222\2\0\0" ++ "\0\217\0\0\0j"}; ++ ++ --- mozilla-traybiff-1.2.3.orig/debian/patches/23_window_close.dpatch +++ mozilla-traybiff-1.2.3/debian/patches/23_window_close.dpatch @@ -0,0 +1,106 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 23_window_close.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad mozilla-traybiff-1.2.3~/components/nsMessengerFreeDesktopIntegration.cpp mozilla-traybiff-1.2.3/components/nsMessengerFreeDesktopIntegration.cpp +--- mozilla-traybiff-1.2.3~/components/nsMessengerFreeDesktopIntegration.cpp 2007-07-19 00:08:13.000000000 +0100 ++++ mozilla-traybiff-1.2.3/components/nsMessengerFreeDesktopIntegration.cpp 2007-07-19 00:08:24.000000000 +0100 +@@ -395,7 +395,12 @@ + if (!iconFile) + ResolveIconName(NS_LITERAL_STRING("mozicon16"), NS_LITERAL_STRING(".xpm"), getter_AddRefs(iconFile)); + if (iconFile) +- iconFile->GetNativePath(mBrandIconPath); ++ iconFile->GetNativePath(mBrandIconPath); ++ ++ nsCOMPtr mediator ( do_GetService(NS_WINDOWMEDIATOR_CONTRACTID) ); ++ NS_ASSERTION(mediator, "no mediator"); ++ mediator->AddListener(this); ++ + } + + nsMessengerFreeDesktopIntegration::~nsMessengerFreeDesktopIntegration() +@@ -649,6 +654,25 @@ + return NS_OK; + } + ++NS_IMETHODIMP ++nsMessengerFreeDesktopIntegration::OnWindowTitleChange(nsIXULWindow *window, const PRUnichar *newTitle) ++{ ++ return NS_ERROR_NOT_IMPLEMENTED; ++} ++ ++NS_IMETHODIMP ++nsMessengerFreeDesktopIntegration::OnOpenWindow(nsIXULWindow *window) ++{ ++ return NS_ERROR_NOT_IMPLEMENTED; ++} ++ ++NS_IMETHODIMP ++nsMessengerFreeDesktopIntegration::OnCloseWindow(nsIXULWindow *window) ++{ ++ printf("In window close event\n"); ++ return NS_OK; ++} ++ + nsresult nsMessengerFreeDesktopIntegration::GetStringBundle(const char* src, nsIStringBundle **aBundle) + { + nsresult rv = NS_OK; +diff -urNad mozilla-traybiff-1.2.3~/components/nsMessengerFreeDesktopIntegration.h mozilla-traybiff-1.2.3/components/nsMessengerFreeDesktopIntegration.h +--- mozilla-traybiff-1.2.3~/components/nsMessengerFreeDesktopIntegration.h 2007-07-19 00:08:13.000000000 +0100 ++++ mozilla-traybiff-1.2.3/components/nsMessengerFreeDesktopIntegration.h 2007-07-19 00:08:13.000000000 +0100 +@@ -54,6 +54,7 @@ + #include + #include + #include ++#include + + #include "eggstatusicon.h" + #include +@@ -70,7 +71,8 @@ + public nsIFolderListener, + public nsIFolderListener10, + public nsIObserver, +- public nsSupportsWeakReference ++ public nsSupportsWeakReference, ++ public nsIWindowMediatorListener + { + public: + nsMessengerFreeDesktopIntegration(); +@@ -82,6 +84,7 @@ + NS_DECL_NSIFOLDERLISTENER + NS_DECL_NSIOBSERVER + NS_DECL_NSIMESSENGERFREEDESKTOPINTEGRATION ++ NS_DECL_NSIWINDOWMEDIATORLISTENER + + // Instead of NS_DECL_NSIFOLDERLISTENER10 + public: +@@ -92,7 +95,7 @@ + NS_IMETHOD OnItemBoolPropertyChanged(nsISupports *item, nsIAtom *property, PRBool oldValue, PRBool newValue); + NS_IMETHOD OnItemUnicharPropertyChanged(nsISupports *item, nsIAtom *property, const PRUnichar *oldValue, const PRUnichar *newValue); + NS_IMETHOD OnItemPropertyFlagChanged(nsISupports *item, nsIAtom *property, PRUint32 oldFlag, PRUint32 newFlag); +- ++ + private: + void ApplyPrefs(); + void FillToolTipInfo(); +@@ -106,7 +109,7 @@ + void OnBiffChange(); + nsresult GetFirstFolderWithNewMail(char ** aFolderURI, char ** aMessageURI); + nsresult GetStringBundle(const char* src, nsIStringBundle **aBundle); +- ++ + private: + nsCOMPtr mPrefBranch; + PRBool mShowBiffIcon, mUseHwIndicator, mAlwaysShowBiffIcon; +@@ -132,7 +135,7 @@ + void OnActionHideIcon(); + // Show Preferences window + void OnActionShowPref(); +- ++ + // GTK+ signal handlers + private: + static void TrayIconActivate(GtkWidget *trayIcon, void *data); --- mozilla-traybiff-1.2.3.orig/debian/patches/02_makefile_fix-patch.dpatch +++ mozilla-traybiff-1.2.3/debian/patches/02_makefile_fix-patch.dpatch @@ -0,0 +1,53 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_makefile_fix-patch.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fixes makefile to use thunderbird-config instead of mozilla-thunderbird-config for new tb builds + +@DPATCH@ +diff -urNad mozilla-traybiff-1.2.3~/Makefile mozilla-traybiff-1.2.3/Makefile +--- mozilla-traybiff-1.2.3~/Makefile 2007-05-28 14:11:15.000000000 +0100 ++++ mozilla-traybiff-1.2.3/Makefile 2007-05-28 14:11:16.000000000 +0100 +@@ -19,7 +19,7 @@ + XPI_EXTRA_FILES = install.js + endif + ifeq ($(MOZILLA_PLATFORM),tbird) +-REAL_CONFIG = mozilla-thunderbird-config ++REAL_CONFIG = icedove-config + XPI_VERSION := $(XPI_VERSION)-tb${MOZILLA_VERSION} + XPI_EXTRA_FILES = install.rdf + endif +diff -urNad mozilla-traybiff-1.2.3~/components/Makefile mozilla-traybiff-1.2.3/components/Makefile +--- mozilla-traybiff-1.2.3~/components/Makefile 2007-05-28 14:11:15.000000000 +0100 ++++ mozilla-traybiff-1.2.3/components/Makefile 2007-05-28 14:11:38.000000000 +0100 +@@ -14,7 +14,7 @@ + + # This doesn't work, so we'll hardcode for now: + MOZILLA_IDLFLAGS := \ +- $(shell $(MOZILLA_CONFIG) --idlflags) ++ $(shell $(REAL_CONFIG) --idlflags) + + COMPONENT_NAME = libtraybiff + +@@ -27,7 +27,7 @@ + $(shell pkg-config --libs $(GTK_PACKAGE)) + + MOZ_INCLUDES := \ +- $(shell $(MOZILLA_CONFIG) --cflags) ++ $(shell $(MOZILLA_CONFIG) --cflags) $(shell $(REAL_CONFIG) --cflags) + + CFLAGS += \ + -fPIC +@@ -84,10 +84,10 @@ + gdk-pixbuf-csource --raw --name=tray_biff_icon $< > $@ + + trayBiffModule.o: trayBiffModule.cpp nsMessengerFreeDesktopIntegration.h nsIMessengerFreeDesktopIntegration.h +- ${CXX} ${MOZ_INCLUDES} ${GTK_CFLAGS} ${CXXFLAGS} ${INTERNAL_FLAGS} -c $< -o $@ ++ ${CXX} ${MOZILLA_IDLFLAGS} ${MOZ_INCLUDES} ${GTK_CFLAGS} ${CXXFLAGS} ${INTERNAL_FLAGS} -c $< -o $@ + + nsMessengerFreeDesktopIntegration.o: nsMessengerFreeDesktopIntegration.cpp nsMessengerFreeDesktopIntegration.h trayBiffIcon.h nsIMessengerFreeDesktopIntegration.h +- ${CXX} ${MOZ_INCLUDES} ${GTK_CFLAGS} ${CXXFLAGS} ${INTERNAL_FLAGS} -c $< -o $@ ++ ${CXX} ${MOZILLA_IDLFLAGS} ${MOZ_INCLUDES} ${GTK_CFLAGS} ${CXXFLAGS} ${INTERNAL_FLAGS} -c $< -o $@ + + eggtrayicon.o: eggtrayicon.c eggtrayicon.h + ${CC} ${GTK_CFLAGS} ${CFLAGS} -DEGG_COMPILATION -c $< -o $@ --- mozilla-traybiff-1.2.3.orig/debian/patches/06_iceape_support.dpatch +++ mozilla-traybiff-1.2.3/debian/patches/06_iceape_support.dpatch @@ -0,0 +1,49 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 06_iceape_support.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad mozilla-traybiff-1.2.2~/Makefile mozilla-traybiff-1.2.2/Makefile +--- mozilla-traybiff-1.2.2~/Makefile 2007-04-26 13:47:33.000000000 +0100 ++++ mozilla-traybiff-1.2.2/Makefile 2007-04-26 13:47:34.000000000 +0100 +@@ -14,7 +14,7 @@ + MOZILLA_VERSION = $(shell $(REAL_CONFIG) --version) + + ifeq ($(MOZILLA_PLATFORM),suite) +-REAL_CONFIG = mozilla-config ++REAL_CONFIG = $(CURDIR)/debian/iceape-config + XPI_VERSION := $(XPI_VERSION)-moz${MOZILLA_VERSION} + XPI_EXTRA_FILES = install.js + endif +diff -urNad mozilla-traybiff-1.2.2~/chrome/content/traybiff/prefsOverlay.xul mozilla-traybiff-1.2.2/chrome/content/traybiff/prefsOverlay.xul +--- mozilla-traybiff-1.2.2~/chrome/content/traybiff/prefsOverlay.xul 2007-04-26 13:47:28.000000000 +0100 ++++ mozilla-traybiff-1.2.2/chrome/content/traybiff/prefsOverlay.xul 2007-04-26 13:47:34.000000000 +0100 +@@ -18,7 +18,7 @@ + + + +- ++ + + + +diff -urNad mozilla-traybiff-1.2.2~/components/Makefile mozilla-traybiff-1.2.2/components/Makefile +--- mozilla-traybiff-1.2.2~/components/Makefile 2007-04-26 13:47:28.000000000 +0100 ++++ mozilla-traybiff-1.2.2/components/Makefile 2007-04-26 13:47:34.000000000 +0100 +@@ -9,8 +9,14 @@ + MOZILLA_CONFIG = ./mozilla-config --real-config $(REAL_CONFIG) + MOZILLA_LIB_PREFIX := \ + $(shell $(MOZILLA_CONFIG) --lib-prefix) ++ifeq ($(MOZILLA_PLATFORM),suite) ++MOZILLA_UTIL_PREFIX := \ ++ $(shell $(REAL_CONFIG) --util-prefix) ++endif ++ifeq ($(MOZILLA_PLATFORM),tbird) + MOZILLA_UTIL_PREFIX := \ + $(shell $(MOZILLA_CONFIG) --util-prefix) ++endif + + # This doesn't work, so we'll hardcode for now: + MOZILLA_IDLFLAGS := \ --- mozilla-traybiff-1.2.3.orig/debian/patches/03_platform_fix-patch.dpatch +++ mozilla-traybiff-1.2.3/debian/patches/03_platform_fix-patch.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_platform_fix-patch.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: handles uname -u returning unknown cleaner + +@DPATCH@ + +--- traybiff-1.2.2.orig/get-platform ++++ traybiff-1.2.2/get-platform +@@ -24,6 +24,9 @@ + x86_64 | sparc | ppc | ia64) + PLATFORM=${PLATFORM}${MACHINE} + ;; ++unknown) ++ PLATFORM=${PLATFORM}`uname -m` ++ ;; + esac + + if ${CC} --version 2>/dev/null | grep GCC > /dev/null; then