[Pkg-mozext-commits] [downthemall] 05/05: Adjust patches.

[Michael Meskes]

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

meskes pushed a commit to branch master
in repository downthemall.

commit e9c297c12fe6aaec456df7b2c8b1350308d89d07
Author: Michael Meskes <meskes at debian.org>
Date:   Wed Sep 21 13:33:43 2016 +0200

    Adjust patches.
---
 debian/changelog                                   |  9 ++++
 ...001-Remove-check-for-available-disk-space.patch | 52 ----------------------
 ...display-user-tracking-screen-at-first-run.patch |  8 ++--
 debian/patches/about_page.diff                     | 13 ++++++
 debian/patches/series                              |  3 +-
 5 files changed, 27 insertions(+), 58 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1c6e71d..259baa2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+downthemall (3.0.6-1) unstable; urgency=medium
+
+  * Bumped Standards-Version to 3.9.8, no changes needed.
+  * Removed Andrea from Uploaders (Closes: #827967)
+  * New upstream version 3.0.6
+  * Adjust patches.
+
+ -- Michael Meskes <meskes at debian.org>  Wed, 21 Sep 2016 13:33:55 +0200
+
 downthemall (2.0.18-2) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/patches/0001-Remove-check-for-available-disk-space.patch b/debian/patches/0001-Remove-check-for-available-disk-space.patch
deleted file mode 100644
index 800ae5a..0000000
--- a/debian/patches/0001-Remove-check-for-available-disk-space.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Michael Meskes <meskes at debian.org>
-Date: Sun, 19 Feb 2012 08:11:51 -0400
-Subject: Remove check for available disk space
-
-It does not work, at least on some systems.
----
- .../chrome.jar!/content/common/internalFunctions.js  | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/chrome/chrome.jar!/content/common/internalFunctions.js b/chrome/chrome.jar!/content/common/internalFunctions.js
-index 412ace4..a7cff0e 100644
---- a/chrome/chrome.jar!/content/common/internalFunctions.js
-+++ b/chrome/chrome.jar!/content/common/internalFunctions.js
-@@ -130,13 +130,13 @@ var Utils = {
- 				parent = parent.QueryInterface(Ci.nsILocalFile);
- 				// we look for a directory that is writable and has some disk-space
- 				if (parent.isDirectory() && parent.isReadable() && parent.isWritable()) {
--					try {
--						return parent.diskSpaceAvailable ? directory : false;
--					}
--					catch (ex) {
-+					//try {
-+					//	return parent.diskSpaceAvailable ? directory : false;
-+					//}
-+					//catch (ex) {
- 						// Solaris compat: #889
- 						return directory;
--					}
-+					//}
- 				}
- 			}
- 		}
-@@ -157,14 +157,14 @@ var Utils = {
- 	getFreeDisk: function(file) {
- 		while (file) {
- 			if (file.exists() && file.isDirectory()) {
--				try {
--					return file.diskSpaceAvailable;
--				}
--				catch (ex) {
-+				//try {
-+				//	return file.diskSpaceAvailable;
-+				//}
-+				//catch (ex) {
- 					// Solaris compat: #889
- 					// As we cannot get a correct value simply return max int64_t
- 					return 9223372036854775807;
--				}					
-+				//}				
- 			}
- 			file = file.parent;
- 		}
diff --git a/debian/patches/0002-Don-t-display-user-tracking-screen-at-first-run.patch b/debian/patches/0002-Don-t-display-user-tracking-screen-at-first-run.patch
index 391764f..d4c8b63 100644
--- a/debian/patches/0002-Don-t-display-user-tracking-screen-at-first-run.patch
+++ b/debian/patches/0002-Don-t-display-user-tracking-screen-at-first-run.patch
@@ -3,13 +3,13 @@ Date: Fri, 1 Apr 2016 09:57:27 -0400
 Subject: =?utf-8?q?Don=E2=80=99t_display_user_tracking_screen_at_first_run?=
 
 ---
- chrome/chrome.jar!/content/integration/elements.js | 1 -
+ chrome/content/integration/elements.js | 1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/chrome/chrome.jar!/content/integration/elements.js b/chrome/chrome.jar!/content/integration/elements.js
+diff --git a/chrome/content/integration/elements.js b/chrome/content/integration/elements.js
 index 8595fed..5bbfbc7 100644
---- a/chrome/chrome.jar!/content/integration/elements.js
-+++ b/chrome/chrome.jar!/content/integration/elements.js
+--- a/chrome/content/integration/elements.js
++++ b/chrome/content/integration/elements.js
 @@ -1563,7 +1563,6 @@
  				return;
  			}
diff --git a/debian/patches/about_page.diff b/debian/patches/about_page.diff
new file mode 100644
index 0000000..ce5103e
--- /dev/null
+++ b/debian/patches/about_page.diff
@@ -0,0 +1,13 @@
+diff --git a/modules/main.js b/modules/main.js
+index cd18f2e..755e60e 100644
+--- a/modules/main.js
++++ b/modules/main.js
+@@ -205,7 +205,7 @@ function migrate() {
+ 			}
+ 			Preferences.setExt('version', v.BASE_VERSION);
+ 
+-			v.showAbout = true;
++			v.showAbout = false;
+ 			obs.notify(null, v.TOPIC_SHOWABOUT, null);
+ 
+ 			// Need to extract icons
diff --git a/debian/patches/series b/debian/patches/series
index 9bc38c6..b4effef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-Remove-check-for-available-disk-space.patch
-0002-Don-t-display-user-tracking-screen-at-first-run.patch
+about_page.diff

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