kubuntu-packaging

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

  1. kservice-work
  2. Merge into kservice
Proposed by Jose Manuel Santamaria Lema
Status: Merged
Merged at revision: 26
Proposed branch: lp:~panfaust/kubuntu-packaging/kservice-work
Merge into: lp:~kubuntu-packagers/kubuntu-packaging-next/kservice
Diff against target: 23 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
debian/libkf5service-dev.install (+1/-1)
To merge this branch: bzr merge lp:~panfaust/kubuntu-packaging/kservice-work
Reviewer Review Type Date Requested Status
Kubuntu Packagers Pending
Review via email: mp+221644@code.launchpad.net

Description of the change

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
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-05-29 09:38:21 +0000
3+++ debian/changelog 2014-06-01 23:14:27 +0000
4@@ -1,3 +1,9 @@
5+kservice (4.99.0-0ubuntu2) UNRELEASED; urgency=medium
6+
7+ * Install *.pri files in arch dependent path.
8+
9+ -- José Manuel Santamaría Lema <panfaust@gmail.com> Sun, 01 Jun 2014 21:46:06 +0200
10+
11 kservice (4.99.0-0ubuntu1) trusty; urgency=medium
12
13 [ Jonathan Riddell ]
14
15=== modified file 'debian/libkf5service-dev.install'
16--- debian/libkf5service-dev.install 2014-05-21 15:28:41 +0000
17+++ debian/libkf5service-dev.install 2014-06-01 23:14:27 +0000
18@@ -2,4 +2,4 @@
19 usr/include/KF5/
20 usr/lib/*/cmake/KF5Service/
21 usr/lib/*/libKF5Service.so
22-usr/share/qt5/mkspecs/modules/qt_KService.pri
23+usr/lib/*/qt5/mkspecs/modules/*

Subscribers

People subscribed via source and target branches