[Git][java-team/svnkit][master] 11 commits: Raising Standards version to 4.6.2
Pierre Gruet (@pgt)
gitlab at salsa.debian.org
Sun Jan 22 16:11:25 GMT 2023
Pierre Gruet pushed to branch master at Debian Java Maintainers / svnkit
Commits:
3de62e2e by Pierre Gruet at 2023-01-22T12:25:45+01:00
Raising Standards version to 4.6.2
- - - - -
fb0830aa by Pierre Gruet at 2023-01-22T12:26:51+01:00
Updating copyright years
- - - - -
082c55eb by Pierre Gruet at 2023-01-22T15:19:11+01:00
Using methods of AuthorizationHandler instead of the removed ones in org.eclipse.core.runtime.Platform
- - - - -
0df11ba5 by Pierre Gruet at 2023-01-22T15:22:30+01:00
Adding a Lintian override for embedded JS
- - - - -
8c75755e by Pierre Gruet at 2023-01-22T15:25:25+01:00
Removing obsolete get-orig-source rule
- - - - -
35a4ec77 by Pierre Gruet at 2023-01-22T15:32:44+01:00
Using uscan version 4, repacking through debian/copyright FIles-Excluded mechanism
- - - - -
65c1baed by Pierre Gruet at 2023-01-22T15:35:39+01:00
Using DEB_VERSION instead of parsing changelog in d/rules
- - - - -
10dddce7 by Pierre Gruet at 2023-01-22T15:37:28+01:00
Updating changelog
- - - - -
b0875863 by Pierre Gruet at 2023-01-22T15:39:00+01:00
Removing unneeded versioned dependencies in d/control
- - - - -
374fc4a8 by Pierre Gruet at 2023-01-22T15:44:17+01:00
Apply multi-arch hints.
+ libsvnkit-java-doc: Add Multi-Arch: foreign.
Changes-By: apply-multiarch-hints
- - - - -
5dc466db by Pierre Gruet at 2023-01-22T15:44:54+01:00
Upload to unstable
- - - - -
9 changed files:
- debian/changelog
- debian/control
- debian/copyright
- + debian/libsvnkit-java-doc.lintian-overrides
- − debian/orig-tar.sh
- debian/patches/series
- + debian/patches/using_AuthorizationHandler.patch
- debian/rules
- debian/watch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,20 @@
+svnkit (1.10.3-2) unstable; urgency=medium
+
+ * Team upload
+ * Raising Standards version to 4.6.2:
+ - Removing obsolete get-orig-source rule
+ * Updating copyright years
+ * Using methods of AuthorizationHandler instead of the removed ones formerly
+ in org.eclipse.core.runtime.Platform (Closes: #1028768)
+ * Adding a Lintian override for embedded JS
+ * Using uscan version 4 and repacking through the debian/copyright
+ Files-Excluded mechanism
+ * Using DEB_VERSION instead of parsing changelog in debian/rules
+ * Removing unneeded versioned dependencies in debian/control
+ * Apply multi-arch hints. + libsvnkit-java-doc: Add Multi-Arch: foreign.
+
+ -- Pierre Gruet <pgt at debian.org> Sun, 22 Jan 2023 15:44:40 +0100
+
svnkit (1.10.3-1) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -13,12 +13,12 @@ Build-Depends: ant,
libjna-platform-java,
liblz4-java,
libsequence-library-java,
- libsqljet-java (>= 1.1.10-1~),
- libsvn-java (>= 1.9.2),
- libtrilead-ssh2-java (>= 6401+svn158),
+ libsqljet-java,
+ libsvn-java,
+ libtrilead-ssh2-java,
maven-repo-helper,
perl
-Standards-Version: 4.6.0
+Standards-Version: 4.6.2
Vcs-Git: https://salsa.debian.org/java-team/svnkit.git
Vcs-Browser: https://salsa.debian.org/java-team/svnkit
Homepage: https://svnkit.com
@@ -30,7 +30,7 @@ Depends: default-jre-headless | java7-runtime-headless,
libjna-java,
libsequence-library-java,
libsvnkit-java (= ${binary:Version}),
- libtrilead-ssh2-java (>= 6401+svn158),
+ libtrilead-ssh2-java,
${misc:Depends}
Description: pure Java Subversion client
SVNKit allows one to work with Subversion repositories and working
@@ -44,10 +44,10 @@ Section: java
Depends: antlr3,
libjna-java,
libsequence-library-java,
- libsqljet-java (>= 1.1.10-1~),
- libtrilead-ssh2-java (>= 6401+svn158),
+ libsqljet-java,
+ libtrilead-ssh2-java,
${misc:Depends}
-Recommends: libsvn-java (>= 1.9.2)
+Recommends: libsvn-java
Suggests: junit
Description: pure Java Subversion client library
SVNKit provides APIs to work with Subversion repositories and working
@@ -60,6 +60,7 @@ Architecture: all
Section: doc
Depends: ${misc:Depends}
Suggests: default-jdk-doc, libsvnkit-java (= ${binary:Version})
+Multi-Arch: foreign
Description: documentation for libsvnkit-java
Documentation for SVNKit, which is a Java library that provides APIs to
work with Subversion repositories and working copies. SVNKit features
=====================================
debian/copyright
=====================================
@@ -2,9 +2,13 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: SVNKit
Upstream-Contact: TMate Software Ltd. <support at svnkit.com>
Source: https://svnkit.com/download.php
+Files-Excluded: gradle
+ svnkit-test/nailgun
+ **/*.class
+ **/*.exe
Files: *
-Copyright: 2004-2011, TMate Software Ltd. <support at svnkit.com>
+Copyright: 2004-2012, TMate Software Ltd. <support at svnkit.com>
License: The-TMate-Open-Source-License
Files: debian/*
=====================================
debian/libsvnkit-java-doc.lintian-overrides
=====================================
@@ -0,0 +1,4 @@
+# It would be too complicated to remove the javascript that is included in
+# javadocs, see the discussion on Debian Java mailing list starting at
+# https://lists.debian.org/debian-java/2018/06/msg00020.html.
+embedded-javascript-library please use * [usr/share/doc/libsvnkit-java/api/script-dir/*s]
=====================================
debian/orig-tar.sh deleted
=====================================
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# called by uscan with '--upstream-version' <version> <file>
-VERSION=$2
-package=`dpkg-parsechangelog | sed -n 's/^Source: //p'`
-debian_version=`dpkg-parsechangelog | sed -ne 's/^Version: \(.*+dfsg\)-.*/\1/p'`
-TAR=../${package}_${VERSION}.orig.tar.xz
-DIR=${package}-${VERSION}.orig
-
-# clean up the upstream tarball
-unzip -d orig $3
-mv "$(find orig -maxdepth 1 -type d ! -name orig)" orig/$DIR
-XZ_OPT=--best tar -C orig -c -v -J -f $TAR \
- --exclude doc/javadoc \
- --exclude '*.class' \
- --exclude contrib/javahl \
- --exclude contrib/jna \
- --exclude contrib/junit \
- --exclude contrib/maven \
- --exclude contrib/sqljet \
- --exclude contrib/trilead \
- --exclude gradle-wrapper.jar \
- --exclude svnkit-test/nailgun \
- --exclude 'nailgun-*.jar' \
- --exclude '*.exe' \
- --numeric-owner --group 0 --owner 0 $DIR
-rm -rf $3 orig
=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@ fix-logging-path.patch
script-fix-classpath.patch
libsvn-java-1.10.0-1.patch
fix_abstract.patch
+using_AuthorizationHandler.patch
=====================================
debian/patches/using_AuthorizationHandler.patch
=====================================
@@ -0,0 +1,55 @@
+Description: relying on the methods of AuthorizationHandler in
+ eclipse-platform-runtime, although they are theoretically internal to the
+ library, as the ones in the Platform class have been removed recently. Yet the
+ right way to handle this would be to use the
+ org.eclipse.equinox.security.storage.ISecurePreferences methods.
+Author: Pierre Gruet <pgt at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1028768
+Forwarded: support at svnkit.com
+Last-Update: 2023-01-22
+
+--- a/svnkit-osgi/src/main/java/org/tmatesoft/svn/core/internal/wc/EclipseSVNAuthenticationManager.java
++++ b/svnkit-osgi/src/main/java/org/tmatesoft/svn/core/internal/wc/EclipseSVNAuthenticationManager.java
+@@ -17,7 +17,7 @@
+ import java.util.Map;
+
+ import org.eclipse.core.runtime.CoreException;
+-import org.eclipse.core.runtime.Platform;
++import org.eclipse.core.internal.runtime.AuthorizationHandler;
+ import org.tmatesoft.svn.core.SVNErrorMessage;
+ import org.tmatesoft.svn.core.SVNURL;
+ import org.tmatesoft.svn.core.auth.ISVNAuthenticationManager;
+@@ -75,7 +75,7 @@
+ public SVNAuthentication requestClientAuthentication(String kind, SVNURL url, String realm, SVNErrorMessage errorMessage, SVNAuthentication previousAuth, boolean authMayBeStored) {
+ // get from key-ring, use realm.
+ realm = realm == null ? DEFAULT_URL.toString() : realm;
+- Map info = Platform.getAuthorizationInfo(DEFAULT_URL, realm, kind);
++ Map info = AuthorizationHandler.getAuthorizationInfo(DEFAULT_URL, realm, kind);
+ // convert info to SVNAuthentication.
+ if (info != null && ISVNAuthenticationManager.SSL.equals(kind)) {
+ String sslKind = (String) info.get("ssl-kind");
+@@ -165,13 +165,13 @@
+ }
+ }
+ try {
+- Platform.addAuthorizationInfo(DEFAULT_URL, realm, kind, info);
++ AuthorizationHandler.addAuthorizationInfo(DEFAULT_URL, realm, kind, info);
+ } catch (CoreException e) {
+ }
+ }
+
+ public byte[] loadFingerprints(String realm) {
+- Map info = Platform.getAuthorizationInfo(DEFAULT_URL, realm, "svn.ssh.server");
++ Map info = AuthorizationHandler.getAuthorizationInfo(DEFAULT_URL, realm, "svn.ssh.server");
+ if (info != null && realm.equals(info.get("svn:realmstring"))) {
+ return (byte[]) info.get("hostkey");
+ }
+@@ -183,7 +183,7 @@
+ info.put("svn:realmstring", realm);
+ info.put("hostkey", fingerprints);
+ try {
+- Platform.addAuthorizationInfo(DEFAULT_URL, realm, "svn.ssh.server", info);
++ AuthorizationHandler.addAuthorizationInfo(DEFAULT_URL, realm, "svn.ssh.server", info);
+ } catch (CoreException e) {
+ }
+ }
=====================================
debian/rules
=====================================
@@ -6,7 +6,7 @@ export CLASSPATH=/usr/share/java/sqljet.jar:/usr/share/java/jna.jar:/usr/share/j
dh $@ --with javahelper
override_dh_auto_build:
- VERSION=$$(dpkg-parsechangelog | grep Version: | cut -d' ' -f 2); \
+ VERSION=$(DEB_VERSION); \
echo $$VERSION | { \
IFS='.-+' read MAJOR MINOR MICRO DFSG DEBIAN; \
export MAJOR MINOR MICRO DEBIAN; \
@@ -31,14 +31,3 @@ override_dh_auto_clean:
override_dh_compress:
dh_compress -X.java
-
-get-orig-source:
- cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \
- uscan \
- --verbose \
- --no-symlink \
- --destdir $(CURDIR) \
- --watchfile debian/watch \
- --force-download \
- --repack \
- --compression xz
=====================================
debian/watch
=====================================
@@ -1,4 +1,5 @@
-version=3
-opts=dversionmangle=s/\+dfsg// \
-https://svnkit.com/download.php \
- https://www.svnkit.com/org.tmatesoft.svn_(.+).src.zip debian debian/orig-tar.sh
+version=4
+opts="dversionmangle=s/\+dfsg//, repack, repacksuffix=+dfsg, compression=xz, \
+ filenamemangle=s%.*org.tmatesoft.svn_(.+).src%@PACKAGE at -$1%" \
+ https://svnkit.com/download.php \
+ https://www.svnkit.com/org.tmatesoft.svn_(.+).src.zip
View it on GitLab: https://salsa.debian.org/java-team/svnkit/-/compare/5778bee093701ae597c155dff50b8746b61e9a2d...5dc466db467cf9579844d3c1b85d0710252d86ec
--
View it on GitLab: https://salsa.debian.org/java-team/svnkit/-/compare/5778bee093701ae597c155dff50b8746b61e9a2d...5dc466db467cf9579844d3c1b85d0710252d86ec
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/20230122/bb47d0b2/attachment.htm>
More information about the pkg-java-commits
mailing list