Merge lp:~panfaust/kubuntu-packaging/knotifications-work into lp:~kubuntu-packagers/kubuntu-packaging-next/knotifications

Proposed by Jose Manuel Santamaria Lema
Status: Merged
Merged at revision: 30
Proposed branch: lp:~panfaust/kubuntu-packaging/knotifications-work
Merge into: lp:~kubuntu-packagers/kubuntu-packaging-next/knotifications
Diff against target: 45 lines (+18/-1)
3 files modified
debian/changelog (+7/-0)
debian/control (+10/-0)
debian/libkf5notifications-dev.install (+1/-1)
To merge this branch: bzr merge lp:~panfaust/kubuntu-packaging/knotifications-work
Reviewer Review Type Date Requested Status
Kubuntu Packagers Pending
Review via email: mp+221660@code.launchpad.net

Description of the change

* Re-add -dev package after a faulty wrap-and-sort.
* Install *.pri files in arch dependent path.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2014-05-29 09:38:06 +0000
+++ debian/changelog 2014-06-02 04:57:24 +0000
@@ -1,3 +1,10 @@
1knotifications (4.99.0-0ubuntu2) UNRELEASED; urgency=medium
2
3 * Re-add -dev package after a faulty wrap-and-sort.
4 * Install *.pri files in arch dependent path.
5
6 -- José Manuel Santamaría Lema <panfaust@gmail.com> Mon, 02 Jun 2014 04:53:11 +0200
7
1knotifications (4.99.0-0ubuntu1) trusty; urgency=medium8knotifications (4.99.0-0ubuntu1) trusty; urgency=medium
29
3 * New upstream beta release10 * New upstream beta release
411
=== modified file 'debian/control'
--- debian/control 2014-05-21 15:58:51 +0000
+++ debian/control 2014-06-02 04:57:24 +0000
@@ -32,6 +32,16 @@
32Standards-Version: 3.9.532Standards-Version: 3.9.5
33Homepage: https://projects.kde.org/projects/frameworks/knotifications33Homepage: https://projects.kde.org/projects/frameworks/knotifications
3434
35Package: libkf5notifications-dev
36Section: libdevel
37Architecture: any
38Depends: libkf5notifications5 (= ${binary:Version}), ${misc:Depends}
39Description: a framework for desktop notifications
40 KNotification is used to notify the user of an event. It covers
41 feedback and persistent events.
42 .
43 Contains debug symbols for KNotifications.
44
35Package: libkf5notifications545Package: libkf5notifications5
36Section: libdevel46Section: libdevel
37Architecture: any47Architecture: any
3848
=== modified file 'debian/libkf5notifications-dev.install'
--- debian/libkf5notifications-dev.install 2014-05-21 15:28:26 +0000
+++ debian/libkf5notifications-dev.install 2014-06-02 04:57:24 +0000
@@ -3,4 +3,4 @@
3usr/lib/*/libKF5Notifications.so3usr/lib/*/libKF5Notifications.so
4usr/share/dbus-1/interfaces/kf5_org.kde.StatusNotifierItem.xml4usr/share/dbus-1/interfaces/kf5_org.kde.StatusNotifierItem.xml
5usr/share/dbus-1/interfaces/kf5_org.kde.StatusNotifierWatcher.xml5usr/share/dbus-1/interfaces/kf5_org.kde.StatusNotifierWatcher.xml
6usr/share/qt5/mkspecs/modules/qt_KNotifications.pri6usr/lib/*/qt5/mkspecs/modules/*

Subscribers

People subscribed via source and target branches