summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2019-11-23 20:28:53 +0000
committerB Stack <bgstack15@gmail.com>2019-11-23 20:28:53 +0000
commit7214e023bafc0e30126b54db05c435c5332f6f7d (patch)
tree608921c8e7440a5a99772fe1db434b128b240fc3
parentMerge branch 'updates' into 'master' (diff)
parentfix typo (diff)
downloadstackrpms-7214e023bafc0e30126b54db05c435c5332f6f7d.tar.gz
stackrpms-7214e023bafc0e30126b54db05c435c5332f6f7d.tar.bz2
stackrpms-7214e023bafc0e30126b54db05c435c5332f6f7d.zip
Merge branch 'veracrypt-dpkg' into 'master'
Fix OBS build errors See merge request bgstack15/stackrpms!100
-rw-r--r--makemkv-bin/debian/changelog6
-rw-r--r--makemkv-bin/debian/control2
-rw-r--r--makemkv-oss/debian/changelog6
-rw-r--r--makemkv-oss/debian/control2
-rw-r--r--veracrypt/debian/changelog6
-rw-r--r--veracrypt/debian/control2
6 files changed, 23 insertions, 1 deletions
diff --git a/makemkv-bin/debian/changelog b/makemkv-bin/debian/changelog
index 51f03d6..35b6629 100644
--- a/makemkv-bin/debian/changelog
+++ b/makemkv-bin/debian/changelog
@@ -1,3 +1,9 @@
+makemkv-bin (1.14.5-2+devuan) obs; urgency=low
+
+ * Change build deps for OBS
+
+ -- B Stack <bgstack15@gmail.com> Thu, 21 Nov 2019 16:17:41 -0500
+
makemkv-bin (1.14.5-1+devuan) manual; urgency=low
* Update
diff --git a/makemkv-bin/debian/control b/makemkv-bin/debian/control
index fd4c301..e963bc3 100644
--- a/makemkv-bin/debian/control
+++ b/makemkv-bin/debian/control
@@ -3,9 +3,11 @@ Section: video
Priority: optional
Maintainer: B Stack <bgstack15@gmail.com>
Build-Depends: debhelper (>=11~),
+ libavcodec58,
makemkv-oss
Standards-Version: 4.1.4
Homepage: https://www.makemkv.com
+# libavcodec58 is listed only to prevent the "two choices available" error in obs. makemkv-oss handles the dependencies
Package: makemkv-bin
Architecture: any
diff --git a/makemkv-oss/debian/changelog b/makemkv-oss/debian/changelog
index 3d2c9db..084217b 100644
--- a/makemkv-oss/debian/changelog
+++ b/makemkv-oss/debian/changelog
@@ -1,3 +1,9 @@
+makemkv-oss (1.14.5-2+devuan) obs; urgency=low
+
+ * Change build deps for OBS
+
+ -- B Stack <bgstack15@gmail.com> Thu, 21 Nov 2019 13:20:28 -0500
+
makemkv-oss (1.14.5-1+devuan) manual; urgency=low
* Update
diff --git a/makemkv-oss/debian/control b/makemkv-oss/debian/control
index 4b2e1d9..7c55684 100644
--- a/makemkv-oss/debian/control
+++ b/makemkv-oss/debian/control
@@ -4,6 +4,7 @@ Priority: optional
Maintainer: B Stack <bgstack15@gmail.com>
Build-Depends: debhelper (>=11~),
libavcodec-dev,
+ libavcodec58,
libc6-dev,
libexpat1-dev,
libgl1-mesa-dev,
@@ -13,6 +14,7 @@ Build-Depends: debhelper (>=11~),
zlib1g-dev
Standards-Version: 4.1.4
Homepage: https://www.makemkv.com
+# libavcodec58 is listed only to prevent the "two choices available" error in obs. makemkv-oss handles the dependencies
Package: makemkv-oss
Architecture: any
diff --git a/veracrypt/debian/changelog b/veracrypt/debian/changelog
index 884430d..13d13d3 100644
--- a/veracrypt/debian/changelog
+++ b/veracrypt/debian/changelog
@@ -1,3 +1,9 @@
+veracrypt (1.24-2+devuan) obs; urgency=low
+
+ * Attempt a build with gtk3
+
+ -- B Stack <bgstack15@gmail.com> Thu, 21 Nov 2019 10:58:35 -0500
+
veracrypt (1.24-1+devuan) obs; urgency=low
* New upstream version
diff --git a/veracrypt/debian/control b/veracrypt/debian/control
index 02fb1aa..b33eb0e 100644
--- a/veracrypt/debian/control
+++ b/veracrypt/debian/control
@@ -5,7 +5,7 @@ Maintainer: B Stack <bgstack15@gmail.com>
Build-Depends: debhelper (>= 11),
libayatana-appindicator-dev | libappindicator-dev,
libfuse-dev,
- libwxgtk3.0-dev,
+ libwxgtk3.0-gtk3-dev,
pkg-config,
yasm [any-i386 any-amd64]
Standards-Version: 4.2.1
bgstack15