From df10556d5eb8c7cb087ac6d69d7282eb6d83a373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Sun, 4 Sep 2016 12:52:24 +0200 Subject: debian: remove asciidoctor dependency in debian/ubuntu patches (issue #722) Asciidoctor is required, but must be installed as a gem (the version in distros is too old). --- tools/debian/patches/weechat_debian_jessie.patch | 24 ++++++++++++++++++++++ tools/debian/patches/weechat_debian_wheezy.patch | 20 ++++++++++-------- tools/debian/patches/weechat_raspbian_jessie.patch | 1 + tools/debian/patches/weechat_ubuntu_trusty.patch | 20 ++++++++++-------- tools/debian/patches/weechat_ubuntu_wily.patch | 1 + 5 files changed, 50 insertions(+), 16 deletions(-) create mode 100644 tools/debian/patches/weechat_debian_jessie.patch create mode 120000 tools/debian/patches/weechat_raspbian_jessie.patch create mode 120000 tools/debian/patches/weechat_ubuntu_wily.patch diff --git a/tools/debian/patches/weechat_debian_jessie.patch b/tools/debian/patches/weechat_debian_jessie.patch new file mode 100644 index 000000000..590da1ff4 --- /dev/null +++ b/tools/debian/patches/weechat_debian_jessie.patch @@ -0,0 +1,24 @@ +diff --git a/debian-devel/control b/debian-devel/control +index 809e059..8fbf0ed 100644 +--- a/debian-devel/control ++++ b/debian-devel/control +@@ -3,7 +3,6 @@ Section: net + Priority: optional + Maintainer: Sébastien Helleu + Build-Depends: +- asciidoctor (>= 1.5.4), + debhelper (>= 9), + dh-exec, + cmake, pkg-config, +diff --git a/debian-stable/control b/debian-stable/control +index 74d134c..e0e9c25 100644 +--- a/debian-stable/control ++++ b/debian-stable/control +@@ -3,7 +3,6 @@ Section: net + Priority: optional + Maintainer: Emmanuel Bouthenot + Build-Depends: +- asciidoctor (>= 1.5.4), + debhelper (>= 9), + dh-exec, + cmake, pkg-config, diff --git a/tools/debian/patches/weechat_debian_wheezy.patch b/tools/debian/patches/weechat_debian_wheezy.patch index 474ec70a0..980c109fe 100644 --- a/tools/debian/patches/weechat_debian_wheezy.patch +++ b/tools/debian/patches/weechat_debian_wheezy.patch @@ -1,16 +1,18 @@ diff --git a/debian-devel/control b/debian-devel/control -index 809e059..d1cd9c8 100644 +index 809e059..35e19b8 100644 --- a/debian-devel/control +++ b/debian-devel/control -@@ -5,7 +5,6 @@ Maintainer: Sébastien Helleu +@@ -3,9 +3,7 @@ Section: net + Priority: optional + Maintainer: Sébastien Helleu Build-Depends: - asciidoctor (>= 1.5.4), +- asciidoctor (>= 1.5.4), debhelper (>= 9), - dh-exec, cmake, pkg-config, libncursesw5-dev, gem2deb, -@@ -13,12 +12,12 @@ Build-Depends: +@@ -13,12 +11,12 @@ Build-Depends: python-dev, libaspell-dev, liblua5.1-0-dev, @@ -28,18 +30,20 @@ index 809e059..d1cd9c8 100644 Standards-Version: 3.9.8 Homepage: https://weechat.org/ diff --git a/debian-stable/control b/debian-stable/control -index 74d134c..8a72fed 100644 +index 74d134c..9780937 100644 --- a/debian-stable/control +++ b/debian-stable/control -@@ -5,7 +5,6 @@ Maintainer: Emmanuel Bouthenot +@@ -3,9 +3,7 @@ Section: net + Priority: optional + Maintainer: Emmanuel Bouthenot Build-Depends: - asciidoctor (>= 1.5.4), +- asciidoctor (>= 1.5.4), debhelper (>= 9), - dh-exec, cmake, pkg-config, libncursesw5-dev, gem2deb, -@@ -13,12 +12,12 @@ Build-Depends: +@@ -13,12 +11,12 @@ Build-Depends: python-dev, libaspell-dev, liblua5.1-0-dev, diff --git a/tools/debian/patches/weechat_raspbian_jessie.patch b/tools/debian/patches/weechat_raspbian_jessie.patch new file mode 120000 index 000000000..a9d7f025b --- /dev/null +++ b/tools/debian/patches/weechat_raspbian_jessie.patch @@ -0,0 +1 @@ +weechat_debian_jessie.patch \ No newline at end of file diff --git a/tools/debian/patches/weechat_ubuntu_trusty.patch b/tools/debian/patches/weechat_ubuntu_trusty.patch index b2580a3be..b9ed7e73b 100644 --- a/tools/debian/patches/weechat_ubuntu_trusty.patch +++ b/tools/debian/patches/weechat_ubuntu_trusty.patch @@ -1,16 +1,18 @@ diff --git a/debian-devel/control b/debian-devel/control -index 809e059..79dc10b 100644 +index 809e059..5f81261 100644 --- a/debian-devel/control +++ b/debian-devel/control -@@ -5,7 +5,6 @@ Maintainer: Sébastien Helleu +@@ -3,9 +3,7 @@ Section: net + Priority: optional + Maintainer: Sébastien Helleu Build-Depends: - asciidoctor (>= 1.5.4), +- asciidoctor (>= 1.5.4), debhelper (>= 9), - dh-exec, cmake, pkg-config, libncursesw5-dev, gem2deb, -@@ -15,10 +14,10 @@ Build-Depends: +@@ -15,10 +13,10 @@ Build-Depends: liblua5.1-0-dev, tcl8.6-dev, guile-2.0-dev, @@ -25,18 +27,20 @@ index 809e059..79dc10b 100644 Standards-Version: 3.9.8 Homepage: https://weechat.org/ diff --git a/debian-stable/control b/debian-stable/control -index 74d134c..da4e8d4 100644 +index 74d134c..5f3d8ce 100644 --- a/debian-stable/control +++ b/debian-stable/control -@@ -5,7 +5,6 @@ Maintainer: Emmanuel Bouthenot +@@ -3,9 +3,7 @@ Section: net + Priority: optional + Maintainer: Emmanuel Bouthenot Build-Depends: - asciidoctor (>= 1.5.4), +- asciidoctor (>= 1.5.4), debhelper (>= 9), - dh-exec, cmake, pkg-config, libncursesw5-dev, gem2deb, -@@ -15,10 +14,10 @@ Build-Depends: +@@ -15,10 +13,10 @@ Build-Depends: liblua5.1-0-dev, tcl8.6-dev, guile-2.0-dev, diff --git a/tools/debian/patches/weechat_ubuntu_wily.patch b/tools/debian/patches/weechat_ubuntu_wily.patch new file mode 120000 index 000000000..a9d7f025b --- /dev/null +++ b/tools/debian/patches/weechat_ubuntu_wily.patch @@ -0,0 +1 @@ +weechat_debian_jessie.patch \ No newline at end of file -- cgit v1.2.3