Simon Quigley pushed to branch master at Debian Java Maintainers / sbt-ivy


Commits:
1d4db46f by Juan Manuel Méndez Rey at 2026-10-28T15:52:23+01:00
d/copyright: declare Ganymed code in Scp.java, fix treeview licence

- - - - -
76166a29 by Juan Manuel Méndez Rey at 2026-10-28T15:52:25+01:00
Update changelog for 2.4.0~rc1+really2.3.0+git20260715+dfsg-2

- - - - -
e7d58619 by Simon Quigley at 2026-10-28T15:15:50-05:00
Merge branch 'fix-copyright-2' into 'master'

sbt-ivy 2.4.0~rc1+really2.3.0+git20260715+dfsg-2: declare Ganymed code in 
Scp.java

See merge request java-team/sbt-ivy!3
- - - - -


3 changed files:

- debian/changelog
- debian/copyright
- debian/lrc.config


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+sbt-ivy (2.4.0~rc1+really2.3.0+git20260715+dfsg-2) unstable; urgency=medium
+
+  * Team upload.
+  * debian/copyright: declare the Ganymed SSH-2 code in Scp.java and fix
+    the jquery.treeview.js licence.
+
+ -- Juan Manuel Méndez Rey <[email protected]>  Wed, 28 Oct 2026 15:52:25 
+0100
+
 sbt-ivy (2.4.0~rc1+really2.3.0+git20260715+dfsg-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/copyright
=====================================
@@ -14,6 +14,15 @@ Files: *
 Copyright: 2001-2019, 2022 The Apache Software Foundation
            Jayasoft SARL
 License: Apache-2.0
+Comment: osgi/util/ZipUtil.java cites a Sun forum post (no longer online);
+ it is the standard java.util.zip loop.
+
+Files: src/java/org/apache/ivy/plugins/repository/ssh/Scp.java
+Copyright: 2007-2019 The Apache Software Foundation
+           2005-2006 Swiss Federal Institute of Technology (ETH Zurich), 
Department of Computer Science
+           2005-2006 Christian Plattner
+License: Apache-2.0 and BSD-3-clause~Ganymed
+Comment: Based on SCPClient.java of Ganymed SSH-2 for Java (build210).
 
 Files: LICENSE
 Copyright: 2007-2019, 2022 The Apache Software Foundation
@@ -25,7 +34,8 @@ Comment: Apache-2.0 text followed by the licences of JSch and 
jQuery,
 
 Files: doc/js/jquery.treeview.js
 Copyright: 2006 Joern Zaefferer, Myles Angell
-License: Expat or GPL-3
+License: Expat or GPL-2+
+Comment: The header names "the GPL licenses" without a version (2006).
 
 Files: debian/*
 Copyright: 2009 Varun Hiremath <[email protected]>
@@ -74,6 +84,32 @@ License: BSD-3-clause
  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+License: BSD-3-clause~Ganymed
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ a.) Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+ b.) Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+ c.) Neither the name of ETH Zurich nor the names of its contributors may
+     be used to endorse or promote products derived from this software
+     without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining
  a copy of this software and associated documentation files (the
@@ -94,6 +130,15 @@ License: Expat
  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ On Debian systems, the full text of the GPL-2 license
+ can be found in the file "/usr/share/common-licenses/GPL-2".
+
 License: GPL-3
  On Debian systems, the full text of the GPL-3 license
  can be found in the file "/usr/share/common-licenses/GPL-3".


=====================================
debian/lrc.config
=====================================
@@ -1,4 +1,6 @@
 # jquery.treeview.js says "Dual licensed under the MIT and GPL licenses";
 # licensecheck only recognises the MIT half.
-Expat or GPL-3 | Expat
+Expat or GPL-2+ | Expat
+# Scp.java has only the Apache header; the Ganymed part is in debian/copyright.
+Apache-2.0 and BSD-3-clause~Ganymed | Apache-2.0
 debian/lrc.config



View it on GitLab: 
https://salsa.debian.org/java-team/sbt-ivy/-/compare/d97dd8e961d9a3762caf2e770b2bb9e26b93a9f2...e7d586192709e82e81875d53ce8dffc924d53ab9

-- 
View it on GitLab: 
https://salsa.debian.org/java-team/sbt-ivy/-/compare/d97dd8e961d9a3762caf2e770b2bb9e26b93a9f2...e7d586192709e82e81875d53ce8dffc924d53ab9
You're receiving this email because of your account on salsa.debian.org. Manage 
all notifications: https://salsa.debian.org/-/profile/notifications | Help: 
https://salsa.debian.org/help


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

Reply via email to