[Pkg-mozext-commits] [automatic-save-folder] 02/03: Remove deprecated patch 'fix-version-handling'

[Sascha Girrulat]

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

sagiru-guest pushed a commit to branch master
in repository automatic-save-folder.

commit 31d035e25037ab5ee7edf6f5aefc9e8becf5714d
Author: Sascha Girrulat <sascha at girrulat.de>
Date:   Thu Aug 20 14:54:51 2015 +0200

    Remove deprecated patch 'fix-version-handling'
    
    It's fixed by upstream itself in version 1.0.5_20140831
---
 ...on-handling-during-the-start-of-iceweasel.patch | 74 ----------------------
 ...1-update-button-labels-to-manage-filters.patch} |  0
 debian/patches/series                              |  3 +-
 3 files changed, 1 insertion(+), 76 deletions(-)

diff --git a/debian/patches/0001-fix-version-handling-during-the-start-of-iceweasel.patch b/debian/patches/0001-fix-version-handling-during-the-start-of-iceweasel.patch
deleted file mode 100644
index 7ce4971..0000000
--- a/debian/patches/0001-fix-version-handling-during-the-start-of-iceweasel.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From: Sascha Girrulat <sascha at girrulat.de>
-Date: Tue, 18 Aug 2015 14:37:37 +0200
-Subject: fix version handling during the start of iceweasel
-
-The empty preferences asf.version and asf.currentVersion results in a displayed
-extra tab with the update information everytime you start firefox. Parts from
-this patch are backported from upstream.
-
-Closes: #796222
----
- content/asf_right_click.js  | 25 ++++++++++---------------
- defaults/preferences/asf.js |  5 +++--
- 2 files changed, 13 insertions(+), 17 deletions(-)
-
-diff --git a/content/asf_right_click.js b/content/asf_right_click.js
-index 0ca5f31..92109c3 100644
---- a/content/asf_right_click.js
-+++ b/content/asf_right_click.js
-@@ -855,21 +855,16 @@ var automatic_save_folder = {
- 		{
- 			this.prefManager.setCharPref("extensions.asf.version", "1.0.0")
- 		}
--		
-+
-+    this.currentASFVersion = this.prefManager.getCharPref("extensions.asf.currentVersion");
-+
-+    // ensure asf.version is not empty to avoid ever displayed update message
-+    if(this.prefManager.getPrefType("extensions.asf.version") == "")
-+    {
-+      this.prefManager.setCharPref("extensions.asf.version", this.currentASFVersion)
-+    }
-+
- 		this.previousASFVersion = this.prefManager.getCharPref("extensions.asf.version");
--		
--		// Read currently installed ASF version, including beta revisions
--		// workaround for Firefox4 new asynchronous addonManager (can't depend on addon.version anymore,
--		// so for all versions of Firefox, read the data directly from the dtd source file.
--		var XhrObj = new XMLHttpRequest();
--		XhrObj.open("GET", "chrome://asf/content/common.dtd", false); //synchronous mode
--		XhrObj.overrideMimeType('text/plain; charset=UTF-8');
--		XhrObj.send(null);
--		if (XhrObj.status == 0)
--		{
--			var dtd = XhrObj.responseText.split("\n") ;
--			this.currentASFVersion = dtd[1].match(/"(.*)"/)[1];
--		}
- 	},
- 	
- 	
-@@ -993,4 +988,4 @@ var automatic_save_folder = {
- 	"load",			// After browser window is loaded
- 	function(){ automatic_save_folder.rightclick_init(); },  // Run main from automatic_save_folder to check the filters
- 	false
--	);
-\ No newline at end of file
-+	);
-diff --git a/defaults/preferences/asf.js b/defaults/preferences/asf.js
-index ca67dbf..8bb8b87 100644
---- a/defaults/preferences/asf.js
-+++ b/defaults/preferences/asf.js
-@@ -1,4 +1,5 @@
-- pref("extensions.asf.lastdir", true);
-+ pref("extensions.asf.currentVersion", "1.0.4");
-+ pref("extensions.asf.lastdir", true);
-  pref("extensions.asf.keeptemp", true);
-  pref("extensions.asf.viewdloption", false);
-  pref("extensions.asf.viewdloptionType", 0);
-@@ -33,4 +34,4 @@ pref("extensions.asf at mangaheart.org.description", "chrome://asf/locale/asf.prope
-  pref("extensions.asf.exportFolder", "");
-  pref("extensions.asf.showExportButton", false);
-  pref("extensions.asf.suggestAllPossibleFolders", false);
-- pref("extensions.asf.useSiteBySiteSavePath", false); // new feature since Firefox 7.0.1
-\ No newline at end of file
-+ pref("extensions.asf.useSiteBySiteSavePath", false); // new feature since Firefox 7.0.1
diff --git a/debian/patches/0002-update-button-labels-to-manage-filters.patch b/debian/patches/0001-update-button-labels-to-manage-filters.patch
similarity index 100%
rename from debian/patches/0002-update-button-labels-to-manage-filters.patch
rename to debian/patches/0001-update-button-labels-to-manage-filters.patch
diff --git a/debian/patches/series b/debian/patches/series
index 20fb7c2..c4b3756 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-fix-version-handling-during-the-start-of-iceweasel.patch
-0002-update-button-labels-to-manage-filters.patch
+0001-update-button-labels-to-manage-filters.patch

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