Merge branch 'debian'

debian/changelog

@@ -1,3 +1,17 @@
+pgloader (3.6.2-1) unstable; urgency=medium
+
+  * New upstream version.
+  * debian/tests/ssl: Add --debug to get backtraces.
+  * debian/rules: Sync loaded systems with Makefile.
+  * debian/rules: Print actual compiler log.
+  * debian/rules: Skip dh_dwz like dh_strip as it fails on buster.
+  * Bump required cl-db3 version to 20200212.
+  * Note that we need cl-plus-ssl 20190204 or later.
+  * Note that we need cl-csv 20180712 or later.
+  * DH 13.
+
+ -- Christoph Berg <myon@debian.org>  Tue, 14 Jul 2020 17:02:30 +0200
+
 pgloader (3.6.1-1) unstable; urgency=medium
 
   * New upstream version.

debian/clean

@@ -0,0 +1 @@
+buildapp.*

debian/compat

@@ -1 +0,0 @@
-9

debian/control

@@ -13,8 +13,8 @@ Build-Depends:
  cl-bordeaux-threads (>= 0.8.3),
  cl-cffi (>= 1:0.12.0),
  cl-command-line-arguments,
- cl-csv,
- cl-db3,
+ cl-csv (>= 20180712),
+ cl-db3 (>= 20200212),
  cl-drakma,
  cl-esrap,
  cl-fad,
@@ -29,6 +29,7 @@ Build-Depends:
  cl-metabang-bind,
  cl-mssql,
  cl-mustache,
+ cl-plus-ssl (>= 20190204),
  cl-postmodern,
  cl-ppcre,
  cl-py-configparser,
@@ -45,14 +46,14 @@ Build-Depends:
  cl-uuid,
  cl-yason,
  cl-zs3,
- debhelper (>= 9.0.0),
+ debhelper-compat (= 13),
  gawk,
  help2man,
  python3-sphinx-rtd-theme,
  python3-sphinx,
  sbcl (>= 1.1.13),
  tzdata,
-Standards-Version: 4.1.4
+Standards-Version: 4.5.0
 Homepage: https://github.com/dimitri/pgloader
 Vcs-Git: https://github.com/dimitri/pgloader.git
 Vcs-Browser: https://github.com/dimitri/pgloader
@@ -87,7 +88,7 @@ Depends:
  cl-cffi (>= 1:0.12.0),
  cl-command-line-arguments,
  cl-csv,
- cl-db3,
+ cl-db3 (>= 20200212),
  cl-drakma,
  cl-esrap,
  cl-fad,

debian/patches/bionic-theme-options

@@ -0,0 +1,14 @@
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -92,11 +92,6 @@ html_theme = 'sphinx_rtd_theme'
+ #
+ # html_theme_options = {}
+ html_theme_options = {
+-    'github_user': 'dimitri',
+-    'github_repo': 'pgloader',
+-    'description': 'your migration companion',
+-    'travis_button': True,
+-    'show_related': True,
+     #'sidebar_collapse': False,
+ }
+ 

debian/patches/series

@@ -0,0 +1 @@
+#bionic-theme-options

debian/rules

@@ -33,19 +33,26 @@ override_dh_auto_build-arch:
 		--asdf-tree /usr/share/common-lisp/systems			\
 		--load-system asdf-finalizers					\
 		--load-system asdf-system-connections				\
-		--load-system pgloader						\
+		--load-system cffi						\
+		--load-system cl+ssl						\
+		--load-system mssql						\
 		--load src/hooks.lisp						\
+		--load-system pgloader						\
 		--entry pgloader:main						\
 		--dynamic-space-size $(SIZE)					\
 		--compress-core							\
-		--output build/bin/pgloader
+		--logfile buildapp.log						\
+		--output build/bin/pgloader					\
+			|| echo $$? > buildapp.fail
+	cat buildapp.log
+	test ! -f buildapp.fail
 	$(MAKE) -C docs html
 
 override_dh_auto_test:
 	# do nothing
 
-override_dh_strip:
-	# do nothing
+override_dh_strip override_dh_dwz:
+	# do nothing, sbcl doesn't write any debug info
 
 override_dh_installman-arch:
 	mkdir -p debian/pgloader/usr/share/man/man1/

debian/tests/ssl

@@ -20,9 +20,9 @@ pg_virtualenv <<-'EOF'
 
 	# test UNIX socket
 	rm -rf /tmp/pgloader
-	PGHOST=/var/run/postgresql su -c 'pgloader --regress test/allcols.load' postgres
+	PGHOST=/var/run/postgresql su -c 'pgloader --debug --regress test/allcols.load' postgres
 
 	# test SSL connection
 	rm -rf /tmp/pgloader
-	PGSSLMODE=require pgloader --regress test/allcols.load
+	PGSSLMODE=require pgloader --debug --regress test/allcols.load
 EOF