Merge lp://staging/~ubuntu-branches/ubuntu/natty/eglibc/natty-201306242138 into lp://staging/ubuntu/natty/eglibc
| Status: | Rejected |
|---|---|
| Rejected by: | Martin Pitt |
| Proposed branch: | lp://staging/~ubuntu-branches/ubuntu/natty/eglibc/natty-201306242138 |
| Merge into: | lp://staging/ubuntu/natty/eglibc |
| Diff against target: |
4106 lines (+2871/-665) (has conflicts) 31 files modified
debian/changelog (+82/-26) debian/patches/alpha/local-strncmp.diff (+254/-0) debian/patches/alpha/submitted-PTR_MANGLE.diff (+36/-0) debian/patches/alpha/submitted-____longjmp_chk.diff (+16/-0) debian/patches/alpha/submitted-fxstatat.patch (+57/-0) debian/patches/alpha/submitted-sysconf-cache.diff (+16/-0) debian/patches/any/local-ldconfig-multiarch.diff (+51/-0) debian/patches/any/local-ldconfig-system-dirs.diff (+0/-53) debian/patches/hppa/submitted-fcntl_h.diff (+49/-0) debian/patches/hppa/submitted-libm-hidden.diff (+27/-0) debian/patches/hppa/submitted-stackinfo.diff (+15/-0) debian/patches/hurd-i386/local-ED.diff (+18/-0) debian/patches/hurd-i386/local-add-needed.diff (+0/-15) debian/patches/hurd-i386/local-pthread_posix-option.diff (+16/-1) debian/patches/hurd-i386/local-pthread_stubs.diff (+5/-7) debian/patches/hurd-i386/submitted-add-needed.diff (+24/-0) debian/patches/hurd-i386/submitted-net.diff (+3/-0) debian/patches/i386/cvs-cacheinfo.diff (+265/-0) debian/patches/i386/submitted-memove-static.diff (+92/-0) debian/patches/kfreebsd/local-sysdeps.diff (+1238/-2) debian/patches/series (+10/-1) debian/patches/series.hurd-i386 (+0/-1) debian/patches/svn-updates.diff (+87/-30) debian/shlibver (+1/-1) debian/testsuite-checking/expected-results-alpha-linux-gnu-libc (+0/-16) debian/testsuite-checking/expected-results-alphaev67-linux-gnu-alphaev67 (+5/-16) debian/testsuite-checking/expected-results-i486-gnu-libc (+2/-0) debian/testsuite-checking/expected-results-i686-gnu-i386 (+2/-0) debian/testsuite-checking/expected-results-i686-gnu-i686 (+2/-0) debian/testsuite-checking/expected-results-i686-gnu-xen (+2/-0) locale/C-translit.h (+496/-496) Text conflict in debian/changelog Text conflict in debian/patches/i386/cvs-cacheinfo.diff Text conflict in debian/patches/series |
| To merge this branch: | bzr merge lp://staging/~ubuntu-branches/ubuntu/natty/eglibc/natty-201306242138 |
| 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/natty/eglibc reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/eglibc/natty-201306242138. 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
- 149. By Matthias Klose <email address hidden>
-
* Update to r13356 from the eglibc-2.13 branch.
- 148. By Matthias Klose <email address hidden>
-
* Merge with Debian (r4609, 2.13 branch).
- 147. By Matthias Klose <email address hidden>
-
* Re-enable the memcpy multiarch implementaiton on x86_64. LP: #727064.
- 146. By Matthias Klose <email address hidden>
-
eglibc 2.13-0ubuntu13 upload
- 145. By Steve Langasek
-
debian/
sysdeps/ linux.mk: detect when linux-libc-dev has moved its
headers to the multiarch dir, and create the symlink to the right place
so we can find those headers for building. LP: #750585. - 144. By Matthias Klose <email address hidden>
-
eglibc (2.13-0ubuntu12) natty; urgency=low
* For memcpy-ssse3, enable chk symbols in static builds. LP: #726802.
* Disable the memcpy multiarch implementaiton on x86_64. LP: #727064.
* Merge from Debian:
- Add patches/i386/cvs- cacheinfo. diff to fix empty LEVEL*CACHE* getconf()
entries for some CPU. Closes: #609389.-- Matthias Klose <email address hidden> Tue, 05 Apr 2011 10:54:32 +0200
- 143. By Steve Langasek
-
releasing version 2.13-0ubuntu11
- 142. By Steve Langasek
-
debian/
debhelper. in/libc. preinst: don't restart kdm on upgrade. It may
no longer be required, and in any case the restart will break running
sessions so we want to avoid this for beta1. LP: #744944. - 141. By Steve Langasek
-
debian/
rules.d/ debhelper. mk: the ld.so.conf snippet isn't included in
all of the alternate libc builds, only in libc6-i386 and libc6-powerpc;
so we add this by hand to the dh_install invocation for these packages.
LP: #741949. - 140. By Steve Langasek
-
debian/
rules.d/ build.mk: when building 32-bit biarch libraries for
64-bit archs, ship an /etc/ld.so.conf/ biarch. conf config snippet adding
/lib32,/usr/lib32 to the path; these are already included in the path
for the biarch build itself, but the biarch ld.so may be Replaced: by
the multiarch libc which does not have built-in support for these
non-standard paths.
