[SCM] kservice packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-9-g30f83b3

Harald Sitter apachelogger-guest at moszumanska.debian.org
Tue Jul 28 10:24:04 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kservice.git;a=commitdiff;h=30f83b3

The following commit has been merged in the kubuntu_unstable branch:
commit 30f83b3d470561d999a6d7b68966080dacae1f18
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Jul 28 12:23:19 2015 +0200

    don't double install manpages. it makes things explode
    
    dpkg: error processing archive /var/cache/apt/archives/libkf5service-
    bin_5.12.0+git20150723.1348+15.04-0_amd64.deb (--unpack):^M
     trying to overwrite '/usr/share/man/man8/kbuildsycoca5.8.gz', which is also
     in package libkf5service5:amd64 5.9.0-0ubuntu1
---
 debian/control                | 4 ++++
 debian/libkf5service5.install | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 89b4597..d31d991 100644
--- a/debian/control
+++ b/debian/control
@@ -34,6 +34,8 @@ Depends: libkf5config-dev (>= 5.12.0~),
          libkf5service5 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
+Breaks: libkf5service5 (<< 5.12.0~)
+Replaces: libkf5service5 (<< 5.12.0~)
 Description: development files for kservice
  Application framework for file type association
  and plugin locating.
@@ -64,6 +66,8 @@ Description: Advanced plugin and service introspection
 Package: libkf5service-bin
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libkf5service5 (<< 5.12.0~)
+Replaces: libkf5service5 (<< 5.12.0~)
 Description: Advanced plugin and service introspection
  Application framework for file type association
  and plugin locating.
diff --git a/debian/libkf5service5.install b/debian/libkf5service5.install
index 2ffc3e0..f27af04 100644
--- a/debian/libkf5service5.install
+++ b/debian/libkf5service5.install
@@ -1,4 +1,2 @@
 usr/lib/*/libKF5Service.so.5
 usr/lib/*/libKF5Service.so.5.*
-usr/share/man/*/man8/desktoptojson.8
-usr/share/man/*/man8/kbuildsycoca5.8

-- 
kservice packaging



More information about the pkg-kde-commits mailing list