Merge lp:~ubuntu-branches/ubuntu/trusty/aptdaemon/trusty-proposed-201404111728 into lp:ubuntu/trusty-proposed/aptdaemon
| Status: | Needs review |
|---|---|
| Proposed branch: | lp:~ubuntu-branches/ubuntu/trusty/aptdaemon/trusty-proposed-201404111728 |
| Merge into: | lp:ubuntu/trusty-proposed/aptdaemon |
| Diff against target: |
44 lines (+19/-0) (has conflicts) 2 files modified
debian/changelog (+14/-0) debian/patches/series (+5/-0) Text conflict in debian/changelog Text conflict in debian/patches/series |
| To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/trusty/aptdaemon/trusty-proposed-201404111728 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Development Team | 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/trusty-proposed/aptdaemon reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/trusty/aptdaemon/trusty-proposed-201404111728. 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
- 153. By Michael Vogt
-
* debian/
python3- aptdaemon. test.install:
- install all test deb files
* debian/patches/ dbus_timeout. patch:
- fix pep8 issue
* debian/patches/ fix-configparse r.patch:
- do not crash when "#" are in comments - 152. By Michael Vogt
-
* debian/
patches/ dbus_timeout. patch
- increase dbus timeouts to avoid a dbus timeout error if a
policykit authentication dialog is not answered for a while
* debian/patches/ lp1266844. patch:
- workaround for LP: #1266844, thanks to Brian Murray - 151. By Matthias Klose
-
Rewrite the python shebang path to /usr/bin/python3.
- 150. By Michael Vogt
-
Backport fix for LP: #1024590 from trunk r963
- 149. By Martin Pitt
-
* Merge with Debian unstable. Remaining Ubuntu changes:
- Build-depend on dh-translations and use it in debian/rules.
- Add upstream_lintian_ 2.5.18. patch: Recently updated lintian 2.5.18
dropped $LINTIAN_ROOT, adjust tests accordingly (cherrypicked from
upstream trunk). Fixes autopkgtest.
- fix_ftbs.patch: Fix FTBFS (LP: #1226100) with latest pep8 version.
* Move Vcs-Bzr to trusty branch.
