From 398802a1f04f8f5697e64393dcdee8c70c7ccc6b Mon Sep 17 00:00:00 2001 From: Christoph Berg Date: Mon, 21 Jan 2019 22:03:35 +0100 Subject: [PATCH 01/13] debian/tests/ssl: Add --debug to get backtraces. Cf. #893. --- debian/changelog | 6 ++++++ debian/tests/ssl | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 27db800..bd02614 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pgloader (3.6.1-2) UNRELEASED; urgency=medium + + * debian/tests/ssl: Add --debug to get backtraces. + + -- Christoph Berg Mon, 21 Jan 2019 22:02:50 +0100 + pgloader (3.6.1-1) unstable; urgency=medium * New upstream version. diff --git a/debian/tests/ssl b/debian/tests/ssl index 66f1f41..cf5daa4 100755 --- a/debian/tests/ssl +++ b/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 From a6df4e98071792f06229aa6018326e000e6ec756 Mon Sep 17 00:00:00 2001 From: Christoph Berg Date: Tue, 22 Jan 2019 10:42:56 +0100 Subject: [PATCH 02/13] debian/rules: Sync loaded systems with Makefile. Cf. 25c937879a --- debian/changelog | 1 + debian/rules | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index bd02614..6601810 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ pgloader (3.6.1-2) UNRELEASED; urgency=medium * debian/tests/ssl: Add --debug to get backtraces. + * debian/rules: Sync loaded systems with Makefile. -- Christoph Berg Mon, 21 Jan 2019 22:02:50 +0100 diff --git a/debian/rules b/debian/rules index 05f78fc..5bb77bc 100755 --- a/debian/rules +++ b/debian/rules @@ -33,8 +33,11 @@ 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 \ From a06900e898eb56e779910be021a9613411085e3f Mon Sep 17 00:00:00 2001 From: Christoph Berg Date: Wed, 10 Jun 2020 14:32:40 +0200 Subject: [PATCH 03/13] New upstream version. --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6601810..707fce3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -pgloader (3.6.1-2) UNRELEASED; urgency=medium +pgloader (3.6.2-1) UNRELEASED; urgency=medium + * New upstream version. * debian/tests/ssl: Add --debug to get backtraces. * debian/rules: Sync loaded systems with Makefile. From d024552f564762131b2ff9c3d3edda255b60ecbe Mon Sep 17 00:00:00 2001 From: Christoph Berg Date: Wed, 10 Jun 2020 15:27:50 +0200 Subject: [PATCH 04/13] Bump required cl-db3 version to 20200212. --- debian/changelog | 1 + debian/control | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 707fce3..11e2336 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ pgloader (3.6.2-1) UNRELEASED; urgency=medium * New upstream version. * debian/tests/ssl: Add --debug to get backtraces. * debian/rules: Sync loaded systems with Makefile. + * Bump required cl-db3 version to 20200212. -- Christoph Berg Mon, 21 Jan 2019 22:02:50 +0100 diff --git a/debian/control b/debian/control index 24a8344..c73876c 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: cl-cffi (>= 1:0.12.0), cl-command-line-arguments, cl-csv, - cl-db3, + cl-db3 (>= 20200212), cl-drakma, cl-esrap, cl-fad, @@ -87,7 +87,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, From 164726eab9966327468fddccfe73d53675409f17 Mon Sep 17 00:00:00 2001 From: Christoph Berg Date: Wed, 10 Jun 2020 15:28:27 +0200 Subject: [PATCH 05/13] DH 13. --- debian/changelog | 1 + debian/compat | 1 - debian/control | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 debian/compat diff --git a/debian/changelog b/debian/changelog index 11e2336..fa87637 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ pgloader (3.6.2-1) UNRELEASED; urgency=medium * debian/tests/ssl: Add --debug to get backtraces. * debian/rules: Sync loaded systems with Makefile. * Bump required cl-db3 version to 20200212. + * DH 13. -- Christoph Berg Mon, 21 Jan 2019 22:02:50 +0100 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index ec63514..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/debian/control b/debian/control index c73876c..63b43b3 100644 --- a/debian/control +++ b/debian/control @@ -45,14 +45,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 From 5bfa5430cfac5d3b3c374f56c9046cd0220cd748 Mon Sep 17 00:00:00 2001 From: Christoph Berg Date: Mon, 13 Jul 2020 16:30:12 +0200 Subject: [PATCH 06/13] debian/rules: Print actual compiler log. --- debian/changelog | 1 + debian/rules | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index fa87637..97e8a51 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ pgloader (3.6.2-1) UNRELEASED; 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. * Bump required cl-db3 version to 20200212. * DH 13. diff --git a/debian/rules b/debian/rules index 5bb77bc..8c63364 100755 --- a/debian/rules +++ b/debian/rules @@ -41,7 +41,11 @@ override_dh_auto_build-arch: --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: From 2100690402508c8347d30321b914c39c02a17fb5 Mon Sep 17 00:00:00 2001 From: Christoph Berg Date: Mon, 13 Jul 2020 16:48:05 +0200 Subject: [PATCH 07/13] debian: Clean buildapp log --- debian/clean | 1 + 1 file changed, 1 insertion(+) create mode 100644 debian/clean diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..c47c407 --- /dev/null +++ b/debian/clean @@ -0,0 +1 @@ +buildapp.* From c8ceb1cf8f14e5f6ad0a8e94d4a9799fbd7f37c6 Mon Sep 17 00:00:00 2001 From: Christoph Berg Date: Mon, 13 Jul 2020 17:16:34 +0200 Subject: [PATCH 08/13] debian: Add patch to remove sphinx theme options on bionic --- debian/patches/bionic-theme-options | 14 ++++++++++++++ debian/patches/series | 1 + 2 files changed, 15 insertions(+) create mode 100644 debian/patches/bionic-theme-options create mode 100644 debian/patches/series diff --git a/debian/patches/bionic-theme-options b/debian/patches/bionic-theme-options new file mode 100644 index 0000000..7ffbf07 --- /dev/null +++ b/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, + } + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..79dacff --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +#bionic-theme-options From 63274dbec4e37ce133ca7c8796739d86b6227d2d Mon Sep 17 00:00:00 2001 From: Christoph Berg Date: Tue, 14 Jul 2020 15:08:41 +0200 Subject: [PATCH 09/13] debian/rules: Skip dh_dwz like dh_strip as it fails on buster. --- debian/changelog | 1 + debian/rules | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 97e8a51..bd24ef2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ pgloader (3.6.2-1) UNRELEASED; urgency=medium * 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. * DH 13. diff --git a/debian/rules b/debian/rules index 8c63364..5e65b26 100755 --- a/debian/rules +++ b/debian/rules @@ -51,8 +51,8 @@ override_dh_auto_build-arch: 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/ From 9c2d8d2baa9c065e64443e193f6431cb31c028dd Mon Sep 17 00:00:00 2001 From: Christoph Berg Date: Tue, 14 Jul 2020 15:33:31 +0200 Subject: [PATCH 10/13] debian: Note that we need cl-plus-ssl 20180328 or later. --- debian/changelog | 1 + debian/control | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index bd24ef2..d391099 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ pgloader (3.6.2-1) UNRELEASED; urgency=medium * 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 20180328 or later. * DH 13. -- Christoph Berg Mon, 21 Jan 2019 22:02:50 +0100 diff --git a/debian/control b/debian/control index 63b43b3..adb13d2 100644 --- a/debian/control +++ b/debian/control @@ -29,6 +29,7 @@ Build-Depends: cl-metabang-bind, cl-mssql, cl-mustache, + cl-plus-ssl (>= 20180328), cl-postmodern, cl-ppcre, cl-py-configparser, From c1d58b6dd996025cbe1d2ce4a4d5693951a3fbc0 Mon Sep 17 00:00:00 2001 From: Christoph Berg Date: Tue, 14 Jul 2020 16:15:45 +0200 Subject: [PATCH 11/13] debian: Note that we need cl-csv 20180712 or later. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d391099..8a8cf2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ pgloader (3.6.2-1) UNRELEASED; urgency=medium * 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 20180328 or later. + * Note that we need cl-csv 20180712 or later. * DH 13. -- Christoph Berg Mon, 21 Jan 2019 22:02:50 +0100 diff --git a/debian/control b/debian/control index adb13d2..755dda9 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: cl-bordeaux-threads (>= 0.8.3), cl-cffi (>= 1:0.12.0), cl-command-line-arguments, - cl-csv, + cl-csv (>= 20180712), cl-db3 (>= 20200212), cl-drakma, cl-esrap, From 455800139fe5372348aa5763fbf3e28db1f725ab Mon Sep 17 00:00:00 2001 From: Christoph Berg Date: Tue, 14 Jul 2020 16:52:17 +0200 Subject: [PATCH 12/13] debian: Note that we need cl-plus-ssl 20190204 or later. --- debian/changelog | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8a8cf2e..c99ea41 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,7 @@ pgloader (3.6.2-1) UNRELEASED; urgency=medium * 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 20180328 or later. + * Note that we need cl-plus-ssl 20190204 or later. * Note that we need cl-csv 20180712 or later. * DH 13. diff --git a/debian/control b/debian/control index 755dda9..b87d188 100644 --- a/debian/control +++ b/debian/control @@ -29,7 +29,7 @@ Build-Depends: cl-metabang-bind, cl-mssql, cl-mustache, - cl-plus-ssl (>= 20180328), + cl-plus-ssl (>= 20190204), cl-postmodern, cl-ppcre, cl-py-configparser, From 11e6627ea8403acc41d2dd6ef69e7bd89ba538ee Mon Sep 17 00:00:00 2001 From: Christoph Berg Date: Tue, 14 Jul 2020 17:02:51 +0200 Subject: [PATCH 13/13] releasing package pgloader version 3.6.2-1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c99ea41..8f0b5d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pgloader (3.6.2-1) UNRELEASED; urgency=medium +pgloader (3.6.2-1) unstable; urgency=medium * New upstream version. * debian/tests/ssl: Add --debug to get backtraces. @@ -10,7 +10,7 @@ pgloader (3.6.2-1) UNRELEASED; urgency=medium * Note that we need cl-csv 20180712 or later. * DH 13. - -- Christoph Berg Mon, 21 Jan 2019 22:02:50 +0100 + -- Christoph Berg Tue, 14 Jul 2020 17:02:30 +0200 pgloader (3.6.1-1) unstable; urgency=medium