Merge lp://staging/~gilir/synapse-project/packaging into lp://staging/synapse-project
Proposed by
Julien Lavergne
Status: | Superseded |
---|---|
Proposed branch: | lp://staging/~gilir/synapse-project/packaging |
Merge into: | lp://staging/synapse-project |
Diff against target: |
161 lines (+69/-22) 7 files modified
debian/changelog (+21/-2) debian/control (+15/-10) debian/copyright (+26/-8) debian/docs (+4/-0) debian/rules (+1/-1) debian/watch (+2/-0) po/POTFILES.in (+0/-1) |
To merge this branch: | bzr merge lp://staging/~gilir/synapse-project/packaging |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michal Hruby | Needs Fixing | ||
Review via email: mp+42729@code.staging.launchpad.net |
This proposal has been superseded by a proposal from 2010-12-04.
To post a comment you must log in.
Could you please fix the conflict in po/* (probably by reverting anything you inadvertently changed there). Also I added optional dependency on app-indicator, could you add that?