[Pkg-privacy-commits] [torbrowser-launcher] 11/11: refresh patches so they apply cleanly

[Holger Levsen]

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

holger pushed a commit to branch debian/jessie
in repository torbrowser-launcher.

commit ef57596afc3931416a25b04c58bcf50f11eb93ca
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Jan 16 13:12:38 2016 +0100

    refresh patches so they apply cleanly
---
 ...removed-testing-code-that-never-should-have-been.patch | 13 +++++--------
 ...e-download-URLs-to-be-strings-and-not-unicode-20.patch | 15 ++++++---------
 ...-convert-unicode-URLs-to-strings-if-they-are-act.patch | 13 +++++--------
 3 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/debian/patches/0008-Eek-removed-testing-code-that-never-should-have-been.patch b/debian/patches/0008-Eek-removed-testing-code-that-never-should-have-been.patch
index 562ec1e..1a67aa9 100644
--- a/debian/patches/0008-Eek-removed-testing-code-that-never-should-have-been.patch
+++ b/debian/patches/0008-Eek-removed-testing-code-that-never-should-have-been.patch
@@ -8,11 +8,11 @@ Subject: [PATCH] Eek, removed testing code that never should have been
  torbrowser_launcher/launcher.py | 6 ------
  1 file changed, 6 deletions(-)
 
-diff --git a/torbrowser_launcher/launcher.py b/torbrowser_launcher/launcher.py
-index fb6d44f..d057410 100644
---- a/torbrowser_launcher/launcher.py
-+++ b/torbrowser_launcher/launcher.py
-@@ -161,12 +161,6 @@ class Launcher:
+Index: b/torbrowser_launcher/launcher.py
+===================================================================
+--- a/torbrowser_launcher/launcher.py	2016-01-16 13:12:09.669967713 +0100
++++ b/torbrowser_launcher/launcher.py	2016-01-16 13:12:09.889967720 +0100
+@@ -148,12 +148,6 @@
  
          start = self.common.paths['tbb']['start']
          if os.path.isfile(start) and os.access(start, os.X_OK):
@@ -25,6 +25,3 @@ index fb6d44f..d057410 100644
              if installed_version == latest_version:
                  print _('Latest version of TBB is installed, launching')
                  # current version of tbb is installed, launch it
--- 
-1.9.1
-
diff --git a/debian/patches/0009-Force-download-URLs-to-be-strings-and-not-unicode-20.patch b/debian/patches/0009-Force-download-URLs-to-be-strings-and-not-unicode-20.patch
index 2238f89..034c051 100644
--- a/debian/patches/0009-Force-download-URLs-to-be-strings-and-not-unicode-20.patch
+++ b/debian/patches/0009-Force-download-URLs-to-be-strings-and-not-unicode-20.patch
@@ -7,11 +7,11 @@ Subject: [PATCH] Force download URLs to be strings and not unicode (#205)
  torbrowser_launcher/launcher.py | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
-diff --git a/torbrowser_launcher/launcher.py b/torbrowser_launcher/launcher.py
-index d057410..671bee7 100644
---- a/torbrowser_launcher/launcher.py
-+++ b/torbrowser_launcher/launcher.py
-@@ -26,7 +26,7 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+Index: b/torbrowser_launcher/launcher.py
+===================================================================
+--- a/torbrowser_launcher/launcher.py	2016-01-16 13:17:32.585978768 +0100
++++ b/torbrowser_launcher/launcher.py	2016-01-16 13:17:32.781978774 +0100
+@@ -26,7 +26,7 @@
  OTHER DEALINGS IN THE SOFTWARE.
  """
  
@@ -20,7 +20,7 @@ index d057410..671bee7 100644
  from twisted.internet import reactor
  from twisted.web.client import Agent, RedirectAgent, ResponseDone, ResponseFailed
  from twisted.web.http_headers import Headers
-@@ -446,8 +446,10 @@ class Launcher:
+@@ -435,8 +435,10 @@
          self.current_download_path = path
          self.current_download_url = url
  
@@ -32,6 +32,3 @@ index d057410..671bee7 100644
          self.progressbar.set_fraction(0)
          self.progressbar.set_text(_('Downloading {0}').format(name))
          self.progressbar.show()
--- 
-1.9.1
-
diff --git a/debian/patches/0010-Only-convert-unicode-URLs-to-strings-if-they-are-act.patch b/debian/patches/0010-Only-convert-unicode-URLs-to-strings-if-they-are-act.patch
index 2ca459c..79848ec 100644
--- a/debian/patches/0010-Only-convert-unicode-URLs-to-strings-if-they-are-act.patch
+++ b/debian/patches/0010-Only-convert-unicode-URLs-to-strings-if-they-are-act.patch
@@ -8,11 +8,11 @@ Subject: [PATCH] Only convert unicode URLs to strings if they are actually
  torbrowser_launcher/launcher.py | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
-diff --git a/torbrowser_launcher/launcher.py b/torbrowser_launcher/launcher.py
-index 671bee7..ff4adcd 100644
---- a/torbrowser_launcher/launcher.py
-+++ b/torbrowser_launcher/launcher.py
-@@ -447,7 +447,10 @@ class Launcher:
+Index: b/torbrowser_launcher/launcher.py
+===================================================================
+--- a/torbrowser_launcher/launcher.py	2016-01-16 13:17:32.781978774 +0100
++++ b/torbrowser_launcher/launcher.py	2016-01-16 13:17:32.985978781 +0100
+@@ -436,7 +436,10 @@
          self.current_download_url = url
  
          mirror_url = url.format(self.common.settings['mirror'])
@@ -24,6 +24,3 @@ index 671bee7..ff4adcd 100644
  
          # initialize the progress bar
          self.progressbar.set_fraction(0)
--- 
-1.9.1
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/torbrowser-launcher.git