[SCM] cervisia packaging branch, master, updated. debian/16.08.2-1-61-g5411422

Maximiliano Curia maxy at moszumanska.debian.org
Sun Sep 3 16:27:09 UTC 2017 

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

The following commit has been merged in the master branch:
commit c932023a3e16ec48d7fac2241ca71b44bcd7c130
Merge: 0052c88922c920e70f45d6416df6a23a4fec4ea9 9f4daaee05ffa847dafbce94454bb0325822fc07
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Sep 3 17:41:06 2017 +0200

    Merge remote-tracking branch 'neon/Neon/stable'

 debian/cervisia.install             |   7 ++-
 debian/cervisia.lintian-overrides   |   4 ++
 debian/changelog                    |  84 +++++++++++++++++++++++++++
 debian/control                      |   9 ++-
 debian/cvsservice.install           |   2 +-
 debian/cvsservice.lintian-overrides |   4 +-
 debian/not-installed                |   5 +-
 debian/rules                        |   3 +
 debian/upstream/signing-key.asc     | 112 ++++++++++++++++++++++++++++++++++++
 debian/watch                        |   4 +-
 10 files changed, 222 insertions(+), 12 deletions(-)

diff --cc debian/cervisia.install
index 166eb4b,7862dd8..ebb899e
--- a/debian/cervisia.install
+++ b/debian/cervisia.install
@@@ -1,18 -1,50 +1,23 @@@
  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/appdata/org.kde.cervisia.appdata.xml
 +usr/share/applications/org.kde.cervisia5.desktop
  usr/share/config.kcfg/cervisiapart.kcfg
- usr/share/doc/HTML/en/cervisia/
+ usr/share/doc/HTML/*/cervisia/
 -usr/share/doc/HTML/en/cervisia/
 -usr/share/icons/hicolor/16x16/actions/vcs-add-cvs-cervisia.png
 -usr/share/icons/hicolor/16x16/actions/vcs-commit-cvs-cervisia.png
 -usr/share/icons/hicolor/16x16/actions/vcs-diff-cvs-cervisia.png
 -usr/share/icons/hicolor/16x16/actions/vcs-remove-cvs-cervisia.png
 -usr/share/icons/hicolor/16x16/actions/vcs-status-cvs-cervisia.png
 -usr/share/icons/hicolor/16x16/actions/vcs-update-cvs-cervisia.png
 -usr/share/icons/hicolor/16x16/apps/cervisia.png
 -usr/share/icons/hicolor/22x22/actions/vcs-add-cvs-cervisia.png
 -usr/share/icons/hicolor/22x22/actions/vcs-commit-cvs-cervisia.png
 -usr/share/icons/hicolor/22x22/actions/vcs-diff-cvs-cervisia.png
 -usr/share/icons/hicolor/22x22/actions/vcs-remove-cvs-cervisia.png
 -usr/share/icons/hicolor/22x22/actions/vcs-status-cvs-cervisia.png
 -usr/share/icons/hicolor/22x22/actions/vcs-update-cvs-cervisia.png
 -usr/share/icons/hicolor/22x22/apps/cervisia.png
 -usr/share/icons/hicolor/32x32/actions/vcs-add-cvs-cervisia.png
 -usr/share/icons/hicolor/32x32/actions/vcs-commit-cvs-cervisia.png
 -usr/share/icons/hicolor/32x32/actions/vcs-diff-cvs-cervisia.png
 -usr/share/icons/hicolor/32x32/actions/vcs-remove-cvs-cervisia.png
 -usr/share/icons/hicolor/32x32/actions/vcs-status-cvs-cervisia.png
 -usr/share/icons/hicolor/32x32/actions/vcs-update-cvs-cervisia.png
 -usr/share/icons/hicolor/32x32/apps/cervisia.png
 -usr/share/icons/hicolor/48x48/actions/vcs-add-cvs-cervisia.png
 -usr/share/icons/hicolor/48x48/actions/vcs-commit-cvs-cervisia.png
 -usr/share/icons/hicolor/48x48/actions/vcs-diff-cvs-cervisia.png
 -usr/share/icons/hicolor/48x48/actions/vcs-remove-cvs-cervisia.png
 -usr/share/icons/hicolor/48x48/actions/vcs-status-cvs-cervisia.png
 -usr/share/icons/hicolor/48x48/actions/vcs-update-cvs-cervisia.png
 -usr/share/icons/hicolor/48x48/apps/cervisia.png
 -usr/share/icons/hicolor/scalable/actions/vcs-add-cvs-cervisia.svgz
 -usr/share/icons/hicolor/scalable/actions/vcs-commit-cvs-cervisia.svgz
 -usr/share/icons/hicolor/scalable/actions/vcs-diff-cvs-cervisia.svgz
 -usr/share/icons/hicolor/scalable/actions/vcs-remove-cvs-cervisia.svgz
 -usr/share/icons/hicolor/scalable/actions/vcs-status-cvs-cervisia.svgz
 -usr/share/icons/hicolor/scalable/actions/vcs-update-cvs-cervisia.svgz
 -usr/share/knotifications5/cervisia.notifyrc
 +usr/share/icons/hicolor/*/actions/vcs-add-cvs-cervisia.*
 +usr/share/icons/hicolor/*/actions/vcs-commit-cvs-cervisia.*
 +usr/share/icons/hicolor/*/actions/vcs-diff-cvs-cervisia.*
 +usr/share/icons/hicolor/*/actions/vcs-remove-cvs-cervisia.*
 +usr/share/icons/hicolor/*/actions/vcs-status-cvs-cervisia.*
 +usr/share/icons/hicolor/*/actions/vcs-update-cvs-cervisia.*
 +usr/share/icons/hicolor/*/apps/cervisia.*
  usr/share/kservices5/org.kde.cervisiapart5.desktop
 -usr/share/kxmlgui5/cervisia/cervisiashellui.rc
 +usr/share/kxmlgui5/cervisia/
  usr/share/kxmlgui5/cervisiapart/cervisiaui.rc
