[SCM] mediagoblin/master: Add patch 2001 to fix Python dependencies.

js at users.alioth.debian.org js at users.alioth.debian.org
Mon Aug 21 18:02:35 UTC 2017


The following commit has been merged in the master branch:
commit 9611a5099f9439d8e36f0eb45adb32fa393be43b
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Aug 21 19:46:06 2017 +0200

    Add patch 2001 to fix Python dependencies.

diff --git a/debian/patches/2001_unhide_deps.patch b/debian/patches/2001_unhide_deps.patch
new file mode 100644
index 0000000..f3f9c7a
--- /dev/null
+++ b/debian/patches/2001_unhide_deps.patch
@@ -0,0 +1,46 @@
+Description: Fix Python dependencies
+ Uncomment dependencies causing problems with non-distro packaging.
+ .
+ Fix replace PasteScript with Chardet.
+Author: Jonas Smedegaard <dr at jones.dk>
+Last-Update: 2017-08-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/setup.py
++++ b/setup.py
+@@ -72,23 +72,16 @@
+     'unidecode',
+     'jsonschema',
+     'PasteDeploy',
+-    'PasteScript',
++    'Chardet',
+     'requests>=2.6.0',
+     'pyld',
+     # This is optional:
+     # 'translitcodec',
+-    # For now we're expecting that users will install this from
+-    # their package managers.
+-    # 'lxml',
+-    # 'Pillow',
++    'lxml',
++    'Pillow',
++    'ExifRead>=2.0.0',
+ ] + pyversion_install_requires
+ 
+-dependency_links = []
+-if not PY2:
+-    # PyPI version (1.4.2) does not have proper Python 3 support
+-    dependency_links.append('https://github.com/ianare/exif-py/zipball/develop#egg=ExifRead-2.0.0')
+-    install_requires.append('ExifRead>=2.0.0')
+-
+ with open(READMEFILE, encoding="utf-8") as fobj:
+     long_description = fobj.read()
+ 
+@@ -101,7 +94,6 @@
+     include_package_data = True,
+     # scripts and dependencies
+     install_requires=install_requires,
+-    dependency_links=dependency_links,
+     test_suite='nose.collector',
+     entry_points="""\
+         [console_scripts]
diff --git a/debian/patches/series b/debian/patches/series
index afbba03..e58bdaf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 1001_fix_exception_syntax.patch
+2001_unhide_deps.patch

-- 
mediagoblin packaging



More information about the pkg-multimedia-commits mailing list