Merge lp:~ubuntu-branches/ubuntu/trusty/powerpc-cross-toolchain-base/trusty-201402260950 into lp:ubuntu/trusty/powerpc-cross-toolchain-base

[Ubuntu Package Importer]

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/powerpc-cross-toolchain-base reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/trusty/powerpc-cross-toolchain-base/trusty-201402260950. 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://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

11. By Dimitri John Ledkov on 2014-02-26

Set back to unreleased

10. By Dimitri John Ledkov on 2014-02-26

* Bump eglibc to 2.19.
* Bump kernel to 3.13.
* Bump binutils to 2.24 (belated).
* Refresh eglibc patches.
* Regeneration debian/control.
* Add rsync, xmlto build-dep.

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-26 08:08:24 +0000
+++ debian/changelog	2014-02-26 09:58:21 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 powerpc-cross-toolchain-base (1.1) trusty; urgency=medium
 
   * Bump eglibc to 2.19.
@@ -8,6 +9,19 @@
 
  -- Matthias Klose <[e-mail]>  Wed, 26 Feb 2014 08:08:24 +0100
 
+=======
+powerpc-cross-toolchain-base (1.1) UNRELEASED; urgency=medium
+
+  * Bump eglibc to 2.19.
+  * Bump kernel to 3.13.
+  * Bump binutils to 2.24 (belated).
+  * Refresh eglibc patches.
+  * Regeneration debian/control.
+  * Add rsync, xmlto build-dep.
+
+ -- Dimitri John Ledkov <[e-mail]>  Wed, 26 Feb 2014 00:20:02 +0000
+
+>>>>>>> MERGE-SOURCE
 powerpc-cross-toolchain-base (1.0) trusty; urgency=low
 
   * Bump eglibc to 2.18.

=== modified file 'debian/control'
--- debian/control	2014-02-26 08:08:24 +0000
+++ debian/control	2014-02-26 09:58:21 +0000
@@ -6,15 +6,26 @@
 Build-Depends: dpkg-cross (>= 2.6.6), binutils-multiarch (>= 2.20.1-3~),
   dpkg (>= 1.16.0~ubuntu6), rdfind, symlinks, lsb-release,
   binutils-source (>= 2.21.0.20110327-2~),
+<<<<<<< TREE
   eglibc-source (>= 2.19-0~),
   gcc-4.8-source (>= 4.8.2-16),
   linux-source (>= 3.13.0-0~), 
+=======
+  eglibc-source (>= 2.19-0~),
+  gcc-4.8-source (>= 4.8.2-10),
+  linux-source (>= 3.13.0-0~), 
+>>>>>>> MERGE-SOURCE
   autoconf (>= 2.64), autoconf2.64, autogen,
   automake, bison (>= 1:2.3), chrpath, debhelper (>= 5.0.62),
   dpkg-dev (>= 1.15.3.1), fakeroot, file, flex,
   gawk, gettext, gperf (>= 3.0.1), kernel-wedge (>= 2.24),
+<<<<<<< TREE
   libcloog-isl-dev (>= 0.12.2~), libmpc-dev,
   libmpfr-dev (>= 2.3.0), rsync, xmlto, libtool, lsb-release, lzma, m4,
+=======
+  libcloog-ppl-dev (>= 0.15.8-1~), libmpc-dev,
+  libmpfr-dev (>= 2.3.0), rsync, xmlto, libtool, lsb-release, lzma, m4,
+>>>>>>> MERGE-SOURCE
   make (>= 3.81), module-init-tools, symlinks,
   patchutils, procps, quilt, rdfind, realpath (>= 1.9.12),
   sed (>= 4.0.5-4), sharutils, tar (>= 1.22), xz-utils,

