split the first patch into two

[osspd.git] / debian / patches / 0001-Fix-compilation-with-Werror-format-security.patch

diff --git a/debian/patches/0001-Fix-compilation-with-Werror-format-security-use-CPPF.patch b/debian/patches/0001-Fix-compilation-with-Werror-format-security.patch
similarity index 64%
rename from debian/patches/0001-Fix-compilation-with-Werror-format-security-use-CPPF.patch
rename to debian/patches/0001-Fix-compilation-with-Werror-format-security.patch
index 2fcf036e7ffeca4b9261320b3a1d1937f2218930..faca5587f4c2fb0e90034bad1d5b1b2513458353 100644 (file)
--- a/debian/patches/0001-Fix-compilation-with-Werror-format-security-use-CPPF.patch
+++ b/debian/patches/0001-Fix-compilation-with-Werror-format-security.patch
@@ -1,26 +1,12 @@
 From: Ralf Jung <post@ralfj.de>
-Date: Thu, 13 Sep 2012 18:36:54 +0200
-Subject: Fix compilation with -Werror=format-security, use CPPFLAGS
+Date: Sat, 15 Sep 2012 13:36:06 +0200
+Subject: Fix compilation with -Werror=format-security
 
 ---
- Makefile     |    2 +-
  ossp-slave.c |    4 ++--
  osspd.c      |    2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
+ 2 files changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/Makefile b/Makefile
-index 8111c9b..8d8fe87 100644
---- a/Makefile
-+++ b/Makefile
-@@ -2,7 +2,7 @@
- # DESTDIR is completely respected
- CC := gcc
- AR := ar
--CFLAGS := -Wall $(CFLAGS)
-+CFLAGS := -Wall $(CFLAGS) $(CPPFLAGS)
- XLDFLAGS := $(LDFLAGS)
- LDFLAGS := -L. -lossp $(LDFLAGS)
- prefix := /usr/local
 diff --git a/ossp-slave.c b/ossp-slave.c
 index 4c5cb2d..a290636 100644
 --- a/ossp-slave.c