[pkg-otr-team] [irssi-plugin-otr] 03/05: remove gmodule-nolink patch merged upstream

[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 9c1ec0afeb3aa6bd6fce3f0c5ea182f0fcb5ce6d
Author: Antoine Beaupré <anarcat at koumbit.org>
Date:   Sat Feb 22 11:42:38 2014 -0500

    remove gmodule-nolink patch merged upstream
---
 debian/changelog                    |  1 +
 debian/patches/gmodule-nolink.patch | 26 --------------------------
 debian/patches/series               |  1 -
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 80054e0..4451696 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ irssi-plugin-otr (1.0.0-1) unstable; urgency=medium
     thanks to David Spreen <netzwurm at debian.org> for having maintained
     this package for many years! (Closes: #738930).
   * Package new 1.0.0 upstream version (Closes: #739106).
+    * Get rid of patch merged upstream (gmodule-nolink.patch).
   * Update to standards 3.9.5, no change.
   * Use upstream tags to build tarball.
 
diff --git a/debian/patches/gmodule-nolink.patch b/debian/patches/gmodule-nolink.patch
deleted file mode 100644
index ce5a5dd..0000000
--- a/debian/patches/gmodule-nolink.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit c3f7b4a9a381f9ee7853693dd810aad2db748846
-Author: David Goulet <dgoulet at ev0ke.net>
-Date:   Fri May 10 15:31:47 2013 -0400
-
-    Fix: remove gmodule useless linked library flags
-    
-    Only the CFLAGS are needed for irssi headers to make sense.
-    
-    Ref #31
-    
-    Reported-by: Antoine Beaupré <anarcat at debian.org>
-    Signed-off-by: David Goulet <dgoulet at ev0ke.net>
-
-diff --git a/configure.ac b/configure.ac
-index 249d0a8..ce5c52d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -36,7 +36,7 @@ AM_PATH_LIBOTR(4.0.0, [], [AC_MSG_ERROR([libotr 4.0.0 or newer is required.])])
- pkg_modules="gmodule-2.0 >= 2.0.0"
- PKG_CHECK_MODULES(GMODULE, [$pkg_modules])
- 
--LIBS="$LIBS $GMODULE_LIBS"
-+LIBS="$LIBS"
- 
- PACKAGE_CFLAGS="$GMODULE_CFLAGS -Wall -Werror=format-security"
- AC_SUBST(PACKAGE_CFLAGS)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c026b58..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-gmodule-nolink.patch

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