Merge lp:~ubuntu-branches/ubuntu/utopic/libphonenumber/utopic-201410062225 into lp:ubuntu/utopic/libphonenumber
Status: | Needs review |
---|---|
Proposed branch: | lp:~ubuntu-branches/ubuntu/utopic/libphonenumber/utopic-201410062225 |
Merge into: | lp:ubuntu/utopic/libphonenumber |
Diff against target: | 0 lines |
To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/utopic/libphonenumber/utopic-201410062225 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Development Team | Pending | ||
Review via email: mp+237346@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/utopic/libphonenumber reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/utopic/libphonenumber/utopic-201410062225. 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
- 10. By Steve Langasek
-
releasing package libphonenumber version 6.0+r655-0ubuntu4
- 9. By Steve Langasek
-
Build without -O2 (which is consistent with previous builds), since
enabling it causes ABI changes in the library. - 8. By Steve Langasek
-
Bump to compat level 9, which enables dpkg-buildflags usage.
- 7. By Steve Langasek
-
use dh build system args instead of overriding all of dh_auto_*.
- 6. By Steve Langasek
-
debian/rules: build with VERBOSE=1.
- 5. By Steve Langasek
-
debian/rules: never set INSTALL_
PROGRAM+ =-s; rely on dh_strip to strip
the files only after install.