[gummi] 09/15: dropped automake-subdirs.patch

[Daniel Stender]

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

danstender-guest pushed a commit to branch master
in repository gummi.

commit 4f513e0c60bb838cde10039758b802838f4870e9
Author: Daniel Stender <debian at danielstender.com>
Date:   Wed Jan 27 21:02:04 2016 +0100

    dropped automake-subdirs.patch
---
 debian/changelog                      |  3 ++-
 debian/patches/automake-subdirs.patch | 20 --------------------
 debian/patches/series                 |  1 -
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8f1ba93..d5ee3f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ gummi (0.6.6-1) UNRELEASED; urgency=medium
     + upgrade_datadir.patch (applied upstream).
     + add-missing-chooser-title.patch (originated from upstream).
     + libgthread-2.0_link.patch (applied upstream).
+    + automake-subdirs.patch (applied upstream, src/Makefile.am).
 
- -- Daniel Stender <debian at danielstender.com>  Wed, 27 Jan 2016 20:57:49 +0100
+ -- Daniel Stender <debian at danielstender.com>  Wed, 27 Jan 2016 21:01:08 +0100
 
 gummi (0.6.5-7) unstable; urgency=medium
 
diff --git a/debian/patches/automake-subdirs.patch b/debian/patches/automake-subdirs.patch
deleted file mode 100644
index 144c4fd..0000000
--- a/debian/patches/automake-subdirs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: automake1.14 warns about 'subdir-objects' not set
- together with -Werror this leads to a build failure.
-Origin: vendor
-Bug: http://bugs.debian.org/725534
-Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2013-10-26
-Applied-Upstream: https://github.com/alexandervdm/gummi/commit/4fad171
- Upstream set subdir-objects for AUTOMAKE_OPTIONS in src/Makefile.am
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -3,7 +3,7 @@
-
- AC_PREREQ(2.65)
- AC_INIT([Gummi], [0.6.5], [alexvandermey at gmail.com], [gummi], [http://gummi.midnightcoding.org/])
--AM_INIT_AUTOMAKE([foreign -Wall -Werror])
-+AM_INIT_AUTOMAKE([foreign -Wall -Werror subdir-objects])
-
- GETTEXT_PACKAGE=gummi
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext domain])
diff --git a/debian/patches/series b/debian/patches/series
index 05b1f2b..63ff267 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-automake-subdirs.patch
 use-system-synctex.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gummi.git