[Pkg-mozext-commits] [SCM] livehttpheaders Debian extension branch, master, updated. debian/0.17-2-10-g583d239

Fabrizio Regalli fabreg at fabreg.it
Fri Apr 6 13:21:04 UTC 2012


The following commit has been merged in the master branch:
commit 583d2397d0804a746891478c2bf88aa392464188
Author: Fabrizio Regalli <fabreg at fabreg.it>
Date:   Fri Apr 6 15:21:00 2012 +0200

    Removed d/dirs and d/links
    
    * Removed d/dirs and d/links
    * Move to standard d/rules using mozilla-devscript

diff --git a/chrome.manifest b/chrome.manifest
index 0820cb9..5d78990 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -6,31 +6,31 @@ overlay	chrome://browser/content/pageInfo.xul	chrome://livehttpheaders/content/P
 overlay chrome://browser/content/pageinfo/pageInfo.xul chrome://livehttpheaders/content/PageInfoOverlay.xul 
 overlay	chrome://browser/content/browser.xul	chrome://livehttpheaders/content/TasksOverlay.xul
 
-content	livehttpheaders	chrome/livehttpheaders.jar!/content/
+content	livehttpheaders	jar:chrome/livehttpheaders.jar!/content/
 style chrome://global/content/customizeToolbar.xul chrome://livehttpheaders/skin/livehttpheaders.css
 style chrome://browser/content/pageinfo/pageInfo.xul chrome://livehttpheaders/skin/livehttpheaders.css
 
-skin	livehttpheaders	classic/1.0	chrome/livehttpheaders.jar!/skin/
+skin	livehttpheaders	classic/1.0	jar:chrome/livehttpheaders.jar!/skin/
 
-locale	livehttpheaders	en-US	chrome/livehttpheaders.jar!/locale/en-US/livehttpheaders/
+locale	livehttpheaders	en-US	jar:chrome/livehttpheaders.jar!/locale/en-US/livehttpheaders/
 
-locale	livehttpheaders	fr-FR	chrome/livehttpheaders.jar!/locale/fr-FR/livehttpheaders/
+locale	livehttpheaders	fr-FR	jar:chrome/livehttpheaders.jar!/locale/fr-FR/livehttpheaders/
 
-locale	livehttpheaders	de-AT	chrome/livehttpheaders.jar!/locale/de-AT/livehttpheaders/
+locale	livehttpheaders	de-AT	jar:chrome/livehttpheaders.jar!/locale/de-AT/livehttpheaders/
 
-locale	livehttpheaders	es-ES	chrome/livehttpheaders.jar!/locale/es-ES/livehttpheaders/
+locale	livehttpheaders	es-ES	jar:chrome/livehttpheaders.jar!/locale/es-ES/livehttpheaders/
 
-locale	livehttpheaders	cs-CZ	chrome/livehttpheaders.jar!/locale/cs-CZ/livehttpheaders/
+locale	livehttpheaders	cs-CZ	jar:chrome/livehttpheaders.jar!/locale/cs-CZ/livehttpheaders/
 
-locale	livehttpheaders	nl-NL	chrome/livehttpheaders.jar!/locale/nl-NL/livehttpheaders/
+locale	livehttpheaders	nl-NL	jar:chrome/livehttpheaders.jar!/locale/nl-NL/livehttpheaders/
 
-locale	livehttpheaders	ru-RU	chrome/livehttpheaders.jar!/locale/ru-RU/livehttpheaders/
+locale	livehttpheaders	ru-RU	jar:chrome/livehttpheaders.jar!/locale/ru-RU/livehttpheaders/
 
-locale	livehttpheaders	da-DK	chrome/livehttpheaders.jar!/locale/da-DK/livehttpheaders/
+locale	livehttpheaders	da-DK	jar:chrome/livehttpheaders.jar!/locale/da-DK/livehttpheaders/
 
-locale	livehttpheaders	ja	chrome/livehttpheaders.jar!/locale/ja-JP/livehttpheaders/
+locale	livehttpheaders	ja	jar:chrome/livehttpheaders.jar!/locale/ja-JP/livehttpheaders/
 
-locale	livehttpheaders	hu-HU	chrome/livehttpheaders.jar!/locale/hu-HU/livehttpheaders/
+locale	livehttpheaders	hu-HU	jar:chrome/livehttpheaders.jar!/locale/hu-HU/livehttpheaders/
 
 component {d5598f0d-5eba-43bc-b8e1-342a23bce3ea} components/nsHeaderInfo.js
 contract @livehttpheaders.org/js_headerinfo;1 {d5598f0d-5eba-43bc-b8e1-342a23bce3ea}
