From 11636f5b439b47aff9f41e7793b3b17598b0b6b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Fri, 30 Oct 2015 21:00:29 +0100 Subject: [PATCH] debian: sync debian files with debian git repository --- debian-devel/control | 3 +- debian-stable/control | 3 +- debian-stable/weechat-plugins.install | 4 +- .../patches/weechat_debian_squeeze.patch | 40 +++++++++++--- .../patches/weechat_debian_wheezy.patch | 52 ++++++++++++++++--- 5 files changed, 85 insertions(+), 17 deletions(-) mode change 100644 => 100755 debian-stable/weechat-plugins.install diff --git a/debian-devel/control b/debian-devel/control index a12df19bb..8fd3e4981 100644 --- a/debian-devel/control +++ b/debian-devel/control @@ -9,6 +9,7 @@ Build-Depends: docbook-xsl, docbook-xml, debhelper (>= 9), + dh-exec, cmake, pkg-config, libncursesw5-dev, gem2deb, @@ -18,7 +19,7 @@ Build-Depends: liblua5.1-0-dev, tcl8.5-dev, guile-2.0-dev, - libv8-dev, + libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel], libcurl4-gnutls-dev, libgcrypt20-dev, libgnutls28-dev, diff --git a/debian-stable/control b/debian-stable/control index ccb417924..0f3c34bb6 100644 --- a/debian-stable/control +++ b/debian-stable/control @@ -9,6 +9,7 @@ Build-Depends: docbook-xsl, docbook-xml, debhelper (>= 9), + dh-exec, cmake, pkg-config, libncursesw5-dev, gem2deb, @@ -18,7 +19,7 @@ Build-Depends: liblua5.1-0-dev, tcl8.5-dev, guile-2.0-dev, - libv8-dev, + libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel], libcurl4-gnutls-dev, libgcrypt20-dev, libgnutls28-dev, diff --git a/debian-stable/weechat-plugins.install b/debian-stable/weechat-plugins.install old mode 100644 new mode 100755 index 980192fa4..198360ffa --- a/debian-stable/weechat-plugins.install +++ b/debian-stable/weechat-plugins.install @@ -1,8 +1,10 @@ +#!/usr/bin/dh-exec + usr/lib/weechat/plugins/aspell.so usr/lib/weechat/plugins/exec.so usr/lib/weechat/plugins/fifo.so usr/lib/weechat/plugins/guile.so -usr/lib/weechat/plugins/javascript.so +[amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel] usr/lib/weechat/plugins/javascript.so usr/lib/weechat/plugins/lua.so usr/lib/weechat/plugins/perl.so usr/lib/weechat/plugins/python.so diff --git a/tools/debian/patches/weechat_debian_squeeze.patch b/tools/debian/patches/weechat_debian_squeeze.patch index d9aa83227..284c82d0e 100644 --- a/tools/debian/patches/weechat_debian_squeeze.patch +++ b/tools/debian/patches/weechat_debian_squeeze.patch @@ -6,14 +6,15 @@ index ec63514..45a4fb7 100644 -9 +8 diff --git a/debian-devel/control b/debian-devel/control -index a12df19..a5f9ceb 100644 +index 8fd3e49..a5f9ceb 100644 --- a/debian-devel/control +++ b/debian-devel/control -@@ -8,10 +8,10 @@ Build-Depends: +@@ -8,21 +8,20 @@ Build-Depends: xsltproc, docbook-xsl, docbook-xml, - debhelper (>= 9), +- dh-exec, + debhelper (>= 8), cmake, pkg-config, libncursesw5-dev, @@ -22,9 +23,11 @@ index a12df19..a5f9ceb 100644 libperl-dev, python-dev, libaspell-dev, -@@ -20,8 +20,8 @@ Build-Depends: + liblua5.1-0-dev, + tcl8.5-dev, guile-2.0-dev, - libv8-dev, +- libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel], ++ libv8-dev, libcurl4-gnutls-dev, - libgcrypt20-dev, - libgnutls28-dev, @@ -41,14 +44,15 @@ index ec63514..45a4fb7 100644 -9 +8 diff --git a/debian-stable/control b/debian-stable/control -index ccb4179..790b315 100644 +index 0f3c34b..790b315 100644 --- a/debian-stable/control +++ b/debian-stable/control -@@ -8,10 +8,10 @@ Build-Depends: +@@ -8,21 +8,20 @@ Build-Depends: xsltproc, docbook-xsl, docbook-xml, - debhelper (>= 9), +- dh-exec, + debhelper (>= 8), cmake, pkg-config, libncursesw5-dev, @@ -57,9 +61,11 @@ index ccb4179..790b315 100644 libperl-dev, python-dev, libaspell-dev, -@@ -20,8 +20,8 @@ Build-Depends: + liblua5.1-0-dev, + tcl8.5-dev, guile-2.0-dev, - libv8-dev, +- libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel], ++ libv8-dev, libcurl4-gnutls-dev, - libgcrypt20-dev, - libgnutls28-dev, @@ -68,3 +74,21 @@ index ccb4179..790b315 100644 zlib1g-dev Standards-Version: 3.9.6 Homepage: https://weechat.org/ +diff --git a/debian-stable/weechat-plugins.install b/debian-stable/weechat-plugins.install +old mode 100755 +new mode 100644 +index 198360f..980192f +--- a/debian-stable/weechat-plugins.install ++++ b/debian-stable/weechat-plugins.install +@@ -1,10 +1,8 @@ +-#!/usr/bin/dh-exec +- + usr/lib/weechat/plugins/aspell.so + usr/lib/weechat/plugins/exec.so + usr/lib/weechat/plugins/fifo.so + usr/lib/weechat/plugins/guile.so +-[amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel] usr/lib/weechat/plugins/javascript.so ++usr/lib/weechat/plugins/javascript.so + usr/lib/weechat/plugins/lua.so + usr/lib/weechat/plugins/perl.so + usr/lib/weechat/plugins/python.so diff --git a/tools/debian/patches/weechat_debian_wheezy.patch b/tools/debian/patches/weechat_debian_wheezy.patch index 459190197..f12da409f 100644 --- a/tools/debian/patches/weechat_debian_wheezy.patch +++ b/tools/debian/patches/weechat_debian_wheezy.patch @@ -1,10 +1,21 @@ diff --git a/debian-devel/control b/debian-devel/control -index a12df19..38773be 100644 +index 8fd3e49..38773be 100644 --- a/debian-devel/control +++ b/debian-devel/control -@@ -20,8 +20,8 @@ Build-Depends: +@@ -9,7 +9,6 @@ Build-Depends: + docbook-xsl, + docbook-xml, + debhelper (>= 9), +- dh-exec, + cmake, pkg-config, + libncursesw5-dev, + gem2deb, +@@ -19,10 +18,10 @@ Build-Depends: + liblua5.1-0-dev, + tcl8.5-dev, guile-2.0-dev, - libv8-dev, +- libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel], ++ libv8-dev, libcurl4-gnutls-dev, - libgcrypt20-dev, - libgnutls28-dev, @@ -14,12 +25,23 @@ index a12df19..38773be 100644 Standards-Version: 3.9.6 Homepage: https://weechat.org/ diff --git a/debian-stable/control b/debian-stable/control -index ccb4179..0d73171 100644 +index 0f3c34b..0d73171 100644 --- a/debian-stable/control +++ b/debian-stable/control -@@ -20,8 +20,8 @@ Build-Depends: +@@ -9,7 +9,6 @@ Build-Depends: + docbook-xsl, + docbook-xml, + debhelper (>= 9), +- dh-exec, + cmake, pkg-config, + libncursesw5-dev, + gem2deb, +@@ -19,10 +18,10 @@ Build-Depends: + liblua5.1-0-dev, + tcl8.5-dev, guile-2.0-dev, - libv8-dev, +- libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel], ++ libv8-dev, libcurl4-gnutls-dev, - libgcrypt20-dev, - libgnutls28-dev, @@ -28,3 +50,21 @@ index ccb4179..0d73171 100644 zlib1g-dev Standards-Version: 3.9.6 Homepage: https://weechat.org/ +diff --git a/debian-stable/weechat-plugins.install b/debian-stable/weechat-plugins.install +old mode 100755 +new mode 100644 +index 198360f..980192f +--- a/debian-stable/weechat-plugins.install ++++ b/debian-stable/weechat-plugins.install +@@ -1,10 +1,8 @@ +-#!/usr/bin/dh-exec +- + usr/lib/weechat/plugins/aspell.so + usr/lib/weechat/plugins/exec.so + usr/lib/weechat/plugins/fifo.so + usr/lib/weechat/plugins/guile.so +-[amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel] usr/lib/weechat/plugins/javascript.so ++usr/lib/weechat/plugins/javascript.so + usr/lib/weechat/plugins/lua.so + usr/lib/weechat/plugins/perl.so + usr/lib/weechat/plugins/python.so