summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--veracrypt/debian/changelog6
-rw-r--r--veracrypt/debian/gbp.conf1
-rw-r--r--veracrypt/debian/patches/vc_devuan.patch2
-rwxr-xr-xveracrypt/debian/rules2
-rw-r--r--veracrypt/debian/veracrypt+devuan.dsc14
-rw-r--r--veracrypt/vc_fedora.patch2
-rw-r--r--veracrypt/veracrypt.spec18
7 files changed, 36 insertions, 9 deletions
diff --git a/veracrypt/debian/changelog b/veracrypt/debian/changelog
index 2aa6089..fb2c98b 100644
--- a/veracrypt/debian/changelog
+++ b/veracrypt/debian/changelog
@@ -1,3 +1,9 @@
+veracrypt (1.24-Update7-1+devuan) obs; urgency=medium
+
+ * d/gbp.conf: Pass '--controlmaint' to dch.
+
+ -- Ben Stack <bgstack15@gmail.com> Tue, 11 Aug 2020 10:03:00 -0400
+
veracrypt (1.24-Update4-1+devuan) obs; urgency=medium
* adapted for stackrpms
diff --git a/veracrypt/debian/gbp.conf b/veracrypt/debian/gbp.conf
index 5474c60..d1d6814 100644
--- a/veracrypt/debian/gbp.conf
+++ b/veracrypt/debian/gbp.conf
@@ -1,3 +1,4 @@
[DEFAULT]
pristine-tar = True
sign-tags = True
+dch-opt = ['--controlmaint']
diff --git a/veracrypt/debian/patches/vc_devuan.patch b/veracrypt/debian/patches/vc_devuan.patch
index b90f9f0..7a12b73 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-2019 IDRIX. All rights reserved.\r\n\r\n"
+ L"Copyright \xA9 2013-2020 IDRIX. All rights reserved.\r\n\r\n"
- L"An IDRIX Release");
+ L"Packaged for Devuan");
diff --git a/veracrypt/debian/rules b/veracrypt/debian/rules
index b02f64e..e96ca1b 100755
--- a/veracrypt/debian/rules
+++ b/veracrypt/debian/rules
@@ -17,7 +17,7 @@ export TC_EXTRA_LFLAGS = $(LDFLAGS)
override_dh_auto_build:
dh_auto_build -- VERBOSE=1 NOSTRIP=1 ARCH=$(DEB_HOST_ARCH)
- unset DISPLAY && src/Main/veracrypt --text --help 2>/dev/null | debian/veracrypt_help_to_troff.pl > veracrypt.1
+ unset DISPLAY && src/Main/veracrypt --text --help 2>/dev/null | perl debian/veracrypt_help_to_troff.pl > veracrypt.1
override_dh_clean:
dh_clean veracrypt.1
diff --git a/veracrypt/debian/veracrypt+devuan.dsc b/veracrypt/debian/veracrypt+devuan.dsc
new file mode 100644
index 0000000..b69b761
--- /dev/null
+++ b/veracrypt/debian/veracrypt+devuan.dsc
@@ -0,0 +1,14 @@
+Format: 3.0 (quilt)
+Source: veracrypt
+Binary: veracrypt
+Architecture: any
+Version: 1.24-Update7-1+devuan
+Maintainer: B Stack <bgstack15@gmail.com>
+Homepage: https://veracrypt.fr/
+Standards-Version: 4.5.0
+Build-Depends: debhelper-compat (= 12), libayatana-appindicator3-dev | libappindicator3-dev, libfuse-dev, libwxgtk3.0-gtk3-dev, pkg-config, yasm [any-i386 any-amd64]
+Package-List:
+ veracrypt deb non-free/utils optional arch=any
+Files:
+ 00000000000000000000000000000000 1 veracrypt.orig.tar.gz
+ 00000000000000000000000000000000 1 veracrypt+devuan.debian.tar.xz
diff --git a/veracrypt/vc_fedora.patch b/veracrypt/vc_fedora.patch
index 3bd18ed..a2b7024 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-2019 IDRIX. All rights reserved.\r\n\r\n"
+ L"Copyright \xA9 2013-2020 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 0e30987..2948353 100644
--- a/veracrypt/veracrypt.spec
+++ b/veracrypt/veracrypt.spec
@@ -1,6 +1,6 @@
%global pname VeraCrypt
%global dummy_package 0
-%global tarballdir %{pname}_%{version}
+%global tarballdir %{pname}_%{upstream_version}
%global srcdir %{tarballdir}/src
%global indocdir %{tarballdir}/doc
%define license_files %{srcdir}/License.txt
@@ -74,17 +74,19 @@
%endif
%endif
+%define upstream_version 1.24-Update7
+
Name: veracrypt
-Version: 1.24
+Version: %( echo %{upstream_version} | tr '-' '_' )
Release: 1
Summary: Disk encryption with strong security based on TrueCrypt
Group: Applications/File
License: Apache License 2.0 and TrueCrypt License 3.0
URL: https://www.veracrypt.fr/
-Source0: https://www.veracrypt.fr/code/%{pname}/snapshot/%{pname}_%{version}.tar.gz
-#Source0: https://gitlab.com/bgstack15/big-sources/raw/master/%%{name}/%%{pname}_%%{version}.tar.gz
-#Source0: https://launchpad.net/veracrypt/trunk/%%{version}/+download/VeraCrypt_%%{version}_Source.tar.bz2
+Source0: https://www.veracrypt.fr/code/%{pname}/snapshot/%{pname}_%{upstream_version}.tar.gz
+#Source0: https://gitlab.com/bgstack15/big-sources/raw/master/%%{name}/%%{pname}_%%{upstream_version}.tar.gz
+#Source0: https://launchpad.net/veracrypt/trunk/%%{upstream_version}/+download/VeraCrypt_%%{upstream_version}_Source.tar.bz2
Patch0: vc_fedora.patch
Patch1: vc_desktop.patch
@@ -112,7 +114,7 @@ VeraCrypt is a free open source disk encryption software for Windows, Mac OSX an
%setup -q -c
# change to that directory so the patch files do not need versioned directories to be updated
-pushd %{pname}_%{version}
+pushd %{tarballdir}
%patch0 -p1
%patch1 -p1
popd
@@ -232,6 +234,10 @@ fi
%{_datadir}/icons/hicolor/*/apps/*
%changelog
+* Tue Aug 11 2020 B Stack <bgstack15@gmail.com> 1.24_Update7-1
+- version bump
+- handle new version naming with dashes
+
* Tue Oct 08 2019 B Stack <bgstack15@gmail.com> 1.24-1
- version bump
bgstack15