[Pkg-mozext-commits] [useragentswitcher] 04/14: Revert "Added bump-maxversion.diff patch for introducing compatibility with all Firefox/Iceweasel versions (Closes: #653884)"

David Prévot taffit at moszumanska.debian.org
Fri May 1 15:40:19 UTC 2015


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository useragentswitcher.

commit 5814c502bbb83f0f65e212dc8e906501acdc7e51
Author: David Prévot <david at tilapin.org>
Date:   Fri May 1 10:30:36 2015 -0400

    Revert "Added bump-maxversion.diff patch for introducing compatibility with all Firefox/Iceweasel versions (Closes: #653884)"
    
    This reverts commit 748faceae3dec35768610f5d41f5547e0846540a.
---
 content/useragentswitcher/upgrade.js |  7 ++-----
 debian/changelog                     |  4 +---
 debian/patches/bump-maxversion.diff  | 22 ----------------------
 debian/patches/series                |  1 -
 install.rdf                          |  4 ++--
 5 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/content/useragentswitcher/upgrade.js b/content/useragentswitcher/upgrade.js
index 80d777e..3cfec6c 100644
--- a/content/useragentswitcher/upgrade.js
+++ b/content/useragentswitcher/upgrade.js
@@ -162,14 +162,11 @@ var UserAgentSwitcherUpgrade =
 	// Opens the upgrade page
 	openUpgradePage: function()
 	{
-/*		var windowContent = window.getBrowser();
+		var windowContent = window.getBrowser();
 	
 		windowContent.removeEventListener("load", UserAgentSwitcherUpgrade.openUpgradePage, false);
 
-		window.setTimeout(function() { windowContent.selectedTab =
-		windowContent.addTab("http://chrispederick.com/work/user-agent-switcher/installed/"
-		+ UserAgentSwitcherUpgrade.getVersion().replace(/\./g, "") + "/"); },
-		0);*/
+		window.setTimeout(function() { windowContent.selectedTab = windowContent.addTab("http://chrispederick.com/work/user-agent-switcher/installed/" + UserAgentSwitcherUpgrade.getVersion().replace(/\./g, "") + "/"); }, 0);	
 	},
 
 	// Parses the version number
diff --git a/debian/changelog b/debian/changelog
index 0ac1a9b..4844123 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,9 @@
-useragentswitcher (0.7.3-2) unstable; urgency=low
+useragentswitcher (0.7.3-2) UNRELEASED; urgency=low
 
   * Fixed Vcs-* fields
   * Added Breaks: ${xpi:Breaks} to d/control
   * Bump Standards-Version to 3.9.2 (no changes needed)
   * Added myself to Uploaders
-  * Added bump-maxversion.diff patch for introducing compatibility
-    with all Firefox/Iceweasel versions (Closes: #653884)
 
  -- Fabrizio Regalli <fabreg at fabreg.it>  Tue, 29 Nov 2011 09:49:09 +0100
 
diff --git a/debian/patches/bump-maxversion.diff b/debian/patches/bump-maxversion.diff
deleted file mode 100644
index 18c2c09..0000000
--- a/debian/patches/bump-maxversion.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Bump maxVersion for working with all Firefox/Iceweasel version.
-Author: Fabrizio Regalli <fabreg at fabreg.it>
-Forwarded: not-needed
-
---- a/install.rdf
-+++ b/install.rdf
-@@ -24,7 +24,7 @@
-     <em:targetApplication>
-       <Description>
-         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
--        <em:maxVersion>4.0.*</em:maxVersion>
-+        <em:maxVersion>*</em:maxVersion>
-         <em:minVersion>1.0</em:minVersion>
-       </Description>
-     </em:targetApplication>
-@@ -50,4 +50,4 @@
-       </Description>
-     </em:targetApplication>
-   </Description>
--</RDF>
-\ No newline at end of file
-+</RDF>
diff --git a/debian/patches/series b/debian/patches/series
index 9e254ef..66530d9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-bump-maxversion.diff
 disable-ads.diff
diff --git a/install.rdf b/install.rdf
index 86400a5..57cb56e 100644
--- a/install.rdf
+++ b/install.rdf
@@ -24,7 +24,7 @@
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-        <em:maxVersion>*</em:maxVersion>
+        <em:maxVersion>4.0.*</em:maxVersion>
         <em:minVersion>1.0</em:minVersion>
       </Description>
     </em:targetApplication>
@@ -50,4 +50,4 @@
       </Description>
     </em:targetApplication>
   </Description>
-</RDF>
+</RDF>
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/useragentswitcher.git



More information about the Pkg-mozext-commits mailing list