Merge lp://staging/~mariusko/modemmanager/ubuntu-0.7 into lp://staging/~modemmanager/modemmanager/ubuntu

Proposed by Marius B. Kotsbak
Status: Merged
Approved by: Mathieu Trudel-Lapierre
Approved revision: 191
Merged at revision: 186
Proposed branch: lp://staging/~mariusko/modemmanager/ubuntu-0.7
Merge into: lp://staging/~modemmanager/modemmanager/ubuntu
Diff against target: 245 lines (+95/-23)
10 files modified
debian/changelog (+13/-0)
debian/control (+58/-4)
debian/libmm-glib-doc.install (+1/-0)
debian/modemmanager-dev.install (+2/-0)
debian/modemmanager-doc.install (+1/-0)
debian/modemmanager.install (+4/-3)
debian/patches/arduino-blacklist.patch (+4/-4)
debian/patches/linux-default-usb-id.patch (+4/-4)
debian/patches/lp700316_usb_blacklist.patch (+6/-6)
debian/rules (+2/-2)
To merge this branch: bzr merge lp://staging/~mariusko/modemmanager/ubuntu-0.7
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve
Review via email: mp+153481@code.staging.launchpad.net
To post a comment you must log in.
191. By Marius B. Kotsbak

Merge ubuntu branch.

Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Approve, I'm merging this now.

review: Approve
Revision history for this message
Marius B. Kotsbak (mariusko) wrote :

Dia build dependency is removed upstream now, just not yet in any releases.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches