[Pkg-freeipa-devel] dogtag-pki: Changes to 'master'

Timo Aaltonen tjaalton at moszumanska.debian.org
Tue Jul 28 14:52:15 UTC 2015 

 debian/changelog                         |    3 +++
 debian/control                           |    8 +++++---
 debian/patches/fix-default-settings.diff |    4 ++--
 debian/pki-base.install                  |    2 ++
 debian/pki-server.install                |    9 +++++++++
 debian/pki-tools.install                 |    4 ++++
 debian/pki-tps-client.install            |    1 +
 debian/rules                             |    5 +++--
 8 files changed, 29 insertions(+), 7 deletions(-)

New commits:
commit f3470720bbfe7690ebc111fbd47408c60949539c
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Tue Jul 28 17:36:32 2015 +0300

    install: Added new manpages, nuxwdog support, html docs to pki-base.

diff --git a/debian/changelog b/debian/changelog
index 8f0b16c..49631b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ dogtag-pki (10.2.6-1) UNRELEASED; urgency=medium
   * control, rules, patches: Migrate to tomcat8.
   * Build using tomcat8, update libtomcatjss-java build-dep.
   * control: Add libnuxwdog-java to build-depends, and pki-server depends.
+  * install: Added new manpages, nuxwdog support, html docs to pki-base.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Thu, 02 Apr 2015 15:45:06 +0300
 
diff --git a/debian/pki-base.install b/debian/pki-base.install
index e97b719..8541fd5 100644
--- a/debian/pki-base.install
+++ b/debian/pki-base.install
@@ -1,9 +1,11 @@
 etc/pki/pki.conf
 usr/lib/python*/dist-packages/pki/*.py
 usr/sbin/pki-upgrade
+usr/share/doc/pki-base/html
 usr/share/java/pki/pki-certsrv.jar
 usr/share/java/pki/pki-cmsutil.jar
 usr/share/java/pki/pki-nsutil.jar
+usr/share/man/man1/pki-python-client.1
 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 16e963c..524d758 100644
--- a/debian/pki-server.install
+++ b/debian/pki-server.install
@@ -1,9 +1,12 @@
 etc/pki/default.cfg
 lib/systemd/system/pki-tomcatd.target
 lib/systemd/system/pki-tomcatd at .service
+lib/systemd/system/pki-tomcatd-nuxwdog.target
+lib/systemd/system/pki-tomcatd-nuxwdog at .service
 usr/bin/pkidaemon
 usr/lib/python*/dist-packages/pki/server
 usr/sbin/pki-server
+usr/sbin/pki-server-nuxwdog
 usr/sbin/pki-server-upgrade
 usr/sbin/pkidestroy
 usr/sbin/pkispawn
@@ -11,8 +14,14 @@ usr/share/java/pki/pki-cms.jar
 usr/share/java/pki/pki-cmsbundle.jar
 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/man8/pki-server-instance.8
+usr/share/man/man8/pki-server-migrate.8
+usr/share/man/man8/pki-server-nuxwdog.8
+usr/share/man/man8/pki-server-subsystem.8
 usr/share/man/man8/pki-server-upgrade.8
+usr/share/man/man8/pki-server.8
 usr/share/man/man8/pkidestroy.8
 usr/share/man/man8/pkispawn.8
 usr/share/pki/deployment/config
diff --git a/debian/pki-tools.install b/debian/pki-tools.install
index 1a9a912..aa794eb 100644
--- a/debian/pki-tools.install
+++ b/debian/pki-tools.install
@@ -25,13 +25,17 @@ usr/bin/setpin
 usr/bin/sslget
 usr/bin/tkstool
 usr/share/java/pki/pki-tools.jar
+usr/share/man/man1/pki-audit.1
 usr/share/man/man1/pki-ca-profile.1
 usr/share/man/man1/pki-cert.1
 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-securitydomain.1
+usr/share/man/man1/pki-tps-profile.1
 usr/share/man/man1/pki-user.1
+usr/share/man/man1/pki-user-cert.1
 usr/share/man/man1/pki.1
 usr/share/pki/java-tools/
 usr/share/pki/native-tools/
diff --git a/debian/pki-tps-client.install b/debian/pki-tps-client.install
index 76b3c01..b7f5a12 100644
--- a/debian/pki-tps-client.install
+++ b/debian/pki-tps-client.install
@@ -1,3 +1,4 @@
 usr/bin/tpsclient
 usr/lib/tps/libtokendb.so
 usr/lib/tps/libtps.so
+usr/share/man/man1/tpsclient.1*

commit ca7508ad7429f10b013b66462f8f407d6d0a9987
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Tue Jul 28 17:10:07 2015 +0300

    control: Add libnuxwdog-java to build-depends, and pki-server depends.

