[Pkg-privacy-commits] [irssi-plugin-otr] 11/13: update to upstream release 1.0.1
Antoine Beaupré
anarcat at moszumanska.debian.org
Wed Mar 23 17:35:22 UTC 2016
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 c861e549c4947958871baac0f46880f00a462e0f
Author: Antoine Beaupré <anarcat at debian.org>
Date: Tue Mar 22 17:00:23 2016 -0400
update to upstream release 1.0.1
---
debian/changelog | 3 ++-
debian/patches/multiarch.patch | 33 ++++++++++++++++++++++++++-------
2 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e1db95f..58beca5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-irssi-plugin-otr (1.0.0-2) unstable; urgency=medium
+irssi-plugin-otr (1.0.1-1) unstable; urgency=medium
+ * New upstream release (Closes: #819011)
* New patch: respect $PREFIX to fix multiarch installs (Closes: #817172)
* Rebuild to fix mismatching ABI version with current irssi (Closes: #818590)
diff --git a/debian/patches/multiarch.patch b/debian/patches/multiarch.patch
index a514081..a930a8e 100644
--- a/debian/patches/multiarch.patch
+++ b/debian/patches/multiarch.patch
@@ -1,15 +1,34 @@
+From 6f6f8f4b389facd5fc89df1330679d41a73cc828 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat at debian.org>
+Date: Tue, 22 Mar 2016 16:35:47 -0400
+Subject: [PATCH] respect $PREFIX on install
+
+$PREFIX is a very common convention when installing software,
+especially with autoconf, which the OTR plugin uses.
+
+This makes sure that the `--prefix` flag in configure affects all
+relevant portions of the install code.
+
+Closes #53.
+---
+ configure.ac | 2 +-
+ help/Makefile.am | 2 +-
+ src/Makefile.am | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 83532e6..a38af58 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -71,7 +71,7 @@ AC_SUBST(DEFAULT_INCLUDES)
+@@ -77,7 +77,7 @@ AC_SUBST(DEFAULT_INCLUDES)
+ AC_ARG_WITH([irssi-module-dir],
+ AS_HELP_STRING([--with-irssi-module-dir=DIR], [Irssi module directory]),
+ [IRSSI_MODULE_DIR="$withval"],
+- [IRSSI_MODULE_DIR="/usr/lib/irssi/modules"])
++ [IRSSI_MODULE_DIR='${libdir}/irssi/modules'])
- # 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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/irssi-plugin-otr.git
More information about the Pkg-privacy-commits
mailing list