split the first patch into two

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

diff --git a/debian/patches/0002-honor-CPPFLAGS.patch b/debian/patches/0002-honor-CPPFLAGS.patch
new file mode 100644 (file)
index 0000000..023b46b
--- /dev/null
+++ b/debian/patches/0002-honor-CPPFLAGS.patch
@@ -0,0 +1,21 @@
+From: Ralf Jung <post@ralfj.de>
+Date: Sat, 15 Sep 2012 13:36:23 +0200
+Subject: honor CPPFLAGS
+
+---
+ Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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/debian/patches/0002-PA-recommends-users-not-to-be-in-the-audio-group-so-.patch b/debian/patches/0003-PA-recommends-users-not-to-be-in-the-audio-group-so-.patch
similarity index 100%
rename from debian/patches/0002-PA-recommends-users-not-to-be-in-the-audio-group-so-.patch
rename to debian/patches/0003-PA-recommends-users-not-to-be-in-the-audio-group-so-.patch

diff --git a/debian/patches/series b/debian/patches/series
index 9d80719243b91a2d1390d3b3677babffe6f81a53..d0285e9209ec2066d04b0f1c88e2182935b5782c 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
-0001-Fix-compilation-with-Werror-format-security-use-CPPF.patch
-0002-PA-recommends-users-not-to-be-in-the-audio-group-so-.patch
+0001-Fix-compilation-with-Werror-format-security.patch
+0002-honor-CPPFLAGS.patch
+0003-PA-recommends-users-not-to-be-in-the-audio-group-so-.patch