From 82b8541881984c34721c46237e7ac65d036f8eed Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 7 May 2024 06:48:36 +0200 Subject: Merging debian version 0.12.2-1~exp1. Signed-off-by: Daniel Baumann --- debian/changelog | 20 ++++++++++++++++++++ debian/control | 6 +++--- debian/copyright | 4 ++-- debian/lnav.lintian-overrides | 2 ++ debian/patches/disable-broken-test_listview.patch | 6 +++--- debian/patches/disable-test_cli.patch | 23 +++++++++++++++++++++++ debian/patches/disable-test_config.patch | 23 +++++++++++++++++++++++ debian/patches/disable-test_mvwattrline.patch | 8 ++++---- debian/patches/disable-test_sql_json_func.patch | 23 +++++++++++++++++++++++ debian/patches/disable-test_sql_str_func.patch | 23 +++++++++++++++++++++++ debian/patches/disable-test_text_file.patch | 23 +++++++++++++++++++++++ debian/patches/disable-test_vt52_curses.patch | 8 ++++---- debian/patches/series | 5 +++++ 13 files changed, 158 insertions(+), 16 deletions(-) create mode 100644 debian/lnav.lintian-overrides create mode 100644 debian/patches/disable-test_cli.patch create mode 100644 debian/patches/disable-test_config.patch create mode 100644 debian/patches/disable-test_sql_json_func.patch create mode 100644 debian/patches/disable-test_sql_str_func.patch create mode 100644 debian/patches/disable-test_text_file.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 64223d5..a91bcd3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +lnav (0.12.2-1~exp1) experimental; urgency=medium + + * New upstream version 0.12.2 + * Refresh "Disable test_mvwattrline test" + * Refresh "Disable failing test_vt52_curses test" + * Refresh "Disable broken test_listview.sh test" + * Add Build-Depends on libgpm-dev + * Replace Build-Depends on libncurses{,w}5-dev with libncurses-dev + * Disable test_config.sh test + * Disable test_sql_json_func.sh test + * Disable test_cli.sh test + * Disable test_sql_str_func.sh test + * Disable test_text_file.sh test + * Update copyright years for upstream files + * Declare compliance with Debian policy 4.7.0 + * Update copyright years for debian/* packaging files + * debian/source: Add linian override for embedded-library check + + -- Salvatore Bonaccorso Mon, 06 May 2024 06:23:49 +0200 + lnav (0.11.2-1~progress7.99u1) graograman-backports; urgency=medium * Initial reupload to graograman-backports. diff --git a/debian/control b/debian/control index 39c8309..57a95bd 100644 --- a/debian/control +++ b/debian/control @@ -10,8 +10,8 @@ Build-Depends: libarchive-dev, libbz2-dev, libcurl4-gnutls-dev, - libncurses5-dev, - libncursesw5-dev, + libgpm-dev, + libncurses-dev, libpcre2-dev, libreadline-dev, libsqlite3-dev, @@ -20,7 +20,7 @@ Build-Depends: tzdata, zlib1g-dev, xz-utils -Standards-Version: 4.6.2 +Standards-Version: 4.7.0 Homepage: https://lnav.org Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/lnav Vcs-Git: https://git.progress-linux.org/packages/graograman-backports/lnav diff --git a/debian/copyright b/debian/copyright index 97c54eb..3732f4d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,7 +4,7 @@ Upstream-Contact: Timothy Stack Source: http://lnav.org/ Files: * -Copyright: 2007-2022, Timothy Stack +Copyright: 2007-2024, Timothy Stack License: BSD-3-clause Files: release/lnav.spec.in @@ -151,7 +151,7 @@ License: curl in this Software without prior written authorization of the copyright holder. Files: debian/* -Copyright: 2013-2023, Salvatore Bonaccorso +Copyright: 2013-2024, Salvatore Bonaccorso License: BSD-3-clause License: Apache-2.0 diff --git a/debian/lnav.lintian-overrides b/debian/lnav.lintian-overrides new file mode 100644 index 0000000..6457f50 --- /dev/null +++ b/debian/lnav.lintian-overrides @@ -0,0 +1,2 @@ +# lnav embeddeded copy for yaijl is reported in #724693 +lnav: embedded-library yajl * diff --git a/debian/patches/disable-broken-test_listview.patch b/debian/patches/disable-broken-test_listview.patch index cf8e0fe..6e6e3d0 100644 --- a/debian/patches/disable-broken-test_listview.patch +++ b/debian/patches/disable-broken-test_listview.patch @@ -8,15 +8,15 @@ Applied-Upstream: no --- a/test/Makefile.am +++ b/test/Makefile.am -@@ -391,7 +391,6 @@ TESTS = \ +@@ -480,7 +480,6 @@ TESTS = \ test_cmds.sh \ test_config.sh \ test_events.sh \ - test_listview.sh \ test_meta.sh \ + test_gantt.sh \ test_grep_proc.sh \ - test_grep_proc2 \ -@@ -425,6 +424,7 @@ DISABLED_TESTS = \ +@@ -520,6 +519,7 @@ DISABLED_TESTS = \ test_remote.sh \ test_top_status \ test_line_buffer2 \ diff --git a/debian/patches/disable-test_cli.patch b/debian/patches/disable-test_cli.patch new file mode 100644 index 0000000..a60cb87 --- /dev/null +++ b/debian/patches/disable-test_cli.patch @@ -0,0 +1,23 @@ +Description: Disable test_cli.sh test +Origin: vendor +Author: Salvatore Bonaccorso +Last-Update: 2024-05-05 + +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -475,7 +475,6 @@ TESTS = \ + test_date_time_scanner \ + test_format_installer.sh \ + test_format_loader.sh \ +- test_cli.sh \ + test_cmds.sh \ + test_events.sh \ + test_meta.sh \ +@@ -513,6 +512,7 @@ endif + + DISABLED_TESTS = \ + test_config.sh \ ++ test_cli.sh \ + test_mvwattrline \ + test_regex101.sh \ + test_remote.sh \ diff --git a/debian/patches/disable-test_config.patch b/debian/patches/disable-test_config.patch new file mode 100644 index 0000000..33ef29a --- /dev/null +++ b/debian/patches/disable-test_config.patch @@ -0,0 +1,23 @@ +Description: Disable test_config.sh test +Origin: vendor +Author: Salvatore Bonaccorso +Last-Update: 2024-05-05 + +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -478,7 +478,6 @@ TESTS = \ + test_format_loader.sh \ + test_cli.sh \ + test_cmds.sh \ +- test_config.sh \ + test_events.sh \ + test_meta.sh \ + test_gantt.sh \ +@@ -514,6 +513,7 @@ TESTS += test_prql.sh + endif + + DISABLED_TESTS = \ ++ test_config.sh \ + test_mvwattrline \ + test_regex101.sh \ + test_remote.sh \ diff --git a/debian/patches/disable-test_mvwattrline.patch b/debian/patches/disable-test_mvwattrline.patch index 1f1dbd1..e63cc01 100644 --- a/debian/patches/disable-test_mvwattrline.patch +++ b/debian/patches/disable-test_mvwattrline.patch @@ -5,16 +5,16 @@ Author: Salvatore Bonaccorso --- a/test/Makefile.am +++ b/test/Makefile.am -@@ -393,7 +393,6 @@ TESTS = \ +@@ -482,7 +482,6 @@ TESTS = \ test_events.sh \ test_listview.sh \ test_meta.sh \ - test_mvwattrline.sh \ + test_gantt.sh \ test_grep_proc.sh \ test_grep_proc2 \ - test_json_format.sh \ -@@ -424,6 +423,7 @@ TESTS = \ - test_vt52_curses.sh +@@ -519,6 +518,7 @@ TESTS += test_prql.sh + endif DISABLED_TESTS = \ + test_mvwattrline \ diff --git a/debian/patches/disable-test_sql_json_func.patch b/debian/patches/disable-test_sql_json_func.patch new file mode 100644 index 0000000..eda4e6f --- /dev/null +++ b/debian/patches/disable-test_sql_json_func.patch @@ -0,0 +1,23 @@ +Description: Disable test_sql_json_func.sh test +Origin: vendor +Author: Salvatore Bonaccorso +Last-Update: 2024-05-05 + +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -493,7 +493,6 @@ TESTS = \ + test_sql_coll_func.sh \ + test_sql_fs_func.sh \ + test_sql_indexes.sh \ +- test_sql_json_func.sh \ + test_sql_regexp.sh \ + test_sql_search_table.sh \ + test_sql_str_func.sh \ +@@ -523,6 +522,7 @@ DISABLED_TESTS = \ + test_logfile.sh \ + test_line_buffer.sh \ + test_sql.sh \ ++ test_sql_json_func.sh \ + test_vt52_curses.sh + + if HAVE_LIBCURL diff --git a/debian/patches/disable-test_sql_str_func.patch b/debian/patches/disable-test_sql_str_func.patch new file mode 100644 index 0000000..3337fee --- /dev/null +++ b/debian/patches/disable-test_sql_str_func.patch @@ -0,0 +1,23 @@ +Description: Disable test_sql_str_func.sh test +Origin: vendor +Author: Salvatore Bonaccorso +Last-Update: 2024-05-05 + +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -494,7 +494,6 @@ TESTS = \ + test_sql_indexes.sh \ + test_sql_regexp.sh \ + test_sql_search_table.sh \ +- test_sql_str_func.sh \ + test_sql_time_func.sh \ + test_sql_views_vtab.sh \ + test_sql_xml_func.sh \ +@@ -523,6 +522,7 @@ DISABLED_TESTS = \ + test_line_buffer.sh \ + test_sql.sh \ + test_sql_json_func.sh \ ++ test_sql_str_func.sh \ + test_vt52_curses.sh + + if HAVE_LIBCURL diff --git a/debian/patches/disable-test_text_file.patch b/debian/patches/disable-test_text_file.patch new file mode 100644 index 0000000..5cb1c60 --- /dev/null +++ b/debian/patches/disable-test_text_file.patch @@ -0,0 +1,23 @@ +Description: Disable test_text_file.sh test +Origin: vendor +Author: Salvatore Bonaccorso +Last-Update: 2024-05-05 + +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -499,7 +499,6 @@ TESTS = \ + test_sql_xml_func.sh \ + test_sql_yaml_func.sh \ + test_text_anonymizer \ +- test_text_file.sh \ + test_tui.sh \ + test_data_parser.sh \ + test_pretty_print.sh \ +@@ -523,6 +522,7 @@ DISABLED_TESTS = \ + test_sql.sh \ + test_sql_json_func.sh \ + test_sql_str_func.sh \ ++ test_text_file.sh \ + test_vt52_curses.sh + + if HAVE_LIBCURL diff --git a/debian/patches/disable-test_vt52_curses.patch b/debian/patches/disable-test_vt52_curses.patch index dc2c9ca..bb2f026 100644 --- a/debian/patches/disable-test_vt52_curses.patch +++ b/debian/patches/disable-test_vt52_curses.patch @@ -5,7 +5,7 @@ Author: Salvatore Bonaccorso --- a/test/Makefile.am +++ b/test/Makefile.am -@@ -419,8 +419,7 @@ TESTS = \ +@@ -510,8 +510,7 @@ TESTS = \ test_tui.sh \ test_data_parser.sh \ test_pretty_print.sh \ @@ -13,9 +13,9 @@ Author: Salvatore Bonaccorso - test_vt52_curses.sh + test_view_colors.sh - DISABLED_TESTS = \ - test_mvwattrline \ -@@ -428,7 +427,8 @@ DISABLED_TESTS = \ + if HAVE_CARGO + TESTS += test_prql.sh +@@ -523,7 +522,8 @@ DISABLED_TESTS = \ test_remote.sh \ test_top_status \ test_line_buffer2 \ diff --git a/debian/patches/series b/debian/patches/series index 1376de8..649c727 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,8 @@ disable-test_vt52_curses.patch disable-broken-test_logfile-test.patch disable-test_sql.patch disable-broken-test_listview.patch +disable-test_config.patch +disable-test_sql_json_func.patch +disable-test_cli.patch +disable-test_sql_str_func.patch +disable-test_text_file.patch -- cgit v1.2.3