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

[Timo Aaltonen]

 debian/changelog         |   11 +++++++++++
 debian/control           |    1 -
 debian/pki-base.postinst |    4 ++--
 debian/pki-ca.dirs       |    2 --
 debian/pki-kra.dirs      |    2 --
 debian/pki-ocsp.dirs     |    2 --
 debian/pki-tks.dirs      |    1 -
 debian/pki-tps.dirs      |    2 --
 8 files changed, 13 insertions(+), 12 deletions(-)

New commits:
commit 9c465130a7a3eab226880f90ac8fcb37200c67d0
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Mon Apr 25 17:23:56 2016 +0300

    pki-base.postinst: Strip extra cruft from version number for pki- upgrade, only the upstream base version matters. (Closes: #821909)

diff --git a/debian/changelog b/debian/changelog
index 8a425f6..ffc90c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ dogtag-pki (10.2.6+git20160317-2) UNRELEASED; urgency=medium
     long gone anyway.
   * control: Drop selinux-policy-dev from build-depends. (Closes:
     #821810)
+  * pki-base.postinst: Strip extra cruft from version number for pki-
+    upgrade, only the upstream base version matters. (Closes: #821909)
 
  -- Timo Aaltonen <tjaalton at debian.org>  Wed, 06 Apr 2016 00:41:21 +0300
 
diff --git a/debian/pki-base.postinst b/debian/pki-base.postinst
index 8c77d57..d7b81b8 100644
--- a/debian/pki-base.postinst
+++ b/debian/pki-base.postinst
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
-OLD_VERSION=`echo $2 | sed 's/-.*//'`
-VERSION=`dpkg-query -W pki-base | sed 's/.*\t//;s/-.*//'`
+OLD_VERSION=`echo $2 | sed 's/-.*//;s/+git.*//'`
+VERSION=`dpkg-query -W pki-base | sed 's/.*\t//;s/-.*//;s/+git.*//'`
 
 if [ "$1" = configure ]; then
     # we've forgot to create pki.version before, do it here

commit 253e498426f897ed73514c9adf4682ffc2a9ad4e
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Mon Apr 25 17:16:30 2016 +0300

    control: Drop selinux-policy-dev from build-depends. (Closes: #821810)

diff --git a/debian/changelog b/debian/changelog
index ccd2ce4..8a425f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ dogtag-pki (10.2.6+git20160317-2) UNRELEASED; urgency=medium
 
   * pki-{ca,kra,ocsp,tks,tps}.dirs: Deleted, the obsolete targets are
     long gone anyway.
+  * control: Drop selinux-policy-dev from build-depends. (Closes:
+    #821810)
 
  -- Timo Aaltonen <tjaalton at debian.org>  Wed, 06 Apr 2016 00:41:21 +0300
 
diff --git a/debian/control b/debian/control
index 5fcac26..5f25740 100644
--- a/debian/control
+++ b/debian/control
@@ -34,7 +34,6 @@ Build-Depends:
  policycoreutils,
  python-dev,
  python-sphinx,
- selinux-policy-dev,
  velocity,
  zlib1g-dev,
 Standards-Version: 3.9.5

commit 098edfaf54159e9543a05e762d0f4b1a58fec9b9
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Wed Apr 6 00:41:26 2016 +0300

    pki-{ca,kra,ocsp,tks,tps}.dirs: Deleted, the obsolete targets are long gone anyway.

diff --git a/debian/changelog b/debian/changelog
index 4ce81c0..ccd2ce4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dogtag-pki (10.2.6+git20160317-2) UNRELEASED; urgency=medium
+
+  * pki-{ca,kra,ocsp,tks,tps}.dirs: Deleted, the obsolete targets are
+    long gone anyway.
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Wed, 06 Apr 2016 00:41:21 +0300
+
 dogtag-pki (10.2.6+git20160317-1) unstable; urgency=medium
 
   * update to current 10_2_6_BRANCH.
diff --git a/debian/pki-ca.dirs b/debian/pki-ca.dirs
deleted file mode 100644
index 77cee8f..0000000
--- a/debian/pki-ca.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-etc/systemd/system/pki-cad.target.wants
-
diff --git a/debian/pki-kra.dirs b/debian/pki-kra.dirs
deleted file mode 100644
index bb7192c..0000000
--- a/debian/pki-kra.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-etc/systemd/system/pki-krad.target.wants
-
diff --git a/debian/pki-ocsp.dirs b/debian/pki-ocsp.dirs
deleted file mode 100644
index 1e9733e..0000000
--- a/debian/pki-ocsp.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-etc/systemd/system/pki-ocspd.target.wants
-
diff --git a/debian/pki-tks.dirs b/debian/pki-tks.dirs
deleted file mode 100644
index 15529b8..0000000
--- a/debian/pki-tks.dirs
+++ /dev/null
@@ -1 +0,0 @@
-etc/systemd/system/pki-tksd.target.wants
diff --git a/debian/pki-tps.dirs b/debian/pki-tps.dirs
deleted file mode 100644
index 77254cd..0000000
--- a/debian/pki-tps.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-etc/systemd/system/pki-tpsd.target.wants
-