debian/changelog

+plexus-digest (1.1-6) unstable; urgency=medium
+
+  * Team upload.
+  * Build depend on libplexus-component-metadata-java
+    instead of libplexus-maven-plugin-java
+  * Removed the libplexus-digest-java-doc package
+  * Standards-Version updated to 4.2.1
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Fri, 23 Nov 2018 00:40:46 +0100
+
 plexus-digest (1.1-5) unstable; urgency=medium
 
   * Team upload.

debian/compat

-10
+11

debian/control

@@ -4,26 +4,21 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner@debian.org>
 Build-Depends:
- debhelper (>= 10),
+ debhelper (>= 11),
  default-jdk,
- default-jdk-doc,
  junit,
- libmaven-javadoc-plugin-java,
- libplexus-container-default1.5-java,
- libplexus-maven-plugin-java,
+ libplexus-component-metadata-java,
  libplexus-utils-java,
- libplexus-utils-java-doc,
  maven-debian-helper (>= 2.2)
-Standards-Version: 4.1.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/plexus-digest.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/plexus-digest.git
+Standards-Version: 4.2.1
+Vcs-Git: https://salsa.debian.org/java-team/plexus-digest.git
+Vcs-Browser: https://salsa.debian.org/java-team/plexus-digest
 Homepage: https://codehaus-plexus.github.io/plexus-digest/
 
 Package: libplexus-digest-java
 Architecture: all
 Depends: ${maven:Depends}, ${misc:Depends}
 Recommends: ${maven:OptionalDepends}
-Suggests: libplexus-digest-java-doc
 Description: Digest utilities for the Plexus system
  The Plexus project provides a full software stack for creating and
  executing software projects. Based on the Plexus container, the applications
@@ -31,17 +26,3 @@ Description: Digest utilities for the Plexus system
  components that can easily be assembled and reused.
  .
  This package provides digest (checksum) utilities for Plexus.
-
-Package: libplexus-digest-java-doc
-Architecture: all
-Section: doc
-Depends: ${maven:DocDepends}, ${misc:Depends}
-Recommends: ${maven:DocOptionalDepends}
-Suggests: libplexus-digest-java
-Description: Documentation for Digest utilities for the Plexus system
- The Plexus project provides a full software stack for creating and
- executing software projects. Based on the Plexus container, the applications
- can utilise component-oriented programming to build modular, reusable
- components that can easily be assembled and reused.
- .
- This package contains the API documentation of libplexus-digest-java.

debian/libplexus-digest-java-doc.doc-base.api

-Document: libplexus-digest-java
-Title: API Javadoc for Plexus Digest / Hashcode Components
-Author: Plexus Digest / Hashcode Components developers
-Abstract: This is the API Javadoc provided for the
- libplexus-digest-java library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libplexus-digest-java/api/index.html
-Files: /usr/share/doc/libplexus-digest-java/api/*

debian/libplexus-digest-java-doc.install

-target/apidocs/* usr/share/doc/libplexus-digest-java/api

debian/maven.cleanIgnoreRules

-# Maven clean ignore rules - ignore some Maven dependencies and plugins
-# during the clean phase of a Maven build
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-#   for the version. In this case, the element is simply matched
-#   and left as it is
-# - * (the star character, alone). In this case, anything will
-#   match and be left as it is. For example, using * on the
-#  position of the artifact field will match any artifact id
-# All elements much match before a rule can be applied
-# Example rule: match jar with groupid= junit, artifactid= junit
-# and version starting with 3., this dependency is then removed
-# from the POM before mvn clean is called
-#   junit junit jar s/3\\..*/3.x/
-

debian/maven.ignoreRules

@@ -14,3 +14,4 @@
 # from the POM
 #   junit junit jar s/3\\..*/3.x/
 
+org.codehaus.plexus plexus-maven-plugin

debian/maven.publishedRules

-# Maven published rules - additional rules to publish, to help
-# the packaging work of Debian maintainers using mh_make
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-#   for the version. In this case, the element is simply matched
-#   and left as it is
-# - * (the star character, alone). In this case, anything will
-#   match and be left as it is. For example, using * on the
-#  position of the artifact field will match any artifact id
-# - a regular expression of the form s/match/replace/
-#   in this case, elements that match are transformed using
-#   the regex rule.
-# All elements much match before a rule can be applied
-# Example rule: match jar with groupid= junit, artifactid= junit
-# and version starting with 3., replacing the version with 3.x
-#   junit junit jar s/3\\..*/3.x/
-

debian/patches/0002-plexus-component-metadata.patch

+Description: Generate the component descriptor with plexus-component-metadata instead of plexus-maven-plugin
+Origin: backport, https://github.com/codehaus-plexus/plexus-pom/commit/3c5f784f
+--- a/pom.xml
++++ b/pom.xml
+@@ -43,6 +43,18 @@
+           </execution>
+         </executions>
+       </plugin>
++      <plugin>
++        <groupId>org.codehaus.plexus</groupId>
++        <artifactId>plexus-component-metadata</artifactId>
++        <executions>
++          <execution>
++            <id>process-classes</id>
++            <goals>
++              <goal>generate-metadata</goal>
++            </goals>
++          </execution>
++        </executions>
++      </plugin>
+     </plugins>
+   </build>
+ 

debian/patches/series

 0001-add-test-dependencies.patch
+0002-plexus-component-metadata.patch

debian/rules

@@ -2,6 +2,3 @@
 
 %:
 	dh $@
-
-get-orig-source:
-	uscan --download-current-version --force-download --rename