[SCM] cervisia packaging branch, master, updated. debian/4%17.08.0-1-13-g94d0649

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/cervisia.git;a=commitdiff;h=60dd199

The following commit has been merged in the master branch:
commit 60dd199608f3ea09cba4678e1567a4a45e7d3e9f
Author: Pino Toscano <pino at debian.org>
Date:   Sun Nov 26 09:01:42 2017 +0100

    move cvsaskpass from cervisia to cvsservice
---
 debian/cervisia.install    | 1 -
 debian/cervisia.manpages   | 1 -
 debian/changelog           | 2 ++
 debian/control             | 4 ++--
 debian/cvsservice.install  | 1 +
 debian/cvsservice.manpages | 1 +
 6 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/cervisia.install b/debian/cervisia.install
index 070caed..9e614d1 100644
--- a/debian/cervisia.install
+++ b/debian/cervisia.install
@@ -1,6 +1,5 @@
 usr/bin/cervisia
 usr/lib/*/libkdeinit5_cervisia.so
-usr/lib/*/libkdeinit5_cvsaskpass.so
 usr/lib/*/qt5/plugins/cervisiapart5.so
 usr/share/applications/org.kde.cervisia.desktop
 usr/share/config.kcfg/cervisiapart.kcfg
diff --git a/debian/cervisia.manpages b/debian/cervisia.manpages
deleted file mode 100644
index 6a3892d..0000000
--- a/debian/cervisia.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/cvsaskpass.1
diff --git a/debian/changelog b/debian/changelog
index 1bf16d1..a62d71a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ cervisia (4:17.08.3-0r1) UNRELEASED; urgency=medium
   * Remove breaks/replaces in cervisia against older versions of cvsservice:
     cervisia already requires the very same version of cvsservice.
   * Rename the local cvsservice man page to cvsservice5.
+  * Move few cvsaskpass bits from cervisia to cvsservice, where the rest of it
+    is already; add proper breaks/replaces.
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 31 Oct 2017 17:58:19 +0100
 
diff --git a/debian/control b/debian/control
index 9d744dd..477206b 100644
--- a/debian/control
+++ b/debian/control
@@ -47,8 +47,8 @@ Package: cvsservice
 Architecture: any
 Section: vcs
 Depends: cvs, ${misc:Depends}, ${shlibs:Depends}
-Replaces: libcvsservice0, ${kde-l10n:all}
-Breaks: libcvsservice0, ${kde-l10n:all}
+Replaces: libcvsservice0, cervisia (<< 4:17.08.3-1~), ${kde-l10n:all}
+Breaks: libcvsservice0, cervisia (<< 4:17.08.3-1~), ${kde-l10n:all}
 Description: D-Bus service for accessing CVS repositories
  This package provides a D-Bus service for browsing and manipulating
  remote CVS repositories.  Applications may make use of it directly from
diff --git a/debian/cvsservice.install b/debian/cvsservice.install
index 0e9097b..a937563 100644
--- a/debian/cvsservice.install
+++ b/debian/cvsservice.install
@@ -1,5 +1,6 @@
 usr/bin/cvsaskpass
 usr/bin/cvsservice5
+usr/lib/*/libkdeinit5_cvsaskpass.so
 usr/lib/*/libkdeinit5_cvsservice.so
 usr/share/dbus-1/interfaces/org.kde.cervisia5.cvsjob.xml
 usr/share/dbus-1/interfaces/org.kde.cervisia5.cvsloginjob.xml
diff --git a/debian/cvsservice.manpages b/debian/cvsservice.manpages
index 6ecdee4..283f812 100644
--- a/debian/cvsservice.manpages
+++ b/debian/cvsservice.manpages
@@ -1 +1,2 @@
+debian/man/cvsaskpass.1
 debian/man/cvsservice5.1

-- 
cervisia packaging