Emmanuel Bourg pushed to branch master at Debian Java Maintainers / libspi-java


Commits:
5a194d05 by Emmanuel Bourg at 2019-09-13T08:42:48Z
Standards-Version updated to 4.4.0

- - - - -
d64141e1 by Emmanuel Bourg at 2019-09-13T08:42:59Z
Switch to debhelper level 11

- - - - -
be388f2a by Emmanuel Bourg at 2019-09-13T08:43:20Z
Use salsa.debian.org Vcs-* URLs

- - - - -
20d8bd0a by Emmanuel Bourg at 2019-09-13T08:47:38Z
Build with the DH sequencer instead of CDBS

- - - - -
d9f8fa14 by Emmanuel Bourg at 2019-09-13T09:00:30Z
Always use the UTC timezone for the timestamp in the META-INF/services/* files

- - - - -
a7f64400 by Emmanuel Bourg at 2019-09-13T09:03:01Z
Changed the priority from extra to optional

- - - - -
256ac888 by Emmanuel Bourg at 2019-09-13T09:04:57Z
Updated debian/copyright

- - - - -
4549b6c6 by Emmanuel Bourg at 2019-09-13T09:05:38Z
Upload to unstable

- - - - -


7 changed files:

- debian/changelog
- + debian/clean
- debian/compat
- debian/control
- debian/copyright
- debian/patches/source-date-epoch.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+libspi-java (0.2.4-3) unstable; urgency=medium
+
+  * Team upload.
+  * The timestamp in the META-INF/services/* files now use a fixed timezone
+  * Build with the DH sequencer instead of CDBS
+  * Standards-Version updated to 4.4.0
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+  * Changed the priority from extra to optional
+
+ -- Emmanuel Bourg <[email protected]>  Fri, 13 Sep 2019 11:05:31 +0200
+
 libspi-java (0.2.4-2) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/clean
=====================================
@@ -0,0 +1 @@
+spi.jar


=====================================
debian/compat
=====================================
@@ -1 +1 @@
-10
+11


=====================================
debian/control
=====================================
@@ -1,14 +1,14 @@
 Source: libspi-java
 Section: java
-Priority: extra
+Priority: optional
 Maintainer: Debian Java Maintainers 
<[email protected]>
 Uploaders: Jakub Adam <[email protected]>,
  tony mancill <[email protected]>
-Build-Depends: debhelper (>= 10), cdbs, default-jdk, javahelper
-Standards-Version: 3.9.8
+Build-Depends: debhelper (>= 11), default-jdk, javahelper
+Standards-Version: 4.4.0
+Vcs-Git: https://salsa.debian.org/java-team/libspi-java.git
+Vcs-Browser: https://salsa.debian.org/java-team/libspi-java
 Homepage: https://github.com/rspilker/spi
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/libspi-java.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libspi-java.git
 
 Package: libspi-java
 Architecture: all


=====================================
debian/copyright
=====================================
@@ -1,13 +1,14 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-
-Files: debian/*
-Copyright: 2012, Debian Java Maintainers 
<[email protected]>
-License: Apache-2.0
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: https://github.com/rspilker/spi
 
 Files: *
 Copyright: 2008, TOPdesk, the Netherlands
 License: Apache-2.0
 
+Files: debian/*
+Copyright: 2012-2019, Debian Java Maintainers 
<[email protected]>
+License: Apache-2.0
+
 License: Apache-2.0
  On a Debian system, for full text of Apache 2.0 license agreement see
  /usr/share/common-licenses/Apache-2.0.


=====================================
debian/patches/source-date-epoch.patch
=====================================
@@ -5,16 +5,19 @@ Last-Update: 2017-08-13
 
 --- a/src/org/mangosdk/spi/processor/Persistence.java
 +++ b/src/org/mangosdk/spi/processor/Persistence.java
-@@ -132,7 +132,7 @@
+@@ -131,8 +131,10 @@
+               FileObject output = 
filer.createResource(StandardLocation.CLASS_OUTPUT, "", path + serviceName);
                Writer writer = output.openWriter();
                try {
++                      SimpleDateFormat fmt = new SimpleDateFormat("EEE, d MMM 
yyyy HH:mm:ss Z", Locale.US);
++                      fmt.setTimeZone(java.util.TimeZone.getTimeZone("UTC"));
                        writer.write("# Generated by " + name + "\n");
 -                      writer.write("# " + new SimpleDateFormat("EEE, d MMM 
yyyy HH:mm:ss Z", Locale.US).format(new Date()) + "\n");
-+                      writer.write("# " + new SimpleDateFormat("EEE, d MMM 
yyyy HH:mm:ss Z", Locale.US).format(getBuildDate()) + "\n");
++                      writer.write("# " + fmt.format(getBuildDate()) + "\n");
                        writer.write(value);
                }
                finally {
-@@ -144,4 +144,17 @@
+@@ -144,4 +146,17 @@
                        }
                }
        }


=====================================
debian/rules
=====================================
@@ -1,10 +1,8 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/class/javahelper.mk
+%:
+       dh $@ --with javahelper
 
-JAVA_HOME := /usr/lib/jvm/default-java
-JH_BUILD_JAR := spi.jar
-JH_BUILD_SRC := src
-
-common-post-build-indep::
+override_dh_auto_build:
+       jh_build spi.jar src
        cd src && jar uf ../spi.jar META-INF



View it on GitLab: 
https://salsa.debian.org/java-team/libspi-java/compare/c54f29c7d4044534fd627b6c8a4d05f8bcc73889...4549b6c6f42a42a2adf5c5b53e9e8ebf5ed83fb4

-- 
View it on GitLab: 
https://salsa.debian.org/java-team/libspi-java/compare/c54f29c7d4044534fd627b6c8a4d05f8bcc73889...4549b6c6f42a42a2adf5c5b53e9e8ebf5ed83fb4
You're receiving this email because of your account on salsa.debian.org.


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

Reply via email to