[maven] 14/16: Install the new logging directory in the conf directory

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository maven.

commit da88f6d420196080c01d4d00adc9336fca60c557
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jul 7 00:28:33 2015 +0200

    Install the new logging directory in the conf directory
---
 debian/changelog     | 1 +
 debian/maven.install | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c33fe51..926601a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ maven (3.1.1-1) UNRELEASED; urgency=medium
     - New build dependencies on liblogback-java and libmockito-java
     - No longer add the plexus-container-default dependency
       to maven-model-builder
+    - Install the new logging directory in the conf directory
   * Moved the libraries to a separate libmaven3-core-java package
   * Removed the unused dependencies on commons-codec, commons-httpclient
     and commons-logging
diff --git a/debian/maven.install b/debian/maven.install
index e12f225..587f304 100644
--- a/debian/maven.install
+++ b/debian/maven.install
@@ -1,7 +1,8 @@
 apache-maven/src/bin/m2.conf /etc/maven
 apache-maven/src/bin/mvn /usr/share/maven/bin/
 apache-maven/src/bin/mvnDebug /usr/share/maven/bin/
-apache-maven/src/conf/settings.xml /etc/maven
+apache-maven/src/conf/* /etc/maven
+
 debian/bash_completion.d/maven /etc/bash_completion.d
 debian/mvn.1 usr/share/maven/man/
 debian/mvnDebug.1 usr/share/maven/man/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven.git