Merge lp://staging/~lars.duesing/ubuntu/quantal/aiccu/aiccu-sid-merge into lp://staging/ubuntu/quantal/aiccu
Proposed by
Lars Düsing
| Status: | Merged |
|---|---|
| Merged at revision: | 17 |
| Proposed branch: | lp://staging/~lars.duesing/ubuntu/quantal/aiccu/aiccu-sid-merge |
| Merge into: | lp://staging/ubuntu/quantal/aiccu |
| Diff against target: |
255 lines (+63/-39) 11 files modified
.pc/06_syslog_openlog.patch/common/aiccu.c (+3/-3) .pc/07_allow_tunnels.patch/unix-console/main.c (+0/-5) .pc/08_setup_script.patch/common/aiccu.c (+3/-0) .pc/08_setup_script.patch/unix-console/main.c (+17/-17) .pc/applied-patches (+1/-1) debian/changelog (+20/-0) debian/control (+6/-6) debian/patches/09_binutils_gold.patch (+2/-0) debian/patches/series (+1/-1) debian/postrm.debhelper (+0/-6) debian/rules (+10/-0) |
| To merge this branch: | bzr merge lp://staging/~lars.duesing/ubuntu/quantal/aiccu/aiccu-sid-merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mathieu Trudel-Lapierre | Approve | ||
| Lars Düsing (community) | Needs Resubmitting | ||
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
merge from debian sid
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Please fix your merge so that changes remaining as a delta from Debian are listed: this helps reviewing whether those are still needed later when proceeding with another merge, or deciding if it should be a sync instead.
You can check the delta from Debian within a Ubuntu packaging branch using: bzr diff --old debianlp:sid/aiccu