From a2d8585c8e7b89ca276447783c93866fb76a3b6c Mon Sep 17 00:00:00 2001 From: B Stack Date: Sun, 17 May 2020 19:16:44 -0400 Subject: ffs 10.24 dpkg rc1 (gtk3) update most patches for minor syntax changes. Add major patch to revert new Zenju aggressive upstreamisms. --- freefilesync/debian/control | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'freefilesync/debian/control') diff --git a/freefilesync/debian/control b/freefilesync/debian/control index 7e4df83..3c93cea 100644 --- a/freefilesync/debian/control +++ b/freefilesync/debian/control @@ -5,21 +5,19 @@ Maintainer: B Stack Build-Depends: debhelper (>=12~), imagemagick, libcurl4-openssl-dev (>=7.68.0), - libfontconfig-dev, -# libfontconfig-dev only added for Debian OBS which is choking as of 2020-04 on libfontconfig-dev | libfontconfig1-dev for deps: libgtk-3-dev, libpango1.0-dev, libcairo2-dev, libxft-dev libssh2-1-dev, libssl-dev, wx3.0-headers, unzip, # gtk2 version, now possible only with local devuan-archive, and these must be removed for gtk3 build # install with sudo apt-get install libwxbase3.0-0v5=3.0.4+dfsg-14 libwxbase3.0-dev=3.0.4+dfsg-14 libwxgtk3.0-0v5=3.0.4+dfsg-14 libwxgtk3.0-dev=3.0.4+dfsg-14 wx3.0-headers=3.0.4+dfsg-14 libgtk2.0-dev - libgtk2.0-dev, - libwxgtk3.0-dev (=3.0.4+dfsg-14), +# libgtk2.0-dev, +# libwxgtk3.0-dev (=3.0.4+dfsg-14), # gtk3 version, and these must be removed for gtk2 build # install with sudo apt-get install libwxbase3.0-dev=3.0.4+dfsg-15 libwxbase3.0-0v5=3.0.4+dfsg-15 wx3.0-headers=3.0.4+dfsg-15 libgtk-3-dev libwxgtk3.0-gtk3-dev # which will remove libwxbase3.0-dev=3.0.4+dfsg-14 -# libgtk-3-dev, -# libwxgtk3.0-gtk3-dev, + libgtk-3-dev, + libwxgtk3.0-gtk3-dev, Standards-Version: 4.1.4 Homepage: https://freefilesync.org/ -- cgit From fec9c07d2ee7e7ef10eedace0931b9c7b14a8c14 Mon Sep 17 00:00:00 2001 From: B Stack Date: Mon, 18 May 2020 08:17:10 -0400 Subject: ffs 10.24 gtk2 build --- freefilesync/debian/control | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'freefilesync/debian/control') diff --git a/freefilesync/debian/control b/freefilesync/debian/control index 3c93cea..00da1a0 100644 --- a/freefilesync/debian/control +++ b/freefilesync/debian/control @@ -11,13 +11,13 @@ Build-Depends: debhelper (>=12~), unzip, # gtk2 version, now possible only with local devuan-archive, and these must be removed for gtk3 build # install with sudo apt-get install libwxbase3.0-0v5=3.0.4+dfsg-14 libwxbase3.0-dev=3.0.4+dfsg-14 libwxgtk3.0-0v5=3.0.4+dfsg-14 libwxgtk3.0-dev=3.0.4+dfsg-14 wx3.0-headers=3.0.4+dfsg-14 libgtk2.0-dev -# libgtk2.0-dev, -# libwxgtk3.0-dev (=3.0.4+dfsg-14), + libgtk2.0-dev, + libwxgtk3.0-dev (=3.0.4+dfsg-14), # gtk3 version, and these must be removed for gtk2 build # install with sudo apt-get install libwxbase3.0-dev=3.0.4+dfsg-15 libwxbase3.0-0v5=3.0.4+dfsg-15 wx3.0-headers=3.0.4+dfsg-15 libgtk-3-dev libwxgtk3.0-gtk3-dev # which will remove libwxbase3.0-dev=3.0.4+dfsg-14 - libgtk-3-dev, - libwxgtk3.0-gtk3-dev, +# libgtk-3-dev, +# libwxgtk3.0-gtk3-dev, Standards-Version: 4.1.4 Homepage: https://freefilesync.org/ -- cgit