[Git][java-team/libspring-java][master] 6 commits: Update dependency on aspectj to be versioned (>= 1.9.2)

Tony Mancill gitlab at salsa.debian.org
Mon Mar 4 05:26:36 GMT 2019


Tony Mancill pushed to branch master at Debian Java Maintainers / libspring-java


Commits:
b718c3a2 by tony mancill at 2019-03-04T05:03:55Z
Update dependency on aspectj to be versioned (>= 1.9.2)

Thank you to Matthias Klose for the bug report.
Closes: #923554

- - - - -
836f3ff8 by tony mancill at 2019-03-04T05:04:49Z
Update Homepage URL in debian/control to use https

- - - - -
7526c4e5 by tony mancill at 2019-03-04T05:04:49Z
Update Source URL in debian/copyright

- - - - -
f1156a21 by tony mancill at 2019-03-04T05:04:49Z
Freshen debian/copyright year for upstream

- - - - -
5560536f by tony mancill at 2019-03-04T05:20:22Z
Patch build.gradle to helpl make the build reproducible

- - - - -
9afa9c08 by tony mancill at 2019-03-04T05:20:55Z
prepare changelog for upload

- - - - -


6 changed files:

- debian/changelog
- debian/control
- debian/copyright
- + debian/patches/0051-reproducible-build-source-date.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+libspring-java (4.3.22-2) unstable; urgency=medium
+
+  * Team upload.
+  * Update dependency on aspectj to be versioned (>= 1.9.2)
+    Thank you to Matthias Klose for the bug report.  (Closes: #923554)
+  * Update Homepage URL in debian/control to use https
+  * Update Source URL in debian/copyright
+  * Freshen debian/copyright year for upstream
+  * Add a patch to use SOURCE_DATE_EPOCH to compute the copyright year
+    that appears in JAR files META-INF.  This should help with build
+    reproducibility.
+
+ -- tony mancill <tmancill at debian.org>  Sun, 03 Mar 2019 20:35:23 -0800
+
 libspring-java (4.3.22-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -16,7 +16,7 @@ Build-Depends-Indep: bsh,
                      libactivation-java,
                      libapache-poi-java (>= 4.0),
                      libasm-java (>= 5.0),
-                     libaspectj-java,
+                     libaspectj-java (>= 1.9.2),
                      libatinject-jsr330-api-java,
                      libc3p0-java,
                      libcastor-xml-java,
@@ -95,7 +95,7 @@ Build-Depends-Indep: bsh,
 Standards-Version: 4.3.0
 Vcs-Git: https://salsa.debian.org/java-team/libspring-java.git
 Vcs-Browser: https://salsa.debian.org/java-team/libspring-java
-Homepage: http://spring.io/projects/spring-framework
+Homepage: https://spring.io/projects/spring-framework
 
 Package: libspring-core-java
 Architecture: all
@@ -104,7 +104,7 @@ Depends: libactivation-java,
          libcommons-logging-java,
          libjaxb-api-java,
          ${misc:Depends}
-Suggests: libaspectj-java,
+Suggests: libaspectj-java (>= 1.9.2),
           libcommons-collections3-java,
           liblog4j1.2-java
 Description: modular Java/J2EE application framework - Core


=====================================
debian/copyright
=====================================
@@ -1,14 +1,14 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Spring Framework
 Upstream-Contact: SpringSource Inc.
-Source: http://springframework.org/download
+Source: https://github.com/spring-projects/spring-framework/tags
 Files-Excluded: *.jar
                 .settings
                 gradlew*
                 gradle/wrapper/*
 
 Files: *
-Copyright: 2002-2011, the original author or authors
+Copyright: 2002-2019, the original author or authors
            2004, 2005 Acegi Technology Pty Limited
            2009 SpringSource Inc.
 License: Apache-2.0


=====================================
debian/patches/0051-reproducible-build-source-date.patch
=====================================
@@ -0,0 +1,15 @@
+Description: use a reproducible copyright date in the JAR metadata
+Author: tony mancill <tmancill at debian.org>
+Forwarded: not-needed
+
+--- a/build.gradle
++++ b/build.gradle
+@@ -234,7 +234,7 @@
+ 			include "license.txt"
+ 			include "notice.txt"
+ 			into "META-INF"
+-			expand(copyright: new Date().format("yyyy"), version: project.version)
++			expand(copyright: new Date(Long.valueOf(System.getenv("SOURCE_DATE_EPOCH")) * 1000).format("yyyy"), version: project.version)
+ 		}
+ 	}
+ 


=====================================
debian/patches/series
=====================================
@@ -18,3 +18,4 @@
 0048-snakeyaml-compatibility.patch
 0049-java11-compatibility.patch
 0050-apache-poi-compatibility.patch
+0051-reproducible-build-source-date.patch


=====================================
debian/rules
=====================================
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/pkg-info.mk
+export SOURCE_DATE_EPOCH
+
 JAVA_HOME       := /usr/lib/jvm/default-java
 
 MODULES = aop beans context context-support core expression instrument jdbc jms messaging orm oxm test tx web webmvc webmvc-portlet



View it on GitLab: https://salsa.debian.org/java-team/libspring-java/compare/248b5f55a833bd85281aa6e947a4087dc67125d2...9afa9c08a156822eaf8223aae1cb5e278726f249

-- 
View it on GitLab: https://salsa.debian.org/java-team/libspring-java/compare/248b5f55a833bd85281aa6e947a4087dc67125d2...9afa9c08a156822eaf8223aae1cb5e278726f249
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20190304/ccfc1ac2/attachment.html>


More information about the pkg-java-commits mailing list