Tony Mancill pushed to branch master at Debian Java Maintainers / ant
Commits:
520cd784 by tony mancill at 2022-07-10T16:38:19-07:00
Add patch to set compiled on date to changelog date.
- - - - -
b15414ef by tony mancill at 2022-07-10T16:54:32-07:00
Ship the ant-junitlauncher jar in ant-optional (Closes: #967933)
- - - - -
6301b2b9 by tony mancill at 2022-07-10T16:54:32-07:00
Freshen years in debian/copyright
- - - - -
e30a0d1b by tony mancill at 2022-07-10T17:00:54-07:00
Bump Standards-Version to 4.6.1
- - - - -
ba1e1404 by tony mancill at 2022-07-10T17:00:55-07:00
Set Rules-Requires-Root: no in debian/control
- - - - -
b47e714c by tony mancill at 2022-07-10T17:00:55-07:00
Prepare changelog for upload to unstable
- - - - -
7 changed files:
- debian/ant-optional.poms
- debian/changelog
- debian/control
- debian/copyright
- + debian/patches/0019-build-date.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/ant-optional.poms
=====================================
@@ -14,6 +14,7 @@ src/etc/poms/ant-jmf/pom.xml
src/etc/poms/ant-jsch/pom.xml
src/etc/poms/ant-junit/pom.xml
src/etc/poms/ant-junit4/pom.xml
+src/etc/poms/ant-junitlauncher/pom.xml
src/etc/poms/ant-swing/pom.xml
src/etc/poms/ant-testutil/pom.xml
src/etc/poms/ant-xz/pom.xml
=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+ant (1.10.12-2) unstable; urgency=medium
+
+ * Team upload.
+ * Add patch to set "compiled on" to changelog date. (Closes: #1014635)
+ * Ship the ant-junitlauncher jar in ant-optional (Closes: #967933)
+ * Bump Standards-Version to 4.6.1
+ * Set Rules-Requires-Root: no in debian/control
+
+ -- tony mancill <tmanc...@debian.org> Sun, 10 Jul 2022 17:00:19 -0700
+
ant (1.10.12-1) unstable; urgency=medium
* New upstream release
=====================================
debian/control
=====================================
@@ -25,10 +25,11 @@ Build-Depends: antlr,
libxml-commons-resolver1.1-java (>= 1.2-7~),
libxz-java,
maven-repo-helper (>> 1.0)
-Standards-Version: 4.6.0.1
+Standards-Version: 4.6.1
Vcs-Git: https://salsa.debian.org/java-team/ant.git
Vcs-Browser: https://salsa.debian.org/java-team/ant
Homepage: http://ant.apache.org
+Rules-Requires-Root: no
Package: ant
Architecture: all
=====================================
debian/copyright
=====================================
@@ -4,7 +4,7 @@ Source: http://ant.apache.org
Files-Excluded: *.jar
Files: *
-Copyright: 2000-2018, The Apache Software Foundation
+Copyright: 2000-2021, The Apache Software Foundation
License: Apache-2.0
Files: debian/*
@@ -17,7 +17,8 @@ Copyright: 2000-2004, Stefan Gybas <sgy...@debian.org>
2010-2011, Niels Thykier <ni...@thykier.net>
2011, Miguel Landaeta <mig...@miguel.cc>
2011-2013, James Page <james.p...@ubuntu.com>
- 2013-2018, Emmanuel Bourg <ebo...@apache.org>
+ 2013-2022, Emmanuel Bourg <ebo...@apache.org>
+ 2013-2022, tony mancill <tmanc...@debian.org>
2017, Chris West <deb...@fau.xxx>
License: Apache-2.0
=====================================
debian/patches/0019-build-date.patch
=====================================
@@ -0,0 +1,13 @@
+Description: set (compilation) DATE to the property BUILD_DATE
+ DATE is used to set the "compiled on" value for `ant -version`.
+ A separate property avoids overlap with other uses of the TODAY property.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1014635
+Forwarded: not-needed
+Author: tony mancill <tmanc...@debian.org>
+
+--- a/src/main/org/apache/tools/ant/version.txt
++++ b/src/main/org/apache/tools/ant/version.txt
+@@ -1,2 +1,2 @@
+ VERSION=${project.version}
+-DATE=${TODAY}
++DATE=${BUILD_DATE}
=====================================
debian/patches/series
=====================================
@@ -5,3 +5,4 @@
0015-javadoc-ignore-source-errors.patch
0017-usrmerge-proof.patch
0018-disable-doclint.patch
+0019-build-date.patch
=====================================
debian/rules
=====================================
@@ -1,6 +1,9 @@
#!/usr/bin/make -f
+include /usr/share/dpkg/pkg-info.mk
+
DEPENDENCIES := antlr bcel bsf commons-logging javax.activation javax.mail
jdepend junit junit4 hamcrest-all log4j-1.2 oro regexp xalan2 serializer
xml-resolver-1.2 commons-net jsch xz
+BUILD_DATE := $(shell date --date='@$(SOURCE_DATE_EPOCH)' --utc +'%B %-d %Y')
%:
dh $@ --with maven-repo-helper
@@ -14,7 +17,7 @@ override_dh_auto_configure:
JAVA_HOME=/usr/lib/jvm/default-java ./bootstrap.sh
# Normal build
- bootstrap/bin/ant -propertyfile debian/ant.properties jars test-jar
+ bootstrap/bin/ant -propertyfile debian/ant.properties
-DBUILD_DATE='${BUILD_DATE}' jars test-jar
override_dh_auto_build-arch:
override_dh_auto_build-indep:
@@ -31,7 +34,7 @@ override_mh_install:
mh_installpoms -pant-optional
for MODULE in antlr apache-bcel apache-bsf apache-log4j apache-oro
apache-regexp apache-resolver apache-xalan2 \
- commons-logging commons-net javamail jdepend jmf jsch
junit junit4 swing testutil xz; do \
+ commons-logging commons-net javamail jdepend jmf jsch
junit junit4 junitlauncher swing testutil xz; do \
mh_installjar -pant-optional -l src/etc/poms/ant-$$MODULE/pom.xml
build/lib/ant-$$MODULE.jar /usr/share/ant/lib/ant-$$MODULE.jar; \
done
View it on GitLab:
https://salsa.debian.org/java-team/ant/-/compare/e07fe5315e22fc3cbb4f1f6958a83459dd1383a6...b47e714c064b36341ba0997afe9a7d240d6e80be
--
View it on GitLab:
https://salsa.debian.org/java-team/ant/-/compare/e07fe5315e22fc3cbb4f1f6958a83459dd1383a6...b47e714c064b36341ba0997afe9a7d240d6e80be
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
