[Pkg-privacy-commits] [tails-installer] 09/10: Debian packaging: drop everything about the now removed launcher (splash screen).

[Ulrike Uhlig]

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

ulrike pushed a commit to annotated tag tails/4.20+dfsg-0tails1
in repository tails-installer.

commit 799b272ea9c1eff3e200476bc291ab9fbaca9003
Author: anonym <anonym at riseup.net>
Date:   Wed Sep 20 19:02:23 2017 +0200

    Debian packaging: drop everything about the now removed launcher (splash screen).
---
 debian/patches/series                    |  1 -
 debian/patches/tails-installer-as-helper | 24 ------------------------
 debian/rules                             |  6 ++----
 debian/tails-installer.manpages          |  1 -
 4 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 10d87a0..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-tails-installer-as-helper
diff --git a/debian/patches/tails-installer-as-helper b/debian/patches/tails-installer-as-helper
deleted file mode 100644
index 56f3f75..0000000
--- a/debian/patches/tails-installer-as-helper
+++ /dev/null
@@ -1,24 +0,0 @@
-Author: Ulrike Uhlig <u at 451f.org>
-Description: call tails-installer from /usr/lib
- dh_override_install moves tails-installer from
- /usr/bin to /usr/lib/tails_installer. We want to treat
- tails-installer as a mere helper for now, as it cannot
- yet be executed from the commandline, since the possibility
- to provide a device as an argument is missing.
- .
- Once this is possible, this patch can be removed.
- Commits that can be reverted then:
- commit e09647715549ada61dfeba269c5606fdf94345a0
- commit b4c5bec40d26b28751780dbd97a1654cf39f65b9
-
---- a/tails_installer/launcher.py
-+++ b/tails_installer/launcher.py
-@@ -38,7 +38,7 @@
- 
-     def run_tails_installer(self, args):
-         args = ['tails-installer'] + args + self.args
--        os.execvp('tails-installer', args)
-+        os.execvp('/usr/lib/tails_installer/tails-installer', args)
- 
-     def on_clone_install(self, widget, data=None):
-         self.run_tails_installer([ '-u', '-n', '--clone', '-P', '-m', '-x' ])
diff --git a/debian/rules b/debian/rules
index e7c043b..b4371aa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,15 +8,13 @@
 %.1: %.1.markdown
 	pandoc --read=markdown --write=man --output=$@ --standalone $<
 
-override_dh_auto_build: tails-installer.1 tails-installer-launcher.1
+override_dh_auto_build: tails-installer.1
 	python setup.py build
 
 override_dh_auto_clean:
 	dh_auto_clean
-	rm -f tails-installer.1 tails-installer-launcher.1
+	rm -f tails-installer.1
 
 override_dh_install:
 	python setup.py install --root=debian/tails-installer/ --install-layout=deb
-	mkdir debian/tails-installer/usr/lib/tails_installer
-	mv debian/tails-installer/usr/bin/tails-installer debian/tails-installer/usr/lib/tails_installer/
 	dh_install
diff --git a/debian/tails-installer.manpages b/debian/tails-installer.manpages
index 4c0565f..f3df2c6 100644
--- a/debian/tails-installer.manpages
+++ b/debian/tails-installer.manpages
@@ -1,2 +1 @@
 tails-installer.1
-tails-installer-launcher.1

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