[tomcat-native] 03/04: Removed 01-disable-maintainer-mode.patch (fixed upstream)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch experimental
in repository tomcat-native.

commit 110356b11a65be389de66b21038e837f5f2eabd5
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun May 14 12:54:53 2017 +0200

    Removed 01-disable-maintainer-mode.patch (fixed upstream)
---
 debian/changelog                                |  4 +++-
 debian/patches/01-disable-maintainer-mode.patch | 28 -------------------------
 debian/patches/series                           |  1 -
 3 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ffd4426..f4db897 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-tomcat-native (1.2.10-2) UNRELEASED; urgency=medium
+tomcat-native (1.2.12-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Removed 01-disable-maintainer-mode.patch (fixed upstream)
   * Removed the generated configure script from the upstream tarball
 
  -- Emmanuel Bourg <ebourg at apache.org>  Sun, 14 May 2017 12:01:20 +0200
diff --git a/debian/patches/01-disable-maintainer-mode.patch b/debian/patches/01-disable-maintainer-mode.patch
deleted file mode 100644
index 65cda0c..0000000
--- a/debian/patches/01-disable-maintainer-mode.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: No longer enable the maintainer mode when --disable-maintainer-mode is specified
-Author: Emmanuel Bourg <ebourg at apache.org>
-Bug: https://bz.apache.org/bugzilla/show_bug.cgi?id=60388
---- a/native/configure.in
-+++ b/native/configure.in
-@@ -198,12 +198,16 @@
- maintainer-mode,
- [  --enable-maintainer-mode   Turn on debugging and compile time warnings],
- [
--  if test "$GCC" = "yes"; then
--    CFLAGS="${CFLAGS} -DDEBUG -Wall"
--  else
--    CFLAGS="${CFLAGS} -DDEBUG"
--  fi
--AC_MSG_RESULT([...Enabling Maintainer mode...])
-+  case "${enableval}" in
-+    yes )
-+       if test "$GCC" = "yes"; then
-+         CFLAGS="${CFLAGS} -DDEBUG -Wall"
-+       else
-+         CFLAGS="${CFLAGS} -DDEBUG"
-+       fi
-+       AC_MSG_RESULT([...Enabling Maintainer mode...])
-+       ;;
-+  esac
- ])
- 
- dnl
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e1f1a9c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01-disable-maintainer-mode.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat-native.git