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

Subscribers

People subscribed via source and target branches