=== modified file 'debian/control.in'
--- debian/control.in	2014-02-26 08:08:24 +0000
+++ debian/control.in	2014-02-26 09:58:21 +0000
@@ -13,8 +13,13 @@
   automake, bison (>= 1:2.3), chrpath, debhelper (>= 5.0.62),
   dpkg-dev (>= 1.15.3.1), fakeroot, file, flex,
   gawk, gettext, gperf (>= 3.0.1), kernel-wedge (>= 2.24),
+<<<<<<< TREE
   libcloog-isl-dev (>= 0.12.2~), libmpc-dev,
   libmpfr-dev (>= 2.3.0), rsync, xmlto, libtool, lsb-release, lzma, m4,
+=======
+  libcloog-ppl-dev (>= 0.15.8-1~), libmpc-dev,
+  libmpfr-dev (>= 2.3.0), rsync, xmlto, libtool, lsb-release, lzma, m4,
+>>>>>>> MERGE-SOURCE
   make (>= 3.81), module-init-tools, symlinks,
   patchutils, procps, quilt, rdfind, realpath (>= 1.9.12),
   sed (>= 4.0.5-4), sharutils, tar (>= 1.22), xz-utils,

=== modified file 'debian/patches/eglibc/ubuntu/disable-selinux.patch'
--- debian/patches/eglibc/ubuntu/disable-selinux.patch	2014-02-26 08:08:24 +0000
+++ debian/patches/eglibc/ubuntu/disable-selinux.patch	2014-02-26 09:58:21 +0000
@@ -8,11 +8,21 @@
  sysdeps/linux.mk |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
+<<<<<<< TREE
 Index: b/debian/sysdeps/linux.mk
+=======
+Index: eglibc-2.19/debian/sysdeps/linux.mk
+>>>>>>> MERGE-SOURCE
 ===================================================================
+<<<<<<< TREE
 --- a/debian/sysdeps/linux.mk
 +++ b/debian/sysdeps/linux.mk
 @@ -16,7 +16,7 @@
+=======
+--- eglibc-2.19.orig/debian/sysdeps/linux.mk	2014-02-25 16:07:52.489500514 +0000
++++ eglibc-2.19/debian/sysdeps/linux.mk	2014-02-25 16:08:18.841273959 +0000
+@@ -16,7 +16,7 @@
+>>>>>>> MERGE-SOURCE
  ifeq ($(DEB_BUILD_PROFILE),bootstrap)
    libc_extra_config_options = $(extra_config_options)
  else

=== modified file 'debian/patches/eglibc/ubuntu/dpkg-shlibs.patch'
--- debian/patches/eglibc/ubuntu/dpkg-shlibs.patch	2014-02-26 08:08:24 +0000
+++ debian/patches/eglibc/ubuntu/dpkg-shlibs.patch	2014-02-26 09:58:21 +0000
@@ -2,11 +2,21 @@
  debian/rules.d/debhelper.mk |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
+<<<<<<< TREE
 Index: b/debian/rules.d/debhelper.mk
+=======
+Index: eglibc-2.19/debian/rules.d/debhelper.mk
+>>>>>>> MERGE-SOURCE
 ===================================================================
+<<<<<<< TREE
 --- a/debian/rules.d/debhelper.mk
 +++ b/debian/rules.d/debhelper.mk
 @@ -105,7 +105,7 @@
+=======
+--- eglibc-2.19.orig/debian/rules.d/debhelper.mk	2014-02-25 16:05:47.490575164 +0000
++++ eglibc-2.19/debian/rules.d/debhelper.mk	2014-02-25 16:08:54.000000000 +0000
+@@ -105,7 +105,7 @@
+>>>>>>> MERGE-SOURCE
  	./debian/shlibs-add-udebs $(curpass)
  
  	dh_installdeb -p$(curpass)

=== modified file 'debian/patches/eglibc/ubuntu/local-kill-locales.patch'
--- debian/patches/eglibc/ubuntu/local-kill-locales.patch	2014-02-26 08:08:24 +0000
+++ debian/patches/eglibc/ubuntu/local-kill-locales.patch	2014-02-26 09:58:21 +0000
@@ -1,6 +1,18 @@
+<<<<<<< TREE
 --- a/localedata/SUPPORTED
 +++ b/localedata/SUPPORTED
 @@ -2,473 +2,3 @@
