Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/f04cedef1c7742f38b0b561efcd77e0476fcbf60
...commit
http://git.netsurf-browser.org/netsurf.git/commit/f04cedef1c7742f38b0b561efcd77e0476fcbf60
...tree
http://git.netsurf-browser.org/netsurf.git/tree/f04cedef1c7742f38b0b561efcd77e0476fcbf60
The branch, master has been updated
via f04cedef1c7742f38b0b561efcd77e0476fcbf60 (commit)
from c03405b3b3b28942d50f672e897be5cfc0f6c540 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=f04cedef1c7742f38b0b561efcd77e0476fcbf60
commit f04cedef1c7742f38b0b561efcd77e0476fcbf60
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
Debian(ish): use libssl1.0-dev if it exists
diff --git a/docs/env.sh b/docs/env.sh
index bb2cbab..f1c89a8 100644
--- a/docs/env.sh
+++ b/docs/env.sh
@@ -25,7 +25,7 @@
###############################################################################
# deb packages for dpkg based systems
-NS_DEV_DEB="build-essential pkg-config git gperf libcurl3-dev libssl-dev
libpng-dev libjpeg-dev"
+NS_DEV_DEB="build-essential pkg-config git gperf libcurl3-dev libpng-dev
libjpeg-dev"
NS_TOOL_DEB="flex bison libhtml-parser-perl"
if [ "x${NETSURF_GTK_MAJOR}" = "x3" ]; then
NS_GTK_DEB="libgtk-3-dev librsvg2-dev"
@@ -36,6 +36,11 @@ fi
# apt get commandline to install necessary dev packages
ns-apt-get-install()
{
+ if /usr/bin/apt-cache show libssl1.0-dev >/dev/null 2>&1; then
+ NS_DEV_DEB="${NS_DEV_DEB} libssl1.0-dev"
+ else
+ NS_DEV_DEB="${NS_DEV_DEB} libssl-dev"
+ fi
sudo apt-get install $(echo ${NS_DEV_DEB} ${NS_TOOL_DEB} ${NS_GTK_DEB})
}
-----------------------------------------------------------------------
Summary of changes:
docs/env.sh | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/docs/env.sh b/docs/env.sh
index bb2cbab..f1c89a8 100644
--- a/docs/env.sh
+++ b/docs/env.sh
@@ -25,7 +25,7 @@
###############################################################################
# deb packages for dpkg based systems
-NS_DEV_DEB="build-essential pkg-config git gperf libcurl3-dev libssl-dev
libpng-dev libjpeg-dev"
+NS_DEV_DEB="build-essential pkg-config git gperf libcurl3-dev libpng-dev
libjpeg-dev"
NS_TOOL_DEB="flex bison libhtml-parser-perl"
if [ "x${NETSURF_GTK_MAJOR}" = "x3" ]; then
NS_GTK_DEB="libgtk-3-dev librsvg2-dev"
@@ -36,6 +36,11 @@ fi
# apt get commandline to install necessary dev packages
ns-apt-get-install()
{
+ if /usr/bin/apt-cache show libssl1.0-dev >/dev/null 2>&1; then
+ NS_DEV_DEB="${NS_DEV_DEB} libssl1.0-dev"
+ else
+ NS_DEV_DEB="${NS_DEV_DEB} libssl-dev"
+ fi
sudo apt-get install $(echo ${NS_DEV_DEB} ${NS_TOOL_DEB} ${NS_GTK_DEB})
}
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
