[debian-edu-commits] debian-edu/ 04/18: d/p/004-fixup-install.diff: Fix the install target so we can use it.

[Unit 193]

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

unit193-guest pushed a commit to branch master
in repository veracrypt.

commit 1bcf7dd5a29d78f2563ed745b977268af6d4108c
Author: Unit 193 <unit193 at ubuntu.com>
Date:   Mon Jul 10 20:33:12 2017 -0400

    d/p/004-fixup-install.diff: Fix the install target so we can use it.
---
 debian/patches/004-fixup-install.diff | 52 +++++++++++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 2 files changed, 53 insertions(+)

diff --git a/debian/patches/004-fixup-install.diff b/debian/patches/004-fixup-install.diff
new file mode 100644
index 0000000..6673d2d
--- /dev/null
+++ b/debian/patches/004-fixup-install.diff
@@ -0,0 +1,52 @@
+Description: Fixup the install target so it's usable.
+ - Use a path that works from the top src dir.
+ - Inverse 'doc' and 'veracrypt' in /usr/share/veracrypt/doc/
+ - Don't install the uninstall script nor extra License.txt file.
+ - Use our own veracrypt.desktop file.
+Author: Unit 193 <unit193 at ubuntu.com>
+
+Origin: vendor
+Forwarded: no
+Last-Update: 2017-07-10
+
+--- veracrypt-1.21.orig/src/Main/Main.make
++++ veracrypt-1.21/src/Main/Main.make
+@@ -223,25 +223,25 @@ endif
+ 
+ ifeq "$(PLATFORM)" "Linux"
+ prepare: $(APPNAME)
+-	rm -fr $(PWD)/Setup/Linux/usr
+-	mkdir -p $(PWD)/Setup/Linux/usr/bin
+-	mkdir -p $(PWD)/Setup/Linux/usr/share/$(APPNAME)/doc/HTML
+-	cp $(PWD)/Main/$(APPNAME) $(PWD)/Setup/Linux/usr/bin/$(APPNAME)
+-	cp $(PWD)/Setup/Linux/$(APPNAME)-uninstall.sh $(PWD)/Setup/Linux/usr/bin/$(APPNAME)-uninstall.sh
+-	chmod +x $(PWD)/Setup/Linux/usr/bin/$(APPNAME)-uninstall.sh
+-	cp $(PWD)/License.txt $(PWD)/Setup/Linux/usr/share/$(APPNAME)/doc/License.txt
+-	cp $(PWD)/../doc/html/* "$(PWD)/Setup/Linux/usr/share/$(APPNAME)/doc/HTML"
++	rm -fr $(CURDIR)/../Setup/Linux/usr
++	mkdir -p $(CURDIR)/../Setup/Linux/usr/bin
++	mkdir -p $(CURDIR)/../Setup/Linux/usr/share/doc/$(APPNAME)/HTML
++	cp $(CURDIR)/$(APPNAME) $(CURDIR)/../Setup/Linux/usr/bin/$(APPNAME)
++#	cp $(CURDIR)/../Setup/Linux/$(APPNAME)-uninstall.sh $(CURDIR)/../Setup/Linux/usr/bin/$(APPNAME)-uninstall.sh
++#	chmod +x $(CURDIR)/../Setup/Linux/usr/bin/$(APPNAME)-uninstall.sh
++#	cp $(CURDIR)/../License.txt $(CURDIR)/../Setup/Linux/usr/share/doc/$(APPNAME)/License.txt
++	cp $(CURDIR)/../../doc/html/* "$(CURDIR)/../Setup/Linux/usr/share/doc/$(APPNAME)/HTML"
+ 
+ ifndef TC_NO_GUI
+-	mkdir -p $(PWD)/Setup/Linux/usr/share/applications
+-	mkdir -p $(PWD)/Setup/Linux/usr/share/pixmaps
+-	cp $(PWD)/Resources/Icons/VeraCrypt-256x256.xpm $(PWD)/Setup/Linux/usr/share/pixmaps/$(APPNAME).xpm
+-	cp $(PWD)/Setup/Linux/$(APPNAME).desktop $(PWD)/Setup/Linux/usr/share/applications/$(APPNAME).desktop
++#	mkdir -p $(CURDIR)/../Setup/Linux/usr/share/applications
++	mkdir -p $(CURDIR)/../Setup/Linux/usr/share/pixmaps
++	cp $(CURDIR)/../Resources/Icons/VeraCrypt-256x256.xpm $(CURDIR)/../Setup/Linux/usr/share/pixmaps/$(APPNAME).xpm
++#	cp $(CURDIR)/../Setup/Linux/$(APPNAME).desktop $(CURDIR)/../Setup/Linux/usr/share/applications/$(APPNAME).desktop
+ endif
+ 
+ 
+ install: prepare
+-	cp -R $(CURDIR)/Setup/Linux/usr $(DESTDIR)/.
++	cp -R $(CURDIR)/../Setup/Linux/usr $(DESTDIR)/
+ 
+ ifeq "$(TC_BUILD_CONFIG)" "Release"
+ package: prepare
diff --git a/debian/patches/series b/debian/patches/series
index 2694b0b..a572334 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 001-user-guide-location.diff
 002-build-flags.diff
 003-indicator-support.diff
+004-fixup-install.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/veracrypt.git