diff --git a/chrome/livehttpheaders.jar!/content/contents.rdf b/chrome/livehttpheaders.jar!/content/contents.rdf
index 38033ee..6c7cf30 100644
--- a/chrome/livehttpheaders.jar!/content/contents.rdf
+++ b/chrome/livehttpheaders.jar!/content/contents.rdf
@@ -34,6 +34,7 @@
         chrome:displayName="Live HTTP Headers"
         chrome:author="livehttpheaders.mozdev.org"
         chrome:authorURL="http://livehttpheaders.mozdev.org/"
+        chrome:extension="true"
         chrome:description="Allows you to view HTTP request/response headers."
         chrome:name="livehttpheaders"
         chrome:settingsURL="chrome://livehttpheaders/content/LiveHTTPHeaders.xul"
diff --git a/debian/changelog b/debian/changelog
index c4816fa..cb058bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ livehttpheaders (0.17-3) UNRELEASED; urgency=low
   * Added {Recommends,Provides} fields in d/control
   * Removed Mike from Maintainers
   * Switch to 3.0 quilt format
+  * Removed d/dirs and d/links
+  * Move to standard d/rules using mozilla-devscript
 
  -- Fabrizio Regalli <fabreg at fabreg.it>  Fri, 06 Apr 2012 12:22:06 +0200
 
diff --git a/debian/control b/debian/control
index 7287e16..e560f05 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
 Section: web
 Maintainer: Debian Mozilla Extension Maintainers <pkg-mozext-maintainers at lists.alioth.debian.org>
 Uploaders: Fabrizio Regalli <fabreg at fabreg.it>
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 7.0.50~), mozilla-devscripts (>= 0.22~)
 Standards-Version: 3.9.3
 Homepage: https://addons.mozilla.org/en-US/firefox/addon/live-http-headers
 Vcs-Browser: http://git.debian.org/?p=pkg-mozext/livehttpheaders.git
diff --git a/debian/rules b/debian/rules
index 0ab98a9..6e1433a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,14 @@
 #!/usr/bin/make -f
 
-EXTENSION_DIR=$(CURDIR)/debian/mozilla-livehttpheaders/usr/share/mozilla-extensions/livehttpheaders
+%:
+	dh $@ --with xul-ext
 
-override_dh_install:
-	# Add here commands to install the package into debian/mozilla-livehttpheaders
-	find $(CURDIR)/chrome ! -name CVS -type d -printf "%P\n" | while read dir; do install -d $(EXTENSION_DIR)/chrome/$${dir}; done
-	find $(CURDIR)/chrome ! -name CVS -type f -printf "%P\n" | while read file; do install -m 644 $(CURDIR)/chrome/$${file} $(EXTENSION_DIR)/chrome/`dirname $${file}`; done
-	install -m 644 $(CURDIR)/chrome.manifest $(EXTENSION_DIR)
-	install -m 644 $(CURDIR)/components/nsHeaderInfo.js $(EXTENSION_DIR)/components/
-	install -m 644 $(CURDIR)/install.rdf $(EXTENSION_DIR)
 
-override_dh_installdocs:
-	dh_installdocs -i $(CURDIR)/TODO.txt
+override_dh_auto_build:
+	xpi-pack . live.xpi
 
-%:
-	dh $@
+override_dh_auto_install:
+	install-xpi --remove-license-files live.xpi
+
+override_dh_auto_clean:
+	rm -f live.xpi
diff --git a/install.rdf b/install.rdf
index 4439523..32e919c 100644
--- a/install.rdf
+++ b/install.rdf
@@ -16,7 +16,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>0.8</em:minVersion>
-        <em:maxVersion>*</em:maxVersion>
+        <em:maxVersion>4.0.*</em:maxVersion>
       </Description>
     </em:targetApplication>
     <!-- Flock -->
@@ -32,7 +32,7 @@
       <Description>
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
         <em:minVersion>1.0</em:minVersion>
-        <em:maxVersion>*</em:maxVersion>
+        <em:maxVersion>2.1.*</em:maxVersion>
       </Description>
     </em:targetApplication>
     
@@ -139,7 +139,7 @@
 
     <!-- Packages, Skins and Locales that this extension registers -->
     <em:file>
-      <Description about="urn:mozilla:extension:file:livehttpheaders">
+      <Description about="urn:mozilla:extension:file:livehttpheaders.jar">
         <em:package>content/</em:package>
         <em:locale>locale/en-US/livehttpheaders/</em:locale>
         <em:locale>locale/fr-FR/livehttpheaders/</em:locale>

-- 
livehttpheaders Debian extension



More information about the Pkg-mozext-commits mailing list