[Pkg-mozext-commits] [SCM] extension for Firebug to edit, inspect and generate XPath express branch, master, updated. upstream/0.9.7

Fabrizio Regalli fabreg at fabreg.it
Tue Sep 27 20:11:03 UTC 2011


The following commit has been merged in the master branch:
commit 8a5870f93e7d4067075b3b3728e36983b718e62f
Author: Fabrizio Regalli <fabreg at fabreg.it>
Date:   Tue Sep 27 22:05:27 2011 +0200

    Imported Upstream version 0.9.7

diff --git a/content/FirePathPanel.js b/content/FirePathPanel.js
index 271acc9..7fea10c 100644
--- a/content/FirePathPanel.js
+++ b/content/FirePathPanel.js
@@ -18,7 +18,6 @@
  */
 
 FBL.ns(function() { with (FBL) {
-
 // ************************************************************************************************
 // Constants
 
@@ -120,26 +119,24 @@ Firebug.FirePathPanel.prototype = extend(Firebug.Panel,
 	name: panelName,
 	title: "FirePath",
 
-	initialize: function() {
-		Firebug.Panel.initialize.apply(this, arguments);
-		this.addStyleSheet(this.document);
-		this.location = this.getDefaultLocation(this.context);
-		this.firePathBar = (this.context.chrome?this.context.chrome.$("FirePathBar"): $("FirePathBar"));
+	initialize: function(context, doc) {
+		this.addStyleSheet(doc);
+		this.location = this.getDefaultLocation(context);
+		this.firePathBar = Firebug.chrome.$('FirePathBar');
 		this.firePathBar.initialize();
-		this.firePathStatusBar = (this.context.chrome?this.context.chrome.$("FirePathStatusBar"): $("FirePathStatusBar"));
-		
-		this.ioBoxContainer = this.document.createElement("div");
-		setClass(this.ioBoxContainer, "io-box-container");
-		this.panelNode.appendChild(this.ioBoxContainer);
+		this.firePathStatusBar = Firebug.chrome.$("FirePathStatusBar");
 		
 		this.onMouseDown = bind(this.onMouseDown, this);
 		
 		this.inspecting = false;
+		Firebug.Panel.initialize.apply(this, arguments);
 	},
 	
 	destroy: function(state) {
 		state.persistedLocation = this.persisteLocation();
-		this.firePathBar.persiste(state);
+		if (this.firePathBar) {
+			this.firePathBar.persiste(state);
+		}
 		this.stopLoading();
 		
 		if (this.ioBox) {
@@ -151,25 +148,32 @@ Firebug.FirePathPanel.prototype = extend(Firebug.Panel,
 	
 	initializeNode: function(oldPanelNode) {
 		this.panelNode.addEventListener("mousedown", this.onMouseDown, false);
+
+		this.ioBoxContainer = this.document.createElement("div");
+		setClass(this.ioBoxContainer, "io-box-container");
+		this.panelNode.appendChild(this.ioBoxContainer);
+		
+		if(!this.ioBox) {
+			this.ioBox = new InsideOutBox(this, this.ioBoxContainer);
+		}
+		Firebug.Panel.initializeNode.apply(this, arguments);
 	},
 
 	destroyNode: function() {
 		this.panelNode.removeEventListener("mousedown", this.onMouseDown, false);
+		Firebug.Panel.destroyNode.apply(this, arguments);
 	},
 	
 	show: function(state) {
 		if (this.context.loaded) {
 			this.showModules(true);
-			
-			if(!this.ioBox) {
-				this.ioBox = new InsideOutBox(this, this.ioBoxContainer);
-				if(state) {
-					this.restoreLocation(state.persistedLocation);
-					this.firePathBar.restore(state);
-					this.firePathBar.evaluate(true);
-				} else {
-					this.ioBox.createObjectBox(this.rootElement || this.location.document);
-				}
+
+			if(state) {
+				this.restoreLocation(state.persistedLocation);
+				this.firePathBar.restore(state);
+				this.firePathBar.evaluate(true);
+			} else {
+				this.ioBox.createObjectBox(this.rootElement || this.location.document);
 			}
 		}
 	},
@@ -184,29 +188,25 @@ Firebug.FirePathPanel.prototype = extend(Firebug.Panel,
 			this.firePathStatusBar.show(this.context, show);
 		} catch (e) {}
 		
-		var $ = FBL.$;
-		if(this.context.chrome)
-			$ = this.context.chrome.$;
-		
 		// when there is a visibility: hidden style the collapsed attribute doesn't work correctly
-		$("fbPanelStatus").removeAttribute("style");
-		collapse($("fbSearchBox"), show);
-		collapse($("fbPanelStatus"), show);
+		Firebug.chrome.$("fbPanelStatus").removeAttribute("style");
+		collapse(Firebug.chrome.$("fbSearchBox"), show);
+		collapse(Firebug.chrome.$("fbPanelStatus"), show);
 	},
 	
 	detach: function(oldChrome, newChrome) {
 		Firebug.Panel.detach.apply(this, arguments);
-		if(this.context == FirebugContext) {
+		if(this.context == Firebug.currentContext) {
 			this.firePathBar.persiste(this.context);
 		}
 		this.firePathBar = newChrome.$("FirePathBar");
 		this.firePathBar.initialize();
 		this.firePathStatusBar = newChrome.$("FirePathStatusBar");
-		if(this.context == FirebugContext) {
+		if(this.context == Firebug.currentContext) {
 			this.firePathBar.restore(this.context);
 			this.firePathBar.currentContext = this.context;
 		}
-		if(this.context.browser.detached || (newChrome != Firebug.originalChrome && this.context == FirebugContext)) {
+		if(this.context.browser.detached || (newChrome != Firebug.originalChrome && this.context == Firebug.currentContext)) {
 			Firebug.FirePathPanel.LocationHighlightModule.addLocationListener(newChrome);
 		} else {
 			Firebug.FirePathPanel.LocationHighlightModule.removeLocationListener(oldChrome);
@@ -225,8 +225,7 @@ Firebug.FirePathPanel.prototype = extend(Firebug.Panel,
 				object instanceof Text ||
 				object instanceof Attr ||
 				object instanceof Comment ||
-				object instanceof Document ||
-				object instanceof SourceText )
+				object instanceof Document )
 			return 1;
 		else
 			return 0;
@@ -437,9 +436,6 @@ Firebug.FirePathPanel.prototype = extend(Firebug.Panel,
 	},
 
 	getParentObject: function(node) {
-		if (node instanceof SourceText)
-			return node.owner;
-
 		if (this.rootElement && node == this.rootElement)
 			return null;
 
@@ -543,7 +539,7 @@ Firebug.FirePathPanel.prototype = extend(Firebug.Panel,
 			
 			Firebug.Inspector.highlightObject(null);
 			element.scrollIntoView();
-			Firebug.Inspector.highlightObject(element, FirebugContext);
+			Firebug.Inspector.highlightObject(element, Firebug.currentContext);
 		}
 	},
 	
@@ -641,7 +637,7 @@ function overwriteMethodForPanel(object, methodName, panelName, newMethod ) {
 	if(object[methodName] && object[methodName] instanceof Function)
 		object["default" + methodName] = object[methodName];
 	object[methodName] = function () {
-		var selectedPanelName = FirebugContext.panelName;
+		var selectedPanelName = Firebug.currentContext.panelName;
 
 		if(selectedPanelName != panelName) {
 			if(object["default" + methodName])
@@ -1660,11 +1656,11 @@ Firebug.FirePathPanel.LocationHighlightModule = extend(Firebug.Module,
 {
 	// add event listener
 	initializeUI: function(detachArgs) {
-		this.addLocationListener(FirebugChrome);
+		this.addLocationListener(Firebug.chrome);
 	},
 	
 	shutdown: function() {
-		this.removeLocationListener(FirebugChrome);
+		this.removeLocationListener(Firebug.chrome);
 	},
 	
 	addLocationListener: function(chrome) {
@@ -1678,12 +1674,12 @@ Firebug.FirePathPanel.LocationHighlightModule = extend(Firebug.Module,
 	},
 	
 	onLocationMouseOver: function(event) {
-		var panel = FirebugContext.browser.chrome.getSelectedPanel();
+		var panel = Firebug.chrome.getSelectedPanel();
 	
 		if(panel.name == panelName) {
 			var repObject = event.originalTarget.repObject;
 			if(repObject && repObject.frameElement) {
-				Firebug.Inspector.highlightObject(repObject.frameElement, FirebugContext);
+				Firebug.Inspector.highlightObject(repObject.frameElement, Firebug.currentContext);
 			}
 		}
 	},
@@ -1714,11 +1710,11 @@ Firebug.FirePathPanel.ResultHighlightModule = extend(Firebug.Module,
 	},
 	
 	reattachContext: function(browser, context) {
-		this.highlightButton = browser.chrome.$("FirePathBarHighlightButton");
+		this.highlightButton = Firebug.chrome.$("FirePathBarHighlightButton");
 	},
 	
 	showContext: function(browser, context) {
-		this.highlightButton = browser.chrome.$("FirePathBarHighlightButton");
+		this.highlightButton = Firebug.chrome.$("FirePathBarHighlightButton");
 		this.refreshHighlightButton(context.getPanel(panelName));
 	},
 	
@@ -1727,13 +1723,15 @@ Firebug.FirePathPanel.ResultHighlightModule = extend(Firebug.Module,
 	},
 	
 	showPanel: function(browser, panel) {
-		if(panel.name == panelName) {
-			this.highlightButton.collapsed = false;
-			if(!panel.context.firePathResultNotHighlighted)
-				this.highlight(panel.context);
-		} else {
-			this.highlightButton.collapsed = true;
-			this.clear();
+		if(panel) {
+			if(panel.name == panelName) {
+				this.highlightButton.collapsed = false;
+				if(!panel.context.firePathResultNotHighlighted)
+					this.highlight(panel.context);
+			} else {
+				this.highlightButton.collapsed = true;
+				this.clear();
+			}
 		}
 	},
 	
@@ -1758,7 +1756,8 @@ Firebug.FirePathPanel.ResultHighlightModule = extend(Firebug.Module,
 		}
 	},
 	
-	toggleHighlight: function(context) {
+	toggleHighlight: function() {
+		var context = Firebug.currentContext;
 		if(!context.firePathResultNotHighlighted) {
 			this.clear();
 		} else {
@@ -1837,113 +1836,7 @@ Firebug.FirePathPanel.ResultHighlightModule = extend(Firebug.Module,
 	}
 })
 
-// ************************************************************************************************
-// Overwrite inspector to make sure it stay on the FirePath tab (instead of going to the HTML tab)
-
-// Firebug 1.7 allow to have inspectable panel so this is no longuer needed.
-if (!Firebug.Inspector._resolveInspectingPanelName) {
-	overwriteMethodForPanel(
-		Firebug.Inspector, 
-		"startInspecting", 
-		panelName, 
-		function (context) {
-			if (this.inspecting || !context || !context.loaded)
-				return;
-
-			this.inspecting = true;
-			this.inspectingContext = context;
-
-			context.chrome.setGlobalAttribute("cmd_toggleInspecting", "checked", "true");
-			this.attachInspectListeners(context);
-
-			// Remember the previous panel and bar state so we can revert if the user cancels
-			this.previousPanelName = context.panelName;
-			this.previousSidePanelName = context.sidePanelName;
-			this.previouslyCollapsed = $("fbContentBox").collapsed;
-			this.previouslyFocused = context.detached && context.chrome.isFocused();
-
-			var panel;
-			if(this.previouslyCollapsed) {
-				panel = context.chrome.selectPanel("html");
-				this.previousObject = panel.selection;
-			} else {
-				panel = context.getPanel(panelName);
-			}
-
-			if (context.detached)
-				FirebugChrome.focus();
-			else
-				Firebug.showBar(true);
-
-			panel.panelNode.focus();
-			panel.startInspecting();
-
-			if (context.hoverNode)
-				this.inspectNode(context.hoverNode);
-		}
-	);
-
-	overwriteMethodForPanel(
-		Firebug.Inspector, 
-		"stopInspecting", 
-		panelName, 
-		function(cancelled, waitForClick){
-			if (!this.inspecting) 
-				return;
-			
-			var context = this.inspectingContext;
-			
-			if (this.inspectTimeout) {
-				context.clearTimeout(this.inspectTimeout);
-				delete this.inspectTimeout;
-			}
-			
-			this.detachInspectListeners(context);
-			if (!waitForClick) 
-				this.detachClickInspectListeners(context.window);
-			
-			context.chrome.setGlobalAttribute("cmd_toggleInspecting", "checked", "false");
-			
-			this.inspecting = false;
-			
-			var htmlPanel = context.getPanel("html");
-			var firePathPanel = context.getPanel(panelName);
-			
-			if (this.previouslyFocused) 
-				context.chrome.focus();
-			
-			if (cancelled) {
-				if (this.previouslyCollapsed) 
-					Firebug.showBar(false);
-				
-				if (this.previousPanelName == "html") 
-					context.chrome.select(this.previousObject);
-				else 
-					context.chrome.selectPanel(this.previousPanelName, this.previousSidePanelName);
-			}
-			else {
-				if(this.previouslyCollapsed) {
-					context.chrome.select(htmlPanel.selection);
-					context.chrome.getSelectedPanel().panelNode.focus();
-				}
-			}
-			
-			if(this.previouslyCollapsed)
-				htmlPanel.stopInspecting(htmlPanel.selection, cancelled);
-			else
-				firePathPanel.stopInspecting(cancelled);
-			
-			this.inspectNode(null);
-			
-			delete this.previousObject;
-			delete this.previousPanelName;
-			delete this.previousSidePanelName;
-			delete this.inspectingContext;
-		}
-	);
-}
-
 Firebug.registerPanel(Firebug.FirePathPanel);
 Firebug.registerModule(Firebug.FirePathPanel.LocationHighlightModule, Firebug.FirePathPanel.ResultHighlightModule);
-if(Firebug.registerUIListener) Firebug.registerUIListener(Firebug.FirePathPanel.ResultHighlightModule);
+Firebug.registerUIListener(Firebug.FirePathPanel.ResultHighlightModule);
 }});
diff --git a/content/bindings.xml b/content/bindings.xml
index cac768e..5995631 100644
--- a/content/bindings.xml
+++ b/content/bindings.xml
@@ -73,13 +73,13 @@
 						this.firePathBar.evaluate();
 						break;
 					case KeyEvent.DOM_VK_UP:
-						this.firePathBar.autoCompleter.complete(FirebugContext, this, true, true);
+						this.firePathBar.autoCompleter.complete(Firebug.currentContext, this, true, true);
 						this.checkSyntax();
 						break;
 					case KeyEvent.DOM_VK_TAB:
 						event.preventDefault();
 					case KeyEvent.DOM_VK_DOWN:
-						this.firePathBar.autoCompleter.complete(FirebugContext, this, true, false);
+						this.firePathBar.autoCompleter.complete(Firebug.currentContext, this, true, false);
 						this.checkSyntax();
 						break;
 				}
@@ -197,7 +197,7 @@
 			
 			<property name="FirePathPanel" readonly="true">
 				<getter><![CDATA[	
-					return FirebugContext.getPanel(Firebug.FirePathPanel.prototype.name);
+					return Firebug.currentContext.getPanel(Firebug.FirePathPanel.prototype.name);
 				]]></getter>
 			</property>
 			
@@ -341,7 +341,7 @@
 						if (xPath && FBL.isHtmlDocument(this.FirePathPanel.location.document)) {
 							// we want to lower case the XPath expression but not the literal inside.
 							//  eg: //DIV[@id='TEST'] should become //div[@id='TEST']
-							xPath = xPath.replace(/([^']*)('[^']+')?/g, 
+							xPath = xPath.replace(/([^'"]*)('[^']+'|"[^"]+")?/g, 
 								function(str, expression, literal){return expression.toLowerCase() + literal;});
 						}
 						return this.xPathEvaluator.createExpression(xPath, this.NSResolver);
@@ -394,22 +394,38 @@
 				<body><![CDATA[
 					var win = this.FirePathPanel.location,
 					doc = win.document;
-					if (!win.wrappedJSObject._firePathSizzle) {
+					var firePathSizzle = win.firePathSizzle;
+					if (!firePathSizzle) {
 						// Inject Sizzle.js into the page.
+
+						// Store target window's original Sizzle, if any
+						var originalSizzle = win.wrappedJSObject.Sizzle; 							
 						var scriptSource = FBL.getResource("chrome://firepath/content/sizzle.js");
-						var addedElement = FBL.addScript(doc, "_firePathSizzle", scriptSource);
+						var addedElement = FBL.addScript(doc, "firePathSizzle", scriptSource);
+
+						// Store the newly created Sizzle on the wrapper
+						win.firePathSizzle = win.wrappedJSObject.Sizzle;
+
+						// Restore the original target's Sizzle, if any
+						if (originalSizzle) {
+							win.wrappedJSObject.Sizzle = originalSizzle;
+						} else {
+							delete win.wrappedJSObject.Sizzle;
+						}
 
 						// take the script tag back out now that the script is loaded
-						addedElement.parentNode.removeChild(addedElement);
+						addedElement.parentNode.removeChild(addedElement); 
+
+						firePathSizzle = win.firePathSizzle;
 					}
 					if (evaluateParent) {
-						win.wrappedJSObject._firePathContext = win.wrappedJSObject._firePathSizzle(selector);
-						return win.wrappedJSObject._firePathContext;
+						win.firePathContext = firePathSizzle(selector);
+						return win.firePathContext;
 					} else if(contextNode) {
-						return win.wrappedJSObject._firePathSizzle(selector, 
-							win.wrappedJSObject._firePathContext[this.parentNodeNumber.value - 1]);
+						return firePathSizzle(selector,
+							win.firePathContext[this.parentNodeNumber.value - 1]);
 					} else {
-						return win.wrappedJSObject._firePathSizzle(selector);
+						return firePathSizzle(selector);
 					}
 				]]></body>
 			</method>
@@ -670,7 +686,7 @@
 			</xul:statusbarpanel>
 			<xul:statusbarpanel anonid="firepath-result-progressmeter-container" collapsed="true">
 				<xul:image src="chrome://firebug/skin/errorIcon.png" 
-					onmousedown="document.getBindingParent(this).cancelLoading(FirebugContext)" 
+					onmousedown="document.getBindingParent(this).cancelLoading(Firebug.currentContext)" 
 					class="firepath-cancel-result-loading-button"/>
 				<xul:progressmeter anonid="firepath-result-progressmeter"/>
 			</xul:statusbarpanel>
diff --git a/content/firebugOverlay.xul b/content/firebugOverlay.xul
index ae0a42d..a4ace75 100644
--- a/content/firebugOverlay.xul
+++ b/content/firebugOverlay.xul
@@ -13,13 +13,13 @@
 	<popup id="contentAreaContextMenu">
 		<menuitem id="menu_fpShow" label="&FirePath.context.show.label;"
 			insertafter="context-viewpartialsource-selection"
-			oncommand="Firebug.toggleBar(true); FirebugChrome.selectPanel('firepath').updateSelection(document.popupNode)"
+			oncommand="Firebug.toggleBar(true); Firebug.chrome.selectPanel('firepath').updateSelection(document.popupNode)"
 			accesskey="&FirePath.context.show.key;"/>
 	</popup>
 
 	<hbox id="fbToolbarInner">
 		<toolbarbutton id="FirePathBarHighlightButton" collapsed="true" label="&FirePath.highlight.button;" class="toolbar-text-button"
-			oncommand="Firebug.FirePathPanel.ResultHighlightModule.toggleHighlight(FirebugContext);"
+			oncommand="Firebug.FirePathPanel.ResultHighlightModule.toggleHighlight();"
 			checked="false" disabled="true" insertafter="fbLocationList"/>
 		<firepathbar id="FirePathBar" flex="1"  collapsed="true" insertafter="fbLocationList"/>
 	</hbox>
@@ -28,4 +28,4 @@
 		<firepathstatusbar id="FirePathStatusBar" insertafter="fbCommandBox" collapsed="true"/>
 	</vbox>
 
-</overlay>
\ No newline at end of file
+</overlay>
diff --git a/content/sizzle.js b/content/sizzle.js
index 7a9dc4c..b2f5496 100644
--- a/content/sizzle.js
+++ b/content/sizzle.js
@@ -1381,6 +1381,6 @@ var posProcess = function( selector, context ) {
 
 // EXPOSE
 
-window._firePathSizzle = Sizzle;
+window.Sizzle = Sizzle;
 
 })();
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index f354746..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,35 +0,0 @@
-firexpath (0.9.6.1-1.0) unstable; urgency=low
-
-  * Non-maintainer upload.
-  * New upstream version.
-
- -- Dmitry E. Oboukhov <unera at debian.org>  Mon, 04 Jul 2011 12:26:59 +0400
-
-firexpath (0.9.5-1.2) unstable; urgency=low
-
-  * Non-maintainer upload.
-  * Iceweasel 5.0 compatible.
-
- -- Dmitry E. Oboukhov <unera at debian.org>  Mon, 04 Jul 2011 12:15:11 +0400
-
-firexpath (0.9.5-1.1) unstable; urgency=low
-
-  * Non-maintainer upload.
-  * Add debian/watch;
-  * Fix highlight button (backport fix from upstream SVN)
-
- -- Dmitry E. Oboukhov <unera at debian.org>  Wed, 02 Mar 2011 16:27:35 +0300
-
-firexpath (0.9.5-1.0) unstable; urgency=low
-
-  * Non-maintainer upload.
-  * New upstream version.
-  * Bump maxVersion to 4.*.
-
- -- Dmitry E. Oboukhov <unera at debian.org>  Wed, 02 Mar 2011 15:54:00 +0300
-
-firexpath (0.9.1-1) unstable; urgency=low
-
-  * Initial release. (Closes: #591902)
-
- -- Roman V. Nikolaev <rshadow at rambler.ru>  Fri, 20 Aug 2010 14:35:02 +0400
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 7f8f011..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/debian/control b/debian/control
deleted file mode 100644
index 22ab459..0000000
--- a/debian/control
+++ /dev/null
@@ -1,32 +0,0 @@
-Source: firexpath
-Section: web
-Priority: optional
-Maintainer: Debian Mozilla Extension Maintainers <pkg-mozext-maintainers at lists.alioth.debian.org>
-Uploaders: Roman V. Nikolaev <rshadow at rambler.ru>
-Build-Depends: cdbs, debhelper (>= 7), mozilla-devscripts (>= 0.16~)
-Standards-Version: 3.9.1
-Homepage: https://addons.mozilla.org/ru/firefox/addon/11900/
-Vcs-Git: git://git.debian.org/pkg-mozext/firexpath.git
-Vcs-Browser: http://git.debian.org/?p=pkg-mozext/firexpath.git;a=summary
-
-Package: xul-ext-firexpath
-Architecture: all
-Depends: ${misc:Depends}, xul-ext-firebug
-Recommends: ${xpi:Recommends}
-Provides: ${xpi:Provides}
-Enhances: ${xpi:Enhances}
-Description: extension for Firebug to edit, inspect and generate XPath expressions.
- FireXPath is a Firebug extension that adds a development tool to edit,
- inspect and generate XPath expressions.
- With FireXPath you can:
-  * Edit XPath expressions with auto completion (using TAB or up and down
-    arrows).
-  * Evaluate the expression on HTML or any XML documents.
-  * Display the result of evaluations in a Firebug-like DOM tree.
-  * Highlight the results directly on the document displayed by Firefox
-    (works only with HTML documents).
-  * Generate an XPath expression for an element by right clicking on it
-    and selecting "Inspect XPath" located under "Inspect Element".
-  * Define the evaluation context of an XPath expression.
-  * Choose the document in which to evaluate the XPath expression (only
-    applicable for HTML documents with frames or iframes).
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index 958d2f8..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,37 +0,0 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: FireXPath
-Mainteiner: Pierre Tholence <FireXPath at pierre.tholence.com>
-Source: https://addons.mozilla.org/ru/firefox/addon/11900/
-
-Files: *
-Copyright: Pierre Tholence <pierre.tholence at gmail.com>
-
-License: GPL-3
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- On Debian systems, the complete text of the GNU General Public
- License can be found in /usr/share/common-licenses/GPL-3 file.
-
-Files: debian/*
-Copyright: 2010, Roman V. Nikolaev <rshadow at rambler.ru>
-License: GPL-3
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- On Debian systems, the complete text of the GNU General Public
- License can be found in /usr/share/common-licenses/GPL-3 file.
diff --git a/debian/patches/max-version b/debian/patches/max-version
deleted file mode 100644
index 3ba47c8..0000000
--- a/debian/patches/max-version
+++ /dev/null
@@ -1,11 +0,0 @@
---- firexpath-0.9.6.1.orig/install.rdf
-+++ firexpath-0.9.6.1/install.rdf
-@@ -10,7 +10,7 @@
-       <Description>
-         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-         <em:minVersion>3.5</em:minVersion>
--        <em:maxVersion>4.0.*</em:maxVersion>
-+        <em:maxVersion>7.*</em:maxVersion>
-       </Description>
-     </em:targetApplication>
-     
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index a803b8c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-max-version
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index 12acab6..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/make -f
-
-PVERSION := $(shell \
-	dpkg-parsechangelog \
-	|grep ^Version: \
-	|awk '{print $$2}' \
-	|sed 's/-.*//' \
-)
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/mozilla-devscripts/xpi.mk
-
-clean::
-	rm -fr .pc
-
-tarball:
-	fakeroot debian/rules clean || ./debian/rules clean
-	cd .. && tar \
-		--exclude=debian \
-		--exclude=.git \
-		-czvf \
-		firexpath_$(PVERSION).orig.tar.gz \
-		firexpath-$(PVERSION)
-	
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index 5afe5d1..0000000
--- a/debian/watch
+++ /dev/null
@@ -1,4 +0,0 @@
-version=3
-opts="uversionmangle=s/(?=[^\.\d]+(?:\d+)?)$/\~/;s/0(\d)/0.$1/g" \
-ftp://ftp.mozilla.org/pub/mozilla.org/addons/11900/\
-	firex?path-(\d+(?:\.\d+){1,3}(?:\w+\d+)?).*\.xpi
diff --git a/install.rdf b/install.rdf
index 1bfa138..ff1d2b3 100644
--- a/install.rdf
+++ b/install.rdf
@@ -3,13 +3,13 @@
  xmlns:em="http://www.mozilla.org/2004/em-rdf#">
   <Description about="urn:mozilla:install-manifest">
     <em:id>FireXPath at pierre.tholence.com</em:id>
-    <em:version>0.9.6.1</em:version>
+    <em:version>0.9.7</em:version>
     
     <!-- Firefox -->
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-        <em:minVersion>3.5</em:minVersion>
+        <em:minVersion>4.0</em:minVersion>
         <em:maxVersion>7.*</em:maxVersion>
       </Description>
     </em:targetApplication>

-- 
extension for Firebug to edit, inspect and generate XPath express



More information about the Pkg-mozext-commits mailing list