Merge lp:~dholbach/ubuntu/raring/kdevelop-custom-buildsystem/description-typo-fixes into lp:ubuntu/raring/kdevelop-custom-buildsystem

Proposed by Daniel Holbach
Status: Merged
Merge reported by: Michał Zając
Merged at revision: not available
Proposed branch: lp:~dholbach/ubuntu/raring/kdevelop-custom-buildsystem/description-typo-fixes
Merge into: lp:ubuntu/raring/kdevelop-custom-buildsystem
Diff against target: 40 lines (+11/-3)
2 files modified
debian/changelog (+8/-0)
debian/control (+3/-3)
To merge this branch: bzr merge lp:~dholbach/ubuntu/raring/kdevelop-custom-buildsystem/description-typo-fixes
Reviewer Review Type Date Requested Status
Michał Zając (community) Approve
Benjamin Drung Abstain
Ubuntu branches Pending
Review via email: mp+132382@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michał Zając (quintasan) wrote :

Brilliant, ready for merging :).

review: Approve
5. By Daniel Holbach

debian/control: updated Standards-Version.

Revision history for this message
Benjamin Drung (bdrung) wrote :

I think we should merge ~nullable/ubuntu/raring/kdevelop-custom-buildsystem/description-typo-fixes instead.

review: Abstain
Revision history for this message
Michał Zając (quintasan) wrote :

Since we have no packaging branch for that, I applied the diff and uploaded to raring

review: Approve

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 2012-09-29 23:01:08 +0000
3+++ debian/changelog 2012-10-31 16:57:21 +0000
4@@ -1,3 +1,11 @@
5+kdevelop-custom-buildsystem (1.2.2-0ubuntu2) raring; urgency=low
6+
7+ * debian/control: fixed two typos (changed 'arbitary' to 'arbitrary'
8+ and 'allows to' to 'allows one to').
9+ * debian/control: updated Standards-Version.
10+
11+ -- Daniel Holbach <daniel.holbach@ubuntu.com> Wed, 31 Oct 2012 17:33:24 +0100
12+
13 kdevelop-custom-buildsystem (1.2.2-0ubuntu1) quantal; urgency=low
14
15 * Bug fix update to fix FTBFS (compatible with current KDevPlatform - 1.4)
16
17=== modified file 'debian/control'
18--- debian/control 2012-01-19 02:24:10 +0000
19+++ debian/control 2012-10-31 16:57:21 +0000
20@@ -3,7 +3,7 @@
21 Priority: extra
22 Maintainer: Kubuntu Developers <kubuntu-devel@lists.ubuntu.com>
23 Build-Depends: debhelper (>= 8.0.0), cmake, pkg-kde-tools, kdevplatform-dev (>= 1.1.0)
24-Standards-Version: 3.9.2
25+Standards-Version: 3.9.4
26 Homepage: http://www.kdevelop.org/
27
28 Package: kdevelop-custom-buildsystem
29@@ -14,10 +14,10 @@
30 'dist-clean' and install the project, so that KDevelop's actions work as
31 expected.
32 .
33- Additionally it allows to setup include directories (or import-directories) and
34+ Additionally it allows one to setup include directories (or import-directories) and
35 defines for the project on a per-directory basis. This allows the C++ support
36 and other language plugins to find file-references without manually adding them
37 via the include-assistant.
38 .
39- This package contains a KDevelop plugin to handle arbitary custom buildsystems
40+ This package contains a KDevelop plugin to handle arbitrary custom buildsystems
41

Subscribers

People subscribed via source and target branches