[ant] 07/17: Indentation in debian/rules

[Emmanuel Bourg]

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

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

commit f996193f201748149b8c19c76177c1f4916708b7
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jan 12 11:23:50 2017 +0100

    Indentation in debian/rules
---
 debian/rules | 49 +++++++++++++++++++++----------------------------
 1 file changed, 21 insertions(+), 28 deletions(-)

diff --git a/debian/rules b/debian/rules
index f48053a..d52fa17 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,11 +6,8 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 # hardening
-CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
-export AOT_GCJFLAGS=$(CFLAGS)
-export AOT_LDFLAGS=$(LDFLAGS)
-
+export AOT_GCJFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+export AOT_LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 
 include /usr/share/gcj/debian_defaults
 ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
@@ -58,11 +55,11 @@ install/ant-doc:: build-ant-doc
 install/ant:: build-ant
 	dh_install -pant
 	mh_installpoms -pant -e$(VERSION)
-	mh_installjar -pant -l -e$(VERSION) src/etc/poms/ant/pom.xml build/lib/ant.jar /usr/share/ant/lib/ant.jar
+	mh_installjar -pant -l -e$(VERSION) src/etc/poms/ant/pom.xml          build/lib/ant.jar          /usr/share/ant/lib/ant.jar
 	mh_installjar -pant -l -e$(VERSION) src/etc/poms/ant-launcher/pom.xml build/lib/ant-launcher.jar /usr/share/ant/lib/ant-launcher.jar
 	dh_install -pant build/lib/ant-bootstrap.jar /usr/share/ant/etc/
-	# Installing these files does not work with dh_install because of
-	# the file permissions
+
+	# Installing these files does not work with dh_install because of the file permissions
 	mkdir -p debian/ant/usr/share/ant/bin
 	install -m 755 src/script/ant     debian/ant/usr/share/ant/bin
 	install -m 755 src/script/antRun  debian/ant/usr/share/ant/bin
@@ -70,28 +67,24 @@ install/ant:: build-ant
 
 install/ant-optional:: build-ant
 	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
-	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-apache-bsf/pom.xml build/lib/ant-apache-bsf.jar /usr/share/ant/lib/ant-apache-bsf.jar
-	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-apache-log4j/pom.xml build/lib/ant-apache-log4j.jar /usr/share/ant/lib/ant-apache-log4j.jar
-	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-apache-oro/pom.xml build/lib/ant-apache-oro.jar /usr/share/ant/lib/ant-apache-oro.jar
-	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-apache-regexp/pom.xml build/lib/ant-apache-regexp.jar /usr/share/ant/lib/ant-apache-regexp.jar
+	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
+	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-apache-bsf/pom.xml      build/lib/ant-apache-bsf.jar      /usr/share/ant/lib/ant-apache-bsf.jar
+	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-apache-log4j/pom.xml    build/lib/ant-apache-log4j.jar    /usr/share/ant/lib/ant-apache-log4j.jar
+	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-apache-oro/pom.xml      build/lib/ant-apache-oro.jar      /usr/share/ant/lib/ant-apache-oro.jar
+	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-apache-regexp/pom.xml   build/lib/ant-apache-regexp.jar   /usr/share/ant/lib/ant-apache-regexp.jar
 	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-apache-resolver/pom.xml build/lib/ant-apache-resolver.jar /usr/share/ant/lib/ant-apache-resolver.jar
-	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-apache-xalan2/pom.xml build/lib/ant-apache-xalan2.jar /usr/share/ant/lib/ant-apache-xalan2.jar
+	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-apache-xalan2/pom.xml   build/lib/ant-apache-xalan2.jar   /usr/share/ant/lib/ant-apache-xalan2.jar
 	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-commons-logging/pom.xml build/lib/ant-commons-logging.jar /usr/share/ant/lib/ant-commons-logging.jar
-	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-commons-net/pom.xml build/lib/ant-commons-net.jar /usr/share/ant/lib/ant-commons-net.jar
-	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-javamail/pom.xml build/lib/ant-javamail.jar /usr/share/ant/lib/ant-javamail.jar
-	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-jdepend/pom.xml build/lib/ant-jdepend.jar /usr/share/ant/lib/ant-jdepend.jar
-	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-jmf/pom.xml build/lib/ant-jmf.jar /usr/share/ant/lib/ant-jmf.jar
-	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-jsch/pom.xml build/lib/ant-jsch.jar /usr/share/ant/lib/ant-jsch.jar
-	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-junit/pom.xml build/lib/ant-junit.jar /usr/share/ant/lib/ant-junit.jar
-	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-swing/pom.xml build/lib/ant-swing.jar /usr/share/ant/lib/ant-swing.jar
-	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-testutil/pom.xml build/lib/ant-testutil.jar /usr/share/ant/lib/ant-testutil.jar
-	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-junit4/pom.xml build/lib/ant-junit4.jar /usr/share/ant/lib/ant-junit4.jar
-	#mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-jai/pom.xml ant-jai/build/ant-jai-$(VERSION).jar
-	#mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-netrexx/pom.xml ant-netrexx/build/ant-netrexx-$(VERSION).jar
-	#mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-starteam/pom.xml ant-starteam/build/ant-starteam-$(VERSION).jar
-	#mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-weblogic/pom.xml ant-weblogic/build/ant-weblogic-$(VERSION).jar
+	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-commons-net/pom.xml     build/lib/ant-commons-net.jar     /usr/share/ant/lib/ant-commons-net.jar
+	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-javamail/pom.xml        build/lib/ant-javamail.jar        /usr/share/ant/lib/ant-javamail.jar
+	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-jdepend/pom.xml         build/lib/ant-jdepend.jar         /usr/share/ant/lib/ant-jdepend.jar
+	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-jmf/pom.xml             build/lib/ant-jmf.jar             /usr/share/ant/lib/ant-jmf.jar
+	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-jsch/pom.xml            build/lib/ant-jsch.jar            /usr/share/ant/lib/ant-jsch.jar
+	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-junit/pom.xml           build/lib/ant-junit.jar           /usr/share/ant/lib/ant-junit.jar
+	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-swing/pom.xml           build/lib/ant-swing.jar           /usr/share/ant/lib/ant-swing.jar
+	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-testutil/pom.xml        build/lib/ant-testutil.jar        /usr/share/ant/lib/ant-testutil.jar
+	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-junit4/pom.xml          build/lib/ant-junit4.jar          /usr/share/ant/lib/ant-junit4.jar
 
 ifeq ($(with_gcj_native),yes)
 install/ant-gcj:: install/ant

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