Subject: Collected Debian patches for log4shib
Author: Russ Allbery <rra@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.
--- log4shib-1.0.4.orig/Makefile.am
+++ log4shib-1.0.4/Makefile.am
@@ -1,10 +1,12 @@
+ACLOCAL_AMFLAGS = -I m4
+
 if DOC
-SUBDIRS = debian msvc6 msvc8 msvc9 bcb5 config src include tests doc 
+SUBDIRS = msvc6 msvc8 msvc9 bcb5 config src include tests doc 
 else
-SUBDIRS = debian msvc6 msvc8 msvc9 bcb5 config src include tests
+SUBDIRS = msvc6 msvc8 msvc9 bcb5 config src include tests
 endif
 
-DIST_SUBDIRS = debian msvc6 msvc8 msvc9 bcb5 openvms config src include doc tests
+DIST_SUBDIRS = msvc6 msvc8 msvc9 bcb5 openvms config src include doc tests
 
 bin_SCRIPTS = log4shib-config
 
@@ -66,4 +68,4 @@ docs:
 
 doc-dist: docs
 	tar -zcf $(PACKAGE)-docs-$(VERSION).tar.gz -C $(top_srcdir)/doc/html --exclude CVS --exclude .svn .
- 
\ No newline at end of file
+ 
--- log4shib-1.0.4.orig/configure.in
+++ log4shib-1.0.4/configure.in
@@ -3,6 +3,7 @@ AC_INIT(log4shib, 1.0.4)
 # autoconf 2.50 or higher to rebuild aclocal.m4, because the
 # AC_CREATE_PREFIX_CONFIG_H macro needs the AS_DIRNAME macro.
 AC_PREREQ(2.50)
+AC_CONFIG_MACRO_DIR([m4])
 
 #
 # +1 : ? : +1  == new interface that does not break old one
@@ -135,7 +136,6 @@ include/Makefile
 include/log4shib/Makefile
 include/log4shib/threading/Makefile
 tests/Makefile
-debian/Makefile
 msvc6/Makefile
 msvc6/log4shib/Makefile
 msvc6/log4shibDLL/Makefile
