On Tue, Mar 26, 2019 at 02:46:35PM +0100, Mattia Rizzolo wrote:
> Source: libspring-java
> Version: 4.3.22-2
> Severity: serious
> X-Debbugs-Cc: tony mancill <tmanc...@debian.org>
> Control: block 925390 924635 924634 by -1
> 
> Dear maintainer (and tony, whose upload 4.3.22-2 caused this bug),
> 
> your package libspring-java suddenly stopped building two binaries that
> were actively used by other packages, like activemq.
> 
> What's very worse, the changelog doesn't mention any reason for doing
> so.

Hi Mattia,

Are you sure about the upload of 4.3.22-2 changing the number of binary
packages built?  If that is the case, it was completely unintentional.
I compared the package I uploaded to a clean chroot build of the
previous version *before* I uploaded it on March 3rd:

/data/debian/sponsor/libspring-java/build-area$ ls -al *deb | grep 4.3.22-2 | 
wc -l
17
/data/debian/sponsor/libspring-java/build-area$ ls -al *deb | grep 4.3.22-1 | 
wc -l
17

The full debdiff for that upload is attached.

Regarding the OpenHFT, I tried to help the overall situation by
uploading new versions to experimental several months back but as was
discussed on the list (I'd have to find the link), was requested to
hold-off on transitioning them into unstable.

Thanks,
tony
diff --git a/debian/changelog b/debian/changelog
index a416f6ad..8a133409 100644
--- a/debian/changelog
+++ b/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 <tmanc...@debian.org>  Sun, 03 Mar 2019 20:35:23 -0800
+
 libspring-java (4.3.22-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 838cb945..736eaa53 100644
--- a/debian/control
+++ b/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
diff --git a/debian/copyright b/debian/copyright
index 6b067e29..002ad044 100644
--- a/debian/copyright
+++ b/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
diff --git a/debian/patches/0051-reproducible-build-source-date.patch 
b/debian/patches/0051-reproducible-build-source-date.patch
new file mode 100644
index 00000000..22c413d2
--- /dev/null
+++ b/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 <tmanc...@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)
+               }
+       }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 4bd9f9f5..ec84d3b3 100644
--- a/debian/patches/series
+++ b/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
diff --git a/debian/rules b/debian/rules
index e8f5288c..2dcb259f 100755
--- a/debian/rules
+++ b/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

Attachment: signature.asc
Description: PGP signature

Reply via email to