[Git][java-team/libscram-java][master] 2 commits: doc: Ship two separate doc-base control files.

[Christoph Berg]

Christoph Berg pushed to branch master at Debian Java Maintainers / libscram-java


Commits:
5aa846da by Christoph Berg at 2018-05-29T19:55:21+02:00
doc: Ship two separate doc-base control files.

- - - - -
0589b9a5 by Christoph Berg at 2018-05-29T20:04:59+02:00
Downgrade to DH 10 and drop version restriction on libmaven-javadoc-plugin-java build-dependency for easier backports.

- - - - -


5 changed files:

- debian/changelog
- debian/compat
- debian/control
- debian/libscram-java-doc.doc-base.api → debian/libscram-java-doc.doc-base.client
- + debian/libscram-java-doc.doc-base.common


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 libscram-java (1.0.0~beta.2-2) UNRELEASED; urgency=medium
 
   * Mark as Multi-Arch: foreign.
+  * doc: Ship two separate doc-base control files.
+  * Downgrade to DH 10 and drop version restriction on
+    libmaven-javadoc-plugin-java build-dependency for easier backports.
 
  -- Christoph Berg <myon at debian.org>  Sat, 19 May 2018 19:51:22 +0200
 


=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-11
+10


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Christoph Berg <myon at debian.org>
-Build-Depends: debhelper (>= 11), default-jdk, maven-debian-helper (>= 2.1)
+Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper (>= 2.1)
 Build-Depends-Indep:
  default-jdk-doc,
  junit4 (>= 4.12),
  libmaven-dependency-plugin-java,
- libmaven-javadoc-plugin-java (>= 3.0.0),
+ libmaven-javadoc-plugin-java,
  libmaven-source-plugin-java,
 Standards-Version: 4.1.4
 Vcs-Git: https://salsa.debian.org/java-team/libscram-java.git


=====================================
debian/libscram-java-doc.doc-base.api → debian/libscram-java-doc.doc-base.client
=====================================
--- a/debian/libscram-java-doc.doc-base.api
+++ b/debian/libscram-java-doc.doc-base.client
@@ -1,12 +1,10 @@
-Document: libscram-java
-Title: API Javadoc for SCRAM
+Document: libscram-java-client
+Title: API Javadoc for SCRAM client
 Author: SCRAM developers
 Abstract: This is the API Javadoc provided for the
- libscram-java libraries.
+ libscram-java client libraries.
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libscram-java/common/index.html
-Files: /usr/share/doc/libscram-java/common/*
 Index: /usr/share/doc/libscram-java/client/index.html
 Files: /usr/share/doc/libscram-java/client/*


=====================================
debian/libscram-java-doc.doc-base.common
=====================================
--- /dev/null
+++ b/debian/libscram-java-doc.doc-base.common
@@ -0,0 +1,10 @@
+Document: libscram-java-common
+Title: API Javadoc for SCRAM common
+Author: SCRAM developers
+Abstract: This is the API Javadoc provided for the
+ libscram-java common libraries.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libscram-java/common/index.html
+Files: /usr/share/doc/libscram-java/common/*



View it on GitLab: https://salsa.debian.org/java-team/libscram-java/compare/f3a4069ad4720a8f38f6f73cf20474bf1368903f...0589b9a5663dcfef77a8ad4f210956a948ca2311

-- 
View it on GitLab: https://salsa.debian.org/java-team/libscram-java/compare/f3a4069ad4720a8f38f6f73cf20474bf1368903f...0589b9a5663dcfef77a8ad4f210956a948ca2311
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/20180529/4ff8e9cb/attachment.html>