It would appear that iconv is no longer required; certainly quickmail isn't.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 51bf123f807713010ad87bf5c9aabed93bf2571f..feb46ae1f12b1a768df8ef67e5fda3bc3d1f18ff 100644 (file)
--- a/cscript
+++ b/cscript
@@ -26,7 +26,7 @@ import copy
 
 deb_build_depends = dict()
 
-deb_build_depends_base = {'debhelper', 'python', 'g++', 'pkg-config', 'libsndfile1-dev', 'libgtk2.0-dev'}
+deb_build_depends_base = ['debhelper', 'python', 'g++', 'pkg-config', 'libsndfile1-dev', 'libgtk2.0-dev']
 
 deb_build_depends['12.04'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['12.04'].extend(['libssh-dev'])
@@ -40,10 +40,11 @@ deb_build_depends['7'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['7'].extend(['libssh-dev'])
 deb_build_depends['8'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['8'].extend(['libssh-dev'])
+deb_build_depends['unstable'] = copy.deepcopy(deb_build_depends_base)
 
 deb_depends = dict()
 
-deb_depends_base = ['libc6', 'libssh-4', 'libsndfile1', 'libsamplerate0', 'libxmlsec1', 'libxmlsec1-openssl', 'libcurl3', 'libgtk2.0-0']
+deb_depends_base = ['libc6', 'libsndfile1', 'libsamplerate0', 'libxmlsec1', 'libxmlsec1-openssl', 'libcurl3', 'libgtk2.0-0']
 
 deb_depends['12.04'] = copy.deepcopy(deb_depends_base)
 deb_depends['12.04'].extend(['libboost-filesystem1.48.0',
@@ -54,7 +55,8 @@ deb_depends['12.04'].extend(['libboost-filesystem1.48.0',
                              'libboost-date-time1.48.0',
                              'libzip2',
                              'libicu48',
-                             'libnettle4'])
+                             'libnettle4',
+                             'libssh-4'])
 
 deb_depends['14.04'] = copy.deepcopy(deb_depends_base)
 deb_depends['14.04'].extend(['libboost-filesystem1.54.0',
@@ -67,7 +69,8 @@ deb_depends['14.04'].extend(['libboost-filesystem1.54.0',
                              'libcairomm-1.0-1',
                              'libpangomm-1.4-1',
                              'libicu52',
-                             'libnettle4'])
+                             'libnettle4',
+                             'libssh-4'])
 
 deb_depends['16.04'] = copy.deepcopy(deb_depends_base)
 deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
@@ -79,7 +82,8 @@ deb_depends['16.04'].extend(['libboost-filesystem1.58.0',
                              'libzip4',
                              'libwxgtk3.0-0v5',
                              'libicu55',
-                             'libnettle6'])
+                             'libnettle6',
+                             'libssh-4'])
 
 deb_depends['16.10'] = copy.deepcopy(deb_depends_base)
 deb_depends['16.10'].extend(['libboost-filesystem1.61.0',
@@ -91,7 +95,8 @@ deb_depends['16.10'].extend(['libboost-filesystem1.61.0',
                              'libzip4',
                              'libwxgtk3.0-0v5',
                              'libicu57',
-                             'libnettle6'])
+                             'libnettle6',
+                             'libssh-4'])
 
 deb_depends['7'] = copy.deepcopy(deb_depends_base)
 deb_depends['7'].extend(['libboost-filesystem1.49.0',
@@ -119,7 +124,8 @@ deb_depends['8'].extend(['libboost-filesystem1.55.0',
                          'libxcb-xfixes0',
                          'libxcb-shape0',
                          'libicu52',
-                         'libnettle4'])
+                         'libnettle4',
+                         'libssh-4'])
 
 deb_depends['unstable'] = copy.deepcopy(deb_depends_base)
 deb_depends['unstable'].extend(['libboost-filesystem1.58.0',
@@ -145,7 +151,7 @@ def make_control(debian_version, bits, filename, debug):
     print('Section: video', file=f)
     print('Priority: extra', file=f)
     print('Maintainer: Carl Hetherington <carl@dcpomatic.com>', file=f)
-    packages('Build-Depends', deb_build_depends, f)
+    packages('Build-Depends', deb_build_depends[debian_version], f)
     print('Standards-Version: 3.9.3', file=f)
     print('Homepage: http://dcpomatic.com/', file=f)
     print('', file=f)