[cpp-log4shib] 06/20: Convert our single upstream patch into a gbp patch queue

[Scott Cantor]

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

scantor pushed a commit to annotated tag debian/1.0.9-1
in repository cpp-log4shib.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-log4shib.git;a=commit;h=70e40e71b463508622020ef376ea135b910141e0

commit 70e40e71b463508622020ef376ea135b910141e0
Author: Ferenc Wágner <wferi at niif.hu>
AuthorDate: Thu Jan 14 14:10:26 2016 +0100

    Convert our single upstream patch into a gbp patch queue
---
 configure.ac                                       |  1 +
 ...ream-debian-directory-from-the-build-syst.patch | 37 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/source/local-options                        |  1 -
 debian/source/local-patch-header                   |  9 ------
 5 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1b873c0..ca7521d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -168,6 +168,7 @@ include/Makefile
 include/log4shib/Makefile
 include/log4shib/threading/Makefile
 tests/Makefile
+debian/Makefile
 msvc6/Makefile
 msvc6/log4shib/Makefile
 msvc6/log4shibDLL/Makefile
diff --git a/debian/patches/Detach-upstream-debian-directory-from-the-build-syst.patch b/debian/patches/Detach-upstream-debian-directory-from-the-build-syst.patch
new file mode 100644
index 0000000..74f8bb2
--- /dev/null
+++ b/debian/patches/Detach-upstream-debian-directory-from-the-build-syst.patch
@@ -0,0 +1,37 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
+Date: Thu, 14 Jan 2016 14:15:50 +0100
+Subject: Detach upstream debian directory from the build system
+
+---
+ Makefile.am  |    4 ++--
+ configure.ac |    1 -
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index c17f815..818159c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,9 +2,9 @@ AUTOMAKE_OPTIONS = foreign
+ ACLOCAL_AMFLAGS = -I m4
+ 
+ if DOC
+-SUBDIRS = debian msvc6 msvc8 msvc9 msvc10 config src include tests doc 
++SUBDIRS = msvc6 msvc8 msvc9 msvc10 config src include tests doc 
+ else
+-SUBDIRS = debian msvc6 msvc8 msvc9 msvc10 config src include tests
++SUBDIRS = msvc6 msvc8 msvc9 msvc10 config src include tests
+ endif
+ 
+ DIST_SUBDIRS = debian msvc6 msvc8 msvc9 msvc10 openvms config src include doc tests
+diff --git a/configure.ac b/configure.ac
+index ca7521d..1b873c0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -168,7 +168,6 @@ include/Makefile
+ include/log4shib/Makefile
+ include/log4shib/threading/Makefile
+ tests/Makefile
+-debian/Makefile
+ msvc6/Makefile
+ msvc6/log4shib/Makefile
+ msvc6/log4shibDLL/Makefile
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..58657aa
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Detach-upstream-debian-directory-from-the-build-syst.patch
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 7423a2d..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-single-debian-patch
diff --git a/debian/source/local-patch-header b/debian/source/local-patch-header
deleted file mode 100644
index 2b153f6..0000000
--- a/debian/source/local-patch-header
+++ /dev/null
@@ -1,9 +0,0 @@
-Subject: Collected Debian patches for log4shib
-Author: Russ Allbery <rra at debian.org>
-
-The packaging for log4shib is maintained in Git using multiple branches
-for fixes, which makes it complex to separate the changes into individual
-patches.  They are therefore all included in a single Debian patch.
-
-For full commit history and separated commits, see the packaging Git
-repository.

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.