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

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

commit 8606704aa66cb27c925cb5e13e65808b0b0b4914
Author: Emmanuel Bourg <[email protected]>
Date:   Tue Aug 4 16:38:02 2015 +0200

    Restored the XSL files in /usr/share/ant/etc (LP: #563899)
---
 debian/ant-optional.install | 13 +++++++++++++
 debian/changelog            |  7 +++++++
 debian/rules                |  2 --
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/debian/ant-optional.install b/debian/ant-optional.install
new file mode 100644
index 0000000..5eb88de
--- /dev/null
+++ b/debian/ant-optional.install
@@ -0,0 +1,13 @@
+src/etc/ant-update.xsl                 /usr/share/ant/etc/
+src/etc/changelog.xsl                  /usr/share/ant/etc/
+src/etc/coverage-frames.xsl            /usr/share/ant/etc/
+src/etc/jdepend-frames.xsl             /usr/share/ant/etc/
+src/etc/jdepend.xsl                    /usr/share/ant/etc/
+src/etc/junit-frames-xalan1.xsl                /usr/share/ant/etc/
+src/etc/junit-frames.xsl               /usr/share/ant/etc/
+src/etc/junit-noframes.xsl             /usr/share/ant/etc/
+src/etc/log.xsl                                /usr/share/ant/etc/
+src/etc/maudit-frames.xsl              /usr/share/ant/etc/
+src/etc/mmetrics-frames.xsl            /usr/share/ant/etc/
+src/etc/tagdiff.xsl                    /usr/share/ant/etc/
+src/etc/checkstyle/*.xsl               /usr/share/ant/etc/checkstyle/
diff --git a/debian/changelog b/debian/changelog
index 717b295..84589f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ant (1.9.6-2) UNRELEASED; urgency=medium
+
+  * Restored the XSL files in /usr/share/ant/etc which were removed
+    in the version 1.7.1-1 (LP: #563899)
+
+ -- Emmanuel Bourg <[email protected]>  Tue, 04 Aug 2015 16:09:22 +0200
+
 ant (1.9.6-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/rules b/debian/rules
index f188803..e3a5db4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,8 +65,6 @@ install/ant:: build-ant
        install -m 755 src/script/*.pl    debian/ant/usr/share/ant/bin
 
 install/ant-optional:: build-ant
-       dh_install -pant-optional src/etc/ant-update.xsl /usr/share/ant/etc/
-       dh_install -pant-optional src/etc/checkstyle     /usr/share/ant/etc/
        mh_installpoms -pant-optional -e$(VERSION)
        mh_installjar -pant-optional -l -e$(VERSION) 
src/etc/poms/ant-antlr/pom.xml build/lib/ant-antlr.jar 
/usr/share/ant/lib/ant-antlr.jar
        mh_installjar -pant-optional -l -e$(VERSION) 
src/etc/poms/ant-apache-bcel/pom.xml build/lib/ant-apache-bcel.jar 
/usr/share/ant/lib/ant-apache-bcel.jar

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

_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to