[Pkg-privacy-commits] [torbrowser-launcher] 02/11: Refresh those patches so they apply cleanly.
Holger Levsen
holger at moszumanska.debian.org
Sat Jan 16 12:31:44 UTC 2016
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 206bca1ba377b54d58220f8bd6b3c259cf49e2ac
Author: Holger Levsen <holger at layer-acht.org>
Date: Fri Jan 15 20:54:40 2016 +0100
Refresh those patches so they apply cleanly.
---
debian/changelog | 1 +
...tion-of-start-tor-browser-for-TBB-4.5-and.patch | 41 ++++++++++------------
...tart-tor-browser.desktop-instead-of-.-Bro.patch | 23 ++++++------
...ting-Tor-Browser-act-as-a-default-browser.patch | 13 +++----
4 files changed, 35 insertions(+), 43 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index be14a55..951a037 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ torbrowser-launcher (0.1.9-1+deb8u2) UNRELEASED; urgency=medium
* Add debian/patches/series file so that the patches from 0.1.9-1+deb8u1 are
actually applied.
+ * Refresh those patches so they apply cleanly.
-- Holger Levsen <holger at debian.org> Fri, 15 Jan 2016 20:46:52 +0100
diff --git a/debian/patches/0001-Update-location-of-start-tor-browser-for-TBB-4.5-and.patch b/debian/patches/0001-Update-location-of-start-tor-browser-for-TBB-4.5-and.patch
index 2d4ae85..a7d0887 100644
--- a/debian/patches/0001-Update-location-of-start-tor-browser-for-TBB-4.5-and.patch
+++ b/debian/patches/0001-Update-location-of-start-tor-browser-for-TBB-4.5-and.patch
@@ -10,11 +10,11 @@ Subject: [PATCH] Update location of start-tor-browser for TBB 4.5, and remove
torbrowser_launcher/settings.py | 12 ------------
3 files changed, 3 insertions(+), 20 deletions(-)
-diff --git a/torbrowser_launcher/common.py b/torbrowser_launcher/common.py
-index 505a4b3..9495fe6 100644
---- a/torbrowser_launcher/common.py
-+++ b/torbrowser_launcher/common.py
-@@ -145,7 +145,7 @@ class Common:
+Index: b/torbrowser_launcher/common.py
+===================================================================
+--- a/torbrowser_launcher/common.py 2016-01-15 20:53:02.630748152 +0100
++++ b/torbrowser_launcher/common.py 2016-01-15 20:53:04.682748223 +0100
+@@ -145,7 +145,7 @@
'update_check_file': tbb_cache+'/download/RecommendedTBBVersions',
'tbb': {
'dir': tbb_local+'/tbb/'+self.architecture,
@@ -23,7 +23,7 @@ index 505a4b3..9495fe6 100644
'versions': tbb_local+'/tbb/'+self.architecture+'/tor-browser_'+self.language+'/Browser/TorBrowser/Docs/sources/versions',
},
}
-@@ -198,8 +198,7 @@ class Common:
+@@ -198,8 +198,7 @@
'check_for_updates': False,
'modem_sound': False,
'last_update_check_timestamp': 0,
@@ -33,11 +33,11 @@ index 505a4b3..9495fe6 100644
}
if os.path.isfile(self.paths['settings_file']):
-diff --git a/torbrowser_launcher/launcher.py b/torbrowser_launcher/launcher.py
-index 00bc5a4..e9397e0 100644
---- a/torbrowser_launcher/launcher.py
-+++ b/torbrowser_launcher/launcher.py
-@@ -634,10 +634,7 @@ class Launcher:
+Index: b/torbrowser_launcher/launcher.py
+===================================================================
+--- a/torbrowser_launcher/launcher.py 2016-01-15 20:53:02.630748152 +0100
++++ b/torbrowser_launcher/launcher.py 2016-01-15 20:53:04.682748223 +0100
+@@ -634,10 +634,7 @@
gtk.main_iteration_do(True)
# run Tor Browser
@@ -49,16 +49,16 @@ index 00bc5a4..e9397e0 100644
if run_next_task:
self.run_task()
-@@ -674,4 +671,3 @@ class Launcher:
+@@ -674,4 +671,3 @@
delattr(self, 'current_download_url')
if reactor.running:
reactor.stop()
-
-diff --git a/torbrowser_launcher/settings.py b/torbrowser_launcher/settings.py
-index a29c41a..00e521d 100644
---- a/torbrowser_launcher/settings.py
-+++ b/torbrowser_launcher/settings.py
-@@ -95,15 +95,6 @@ class Settings:
+Index: b/torbrowser_launcher/settings.py
+===================================================================
+--- a/torbrowser_launcher/settings.py 2016-01-15 20:53:02.630748152 +0100
++++ b/torbrowser_launcher/settings.py 2016-01-15 20:53:04.682748223 +0100
+@@ -95,15 +95,6 @@
self.update_checkbox.set_active(False)
self.update_checkbox.show()
@@ -74,7 +74,7 @@ index a29c41a..00e521d 100644
# modem sound
self.modem_checkbox = gtk.CheckButton(_("Play modem sound, because Tor is slow :]"))
self.settings_box.pack_start(self.modem_checkbox, True, True, 0)
-@@ -222,7 +213,6 @@ class Settings:
+@@ -222,7 +213,6 @@
# checkbox options
self.common.settings['update_over_tor'] = self.tor_update_checkbox.get_active()
self.common.settings['check_for_updates'] = self.update_checkbox.get_active()
@@ -82,12 +82,9 @@ index a29c41a..00e521d 100644
self.common.settings['modem_sound'] = self.modem_checkbox.get_active()
# figure out the selected mirror
-@@ -237,5 +227,3 @@ class Settings:
+@@ -237,5 +227,3 @@
def destroy(self, widget, data=None):
gtk.main_quit()
-
-
---
-1.9.1
-
diff --git a/debian/patches/0002-execute-.-start-tor-browser.desktop-instead-of-.-Bro.patch b/debian/patches/0002-execute-.-start-tor-browser.desktop-instead-of-.-Bro.patch
index af3f86a..4230409 100644
--- a/debian/patches/0002-execute-.-start-tor-browser.desktop-instead-of-.-Bro.patch
+++ b/debian/patches/0002-execute-.-start-tor-browser.desktop-instead-of-.-Bro.patch
@@ -9,11 +9,11 @@ Subject: [PATCH] execute ./start-tor-browser.desktop instead of
torbrowser_launcher/launcher.py | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
-diff --git a/torbrowser_launcher/common.py b/torbrowser_launcher/common.py
-index 93ed067..e5844b9 100644
---- a/torbrowser_launcher/common.py
-+++ b/torbrowser_launcher/common.py
-@@ -144,7 +144,8 @@ class Common:
+Index: b/torbrowser_launcher/common.py
+===================================================================
+--- a/torbrowser_launcher/common.py 2016-01-15 20:53:04.682748223 +0100
++++ b/torbrowser_launcher/common.py 2016-01-15 20:53:04.934748231 +0100
+@@ -145,7 +145,8 @@
'update_check_file': tbb_cache+'/download/RecommendedTBBVersions',
'tbb': {
'dir': tbb_local+'/tbb/'+self.architecture,
@@ -23,11 +23,11 @@ index 93ed067..e5844b9 100644
'versions': tbb_local+'/tbb/'+self.architecture+'/tor-browser_'+self.language+'/Browser/TorBrowser/Docs/sources/versions',
},
}
-diff --git a/torbrowser_launcher/launcher.py b/torbrowser_launcher/launcher.py
-index d4211df..698949d 100644
---- a/torbrowser_launcher/launcher.py
-+++ b/torbrowser_launcher/launcher.py
-@@ -631,7 +631,7 @@ class Launcher:
+Index: b/torbrowser_launcher/launcher.py
+===================================================================
+--- a/torbrowser_launcher/launcher.py 2016-01-15 20:53:04.682748223 +0100
++++ b/torbrowser_launcher/launcher.py 2016-01-15 20:53:04.934748231 +0100
+@@ -634,7 +634,7 @@
gtk.main_iteration_do(True)
# run Tor Browser
@@ -36,6 +36,3 @@ index d4211df..698949d 100644
if run_next_task:
self.run_task()
---
-1.9.1
-
diff --git a/debian/patches/0003-Stop-letting-Tor-Browser-act-as-a-default-browser.patch b/debian/patches/0003-Stop-letting-Tor-Browser-act-as-a-default-browser.patch
index f879f40..138c8ec 100644
--- a/debian/patches/0003-Stop-letting-Tor-Browser-act-as-a-default-browser.patch
+++ b/debian/patches/0003-Stop-letting-Tor-Browser-act-as-a-default-browser.patch
@@ -7,15 +7,12 @@ Subject: [PATCH] Stop letting Tor Browser act as a default browser
share/applications/torbrowser.desktop | 1 -
1 file changed, 1 deletion(-)
-diff --git a/share/applications/torbrowser.desktop b/share/applications/torbrowser.desktop
-index 4e10d3f..2a16c38 100644
---- a/share/applications/torbrowser.desktop
-+++ b/share/applications/torbrowser.desktop
-@@ -6,4 +6,3 @@ Terminal=false
+Index: b/share/applications/torbrowser.desktop
+===================================================================
+--- a/share/applications/torbrowser.desktop 2016-01-15 20:53:02.350748143 +0100
++++ b/share/applications/torbrowser.desktop 2016-01-15 20:53:05.162748239 +0100
+@@ -6,4 +6,3 @@
Type=Application
Icon=/usr/share/pixmaps/torbrowser80.xpm
Categories=Network;WebBrowser;
-MimeType=x-scheme-handler/http;x-scheme-handler/https;
---
-1.9.1
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/torbrowser-launcher.git
More information about the Pkg-privacy-commits
mailing list