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

Subscribers

People subscribed via source and target branches