[debian-edu-commits] debian-edu/ 04/04: Remove patch from yesterday because it was not a good idea.

[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 f3b939b41bdd217113ec355406f4c8f5b38ffd26
Author: Dominik George <nik at naturalnet.de>
Date:   Fri Oct 7 12:15:19 2016 +0200

    Remove patch from yesterday because it was not a good idea.
---
 debian/patches/remove-pedantic.patch | 154 -----------------------------------
 debian/patches/series                |   1 -
 2 files changed, 155 deletions(-)

diff --git a/debian/patches/remove-pedantic.patch b/debian/patches/remove-pedantic.patch
deleted file mode 100644
index 4732395..0000000
--- a/debian/patches/remove-pedantic.patch
+++ /dev/null
@@ -1,154 +0,0 @@
---- a/src/common-ssh/Makefile.am
-+++ b/src/common-ssh/Makefile.am
-@@ -40,7 +40,7 @@ noinst_HEADERS =      \
-     guac_ssh_user.h
- 
- libguac_common_ssh_la_CFLAGS = \
--    -Werror -Wall -pedantic    \
-+    -Werror -Wall    \
-     @COMMON_INCLUDE@           \
-     @LIBGUAC_INCLUDE@
- 
---- a/src/common-ssh/Makefile.in
-+++ b/src/common-ssh/Makefile.in
-@@ -357,7 +357,7 @@ noinst_HEADERS = \
-     guac_ssh_user.h
- 
- libguac_common_ssh_la_CFLAGS = \
--    -Werror -Wall -pedantic    \
-+    -Werror -Wall    \
-     @COMMON_INCLUDE@           \
-     @LIBGUAC_INCLUDE@
- 
---- a/src/common/Makefile.am
-+++ b/src/common/Makefile.am
-@@ -50,7 +50,7 @@ libguac_common_la_SOURCES = \
-     guac_surface.c
- 
- libguac_common_la_CFLAGS =  \
--    -Werror -Wall -pedantic \
-+    -Werror -Wall \
-     @LIBGUAC_INCLUDE@
- 
- libguac_common_la_LIBADD = \
---- a/src/common/Makefile.in
-+++ b/src/common/Makefile.in
-@@ -371,7 +371,7 @@ libguac_common_la_SOURCES = \
-     guac_surface.c
- 
- libguac_common_la_CFLAGS = \
--    -Werror -Wall -pedantic \
-+    -Werror -Wall \
-     @LIBGUAC_INCLUDE@
- 
- libguac_common_la_LIBADD = \
---- a/src/guacd/Makefile.am
-+++ b/src/guacd/Makefile.am
-@@ -46,7 +46,7 @@ guacd_SOURCES =   \
-     log.c
- 
- guacd_CFLAGS =              \
--    -Werror -Wall -pedantic \
-+    -Werror -Wall \
-     @COMMON_INCLUDE@        \
-     @LIBGUAC_INCLUDE@
- 
---- a/src/guacd/Makefile.in
-+++ b/src/guacd/Makefile.in
-@@ -392,7 +392,7 @@ noinst_HEADERS = client.h client-map.h c
- guacd_SOURCES = daemon.c client.c client-map.c conf-args.c conf-file.c \
- 	conf-parse.c log.c $(am__append_2)
- guacd_CFLAGS = \
--    -Werror -Wall -pedantic \
-+    -Werror -Wall \
-     @COMMON_INCLUDE@        \
-     @LIBGUAC_INCLUDE@
- 
---- a/src/libguac/Makefile.am
-+++ b/src/libguac/Makefile.am
-@@ -97,7 +97,7 @@ endif
- 
- 
- libguac_la_CFLAGS = \
--    -Werror -Wall -pedantic -Iguacamole
-+    -Werror -Wall -Iguacamole
- 
- libguac_la_LDFLAGS =     \
-     -version-info 11:0:0 \
---- a/src/libguac/Makefile.in
-+++ b/src/libguac/Makefile.in
-@@ -428,7 +428,7 @@ libguac_la_SOURCES = audio.c client.c cl
- 	pool.c protocol.c raw_encoder.c socket.c socket-fd.c \
- 	socket-nest.c timestamp.c unicode.c $(am__append_1)
- libguac_la_CFLAGS = \
--    -Werror -Wall -pedantic -Iguacamole
-+    -Werror -Wall -Iguacamole
- 
- libguac_la_LDFLAGS = \
-     -version-info 11:0:0 \
---- a/src/protocols/vnc/Makefile.am
-+++ b/src/protocols/vnc/Makefile.am
-@@ -44,7 +44,7 @@ noinst_HEADERS += pulse.h
- endif
- 
- libguac_client_vnc_la_CFLAGS =        \
--    -Werror -Wall -pedantic -Iinclude \
-+    -Werror -Wall -Iinclude \
-     @COMMON_INCLUDE@                  \
-     @COMMON_SSH_INCLUDE@              \
-     @LIBGUAC_INCLUDE@
---- a/src/protocols/vnc/Makefile.in
-+++ b/src/protocols/vnc/Makefile.in
-@@ -391,7 +391,7 @@ libguac_client_vnc_la_SOURCES = client.c
- noinst_HEADERS = client.h clipboard.h guac_handlers.h vnc_handlers.h \
- 	$(am__append_2) $(am__append_4)
- libguac_client_vnc_la_CFLAGS = \
--    -Werror -Wall -pedantic -Iinclude \
-+    -Werror -Wall -Iinclude \
-     @COMMON_INCLUDE@                  \
-     @COMMON_SSH_INCLUDE@              \
-     @LIBGUAC_INCLUDE@
---- a/src/terminal/Makefile.am
-+++ b/src/terminal/Makefile.am
-@@ -55,7 +55,7 @@ libguac_terminal_la_SOURCES =   \
-     terminal_handlers.c
- 
- libguac_terminal_la_CFLAGS = \
--    -Werror -Wall -pedantic  \
-+    -Werror -Wall  \
-     @COMMON_INCLUDE@         \
-     @LIBGUAC_INCLUDE@        \
-     @PANGO_CFLAGS@           \
---- a/src/terminal/Makefile.in
-+++ b/src/terminal/Makefile.in
-@@ -376,7 +376,7 @@ libguac_terminal_la_SOURCES = \
-     terminal_handlers.c
- 
- libguac_terminal_la_CFLAGS = \
--    -Werror -Wall -pedantic  \
-+    -Werror -Wall  \
-     @COMMON_INCLUDE@         \
-     @LIBGUAC_INCLUDE@        \
-     @PANGO_CFLAGS@           \
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -52,7 +52,7 @@ test_libguac_SOURCES =           \
-     util/guac_unicode.c
- 
- test_libguac_CFLAGS =       \
--    -Werror -Wall -pedantic \
-+    -Werror -Wall \
-     @COMMON_INCLUDE@        \
-     @LIBGUAC_INCLUDE@
- 
---- a/tests/Makefile.in
-+++ b/tests/Makefile.in
-@@ -584,7 +584,7 @@ test_libguac_SOURCES = \
-     util/guac_unicode.c
- 
- test_libguac_CFLAGS = \
--    -Werror -Wall -pedantic \
-+    -Werror -Wall \
-     @COMMON_INCLUDE@        \
-     @LIBGUAC_INCLUDE@
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 667addf..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-remove-pedantic.patch

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