Merge lp://staging/~ubuntu-branches/ubuntu/precise/cairo-dock-plug-ins/precise-201111101111 into lp://staging/ubuntu/precise/cairo-dock-plug-ins
| Status: | Rejected |
|---|---|
| Rejected by: | James Westby |
| Proposed branch: | lp://staging/~ubuntu-branches/ubuntu/precise/cairo-dock-plug-ins/precise-201111101111 |
| Merge into: | lp://staging/ubuntu/precise/cairo-dock-plug-ins |
| Diff against target: |
120 lines (+73/-0) (has conflicts) 3 files modified
debian/patches/01-removed-useless-g_print.patch (+37/-0) switcher/src/applet-draw.c (+4/-0) switcher/src/applet-load-icons.c (+32/-0) Conflict adding file debian/patches/01-removed-useless-g_print.patch. Moved existing file to debian/patches/01-removed-useless-g_print.patch.moved. Text conflict in switcher/src/applet-draw.c Text conflict in switcher/src/applet-load-icons.c |
| To merge this branch: | bzr merge lp://staging/~ubuntu-branches/ubuntu/precise/cairo-dock-plug-ins/precise-201111101111 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
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/precise/cairo-dock-plug-ins reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/cairo-dock-plug-ins/precise-201111101111. 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
- 23. By Daniel Holbach
-
* New upstream bug fix release. (LP: #886676)
* Upstream ChangeLog:
- Desklet-rendering - viewport: fixed a crash when the desklet is empty
- Status-Notifier: patch to work around strange bugs
in the Ubuntu's indicator-application
- Switcher: fixed a crash in expanded+desklet mode, a wrong loading
of the icons and a small drawing bug with the non-compact view.
- GMenu: look for *-applications.menu file in the xdg path
(if common file names are not found, e.g. with KDE env in Oneiric)
* debian/patches/ 01-switcher- force-compact- view.patch:
- Deleted (now in upstream)
* debian/patches/ 01-removed- useless- g_print. patch:
- Removed useless output messages
