--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: unblock: iceweasel/3.5.16-3, iceape/2.0.11-2
- From: Mike Hommey <mh+reportbug@glandium.org>
- Date: Thu, 30 Dec 2010 09:12:16 +0100
- Message-id: <20101230081216.4295.36727.reportbug@jigen.glandium.org>
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock packages iceweasel and iceape
See http://lists.debian.org/debian-release/2010/12/msg00944.html
I'm attaching here the diffs (against 3.5.16-1 for iceweasel, since
that one was unblocked, and against 2.0.11-1 for iceape). They can look
pretty scary by their size, but they actually don't touch anything that
is involved during the build process (except for the test suite in
iceweasel case).
There should be another iceweasel upload to fix 3 more issues[1][2][3]
in a few days, but 3.5.16 has been waiting for too long already to
migrate.
unblock iceweasel/3.5.16-3
unblock iceape/2.0.11-2
1. Fix iceweasel's README.Debian, which I actually forgot to do in
3.5.16-3
2. Add a timeout to the reftest suite: there have been issues,
recently, though after a couple of retries, it ends up working. But
the sparc and hppa buildds have better things to do than retry to
build iceweasel because somehow its test suite got stuck.
3. Revert the postinst change, it's actually not any useful.
-- System Information:
Debian Release: 6.0
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-5-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
debian/changelog | 34 ++++
debian/control | 4 +-
debian/control.in | 2 +-
debian/extra-stuff/Makefile.in | 19 +--
debian/extra-stuff/debUpdateNotifier.js | 206 --------------------
debian/extra-stuff/debUpdateNotifier.properties | 2 -
debian/extra-stuff/filemonitor/Makefile.in | 81 --------
.../filemonitor/debGIOFileMonitorService.cpp | 120 ------------
.../filemonitor/debGIOFileMonitorService.h | 52 -----
.../filemonitor/debIGIOFileMonitorService.idl | 65 ------
debian/extra-stuff/packages-static.xulrunner | 5 -
debian/iceweasel.mozconfig | 2 +
...Add-a-2-minutes-timeout-on-xpcshell-tests.patch | 44 ++++
debian/patches/series | 1 +
debian/remove.nonfree | 80 --------
debian/repack.py | 131 +++++++++++++
debian/source.filter | 72 +++++++
debian/watch | 2 +-
debian/xulrunner-GRE_VERSION.install.in | 1 -
debian/xulrunner-GRE_VERSION.postinst.in | 7 +-
debian/xulrunner.mozconfig | 2 +
testing/xpcshell/runxpcshelltests.py | 18 ++-
22 files changed, 313 insertions(+), 637 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7593fb2..8c5d1bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,37 @@
+iceweasel (3.5.16-3) unstable; urgency=low
+
+ * debian/xulrunner-GRE_VERSION.postinst.in: Trigger components registration
+ after postinst with dpkg-trigger.
+
+ * testing/xpcshell/head.js: Revert previous change.
+ * testing/xpcshell/runxpcshelltests.py: Add a 2 minutes timeout on xpcshell
+ tests. The previous approach (from within xpcshell) didn't seem to work
+ well, so this time, just kill the process from outside.
+
+ -- Mike Hommey <glandium@debian.org> Mon, 27 Dec 2010 10:54:18 +0100
+
+iceweasel (3.5.16-2) unstable; urgency=low
+
+ * debian/extra-stuff/Makefile.in, debian/extra-stuff/debUpdateNotifier.*,
+ debian/extra-stuff/filemonitor/,
+ debian/extra-stuff/packages-static.xulrunner,
+ debian/xulrunner-GRE_VERSION.install.in: Remove update notifier, it's
+ not quite as helpful as it should be for squeeze.
+ * debian/control: Refresh from debian/control.in.
+ * debian/control.*: Relax libglib2.0-dev build dependency.
+ 2.18.0 was only needed for filemonitor, which we just removed.
+ * debian/*.mozconfig: Add a comment on top of mozconfig files to avoid
+ people using them.
+ * debian/remove.nonfree, debian/repack.py, debian/source.filter,
+ debian/watch: Update debian/watch and provide a script repacking
+ upstream source tarballs.
+
+ * testing/xpcshell/head.js: Add a 2 minutes timeout on xpcshell tests.
+ This will avoid recurring build failures on kfreebsd-* due to buildd
+ weirdness.
+
+ -- Mike Hommey <glandium@debian.org> Fri, 24 Dec 2010 15:26:40 +0100
+
iceweasel (3.5.16-1) unstable; urgency=high
* New upstream release.
diff --git a/debian/control b/debian/control
index 23b3219..4d43be9 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: autotools-dev,
libxt-dev,
libidl-dev,
libgtk2.0-dev (>= 2.10),
- libglib2.0-dev (>= 2.18.0),
+ libglib2.0-dev (>= 2.16.0),
libstartup-notification0-dev,
libgnomevfs2-dev,
libgnome2-dev,
@@ -54,7 +54,7 @@ Depends: ${shlibs:Depends},
fontconfig,
procps,
debianutils (>= 1.16),
- xulrunner-1.9.1 (>= 1.9.1.14)
+ xulrunner-1.9.1 (>= 1.9.1.16)
Suggests: ttf-lyx | latex-xft-fonts,
xfonts-mathml,
ttf-mathematica4.1,
diff --git a/debian/control.in b/debian/control.in
index 1a6782c..6f8d9d9 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -9,7 +9,7 @@ Build-Depends: autotools-dev,
libxt-dev,
libidl-dev,
libgtk2.0-dev (>= 2.10),
- libglib2.0-dev (>= 2.18.0),
+ libglib2.0-dev (>= 2.16.0),
libstartup-notification0-dev,
libgnomevfs2-dev,
libgnome2-dev,
diff --git a/debian/extra-stuff/Makefile.in b/debian/extra-stuff/Makefile.in
index 2e998cb..533e549 100644
--- a/debian/extra-stuff/Makefile.in
+++ b/debian/extra-stuff/Makefile.in
@@ -5,11 +5,9 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-DIRS := filemonitor
-
PREF_JS_EXPORTS := places.js
-EXTRA_COMPONENTS := addonsInfo.js debUpdateNotifier.js
+EXTRA_COMPONENTS := addonsInfo.js
include $(topsrcdir)/config/rules.mk
@@ -22,21 +20,8 @@ DEFINES += -DAPP_UA_NAME=a -DAPP_VERSION=0
packages-static: $(topsrcdir)/browser/installer/unix/packages-static $(srcdir)/packages-static.$(MOZ_APP_NAME)
$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $^ | sed 's/^\[browser\]/[$(MOZ_APP_NAME)]/' > $@
-GARBAGE += places.js packages-static jar.mn
+GARBAGE += places.js packages-static
libs:: packages-static
libs::
$(SYSINSTALL) $(IFLAGS2) $(srcdir)/reportbug-helper-script $(DIST)/bin
-
-ifeq (,$(wildcard jar.mn))
-libs::jar.mn
- $(MAKE) realchrome JAR_MANIFEST=jar.mn
-endif
-
-locales:
- mkdir $@
-
-GARBAGE_DIRS += locales
-
-jar.mn: debUpdateNotifier.properties locales
- awk 'BEGIN { print "debian.jar:" } { l = $$1 } $$2 == "message" { print "% locale debian " l " %locale/" l "/debian/"; print " locale/" l "/debian/$(notdir $<) (locales/" l ")" } { $$0=substr($$0,length($$1)+2); print $$0 > "locales/" l}' $< > $@
diff --git a/debian/extra-stuff/debUpdateNotifier.js b/debian/extra-stuff/debUpdateNotifier.js
deleted file mode 100644
index ee47261..0000000
--- a/debian/extra-stuff/debUpdateNotifier.js
+++ /dev/null
@@ -1,206 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is debAbout.
- *
- * The Initial Developer of the Original Code is
- * Mike Hommey.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cr = Components.results;
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-
-function fileAppend(file, leaf) {
- file.append(leaf);
- return file;
-}
-
-function setResult(result, file, type) {
- try {
- file.normalize();
- } catch(e) { }
- result[file.path] = type;
-}
-
-function monitoredList() {
- var result = {};
- var app = Cc["@mozilla.org/xre/app-info;1"]
- .getService(Ci.nsIXULAppInfo).QueryInterface(Ci.nsIXULRuntime);
- var ds = Cc["@mozilla.org/file/directory_service;1"]
- .getService(Ci.nsIProperties);
-
- // $GREDIR/platform.ini
- var gredir = ds.get("GreD", Ci.nsIFile);
- setResult(result, gredir, "gre");
-
- // $APPDIR/application.ini if $APPDIR != $GREDIR
- var dir = ds.get("CurProcD", Ci.nsIFile);
- if (!dir.equals(gredir))
- setResult(result, dir, "app");
-
- // $APPDIR/extensions
- setResult(result, fileAppend(dir, "extensions"), "extdir");
-
- // system /usr/share extensions directory
- dir = ds.get("XRESysSExtPD", Ci.nsIFile);
- setResult(result, fileAppend(dir, app.ID), "extdir");
-
- // system /usr/lib extensions directory
- dir = ds.get("XRESysLExtPD", Ci.nsIFile);
- setResult(result, fileAppend(dir, app.ID), "extdir");
-
- // plugins directories
- var userplugins = ds.get("UserPlugins", Ci.nsIFile);
- dir = ds.get("APluginsDL", Ci.nsISimpleEnumerator);
- while (dir.hasMoreElements()) {
- var plugindir = dir.getNext().QueryInterface(Ci.nsIFile);
- if (!userplugins || !plugindir.equals(userplugins))
- setResult(result, plugindir, "plugdir");
- }
-
- // individual plugins
- var phs = Cc["@mozilla.org/plugin/host;1"]
- .getService(Ci.nsIPluginHost);
- var plugins = phs.getPluginTags({ });
- for (var i = 0; i < plugins.length; i++) {
- var file = Cc["@mozilla.org/file/local;1"]
- .createInstance(Ci.nsILocalFile);
- var plugin = plugins[i];
- if (Ci.nsIPluginTag_1_9_2)
- plugin = plugin.QueryInterface(Ci.nsIPluginTag_1_9_2);
- file.initWithPath(plugin.fullpath ? plugin.fullpath
- : plugin.filename);
- if (!userplugins || !file.parent.equals(userplugins))
- setResult(result, file, "plugin");
- }
-
- // individual extensions
- var em = Cc["@mozilla.org/extensions/manager;1"]
- .getService(Ci.nsIExtensionManager);
- var extensions = em.getItemList(Ci.nsIUpdateItem.TYPE_ANY, { });
- for (var i = 0; i < extensions.length; i++) {
- var extension = extensions[i];
- if (extension.installLocation != "app-profile" &&
- extension.installLocation != "app-system-user") {
- var location = em.getInstallLocation(extension.id)
- .getItemLocation(extension.id);
- setResult(result, location, "ext");
- }
- }
-
- return result;
-}
-
-function fmObserver() {}
-
-fmObserver.prototype = {
- notify: function(file, event) {
- if (this.notified)
- return;
- this.notified = true;
- if (!this.list)
- this.list = monitoredList();
- monitoredfile = file;
- if (!this.list[monitoredfile.path])
- monitoredfile = file.parent;
- if (this.list[monitoredfile.path]) {
- var name;
- var sbs = Cc["@mozilla.org/intl/stringbundle;1"]
- .getService(Ci.nsIStringBundleService);
- try {
- name = sbs.createBundle("chrome://branding/locale/brand.properties")
- .GetStringFromName("brandShortName");
- } catch(e) {
- name = Cc["@mozilla.org/xre/app-info;1"]
- .getService(Ci.nsIXULAppInfo)
- .QueryInterface(Ci.nsIXULRuntime).name;
- }
- var dun = sbs.createBundle("chrome://debian/locale/debUpdateNotifier.properties");
- var title = dun.GetStringFromName("title");
- var text = dun.formatStringFromName("message", [name], 1);
-
- if (!Cc["@mozilla.org/embedcomp/prompt-service;1"]
- .getService(Ci.nsIPromptService)
- .confirm(null, title, text))
- return;
-
- var os = Cc["@mozilla.org/observer-service;1"]
- .getService(Ci.nsIObserverService);
- var cancelQuit = Cc["@mozilla.org/supports-PRBool;1"]
- .createInstance(Ci.nsISupportsPRBool);
- os.notifyObservers(cancelQuit, "quit-application-requested", "restart");
-
- // Something aborted the quit process.
- if (cancelQuit.data)
- return;
-
- Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci.nsIAppStartup)
- .quit(Ci.nsIAppStartup.eRestart | Ci.nsIAppStartup.eAttemptQuit);
- }
- }
-}
-
-function debUpdateNotifier() {}
-
-debUpdateNotifier.prototype = {
- classDescription: "Debian system updates notifier",
- classID: Components.ID("{7ff849af-8344-4784-a575-09c172ff8b72}"),
- contractID: "@debian.org/update-notifier;1",
- _xpcom_categories: [{category: "app-startup", service: true}],
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsISupportsWeakReference]),
- observe: function (subject, topic, data) {
- if (topic == "app-startup") {
- var os = Cc["@mozilla.org/observer-service;1"]
- .getService(Ci.nsIObserverService);
- os.addObserver(this, "final-ui-startup", true);
- }
- if (topic != "final-ui-startup") return;
- var fmo = new fmObserver();
- var fm = Cc["@debian.org/gio-file-monitor-service;1"]
- .getService(Ci.debIGIOFileMonitorService);
-
- var list = monitoredList();
- for (var path in list) {
- var file = Cc["@mozilla.org/file/local;1"]
- .createInstance(Ci.nsILocalFile);
- file.initWithPath(path);
- // We don't want to monitor e.g. /usr/lib/mozilla/plugins/libjavaplugin.so
- // when we already monitor /usr/lib/mozilla/plugins.
- // But we want to monitor subdirectories.
- if (list[path].substr(-3) == "dir" || ! list[file.parent.path])
- fm.monitor(file, fmo);
- }
- }
-}
-
-var NSGetModule = XPCOMUtils.generateNSGetModule([debUpdateNotifier]);
diff --git a/debian/extra-stuff/debUpdateNotifier.properties b/debian/extra-stuff/debUpdateNotifier.properties
deleted file mode 100644
index 1ae1b8f..0000000
--- a/debian/extra-stuff/debUpdateNotifier.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-en-US title = Please restart
-en-US message = %1$S, an extension or a plugin has been installed, upgraded or removed by the system.\nIt is strongly recommended to restart %1$S.\nDo you want to restart it now?
diff --git a/debian/extra-stuff/filemonitor/Makefile.in b/debian/extra-stuff/filemonitor/Makefile.in
deleted file mode 100644
index 6c8e688..0000000
--- a/debian/extra-stuff/filemonitor/Makefile.in
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Mike Hommey <mh@glandium.org>.
-# Portions created by the Initial Developer are Copyright (C) 2010
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH = ../../..
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE = giofilemonitor
-LIBRARY_NAME = giofilemonitor
-IS_COMPONENT = 1
-FORCE_SHARED_LIB = 1
-
-REQUIRES = \
- xpcom \
- string \
- $(NULL)
-
-XPIDLSRCS += debIGIOFileMonitorService.idl
-CPPSRCS += debGIOFileMonitorService.cpp
-
-EXTRA_DSO_LDOPTS += \
- $(XPCOM_GLUE_LDOPTS) \
- $(NSPR_LIBS)
-
-ifdef MOZ_ENABLE_GIO # Should be defined from xulrunner 1.9.3
-EXTRA_DSO_LDOPTS += $(MOZ_GIO_LIBS)
-else
-EXTRA_DSO_LDOPTS += $(GLIB_LIBS) -lgio-2.0 # This is ugly, but it's a local build rule
-endif
-
-include $(topsrcdir)/config/rules.mk
-
-ifdef MOZ_ENABLE_GIO
-CXXFLAGS += $(MOZ_GIO_CFLAGS)
-else
-CXXFLAGS += $(GLIB_CFLAGS)
-endif
-
-CXXFLAGS += $(XPCOM_GLUE_CFLAGS)
-
-LOCAL_INCLUDES := -I$(XPIDL_GEN_DIR)
-
-export::
- rm $(IDL_DIR)/$(XPIDLSRCS) $(PUBLIC)/$(patsubst %.idl,%.h, $(XPIDLSRCS))
diff --git a/debian/extra-stuff/filemonitor/debGIOFileMonitorService.cpp b/debian/extra-stuff/filemonitor/debGIOFileMonitorService.cpp
deleted file mode 100644
index a3c48a9..0000000
--- a/debian/extra-stuff/filemonitor/debGIOFileMonitorService.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Mike Hommey <mh@glandium.org>.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsWeakReference.h"
-#include "debGIOFileMonitorService.h"
-#include "nsIGenericFactory.h"
-#include "nsStringAPI.h"
-#include "nsILocalFile.h"
-
-extern "C" {
-/* #pragma are only here because I don't want to patch build/system-headers
- while this component lives in debian/ */
-#pragma GCC visibility push(default)
-#include <gio/gio.h>
-#pragma GCC visibility pop
-}
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(debGIOFileMonitorService)
-
-static const nsModuleComponentInfo components[] = {
- { "GIO File Monitor Service",
- DEB_GIOFILEMONITORSERVICE_CID,
- DEB_GIOFILEMONITORSERVICE_CONTRACTID,
- debGIOFileMonitorServiceConstructor }
-};
-
-NS_IMPL_NSGETMODULE(giofilemonitor, components)
-
-NS_IMPL_ISUPPORTS1(debGIOFileMonitorService, debIGIOFileMonitorService)
-
-static void file_changed(GFileMonitor *aMonitor,
- GFile *aFile,
- GFile *aOther_file,
- GFileMonitorEvent aEvent_type,
- debIGIOFileMonitorObserver *aObserver)
-{
- /* aOther_file is ignored, it doesn't seem to be ever used.
- * We also don't support G_FILE_MONITOR_EVENT_PRE_UNMOUNT and
- * G_FILE_MONITOR_EVENT_UNMOUNTED events. */
- if (!aObserver || !aFile || (aEvent_type >= G_FILE_MONITOR_EVENT_PRE_UNMOUNT))
- return;
-
- nsresult rv;
- nsCOMPtr<debIGIOFileMonitorObserver> observer = do_QueryInterface(aObserver, &rv);
- if (NS_FAILED(rv)) return;
-
- nsCOMPtr<nsILocalFile> file;
- char *path = g_file_get_path(aFile);
- rv = NS_NewNativeLocalFile(nsDependentCString(path), PR_FALSE, getter_AddRefs(file));
- g_free(path);
- if (NS_FAILED(rv)) return;
-
- observer->Notify(file, (debGIOFileMonitorEvent) aEvent_type);
-}
-
-NS_IMETHODIMP
-debGIOFileMonitorService::Monitor(nsIFile *aFile, debIGIOFileMonitorObserver *aObserver)
-{
- if (!aFile || !aObserver)
- return NS_ERROR_FAILURE;
-
- nsresult rv;
- nsCAutoString path;
- rv = aFile->GetNativePath(path);
- NS_ENSURE_SUCCESS(rv, rv);
-
- if (path.IsEmpty())
- return NS_ERROR_FAILURE;
-
- GFile *monitored_file = g_file_new_for_path(path.get());
- if (!monitored_file)
- return NS_ERROR_FAILURE;
-
- GFileMonitor *monitor = g_file_monitor(monitored_file, G_FILE_MONITOR_NONE, NULL, NULL);
- g_object_unref(monitored_file);
-
- if (!monitor)
- return NS_ERROR_FAILURE;
-
- NS_ENSURE_SUCCESS(rv, rv);
-
- /* Keep a reference of the observer */
- aObserver->AddRef();
- g_signal_connect(monitor, "changed", G_CALLBACK(file_changed), aObserver);
-
- return NS_OK;
-}
diff --git a/debian/extra-stuff/filemonitor/debGIOFileMonitorService.h b/debian/extra-stuff/filemonitor/debGIOFileMonitorService.h
deleted file mode 100644
index 1650f0b..0000000
--- a/debian/extra-stuff/filemonitor/debGIOFileMonitorService.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Mike Hommey <mh@glandium.org>.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef debGIOFileMonitorService_h_
-#define debGIOFileMonitorService_h_
-
-#include "debIGIOFileMonitorService.h"
-
-#define DEB_GIOFILEMONITORSERVICE_CID \
-{0x8cf6024a, 0x6028, 0x4d0d, {0xbc, 0x47, 0x42, 0x1e, 0xd4, 0xad, 0x3d, 0x40}}
-
-class debGIOFileMonitorService : public debIGIOFileMonitorService
-{
-public:
- NS_DECL_ISUPPORTS
- NS_DECL_DEBIGIOFILEMONITORSERVICE
-};
-
-#endif
diff --git a/debian/extra-stuff/filemonitor/debIGIOFileMonitorService.idl b/debian/extra-stuff/filemonitor/debIGIOFileMonitorService.idl
deleted file mode 100644
index 1fd8d73..0000000
--- a/debian/extra-stuff/filemonitor/debIGIOFileMonitorService.idl
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Mike Hommey <mh@glandium.org>.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsISupports.idl"
-#include "nsIFile.idl"
-
-typedef long debGIOFileMonitorEvent;
-%{ C++
-enum {
- DEB_GIO_FILE_MONITOR_EVENT_CHANGED = 0,
- DEB_GIO_FILE_MONITOR_EVENT_CHANGES_DONE_HINT,
- DEB_GIO_FILE_MONITOR_EVENT_DELETED,
- DEB_GIO_FILE_MONITOR_EVENT_CREATED,
- DEB_GIO_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED
-};
-%}
-
-[scriptable, uuid(caf63993-5b22-4d0b-a4f5-97a7dfd28e8b)]
-interface debIGIOFileMonitorObserver: nsISupports
-{
- void notify(in nsIFile file, in debGIOFileMonitorEvent event_type);
-};
-
-[scriptable, uuid(c7cc29a4-a2c7-4f4c-9175-fa1f22201625)]
-interface debIGIOFileMonitorService: nsISupports
-{
- void monitor(in nsIFile file, in debIGIOFileMonitorObserver observer);
-};
-
-%{C++
-#define DEB_GIOFILEMONITORSERVICE_CONTRACTID "@debian.org/gio-file-monitor-service;1"
-%}
diff --git a/debian/extra-stuff/packages-static.xulrunner b/debian/extra-stuff/packages-static.xulrunner
index 5d8633d..a1c241c 100644
--- a/debian/extra-stuff/packages-static.xulrunner
+++ b/debian/extra-stuff/packages-static.xulrunner
@@ -11,9 +11,4 @@ bin/xulrunner-stub
[debian]
bin/reportbug-helper-script
bin/components/addonsInfo.js
-bin/components/debUpdateNotifier.js
-bin/components/giofilemonitor.xpt
-bin/components/libgiofilemonitor.so
bin/defaults/pref/places.js
-bin/chrome/debian.jar
-bin/chrome/debian.manifest
diff --git a/debian/iceweasel.mozconfig b/debian/iceweasel.mozconfig
index 28cd46a..4ec07f4 100644
--- a/debian/iceweasel.mozconfig
+++ b/debian/iceweasel.mozconfig
@@ -1,3 +1,5 @@
+# Please don't use this mozconfig unless you are planning to build
+# packages for Debian or a derivative.
. $topsrcdir/browser/config/mozconfig
ac_add_options --with-user-appdir=.mozilla
ac_add_options --disable-installer
diff --git a/debian/patches/debian-hacks/Add-a-2-minutes-timeout-on-xpcshell-tests.patch b/debian/patches/debian-hacks/Add-a-2-minutes-timeout-on-xpcshell-tests.patch
new file mode 100644
index 0000000..0f6a7e1
--- /dev/null
+++ b/debian/patches/debian-hacks/Add-a-2-minutes-timeout-on-xpcshell-tests.patch
@@ -0,0 +1,44 @@
+From: Mike Hommey <mh@glandium.org>
+Date: Mon, 27 Dec 2010 10:44:28 +0100
+Subject: [PATCH] Add a 2 minutes timeout on xpcshell tests
+
+---
+ testing/xpcshell/runxpcshelltests.py | 18 ++++++++++++++++--
+ 1 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/testing/xpcshell/runxpcshelltests.py b/testing/xpcshell/runxpcshelltests.py
+index 30f9bba..b93bf37 100644
+--- a/testing/xpcshell/runxpcshelltests.py
++++ b/testing/xpcshell/runxpcshelltests.py
+@@ -37,7 +37,7 @@
+ #
+ # ***** END LICENSE BLOCK ***** */
+
+-import re, sys, os, os.path, logging, shutil, signal
++import re, sys, os, os.path, logging, shutil, signal, select
+ from glob import glob
+ from optparse import OptionParser
+ from subprocess import Popen, PIPE, STDOUT
+@@ -225,7 +225,21 @@ def runTests(xpcshell, xrePath=None, symbolsPath=None,
+ # - don't move this line above Popen, or child will inherit the SIG_IGN
+ signal.signal(signal.SIGINT, signal.SIG_IGN)
+ # |stderr == None| as |pStderr| was either |None| or redirected to |stdout|.
+- stdout, stderr = proc.communicate()
++ if pStdout == PIPE:
++ stdout = ""
++ while True:
++ (r, w, e) = select.select([proc.stdout], [], [], 120)
++ if len(r) == 0:
++ stdout += "TEST-UNEXPECTED-FAIL | %s | application timed out after 120 seconds with no output" % (test)
++ proc.kill()
++ break
++ line = proc.stdout.readline()
++ if line == "":
++ break
++ stdout += line
++ proc.wait()
++ else:
++ stdout, stderr = proc.communicate()
+ signal.signal(signal.SIGINT, signal.SIG_DFL)
+
+ if interactive:
diff --git a/debian/patches/series b/debian/patches/series
index bacdeb4..c469b38 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -108,4 +108,5 @@ debian-hacks/Use-char16_t-when-available-and-when-it-is-don-t-tes.patch
debian-hacks/Fix-compiler-errors-with-g-4.4-with-std-gnu-0x.patch
debian-hacks/Do-build-time-detection-of-2-bytes-wchar_t-and-char1.patch
debian-hacks/pkg-config-files-don-t-need-to-require-the-version-o.patch
+debian-hacks/Add-a-2-minutes-timeout-on-xpcshell-tests.patch
configure.patch
diff --git a/debian/remove.nonfree b/debian/remove.nonfree
deleted file mode 100644
index 4328a8f..0000000
--- a/debian/remove.nonfree
+++ /dev/null
@@ -1,80 +0,0 @@
-#! /bin/sh
-
-rm -fv ./modules/oji/tests/script/killer.exe
-rm -fv ./other-licenses/7zstub/firefox/7zSD.sfx
-rm -fv ./toolkit/mozapps/update/src/updater/macbuild/Contents/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
-rm -fv ./toolkit/mozapps/update/src/updater/macbuild/Contents/PkgInfo
-rm -fv ./extensions/universalchardet/doc/UniversalCharsetDetection.doc
-rm -fv ./config/bin2rc.exe
-rm -fv ./config/makedep.exe
-rm -fv ./config/mangle.exe
-rm -fv ./embedding/browser/activex/src/pluginhostctrl/cab/redist/ATL.DLL
-rm -fv ./embedding/browser/activex/tests/vbrowse/browser.frx
-rm -fv ./embedding/browser/activex/tests/vbrowse/frmToolBar.frx
-rm -fv ./embedding/qa/testembed/testembed.aps
-rm -fv ./embedding/tests/MSDotNETCSEmbed/MSDotNETCSEmbed.suo
-rm -fv ./embedding/wrappers/DotNETEmbed/DotNETEmbed.snk
-rm -fv ./intl/unicharutil/tools/data/case.dat
-rm -fv ./intl/unicharutil/tools/data/cmbcl.dat
-rm -fv ./intl/unicharutil/tools/data/ctype.dat
-rm -fv ./intl/unicharutil/tools/data/decomp.dat
-rm -fv ./intl/unicharutil/tools/data/num.dat
-rm -fv ./js/src/js.mdp
-rm -fv ./js/src/liveconnect/jsj_nodl.c
-rm -fv ./memory/jemalloc/ed.exe
-rm -fv ./plugin/oji/JEP/MRJPlugin.plugin/Contents/MacOS/MRJPlugin
-rm -fv ./plugin/oji/JEP/MRJPlugin.plugin/Contents/MacOS/MRJPlugin.jar
-rm -fv ./plugin/oji/JEP/MRJPlugin.plugin/Contents/Resources/MRJPlugin.rsrc
-rm -fv ./plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/MacOS/JavaEmbeddingPlugin
-rm -fv ./plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/Resources/Java/JavaEmbeddingPlugin.jar
-rm -fv ./plugin/oji/MRJ/plugin/Resources/Dialogs.rsrc
-rm -fv ./plugin/oji/MRJ/plugin/Resources/Strings.rsrc
-rm -fv ./plugin/oji/MRJ/plugin/Resources/Version.rsrc
-rm -fv ./plugin/oji/MRJ/plugin/MRJPlugin.jar
-rm -fv ./plugin/oji/MRJ/plugin/netscape.plugin.jar
-rm -fv ./plugin/oji/MRJ/plugin/Source/JMURLConnection
-rm -fv ./plugin/oji/MRJ/testing/ConsoleApplet/ConsoleApplet.mcp
-rm -fv ./plugin/oji/MRJ/testing/JSApplet/JSApplet.mcp
-rm -fv ./plugin/oji/MRJ/testing/SwingApplet/TestApplet.mcp
-rm -fv ./plugin/oji/MRJ/testing/TrivialApplet/MyApplet.mcp
-rm -fv ./plugin/oji/MRJCarbon/MRJSDK/JavaFrameworks/JavaEmbeddingLib
-rm -fv ./plugin/oji/MRJCarbon/plugin/MRJPlugin.jar
-rm -fv ./plugin/oji/MRJCarbon/plugin/Resources/Dialogs.rsrc
-rm -fv ./plugin/oji/MRJCarbon/plugin/Resources/Strings.rsrc
-rm -fv ./plugin/oji/MRJCarbon/plugin/Resources/Version.rsrc
-rm -fv ./xpcom/reflect/xptcall/tests/eVC4/XPTCInvoke_Testing.cpp
-rm -fv ./xpcom/tests/StringFactoringTests/StringTest.mcp
-rm -fv ./xpinstall/test/pre_checkin.xpi
-rm -fv ./layout/doc/SpaceMgr_BlockReflSt_OD.sda
-rm -fv ./layout/doc/object_diagram_template.sda
-rm -fv ./layout/html/tests/block/bugs/RealSnow.jar
-rm -fv ./xpfe/bootstrap/appleevents/nsAppleEvents.rsrc
-rm -fv ./toolkit/crashreporter/tools/win32/dump_syms.exe
-rm -fv ./toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/testdata/dump_syms_regtest.o
-rm -fv ./toolkit/mozapps/installer/windows/nsis/AppAssocReg.dll
-rm -fv ./toolkit/mozapps/installer/windows/nsis/ShellLink.dll
-rm -fv ./toolkit/mozapps/installer/windows/nsis/UAC.dll
-rm -fv ./toolkit/mozapps/installer/windows/nsis/nsProcess.dll
-
-rm -fvr ./other-licenses/7zstub
-rm -fvr ./other-licenses/branding
-
-rm -fv ./netwerk/protocol/ftp/doc/rfc959.txt
-
-rm -fvr ./layout/html/tests
-rm -fvr ./layout/doc
-rm -fvr ./content/xml/tests
-rm -fvr ./testing/performance
-rm -fvr ./modules/libpr0n/test/reftest/pngsuite-transparency/
-sed -i /pngsuite-transparency/d ./modules/libpr0n/test/reftest/reftest.list
-
-sed -i 's,>data:.*\(</Image>\), type="image/x-icon">http://www.amazon.com/favicon.ico\1,' ./browser/locales/en-US/searchplugins/amazondotcom.xml
-sed -i 's,>data:.*\(</Image>\), type="image/x-icon">http://www.answers.com/favicon.ico\1,' ./browser/locales/en-US/searchplugins/answers.xml
-sed -i 's,>data:.*\(</Image>\), type="image/x-icon">http://www.creativecommons.org/favicon.ico\1,' ./browser/locales/en-US/searchplugins/creativecommons.xml
-sed -i 's,>data:.*\(</Image>\), type="image/x-icon">http://www.ebay.com/favicon.ico\1,' ./browser/locales/en-US/searchplugins/eBay.xml
-sed -i 's,>data:.*\(</Image>\), type="image/x-icon">http://www.google.com/favicon.ico\1,' ./browser/locales/en-US/searchplugins/google.xml
-sed -i 's,>data:.*\(</Image>\), type="image/x-icon">http://en.wikipedia.org/favicon.ico\1,' ./browser/locales/en-US/searchplugins/wikipedia.xml
-sed -i 's,>data:.*\(</Image>\), type="image/x-icon">http://www.yahoo.com/favicon.ico\1,' ./browser/locales/en-US/searchplugins/yahoo.xml
-
-# There are still some cvsignore files
-find . -type f -name .cvsignore | xargs rm -f
diff --git a/debian/repack.py b/debian/repack.py
new file mode 100644
index 0000000..154ae46
--- /dev/null
+++ b/debian/repack.py
@@ -0,0 +1,131 @@
+#!/usr/bin/python
+
+from optparse import OptionParser
+import fnmatch
+import tarfile
+import StringIO
+import re
+import os
+import sys
+import rfc822
+
+class TarFilterList(object):
+ def __init__(self, filename):
+ self.patterns = {}
+ for filt in open(filename).readlines():
+ f = filt.strip().split(None, 1)
+ if len(f) == 1:
+ [pat] = f
+ cmd = None
+ else:
+ [pat, cmd] = f
+
+ pat = pat.split(os.sep)
+ self.patterns['t'] = "A"
+ self.add_pattern(pat, self.patterns, cmd)
+
+ def add_pattern(self, pat, patterns, cmd):
+ if re.search(r'[\[\?\*]', pat[0]):
+ if not '*' in patterns:
+ patterns['*'] = []
+ patterns['*'].append([os.sep.join(pat), cmd])
+ else:
+ if not pat[0] in patterns:
+ patterns[pat[0]] = {}
+ if len(pat) > 2:
+ self.add_pattern(pat[1:], patterns[pat[0]], cmd)
+ else:
+ if not '*' in patterns[pat[0]]:
+ patterns[pat[0]]['*'] = []
+ patterns[pat[0]]['*'].append([os.sep.join(pat[1:]), cmd])
+
+ def match(self, name):
+ name = name.split(os.sep)[1:]
+ if len(name) == 0:
+ return False
+ return self._match(name, self.patterns)
+
+ def _match(self, name, patterns):
+ if len(name) > 1 and name[0] in patterns:
+ cmd = self._match(name[1:], patterns[name[0]])
+ if cmd != False:
+ return cmd
+ if '*' in patterns:
+ for [pat, cmd] in patterns['*']:
+ if fnmatch.fnmatch(name[0], pat) or fnmatch.fnmatch(os.sep.join(name), pat):
+ return cmd
+ return False
+
+def filter_tar(orig, new, filt):
+ filt = TarFilterList(filt)
+ tar = tarfile.open(orig, "r:*")
+ new = tarfile.open(new, "w:bz2")
+
+ while True:
+ info = tar.next()
+ if not info:
+ break
+ do_filt = filt.match(info.name)
+ if do_filt == None:
+ print >> sys.stderr, "Removing %s" % (info.name)
+ continue
+
+ if info.isfile():
+ file = tar.extractfile(info)
+ if do_filt:
+ print >> sys.stderr, "Filtering %s" % (info.name)
+ orig = file
+ file = StringIO.StringIO()
+ the_filt = lambda l: l
+ if do_filt[0].isalpha():
+ f = do_filt.split(do_filt[1])
+ if f[0] == 's':
+ the_filt = lambda l: re.sub(f[1], f[2], l)
+ else:
+ f = do_filt.split(do_filt[0])
+ if f[2] == 'd':
+ the_filt = lambda l: "" if re.search(f[1], l) else l
+ file.writelines(map(the_filt, orig.readlines()))
+ file.seek(0);
+ info.size = len(file.buf)
+ new.addfile(info, file)
+ else:
+ new.addfile(info)
+
+ tar.close()
+ new.close()
+
+def get_package_name():
+ return rfc822.Message(open("debian/control"))["Source"]
+
+def main():
+ parser = OptionParser()
+ parser.add_option("-u", "--upstream-version", dest="upstream_version",
+ help="define upstream version number to use when creating the file",
+ metavar="VERSION")
+ (options, args) = parser.parse_args()
+
+ if not options.upstream_version:
+ parser.error("Need an upstream version")
+ return
+
+ if len(args) < 1:
+ parser.error("Too few arguments")
+ return
+ if len(args) > 1:
+ parser.error("Too many arguments")
+ return
+
+ if os.path.islink(args[0]):
+ orig = os.path.realpath(args[0])
+ new_file = args[0]
+ else:
+ orig = args[0]
+ new_file = get_package_name() + "_" + options.upstream_version + ".orig.tar.bz2"
+ new_file = os.path.realpath(os.path.join(os.path.dirname(orig), new_file))
+ print orig, new_file
+ filter_tar(orig, new_file + ".new", "debian/source.filter")
+ os.rename(new_file + ".new", new_file)
+
+if __name__ == '__main__':
+ main()
diff --git a/debian/source.filter b/debian/source.filter
new file mode 100644
index 0000000..a52d0af
--- /dev/null
+++ b/debian/source.filter
@@ -0,0 +1,72 @@
+modules/oji/tests/script/killer.exe
+other-licenses/7zstub/firefox/7zSD.sfx
+toolkit/mozapps/update/src/updater/macbuild/Contents/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
+toolkit/mozapps/update/src/updater/macbuild/Contents/PkgInfo
+extensions/universalchardet/doc/UniversalCharsetDetection.doc
+config/bin2rc.exe
+config/makedep.exe
+config/mangle.exe
+embedding/browser/activex/src/pluginhostctrl/cab/redist/ATL.DLL
+embedding/browser/activex/tests/vbrowse/browser.frx
+embedding/browser/activex/tests/vbrowse/frmToolBar.frx
+embedding/qa/testembed/testembed.aps
+embedding/tests/MSDotNETCSEmbed/MSDotNETCSEmbed.suo
+embedding/wrappers/DotNETEmbed/DotNETEmbed.snk
+intl/unicharutil/tools/data/case.dat
+intl/unicharutil/tools/data/cmbcl.dat
+intl/unicharutil/tools/data/ctype.dat
+intl/unicharutil/tools/data/decomp.dat
+intl/unicharutil/tools/data/num.dat
+js/src/js.mdp
+js/src/liveconnect/jsj_nodl.c
+memory/jemalloc/ed.exe
+plugin/oji/JEP/MRJPlugin.plugin/Contents/MacOS/MRJPlugin
+plugin/oji/JEP/MRJPlugin.plugin/Contents/MacOS/MRJPlugin.jar
+plugin/oji/JEP/MRJPlugin.plugin/Contents/Resources/MRJPlugin.rsrc
+plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/MacOS/JavaEmbeddingPlugin
+plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/Resources/Java/JavaEmbeddingPlugin.jar
+plugin/oji/MRJ/plugin/Resources/Dialogs.rsrc
+plugin/oji/MRJ/plugin/Resources/Strings.rsrc
+plugin/oji/MRJ/plugin/Resources/Version.rsrc
+plugin/oji/MRJ/plugin/MRJPlugin.jar
+plugin/oji/MRJ/plugin/netscape.plugin.jar
+plugin/oji/MRJ/plugin/Source/JMURLConnection
+plugin/oji/MRJ/testing/ConsoleApplet/ConsoleApplet.mcp
+plugin/oji/MRJ/testing/JSApplet/JSApplet.mcp
+plugin/oji/MRJ/testing/SwingApplet/TestApplet.mcp
+plugin/oji/MRJ/testing/TrivialApplet/MyApplet.mcp
+plugin/oji/MRJCarbon/MRJSDK/JavaFrameworks/JavaEmbeddingLib
+plugin/oji/MRJCarbon/plugin/MRJPlugin.jar
+plugin/oji/MRJCarbon/plugin/Resources/Dialogs.rsrc
+plugin/oji/MRJCarbon/plugin/Resources/Strings.rsrc
+plugin/oji/MRJCarbon/plugin/Resources/Version.rsrc
+xpcom/reflect/xptcall/tests/eVC4/XPTCInvoke_Testing.cpp
+xpcom/tests/StringFactoringTests/StringTest.mcp
+xpinstall/test/pre_checkin.xpi
+layout/doc/SpaceMgr_BlockReflSt_OD.sda
+layout/doc/object_diagram_template.sda
+layout/html/tests/block/bugs/RealSnow.jar
+xpfe/bootstrap/appleevents/nsAppleEvents.rsrc
+toolkit/crashreporter/tools/win32/dump_syms.exe
+toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/testdata/dump_syms_regtest.o
+toolkit/mozapps/installer/windows/nsis/AppAssocReg.dll
+toolkit/mozapps/installer/windows/nsis/ShellLink.dll
+toolkit/mozapps/installer/windows/nsis/UAC.dll
+toolkit/mozapps/installer/windows/nsis/nsProcess.dll
+other-licenses/7zstub
+other-licenses/branding
+netwerk/protocol/ftp/doc/rfc959.txt
+layout/html/tests
+layout/doc
+content/xml/tests
+testing/performance
+modules/libpr0n/test/reftest/pngsuite-transparency
+*/.cvsignore
+modules/libpr0n/test/reftest/reftest.list /pngsuite-transparency/d
+browser/locales/en-US/searchplugins/amazondotcom.xml s,>data:.*<, type="image/x-icon">http://www.amazon.com/favicon.ico<,
+browser/locales/en-US/searchplugins/answers.xml s,>data:.*<, type="image/x-icon">http://www.answers.com/favicon.ico<,
+browser/locales/en-US/searchplugins/creativecommons.xml s,>data:.*<, type="image/x-icon">http://www.creativecommons.org/favicon.ico<,
+browser/locales/en-US/searchplugins/eBay.xml s,>data:.*<, type="image/x-icon">http://www.ebay.com/favicon.ico<,
+browser/locales/en-US/searchplugins/google.xml s,>data:.*<, type="image/x-icon">http://www.google.com/favicon.ico<,
+browser/locales/en-US/searchplugins/wikipedia.xml s,>data:.*<, type="image/x-icon">http://en.wikipedia.org/favicon.ico<,
+browser/locales/en-US/searchplugins/yahoo.xml s,>data:.*<, type="image/x-icon">http://www.yahoo.com/favicon.ico<,
diff --git a/debian/watch b/debian/watch
index a455a84..6639099 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
version=3
opts=dversionmangle=s/^(\d\.[\d\.]+)\+dfsg$/$1/ \
-ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/(\d\.[\d\.]+)/source/firefox-([\d\.]+)[\.-]source\.tar\.bz2
+ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/(3\.5\.[\d\.]+)/source/firefox-([\d\.]+)[\.-]source\.tar\.bz2 debian python debian/repack.py
diff --git a/debian/xulrunner-GRE_VERSION.install.in b/debian/xulrunner-GRE_VERSION.install.in
index 40198c3..f0f6baa 100644
--- a/debian/xulrunner-GRE_VERSION.install.in
+++ b/debian/xulrunner-GRE_VERSION.install.in
@@ -30,7 +30,6 @@ usr/lib/xulrunner-##GRE_VERSION##/modules usr/share/xulrunner-##GRE_VERSION##
usr/lib/xulrunner-##GRE_VERSION##/components/*.js
usr/lib/xulrunner-##GRE_VERSION##/components/*.xpt
usr/lib/xulrunner-##GRE_VERSION##/components/libimgicon.so
-usr/lib/xulrunner-##GRE_VERSION##/components/libgiofilemonitor.so
usr/lib/xulrunner-##GRE_VERSION##/components/libdbusservice.so
usr/lib/xulrunner-##GRE_VERSION##/components/libmozgnome.so
usr/lib/xulrunner-##GRE_VERSION##/components/libnkgnomevfs.so
diff --git a/debian/xulrunner-GRE_VERSION.postinst.in b/debian/xulrunner-GRE_VERSION.postinst.in
index 1b199a8..3f4aa04 100644
--- a/debian/xulrunner-GRE_VERSION.postinst.in
+++ b/debian/xulrunner-GRE_VERSION.postinst.in
@@ -2,8 +2,7 @@
set -e
-if [ "$1" = "configure" ] || [ "$1" = "triggered" ] ||
- [ "$1" = "abort-upgrade" ]; then
+if [ "$1" = "triggered" ]; then
touch /usr/lib/xulrunner-##GRE_VERSION##/.autoreg
rm -f /usr/lib/xulrunner-##GRE_VERSION##/components/compreg.dat \
/usr/lib/xulrunner-##GRE_VERSION##/components/xpti.dat
@@ -15,6 +14,10 @@ if [ "$1" = "configure" ] || [ "$1" = "triggered" ] ||
rm -rf "$HOME"
fi
+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
+ dpkg-trigger /usr/lib/xulrunner-##GRE_VERSION##/components
+fi
+
if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] ; then
update-alternatives --install /usr/bin/xulrunner-stub \
xulrunner-stub /usr/lib/xulrunner-##GRE_VERSION##/xulrunner-stub 100 \
diff --git a/debian/xulrunner.mozconfig b/debian/xulrunner.mozconfig
index a97ee67..606429d 100644
--- a/debian/xulrunner.mozconfig
+++ b/debian/xulrunner.mozconfig
@@ -1,3 +1,5 @@
+# Please don't use this mozconfig unless you are planning to build
+# packages for Debian or a derivative.
. $topsrcdir/xulrunner/config/mozconfig
ac_add_options --prefix=/usr
ac_add_options --enable-default-toolkit=cairo-gtk2
diff --git a/testing/xpcshell/runxpcshelltests.py b/testing/xpcshell/runxpcshelltests.py
index 30f9bba..b93bf37 100644
--- a/testing/xpcshell/runxpcshelltests.py
+++ b/testing/xpcshell/runxpcshelltests.py
@@ -37,7 +37,7 @@
#
# ***** END LICENSE BLOCK ***** */
-import re, sys, os, os.path, logging, shutil, signal
+import re, sys, os, os.path, logging, shutil, signal, select
from glob import glob
from optparse import OptionParser
from subprocess import Popen, PIPE, STDOUT
@@ -225,7 +225,21 @@ def runTests(xpcshell, xrePath=None, symbolsPath=None,
# - don't move this line above Popen, or child will inherit the SIG_IGN
signal.signal(signal.SIGINT, signal.SIG_IGN)
# |stderr == None| as |pStderr| was either |None| or redirected to |stdout|.
- stdout, stderr = proc.communicate()
+ if pStdout == PIPE:
+ stdout = ""
+ while True:
+ (r, w, e) = select.select([proc.stdout], [], [], 120)
+ if len(r) == 0:
+ stdout += "TEST-UNEXPECTED-FAIL | %s | application timed out after 120 seconds with no output" % (test)
+ proc.kill()
+ break
+ line = proc.stdout.readline()
+ if line == "":
+ break
+ stdout += line
+ proc.wait()
+ else:
+ stdout, stderr = proc.communicate()
signal.signal(signal.SIGINT, signal.SIG_DFL)
if interactive:
debian/README.Debian | 8 +-
debian/README.source | 8 +-
debian/changelog | 17 ++
debian/control | 2 +-
debian/extra-stuff/Makefile.in | 17 +--
debian/extra-stuff/debUpdateNotifier.js | 206 --------------------
debian/extra-stuff/debUpdateNotifier.properties | 2 -
debian/extra-stuff/filemonitor/Makefile.in | 81 --------
.../filemonitor/debGIOFileMonitorService.cpp | 120 ------------
.../filemonitor/debGIOFileMonitorService.h | 52 -----
.../filemonitor/debIGIOFileMonitorService.idl | 65 ------
debian/iceape-browser.install | 4 -
debian/iceape-browser.links | 2 -
debian/pkg_files | 3 -
debian/remove.nonfree | 128 ------------
debian/repack.py | 131 +++++++++++++
debian/rules | 4 -
debian/source.filter | 112 +++++++++++
debian/watch | 2 +-
19 files changed, 268 insertions(+), 696 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
index fb34932..abdfccd 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -41,12 +41,12 @@ anyways. Please report a bug to any such package.
Sound
-----
-By default, iceape detects and runs the correct dsp wrapper for esd,
-arts, or alsa. If this is not the desired behaviour, edit
+By default, iceape doesn't use a dsp wrapper for sound support. If you
+happen to experience sound issues, you can try to edit
/etc/iceape/iceaperc or ~/.mozilla/iceaperc and set the ICEAPE_DSP
variable to:
-"auto": The default, auto-detection.
+"auto": Auto-detection.
"esddsp": Use esd.
@@ -54,7 +54,7 @@ variable to:
"aoss": Use alsa.
-"none": Don't use any sound wrapper.
+"none": The default, don't use any sound wrapper.
using Java. (You should use plugin which compiled with gcc-3.2 or newer)
----------
diff --git a/debian/README.source b/debian/README.source
index 118e36d..be312b2 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -3,10 +3,4 @@ README.source for iceape
Building a new upstream tarball for debian consumption :
------------------------------------------------------
-#1 Extract an existing iceape debian source
-#2 Fetch the source tarball from upstream (uscan can be used) and extract it.
- Rename the extracted directory as iceape-version.
-#3 Copy the debian directory from the extracted iceape debian source into the
- iceape-version directory
-#4 Go into iceape-version directory
-#5 Run: debian/rules source
+#1 Use uscan.
diff --git a/debian/changelog b/debian/changelog
index f51d276..6c35251 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+iceape (2.0.11-2) unstable; urgency=low
+
+ * debian/extra-stuff/Makefile.in, debian/extra-stuff/debUpdateNotifier.*,
+ debian/extra-stuff/filemonitor, debian/iceape-browser.install,
+ debian/iceape-browser.links, debian/pkg_files: Remove update notifier,
+ it's not quite as helpful as it should be for squeeze
+ * debian/control: Relax libglib2.0-dev build dependency. 2.18.0 was only
+ needed for filemonitor, which we just removed.
+ * debian/remove.nonfree, debian/repack.py, debian/source.filter,
+ debian/watch: Update debian/watch and provide a script repacking
+ upstream source tarballs.
+ * debian/rules, debian/README.source: Remove the "source" target.
+ uscan is now enough
+ * debian/README.Debian: Fix for the default dsp wrapper behaviour.
+
+ -- Mike Hommey <glandium@debian.org> Mon, 27 Dec 2010 16:17:19 +0100
+
iceape (2.0.11-1) unstable; urgency=high
* New upstream release.
diff --git a/debian/control b/debian/control
index ef67631..91f4b09 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends: debhelper (>= 7.2.3),
libxt-dev,
libxau-dev,
libcairo2-dev (>= 1.8.8),
- libglib2.0-dev (>= 2.18.0),
+ libglib2.0-dev (>= 2.16.0),
libgnomevfs2-dev,
libgnomeui-dev,
dpkg-dev (>= 1.13.19), dpkg-dev (<= 1.14.7) | dpkg-dev (>= 1.14.11),
diff --git a/debian/extra-stuff/Makefile.in b/debian/extra-stuff/Makefile.in
index 5044f96..9e607c6 100644
--- a/debian/extra-stuff/Makefile.in
+++ b/debian/extra-stuff/Makefile.in
@@ -5,21 +5,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-DIRS := filemonitor
-
-EXTRA_COMPONENTS := addonsInfo.js debUpdateNotifier.js
+EXTRA_COMPONENTS := addonsInfo.js
include $(topsrcdir)/config/rules.mk
-
-ifeq (,$(wildcard $(JAR_MANIFEST)))
-libs::jar.mn
- $(MAKE) realchrome
-endif
-
-locales:
- mkdir $@
-
-GARBAGE_DIRS += locales
-
-jar.mn: debUpdateNotifier.properties locales
- awk 'BEGIN { print "debian.jar:" } { l = $$1; print "% locale debian " l " %locale/" l "/debian/"; print " locale/" l "/debian/$< (locales/" l ")"; $$0=substr($$0,length($$1)+2); print $$0 > "locales/" l}' $< > $@
diff --git a/debian/extra-stuff/debUpdateNotifier.js b/debian/extra-stuff/debUpdateNotifier.js
deleted file mode 100644
index ee47261..0000000
--- a/debian/extra-stuff/debUpdateNotifier.js
+++ /dev/null
@@ -1,206 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is debAbout.
- *
- * The Initial Developer of the Original Code is
- * Mike Hommey.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cr = Components.results;
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-
-function fileAppend(file, leaf) {
- file.append(leaf);
- return file;
-}
-
-function setResult(result, file, type) {
- try {
- file.normalize();
- } catch(e) { }
- result[file.path] = type;
-}
-
-function monitoredList() {
- var result = {};
- var app = Cc["@mozilla.org/xre/app-info;1"]
- .getService(Ci.nsIXULAppInfo).QueryInterface(Ci.nsIXULRuntime);
- var ds = Cc["@mozilla.org/file/directory_service;1"]
- .getService(Ci.nsIProperties);
-
- // $GREDIR/platform.ini
- var gredir = ds.get("GreD", Ci.nsIFile);
- setResult(result, gredir, "gre");
-
- // $APPDIR/application.ini if $APPDIR != $GREDIR
- var dir = ds.get("CurProcD", Ci.nsIFile);
- if (!dir.equals(gredir))
- setResult(result, dir, "app");
-
- // $APPDIR/extensions
- setResult(result, fileAppend(dir, "extensions"), "extdir");
-
- // system /usr/share extensions directory
- dir = ds.get("XRESysSExtPD", Ci.nsIFile);
- setResult(result, fileAppend(dir, app.ID), "extdir");
-
- // system /usr/lib extensions directory
- dir = ds.get("XRESysLExtPD", Ci.nsIFile);
- setResult(result, fileAppend(dir, app.ID), "extdir");
-
- // plugins directories
- var userplugins = ds.get("UserPlugins", Ci.nsIFile);
- dir = ds.get("APluginsDL", Ci.nsISimpleEnumerator);
- while (dir.hasMoreElements()) {
- var plugindir = dir.getNext().QueryInterface(Ci.nsIFile);
- if (!userplugins || !plugindir.equals(userplugins))
- setResult(result, plugindir, "plugdir");
- }
-
- // individual plugins
- var phs = Cc["@mozilla.org/plugin/host;1"]
- .getService(Ci.nsIPluginHost);
- var plugins = phs.getPluginTags({ });
- for (var i = 0; i < plugins.length; i++) {
- var file = Cc["@mozilla.org/file/local;1"]
- .createInstance(Ci.nsILocalFile);
- var plugin = plugins[i];
- if (Ci.nsIPluginTag_1_9_2)
- plugin = plugin.QueryInterface(Ci.nsIPluginTag_1_9_2);
- file.initWithPath(plugin.fullpath ? plugin.fullpath
- : plugin.filename);
- if (!userplugins || !file.parent.equals(userplugins))
- setResult(result, file, "plugin");
- }
-
- // individual extensions
- var em = Cc["@mozilla.org/extensions/manager;1"]
- .getService(Ci.nsIExtensionManager);
- var extensions = em.getItemList(Ci.nsIUpdateItem.TYPE_ANY, { });
- for (var i = 0; i < extensions.length; i++) {
- var extension = extensions[i];
- if (extension.installLocation != "app-profile" &&
- extension.installLocation != "app-system-user") {
- var location = em.getInstallLocation(extension.id)
- .getItemLocation(extension.id);
- setResult(result, location, "ext");
- }
- }
-
- return result;
-}
-
-function fmObserver() {}
-
-fmObserver.prototype = {
- notify: function(file, event) {
- if (this.notified)
- return;
- this.notified = true;
- if (!this.list)
- this.list = monitoredList();
- monitoredfile = file;
- if (!this.list[monitoredfile.path])
- monitoredfile = file.parent;
- if (this.list[monitoredfile.path]) {
- var name;
- var sbs = Cc["@mozilla.org/intl/stringbundle;1"]
- .getService(Ci.nsIStringBundleService);
- try {
- name = sbs.createBundle("chrome://branding/locale/brand.properties")
- .GetStringFromName("brandShortName");
- } catch(e) {
- name = Cc["@mozilla.org/xre/app-info;1"]
- .getService(Ci.nsIXULAppInfo)
- .QueryInterface(Ci.nsIXULRuntime).name;
- }
- var dun = sbs.createBundle("chrome://debian/locale/debUpdateNotifier.properties");
- var title = dun.GetStringFromName("title");
- var text = dun.formatStringFromName("message", [name], 1);
-
- if (!Cc["@mozilla.org/embedcomp/prompt-service;1"]
- .getService(Ci.nsIPromptService)
- .confirm(null, title, text))
- return;
-
- var os = Cc["@mozilla.org/observer-service;1"]
- .getService(Ci.nsIObserverService);
- var cancelQuit = Cc["@mozilla.org/supports-PRBool;1"]
- .createInstance(Ci.nsISupportsPRBool);
- os.notifyObservers(cancelQuit, "quit-application-requested", "restart");
-
- // Something aborted the quit process.
- if (cancelQuit.data)
- return;
-
- Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci.nsIAppStartup)
- .quit(Ci.nsIAppStartup.eRestart | Ci.nsIAppStartup.eAttemptQuit);
- }
- }
-}
-
-function debUpdateNotifier() {}
-
-debUpdateNotifier.prototype = {
- classDescription: "Debian system updates notifier",
- classID: Components.ID("{7ff849af-8344-4784-a575-09c172ff8b72}"),
- contractID: "@debian.org/update-notifier;1",
- _xpcom_categories: [{category: "app-startup", service: true}],
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsISupportsWeakReference]),
- observe: function (subject, topic, data) {
- if (topic == "app-startup") {
- var os = Cc["@mozilla.org/observer-service;1"]
- .getService(Ci.nsIObserverService);
- os.addObserver(this, "final-ui-startup", true);
- }
- if (topic != "final-ui-startup") return;
- var fmo = new fmObserver();
- var fm = Cc["@debian.org/gio-file-monitor-service;1"]
- .getService(Ci.debIGIOFileMonitorService);
-
- var list = monitoredList();
- for (var path in list) {
- var file = Cc["@mozilla.org/file/local;1"]
- .createInstance(Ci.nsILocalFile);
- file.initWithPath(path);
- // We don't want to monitor e.g. /usr/lib/mozilla/plugins/libjavaplugin.so
- // when we already monitor /usr/lib/mozilla/plugins.
- // But we want to monitor subdirectories.
- if (list[path].substr(-3) == "dir" || ! list[file.parent.path])
- fm.monitor(file, fmo);
- }
- }
-}
-
-var NSGetModule = XPCOMUtils.generateNSGetModule([debUpdateNotifier]);
diff --git a/debian/extra-stuff/debUpdateNotifier.properties b/debian/extra-stuff/debUpdateNotifier.properties
deleted file mode 100644
index 1ae1b8f..0000000
--- a/debian/extra-stuff/debUpdateNotifier.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-en-US title = Please restart
-en-US message = %1$S, an extension or a plugin has been installed, upgraded or removed by the system.\nIt is strongly recommended to restart %1$S.\nDo you want to restart it now?
diff --git a/debian/extra-stuff/filemonitor/Makefile.in b/debian/extra-stuff/filemonitor/Makefile.in
deleted file mode 100644
index 6c8e688..0000000
--- a/debian/extra-stuff/filemonitor/Makefile.in
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Mike Hommey <mh@glandium.org>.
-# Portions created by the Initial Developer are Copyright (C) 2010
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH = ../../..
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE = giofilemonitor
-LIBRARY_NAME = giofilemonitor
-IS_COMPONENT = 1
-FORCE_SHARED_LIB = 1
-
-REQUIRES = \
- xpcom \
- string \
- $(NULL)
-
-XPIDLSRCS += debIGIOFileMonitorService.idl
-CPPSRCS += debGIOFileMonitorService.cpp
-
-EXTRA_DSO_LDOPTS += \
- $(XPCOM_GLUE_LDOPTS) \
- $(NSPR_LIBS)
-
-ifdef MOZ_ENABLE_GIO # Should be defined from xulrunner 1.9.3
-EXTRA_DSO_LDOPTS += $(MOZ_GIO_LIBS)
-else
-EXTRA_DSO_LDOPTS += $(GLIB_LIBS) -lgio-2.0 # This is ugly, but it's a local build rule
-endif
-
-include $(topsrcdir)/config/rules.mk
-
-ifdef MOZ_ENABLE_GIO
-CXXFLAGS += $(MOZ_GIO_CFLAGS)
-else
-CXXFLAGS += $(GLIB_CFLAGS)
-endif
-
-CXXFLAGS += $(XPCOM_GLUE_CFLAGS)
-
-LOCAL_INCLUDES := -I$(XPIDL_GEN_DIR)
-
-export::
- rm $(IDL_DIR)/$(XPIDLSRCS) $(PUBLIC)/$(patsubst %.idl,%.h, $(XPIDLSRCS))
diff --git a/debian/extra-stuff/filemonitor/debGIOFileMonitorService.cpp b/debian/extra-stuff/filemonitor/debGIOFileMonitorService.cpp
deleted file mode 100644
index a3c48a9..0000000
--- a/debian/extra-stuff/filemonitor/debGIOFileMonitorService.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Mike Hommey <mh@glandium.org>.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsWeakReference.h"
-#include "debGIOFileMonitorService.h"
-#include "nsIGenericFactory.h"
-#include "nsStringAPI.h"
-#include "nsILocalFile.h"
-
-extern "C" {
-/* #pragma are only here because I don't want to patch build/system-headers
- while this component lives in debian/ */
-#pragma GCC visibility push(default)
-#include <gio/gio.h>
-#pragma GCC visibility pop
-}
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(debGIOFileMonitorService)
-
-static const nsModuleComponentInfo components[] = {
- { "GIO File Monitor Service",
- DEB_GIOFILEMONITORSERVICE_CID,
- DEB_GIOFILEMONITORSERVICE_CONTRACTID,
- debGIOFileMonitorServiceConstructor }
-};
-
-NS_IMPL_NSGETMODULE(giofilemonitor, components)
-
-NS_IMPL_ISUPPORTS1(debGIOFileMonitorService, debIGIOFileMonitorService)
-
-static void file_changed(GFileMonitor *aMonitor,
- GFile *aFile,
- GFile *aOther_file,
- GFileMonitorEvent aEvent_type,
- debIGIOFileMonitorObserver *aObserver)
-{
- /* aOther_file is ignored, it doesn't seem to be ever used.
- * We also don't support G_FILE_MONITOR_EVENT_PRE_UNMOUNT and
- * G_FILE_MONITOR_EVENT_UNMOUNTED events. */
- if (!aObserver || !aFile || (aEvent_type >= G_FILE_MONITOR_EVENT_PRE_UNMOUNT))
- return;
-
- nsresult rv;
- nsCOMPtr<debIGIOFileMonitorObserver> observer = do_QueryInterface(aObserver, &rv);
- if (NS_FAILED(rv)) return;
-
- nsCOMPtr<nsILocalFile> file;
- char *path = g_file_get_path(aFile);
- rv = NS_NewNativeLocalFile(nsDependentCString(path), PR_FALSE, getter_AddRefs(file));
- g_free(path);
- if (NS_FAILED(rv)) return;
-
- observer->Notify(file, (debGIOFileMonitorEvent) aEvent_type);
-}
-
-NS_IMETHODIMP
-debGIOFileMonitorService::Monitor(nsIFile *aFile, debIGIOFileMonitorObserver *aObserver)
-{
- if (!aFile || !aObserver)
- return NS_ERROR_FAILURE;
-
- nsresult rv;
- nsCAutoString path;
- rv = aFile->GetNativePath(path);
- NS_ENSURE_SUCCESS(rv, rv);
-
- if (path.IsEmpty())
- return NS_ERROR_FAILURE;
-
- GFile *monitored_file = g_file_new_for_path(path.get());
- if (!monitored_file)
- return NS_ERROR_FAILURE;
-
- GFileMonitor *monitor = g_file_monitor(monitored_file, G_FILE_MONITOR_NONE, NULL, NULL);
- g_object_unref(monitored_file);
-
- if (!monitor)
- return NS_ERROR_FAILURE;
-
- NS_ENSURE_SUCCESS(rv, rv);
-
- /* Keep a reference of the observer */
- aObserver->AddRef();
- g_signal_connect(monitor, "changed", G_CALLBACK(file_changed), aObserver);
-
- return NS_OK;
-}
diff --git a/debian/extra-stuff/filemonitor/debGIOFileMonitorService.h b/debian/extra-stuff/filemonitor/debGIOFileMonitorService.h
deleted file mode 100644
index 1650f0b..0000000
--- a/debian/extra-stuff/filemonitor/debGIOFileMonitorService.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Mike Hommey <mh@glandium.org>.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef debGIOFileMonitorService_h_
-#define debGIOFileMonitorService_h_
-
-#include "debIGIOFileMonitorService.h"
-
-#define DEB_GIOFILEMONITORSERVICE_CID \
-{0x8cf6024a, 0x6028, 0x4d0d, {0xbc, 0x47, 0x42, 0x1e, 0xd4, 0xad, 0x3d, 0x40}}
-
-class debGIOFileMonitorService : public debIGIOFileMonitorService
-{
-public:
- NS_DECL_ISUPPORTS
- NS_DECL_DEBIGIOFILEMONITORSERVICE
-};
-
-#endif
diff --git a/debian/extra-stuff/filemonitor/debIGIOFileMonitorService.idl b/debian/extra-stuff/filemonitor/debIGIOFileMonitorService.idl
deleted file mode 100644
index 1fd8d73..0000000
--- a/debian/extra-stuff/filemonitor/debIGIOFileMonitorService.idl
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Mike Hommey <mh@glandium.org>.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsISupports.idl"
-#include "nsIFile.idl"
-
-typedef long debGIOFileMonitorEvent;
-%{ C++
-enum {
- DEB_GIO_FILE_MONITOR_EVENT_CHANGED = 0,
- DEB_GIO_FILE_MONITOR_EVENT_CHANGES_DONE_HINT,
- DEB_GIO_FILE_MONITOR_EVENT_DELETED,
- DEB_GIO_FILE_MONITOR_EVENT_CREATED,
- DEB_GIO_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED
-};
-%}
-
-[scriptable, uuid(caf63993-5b22-4d0b-a4f5-97a7dfd28e8b)]
-interface debIGIOFileMonitorObserver: nsISupports
-{
- void notify(in nsIFile file, in debGIOFileMonitorEvent event_type);
-};
-
-[scriptable, uuid(c7cc29a4-a2c7-4f4c-9175-fa1f22201625)]
-interface debIGIOFileMonitorService: nsISupports
-{
- void monitor(in nsIFile file, in debIGIOFileMonitorObserver observer);
-};
-
-%{C++
-#define DEB_GIOFILEMONITORSERVICE_CONTRACTID "@debian.org/gio-file-monitor-service;1"
-%}
diff --git a/debian/iceape-browser.install b/debian/iceape-browser.install
index d52499b..2ef1945 100644
--- a/debian/iceape-browser.install
+++ b/debian/iceape-browser.install
@@ -168,11 +168,7 @@ usr/share/applications/iceape-composer.desktop
usr/lib/iceape/extensions/modern@themes.mozilla.org usr/share/iceape/extensions
usr/lib/iceape/extensions/\{972ce4c6-7e08-4474-a285-3208198ce6fd\} usr/share/iceape/extensions
usr/lib/iceape/modules/*.{js,jsm} usr/share/iceape/modules
-usr/lib/iceape/components/libgiofilemonitor.so
-usr/lib/iceape/components/debian.xpt usr/share/iceape/components
usr/lib/iceape/components/addonsInfo.js usr/share/iceape/components
-usr/lib/iceape/components/debUpdateNotifier.js usr/share/iceape/components
-mozilla/dist/bin/chrome/debian.* usr/share/iceape/chrome
debian/branding/aboutIce.js usr/lib/iceape/components
mozilla/dist/bin/chrome/ice.* usr/share/iceape/chrome
diff --git a/debian/iceape-browser.links b/debian/iceape-browser.links
index baf956a..f39a652 100644
--- a/debian/iceape-browser.links
+++ b/debian/iceape-browser.links
@@ -59,6 +59,4 @@ usr/share/iceape/components/txEXSLTRegExFunctions.js usr/lib/iceape/components/t
usr/share/iceape/extensions/modern@themes.mozilla.org usr/lib/iceape/extensions/modern@themes.mozilla.org
usr/share/iceape/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} usr/lib/iceape/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
-usr/share/iceape/components/debian.xpt usr/lib/iceape/components/debian.xpt
usr/share/iceape/components/addonsInfo.js usr/lib/iceape/components/addonsInfo.js
-usr/share/iceape/components/debUpdateNotifier.js usr/lib/iceape/components/debUpdateNotifier.js
diff --git a/debian/pkg_files b/debian/pkg_files
index 00b4ae0..e71aed3 100644
--- a/debian/pkg_files
+++ b/debian/pkg_files
@@ -1,5 +1,2 @@
[debian]
bin/components/addonsInfo.js
-bin/components/debUpdateNotifier.js
-bin/components/giofilemonitor.xpt
-bin/components/libgiofilemonitor.so
diff --git a/debian/remove.nonfree b/debian/remove.nonfree
deleted file mode 100644
index 660abc2..0000000
--- a/debian/remove.nonfree
+++ /dev/null
@@ -1,128 +0,0 @@
-#! /bin/sh
-
-rm -fv ./directory/c-sdk/ldap/examples/macintosh/*.u
-rm -fv ./directory/c-sdk/ldap/libraries/macintosh/LDAPClient.mcp
-rm -fv ./mozilla/modules/oji/tests/script/killer.exe
-rm -fv ./mozilla/other-licenses/7zstub/firefox/7zSD.sfx
-rm -fv ./mozilla/toolkit/mozapps/update/src/updater/macbuild/Contents/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
-rm -fv ./mozilla/toolkit/mozapps/update/src/updater/macbuild/Contents/PkgInfo
-rm -fv ./mozilla/extensions/universalchardet/doc/UniversalCharsetDetection.doc
-rm -fv ./mozilla/config/bin2rc.exe
-rm -fv ./mozilla/config/makedep.exe
-rm -fv ./mozilla/config/mangle.exe
-rm -fv ./mozilla/embedding/browser/activex/src/pluginhostctrl/cab/redist/ATL.DLL
-rm -fv ./mozilla/embedding/browser/activex/tests/vbrowse/browser.frx
-rm -fv ./mozilla/embedding/browser/activex/tests/vbrowse/frmToolBar.frx
-rm -fv ./mozilla/embedding/qa/testembed/testembed.aps
-rm -fv ./mozilla/embedding/tests/MSDotNETCSEmbed/MSDotNETCSEmbed.suo
-rm -fv ./mozilla/embedding/wrappers/DotNETEmbed/DotNETEmbed.snk
-rm -fv ./mozilla/intl/unicharutil/tools/data/case.dat
-rm -fv ./mozilla/intl/unicharutil/tools/data/cmbcl.dat
-rm -fv ./mozilla/intl/unicharutil/tools/data/ctype.dat
-rm -fv ./mozilla/intl/unicharutil/tools/data/decomp.dat
-rm -fv ./mozilla/intl/unicharutil/tools/data/num.dat
-rm -fv ./mozilla/js/src/js.mdp
-rm -fv ./mozilla/js/src/liveconnect/jsj_nodl.c
-rm -fv ./mozilla/memory/jemalloc/ed.exe
-rm -fv ./mozilla/plugin/oji/JEP/MRJPlugin.plugin/Contents/MacOS/MRJPlugin
-rm -fv ./mozilla/plugin/oji/JEP/MRJPlugin.plugin/Contents/MacOS/MRJPlugin.jar
-rm -fv ./mozilla/plugin/oji/JEP/MRJPlugin.plugin/Contents/Resources/MRJPlugin.rsrc
-rm -fv ./mozilla/plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/MacOS/JavaEmbeddingPlugin
-rm -fv ./mozilla/plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/Resources/Java/JavaEmbeddingPlugin.jar
-rm -fv ./mozilla/plugin/oji/MRJ/plugin/Resources/Dialogs.rsrc
-rm -fv ./mozilla/plugin/oji/MRJ/plugin/Resources/Strings.rsrc
-rm -fv ./mozilla/plugin/oji/MRJ/plugin/Resources/Version.rsrc
-rm -fv ./mozilla/plugin/oji/MRJ/plugin/MRJPlugin.jar
-rm -fv ./mozilla/plugin/oji/MRJ/plugin/netscape.plugin.jar
-rm -fv ./mozilla/plugin/oji/MRJ/plugin/Source/JMURLConnection
-rm -fv ./mozilla/plugin/oji/MRJ/testing/ConsoleApplet/ConsoleApplet.mcp
-rm -fv ./mozilla/plugin/oji/MRJ/testing/JSApplet/JSApplet.mcp
-rm -fv ./mozilla/plugin/oji/MRJ/testing/SwingApplet/TestApplet.mcp
-rm -fv ./mozilla/plugin/oji/MRJ/testing/TrivialApplet/MyApplet.mcp
-rm -fv ./mozilla/plugin/oji/MRJCarbon/MRJSDK/JavaFrameworks/JavaEmbeddingLib
-rm -fv ./mozilla/plugin/oji/MRJCarbon/plugin/MRJPlugin.jar
-rm -fv ./mozilla/plugin/oji/MRJCarbon/plugin/Resources/Dialogs.rsrc
-rm -fv ./mozilla/plugin/oji/MRJCarbon/plugin/Resources/Strings.rsrc
-rm -fv ./mozilla/plugin/oji/MRJCarbon/plugin/Resources/Version.rsrc
-rm -fv ./mozilla/xpcom/reflect/xptcall/tests/eVC4/XPTCInvoke_Testing.cpp
-rm -fv ./mozilla/xpcom/tests/StringFactoringTests/StringTest.mcp
-rm -fv ./mozilla/xpinstall/test/pre_checkin.xpi
-rm -fv ./mozilla/layout/doc/SpaceMgr_BlockReflSt_OD.sda
-rm -fv ./mozilla/layout/doc/object_diagram_template.sda
-rm -fv ./mozilla/layout/html/tests/block/bugs/RealSnow.jar
-rm -fv ./mozilla/xpfe/bootstrap/appleevents/nsAppleEvents.rsrc
-rm -fv ./mozilla/toolkit/crashreporter/tools/win32/dump_syms.exe
-rm -fv ./mozilla/toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/testdata/dump_syms_regtest.o
-rm -fv ./mozilla/toolkit/mozapps/installer/windows/nsis/AppAssocReg.dll
-rm -fv ./mozilla/toolkit/mozapps/installer/windows/nsis/ShellLink.dll
-rm -fv ./mozilla/toolkit/mozapps/installer/windows/nsis/UAC.dll
-rm -fv ./mozilla/toolkit/mozapps/installer/windows/nsis/nsProcess.dll
-
-echo also we need to remove any copyrighted image files from the mozilla src suite, not replaced by the branding process. This includes theme throbbers depending on how you handle that and windows icons, app icons, windows splash etc
-
-rm -fv ./suite/branding/icons/gtk/seamonkey.png # 128x128
-rm -fv ./suite/branding/content/logo.gif # 200x200
-
-rm -fv ./calendar/sunbird/base/themes/winstripe/preview.png
-rm -fv ./calendar/sunbird/base/themes/pinstripe/preview.png
-rm -fv ./suite/themes/classic/preview.png
-rm -fv ./mail/themes/qute/mail/preview.png
-rm -fv ./mail/themes/gnomestripe/mail/preview.png
-rm -fv ./mail/themes/pinstripe/mail/preview.png
-rm -fv ./calendar/sunbird/base/themes/pinstripe/preview.png
-rm -fv ./calendar/sunbird/base/themes/winstripe/preview.png
-rm -fv ./mail/themes/gnomestripe/mail/preview.png
-rm -fv ./mail/themes/pinstripe/mail/preview.png
-rm -fv ./mail/themes/qute/mail/preview.png
-rm -fv ./suite/branding/content/about.png
-rm -fv ./suite/branding/content/icon64.png
-rm -fv ./suite/branding/icons/gtk/default.png
-rm -fv ./suite/branding/icons/gtk/default16.png
-rm -fv ./suite/branding/icons/gtk/default48.png
-rm -fv ./suite/branding/icons/gtk/main-window.png
-rm -fv ./suite/branding/icons/gtk/main-window16.png
-rm -fv ./suite/branding/icons/gtk/main-window48.png
-rm -fv ./suite/branding/icons/mac/seamonkey.icns
-rm -fv ./suite/branding/icons/os2/main-window.ico
-rm -fv ./suite/branding/icons/os2/seamonkey.ico
-rm -fv ./suite/branding/icons/windows/main-window.ico
-rm -fv ./suite/branding/icons/windows/seamonkey.ico
-rm -fv ./suite/themes/classic/preview.png
-
-# remove the throbbers as they are branded
-rm -fv ./suite/themes/classic/communicator/brand/throbber-anim.png
-rm -fv ./suite/themes/classic/communicator/brand/throbber-single.png
-rm -fv ./suite/themes/classic/communicator/brand/throbber16-anim.png
-rm -fv ./suite/themes/classic/communicator/brand/throbber16-single.png
-rm -fv ./suite/themes/modern/communicator/brand/throbber-anim.png
-rm -fv ./suite/themes/modern/communicator/brand/throbber-single.png
-rm -fv ./suite/themes/modern/communicator/brand/throbber16-anim.png
-rm -fv ./suite/themes/modern/communicator/brand/throbber16-single.png
-
-
-rm -fvr ./other-licenses/
-rm -fvr ./mozilla/other-licenses/
-
-rm -fv ./mozilla/netwerk/protocol/ftp/doc/rfc959.txt
-
-# sunbird stuff
-
-rm -fv calendar/sunbird/app/sunbird.ico
-rm -fv calendar/sunbird/app/default.xpm
-
-rm -fvr ./mozilla/layout/html/tests
-rm -fvr ./mozilla/layout/doc
-rm -fvr ./mozilla/content/xml/tests
-rm -fvr ./mozilla/testing/performance
-rm -fvr ./mozilla/modules/libpr0n/test/reftest/pngsuite-transparency/
-
-sed -i 's,>data:.*\(</Image>\), type="image/x-icon">http://www.amazon.com/favicon.ico\1,' ./mozilla/browser/locales/en-US/searchplugins/amazondotcom.xml
-sed -i 's,>data:.*\(</Image>\), type="image/x-icon">http://www.answers.com/favicon.ico\1,' ./mozilla/browser/locales/en-US/searchplugins/answers.xml
-sed -i 's,>data:.*\(</Image>\), type="image/x-icon">http://www.creativecommons.org/favicon.ico\1,' ./mozilla/browser/locales/en-US/searchplugins/creativecommons.xml
-sed -i 's,>data:.*\(</Image>\), type="image/x-icon">http://www.ebay.com/favicon.ico\1,' ./mozilla/browser/locales/en-US/searchplugins/eBay.xml
-sed -i 's,>data:.*\(</Image>\), type="image/x-icon">http://www.google.com/favicon.ico\1,' ./mozilla/browser/locales/en-US/searchplugins/google.xml
-sed -i 's,>data:.*\(</Image>\), type="image/x-icon">http://en.wikipedia.org/favicon.ico\1,' ./mozilla/browser/locales/en-US/searchplugins/wikipedia.xml
-sed -i 's,>data:.*\(</Image>\), type="image/x-icon">http://www.yahoo.com/favicon.ico\1,' ./mozilla/browser/locales/en-US/searchplugins/yahoo.xml
-
-# There are still some cvsignore files
-find . -type f -name .cvsignore | xargs rm -f
diff --git a/debian/repack.py b/debian/repack.py
new file mode 100644
index 0000000..154ae46
--- /dev/null
+++ b/debian/repack.py
@@ -0,0 +1,131 @@
+#!/usr/bin/python
+
+from optparse import OptionParser
+import fnmatch
+import tarfile
+import StringIO
+import re
+import os
+import sys
+import rfc822
+
+class TarFilterList(object):
+ def __init__(self, filename):
+ self.patterns = {}
+ for filt in open(filename).readlines():
+ f = filt.strip().split(None, 1)
+ if len(f) == 1:
+ [pat] = f
+ cmd = None
+ else:
+ [pat, cmd] = f
+
+ pat = pat.split(os.sep)
+ self.patterns['t'] = "A"
+ self.add_pattern(pat, self.patterns, cmd)
+
+ def add_pattern(self, pat, patterns, cmd):
+ if re.search(r'[\[\?\*]', pat[0]):
+ if not '*' in patterns:
+ patterns['*'] = []
+ patterns['*'].append([os.sep.join(pat), cmd])
+ else:
+ if not pat[0] in patterns:
+ patterns[pat[0]] = {}
+ if len(pat) > 2:
+ self.add_pattern(pat[1:], patterns[pat[0]], cmd)
+ else:
+ if not '*' in patterns[pat[0]]:
+ patterns[pat[0]]['*'] = []
+ patterns[pat[0]]['*'].append([os.sep.join(pat[1:]), cmd])
+
+ def match(self, name):
+ name = name.split(os.sep)[1:]
+ if len(name) == 0:
+ return False
+ return self._match(name, self.patterns)
+
+ def _match(self, name, patterns):
+ if len(name) > 1 and name[0] in patterns:
+ cmd = self._match(name[1:], patterns[name[0]])
+ if cmd != False:
+ return cmd
+ if '*' in patterns:
+ for [pat, cmd] in patterns['*']:
+ if fnmatch.fnmatch(name[0], pat) or fnmatch.fnmatch(os.sep.join(name), pat):
+ return cmd
+ return False
+
+def filter_tar(orig, new, filt):
+ filt = TarFilterList(filt)
+ tar = tarfile.open(orig, "r:*")
+ new = tarfile.open(new, "w:bz2")
+
+ while True:
+ info = tar.next()
+ if not info:
+ break
+ do_filt = filt.match(info.name)
+ if do_filt == None:
+ print >> sys.stderr, "Removing %s" % (info.name)
+ continue
+
+ if info.isfile():
+ file = tar.extractfile(info)
+ if do_filt:
+ print >> sys.stderr, "Filtering %s" % (info.name)
+ orig = file
+ file = StringIO.StringIO()
+ the_filt = lambda l: l
+ if do_filt[0].isalpha():
+ f = do_filt.split(do_filt[1])
+ if f[0] == 's':
+ the_filt = lambda l: re.sub(f[1], f[2], l)
+ else:
+ f = do_filt.split(do_filt[0])
+ if f[2] == 'd':
+ the_filt = lambda l: "" if re.search(f[1], l) else l
+ file.writelines(map(the_filt, orig.readlines()))
+ file.seek(0);
+ info.size = len(file.buf)
+ new.addfile(info, file)
+ else:
+ new.addfile(info)
+
+ tar.close()
+ new.close()
+
+def get_package_name():
+ return rfc822.Message(open("debian/control"))["Source"]
+
+def main():
+ parser = OptionParser()
+ parser.add_option("-u", "--upstream-version", dest="upstream_version",
+ help="define upstream version number to use when creating the file",
+ metavar="VERSION")
+ (options, args) = parser.parse_args()
+
+ if not options.upstream_version:
+ parser.error("Need an upstream version")
+ return
+
+ if len(args) < 1:
+ parser.error("Too few arguments")
+ return
+ if len(args) > 1:
+ parser.error("Too many arguments")
+ return
+
+ if os.path.islink(args[0]):
+ orig = os.path.realpath(args[0])
+ new_file = args[0]
+ else:
+ orig = args[0]
+ new_file = get_package_name() + "_" + options.upstream_version + ".orig.tar.bz2"
+ new_file = os.path.realpath(os.path.join(os.path.dirname(orig), new_file))
+ print orig, new_file
+ filter_tar(orig, new_file + ".new", "debian/source.filter")
+ os.rename(new_file + ".new", new_file)
+
+if __name__ == '__main__':
+ main()
diff --git a/debian/rules b/debian/rules
index a590cd7..2641138 100755
--- a/debian/rules
+++ b/debian/rules
@@ -178,10 +178,6 @@ override_dh_shlibdeps:
override_dh_bugfiles:
dh_bugfiles -A
-source: clean
- sh $(CURDIR)/debian/remove.nonfree
- tar -C .. -jcf ../`dpkg-parsechangelog | sed -n '/Source:/ N; s/Source: \(.*\)\nVersion: \(.*:\|\)\(.*\)-[0-9][0-9]*$$/\1_\3/ p'`.orig.tar.bz2 --exclude=`basename $(CURDIR)`/debian `basename $(CURDIR)`
-
debian/patches:
ifdef REVLIST
rm -rf $@
diff --git a/debian/source.filter b/debian/source.filter
new file mode 100644
index 0000000..e5afe0e
--- /dev/null
+++ b/debian/source.filter
@@ -0,0 +1,112 @@
+mozilla/modules/oji/tests/script/killer.exe
+mozilla/other-licenses/7zstub/firefox/7zSD.sfx
+mozilla/toolkit/mozapps/update/src/updater/macbuild/Contents/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
+mozilla/toolkit/mozapps/update/src/updater/macbuild/Contents/PkgInfo
+mozilla/extensions/universalchardet/doc/UniversalCharsetDetection.doc
+mozilla/config/bin2rc.exe
+mozilla/config/makedep.exe
+mozilla/config/mangle.exe
+mozilla/embedding/browser/activex/src/pluginhostctrl/cab/redist/ATL.DLL
+mozilla/embedding/browser/activex/tests/vbrowse/browser.frx
+mozilla/embedding/browser/activex/tests/vbrowse/frmToolBar.frx
+mozilla/embedding/qa/testembed/testembed.aps
+mozilla/embedding/tests/MSDotNETCSEmbed/MSDotNETCSEmbed.suo
+mozilla/embedding/wrappers/DotNETEmbed/DotNETEmbed.snk
+mozilla/intl/unicharutil/tools/data/case.dat
+mozilla/intl/unicharutil/tools/data/cmbcl.dat
+mozilla/intl/unicharutil/tools/data/ctype.dat
+mozilla/intl/unicharutil/tools/data/decomp.dat
+mozilla/intl/unicharutil/tools/data/num.dat
+mozilla/js/src/js.mdp
+mozilla/js/src/liveconnect/jsj_nodl.c
+mozilla/memory/jemalloc/ed.exe
+mozilla/plugin/oji/JEP/MRJPlugin.plugin/Contents/MacOS/MRJPlugin
+mozilla/plugin/oji/JEP/MRJPlugin.plugin/Contents/MacOS/MRJPlugin.jar
+mozilla/plugin/oji/JEP/MRJPlugin.plugin/Contents/Resources/MRJPlugin.rsrc
+mozilla/plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/MacOS/JavaEmbeddingPlugin
+mozilla/plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/Resources/Java/JavaEmbeddingPlugin.jar
+mozilla/plugin/oji/MRJ/plugin/Resources/Dialogs.rsrc
+mozilla/plugin/oji/MRJ/plugin/Resources/Strings.rsrc
+mozilla/plugin/oji/MRJ/plugin/Resources/Version.rsrc
+mozilla/plugin/oji/MRJ/plugin/MRJPlugin.jar
+mozilla/plugin/oji/MRJ/plugin/netscape.plugin.jar
+mozilla/plugin/oji/MRJ/plugin/Source/JMURLConnection
+mozilla/plugin/oji/MRJ/testing/ConsoleApplet/ConsoleApplet.mcp
+mozilla/plugin/oji/MRJ/testing/JSApplet/JSApplet.mcp
+mozilla/plugin/oji/MRJ/testing/SwingApplet/TestApplet.mcp
+mozilla/plugin/oji/MRJ/testing/TrivialApplet/MyApplet.mcp
+mozilla/plugin/oji/MRJCarbon/MRJSDK/JavaFrameworks/JavaEmbeddingLib
+mozilla/plugin/oji/MRJCarbon/plugin/MRJPlugin.jar
+mozilla/plugin/oji/MRJCarbon/plugin/Resources/Dialogs.rsrc
+mozilla/plugin/oji/MRJCarbon/plugin/Resources/Strings.rsrc
+mozilla/plugin/oji/MRJCarbon/plugin/Resources/Version.rsrc
+mozilla/xpcom/reflect/xptcall/tests/eVC4/XPTCInvoke_Testing.cpp
+mozilla/xpcom/tests/StringFactoringTests/StringTest.mcp
+mozilla/xpinstall/test/pre_checkin.xpi
+mozilla/layout/doc/SpaceMgr_BlockReflSt_OD.sda
+mozilla/layout/doc/object_diagram_template.sda
+mozilla/layout/html/tests/block/bugs/RealSnow.jar
+mozilla/xpfe/bootstrap/appleevents/nsAppleEvents.rsrc
+mozilla/toolkit/crashreporter/tools/win32/dump_syms.exe
+mozilla/toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/testdata/dump_syms_regtest.o
+mozilla/toolkit/mozapps/installer/windows/nsis/AppAssocReg.dll
+mozilla/toolkit/mozapps/installer/windows/nsis/ShellLink.dll
+mozilla/toolkit/mozapps/installer/windows/nsis/UAC.dll
+mozilla/toolkit/mozapps/installer/windows/nsis/nsProcess.dll
+mozilla/other-licenses/7zstub
+mozilla/other-licenses/branding
+mozilla/netwerk/protocol/ftp/doc/rfc959.txt
+mozilla/layout/html/tests
+mozilla/layout/doc
+mozilla/content/xml/tests
+mozilla/testing/performance
+mozilla/modules/libpr0n/test/reftest/pngsuite-transparency
+mozilla/*/.cvsignore
+mozilla/browser/locales/en-US/searchplugins/amazondotcom.xml s,>data:.*<, type="image/x-icon">http://www.amazon.com/favicon.ico<,
+mozilla/browser/locales/en-US/searchplugins/answers.xml s,>data:.*<, type="image/x-icon">http://www.answers.com/favicon.ico<,
+mozilla/browser/locales/en-US/searchplugins/creativecommons.xml s,>data:.*<, type="image/x-icon">http://www.creativecommons.org/favicon.ico<,
+mozilla/browser/locales/en-US/searchplugins/eBay.xml s,>data:.*<, type="image/x-icon">http://www.ebay.com/favicon.ico<,
+mozilla/browser/locales/en-US/searchplugins/google.xml s,>data:.*<, type="image/x-icon">http://www.google.com/favicon.ico<,
+mozilla/browser/locales/en-US/searchplugins/wikipedia.xml s,>data:.*<, type="image/x-icon">http://en.wikipedia.org/favicon.ico<,
+mozilla/browser/locales/en-US/searchplugins/yahoo.xml s,>data:.*<, type="image/x-icon">http://www.yahoo.com/favicon.ico<,
+directory/c-sdk/ldap/examples/macintosh/*.u
+directory/c-sdk/ldap/libraries/macintosh/LDAPClient.mcp
+suite/branding/icons/gtk/seamonkey.png
+suite/branding/content/logo.gif
+calendar/sunbird/base/themes/winstripe/preview.png
+calendar/sunbird/base/themes/pinstripe/preview.png
+suite/themes/classic/preview.png
+mail/themes/qute/mail/preview.png
+mail/themes/gnomestripe/mail/preview.png
+mail/themes/pinstripe/mail/preview.png
+calendar/sunbird/base/themes/pinstripe/preview.png
+calendar/sunbird/base/themes/winstripe/preview.png
+mail/themes/gnomestripe/mail/preview.png
+mail/themes/pinstripe/mail/preview.png
+mail/themes/qute/mail/preview.png
+suite/branding/content/about.png
+suite/branding/content/icon64.png
+suite/branding/icons/gtk/default.png
+suite/branding/icons/gtk/default16.png
+suite/branding/icons/gtk/default48.png
+suite/branding/icons/gtk/main-window.png
+suite/branding/icons/gtk/main-window16.png
+suite/branding/icons/gtk/main-window48.png
+suite/branding/icons/mac/seamonkey.icns
+suite/branding/icons/os2/main-window.ico
+suite/branding/icons/os2/seamonkey.ico
+suite/branding/icons/windows/main-window.ico
+suite/branding/icons/windows/seamonkey.ico
+suite/themes/classic/preview.png
+suite/themes/classic/communicator/brand/throbber-anim.png
+suite/themes/classic/communicator/brand/throbber-single.png
+suite/themes/classic/communicator/brand/throbber16-anim.png
+suite/themes/classic/communicator/brand/throbber16-single.png
+suite/themes/modern/communicator/brand/throbber-anim.png
+suite/themes/modern/communicator/brand/throbber-single.png
+suite/themes/modern/communicator/brand/throbber16-anim.png
+suite/themes/modern/communicator/brand/throbber16-single.png
+other-licenses/*
+mozilla/other-licenses
+calendar/sunbird/app/sunbird.ico
+calendar/sunbird/app/default.xpm
diff --git a/debian/watch b/debian/watch
index cd76310..14bf0fd 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
version=3
opts=dversionmangle=s/^(\d\.[\d\.]+)\+dfsg$/$1/ \
-http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/(\d\.[\d\.]+)/source/seamonkey-([\d\.]+).source\.tar\.bz2
+ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/(2\.0\.[\d\.]+)/source/seamonkey-([\d\.]+).source\.tar\.bz2 debian python debian/repack.py
--- End Message ---