[SCM] log4shib Debian packaging branch, master, updated. debian/1.0.5-1-3-g22a6d96

[Russ Allbery]

The following commit has been merged in the master branch:
commit 1d2949df0443f682cbe97b2596fcf4d5d3f6765f
Merge: 3dea769cccfc8fc170618b9288fe103e7e156238 7b631881108808f9c206022a8ecb90dee93f684b
Author: Russ Allbery <rra at stanford.edu>
Date:   Thu May 23 19:37:52 2013 -0700

    Merge tag 'upstream/1.0.6'
    
    Upstream version 1.0.6
    
    Conflicts:
    	Makefile.am
    	debian/Makefile.in

diff --combined Makefile.am
index c8f6b5e,5cac51b..ad111a7
--- a/Makefile.am
+++ b/Makefile.am
@@@ -1,12 -1,13 +1,13 @@@
+ AUTOMAKE_OPTIONS = foreign
  ACLOCAL_AMFLAGS = -I m4
  
  if DOC
 -SUBDIRS = debian msvc6 msvc8 msvc9 msvc10 bcb5 config src include tests doc 
 +SUBDIRS = msvc6 msvc8 msvc9 msvc10 bcb5 config src include tests doc 
  else
 -SUBDIRS = debian msvc6 msvc8 msvc9 msvc10 bcb5 config src include tests
 +SUBDIRS = msvc6 msvc8 msvc9 msvc10 bcb5 config src include tests
  endif
  
 -DIST_SUBDIRS = debian msvc6 msvc8 msvc9 msvc10 bcb5 openvms config src include doc tests
 +DIST_SUBDIRS = msvc6 msvc8 msvc9 msvc10 bcb5 openvms config src include doc tests
  
  bin_SCRIPTS = log4shib-config
  
diff --combined configure.ac
index e5ccc42,0309a05..505e287
--- a/configure.ac
+++ b/configure.ac
@@@ -1,9 -1,8 +1,9 @@@
- AC_INIT(log4shib, 1.0.5)
+ AC_INIT(log4shib, 1.0.6)
  
  # 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
@@@ -12,15 -11,15 +12,15 @@@
  #  ? :+1 : ?   == just some internal changes, nothing breaks but might work 
  #                 better
  # CURRENT : REVISION : AGE
- LT_VERSION=1:5:0
+ LT_VERSION=1:6:0
  
  AC_SUBST(LT_VERSION)
  
  #AC_CONFIG_SRCDIR(configure.in)
  AC_CONFIG_AUX_DIR(config)
- AM_CONFIG_HEADER(include/config.h)
+ AC_CONFIG_HEADERS([include/config.h])
  AX_PREFIX_CONFIG_H([include/log4shib/config.h])
- 
+ AC_CONFIG_MACRO_DIR(m4)
  AM_INIT_AUTOMAKE
  
  # General "with" options
@@@ -146,6 -145,7 +146,6 @@@ include/Makefil
  include/log4shib/Makefile
  include/log4shib/threading/Makefile
  tests/Makefile
 -debian/Makefile
  msvc6/Makefile
  msvc6/log4shib/Makefile
  msvc6/log4shibDLL/Makefile

-- 
log4shib Debian packaging