++usr/share/knotifications5/cervisia.notifyrc
+ usr/share/locale/*/LC_MESSAGES/cervisia.mo
+ usr/share/man/*/man1/cervisia.1
  usr/share/man/man1/cervisia.1
+ usr/share/metainfo/org.kde.cervisia.appdata.xml
diff --cc debian/cervisia.lintian-overrides
index f79835d,ed0e1e2..908b8ba
--- a/debian/cervisia.lintian-overrides
+++ b/debian/cervisia.lintian-overrides
@@@ -1,1 -1,4 +1,5 @@@
 -cervisia: package-name-doesnt-match-sonames libkdeinit5-cervisia libkdeinit5-cvsaskpass
 -cervisia: shlib-without-versioned-soname usr/lib/*/libkdeinit5_cvsaskpass.so libkdeinit5_cvsaskpass.so
 -cervisia: shlib-without-versioned-soname usr/lib/*/libkdeinit5_cervisia.so libkdeinit5_cervisia.so
 -cervisia: postinst-must-call-ldconfig usr/lib/*/libkdeinit5_cvsaskpass.so
 +package-must-activate-ldconfig-trigger usr/lib/*/libkdeinit5_cervisia.so
++package-name-doesnt-match-sonames libkdeinit5-cervisia libkdeinit5-cvsaskpass
++shlib-without-versioned-soname usr/lib/*/libkdeinit5_cvsaskpass.so libkdeinit5_cvsaskpass.so
++shlib-without-versioned-soname usr/lib/*/libkdeinit5_cervisia.so libkdeinit5_cervisia.so
++postinst-must-call-ldconfig usr/lib/*/libkdeinit5_cvsaskpass.so
diff --cc debian/changelog
index d3b0df7,2768f12..d69bbb1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,87 +1,99 @@@
+ cervisia (4:17.08.0-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Thu, 17 Aug 2017 09:31:11 +0000
+ 
+ cervisia (4:17.04.3-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Wed, 12 Jul 2017 10:18:23 +0000
+ 
+ cervisia (4:17.04.2-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Wed, 07 Jun 2017 12:19:52 +0000
+ 
+ cervisia (4:17.04.1-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Thu, 11 May 2017 18:11:14 +0000
+ 
+ cervisia (4:17.04.0-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Wed, 19 Apr 2017 13:02:25 +0000
+ 
+ cervisia (4:16.12.3-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Wed, 08 Mar 2017 13:46:12 +0000
+ 
+ cervisia (4:16.12.2-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Wed, 08 Feb 2017 16:55:55 +0000
+ 
+ cervisia (4:16.12.1-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Wed, 11 Jan 2017 13:13:44 +0000
+ 
+ cervisia (4:16.12.0-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Wed, 14 Dec 2016 16:23:09 +0000
+ 
+ cervisia (4:16.08.3-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Mon, 21 Nov 2016 13:52:10 +0000
+ 
 +cervisia (4:16.08.2-1) unstable; urgency=medium
 +
 +  [ Automatic packaging ]
 +  * Update build-deps and deps with the info from cmake
 +
 +  [ Maximiliano Curia ]
 +  * New upstream release (16.08.2)
 +  * Update build dependencies
 +  * Update install files
 +
 + -- Maximiliano Curia <maxy at debian.org>  Mon, 17 Oct 2016 21:42:11 +0200
 +
+ cervisia (4:16.08.2-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Fri, 14 Oct 2016 13:38:13 +0000
+ 
+ cervisia (4:16.08.1-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Fri, 16 Sep 2016 13:04:57 +0000
+ 
+ cervisia (4:16.08.0-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Wed, 17 Aug 2016 11:47:01 +0000
+ 
+ cervisia (4:16.04.3-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Tue, 12 Jul 2016 11:39:38 +0000
+ 
  cervisia (4:16.04.2-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index 4403cd8,fa4810e..461d25c
--- a/debian/control
+++ b/debian/control
@@@ -7,11 -7,12 +7,12 @@@ Uploaders: Sune Vuorela <sune at debian.or
             Modestas Vainius <modax at debian.org>,
             George Kiagiadakis <kiagiadakis.george at gmail.com>,
             Maximiliano Curia <maxy at debian.org>
 -Build-Depends: cmake (>= 2.6~),
 +Build-Depends: cmake (>= 2.8.12~),
                 debhelper (>= 9),
 -               extra-cmake-modules,
 -               kdoctools-dev,
 +               extra-cmake-modules (>= 1.3.0~),
 +               libkf5doctools-dev,
                 kinit-dev,
+                libkf5config-dev,
                 libkf5iconthemes-dev,
                 libkf5itemviews-dev,
                 libkf5notifications-dev,
@@@ -28,8 -28,10 +29,10 @@@ Vcs-Git: https://anonscm.debian.org/git
  Package: cervisia
  Architecture: any
  Section: devel
--Depends: cvsservice, ${misc:Depends}, ${shlibs:Depends}
++Depends: cvsservice (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
  Suggests: khelpcenter
 -Breaks: ${kde-l10n:all}
 -Replaces: ${kde-l10n:all}
++Breaks: ${kde-l10n:all}, cvsservice (<< 4:17.08~)
++Replaces: ${kde-l10n:all}, cvsservice (<< 4:17.08~)
  Description: graphical CVS client
   Cervisia is a front-end for the CVS version control system client.
   .
diff --cc debian/cvsservice.lintian-overrides
index 7e04cd1,2b209bc..b6dbca6
--- a/debian/cvsservice.lintian-overrides
+++ b/debian/cvsservice.lintian-overrides
@@@ -1,2 -1,3 +1,4 @@@
 -cvsservice: package-name-doesnt-match-sonames libkdeinit5-cvsservice
 -cvsservice: shlib-without-versioned-soname usr/lib/*/libkdeinit5_cvsservice.so libkdeinit5_cvsservice.so
 -cvsservice: postinst-must-call-ldconfig usr/lib/*/libkdeinit5_cvsservice.so
 +package-must-activate-ldconfig-trigger usr/lib/*/libkdeinit5_cvsservice.so
- 
++package-name-doesnt-match-sonames libkdeinit5-cvsservice
++shlib-without-versioned-soname usr/lib/*/libkdeinit5_cvsservice.so libkdeinit5_cvsservice.so
++postinst-must-call-ldconfig usr/lib/*/libkdeinit5_cvsservice.so

-- 
cervisia packaging

More information about the pkg-kde-commits mailing list