=== modified file debian/changelog --- debian/changelog 2016-03-16 02:02:32 +0000 +++ debian/changelog 2016-03-18 18:08:24 +0000 @@ -4,23 +4,28 @@ * Updated d/ based on 1:2.6.10-0ubuntu1 d/ * d/control: - Renamed source and binary package to juju-mongodb2.6. - - Do not build i386 and armhf because upstream will - not support 32-bit for mango 3.x, so no need to migrate. - Install to /usr/lib/juju/mongo2.6/bin/ - Add libyaml-cpp-dev to BD's. * d/rules: Enable --with-system-yaml option. - * d/p Dropped patches, included upstream: - + 0003-All-platforms-but-Windows-find-hash-in-std-tr1.patch - + 0005-ARM-support-for-ASM-operations-in-MongoDB.patch - + 0008-Use-system-libstemmer.patch - + 0011-Use-a-signed-char-to-store-BSONType-enumerations.patch - + 0001-SERVER-12064-Atomic-operations-for-gcc-non-Intel-arc.patch - + 0002-SERVER-12065-Support-ARM-and-AArch64-builds.patch - + 00git_pymongo3.patch - + no-unused-variable.patch + * d/p + - Synced upstream patches with the mongodb 1:2.6.10-0ubuntu1 + - dropped be-port because juju 1.25 and juju-mongodb will not + support s390x and powerpc; juju2 will support these archs. -- Curtis C. Hovey Tue, 15 Mar 2015 17:24:48 +0000 +juju-mongodb (2.4.10-0ubuntu6) xenial; urgency=high + + * Drop architecture restrictions. + + -- Dimitri John Ledkov Wed, 06 Jan 2016 09:27:48 +0000 + +juju-mongodb (2.4.10-0ubuntu5) xenial; urgency=medium + + * Add be-port.patch from IBM's port. + + -- Michael Hudson-Doyle Tue, 08 Dec 2015 15:11:35 +1300 + juju-mongodb (2.4.10-0ubuntu4) wily; urgency=medium * Fix FTBFS: (LP: #1483400) === modified file debian/control --- debian/control 2016-02-03 22:58:46 +0000 +++ debian/control 2016-03-18 18:08:24 +0000 @@ -1,7 +1,8 @@ Source: juju-mongodb2.6 Section: database Priority: optional -Maintainer: Laszlo Boszormenyi (GCS) +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Laszlo Boszormenyi (GCS) Build-Depends: debhelper (>= 9), libboost-date-time-dev, @@ -23,7 +24,7 @@ XS-Testsuite: autopkgtest Package: juju-mongodb2.6 -Architecture: amd64 arm64 ppc64el +Architecture: amd64 i386 armhf arm64 ppc64el Depends: ${misc:Depends}, ${shlibs:Depends} === modified file debian/patches/0001-Create-kfreebsd-like-linux-in-most-respects.patch --- debian/patches/0001-Create-kfreebsd-like-linux-in-most-respects.patch 2015-11-25 22:23:52 +0000 +++ debian/patches/0001-Create-kfreebsd-like-linux-in-most-respects.patch 2016-03-18 01:46:30 +0000 @@ -8,7 +8,7 @@ --- a/SConstruct +++ b/SConstruct -@@ -66,7 +66,7 @@ solaris = False +@@ -66,7 +66,7 @@ if "darwin" == platform: darwin = True platform = "osx" # prettier than darwin @@ -17,7 +17,7 @@ linux = True platform = "linux" elif "sunos5" == platform: -@@ -526,6 +526,8 @@ libdeps.setup_environment( env ) +@@ -527,6 +527,8 @@ if env['PYSYSPLATFORM'] == 'linux3': env['PYSYSPLATFORM'] = 'linux2' === modified file debian/patches/0012-support-gnu.patch --- debian/patches/0012-support-gnu.patch 2015-11-25 22:23:52 +0000 +++ debian/patches/0012-support-gnu.patch 2016-03-18 01:46:30 +0000 @@ -1,6 +1,6 @@ --- a/SConstruct +++ b/SConstruct -@@ -66,7 +66,7 @@ solaris = False +@@ -66,7 +66,7 @@ if "darwin" == platform: darwin = True platform = "osx" # prettier than darwin @@ -9,7 +9,7 @@ linux = True platform = "linux" elif "sunos5" == platform: -@@ -535,6 +535,8 @@ if 'gnukfreebsd' in env['PYSYSPLATFORM'] +@@ -536,6 +536,8 @@ env['PYSYSPLATFORM'] = 'linux2' if 'freebsd' in env['PYSYSPLATFORM']: env['PYSYSPLATFORM'] = 'freebsd' @@ -20,7 +20,7 @@ env['OS_FAMILY'] = 'win' --- a/src/mongo/platform/random.cpp +++ b/src/mongo/platform/random.cpp -@@ -105,7 +105,7 @@ namespace mongo { +@@ -105,7 +105,7 @@ return new WinSecureRandom(); } === modified file debian/patches/00git_boost_1.56.patch --- debian/patches/00git_boost_1.56.patch 2015-08-11 10:57:23 +0000 +++ debian/patches/00git_boost_1.56.patch 2016-03-18 01:46:30 +0000 @@ -3,11 +3,9 @@ Date: Tue, 19 Aug 2014 15:07:11 -0400 Subject: [PATCH] SERVER-8994: Boost 1.56 build fixes -diff --git a/src/mongo/shell/linenoise_utf8.h b/src/mongo/shell/linenoise_utf8.h -index c9387cc..b650098 100644 --- a/src/mongo/shell/linenoise_utf8.h +++ b/src/mongo/shell/linenoise_utf8.h -@@ -28,6 +28,7 @@ +@@ -16,6 +16,7 @@ */ #include === modified file debian/patches/fix-yaml-detection.patch --- debian/patches/fix-yaml-detection.patch 2015-11-25 22:23:52 +0000 +++ debian/patches/fix-yaml-detection.patch 2016-03-18 01:35:57 +0000 @@ -7,7 +7,7 @@ --- a/SConstruct +++ b/SConstruct -@@ -1359,7 +1359,7 @@ def doConfigure(myenv): +@@ -1358,7 +1358,7 @@ conf.FindSysLibDep("stemmer", ["stemmer"]) if use_system_version_of_library("yaml"): === modified file debian/patches/no-unused-function.patch --- debian/patches/no-unused-function.patch 2015-11-25 22:23:52 +0000 +++ debian/patches/no-unused-function.patch 2016-03-18 01:46:30 +0000 @@ -6,9 +6,9 @@ Forwarded: no Last-Update: 2014-06-16 ---- mongodb-2.4.10.orig/SConstruct -+++ mongodb-2.4.10/SConstruct -@@ -708,6 +708,7 @@ if nix: +--- a/SConstruct ++++ b/SConstruct +@@ -834,6 +834,7 @@ "-pthread", "-Wall", "-Wsign-compare", === modified file debian/patches/series --- debian/patches/series 2015-11-25 22:23:52 +0000 +++ debian/patches/series 2016-03-18 18:08:24 +0000 @@ -6,11 +6,11 @@ 0007-Use-TIME_UTC_-macro.patch 0009-ignore-unused-local-typedefs.patch 0010-fix-integer-signs.patch -# Added for arm64 and ppc64el enablement +fix-yaml-detection.patch +# Added for arm64, ppc64el, and s390x enablement 0001-Add-option-to-disable-javascript.patch 0004-Support-ppc64el-builds.patch 0099-Pagesize-hacks.patch -fix-yaml-detection.patch 0012-support-gnu.patch no-unused-function.patch fix-signed-checks.patch