+=======
+---
+ localedata/SUPPORTED |  439 ---------------------------------------------------
+ 1 file changed, 439 deletions(-)
+
+Index: eglibc-2.19/localedata/SUPPORTED
+===================================================================
+--- eglibc-2.19.orig/localedata/SUPPORTED	2014-02-25 16:06:11.010372959 +0000
++++ eglibc-2.19/localedata/SUPPORTED	2014-02-25 16:07:31.345682293 +0000
+@@ -2,473 +2,3 @@
+>>>>>>> MERGE-SOURCE
  # If you have any additions please file a glibc bug report.
  SUPPORTED-LOCALES=\
  aa_DJ.UTF-8/UTF-8 \

=== modified file 'debian/patches/eglibc/ubuntu/no-symlinks-for-no-multiarch.patch'
--- debian/patches/eglibc/ubuntu/no-symlinks-for-no-multiarch.patch	2014-02-26 08:08:24 +0000
+++ debian/patches/eglibc/ubuntu/no-symlinks-for-no-multiarch.patch	2014-02-26 09:58:21 +0000
@@ -2,11 +2,21 @@
  debian/rules.d/build.mk |    4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
+<<<<<<< TREE
 Index: b/debian/rules.d/build.mk
+=======
+Index: eglibc-2.19/debian/rules.d/build.mk
+>>>>>>> MERGE-SOURCE
 ===================================================================
+<<<<<<< TREE
 --- a/debian/rules.d/build.mk
 +++ b/debian/rules.d/build.mk
 @@ -261,6 +261,7 @@
+=======
+--- eglibc-2.19.orig/debian/rules.d/build.mk	2014-02-25 16:07:47.233545700 +0000
++++ eglibc-2.19/debian/rules.d/build.mk	2014-02-25 16:08:54.000000000 +0000
+@@ -261,6 +261,7 @@
+>>>>>>> MERGE-SOURCE
  	  esac; \
  	fi
  

=== modified file 'debian/patches/eglibc/ubuntu/stage1-passes.diff'
=== modified file 'debian/rules'
--- debian/rules	2014-02-26 08:08:24 +0000
+++ debian/rules	2014-02-26 09:58:21 +0000
@@ -43,10 +43,17 @@
 # default version of gcc which will be used
   VER_GCC_BASE   := 4.7
 else
+<<<<<<< TREE
   MIN_VER_EGLIBC := 2.19-0~
   MIN_VER_LINUX  := 3.13.0-0~
   MIN_VER_GCC    := 4.8.2-16
   VER_LINUX      := 3.13.0
+=======
+  MIN_VER_EGLIBC := 2.19-0~
+  MIN_VER_LINUX  := 3.13.0-0~
+  MIN_VER_GCC    := 4.8.2-10
+  VER_LINUX      := 3.13.0
+>>>>>>> MERGE-SOURCE
 # default version of gcc which will be used
   VER_GCC_BASE := 4.8
 endif
@@ -117,7 +124,7 @@
 
 info:
 	@echo "Binutils version:         ${VER_BINUTILS}	${DEB_VER_BINUTILS}	${PKG_VER_BINUTILS}"
-	@echo "GCC 4.7 version:          ${VER_GCC}       	${DEB_VER_GCC}            ${VER_GCC_BASE}"
+	@echo "GCC version:              ${VER_GCC}       	${DEB_VER_GCC}            ${VER_GCC_BASE}"
 	@echo "Eglibc version:           ${VER_EGLIBC}  	${DEB_VER_EGLIBC}"
 	@echo "Linux version:            ${VER_LINUX}   	${DEB_VER_LINUX}"
 	@echo