[Pkg-swan-devel] Bug#767561: [Pkg-freeipa-devel] Bug#767561: pki-tools, strongswan-starter: error when trying to install together

[Timo Aaltonen]

On 02.11.2014 19:20, Romain Francoise wrote:
> severity 767561 important
> quit
> 
> On Sat, Nov 01, 2014 at 11:37:48AM +0200, Timo Aaltonen wrote:
>> I don't mind adding a Conflicts. On Fedora though strongswan changed
>> the binary/manpage name to strongswan-pki: [...]
> 
> Either solution would be fine with me, but in the meantime this bug will
> block strongswan's migration to testing before the freeze, so I'm
> downgrading it to important and we can see how to handle this in the
> coming weeks.

Strongswan 5.2.1-4 is now in testing, how about the following diff applied
quickly so that dogtag-pki could migrate before the freeze?


diff --git a/debian/changelog b/debian/changelog
index 1cf0050..c02b490 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+strongswan (5.2.1-5) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * rules, strongswan-starter.install: Rename pki to strongswan-pki to
+    avoid conflict with pki-tools. (Closes: #767561)
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Tue, 04 Nov 2014 20:57:31 +0200
+
 strongswan (5.2.1-4) unstable; urgency=medium
 
   * Give up on trying to run the test suite on !amd64, it now times out on
diff --git a/debian/rules b/debian/rules
index ba9eefa..a18e7bc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,6 +83,10 @@ override_dh_auto_clean:
 
 override_dh_install:
 
+       # rename $bin/pki to avoid conflict with dogtag/pki-tools
+       mv $(CURDIR)/debian/tmp/usr/bin/pki $(CURDIR)/debian/tmp/usr/bin/strongswan-pki
+       mv $(CURDIR)/debian/tmp/usr/share/man/man1/pki.1 $(CURDIR)/debian/tmp/usr/share/man/man1/strongswan-pki.1
+
        # first special cases
 ifeq ($(DEB_BUILD_ARCH_OS),linux)
        # handle Linux-only plugins
diff --git a/debian/strongswan-starter.install b/debian/strongswan-starter.install
index 5d765ee..a2a5374 100644
--- a/debian/strongswan-starter.install
+++ b/debian/strongswan-starter.install
@@ -19,7 +19,7 @@ usr/lib/ipsec/_updown_espmark
 usr/share/man/man8/_updown.8
 usr/share/man/man8/_updown_espmark.8
 #tools
-usr/bin/pki
+usr/bin/strongswan-pki
 usr/lib/ipsec/scepclient
 usr/share/man/man8/scepclient.8
 usr/share/man/man1/pki---acert.1
@@ -33,7 +33,7 @@ usr/share/man/man1/pki---req.1
 usr/share/man/man1/pki---self.1
 usr/share/man/man1/pki---signcrl.1
 usr/share/man/man1/pki---verify.1
-usr/share/man/man1/pki.1
+usr/share/man/man1/strongswan-pki.1
 usr/share/strongswan/templates/config/strongswan.d/pki.conf
 usr/share/strongswan/templates/config/strongswan.d/scepclient.conf
 etc/strongswan.d/pki.conf