kubuntu-packaging

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

  1. kemoticons-work
  2. Merge into kemoticons
Proposed by Jose Manuel Santamaria Lema
Status: Merged
Merged at revision: 21
Proposed branch: lp:~panfaust/kubuntu-packaging/kemoticons-work
Merge into: lp:~kubuntu-packagers/kubuntu-packaging-next/kemoticons
Diff against target: 69 lines (+18/-5)
3 files modified
debian/changelog (+3/-2)
debian/control (+12/-0)
debian/copyright (+3/-3)
To merge this branch: bzr merge lp:~panfaust/kubuntu-packaging/kemoticons-work
Reviewer Review Type Date Requested Status
Kubuntu Packagers Pending
Review via email: mp+221306@code.launchpad.net

Description of the change

Re-add a missing -dev package after a wrap-and-sort.

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-05 14:42:14 +0000
3+++ debian/changelog 2014-05-29 00:24:21 +0000
4@@ -1,8 +1,9 @@
5-kemoticons (4.99.0-0ubuntu1) UNRELEASED; urgency=medium
6+kemoticons (4.99.0-0ubuntu1) trusty; urgency=medium
7
8+ [ Jonathan Riddell ]
9 * New upstream beta release
10
11- -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 05 May 2014 15:39:52 +0100
12+ -- José Manuel Santamaría Lema <panfaust@gmail.com> Tue, 27 May 2014 19:05:14 +0200
13
14 kemoticons (4.98.0-0ubuntu1) trusty; urgency=medium
15
16
17=== modified file 'debian/control'
18--- debian/control 2014-05-21 15:58:13 +0000
19+++ debian/control 2014-05-29 00:24:21 +0000
20@@ -21,6 +21,18 @@
21 Standards-Version: 3.9.5
22 Homepage: https://projects.kde.org/projects/frameworks/kemoticons
23
24+Package: libkf5emoticons-dev
25+Section: libdevel
26+Architecture: any
27+Depends: libkf5emoticons5 (= ${binary:Version}), ${misc:Depends}
28+Description: Support for emoticons and emoticons themes.
29+ This class can be used to retrieve, install,
30+ create emoticons theme. It can also be used to
31+ set the emoticon theme and the parse mode in the
32+ config file.
33+ .
34+ Contains development files for kemoticons.
35+
36 Package: libkf5emoticons5
37 Section: libdevel
38 Architecture: any
39
40=== modified file 'debian/copyright'
41--- debian/copyright 2014-02-04 18:41:21 +0000
42+++ debian/copyright 2014-05-29 00:24:21 +0000
43@@ -3,7 +3,7 @@
44 Source: https://projects.kde.org/projects/frameworks/kemoticons
45
46 Files: *
47- debian/*
48+ debian/*
49 Copyright: © 2007-2008 Carlo Segato <brandon.ml@gmail.com>
50 © 2002-2008 Kopete <kopete-devel@kde.org>
51 © 2005 Duncan Mac-Vicar <duncan@kde.org>
52@@ -12,7 +12,7 @@
53 © 2004 Richard Smith <kde@metafoo.co.uk>
54 © 2008 Montel Laurent <montel@kde.org>
55 © 2006 Michael Larouche <larouche@kde.org>
56- 2014 Scarlett Clark <scarlett@scarlettgatelyclark.com>
57+ 2014 Scarlett Clark <scarlett@scarlettgatelyclark.com>
58 License: GPL-2+
59 This package is free software; you can redistribute it and/or modify
60 it under the terms of the GNU General Public License as published by
61@@ -29,7 +29,7 @@
62 .
63 On Debian systems, the complete text of the GNU General
64 Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
65-
66+
67 Files: src/core/* excluding:
68 -? src/core/CMakeLists.txt
69 src/providers/adium/* excluding:

Subscribers

People subscribed via source and target branches