Fixes for Debian 10 and unstable builds.
authorCarl Hetherington <cth@carlh.net>
Mon, 2 Sep 2019 19:23:25 +0000 (20:23 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 2 Sep 2019 22:43:46 +0000 (23:43 +0100)
Forward-ported from 446255b74f38f299c2e73260293dce291666fb73 in 2.14.x.

cscript

diff --git a/cscript b/cscript
index 992a3e9c47d30e0f4d33de0f22401dbc6c67e318..453dd2d0bec7694500ff843722b05c51e4f9f1d6 100644 (file)
--- a/cscript
+++ b/cscript
@@ -45,6 +45,8 @@ deb_build_depends['8'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['8'].extend(['libssh-gcrypt-dev'])
 deb_build_depends['9'] = copy.deepcopy(deb_build_depends_base)
 deb_build_depends['9'].extend(['libssh-gcrypt-dev'])
+deb_build_depends['10'] = copy.deepcopy(deb_build_depends_base)
+deb_build_depends['10'].extend(['libssh-gcrypt-dev'])
 deb_build_depends['unstable'] = copy.deepcopy(deb_build_depends_base)
 
 deb_depends = dict()
@@ -190,18 +192,41 @@ deb_depends_gui['9'] = [ 'libwxgtk3.0-0v5',
                          'libasound2',
                          'libpulse0' ]
 
+deb_depends['10'] = copy.deepcopy(deb_depends_base)
+deb_depends['10'].extend(['libboost-filesystem1.67.0',
+                          'libboost-thread1.67.0',
+                          'libboost-regex1.67.0',
+                          'libboost-date-time1.67.0',
+                          'libxml++2.6-2v5',
+                          'libgtk2.0-0',
+                          'libzip4',
+                          'libcairomm-1.0-1v5',
+                          'libpangomm-1.4-1v5',
+                          'libicu63',
+                          'libssh-4',
+                          'libssh-gcrypt-4',
+                          'libnettle6',
+                          'libx264-155',
+                          'libcurl4'])
+
+deb_depends_gui['10'] = [ 'libwxgtk3.0-0v5',
+                          'libxcb-xfixes0',
+                          'libxcb-shape0',
+                          'libasound2',
+                          'libpulse0' ]
+
 deb_depends['unstable'] = copy.deepcopy(deb_depends_base)
-deb_depends['unstable'].extend(['libboost-filesystem1.62.0',
-                                'libboost-thread1.62.0',
-                                'libboost-regex1.62.0',
-                                'libboost-date-time1.62.0',
+deb_depends['unstable'].extend(['libboost-filesystem1.67.0',
+                                'libboost-thread1.67.0',
+                                'libboost-regex1.67.0',
+                                'libboost-date-time1.67.0',
                                 'libxml++2.6-2v5',
                                 'libgtk2.0-0',
                                 'libzip4',
-                                'libicu57',
+                                'libicu63',
                                 'libnettle6',
-                                'libx264-148',
-                                'libcurl3'])
+                                'libx264-155',
+                                'libcurl4'])
 
 def packages(name, packages, f):
     s = '%s: ' % name