Control: tags 959652 + patch

Dear maintainer,

I've prepared an NMU for imdbpy (versioned as 6.8-2.1). The diff
is attached to this message.

cu
Adrian
diff -Nru imdbpy-6.8/debian/changelog imdbpy-6.8/debian/changelog
--- imdbpy-6.8/debian/changelog	2019-09-12 00:01:02.000000000 +0300
+++ imdbpy-6.8/debian/changelog	2021-02-07 13:52:04.000000000 +0200
@@ -1,3 +1,10 @@
+imdbpy (6.8-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Backport upstream FTBFS fix. (Closes: #959652)
+
+ -- Adrian Bunk <[email protected]>  Sun, 07 Feb 2021 13:52:04 +0200
+
 imdbpy (6.8-2) unstable; urgency=medium
 
   * Update Homepage and copyright years.
diff -Nru imdbpy-6.8/debian/patches/0001-fix-262-remove-obsolete-Feature-keyword-from-setup.p.patch imdbpy-6.8/debian/patches/0001-fix-262-remove-obsolete-Feature-keyword-from-setup.p.patch
--- imdbpy-6.8/debian/patches/0001-fix-262-remove-obsolete-Feature-keyword-from-setup.p.patch	1970-01-01 02:00:00.000000000 +0200
+++ imdbpy-6.8/debian/patches/0001-fix-262-remove-obsolete-Feature-keyword-from-setup.p.patch	2021-02-07 13:51:27.000000000 +0200
@@ -0,0 +1,47 @@
+From 4f1d6ae9ec8c0f584bcef6e41f575a3ed38679c2 Mon Sep 17 00:00:00 2001
+From: Davide Alberani <[email protected]>
+Date: Sat, 13 Jun 2020 09:47:16 +0200
+Subject: fix #262: remove obsolete Feature keyword from setup.py
+
+diff --git a/setup.py b/setup.py
+index 1e471c9..2595154 100755
+--- a/setup.py
++++ b/setup.py
+@@ -80,11 +80,6 @@ scripts = [
+ 
+ data_files = []
+ 
+-featSQLAlchemy = setuptools.dist.Feature(
+-    'SQLAlchemy dependency',
+-    standard=True,
+-    install_requires=['SQLAlchemy']
+-)
+ 
+ params = {
+     # Meta-information.
+@@ -123,7 +118,6 @@ params = {
+             'pytest-profiling'
+         ]
+     },
+-    'features': {'sqlalchemy': featSQLAlchemy},
+     'packages': setuptools.find_packages(),
+     'entry_points': """
+         [console_scripts]
+@@ -160,12 +154,11 @@ def runRebuildmo():
+     path = list(sys.path)
+     languages = []
+     try:
+-        import imp
++        import importlib
+         scriptPath = os.path.dirname(__file__)
+         modulePath = os.path.join(cwd, scriptPath, REBUILDMO_DIR)
+         sys.path += [modulePath, '.', cwd]
+-        modInfo = imp.find_module(REBUILDMO_NAME, [modulePath, '.', cwd])
+-        rebuildmo = imp.load_module('rebuildmo', *modInfo)
++        rebuildmo = importlib.import_module(os.path.join(REBUILDMO_DIR, REBUILDMO_NAME).replace('/', '.'))
+         os.chdir(modulePath)
+         languages = rebuildmo.rebuildmo()
+         print('Created locale for: %s.' % ' '.join(languages))
+-- 
+2.20.1
+
diff -Nru imdbpy-6.8/debian/patches/series imdbpy-6.8/debian/patches/series
--- imdbpy-6.8/debian/patches/series	2019-08-02 00:41:10.000000000 +0300
+++ imdbpy-6.8/debian/patches/series	2021-02-07 13:52:01.000000000 +0200
@@ -1 +1,2 @@
 do_not_install_scripts
+0001-fix-262-remove-obsolete-Feature-keyword-from-setup.p.patch

Reply via email to