Merge lp:~ubuntu-branches/ubuntu/natty/liferea/natty-201307040925 into lp:ubuntu/natty/liferea
Status: | Needs review |
---|---|
Proposed branch: | lp:~ubuntu-branches/ubuntu/natty/liferea/natty-201307040925 |
Merge into: | lp:ubuntu/natty/liferea |
Diff against target: | 0 lines |
To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/natty/liferea/natty-201307040925 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu branches | Pending | ||
Review via email: mp+172987@code.launchpad.net |
Description of the change
The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/natty/liferea reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/liferea/natty-201307040925. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.
If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https:/
(this is an automatically generated message)
Unmerged revisions
- 111. By Didier Roche-Tolomelli
-
Rebuild against latest libunity (soname bump)
- 110. By Jean-Philippe Orsini
-
* debian/
patches/ libunity. patch
- Displays the number of unread items in the Unity Launcher
entry (LP: #732848).
* debian/control
- Added missing build dep to libunity-dev - 109. By Marc Deslauriers
-
* Fix indicator support again (LP: #723349)
- debian/patches/ libindicate. patch: updated check for new version of
libindicate.
- debian/control: bump libindicate-dev and libindicate-gtk-dev
version requirement. - 108. By Benjamin Drung
-
Change build dependency from libwebkit-dev to libwebkitgtk-dev
(LP: #703248). - 107. By Marc Deslauriers
-
debian/control: Add libindicate-gtk-dev to Build-Depends so indicator
support gets built properly. (LP: #689710) - 106. By Luke Yelavich
-
releasing version 1.6.4-1ubuntu2
- 105. By Luke Yelavich
-
debian/
patches/ libindicate. patch: Fixed reversed order and missing
favicons in indicator applet, thanks to Pavol Klačanský for the patch.
(LP: #653995) - 104. By Luke Yelavich
-
Integrate indicator_
icons.patch into libindicate.patch - 103. By Luke Yelavich
-
Merge branch lp:~pavolzetor/ubuntu/natty/liferea/liferea-test with changes:
- Kept src/ui/ui_indicator. {c,h} so they still have a revision history