From c033834ada39c6dfcd7f5056fd9550bf648fcbb4 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Mon, 2 Jan 2017 10:36:53 +0100
Subject: Moving debian specific patches to subdirectory within patches
 directory.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
---
 debian/patches/0001-build.patch          | 19 -------------------
 debian/patches/0002-zupdate.patch        | 15 ---------------
 debian/patches/debian/0001-build.patch   | 19 +++++++++++++++++++
 debian/patches/debian/0002-zupdate.patch | 15 +++++++++++++++
 debian/patches/series                    |  4 ++--
 5 files changed, 36 insertions(+), 36 deletions(-)
 delete mode 100644 debian/patches/0001-build.patch
 delete mode 100644 debian/patches/0002-zupdate.patch
 create mode 100644 debian/patches/debian/0001-build.patch
 create mode 100644 debian/patches/debian/0002-zupdate.patch

diff --git a/debian/patches/0001-build.patch b/debian/patches/0001-build.patch
deleted file mode 100644
index 5650f34..0000000
--- a/debian/patches/0001-build.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Author: Daniel Baumann <mail@daniel-baumann.ch>
-Description: Avoid overwriting build-environment.
-
-diff -Naurp zutils.orig/configure zutils/configure
---- zutils.orig/configure
-+++ zutils/configure
-@@ -21,9 +21,9 @@ infodir='$(datarootdir)/info'
- mandir='$(datarootdir)/man'
- sysconfdir='$(prefix)/etc'
- CXX=g++
--CPPFLAGS=
--CXXFLAGS='-Wall -W -O2'
--LDFLAGS=
-+#CPPFLAGS=
-+#CXXFLAGS='-Wall -W -O2'
-+#LDFLAGS=
- DIFF=diff
- GREP=grep
- 
diff --git a/debian/patches/0002-zupdate.patch b/debian/patches/0002-zupdate.patch
deleted file mode 100644
index f434707..0000000
--- a/debian/patches/0002-zupdate.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Daniel Baumann <mail@daniel-baumann.ch>
-Description: Avoid linking zupdate statically.
-
-diff -Naurp zutils.orig/Makefile.in zutils/Makefile.in
---- zutils.orig/Makefile.in
-+++ zutils/Makefile.in
-@@ -51,7 +51,7 @@ ztest : $(ztest_objs)
- 	$(CXX) $(LDFLAGS) $(CXXFLAGS) -o $@ $(ztest_objs)
- 
- zupdate : $(zupdate_objs)
--	$(CXX) $(LDFLAGS) $(CXXFLAGS) -o $@ $(zupdate_objs)
-+	$(CXX) $(CXXFLAGS) -o $@ $(zupdate_objs)
- 
- rc.o : rc.cc
- 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -DPROGVERSION=\"$(pkgversion)\" -DSYSCONFDIR=\"$(sysconfdir)\" -c -o $@ $<
diff --git a/debian/patches/debian/0001-build.patch b/debian/patches/debian/0001-build.patch
new file mode 100644
index 0000000..5650f34
--- /dev/null
+++ b/debian/patches/debian/0001-build.patch
@@ -0,0 +1,19 @@
+Author: Daniel Baumann <mail@daniel-baumann.ch>
+Description: Avoid overwriting build-environment.
+
+diff -Naurp zutils.orig/configure zutils/configure
+--- zutils.orig/configure
++++ zutils/configure
+@@ -21,9 +21,9 @@ infodir='$(datarootdir)/info'
+ mandir='$(datarootdir)/man'
+ sysconfdir='$(prefix)/etc'
+ CXX=g++
+-CPPFLAGS=
+-CXXFLAGS='-Wall -W -O2'
+-LDFLAGS=
++#CPPFLAGS=
++#CXXFLAGS='-Wall -W -O2'
++#LDFLAGS=
+ DIFF=diff
+ GREP=grep
+ 
diff --git a/debian/patches/debian/0002-zupdate.patch b/debian/patches/debian/0002-zupdate.patch
new file mode 100644
index 0000000..f434707
--- /dev/null
+++ b/debian/patches/debian/0002-zupdate.patch
@@ -0,0 +1,15 @@
+Author: Daniel Baumann <mail@daniel-baumann.ch>
+Description: Avoid linking zupdate statically.
+
+diff -Naurp zutils.orig/Makefile.in zutils/Makefile.in
+--- zutils.orig/Makefile.in
++++ zutils/Makefile.in
+@@ -51,7 +51,7 @@ ztest : $(ztest_objs)
+ 	$(CXX) $(LDFLAGS) $(CXXFLAGS) -o $@ $(ztest_objs)
+ 
+ zupdate : $(zupdate_objs)
+-	$(CXX) $(LDFLAGS) $(CXXFLAGS) -o $@ $(zupdate_objs)
++	$(CXX) $(CXXFLAGS) -o $@ $(zupdate_objs)
+ 
+ rc.o : rc.cc
+ 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -DPROGVERSION=\"$(pkgversion)\" -DSYSCONFDIR=\"$(sysconfdir)\" -c -o $@ $<
diff --git a/debian/patches/series b/debian/patches/series
index 202a17f..a353e88 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-0001-build.patch
-0002-zupdate.patch
+debian/0001-build.patch
+debian/0002-zupdate.patch
-- 
cgit v1.2.3