[Git][java-team/libjbcrypt-java][master] 15 commits: Acknowledging source-only NMU
Pierre Gruet (@pgt)
gitlab at salsa.debian.org
Sun Dec 26 21:05:29 GMT 2021
Pierre Gruet pushed to branch master at Debian Java Maintainers / libjbcrypt-java
Commits:
f3baa3b1 by Pierre Gruet at 2021-12-26T14:41:41+01:00
Acknowledging source-only NMU
- - - - -
134d3847 by Pierre Gruet at 2021-12-26T14:43:09+01:00
Vcs-* fields now point to Salsa
- - - - -
6cb206da by Pierre Gruet at 2021-12-26T15:02:17+01:00
Using version 4 of d/watch
- - - - -
12995b65 by Pierre Gruet at 2021-12-26T15:02:48+01:00
Depending on debhelper-compat 13
- - - - -
eaa403da by Pierre Gruet at 2021-12-26T15:05:11+01:00
Removing now useless versioned dependencies
- - - - -
c0652608 by Pierre Gruet at 2021-12-26T15:10:14+01:00
Refreshing d/copyright, using 1.0 copyright format
- - - - -
df7aadbe by Pierre Gruet at 2021-12-26T15:16:45+01:00
Setting Rules-Requires-Root: no
- - - - -
efe5d8dd by Pierre Gruet at 2021-12-26T15:17:31+01:00
Raising Standards version to 4.6.0
- - - - -
b9f62a51 by Pierre Gruet at 2021-12-26T15:19:02+01:00
Updating changelog
- - - - -
f03a641e by Pierre Gruet at 2021-12-26T15:19:17+01:00
Trim trailing whitespace.
Changes-By: lintian-brush
Fixes: lintian: trailing-whitespace
See-also: https://lintian.debian.org/tags/trailing-whitespace.html
- - - - -
9b707c68 by Pierre Gruet at 2021-12-26T15:19:20+01:00
Use secure URI in Homepage field.
Changes-By: lintian-brush
Fixes: lintian: homepage-field-uses-insecure-uri
See-also: https://lintian.debian.org/tags/homepage-field-uses-insecure-uri.html
- - - - -
8f8218e3 by Pierre Gruet at 2021-12-26T15:27:00+01:00
Using secured URI in d/copyright and in d/watch
- - - - -
d2658964 by Pierre Gruet at 2021-12-26T15:34:28+01:00
Marking the binary package as Multi-Arch: foreign
- - - - -
a7f452a0 by Pierre Gruet at 2021-12-26T21:42:27+01:00
Running the tests at build time
- - - - -
ccb60c7f by Pierre Gruet at 2021-12-26T22:05:11+01:00
Upload to unstable
- - - - -
9 changed files:
- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- + debian/patches/series
- + debian/patches/test.patch
- debian/pom.xml
- debian/rules
- debian/watch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,27 @@
+libjbcrypt-java (0.4-3) unstable; urgency=medium
+
+ * Team upload
+ * Vcs-* fields now point to Salsa
+ * Using version 4 of d/watch
+ * Depending on debhelper-compat 13
+ * Raising Standards version to 4.6.0:
+ - Rules-Requires-Root: no
+ - Using 1.0 copyright-format in d/copyright
+ * Removing now useless versioned dependencies
+ * Trim trailing whitespace.
+ * Use secure URI in Homepage field, in d/copyright and in d/watch
+ * Marking the binary package as Multi-Arch: foreign
+ * Running the tests at build time
+
+ -- Pierre Gruet <pgt at debian.org> Sun, 26 Dec 2021 21:42:38 +0100
+
+libjbcrypt-java (0.4-2.1) unstable; urgency=medium
+
+ * Non maintainer upload by the Reproducible Builds team.
+ * No source change upload to rebuild on buildd with .buildinfo files.
+
+ -- Holger Levsen <holger at debian.org> Tue, 05 Jan 2021 00:58:05 +0100
+
libjbcrypt-java (0.4-2) unstable; urgency=medium
* Team upload.
@@ -22,7 +46,7 @@ libjbcrypt-java (0.4-1) experimental; urgency=medium
libjbcrypt-java (0.3-4) unstable; urgency=low
* Team upload.
- * Upload to unstable.
+ * Upload to unstable.
-- James Page <james.page at ubuntu.com> Mon, 01 Jul 2013 09:08:45 +0100
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-9
=====================================
debian/control
=====================================
@@ -4,19 +4,23 @@ Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Per Andersson <avtobiff at gmail.com>
Build-Depends:
- debhelper (>= 9),
+ debhelper-compat (= 13),
default-jdk,
ant,
- javahelper (>= 0.30),
- maven-repo-helper (>= 1.5~)
-Standards-Version: 3.9.6
-Vcs-Git: git://anonscm.debian.org/pkg-java/libjbcrypt-java.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libjbcrypt-java.git
-Homepage: http://www.mindrot.org/projects/jBCrypt/
+ ant-optional <!nocheck>,
+ javahelper,
+ junit4 <!nocheck>,
+ maven-repo-helper
+Standards-Version: 4.6.0
+Vcs-Git: https://salsa.debian.org/java-team/libjbcrypt-java.git
+Vcs-Browser: https://salsa.debian.org/java-team/libjbcrypt-java
+Homepage: https://www.mindrot.org/projects/jBCrypt/
+Rules-Requires-Root: no
Package: libjbcrypt-java
Architecture: all
Depends: ${java:Depends}, ${misc:Depends}
+Multi-Arch: foreign
Description: Java implementation of OpenBSD's Blowfish hashing
jBCrypt is an implementation of Blowfish block cipher with modifications
designed to raise the cost of off-line password cracking and frustrate fast
=====================================
debian/copyright
=====================================
@@ -1,23 +1,30 @@
-This package was Debianised by Per Andersson <avtobiff at gmail.com> on Mon Apr 19 23:57:22 CEST 2010
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: jBCrypt
+Upstream-Contact: Damien Miller <djm at mindrot.org>
+Source: https://www.mindrot.org/projects/jBCrypt/
-This package was downloaded from http://www.mindrot.org/projects/jBCrypt/.
+Files: *
+Copyright: 2006, Damien Miller <djm at mindrot.org>
+License: ISC
-Upstream Author: Damien Miller
+Files: debian/*
+Copyright: 2010 Per Andersson <avtobiff at gmail.com>
+ 2021 Pierre Gruet <pgt at debian.org>
+License: GPL-3
-Copyright © 2006 Damien Miller <djm at mindrot.org>
+License: ISC
+ Permission to use, copy, modify, and distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-Permission to use, copy, modify, and distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-The packaging is Copyright 2010 Per Andersson <avtobiff at gmail.com> and is
-licenced under the terms of the GPLv3licence. On Debian systems the GLPv3
-licence can be found in /usr/share/common-licenses/GPL.
+License: GPL-3
+ On Debian systems the full text of the GPL-3 can be found in
+ /usr/share/common-licenses/GPL-3
=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+test.patch
=====================================
debian/patches/test.patch
=====================================
@@ -0,0 +1,32 @@
+Description: adding missing junit4.jar in the classpath for the tests
+Author: Pierre Gruet <pgt at debian.org>
+Forwarded: not-needed
+Last-Update: 2021-12-26
+
+--- a/build.xml
++++ b/build.xml
+@@ -17,13 +17,14 @@
+ </target>
+
+ <target name="build" depends="init">
+- <javac target="1.6" srcdir="${src}" destdir="${build}"/>
++ <javac includeantruntime="false" target="1.6" srcdir="${src}" destdir="${build}"/>
+ </target>
+
+ <target name="build-tests" depends="init, build">
+- <javac target="1.6" srcdir="${test-src}" destdir="${test-build}">
++ <javac includeantruntime="false" target="1.6" srcdir="${test-src}" destdir="${test-build}">
+ <classpath>
+ <pathelement path="${build}"/>
++ <pathelement path="/usr/share/java/junit4.jar"/>
+ </classpath>
+ </javac>
+ </target>
+@@ -33,6 +34,7 @@
+ <classpath>
+ <pathelement path="${build}"/>
+ <pathelement path="${test-build}"/>
++ <pathelement path="/usr/share/java/junit4.jar"/>
+ </classpath>
+
+ <test name="org.mindrot.jbcrypt.TestBCrypt"/>
=====================================
debian/pom.xml
=====================================
@@ -112,7 +112,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
+ <version>4.x</version>
<scope>test</scope>
</dependency>
</dependencies>
=====================================
debian/rules
=====================================
@@ -8,3 +8,8 @@ export JAVA_HOME=/usr/lib/jvm/default-java
override_dh_auto_clean:
dh_auto_clean
rm -f *.jar
+
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ ant -Duser.name debian test
+endif
=====================================
debian/watch
=====================================
@@ -1,2 +1,2 @@
-version=3
-http://mindrot.org/files/jBCrypt/jBCrypt-([\d\.]+)\.tar\.gz
+version=4
+https://mindrot.org/files/jBCrypt/jBCrypt-([\d\.]+)\.tar\.gz
View it on GitLab: https://salsa.debian.org/java-team/libjbcrypt-java/-/compare/08e10f008accf18b67aa19dd76cd515d20f3661a...ccb60c7fd7c7c74b55f06bcd6fe870ce904674b0
--
View it on GitLab: https://salsa.debian.org/java-team/libjbcrypt-java/-/compare/08e10f008accf18b67aa19dd76cd515d20f3661a...ccb60c7fd7c7c74b55f06bcd6fe870ce904674b0
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/20211226/7429a82c/attachment.htm>
More information about the pkg-java-commits
mailing list