--- Begin Message ---
Package: mongo-cxx-driver-legacy
Version: 1.1.3-3
Severity: normal
Tags: patch pending
Dear maintainer,
I've prepared an NMU for mongo-cxx-driver-legacy (versioned as 1.1.3-3.1). The
diff
is attached to this message.
Regards.
Jonas
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 2018-12-06
22:00:28.000000000 +0100
+++ mongo-cxx-driver-legacy-1.1.3/debian/changelog 2021-01-03
09:48:28.000000000 +0100
@@ -1,3 +1,24 @@
+mongo-cxx-driver-legacy (1.1.3-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ 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.
+
+ -- Jonas Smedegaard <[email protected]> Sun, 03 Jan 2021 09:48:28 +0100
+
mongo-cxx-driver-legacy (1.1.3-3) unstable; urgency=medium
* Fix FTBFS with Boost 1.67 (Closes: #911888)
@@ -97,4 +118,3 @@
Closes: #818286
-- Giulio Paci <[email protected]> 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 15:22:09.000000000
+0200
+++ mongo-cxx-driver-legacy-1.1.3/debian/compat 1970-01-01 01:00:00.000000000
+0100
@@ -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 2018-12-06
22:00:28.000000000 +0100
+++ mongo-cxx-driver-legacy-1.1.3/debian/control 2021-01-03
09:48:28.000000000 +0100
@@ -5,7 +5,7 @@
Uploaders: Giulio Paci <[email protected]>,
Apollon Oikonomopoulos <[email protected]>,
Laszlo Boszormenyi (GCS) <[email protected]>
-Build-Depends: debhelper (>= 11~),
+Build-Depends: debhelper-compat (= 12),
devscripts,
dh-buildinfo,
dh-exec,
@@ -15,6 +15,7 @@
libjsoncpp-dev,
libsasl2-dev,
libssl-dev,
+ python3-distutils,
tzdata,
scons (>= 2.3.0)
Standards-Version: 4.2.1
@@ -47,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
15:34:43.000000000 +0200
+++ mongo-cxx-driver-legacy-1.1.3/debian/copyright 2021-01-03
09:48:28.000000000 +0100
@@ -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 <https://www.mongodb.org/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 01:00:00.000000000 +0100
+++
mongo-cxx-driver-legacy-1.1.3/debian/patches/1005_fix_ftbfs_with_python3.patch
2021-01-03 09:25:03.000000000 +0100
@@ -0,0 +1,132 @@
+Description: Fix FTBS with python3
+Author: Christophe Trophime <[email protected]>
+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/series
mongo-cxx-driver-legacy-1.1.3/debian/patches/series
--- mongo-cxx-driver-legacy-1.1.3/debian/patches/series 2018-12-06
21:58:49.000000000 +0100
+++ mongo-cxx-driver-legacy-1.1.3/debian/patches/series 2021-01-03
09:24:51.000000000 +0100
@@ -2,6 +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
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 16:51:54.000000000
+0200
+++ mongo-cxx-driver-legacy-1.1.3/debian/rules 2021-01-03 09:48:28.000000000
+0100
@@ -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
01:00:00.000000000 +0100
+++ mongo-cxx-driver-legacy-1.1.3/debian/upstream/metadata 2021-01-03
09:48:28.000000000 +0100
@@ -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 17:52:41.000000000
+0200
+++ mongo-cxx-driver-legacy-1.1.3/debian/watch 2021-01-03 09:48:28.000000000
+0100
@@ -1,3 +1,2 @@
-version=3
-opts=filenamemangle=s/.+\/legacy-(\d\S*)\.tar\.gz/<project>-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/<project>-legacy-$1\.tar\.gz/
https://github.com/mongodb/mongo-cxx-driver/tags .*/legacy-(\d\S*)\.tar\.gz
--- End Message ---
