[SCM] libkpeople packaging branch, master, updated. debian/0.2.2-2-11-g144267b

Diane Trout diane-guest at moszumanska.debian.org
Tue Oct 7 05:25:32 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/libkpeople.git;a=commitdiff;h=144267b

The following commit has been merged in the master branch:
commit 144267bb6756a74880560aa7a06400a5d0fa2457
Author: Diane Trout <diane at ghic.org>
Date:   Mon Oct 6 22:17:54 2014 -0700

    Split desktop files out from the libkpeople library into libkpeople-data.
    
    * Split desktop files out from the libkpeople library
      into libkpeople-data.
      - hopefully this means fewer breaks/replaces in the future.
    * Add Breaks/Replaces to remove libkpeople3
---
 debian/changelog                                        |  4 ++++
 debian/control                                          | 14 +++++++++++++-
 debian/{libkpeople4.install => libkpeople-data.install} |  2 --
 debian/libkpeople4.install                              |  7 -------
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 076d2b3..e4d8c63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ libkpeople (0.3.0-1) UNRELEASED; urgency=medium
   * Remove library_startswith_soname.patch applied upstream.
   * Rename libkpeople3 to libkpeople4 to match SONAME
   * Update libkpeople4 symbols file for 0.3.0
+  * Split desktop files out from the libkpeople library
+    into libkpeople-data.
+    - hopefully this means fewer breaks/replaces in the future.
+  * Add Breaks/Replaces to remove libkpeople3
 
  -- Diane Trout <diane at ghic.org>  Sat, 20 Sep 2014 10:58:21 -0700
 
diff --git a/debian/control b/debian/control
index f429f77..073f41b 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Description: development files for libkpeople
 
 Package: libkpeople4
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: libkpeople-data (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: Library providing access to and grouping for KDE contacts
  libkpeople allow grouping multiple accounts into a
  single identity.
@@ -33,6 +33,18 @@ Description: Library providing access to and grouping for KDE contacts
  This library allows you to read metadata and initiate
  various actions for a contact.
 
+Package: libkpeople-data
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libkpeople3 (<< 0.3.0~)
+Replaces: libkpeople3 (<< 0.3.0~)
+Description: Support files for used by libkpeople
+ libkpeople allow grouping multiple accounts into a
+ single identity.
+ .
+ This package contains plugins and service files to
+ integrage kpeople support.
+
 Package: libkpeople4-dbg
 Section: debug
 Priority: extra
diff --git a/debian/libkpeople4.install b/debian/libkpeople-data.install
similarity index 85%
copy from debian/libkpeople4.install
copy to debian/libkpeople-data.install
index f9ef106..a47a3fb 100644
--- a/debian/libkpeople4.install
+++ b/debian/libkpeople-data.install
@@ -1,6 +1,4 @@
 usr/lib/kde4/akonadi_kpeople_plugin.so
-usr/lib/libkpeople.so.4*
-usr/lib/libkpeoplewidgets.so.4*
 usr/share/kde4/apps/kpeople/dummy_avatar.png
 usr/share/kde4/services/akonadi_kpeople_plugin.desktop
 usr/share/kde4/servicetypes/kpeople_data_source.desktop
diff --git a/debian/libkpeople4.install b/debian/libkpeople4.install
index f9ef106..9572ed7 100644
--- a/debian/libkpeople4.install
+++ b/debian/libkpeople4.install
@@ -1,9 +1,2 @@
-usr/lib/kde4/akonadi_kpeople_plugin.so
 usr/lib/libkpeople.so.4*
 usr/lib/libkpeoplewidgets.so.4*
-usr/share/kde4/apps/kpeople/dummy_avatar.png
-usr/share/kde4/services/akonadi_kpeople_plugin.desktop
-usr/share/kde4/servicetypes/kpeople_data_source.desktop
-usr/share/kde4/servicetypes/kpeople_plugin.desktop
-usr/share/kde4/servicetypes/persondetailsplugin.desktop
-usr/share/locale/*/LC_MESSAGES/libkpeople.mo

-- 
libkpeople packaging



More information about the pkg-kde-commits mailing list