[Pkg-privacy-commits] [irssi-plugin-otr] 18/18: remove merged patch

[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 89dc2af04e59acedd8d2e8389ee888f24ae31a16
Author: Antoine Beaupré <anarcat at debian.org>
Date:   Fri Mar 25 14:36:31 2016 -0400

    remove merged patch
---
 debian/changelog               |  1 +
 debian/patches/multiarch.patch | 55 ------------------------------------------
 debian/patches/series          |  1 -
 3 files changed, 1 insertion(+), 56 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2004f9f..d690977 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ irssi-plugin-otr (1.0.1+f75eb26-1) unstable; urgency=medium
 
   * New upstream snapshot, required to fix ABI problems with irssi 1.18
     (Closes: #818590)
+  * Remove prefix patch, merged upstream
 
  -- Antoine Beaupré <anarcat at debian.org>  Fri, 25 Mar 2016 14:31:27 -0400
 
diff --git a/debian/patches/multiarch.patch b/debian/patches/multiarch.patch
deleted file mode 100644
index a930a8e..0000000
--- a/debian/patches/multiarch.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-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
-@@ -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'])
- 
- AC_SUBST(IRSSI_MODULE_DIR)
- 
-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
deleted file mode 100644
index 96b549c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-multiarch.patch

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