Merge lp:~ubuntu-branches/ubuntu/quantal/psensor/quantal-201404080726 into lp:ubuntu/quantal/psensor
| Status: | Needs review |
|---|---|
| Proposed branch: | lp:~ubuntu-branches/ubuntu/quantal/psensor/quantal-201404080726 |
| Merge into: | lp:ubuntu/quantal/psensor |
| Diff against target: |
1 lines (+0/-0) (has conflicts) 0 files modified
Contents conflict in .pc/applied-patches |
| To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/quantal/psensor/quantal-201404080726 |
| 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/quantal/psensor reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/quantal/psensor/quantal-201404080726. 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
- 16. By Iain Lane
-
Manually reverse patch. bzr and quilt /o\
- 15. By Iain Lane
-
Merge lp:~jfi/ubuntu/quantal/psensor/new-upstream-0-6-2-19
* New upstream release
+ fixed hide window on startup for gnome-shell. (Closes: #676361)
+ fixed size of the icon hicolor/48x48/psensor_ hot.png. (LP: #1029065)
* Removed LP1021900.patch: fixed upstream since 0.6.2.18.
* Remaining changes:
+ Modifed build-dep to add NVidia and Application Indicator support
+ Only add an nvidia-settings build-dep on i386 and amd6
