6 files changed, 49 insertions, 28 deletions
diff --git a/debian/changelog b/debian/changelog
index 5ebfe26..04e424f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+libj2ssh-java (0.2.9-6) unstable; urgency=medium
+
+  * Team upload.
+  * Build-Depends: s/default-jdk/default-jdk-headless/
+  * Standards-Version: 4.7.0 (routine-update)
+  * debhelper-compat 13 (routine-update)
+  * Reorder sequence of d/control fields by cme (routine-update)
+  * Secure URI in copyright format (routine-update)
+  * Drop useless get-orig-source target (routine-update)
+  * No tab in license text (routine-update)
+  * Trim trailing whitespace.
+  * Use secure URI in Homepage field.
+  * watch file standard 4 (routine-update)
+  * d/copyright: review
+
+ -- Andreas Tille <tille@debian.org>  Wed, 05 Feb 2025 21:55:55 +0100
+
 libj2ssh-java (0.2.9-5) unstable; urgency=medium
 
   [ Kumar Appaiah ]
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index e9a044f..132dbf7 100644
--- a/debian/control
+++ b/debian/control
@@ -1,25 +1,24 @@
 Source: libj2ssh-java
+Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Uploaders: Varun Hiremath <varunhiremath@gmail.com>,
+           Emmanuel Bourg <ebourg@apache.org>
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders:
- Varun Hiremath <varunhiremath@gmail.com>,
- Emmanuel Bourg <ebourg@apache.org>
-Build-Depends:
- ant,
- debhelper (>= 10),
- default-jdk,
- javahelper,
- libcommons-logging-java,
- maven-repo-helper
-Standards-Version: 4.1.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/libj2ssh-java.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libj2ssh-java.git
-Homepage: http://sshtools.sourceforge.net
+Build-Depends: ant,
+               debhelper-compat (= 13),
+               default-jdk-headless,
+               javahelper,
+               libcommons-logging-java,
+               maven-repo-helper
+Standards-Version: 4.7.0
+Vcs-Browser: https://salsa.debian.org/java-team/libj2ssh-java
+Vcs-Git: https://salsa.debian.org/java-team/libj2ssh-java.git
+Homepage: https://sshtools.sourceforge.net
 
 Package: libj2ssh-java
 Architecture: all
-Depends: libcommons-logging-java, ${misc:Depends}
+Depends: libcommons-logging-java,
+         ${misc:Depends}
 Description: Java library for the SSH protocol
  J2SSH is an object-orientated Java library implementation of the SSH
  version 2 protocol. It provides a rich, powerful, and extensible SSH
@@ -34,8 +33,8 @@ Description: Java library for the SSH protocol
  protocol.
 
 Package: libj2ssh-java-doc
-Section: doc
 Architecture: all
+Section: doc
 Depends: ${misc:Depends}
 Description: Java library for the SSH protocol - documentation and examples
  J2SSH is an object-orientated Java library implementation of the SSH
diff --git a/debian/copyright b/debian/copyright
index 658b1a2..4ce6a13 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: SSHTools
 Upstream-Contact: Lee David Painter
 Source: http://sshtools.sourceforge.net
@@ -11,14 +11,23 @@ Comment:
 
 Files: *
 Copyright: 2002-2003, Lee David Painter and Contributors.
-	   2000, Dieter Wimberger
-	   2002, by Manfred Duchrow. All rights reserved.
-License: GPL-2
+           2000, Dieter Wimberger
+           2002, by Manfred Duchrow. All rights reserved.
+License: GPL-2+
+
+Files: src/com/sshtools/daemon/terminal/*
+Copyright: 2002-2003 Lee David Painter and Contributors.
+License: GPL-2+ and/or LGPL-2.1
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
 
 Files: debian/*
 Copyright: 2007, Varun Hiremath <varunhiremath@gmail.com> and Kumar Appaiah <akumar@ee.iitm.ac.in>
-License: GPL-2
+License: GPL-2+
 
-License: GPL-2
+License: GPL-2+
  On Debian systems, the complete text of the GNU General
  Public License can be found in `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/rules b/debian/rules
index cd34191..154e083 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,3 @@ export CLASSPATH=/usr/share/java/commons-logging.jar
 
 override_dh_auto_build:
 	dh_auto_build -- javadoc
-
-get-orig-source:
-	uscan --download-current-version --force-download --rename
diff --git a/debian/watch b/debian/watch
index 4985afb..99e9a96 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
-version=3
+version=4
 http://sf.net/sshtools/j2ssh-(.*)-src\.tar\.gz debian debian/orig-tar.sh