Merge lp:~didrocks/dbus-cpp/inlinepackaging into lp:~thomas-voss/dbus-cpp/trunk

Proposed by Didier Roche-Tolomelli
Status: Merged
Merged at revision: 4
Proposed branch: lp:~didrocks/dbus-cpp/inlinepackaging
Merge into: lp:~thomas-voss/dbus-cpp/trunk
Diff against target: 16 lines (+3/-1)
2 files modified
.bzr-builddeb/default.conf (+2/-0)
debian/changelog (+1/-1)
To merge this branch: bzr merge lp:~didrocks/dbus-cpp/inlinepackaging
Reviewer Review Type Date Requested Status
Thomas Voß Approve
Review via email: mp+165307@code.launchpad.net

Commit message

Add inline packaging and ubuntu version

Description of the change

Add inline packaging and ubuntu version

To post a comment you must log in.
Revision history for this message
Thomas Voß (thomas-voss) wrote :

lgtm.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.bzr-builddeb'
2=== added file '.bzr-builddeb/default.conf'
3--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
4+++ .bzr-builddeb/default.conf 2013-05-23 08:44:32 +0000
5@@ -0,0 +1,2 @@
6+[BUILDDEB]
7+split = True
8
9=== modified file 'debian/changelog'
10--- debian/changelog 2013-05-21 09:49:21 +0000
11+++ debian/changelog 2013-05-23 08:44:32 +0000
12@@ -1,4 +1,4 @@
13-dbus-cpp (0.0.1-1) raring; urgency=low
14+dbus-cpp (0.0.1-0ubuntu1) raring; urgency=low
15
16 * Initial release
17

Subscribers

People subscribed via source and target branches