[Pkg-privacy-commits] [irssi-plugin-otr] 09/13: fix multiarch install and prepare -2 release

[Antoine Beaupré]

This is an automated email from the git hooks/post-receive script.

anarcat pushed a commit to branch debian
in repository irssi-plugin-otr.

commit 93124d6553df5c96c6b21300c02be7460e23c533
Author: Antoine Beaupré <anarcat at debian.org>
Date:   Tue Mar 22 16:23:10 2016 -0400

    fix multiarch install and prepare -2 release
---
 debian/changelog               |  7 +++++++
 debian/patches/multiarch.patch | 36 ++++++++++++++++++++++++++++++++++++
 debian/patches/series          |  1 +
 3 files changed, 44 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7b0ee3c..e1db95f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+irssi-plugin-otr (1.0.0-2) unstable; urgency=medium
+
+  * New patch: respect $PREFIX to fix multiarch installs (Closes: #817172)
+  * Rebuild to fix mismatching ABI version with current irssi (Closes: #818590)
+
+ -- Antoine Beaupré <anarcat at debian.org>  Tue, 22 Mar 2016 16:22:49 -0400
+
 irssi-plugin-otr (1.0.0-1) unstable; urgency=medium
 
   * Put the package under the umbrella of the Debian OTR Team.  Huge
diff --git a/debian/patches/multiarch.patch b/debian/patches/multiarch.patch
new file mode 100644
index 0000000..a514081
--- /dev/null
+++ b/debian/patches/multiarch.patch
@@ -0,0 +1,36 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -71,7 +71,7 @@ AC_SUBST(DEFAULT_INCLUDES)
+ 
+ # Hardcoded here since irssi only searches in $HOME/.irssi/modules or this path
+ # which is unfortunate...
+-IRSSI_MODULE_DIR="/usr/lib/irssi/modules"
++IRSSI_MODULE_DIR='${libdir}/irssi/modules'
+ AC_SUBST(IRSSI_MODULE_DIR)
+ 
+ AC_CONFIG_FILES([
+
+diff --git a/help/Makefile.am b/help/Makefile.am
+index 9bc4cba..28d8202 100644
+--- a/help/Makefile.am
++++ b/help/Makefile.am
+@@ -1,6 +1,6 @@
+ # The day Irssi will be able to check in $(prefix), this will change. Until
+ # then, it's hardcoded.
+-helpdir = /usr/share/irssi/help
++helpdir = $(datarootdir)/irssi/help
+ help_DATA = otr
+ 
+ EXTRA_DIST = otr
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 86dd43e..ca3bb3c 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,6 +1,6 @@
+ AM_CFLAGS = $(LIBOTR_CFLAGS) $(LIBGCRYPT_CFLAGS) $(PACKAGE_FLAGS)
+ 
+-IRSSI_DIST=/usr/include/irssi
++IRSSI_DIST=$(includedir)/irssi
+ IRSSI_INCLUDE = -I$(IRSSI_DIST) \
+ 				-I$(IRSSI_DIST)/src \
+ 				-I$(IRSSI_DIST)/src/fe-common/core \
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..96b549c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+multiarch.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/irssi-plugin-otr.git