[debian-edu-commits] debian-edu/ 08/12: Drop patches

[Dominik George]

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

natureshadow-guest pushed a commit to branch master
in repository guacamole-server.

commit 3f1e456179a695b0670db0aef0f20b9849833267
Author: Dominik George <nik at naturalnet.de>
Date:   Fri Jun 3 00:48:58 2016 +0200

    Drop patches
---
 debian/changelog                              |  1 +
 debian/patches/0001-remove-ssh-pedantic.patch | 13 -------------
 debian/patches/0002-add-subdir-objects.patch  | 13 -------------
 debian/patches/0003-default-source.patch      | 11 -----------
 debian/patches/series                         |  3 ---
 5 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8572548..22c6cc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ guacamole-server (0.9.9-1) UNRELEASED; urgency=medium
   * Update homepage and VCS fields
   * Reformat control file
   * Update watch file to point to SF.net
+  * Drop all patches as they were applied upstream
 
  -- Dominik George <nik at naturalnet.de>  Fri, 03 Jun 2016 00:33:54 +0200
 
diff --git a/debian/patches/0001-remove-ssh-pedantic.patch b/debian/patches/0001-remove-ssh-pedantic.patch
deleted file mode 100644
index 669e42e..0000000
--- a/debian/patches/0001-remove-ssh-pedantic.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/protocols/ssh/Makefile.am b/src/protocols/ssh/Makefile.am
-index da8d1ea..e2e3ad4 100644
---- a/src/protocols/ssh/Makefile.am
-+++ b/src/protocols/ssh/Makefile.am
-@@ -70,7 +70,7 @@ noinst_HEADERS =                \
-     terminal_handlers.h         \
-     types.h
- 
--libguac_client_ssh_la_CFLAGS = -Werror -Wall -pedantic -Iinclude @PANGO_CFLAGS@ @PANGOCAIRO_CFLAGS@ @LIBGUAC_INCLUDE@
-+libguac_client_ssh_la_CFLAGS = -Werror -Wall -Iinclude @PANGO_CFLAGS@ @PANGOCAIRO_CFLAGS@ @LIBGUAC_INCLUDE@
- libguac_client_ssh_la_LIBADD = @LIBGUAC_LTLIB@
- libguac_client_ssh_la_LDFLAGS = -version-info 0:0:0 @SSH_LIBS@ @PTHREAD_LIBS@ @PANGO_LIBS@ @PANGOCAIRO_LIBS@ @CAIRO_LIBS@
- 
diff --git a/debian/patches/0002-add-subdir-objects.patch b/debian/patches/0002-add-subdir-objects.patch
deleted file mode 100644
index 0c06a72..0000000
--- a/debian/patches/0002-add-subdir-objects.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 598a452..5d28d0f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -37,7 +37,7 @@
- 
- AC_PREREQ([2.61])
- AC_INIT([guacamole-server], [0.8.3])
--AM_INIT_AUTOMAKE([-Wall -Werror foreign])
-+AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
- 
- LT_PREREQ([2.2])
- LT_INIT([dlopen])
diff --git a/debian/patches/0003-default-source.patch b/debian/patches/0003-default-source.patch
deleted file mode 100644
index 44b779f..0000000
--- a/debian/patches/0003-default-source.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -54,7 +54,7 @@ AC_CHECK_HEADERS([fcntl.h stdlib.h strin
- 
- # Source characteristics
- AC_DEFINE([_POSIX_C_SOURCE], [199309L], [Uses POSIX APIs])
--AC_DEFINE([_BSD_SOURCE],     [],        [Uses BSD APIs])
-+AC_DEFINE([_DEFAULT_SOURCE],     [],        [Uses BSD APIs])
- 
- # libdl
- AC_CHECK_LIB([dl], [dlopen], [DL_LIBS=-ldl],
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b381eef..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-0001-remove-ssh-pedantic.patch
-0002-add-subdir-objects.patch
-0003-default-source.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/guacamole-server.git