diff -Nru mongo-cxx-driver-legacy-1.1.3/debian/changelog mongo-cxx-driver-legacy-1.1.3/debian/changelog --- mongo-cxx-driver-legacy-1.1.3/debian/changelog 2020-12-12 12:08:51.000000000 +0000 +++ mongo-cxx-driver-legacy-1.1.3/debian/changelog 2021-01-03 08:48:28.000000000 +0000 @@ -1,26 +1,23 @@ -mongo-cxx-driver-legacy (1.1.3-3ubuntu2) hirsute; urgency=medium +mongo-cxx-driver-legacy (1.1.3-3.1) unstable; urgency=medium - * No-change rebuild for boost soname change. + * Non-maintainer upload. - -- Matthias Klose Sat, 12 Dec 2020 13:08:51 +0100 + [ Jonas Smedegaard ] + * add patch 1005 to fix FTBS with python3, + and build-depend on python3-distutils; + closes: bug#947569, thanks to Jörg Frings-Fürst and Christophe Trophime + * drop obsolete transitional package mongodb-dev; + closes: bug#940752, thanks to Holger Levsen + + [ Debian Janitor ] + * Trim trailing whitespace. + * Use secure copyright file specification URI. + * Bump debhelper from old 11 to 12. + * Set debhelper-compat version in Build-Depends. + * Set upstream metadata fields: Repository, Repository-Browse. + * Update watch file format version to 4. -mongo-cxx-driver-legacy (1.1.3-3ubuntu1) groovy; urgency=medium - - * Cherrypick BTS patch to fix FTBFS. Closes: #947569 - - -- Dimitri John Ledkov Mon, 01 Jun 2020 13:47:42 +0100 - -mongo-cxx-driver-legacy (1.1.3-3build2) focal; urgency=medium - - * No-change rebuild for libgcc-s1 package name change. - - -- Matthias Klose Mon, 23 Mar 2020 08:58:42 +0100 - -mongo-cxx-driver-legacy (1.1.3-3build1) focal; urgency=medium - - * No change rebuild against new boost1.71 ABI - - -- Dimitri John Ledkov Mon, 03 Feb 2020 21:06:12 +0000 + -- Jonas Smedegaard Sun, 03 Jan 2021 09:48:28 +0100 mongo-cxx-driver-legacy (1.1.3-3) unstable; urgency=medium @@ -121,4 +118,3 @@ Closes: #818286 -- Giulio Paci Mon, 23 May 2016 09:32:23 +0200 - diff -Nru mongo-cxx-driver-legacy-1.1.3/debian/compat mongo-cxx-driver-legacy-1.1.3/debian/compat --- mongo-cxx-driver-legacy-1.1.3/debian/compat 2018-06-20 13:22:09.000000000 +0000 +++ mongo-cxx-driver-legacy-1.1.3/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru mongo-cxx-driver-legacy-1.1.3/debian/control mongo-cxx-driver-legacy-1.1.3/debian/control --- mongo-cxx-driver-legacy-1.1.3/debian/control 2020-06-01 12:47:42.000000000 +0000 +++ mongo-cxx-driver-legacy-1.1.3/debian/control 2021-01-03 08:48:28.000000000 +0000 @@ -1,22 +1,21 @@ Source: mongo-cxx-driver-legacy Section: devel Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian MongoDB Maintainers +Maintainer: Debian MongoDB Maintainers Uploaders: Giulio Paci , Apollon Oikonomopoulos , Laszlo Boszormenyi (GCS) -Build-Depends: debhelper (>= 11~), +Build-Depends: debhelper-compat (= 12), devscripts, dh-buildinfo, dh-exec, - python3-distutils, libboost-dev, libboost-thread-dev, libgtest-dev, libjsoncpp-dev, libsasl2-dev, libssl-dev, + python3-distutils, tzdata, scons (>= 2.3.0) Standards-Version: 4.2.1 @@ -49,10 +48,3 @@ 3.0 and 3.2. . This package includes the shared library. - -Package: mongodb-dev -Architecture: all -Section: oldlibs -Depends: libmongoclient-dev, ${misc:Depends} -Description: MongoDB C++ Driver (transitional package) - This is a transitional dummy package and can be safely removed. diff -Nru mongo-cxx-driver-legacy-1.1.3/debian/copyright mongo-cxx-driver-legacy-1.1.3/debian/copyright --- mongo-cxx-driver-legacy-1.1.3/debian/copyright 2018-06-20 13:34:43.000000000 +0000 +++ mongo-cxx-driver-legacy-1.1.3/debian/copyright 2021-01-03 08:48:28.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Contact: MongoDB community Upstream-Name: mongo-cxx-driver Source: https://github.com/mongodb/mongo-cxx-driver diff -Nru mongo-cxx-driver-legacy-1.1.3/debian/patches/1005_fix_ftbfs_with_python3.patch mongo-cxx-driver-legacy-1.1.3/debian/patches/1005_fix_ftbfs_with_python3.patch --- mongo-cxx-driver-legacy-1.1.3/debian/patches/1005_fix_ftbfs_with_python3.patch 1970-01-01 00:00:00.000000000 +0000 +++ mongo-cxx-driver-legacy-1.1.3/debian/patches/1005_fix_ftbfs_with_python3.patch 2021-01-03 08:25:03.000000000 +0000 @@ -0,0 +1,132 @@ +Description: Fix FTBS with python3 +Author: Christophe Trophime +Bug-Debian: https://bugs.debian.org/947569 +Last-Update: 2020-03-04 +--- a/SConstruct ++++ b/SConstruct +@@ -13,7 +13,7 @@ + import textwrap + import types + import urllib +-import urllib2 ++#import urllib2 + + import buildscripts.utils + import buildscripts.docs +@@ -389,7 +389,7 @@ + def printLocalInfo(): + import sys, SCons + print( "scons version: " + SCons.__version__ ) +- print( "python version: " + " ".join( [ `i` for i in sys.version_info ] ) ) ++ print( "python version: " + " ".join( [ str(i) for i in sys.version_info ] ) ) + + printLocalInfo() + +@@ -928,7 +928,7 @@ + env.Append( CPPDEFINES=["MONGO_DEBUG_BUILD"] ); + + try: +- umask = os.umask(022) ++ umask = os.umask(0o22) + except OSError: + pass + +@@ -1119,7 +1119,7 @@ + # to make them real errors. + cloned.Append(CCFLAGS=['-Werror']) + conf = Configure(cloned, help=False, custom_tests = { +- 'CheckFlag' : lambda(ctx) : CheckFlagTest(ctx, tool, extension, flag) ++ 'CheckFlag' : lambda ctx : CheckFlagTest(ctx, tool, extension, flag) + }) + available = conf.CheckFlag() + conf.Finish() +--- a/site_scons/buildscripts/clang_format.py ++++ b/site_scons/buildscripts/clang_format.py +@@ -9,7 +9,7 @@ + """ + from __future__ import print_function, absolute_import + +-import Queue ++import queue + import difflib + import itertools + import os +--- a/site_scons/buildscripts/lint.py ++++ b/site_scons/buildscripts/lint.py +@@ -2,8 +2,8 @@ + import sys + import codecs + +-import cpplint +-import utils ++import buildscripts.cpplint ++import buildscripts.utils + + + def run_lint( paths, nudgeOn=False ): +--- a/src/SConscript.client ++++ b/src/SConscript.client +@@ -3,7 +3,7 @@ + # This SConscript describes build and install rules for the Mongo C++ driver and associated exmaple + # programs. + import buildscripts.git +-import httplib ++import http.client + import json + import os + import re +@@ -415,7 +415,7 @@ + mongoClientPrefixInstalls.append(mongoClientSharedLibPrefixInstall) + + inst = libEnv.InstallAs(['$INSTALL_DIR/include/' + x for x in clientHeaders], clientHeaders) +-libEnv.AddPostAction(inst, Chmod('$TARGET', 0644)) ++libEnv.AddPostAction(inst, Chmod('$TARGET', 0o644)) + mongoClientPrefixInstalls.append(inst); + + +--- a/src/mongo/base/generate_error_codes.py ++++ b/src/mongo/base/generate_error_codes.py +@@ -112,12 +112,14 @@ + def generate_header(filename, error_codes, error_classes): + + enum_declarations = ',\n '.join('%s = %s' % ec for ec in error_codes) +- predicate_declarations = ';\n '.join( ++ predicate_declarations = ';\n '.join( + 'static bool is%s(Error err)' % ec[0] for ec in error_classes) + +- open(filename, 'wb').write(header_template % dict( ++ header = header_template % dict( + error_code_enum_declarations=enum_declarations, +- error_code_class_predicate_declarations=predicate_declarations)) ++ error_code_class_predicate_declarations=predicate_declarations) ++ ++ open(filename, 'wb').write(header.encode()) + + def generate_source(filename, error_codes, error_classes): + symbol_to_string_cases = ';\n '.join( +@@ -129,11 +131,12 @@ + 'case %s: return %s' % (ec[0], ec[0]) for ec in error_codes) + predicate_definitions = '\n '.join( + generate_error_class_predicate_definition(*ec) for ec in error_classes) +- open(filename, 'wb').write(source_template % dict( ++ source = source_template % dict( + symbol_to_string_cases=symbol_to_string_cases, + string_to_symbol_cases=string_to_symbol_cases, + int_to_symbol_cases=int_to_symbol_cases, +- error_code_class_predicate_definitions=predicate_definitions)) ++ error_code_class_predicate_definitions=predicate_definitions) ++ open(filename, 'wb').write(source.encode()) + + def generate_error_class_predicate_definition(class_name, code_names): + cases = '\n '.join('case %s:' % c for c in code_names) +--- a/src/mongo/logger/log_test.cpp ++++ b/src/mongo/logger/log_test.cpp +@@ -403,7 +403,7 @@ + + // Tests pass through of log component: + // log macros -> LogStreamBuilder -> MessageEventEphemeral -> MessageEventDetailsEncoder +-TEST_F(LogTestDetailsEncoder, ) { ++TEST_F(LogTestDetailsEncoder, MessageEventDetailsEncoderLogComponent) { + globalLogDomain()->setMinimumLoggedSeverity(LogSeverity::Log()); + + // Default log component short name should not appear in detailed log line. diff -Nru mongo-cxx-driver-legacy-1.1.3/debian/patches/Fix-FTBFS.patch mongo-cxx-driver-legacy-1.1.3/debian/patches/Fix-FTBFS.patch --- mongo-cxx-driver-legacy-1.1.3/debian/patches/Fix-FTBFS.patch 2020-06-01 12:47:40.000000000 +0000 +++ mongo-cxx-driver-legacy-1.1.3/debian/patches/Fix-FTBFS.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,155 +0,0 @@ -Description: - TODO: Put a short summary on the line above and replace this paragraph - with a longer explanation of this change. Complete the meta-information - with other relevant fields (see below for details). To make it easier, the - information below has been extracted from the changelog. Adjust it or drop - it. - . - mongo-cxx-driver-legacy (1.1.3-3.1) unstable; urgency=medium - . - * Non-maintainer upload. - * Fix FTBS with python3 (Closes: #947569) -Author: Christophe Trophime -Bug-Debian: https://bugs.debian.org/947569 - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: https://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: 2020-03-04 - ---- mongo-cxx-driver-legacy-1.1.3.orig/SConstruct -+++ mongo-cxx-driver-legacy-1.1.3/SConstruct -@@ -13,7 +13,7 @@ import sys - import textwrap - import types - import urllib --import urllib2 -+#import urllib2 - - import buildscripts.utils - import buildscripts.docs -@@ -389,7 +389,7 @@ SConsignFile(str(sconsDataDir.File('scon - def printLocalInfo(): - import sys, SCons - print( "scons version: " + SCons.__version__ ) -- print( "python version: " + " ".join( [ `i` for i in sys.version_info ] ) ) -+ print( "python version: " + " ".join( [ str(i) for i in sys.version_info ] ) ) - - printLocalInfo() - -@@ -931,7 +931,7 @@ if debugBuild: - env.Append( CPPDEFINES=["MONGO_DEBUG_BUILD"] ); - - try: -- umask = os.umask(022) -+ umask = os.umask(0o22) - except OSError: - pass - -@@ -1125,7 +1125,7 @@ def doConfigure(myenv): - # to make them real errors. - cloned.Append(CCFLAGS=['-Werror']) - conf = Configure(cloned, help=False, custom_tests = { -- 'CheckFlag' : lambda(ctx) : CheckFlagTest(ctx, tool, extension, flag) -+ 'CheckFlag' : lambda ctx : CheckFlagTest(ctx, tool, extension, flag) - }) - available = conf.CheckFlag() - conf.Finish() ---- mongo-cxx-driver-legacy-1.1.3.orig/site_scons/buildscripts/clang_format.py -+++ mongo-cxx-driver-legacy-1.1.3/site_scons/buildscripts/clang_format.py -@@ -9,7 +9,7 @@ A script that provides: - """ - from __future__ import print_function, absolute_import - --import Queue -+import queue - import difflib - import itertools - import os ---- mongo-cxx-driver-legacy-1.1.3.orig/site_scons/buildscripts/lint.py -+++ mongo-cxx-driver-legacy-1.1.3/site_scons/buildscripts/lint.py -@@ -2,8 +2,8 @@ - import sys - import codecs - --import cpplint --import utils -+import buildscripts.cpplint -+import buildscripts.utils - - - def run_lint( paths, nudgeOn=False ): ---- mongo-cxx-driver-legacy-1.1.3.orig/src/SConscript.client -+++ mongo-cxx-driver-legacy-1.1.3/src/SConscript.client -@@ -3,7 +3,7 @@ - # This SConscript describes build and install rules for the Mongo C++ driver and associated exmaple - # programs. - import buildscripts.git --import httplib -+import http.client - import json - import os - import re -@@ -415,7 +415,7 @@ if buildShared: - mongoClientPrefixInstalls.append(mongoClientSharedLibPrefixInstall) - - inst = libEnv.InstallAs(['$INSTALL_DIR/include/' + x for x in clientHeaders], clientHeaders) --libEnv.AddPostAction(inst, Chmod('$TARGET', 0644)) -+libEnv.AddPostAction(inst, Chmod('$TARGET', 0o644)) - mongoClientPrefixInstalls.append(inst); - - ---- mongo-cxx-driver-legacy-1.1.3.orig/src/mongo/base/generate_error_codes.py -+++ mongo-cxx-driver-legacy-1.1.3/src/mongo/base/generate_error_codes.py -@@ -112,12 +112,14 @@ def has_missing_error_codes(error_codes, - def generate_header(filename, error_codes, error_classes): - - enum_declarations = ',\n '.join('%s = %s' % ec for ec in error_codes) -- predicate_declarations = ';\n '.join( -+ predicate_declarations = ';\n '.join( - 'static bool is%s(Error err)' % ec[0] for ec in error_classes) - -- open(filename, 'wb').write(header_template % dict( -+ header = header_template % dict( - error_code_enum_declarations=enum_declarations, -- error_code_class_predicate_declarations=predicate_declarations)) -+ error_code_class_predicate_declarations=predicate_declarations) -+ -+ open(filename, 'wb').write(header.encode()) - - def generate_source(filename, error_codes, error_classes): - symbol_to_string_cases = ';\n '.join( -@@ -129,11 +131,12 @@ def generate_source(filename, error_code - 'case %s: return %s' % (ec[0], ec[0]) for ec in error_codes) - predicate_definitions = '\n '.join( - generate_error_class_predicate_definition(*ec) for ec in error_classes) -- open(filename, 'wb').write(source_template % dict( -+ source = source_template % dict( - symbol_to_string_cases=symbol_to_string_cases, - string_to_symbol_cases=string_to_symbol_cases, - int_to_symbol_cases=int_to_symbol_cases, -- error_code_class_predicate_definitions=predicate_definitions)) -+ error_code_class_predicate_definitions=predicate_definitions) -+ open(filename, 'wb').write(source.encode()) - - def generate_error_class_predicate_definition(class_name, code_names): - cases = '\n '.join('case %s:' % c for c in code_names) ---- mongo-cxx-driver-legacy-1.1.3.orig/src/mongo/logger/log_test.cpp -+++ mongo-cxx-driver-legacy-1.1.3/src/mongo/logger/log_test.cpp -@@ -403,7 +403,7 @@ TEST_F(LogTestUnadornedEncoder, MessageE - - // Tests pass through of log component: - // log macros -> LogStreamBuilder -> MessageEventEphemeral -> MessageEventDetailsEncoder --TEST_F(LogTestDetailsEncoder, ) { -+TEST_F(LogTestDetailsEncoder, MessageEventDetailsEncoderLogComponent) { - globalLogDomain()->setMinimumLoggedSeverity(LogSeverity::Log()); - - // Default log component short name should not appear in detailed log line. diff -Nru mongo-cxx-driver-legacy-1.1.3/debian/patches/series mongo-cxx-driver-legacy-1.1.3/debian/patches/series --- mongo-cxx-driver-legacy-1.1.3/debian/patches/series 2020-06-01 12:47:40.000000000 +0000 +++ mongo-cxx-driver-legacy-1.1.3/debian/patches/series 2021-01-03 08:24:51.000000000 +0000 @@ -2,7 +2,7 @@ 1002_openssl_1.1_compat.patch 1003_C++11_compat.patch 1004_fix_ftbfs_with_gcc6.1.patch +1005_fix_ftbfs_with_python3.patch 2001_use_system_libraries_if_possible.patch 2002_add-latomic-for-mips32.patch boost-1.67-compat.patch -Fix-FTBFS.patch diff -Nru mongo-cxx-driver-legacy-1.1.3/debian/rules mongo-cxx-driver-legacy-1.1.3/debian/rules --- mongo-cxx-driver-legacy-1.1.3/debian/rules 2018-06-26 14:51:54.000000000 +0000 +++ mongo-cxx-driver-legacy-1.1.3/debian/rules 2021-01-03 08:48:28.000000000 +0000 @@ -71,8 +71,3 @@ override_dh_makeshlibs: dh_makeshlibs -V - -override_dh_gencontrol: - dh_gencontrol -Nmongodb-dev - # Bump the epoch of mongodb-dev - dh_gencontrol -pmongodb-dev -- -v2:$(DEB_VERSION) diff -Nru mongo-cxx-driver-legacy-1.1.3/debian/upstream/metadata mongo-cxx-driver-legacy-1.1.3/debian/upstream/metadata --- mongo-cxx-driver-legacy-1.1.3/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ mongo-cxx-driver-legacy-1.1.3/debian/upstream/metadata 2021-01-03 08:48:28.000000000 +0000 @@ -0,0 +1,3 @@ +--- +Repository: https://github.com/mongodb/mongo-cxx-driver.git +Repository-Browse: https://github.com/mongodb/mongo-cxx-driver diff -Nru mongo-cxx-driver-legacy-1.1.3/debian/watch mongo-cxx-driver-legacy-1.1.3/debian/watch --- mongo-cxx-driver-legacy-1.1.3/debian/watch 2017-08-10 15:52:41.000000000 +0000 +++ mongo-cxx-driver-legacy-1.1.3/debian/watch 2021-01-03 08:48:28.000000000 +0000 @@ -1,3 +1,2 @@ -version=3 -opts=filenamemangle=s/.+\/legacy-(\d\S*)\.tar\.gz/-legacy-$1\.tar\.gz/ \ - https://github.com/mongodb/mongo-cxx-driver/tags .*/legacy-(\d\S*)\.tar\.gz +version=4 +opts=filenamemangle=s/.+\/legacy-(\d\S*)\.tar\.gz/-legacy-$1\.tar\.gz/ https://github.com/mongodb/mongo-cxx-driver/tags .*/legacy-(\d\S*)\.tar\.gz