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

Tue Oct 6 19:29:34 UTC 2015

debian/changelog                   |   14 ++++++++++++--
 debian/patches/debian-support.diff |   17 ++++++++++++-----
 debian/pki-base.postrm             |    1 +
 3 files changed, 25 insertions(+), 7 deletions(-)

New commits:
commit df479e849ae246dd68709f14ca95e26002e82d13
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Tue Oct 6 22:29:12 2015 +0300

    pki-base.postrm: Remove upgrade logs on purge. (Closes: #801139)

diff --git a/debian/changelog b/debian/changelog
index 5826b30..d7abf9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dogtag-pki (10.2.6-3) UNRELEASED; urgency=medium
+
+  * pki-base.postrm: Remove upgrade logs on purge. (Closes: #801139)
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Tue, 06 Oct 2015 22:29:04 +0300
+
 dogtag-pki (10.2.6-2) unstable; urgency=medium
 
   * pki-server.dirs: Add pki-tomcatd-nuxwdog.target.wants.
diff --git a/debian/pki-base.postrm b/debian/pki-base.postrm
index 7f48c71..44a2894 100644
--- a/debian/pki-base.postrm
+++ b/debian/pki-base.postrm
@@ -3,6 +3,7 @@ set -e
 
 if [ "$1" = purge ]; then
     rm -f /etc/pki/pki.version
+    rm -f /var/log/pki/pki-upgrade-*.log
 fi
 
 

commit 8e2d303deecd802ea79803729f280e27a841acbd
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Thu Oct 1 08:15:01 2015 +0300

    releasing package dogtag-pki version 10.2.6-2

diff --git a/debian/changelog b/debian/changelog
index 39d78af..5826b30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dogtag-pki (10.2.6-2) UNRELEASED; urgency=medium
+dogtag-pki (10.2.6-2) unstable; urgency=medium
 
   * pki-server.dirs: Add pki-tomcatd-nuxwdog.target.wants.
   * base.postrm: No need to remove /etc/pki here.
@@ -7,7 +7,7 @@ dogtag-pki (10.2.6-2) UNRELEASED; urgency=medium
   * debian-support.diff: Import /lib/lsb/init-functions in
     scripts/operations. (Closes: #800559)
 
- -- Timo Aaltonen <tjaalton at debian.org>  Fri, 25 Sep 2015 06:10:06 +0300
+ -- Timo Aaltonen <tjaalton at debian.org>  Thu, 01 Oct 2015 08:14:52 +0300
 
 dogtag-pki (10.2.6-1) unstable; urgency=medium
 

commit b6aeac96429ba4cd2e75a51cca8d1a5b1121db09
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Thu Oct 1 08:07:20 2015 +0300

    debian-support.diff: Import /lib/lsb/init-functions in scripts/operations. (Closes: #800559)

diff --git a/debian/changelog b/debian/changelog
index 8a061ea..39d78af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ dogtag-pki (10.2.6-2) UNRELEASED; urgency=medium
   * base.postrm: No need to remove /etc/pki here.
   * debian-support.diff: Drop /etc/default/tomcat8, was a leftover from
     t8 testing. (Closes: #800558)
+  * debian-support.diff: Import /lib/lsb/init-functions in
+    scripts/operations. (Closes: #800559)
 
  -- Timo Aaltonen <tjaalton at debian.org>  Fri, 25 Sep 2015 06:10:06 +0300
 
diff --git a/debian/patches/debian-support.diff b/debian/patches/debian-support.diff
index 747d5f6..2b0bdc8 100644
--- a/debian/patches/debian-support.diff
+++ b/debian/patches/debian-support.diff
@@ -82,7 +82,15 @@ Description: changes for Debian
          for root, _dirs, names in os.walk(deployment_root):
 --- a/base/server/scripts/operations
 +++ b/base/server/scripts/operations
-@@ -144,7 +144,7 @@ usage()
+@@ -38,6 +38,7 @@ default_error=0
+ 
+ if [ -f /etc/debian_version ]; then
+     debian=true
++    . /lib/lsb/init-functions
+ else
+     debian=false
+ fi
+@@ -144,7 +145,7 @@ usage()
  list_instances()
  {
      echo
@@ -91,7 +99,7 @@ Description: changes for Debian
          if [ -d "${INSTANCE}" ] ; then
              instance_name=`basename ${INSTANCE}`
              echo "    $instance_name"
-@@ -952,7 +952,7 @@ verify_symlinks()
+@@ -952,7 +953,7 @@ verify_symlinks()
      # Dogtag 10 Symbolic Link Variables
      java_dir="/usr/share/java"
      pki_common_jar_dir="${PKI_INSTANCE_PATH}/common/lib"
@@ -100,7 +108,7 @@ Description: changes for Debian
  
      # Dogtag 10 Systemd variables
      systemd_dir="/lib/systemd/system"
-@@ -1507,8 +1507,8 @@ set_debian_tomcat_parameters()
+@@ -1507,8 +1508,8 @@ set_debian_tomcat_parameters()
      fi
  
      # overwrite with settings from the registry file

commit 1664253b0a06cb1e645638f0295aaef82bc17afc
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Thu Oct 1 08:04:29 2015 +0300

    debian-support.diff: Drop /etc/default/tomcat8, was a leftover from t8 testing. (Closes: #800558)

diff --git a/debian/changelog b/debian/changelog
index 637d5b2..8a061ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ dogtag-pki (10.2.6-2) UNRELEASED; urgency=medium
 
   * pki-server.dirs: Add pki-tomcatd-nuxwdog.target.wants.
   * base.postrm: No need to remove /etc/pki here.
+  * debian-support.diff: Drop /etc/default/tomcat8, was a leftover from
+    t8 testing. (Closes: #800558)
 
  -- Timo Aaltonen <tjaalton at debian.org>  Fri, 25 Sep 2015 06:10:06 +0300
 
diff --git a/debian/patches/debian-support.diff b/debian/patches/debian-support.diff
index c2646ce..747d5f6 100644
--- a/debian/patches/debian-support.diff
+++ b/debian/patches/debian-support.diff
@@ -124,12 +124,11 @@ Description: changes for Debian
  
 --- a/base/server/share/lib/systemd/system/pki-tomcatd at .service
 +++ b/base/server/share/lib/systemd/system/pki-tomcatd at .service
-@@ -4,9 +4,9 @@ PartOf=pki-tomcatd.target
+@@ -4,9 +4,8 @@ PartOf=pki-tomcatd.target
  
  [Service]
  Type=simple
 -EnvironmentFile=/etc/tomcat/tomcat.conf
-+EnvironmentFile=/etc/default/tomcat8
  Environment="NAME=%i"
 -EnvironmentFile=-/etc/sysconfig/%i
 +EnvironmentFile=-/etc/default/%i

