From 993fa5591365639371b3e4b8550cc1682f788269 Mon Sep 17 00:00:00 2001 From: Emmanuel Bourg <ebourg@apache.org> Date: Thu, 4 Jan 2018 00:40:06 +0100 Subject: [PATCH] Install the Maven artifacts --- debian/changelog | 1 + debian/control | 3 ++- debian/libj2ssh-java.install | 1 - debian/libj2ssh-java.poms | 4 ++++ debian/poms/j2ssh-ant.xml | 7 +++++++ debian/poms/j2ssh-common.xml | 7 +++++++ debian/poms/j2ssh-core.xml | 7 +++++++ debian/poms/j2ssh-daemon.xml | 7 +++++++ debian/rules | 8 +------- 9 files changed, 36 insertions(+), 9 deletions(-) delete mode 100644 debian/libj2ssh-java.install create mode 100644 debian/libj2ssh-java.poms create mode 100644 debian/poms/j2ssh-ant.xml create mode 100644 debian/poms/j2ssh-common.xml create mode 100644 debian/poms/j2ssh-core.xml create mode 100644 debian/poms/j2ssh-daemon.xml diff --git a/debian/changelog b/debian/changelog index 46be7bd..d60f9e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ libj2ssh-java (0.2.9-5) UNRELEASED; urgency=medium + Remove Kumar Appaiah from uploaders [ Emmanuel Bourg ] + * Install the Maven artifacts * Build with the DH sequencer instead of CDBS * Moved the package to Git * Standards-Version updated to 4.1.3 diff --git a/debian/control b/debian/control index 98c3b7b..e9a044f 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,8 @@ Build-Depends: debhelper (>= 10), default-jdk, javahelper, - libcommons-logging-java + 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 diff --git a/debian/libj2ssh-java.install b/debian/libj2ssh-java.install deleted file mode 100644 index 2f868b0..0000000 --- a/debian/libj2ssh-java.install +++ /dev/null @@ -1 +0,0 @@ -dist/lib/*.jar /usr/share/java diff --git a/debian/libj2ssh-java.poms b/debian/libj2ssh-java.poms new file mode 100644 index 0000000..fef808d --- /dev/null +++ b/debian/libj2ssh-java.poms @@ -0,0 +1,4 @@ +debian/poms/j2ssh-ant.xml --has-package-version --java-lib --artifact=dist/lib/j2ssh-ant-*.jar +debian/poms/j2ssh-common.xml --has-package-version --java-lib --artifact=dist/lib/j2ssh-common-*.jar +debian/poms/j2ssh-core.xml --has-package-version --java-lib --artifact=dist/lib/j2ssh-core-*.jar +debian/poms/j2ssh-daemon.xml --has-package-version --java-lib --artifact=dist/lib/j2ssh-dameon-*.jar diff --git a/debian/poms/j2ssh-ant.xml b/debian/poms/j2ssh-ant.xml new file mode 100644 index 0000000..e037a59 --- /dev/null +++ b/debian/poms/j2ssh-ant.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>sshtools</groupId> + <artifactId>j2ssh-ant</artifactId> + <version>0.2.9</version> +</project> diff --git a/debian/poms/j2ssh-common.xml b/debian/poms/j2ssh-common.xml new file mode 100644 index 0000000..fe88fdf --- /dev/null +++ b/debian/poms/j2ssh-common.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>sshtools</groupId> + <artifactId>j2ssh-common</artifactId> + <version>0.2.9</version> +</project> diff --git a/debian/poms/j2ssh-core.xml b/debian/poms/j2ssh-core.xml new file mode 100644 index 0000000..dc97495 --- /dev/null +++ b/debian/poms/j2ssh-core.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>sshtools</groupId> + <artifactId>j2ssh-core</artifactId> + <version>0.2.9</version> +</project> diff --git a/debian/poms/j2ssh-daemon.xml b/debian/poms/j2ssh-daemon.xml new file mode 100644 index 0000000..bd601a0 --- /dev/null +++ b/debian/poms/j2ssh-daemon.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>sshtools</groupId> + <artifactId>j2ssh-daemon</artifactId> + <version>0.2.9</version> +</project> diff --git a/debian/rules b/debian/rules index 573fbaa..cd34191 100755 --- a/debian/rules +++ b/debian/rules @@ -5,16 +5,10 @@ include /usr/share/dpkg/pkg-info.mk export CLASSPATH=/usr/share/java/commons-logging.jar %: - dh $@ --with javahelper + dh $@ --with javahelper --with maven-repo-helper override_dh_auto_build: dh_auto_build -- javadoc -override_dh_auto_install: - dh_link /usr/share/java/j2ssh-core-$(DEB_VERSION_UPSTREAM).jar /usr/share/java/j2ssh-core.jar - dh_link /usr/share/java/j2ssh-ant-$(DEB_VERSION_UPSTREAM).jar /usr/share/java/j2ssh-ant.jar - dh_link /usr/share/java/j2ssh-dameon-$(DEB_VERSION_UPSTREAM).jar /usr/share/java/j2ssh-dameon.jar - dh_link /usr/share/java/j2ssh-common-$(DEB_VERSION_UPSTREAM).jar /usr/share/java/j2ssh-common.jar - get-orig-source: uscan --download-current-version --force-download --rename -- GitLab