Network Manager Applet

Merge lp://qastaging/~sil2100/network-manager-applet/merge_1.0.6_debian into lp://qastaging/~network-manager/network-manager-applet/ubuntu

  1. merge_1.0.6_debian
  2. Merge into ubuntu
Proposed by Łukasz Zemczak
Status: Merged
Approved by: Mathieu Trudel-Lapierre
Approved revision: 468
Merged at revision: 467
Proposed branch: lp://qastaging/~sil2100/network-manager-applet/merge_1.0.6_debian
Merge into: lp://qastaging/~network-manager/network-manager-applet/ubuntu
Diff against target: 2479 lines (+1173/-967)
16 files modified
debian/changelog (+252/-4)
debian/control (+60/-67)
debian/gbp.conf (+1/-0)
debian/gir1.2-nmgtk-1.0.install (+1/-1)
debian/libnm-gtk0.symbols (+9/-8)
debian/network-manager-gnome.README.Debian (+5/-0)
debian/network-manager-gnome.manpages (+0/-1)
debian/network-manager-gnome.postinst (+10/-0)
debian/nm-applet.sgml (+0/-100)
debian/patches/11-user-connections.patch (+0/-698)
debian/patches/Allow-to-create-connections-without-admin-privileges.patch (+683/-0)
debian/patches/Don-t-hard-code-gnome-bluetooth-plugin-directory.patch (+35/-0)
debian/patches/Force-online-state-with-unmanaged-devices.patch (+28/-0)
debian/patches/nm-applet-use-indicator.patch (+84/-83)
debian/patches/series (+3/-1)
debian/rules (+2/-4)
To merge this branch: bzr merge lp://qastaging/~sil2100/network-manager-applet/merge_1.0.6_debian
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve
Review via email: mp+279012@code.qastaging.launchpad.net

Commit message

Propose a merge of 1.0.6 from Debian. Remove unneeded patches, modify changelog, carry over required changes.

Description of the change

Propose a merge of 1.0.6 from Debian. Remove unneeded patches, modify changelog, carry over required changes.

Example package built in a local PPA here:
https://launchpad.net/~sil2100/+archive/ubuntu/testing/+sourcepub/5731167/+listing-archive-extra

Compared .deb's with existing ones and contents look sane.

To post a comment you must log in.
lp://qastaging/~sil2100/network-manager-applet/merge_1.0.6_debian updated
468. By Łukasz Zemczak

Remove the 11-user-connections.patch patch as it's not applied anymore (it's merged from debian now)

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

Looks good!

review: Approve
lp://qastaging/~sil2100/network-manager-applet/merge_1.0.6_debian updated
469. By Łukasz Zemczak

Remove one more file that's not used anymore - nm-applet.sgml.

Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Sorry for the post-approve file removal. This file was not used anywhere and I didn't want to leave any leftovers. Thanks for the review, publishing in a moment!

lp://qastaging/~sil2100/network-manager-applet/merge_1.0.6_debian updated
470. By Łukasz Zemczak

One more file not needed.

471. By Łukasz Zemczak

Re-release.

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