summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2019-10-21 14:06:44 +0000
committerB Stack <bgstack15@gmail.com>2019-10-21 14:06:44 +0000
commit0eab1d0129eb78ebbf75a7badbac333b30ceed18 (patch)
tree43a78bea57a6e8c5562ff1ef379378f703189afc
parentMerge branch 'centos-8' into 'master' (diff)
parentveracrypt 1.24 dpkg rc1 (diff)
downloadstackrpms-0eab1d0129eb78ebbf75a7badbac333b30ceed18.tar.gz
stackrpms-0eab1d0129eb78ebbf75a7badbac333b30ceed18.tar.bz2
stackrpms-0eab1d0129eb78ebbf75a7badbac333b30ceed18.zip
Merge branch 'veracrypt-bump' into 'master'
Veracrypt 1.24 See merge request bgstack15/stackrpms!94
-rw-r--r--veracrypt/debian/changelog6
-rw-r--r--veracrypt/debian/patches/series4
-rw-r--r--veracrypt/debian/patches/vc_devuan.patch2
-rw-r--r--veracrypt/vc_fedora.patch2
-rw-r--r--veracrypt/veracrypt.spec11
5 files changed, 18 insertions, 7 deletions
diff --git a/veracrypt/debian/changelog b/veracrypt/debian/changelog
index 236ddcb..884430d 100644
--- a/veracrypt/debian/changelog
+++ b/veracrypt/debian/changelog
@@ -1,3 +1,9 @@
+veracrypt (1.24-1+devuan) obs; urgency=low
+
+ * New upstream version
+
+ -- B Stack <bgstack15@gmail.com> Tue, 08 Oct 2019 11:31 -0400
+
veracrypt (1.23-2+devuan) manual; urgency=low
* Re-release to match current naming standard
diff --git a/veracrypt/debian/patches/series b/veracrypt/debian/patches/series
index 5f788f9..7e9c1bf 100644
--- a/veracrypt/debian/patches/series
+++ b/veracrypt/debian/patches/series
@@ -1,4 +1,4 @@
-001-user-guide-location.diff
+#001-user-guide-location.diff
002-build-flags.diff
-004-fixup-install.diff
+#004-fixup-install.diff
vc_devuan.patch
diff --git a/veracrypt/debian/patches/vc_devuan.patch b/veracrypt/debian/patches/vc_devuan.patch
index b55bea5..b90f9f0 100644
--- a/veracrypt/debian/patches/vc_devuan.patch
+++ b/veracrypt/debian/patches/vc_devuan.patch
@@ -3,7 +3,7 @@ diff -x '*.rej' -x '*.orig' -Naur VeraCrypt_1.22/src/Common/Dlgcode.c VeraCrypt_
+++ VeraCrypt_1.22-1/src/Common/Dlgcode.c 2018-09-02 08:22:00.007030589 -0400
@@ -1280,7 +1280,7 @@
L"This software as a whole:\r\n"
- L"Copyright \xA9 2013-2018 IDRIX. All rights reserved.\r\n\r\n"
+ L"Copyright \xA9 2013-2019 IDRIX. All rights reserved.\r\n\r\n"
- L"An IDRIX Release");
+ L"Packaged for Devuan");
diff --git a/veracrypt/vc_fedora.patch b/veracrypt/vc_fedora.patch
index fc118d5..3bd18ed 100644
--- a/veracrypt/vc_fedora.patch
+++ b/veracrypt/vc_fedora.patch
@@ -3,7 +3,7 @@ diff -x '*.rej' -x '*.orig' -Naur VeraCrypt_1.22/src/Common/Dlgcode.c VeraCrypt_
+++ VeraCrypt_1.22-1/src/Common/Dlgcode.c 2018-09-02 08:22:00.007030589 -0400
@@ -1280,7 +1280,7 @@
L"This software as a whole:\r\n"
- L"Copyright \xA9 2013-2018 IDRIX. All rights reserved.\r\n\r\n"
+ L"Copyright \xA9 2013-2019 IDRIX. All rights reserved.\r\n\r\n"
- L"An IDRIX Release");
+ L"A Fedora copr release");
diff --git a/veracrypt/veracrypt.spec b/veracrypt/veracrypt.spec
index c8c2614..0e30987 100644
--- a/veracrypt/veracrypt.spec
+++ b/veracrypt/veracrypt.spec
@@ -69,11 +69,13 @@
%define doctarget %{_docdir}/%{name}
%if 0%{?rhel}
- %define doctarget %{_docdir}/%{name}-%{version}
+ %if 0%{?rhel} < 8
+ %define doctarget %{_docdir}/%{name}-%{version}
+ %endif
%endif
Name: veracrypt
-Version: 1.23
+Version: 1.24
Release: 1
Summary: Disk encryption with strong security based on TrueCrypt
@@ -86,7 +88,7 @@ Source0: https://www.veracrypt.fr/code/%{pname}/snapshot/%{pname}_%{version}.tar
Patch0: vc_fedora.patch
Patch1: vc_desktop.patch
-Packager: Bgstack15 <bgstack15@gmail.com>
+Packager: B Stack <bgstack15@gmail.com>
%if "%{?wx_toolkit}" != ""
BuildRequires: compat-wxGTK%{?wx_name_postfix}-%{wx_toolkit}-devel
%else
@@ -230,5 +232,8 @@ fi
%{_datadir}/icons/hicolor/*/apps/*
%changelog
+* Tue Oct 08 2019 B Stack <bgstack15@gmail.com> 1.24-1
+- version bump
+
* Wed Sep 26 2018 B Stack <bgstack15@gmail.com> 1.23-1
- rebuild rpm
bgstack15