[Pkg-freeipa-devel] dogtag-pki: Changes to 'master'
Timo Aaltonen
tjaalton at moszumanska.debian.org
Wed Feb 15 11:25:04 UTC 2017
debian/changelog | 7 +++
debian/patches/use-resteasy-legacy.diff | 59 +++++---------------------------
debian/pki-base.install | 1
debian/pki-server.install | 1
debian/pki-tools.install | 3 +
5 files changed, 23 insertions(+), 48 deletions(-)
New commits:
commit a5600af9d36566641a760d7cf574531c5fe62c3d
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Wed Feb 15 13:24:27 2017 +0200
releasing package dogtag-pki version 10.3.5+12-2
diff --git a/debian/changelog b/debian/changelog
index 4645694..a8c93c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-dogtag-pki (10.3.5+12-2) UNRELEASED; urgency=medium
+dogtag-pki (10.3.5+12-2) unstable; urgency=medium
* base, server, tools: Add new manpages.
* use-resteasy-legacy.diff: Fix javadoc build.
- -- Timo Aaltonen <tjaalton at debian.org> Wed, 15 Feb 2017 11:34:39 +0200
+ -- Timo Aaltonen <tjaalton at debian.org> Wed, 15 Feb 2017 13:24:15 +0200
dogtag-pki (10.3.5+12-1) unstable; urgency=medium
commit c2d94d90cb97af6436e522675af22e8d912d2c9a
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Wed Feb 15 13:24:14 2017 +0200
use-resteasy-legacy.diff: Fix javadoc build.
diff --git a/debian/changelog b/debian/changelog
index ad53324..4645694 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
dogtag-pki (10.3.5+12-2) UNRELEASED; urgency=medium
* base, server, tools: Add new manpages.
+ * use-resteasy-legacy.diff: Fix javadoc build.
-- Timo Aaltonen <tjaalton at debian.org> Wed, 15 Feb 2017 11:34:39 +0200
diff --git a/debian/patches/use-resteasy-legacy.diff b/debian/patches/use-resteasy-legacy.diff
index b9dab5b..154bcd2 100644
--- a/debian/patches/use-resteasy-legacy.diff
+++ b/debian/patches/use-resteasy-legacy.diff
@@ -43,8 +43,6 @@
OUTPUT_DIR
${CMAKE_CURRENT_BINARY_DIR}/classes
DEPENDS
-diff --git a/base/common/src/com/netscape/certsrv/account/AccountResource.java b/base/common/src/com/netscape/certsrv/account/AccountResource.java
-index 95440cf..46edfdf 100644
--- a/base/common/src/com/netscape/certsrv/account/AccountResource.java
+++ b/base/common/src/com/netscape/certsrv/account/AccountResource.java
@@ -22,7 +22,7 @@ import javax.ws.rs.GET;
@@ -56,8 +54,6 @@ index 95440cf..46edfdf 100644
import com.netscape.certsrv.acls.ACLMapping;
import com.netscape.certsrv.authentication.AuthMethodMapping;
-diff --git a/base/common/src/com/netscape/certsrv/authority/AuthorityResource.java b/base/common/src/com/netscape/certsrv/authority/AuthorityResource.java
-index 0f8b70a..1429ae5 100644
--- a/base/common/src/com/netscape/certsrv/authority/AuthorityResource.java
+++ b/base/common/src/com/netscape/certsrv/authority/AuthorityResource.java
@@ -9,7 +9,7 @@ import javax.ws.rs.PathParam;
@@ -69,8 +65,6 @@ index 0f8b70a..1429ae5 100644
import com.netscape.certsrv.acls.ACLMapping;
import com.netscape.certsrv.authentication.AuthMethodMapping;
-diff --git a/base/common/src/com/netscape/certsrv/cert/CertRequestResource.java b/base/common/src/com/netscape/certsrv/cert/CertRequestResource.java
-index 493f6f5..d8a10a2 100644
--- a/base/common/src/com/netscape/certsrv/cert/CertRequestResource.java
+++ b/base/common/src/com/netscape/certsrv/cert/CertRequestResource.java
@@ -24,7 +24,7 @@ import javax.ws.rs.PathParam;
@@ -82,8 +76,6 @@ index 493f6f5..d8a10a2 100644
import com.netscape.certsrv.acls.ACLMapping;
import com.netscape.certsrv.authentication.AuthMethodMapping;
-diff --git a/base/common/src/com/netscape/certsrv/cert/CertResource.java b/base/common/src/com/netscape/certsrv/cert/CertResource.java
-index 9d6a7c8..267ba52 100644
--- a/base/common/src/com/netscape/certsrv/cert/CertResource.java
+++ b/base/common/src/com/netscape/certsrv/cert/CertResource.java
@@ -7,7 +7,7 @@ import javax.ws.rs.PathParam;
@@ -95,8 +87,6 @@ index 9d6a7c8..267ba52 100644
import com.netscape.certsrv.acls.ACLMapping;
import com.netscape.certsrv.authentication.AuthMethodMapping;
-diff --git a/base/common/src/com/netscape/certsrv/group/GroupResource.java b/base/common/src/com/netscape/certsrv/group/GroupResource.java
-index 27fa90b..f04eaa7 100644
--- a/base/common/src/com/netscape/certsrv/group/GroupResource.java
+++ b/base/common/src/com/netscape/certsrv/group/GroupResource.java
@@ -26,7 +26,7 @@ import javax.ws.rs.PathParam;
@@ -108,8 +98,6 @@ index 27fa90b..f04eaa7 100644
import com.netscape.certsrv.acls.ACLMapping;
import com.netscape.certsrv.authentication.AuthMethodMapping;
-diff --git a/base/common/src/com/netscape/certsrv/key/KeyRequestResource.java b/base/common/src/com/netscape/certsrv/key/KeyRequestResource.java
-index 26ab990..938c494 100644
--- a/base/common/src/com/netscape/certsrv/key/KeyRequestResource.java
+++ b/base/common/src/com/netscape/certsrv/key/KeyRequestResource.java
@@ -10,7 +10,7 @@ import javax.ws.rs.core.MediaType;
@@ -121,8 +109,6 @@ index 26ab990..938c494 100644
import com.netscape.certsrv.acls.ACLMapping;
import com.netscape.certsrv.authentication.AuthMethodMapping;
-diff --git a/base/common/src/com/netscape/certsrv/key/KeyResource.java b/base/common/src/com/netscape/certsrv/key/KeyResource.java
-index 71a3556..211ed6e 100644
--- a/base/common/src/com/netscape/certsrv/key/KeyResource.java
+++ b/base/common/src/com/netscape/certsrv/key/KeyResource.java
@@ -10,7 +10,7 @@ import javax.ws.rs.core.MediaType;
@@ -134,8 +120,6 @@ index 71a3556..211ed6e 100644
import com.netscape.certsrv.acls.ACLMapping;
import com.netscape.certsrv.authentication.AuthMethodMapping;
-diff --git a/base/common/src/com/netscape/certsrv/logging/ActivityResource.java b/base/common/src/com/netscape/certsrv/logging/ActivityResource.java
-index 3e0a050..d3db3bc 100644
--- a/base/common/src/com/netscape/certsrv/logging/ActivityResource.java
+++ b/base/common/src/com/netscape/certsrv/logging/ActivityResource.java
@@ -23,7 +23,7 @@ import javax.ws.rs.PathParam;
@@ -147,8 +131,6 @@ index 3e0a050..d3db3bc 100644
/**
-diff --git a/base/common/src/com/netscape/certsrv/logging/AuditResource.java b/base/common/src/com/netscape/certsrv/logging/AuditResource.java
-index 9b14986..607c0cc 100644
--- a/base/common/src/com/netscape/certsrv/logging/AuditResource.java
+++ b/base/common/src/com/netscape/certsrv/logging/AuditResource.java
@@ -23,7 +23,7 @@ import javax.ws.rs.Path;
@@ -160,8 +142,6 @@ index 9b14986..607c0cc 100644
import com.netscape.certsrv.acls.ACLMapping;
import com.netscape.certsrv.authentication.AuthMethodMapping;
-diff --git a/base/common/src/com/netscape/certsrv/profile/ProfileResource.java b/base/common/src/com/netscape/certsrv/profile/ProfileResource.java
-index 410f98a..37fa524 100644
--- a/base/common/src/com/netscape/certsrv/profile/ProfileResource.java
+++ b/base/common/src/com/netscape/certsrv/profile/ProfileResource.java
@@ -9,7 +9,7 @@ import javax.ws.rs.PathParam;
@@ -173,8 +153,6 @@ index 410f98a..37fa524 100644
import com.netscape.certsrv.acls.ACLMapping;
import com.netscape.certsrv.authentication.AuthMethodMapping;
-diff --git a/base/common/src/com/netscape/certsrv/selftests/SelfTestResource.java b/base/common/src/com/netscape/certsrv/selftests/SelfTestResource.java
-index 2238beb..101d595 100644
--- a/base/common/src/com/netscape/certsrv/selftests/SelfTestResource.java
+++ b/base/common/src/com/netscape/certsrv/selftests/SelfTestResource.java
@@ -24,7 +24,7 @@ import javax.ws.rs.PathParam;
@@ -186,8 +164,6 @@ index 2238beb..101d595 100644
import com.netscape.certsrv.acls.ACLMapping;
import com.netscape.certsrv.authentication.AuthMethodMapping;
-diff --git a/base/common/src/com/netscape/certsrv/system/FeatureResource.java b/base/common/src/com/netscape/certsrv/system/FeatureResource.java
-index 16413f7..47f441b 100644
--- a/base/common/src/com/netscape/certsrv/system/FeatureResource.java
+++ b/base/common/src/com/netscape/certsrv/system/FeatureResource.java
@@ -22,7 +22,7 @@ import javax.ws.rs.Path;
@@ -199,8 +175,6 @@ index 16413f7..47f441b 100644
/**
* @author alee
-diff --git a/base/common/src/com/netscape/certsrv/system/KRAConnectorResource.java b/base/common/src/com/netscape/certsrv/system/KRAConnectorResource.java
-index cf52c66..5f88c4b 100644
--- a/base/common/src/com/netscape/certsrv/system/KRAConnectorResource.java
+++ b/base/common/src/com/netscape/certsrv/system/KRAConnectorResource.java
@@ -23,7 +23,7 @@ import javax.ws.rs.Path;
@@ -212,8 +186,6 @@ index cf52c66..5f88c4b 100644
import com.netscape.certsrv.acls.ACLMapping;
import com.netscape.certsrv.authentication.AuthMethodMapping;
-diff --git a/base/common/src/com/netscape/certsrv/system/SecurityDomainResource.java b/base/common/src/com/netscape/certsrv/system/SecurityDomainResource.java
-index 7ad8755..85d784e 100644
--- a/base/common/src/com/netscape/certsrv/system/SecurityDomainResource.java
+++ b/base/common/src/com/netscape/certsrv/system/SecurityDomainResource.java
@@ -22,7 +22,7 @@ import javax.ws.rs.Path;
@@ -225,8 +197,6 @@ index 7ad8755..85d784e 100644
import com.netscape.certsrv.acls.ACLMapping;
import com.netscape.certsrv.authentication.AuthMethodMapping;
-diff --git a/base/common/src/com/netscape/certsrv/system/SystemCertResource.java b/base/common/src/com/netscape/certsrv/system/SystemCertResource.java
-index 3a9d6e1..b8886ee 100644
--- a/base/common/src/com/netscape/certsrv/system/SystemCertResource.java
+++ b/base/common/src/com/netscape/certsrv/system/SystemCertResource.java
@@ -4,7 +4,7 @@ import javax.ws.rs.GET;
@@ -238,8 +208,6 @@ index 3a9d6e1..b8886ee 100644
import com.netscape.certsrv.cert.CertData;
-diff --git a/base/common/src/com/netscape/certsrv/system/TPSConnectorResource.java b/base/common/src/com/netscape/certsrv/system/TPSConnectorResource.java
-index af440d3..c6fa0e2 100644
--- a/base/common/src/com/netscape/certsrv/system/TPSConnectorResource.java
+++ b/base/common/src/com/netscape/certsrv/system/TPSConnectorResource.java
@@ -26,7 +26,7 @@ import javax.ws.rs.PathParam;
@@ -251,8 +219,6 @@ index af440d3..c6fa0e2 100644
import com.netscape.certsrv.acls.ACLMapping;
import com.netscape.certsrv.authentication.AuthMethodMapping;
-diff --git a/base/common/src/com/netscape/certsrv/tps/authenticator/AuthenticatorResource.java b/base/common/src/com/netscape/certsrv/tps/authenticator/AuthenticatorResource.java
-index c94dd8a..f639ad1 100644
--- a/base/common/src/com/netscape/certsrv/tps/authenticator/AuthenticatorResource.java
+++ b/base/common/src/com/netscape/certsrv/tps/authenticator/AuthenticatorResource.java
@@ -25,7 +25,7 @@ import javax.ws.rs.PathParam;
@@ -264,8 +230,6 @@ index c94dd8a..f639ad1 100644
import com.netscape.certsrv.acls.ACLMapping;
import com.netscape.certsrv.authentication.AuthMethodMapping;
-diff --git a/base/common/src/com/netscape/certsrv/tps/cert/TPSCertResource.java b/base/common/src/com/netscape/certsrv/tps/cert/TPSCertResource.java
-index 90deaaa..d7a07d9 100644
--- a/base/common/src/com/netscape/certsrv/tps/cert/TPSCertResource.java
+++ b/base/common/src/com/netscape/certsrv/tps/cert/TPSCertResource.java
@@ -23,7 +23,7 @@ import javax.ws.rs.PathParam;
@@ -277,8 +241,6 @@ index 90deaaa..d7a07d9 100644
/**
-diff --git a/base/common/src/com/netscape/certsrv/tps/config/ConfigResource.java b/base/common/src/com/netscape/certsrv/tps/config/ConfigResource.java
-index 1461b06..bae3022 100644
--- a/base/common/src/com/netscape/certsrv/tps/config/ConfigResource.java
+++ b/base/common/src/com/netscape/certsrv/tps/config/ConfigResource.java
@@ -21,7 +21,7 @@ import javax.ws.rs.GET;
@@ -290,8 +252,6 @@ index 1461b06..bae3022 100644
import com.netscape.certsrv.acls.ACLMapping;
import com.netscape.certsrv.authentication.AuthMethodMapping;
-diff --git a/base/common/src/com/netscape/certsrv/tps/connector/ConnectorResource.java b/base/common/src/com/netscape/certsrv/tps/connector/ConnectorResource.java
-index bede85c..e7a38be 100644
--- a/base/common/src/com/netscape/certsrv/tps/connector/ConnectorResource.java
+++ b/base/common/src/com/netscape/certsrv/tps/connector/ConnectorResource.java
@@ -25,7 +25,7 @@ import javax.ws.rs.PathParam;
@@ -303,8 +263,6 @@ index bede85c..e7a38be 100644
import com.netscape.certsrv.acls.ACLMapping;
import com.netscape.certsrv.authentication.AuthMethodMapping;
-diff --git a/base/common/src/com/netscape/certsrv/tps/profile/ProfileMappingResource.java b/base/common/src/com/netscape/certsrv/tps/profile/ProfileMappingResource.java
-index 0308615..dc1c2b8 100644
--- a/base/common/src/com/netscape/certsrv/tps/profile/ProfileMappingResource.java
+++ b/base/common/src/com/netscape/certsrv/tps/profile/ProfileMappingResource.java
@@ -25,7 +25,7 @@ import javax.ws.rs.PathParam;
@@ -316,8 +274,6 @@ index 0308615..dc1c2b8 100644
import com.netscape.certsrv.acls.ACLMapping;
import com.netscape.certsrv.authentication.AuthMethodMapping;
-diff --git a/base/common/src/com/netscape/certsrv/tps/profile/ProfileResource.java b/base/common/src/com/netscape/certsrv/tps/profile/ProfileResource.java
-index 8f0ebd0..f80cb0e 100644
--- a/base/common/src/com/netscape/certsrv/tps/profile/ProfileResource.java
+++ b/base/common/src/com/netscape/certsrv/tps/profile/ProfileResource.java
@@ -25,7 +25,7 @@ import javax.ws.rs.PathParam;
@@ -329,8 +285,6 @@ index 8f0ebd0..f80cb0e 100644
import com.netscape.certsrv.acls.ACLMapping;
import com.netscape.certsrv.authentication.AuthMethodMapping;
-diff --git a/base/common/src/com/netscape/certsrv/tps/token/TokenResource.java b/base/common/src/com/netscape/certsrv/tps/token/TokenResource.java
-index c37b027..c454c90 100644
--- a/base/common/src/com/netscape/certsrv/tps/token/TokenResource.java
+++ b/base/common/src/com/netscape/certsrv/tps/token/TokenResource.java
@@ -26,7 +26,7 @@ import javax.ws.rs.PathParam;
@@ -342,8 +296,6 @@ index c37b027..c454c90 100644
import com.netscape.certsrv.acls.ACLMapping;
import com.netscape.certsrv.authentication.AuthMethodMapping;
-diff --git a/base/common/src/com/netscape/certsrv/user/UserResource.java b/base/common/src/com/netscape/certsrv/user/UserResource.java
-index 8668221..4a957b5 100644
--- a/base/common/src/com/netscape/certsrv/user/UserResource.java
+++ b/base/common/src/com/netscape/certsrv/user/UserResource.java
@@ -27,7 +27,7 @@ import javax.ws.rs.PathParam;
@@ -355,3 +307,14 @@ index 8668221..4a957b5 100644
import com.netscape.certsrv.acls.ACLMapping;
import com.netscape.certsrv.authentication.AuthMethodMapping;
+--- a/base/javadoc/CMakeLists.txt
++++ b/base/javadoc/CMakeLists.txt
+@@ -98,7 +98,7 @@ javadoc(pki-javadoc
+ ${HTTPCLIENT_JAR} ${HTTPCORE_JAR}
+ ${JAXRS_API_JAR} ${RESTEASY_JAXRS_JAR} ${RESTEASY_ATOM_PROVIDER_JAR} ${RESTEASY_CLIENT_JAR}
+ ${PKI_CMSUTIL_JAR} ${PKI_CERTSRV_JAR} ${PKI_TOMCAT_JAR} ${PKI_CMS_JAR} ${PKI_TOOLS_JAR}
+- ${NUXWDOG_JAR}
++ ${NUXWDOG_JAR} ${RESTEASY_LEGACY_JAR}
+ OPTIONS
+ -windowtitle 'pki-javadoc'
+ -doctitle '<h1>PKI Javadoc</h1>'
commit 5f9eda39e66729295361b23591de17168f883dd1
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Wed Feb 15 11:45:06 2017 +0200
base, server, tools: Add new manpages.
diff --git a/debian/changelog b/debian/changelog
index 1cb5253..ad53324 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dogtag-pki (10.3.5+12-2) UNRELEASED; urgency=medium
+
+ * base, server, tools: Add new manpages.
+
+ -- Timo Aaltonen <tjaalton at debian.org> Wed, 15 Feb 2017 11:34:39 +0200
+
dogtag-pki (10.3.5+12-1) unstable; urgency=medium
* New upstream snapshot. Version number is derived from the Fedora
diff --git a/debian/pki-base.install b/debian/pki-base.install
index ecc0129..89be52b 100644
--- a/debian/pki-base.install
+++ b/debian/pki-base.install
@@ -4,6 +4,7 @@ usr/lib/python2*/dist-packages/pki/cli/*.py
usr/sbin/pki-upgrade
usr/share/doc/pki-base/html
usr/share/man/man1/pki-python-client.1
+usr/share/man/man5/pki-logging.5
usr/share/man/man8/pki-upgrade.8
usr/share/pki/VERSION
usr/share/pki/etc
diff --git a/debian/pki-server.install b/debian/pki-server.install
index ccb2f37..ddaba62 100644
--- a/debian/pki-server.install
+++ b/debian/pki-server.install
@@ -16,6 +16,7 @@ usr/share/java/pki/pki-cmscore.jar
usr/share/java/pki/pki-tomcat.jar
usr/share/man/man1/pkidaemon.1
usr/share/man/man5/pki_default.cfg.5
+usr/share/man/man5/pki-server-logging.5
usr/share/man/man8/pki-server-instance.8
usr/share/man/man8/pki-server-migrate.8
usr/share/man/man8/pki-server-nuxwdog.8
diff --git a/debian/pki-tools.install b/debian/pki-tools.install
index 9a1522d..a281b07 100644
--- a/debian/pki-tools.install
+++ b/debian/pki-tools.install
@@ -40,6 +40,9 @@ usr/share/man/man1/pki-client.1
usr/share/man/man1/pki-group.1
usr/share/man/man1/pki-group-member.1
usr/share/man/man1/pki-key.1
+usr/share/man/man1/pki-pkcs12.1
+usr/share/man/man1/pki-pkcs12-cert.1
+usr/share/man/man1/pki-pkcs12-key.1
usr/share/man/man1/pki-securitydomain.1
usr/share/man/man1/pki-tps-profile.1
usr/share/man/man1/pki-user.1
More information about the Pkg-freeipa-devel
mailing list