debian: update patches to not build doc/man page on some Debian/Ubuntu versions to build docs and man page (issue #722)

4 files changed, 275 insertions, 39 deletions

diff --git a/tools/debian/patches/weechat_debian_squeeze.patch b/tools/debian/patches/weechat_debian_squeeze.patch
index 62d708cb3..2ba2d90e8 100644
--- a/tools/debian/patches/weechat_debian_squeeze.patch
+++ b/tools/debian/patches/weechat_debian_squeeze.patch
@@ -6,13 +6,14 @@ index ec63514..45a4fb7 100644
 -9
 +8
 diff --git a/debian-devel/control b/debian-devel/control
-index 50f1217..bff1b8f 100644
+index fabddc6..b81db8b 100644
 --- a/debian-devel/control
 +++ b/debian-devel/control
-@@ -8,21 +8,20 @@ Build-Depends:
-     xsltproc,
-     docbook-xsl,
-     docbook-xml,
+@@ -3,22 +3,20 @@ Section: net
+ Priority: optional
+ Maintainer: Sébastien Helleu <flashcode@flashtux.org>
+ Build-Depends:
+-    asciidoctor (>= 1.5.4),
 -    debhelper (>= 9),
 -    dh-exec,
 +    debhelper (>= 8),
@@ -37,6 +38,21 @@ index 50f1217..bff1b8f 100644
      zlib1g-dev
  Standards-Version: 3.9.8
  Homepage: https://weechat.org/
+diff --git a/debian-devel/rules b/debian-devel/rules
+index 0fb3b21..89e8ddb 100755
+--- a/debian-devel/rules
++++ b/debian-devel/rules
+@@ -7,8 +7,8 @@ $(BUILDDIR)/Makefile:
+ 	cd $(BUILDDIR) && \
+ 	cmake .. \
+ 		-DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
+-		-DENABLE_DOC:BOOL=ON \
+-		-DENABLE_MAN:BOOL=ON \
++		-DENABLE_DOC:BOOL=OFF \
++		-DENABLE_MAN:BOOL=OFF \
+ 		-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
+ 		-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="$(CFLAGS) -D_FORTIFY_SOURCE=2" \
+ 		-DCMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING="$(LDFLAGS)" \
 diff --git a/debian-stable/compat b/debian-stable/compat
 index ec63514..45a4fb7 100644
 --- a/debian-stable/compat
@@ -45,13 +61,14 @@ index ec63514..45a4fb7 100644
 -9
 +8
 diff --git a/debian-stable/control b/debian-stable/control
-index f9e9aa0..ae1567e 100644
+index 641c931..ebd0d96 100644
 --- a/debian-stable/control
 +++ b/debian-stable/control
-@@ -8,21 +8,20 @@ Build-Depends:
-     xsltproc,
-     docbook-xsl,
-     docbook-xml,
+@@ -3,22 +3,20 @@ Section: net
+ Priority: optional
+ Maintainer: Emmanuel Bouthenot <kolter@debian.org>
+ Build-Depends:
+-    asciidoctor (>= 1.5.4),
 -    debhelper (>= 9),
 -    dh-exec,
 +    debhelper (>= 8),
@@ -76,10 +93,45 @@ index f9e9aa0..ae1567e 100644
      zlib1g-dev
  Standards-Version: 3.9.8
  Homepage: https://weechat.org/
+diff --git a/debian-stable/rules b/debian-stable/rules
+index b92991d..335610a 100755
+--- a/debian-stable/rules
++++ b/debian-stable/rules
+@@ -7,8 +7,8 @@ $(BUILDDIR)/Makefile:
+ 	cd $(BUILDDIR) && \
+ 	cmake .. \
+ 		-DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
+-		-DENABLE_DOC:BOOL=ON \
+-		-DENABLE_MAN:BOOL=ON \
++		-DENABLE_DOC:BOOL=OFF \
++		-DENABLE_MAN:BOOL=OFF \
+ 		-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
+ 		-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="$(CFLAGS) -D_FORTIFY_SOURCE=2" \
+ 		-DCMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING="$(LDFLAGS)" \
+diff --git a/debian-stable/weechat-curses.install b/debian-stable/weechat-curses.install
+index 9ca6321..fbfdb1f 100644
+--- a/debian-stable/weechat-curses.install
++++ b/debian-stable/weechat-curses.install
+@@ -1,4 +1,2 @@
+ usr/bin/weechat
+ debian/weechat.xpm usr/share/pixmaps
+-usr/share/man/man1/weechat.1
+-usr/share/man/*/man1/weechat.1
+diff --git a/debian-stable/weechat-curses.links b/debian-stable/weechat-curses.links
+index 4d0e998..bd9a567 100644
+--- a/debian-stable/weechat-curses.links
++++ b/debian-stable/weechat-curses.links
+@@ -1,8 +1 @@
+ usr/bin/weechat usr/bin/weechat-curses
+-usr/share/man/man1/weechat.1.gz usr/share/man/man1/weechat-curses.1.gz
+-usr/share/man/de/man1/weechat.1.gz usr/share/man/de/man1/weechat-curses.1.gz
+-usr/share/man/fr/man1/weechat.1.gz usr/share/man/fr/man1/weechat-curses.1.gz
+-usr/share/man/it/man1/weechat.1.gz usr/share/man/it/man1/weechat-curses.1.gz
+-usr/share/man/ja/man1/weechat.1.gz usr/share/man/ja/man1/weechat-curses.1.gz
+-usr/share/man/pl/man1/weechat.1.gz usr/share/man/pl/man1/weechat-curses.1.gz
+-usr/share/man/ru/man1/weechat.1.gz usr/share/man/ru/man1/weechat-curses.1.gz
 diff --git a/debian-stable/weechat-plugins.install b/debian-stable/weechat-plugins.install
-old mode 100755
-new mode 100644
-index 198360f..980192f
+index 198360f..980192f 100755
 --- a/debian-stable/weechat-plugins.install
 +++ b/debian-stable/weechat-plugins.install
 @@ -1,10 +1,8 @@
diff --git a/tools/debian/patches/weechat_debian_wheezy.patch b/tools/debian/patches/weechat_debian_wheezy.patch
index 7029d84a3..819fed19c 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 50f1217..24daebc 100644
+index fabddc6..09c2db4 100644
 --- a/debian-devel/control
 +++ b/debian-devel/control
-@@ -9,7 +9,6 @@ Build-Depends:
-     docbook-xsl,
-     docbook-xml,
+@@ -3,9 +3,7 @@ Section: net
+ Priority: optional
+ Maintainer: Sébastien Helleu <flashcode@flashtux.org>
+ Build-Depends:
+-    asciidoctor (>= 1.5.4),
      debhelper (>= 9),
 -    dh-exec,
      cmake, pkg-config,
      libncursesw5-dev,
      gem2deb,
-@@ -17,12 +16,12 @@ Build-Depends:
+@@ -13,12 +11,12 @@ Build-Depends:
      python-dev,
      libaspell-dev,
      liblua5.1-0-dev,
@@ -27,19 +29,36 @@ index 50f1217..24daebc 100644
      zlib1g-dev
  Standards-Version: 3.9.8
  Homepage: https://weechat.org/
+diff --git a/debian-devel/rules b/debian-devel/rules
+index 0fb3b21..89e8ddb 100755
+--- a/debian-devel/rules
++++ b/debian-devel/rules
+@@ -7,8 +7,8 @@ $(BUILDDIR)/Makefile:
+ 	cd $(BUILDDIR) && \
+ 	cmake .. \
+ 		-DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
+-		-DENABLE_DOC:BOOL=ON \
+-		-DENABLE_MAN:BOOL=ON \
++		-DENABLE_DOC:BOOL=OFF \
++		-DENABLE_MAN:BOOL=OFF \
+ 		-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
+ 		-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="$(CFLAGS) -D_FORTIFY_SOURCE=2" \
+ 		-DCMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING="$(LDFLAGS)" \
 diff --git a/debian-stable/control b/debian-stable/control
-index f9e9aa0..919202a 100644
+index 641c931..9780937 100644
 --- a/debian-stable/control
 +++ b/debian-stable/control
-@@ -9,7 +9,6 @@ Build-Depends:
-     docbook-xsl,
-     docbook-xml,
+@@ -3,9 +3,7 @@ Section: net
+ Priority: optional
+ Maintainer: Emmanuel Bouthenot <kolter@debian.org>
+ Build-Depends:
+-    asciidoctor (>= 1.5.4),
      debhelper (>= 9),
 -    dh-exec,
      cmake, pkg-config,
      libncursesw5-dev,
      gem2deb,
-@@ -17,12 +16,12 @@ Build-Depends:
+@@ -13,12 +11,12 @@ Build-Depends:
      python-dev,
      libaspell-dev,
      liblua5.1-0-dev,
@@ -56,10 +75,45 @@ index f9e9aa0..919202a 100644
      zlib1g-dev
  Standards-Version: 3.9.8
  Homepage: https://weechat.org/
+diff --git a/debian-stable/rules b/debian-stable/rules
+index b92991d..335610a 100755
+--- a/debian-stable/rules
++++ b/debian-stable/rules
+@@ -7,8 +7,8 @@ $(BUILDDIR)/Makefile:
+ 	cd $(BUILDDIR) && \
+ 	cmake .. \
+ 		-DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
+-		-DENABLE_DOC:BOOL=ON \
+-		-DENABLE_MAN:BOOL=ON \
++		-DENABLE_DOC:BOOL=OFF \
++		-DENABLE_MAN:BOOL=OFF \
+ 		-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
+ 		-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="$(CFLAGS) -D_FORTIFY_SOURCE=2" \
+ 		-DCMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING="$(LDFLAGS)" \
+diff --git a/debian-stable/weechat-curses.install b/debian-stable/weechat-curses.install
+index 9ca6321..fbfdb1f 100644
+--- a/debian-stable/weechat-curses.install
++++ b/debian-stable/weechat-curses.install
+@@ -1,4 +1,2 @@
+ usr/bin/weechat
+ debian/weechat.xpm usr/share/pixmaps
+-usr/share/man/man1/weechat.1
+-usr/share/man/*/man1/weechat.1
+diff --git a/debian-stable/weechat-curses.links b/debian-stable/weechat-curses.links
+index 4d0e998..bd9a567 100644
+--- a/debian-stable/weechat-curses.links
++++ b/debian-stable/weechat-curses.links
+@@ -1,8 +1 @@
+ usr/bin/weechat usr/bin/weechat-curses
+-usr/share/man/man1/weechat.1.gz usr/share/man/man1/weechat-curses.1.gz
+-usr/share/man/de/man1/weechat.1.gz usr/share/man/de/man1/weechat-curses.1.gz
+-usr/share/man/fr/man1/weechat.1.gz usr/share/man/fr/man1/weechat-curses.1.gz
+-usr/share/man/it/man1/weechat.1.gz usr/share/man/it/man1/weechat-curses.1.gz
+-usr/share/man/ja/man1/weechat.1.gz usr/share/man/ja/man1/weechat-curses.1.gz
+-usr/share/man/pl/man1/weechat.1.gz usr/share/man/pl/man1/weechat-curses.1.gz
+-usr/share/man/ru/man1/weechat.1.gz usr/share/man/ru/man1/weechat-curses.1.gz
 diff --git a/debian-stable/weechat-plugins.install b/debian-stable/weechat-plugins.install
-old mode 100755
-new mode 100644
-index 198360f..980192f
+index 198360f..980192f 100755
 --- a/debian-stable/weechat-plugins.install
 +++ b/debian-stable/weechat-plugins.install
 @@ -1,10 +1,8 @@
diff --git a/tools/debian/patches/weechat_ubuntu_trusty.patch b/tools/debian/patches/weechat_ubuntu_trusty.patch
index 2c6d2a638..7402a15e6 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 50f1217..81f0bcb 100644
+index fabddc6..cce7e04 100644
 --- a/debian-devel/control
 +++ b/debian-devel/control
-@@ -9,7 +9,6 @@ Build-Depends:
-     docbook-xsl,
-     docbook-xml,
+@@ -3,9 +3,7 @@ Section: net
+ Priority: optional
+ Maintainer: Sébastien Helleu <flashcode@flashtux.org>
+ Build-Depends:
+-    asciidoctor (>= 1.5.4),
      debhelper (>= 9),
 -    dh-exec,
      cmake, pkg-config,
      libncursesw5-dev,
      gem2deb,
-@@ -19,10 +18,10 @@ Build-Depends:
+@@ -15,10 +13,10 @@ Build-Depends:
      liblua5.1-0-dev,
      tcl8.6-dev,
      guile-2.0-dev,
@@ -24,19 +26,36 @@ index 50f1217..81f0bcb 100644
      zlib1g-dev
  Standards-Version: 3.9.8
  Homepage: https://weechat.org/
+diff --git a/debian-devel/rules b/debian-devel/rules
+index 0fb3b21..89e8ddb 100755
+--- a/debian-devel/rules
++++ b/debian-devel/rules
+@@ -7,8 +7,8 @@ $(BUILDDIR)/Makefile:
+ 	cd $(BUILDDIR) && \
+ 	cmake .. \
+ 		-DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
+-		-DENABLE_DOC:BOOL=ON \
+-		-DENABLE_MAN:BOOL=ON \
++		-DENABLE_DOC:BOOL=OFF \
++		-DENABLE_MAN:BOOL=OFF \
+ 		-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
+ 		-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="$(CFLAGS) -D_FORTIFY_SOURCE=2" \
+ 		-DCMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING="$(LDFLAGS)" \
 diff --git a/debian-stable/control b/debian-stable/control
-index f9e9aa0..6841c04 100644
+index 641c931..5f3d8ce 100644
 --- a/debian-stable/control
 +++ b/debian-stable/control
-@@ -9,7 +9,6 @@ Build-Depends:
-     docbook-xsl,
-     docbook-xml,
+@@ -3,9 +3,7 @@ Section: net
+ Priority: optional
+ Maintainer: Emmanuel Bouthenot <kolter@debian.org>
+ Build-Depends:
+-    asciidoctor (>= 1.5.4),
      debhelper (>= 9),
 -    dh-exec,
      cmake, pkg-config,
      libncursesw5-dev,
      gem2deb,
-@@ -19,10 +18,10 @@ Build-Depends:
+@@ -15,10 +13,10 @@ Build-Depends:
      liblua5.1-0-dev,
      tcl8.6-dev,
      guile-2.0-dev,
@@ -50,10 +69,45 @@ index f9e9aa0..6841c04 100644
      zlib1g-dev
  Standards-Version: 3.9.8
  Homepage: https://weechat.org/
+diff --git a/debian-stable/rules b/debian-stable/rules
+index b92991d..335610a 100755
+--- a/debian-stable/rules
++++ b/debian-stable/rules
+@@ -7,8 +7,8 @@ $(BUILDDIR)/Makefile:
+ 	cd $(BUILDDIR) && \
+ 	cmake .. \
+ 		-DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
+-		-DENABLE_DOC:BOOL=ON \
+-		-DENABLE_MAN:BOOL=ON \
++		-DENABLE_DOC:BOOL=OFF \
++		-DENABLE_MAN:BOOL=OFF \
+ 		-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
+ 		-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="$(CFLAGS) -D_FORTIFY_SOURCE=2" \
+ 		-DCMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING="$(LDFLAGS)" \
+diff --git a/debian-stable/weechat-curses.install b/debian-stable/weechat-curses.install
+index 9ca6321..fbfdb1f 100644
+--- a/debian-stable/weechat-curses.install
++++ b/debian-stable/weechat-curses.install
+@@ -1,4 +1,2 @@
+ usr/bin/weechat
+ debian/weechat.xpm usr/share/pixmaps
+-usr/share/man/man1/weechat.1
+-usr/share/man/*/man1/weechat.1
+diff --git a/debian-stable/weechat-curses.links b/debian-stable/weechat-curses.links
+index 4d0e998..bd9a567 100644
+--- a/debian-stable/weechat-curses.links
++++ b/debian-stable/weechat-curses.links
+@@ -1,8 +1 @@
+ usr/bin/weechat usr/bin/weechat-curses
+-usr/share/man/man1/weechat.1.gz usr/share/man/man1/weechat-curses.1.gz
+-usr/share/man/de/man1/weechat.1.gz usr/share/man/de/man1/weechat-curses.1.gz
+-usr/share/man/fr/man1/weechat.1.gz usr/share/man/fr/man1/weechat-curses.1.gz
+-usr/share/man/it/man1/weechat.1.gz usr/share/man/it/man1/weechat-curses.1.gz
+-usr/share/man/ja/man1/weechat.1.gz usr/share/man/ja/man1/weechat-curses.1.gz
+-usr/share/man/pl/man1/weechat.1.gz usr/share/man/pl/man1/weechat-curses.1.gz
+-usr/share/man/ru/man1/weechat.1.gz usr/share/man/ru/man1/weechat-curses.1.gz
 diff --git a/debian-stable/weechat-plugins.install b/debian-stable/weechat-plugins.install
-old mode 100755
-new mode 100644
-index 198360f..980192f
+index 198360f..980192f 100755
 --- a/debian-stable/weechat-plugins.install
 +++ b/debian-stable/weechat-plugins.install
 @@ -1,10 +1,8 @@
diff --git a/tools/debian/patches/weechat_ubuntu_wily.patch b/tools/debian/patches/weechat_ubuntu_wily.patch
new file mode 100644
index 000000000..b16fd7e0c
--- /dev/null
+++ b/tools/debian/patches/weechat_ubuntu_wily.patch
@@ -0,0 +1,76 @@
+diff --git a/debian-devel/control b/debian-devel/control
+index 8f54814..a058bcc 100644
+--- a/debian-devel/control
++++ b/debian-devel/control
+@@ -3,7 +3,6 @@ Section: net
+ Priority: optional
+ Maintainer: Sébastien Helleu <flashcode@flashtux.org>
+ Build-Depends:
+-    asciidoctor (>= 1.5.4),
+     debhelper (>= 9),
+     dh-exec,
+     cmake, pkg-config,
+diff --git a/debian-devel/rules b/debian-devel/rules
+index 0fb3b21..89e8ddb 100755
+--- a/debian-devel/rules
++++ b/debian-devel/rules
+@@ -7,8 +7,8 @@ $(BUILDDIR)/Makefile:
+ 	cd $(BUILDDIR) && \
+ 	cmake .. \
+ 		-DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
+-		-DENABLE_DOC:BOOL=ON \
+-		-DENABLE_MAN:BOOL=ON \
++		-DENABLE_DOC:BOOL=OFF \
++		-DENABLE_MAN:BOOL=OFF \
+ 		-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
+ 		-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="$(CFLAGS) -D_FORTIFY_SOURCE=2" \
+ 		-DCMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING="$(LDFLAGS)" \
+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 <kolter@debian.org>
+ Build-Depends:
+-    asciidoctor (>= 1.5.4),
+     debhelper (>= 9),
+     dh-exec,
+     cmake, pkg-config,
+diff --git a/debian-stable/rules b/debian-stable/rules
+index b92991d..335610a 100755
+--- a/debian-stable/rules
++++ b/debian-stable/rules
+@@ -7,8 +7,8 @@ $(BUILDDIR)/Makefile:
+ 	cd $(BUILDDIR) && \
+ 	cmake .. \
+ 		-DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
+-		-DENABLE_DOC:BOOL=ON \
+-		-DENABLE_MAN:BOOL=ON \
++		-DENABLE_DOC:BOOL=OFF \
++		-DENABLE_MAN:BOOL=OFF \
+ 		-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
+ 		-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="$(CFLAGS) -D_FORTIFY_SOURCE=2" \
+ 		-DCMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING="$(LDFLAGS)" \
+diff --git a/debian-stable/weechat-curses.install b/debian-stable/weechat-curses.install
+index 9ca6321..fbfdb1f 100644
+--- a/debian-stable/weechat-curses.install
++++ b/debian-stable/weechat-curses.install
+@@ -1,4 +1,2 @@
+ usr/bin/weechat
+ debian/weechat.xpm usr/share/pixmaps
+-usr/share/man/man1/weechat.1
+-usr/share/man/*/man1/weechat.1
+diff --git a/debian-stable/weechat-curses.links b/debian-stable/weechat-curses.links
+index 4d0e998..bd9a567 100644
+--- a/debian-stable/weechat-curses.links
++++ b/debian-stable/weechat-curses.links
+@@ -1,8 +1 @@
+ usr/bin/weechat usr/bin/weechat-curses
+-usr/share/man/man1/weechat.1.gz usr/share/man/man1/weechat-curses.1.gz
+-usr/share/man/de/man1/weechat.1.gz usr/share/man/de/man1/weechat-curses.1.gz
+-usr/share/man/fr/man1/weechat.1.gz usr/share/man/fr/man1/weechat-curses.1.gz
+-usr/share/man/it/man1/weechat.1.gz usr/share/man/it/man1/weechat-curses.1.gz
+-usr/share/man/ja/man1/weechat.1.gz usr/share/man/ja/man1/weechat-curses.1.gz
+-usr/share/man/pl/man1/weechat.1.gz usr/share/man/pl/man1/weechat-curses.1.gz
+-usr/share/man/ru/man1/weechat.1.gz usr/share/man/ru/man1/weechat-curses.1.gz