diff --git a/debian/changelog b/debian/changelog
index 44caf60..8f0b16c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ dogtag-pki (10.2.6-1) UNRELEASED; urgency=medium
     proxy which is gone.
   * control, rules, patches: Migrate to tomcat8.
   * Build using tomcat8, update libtomcatjss-java build-dep.
+  * control: Add libnuxwdog-java to build-depends, and pki-server depends.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Thu, 02 Apr 2015 15:45:06 +0300
 
diff --git a/debian/control b/debian/control
index d5e18e2..556acf8 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,7 @@ Build-Depends:
  libldap2-dev,
  libnspr4-dev,
  libnss3-dev,
+ libnuxwdog-java,
  libresteasy-java,
  libservlet3.1-java,
  libsvrcore-dev,
@@ -132,6 +133,7 @@ Depends:
  libjackson2-jaxrs-providers-java,
  libjs-jquery,
  libjs-underscore,
+ libnuxwdog-java,
  libtomcatjss-java (>= 7.1.2),
  libxml-commons-external-java,
  libxml-commons-resolver1.1-java,

commit cbf5fe105ab1f5fd93f67cf293244daeb27687aa
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Tue Jul 28 17:07:54 2015 +0300

    Build using tomcat8, update libtomcatjss-java build-dep.

diff --git a/debian/changelog b/debian/changelog
index f692aa9..44caf60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ dogtag-pki (10.2.6-1) UNRELEASED; urgency=medium
   * control, pki-server.install: Clean up perl stuff, drop pki-setup-
     proxy which is gone.
   * control, rules, patches: Migrate to tomcat8.
+  * Build using tomcat8, update libtomcatjss-java build-dep.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Thu, 02 Apr 2015 15:45:06 +0300
 
diff --git a/debian/control b/debian/control
index 3558748..d5e18e2 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Build-Depends:
  libservlet3.1-java,
  libsvrcore-dev,
  libtomcat8-java,
- libtomcatjss-java (>= 7.1.0),
+ libtomcatjss-java (>= 7.1.2),
  libxalan2-java,
  libxerces2-java,
  pkg-config,
@@ -132,13 +132,13 @@ Depends:
  libjackson2-jaxrs-providers-java,
  libjs-jquery,
  libjs-underscore,
- libtomcatjss-java (>= 7.1.0),
+ libtomcatjss-java (>= 7.1.2),
  libxml-commons-external-java,
  libxml-commons-resolver1.1-java,
  pki-base (= ${binary:Version}),
  pki-tools (= ${binary:Version}),
  python-selinux,
- tomcat7-user,
+ tomcat8-user,
  velocity,
  ${java:Depends},
  ${misc:Depends},
diff --git a/debian/patches/fix-default-settings.diff b/debian/patches/fix-default-settings.diff
index fecefbd..490f639 100644
--- a/debian/patches/fix-default-settings.diff
+++ b/debian/patches/fix-default-settings.diff
@@ -16,8 +16,8 @@
 -pki_tomcat_bin_path=/usr/share/tomcat/bin
 -pki_tomcat_lib_path=/usr/share/tomcat/lib
 -pki_tomcat_systemd=/usr/sbin/tomcat
-+pki_tomcat_bin_path=/usr/share/tomcat7/bin
-+pki_tomcat_lib_path=/usr/share/tomcat7/lib
++pki_tomcat_bin_path=/usr/share/tomcat8/bin
++pki_tomcat_lib_path=/usr/share/tomcat8/lib
 +pki_tomcat_systemd=/etc/init.d/pki-tomcatd
  pki_source_catalina_properties=%(pki_source_server_path)s/catalina.properties
  pki_source_servercertnick_conf=%(pki_source_server_path)s/serverCertNick.conf
diff --git a/debian/rules b/debian/rules
index d67e26e..6deef5a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,8 +43,9 @@ confflags-common = $(confflags) \
 	-DPKI_NSUTIL_JAR=$(DEB_BUILD_DIR)/core/dist/pki-nsutil.jar \
 	-DHTTPCLIENT_JAR=/usr/share/java/httpclient.jar \
 	-DHTTPCORE_JAR=/usr/share/java/httpcore.jar \
-	-DTOMCAT_CATALINA_JAR=/usr/share/java/tomcat-catalina.jar \
-	-DTOMCAT_UTIL_JAR=/usr/share/java/tomcat-util.jar \
+	-DTOMCAT_CATALINA_JAR=/usr/share/java/tomcat8-catalina.jar \
+	-DTOMCAT_UTIL_JAR=/usr/share/java/tomcat8-util.jar \
+	-DTOMCAT_UTIL_SCAN_JAR=/usr/share/java/tomcat8-util-scan.jar \
 
 confflags-core = \
 	-DBUILD_PKI_CORE:BOOL=ON \

More information about the Pkg-freeipa-devel mailing list