Merge branch 'release/debian/4.10-1'debian/4.10-1

13 files changed, 57 insertions, 17 deletions

diff --git a/debian/changelog b/debian/changelog
index 619b056..16df304 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+libhx (4.10-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Declare compliance with Debian Policy 4.6.2.0 (No changes needed).
+  * Fix lintian overrides.
+  * debian/watch:
+    - Bump standard version to 4.
+    - Switch to new download URL.
+  * debian/copyright:
+    - Refresh years.
+    - Add year 2023 to myself.
+  * Refresh symbols files.
+  * debian/libhx-dev.lintian-overrides:
+    - Add override for no-code-sections.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Thu, 09 Feb 2023 14:03:13 +0100
+
 libhx (3.25-2) unstable; urgency=medium
 
   * debian/control:
diff --git a/debian/control b/debian/control
index f0c65a7..98ef1be 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Build-Depends:
  debhelper-compat (= 13)
-Standards-Version: 4.5.0
+Standards-Version: 4.6.2.0
 Section: libs
 Rules-Requires-Root: no
 Homepage: https://inai.de/projects/libhx/
diff --git a/debian/copyright b/debian/copyright
index 817eb20..b879cf7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,7 +9,7 @@ License: LGPL-2.1+
 
 Files: debian/*
 Copyright: 2007-2014 Bastian Kleineidam <calvin@debian.org>
-           2015-2020 Jörg Frings-Fürst <debian@jff.email>
+           2015-2023 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-3+
 
 Files: debian/patches/*
@@ -19,7 +19,7 @@ License: LGPL-2.1+
 
 Files: build-aux/*
        m4/*
-Copyright: 1992-2017 Free Software Foundation, Inc.
+Copyright: 1992-2022 Free Software Foundation, Inc.
 License: GPL-2+
 
 Files: src/tc-*.c
diff --git a/debian/libhx-dev.lintian-overrides b/debian/libhx-dev.lintian-overrides
index 15979c8..586a22d 100644
--- a/debian/libhx-dev.lintian-overrides
+++ b/debian/libhx-dev.lintian-overrides
@@ -1,4 +1,5 @@
 # libHX_rtcheck is used to enable more internal checks dynamically
 libhx-dev: package-name-doesnt-match-sonames libHX-rtcheck
 libhx-dev: shared-library-lacks-version usr/lib/x86_64-linux-gnu/libHX_rtcheck.so libHX_rtcheck.so
-libhx-dev: shared-library-lacks-prerequisites usr/lib/x86_64-linux-gnu/libHX_rtcheck.so
+libhx-dev: shared-library-lacks-prerequisites [usr/lib/x86_64-linux-gnu/libHX_rtcheck.so]
+libhx-dev: no-code-sections
diff --git a/debian/libhx-dev.symbols b/debian/libhx-dev.symbols
index abfb1ac..82ae111 100644
--- a/debian/libhx-dev.symbols
+++ b/debian/libhx-dev.symbols
@@ -1,3 +1,7 @@
 libHX_rtcheck.so libhx-dev #MINVER#
 * Build-Depends-Package: libhx-dev
  LIBHX_3.25@LIBHX_3.25 3.25
+ LIBHX_3.27@LIBHX_3.27 4.7
+ LIBHX_4.2@LIBHX_4.2 4.7
+ LIBHX_4.3@LIBHX_4.3 4.7
+ LIBHX_4.9@LIBHX_4.9 4.10
diff --git a/debian/libhx-doc.doc-base b/debian/libhx-doc.doc-base
index cb00bc2..88de3f3 100644
--- a/debian/libhx-doc.doc-base
+++ b/debian/libhx-doc.doc-base
@@ -6,4 +6,4 @@ Abstract: API documentation and tutorial for the libhx
 Section: Programming/C
 
 Format: PDF
-Files: /usr/share/doc/libhx-doc/libHX_Documentation.pdf.gz
+Files: /usr/share/doc/libhx-doc/libHX_Documentation.rst
diff --git a/debian/libhx-doc.docs b/debian/libhx-doc.docs
index 2389dc7..66eb2fe 100644
--- a/debian/libhx-doc.docs
+++ b/debian/libhx-doc.docs
@@ -1,6 +1,2 @@
+doc/*.rst
 doc/assorted.txt
-doc/libHX_Documentation.pdf
-doc/dirstamp.txt
-doc/ux-file.txt
-doc/ux-mmap.txt
-doc/api.txt
diff --git a/debian/libhx-doc.lintian-overrides b/debian/libhx-doc.lintian-overrides
new file mode 100644
index 0000000..b5f698a
--- /dev/null
+++ b/debian/libhx-doc.lintian-overrides
@@ -0,0 +1 @@
+libhx-doc: duplicate-changelog-files
diff --git a/debian/libhx32.symbols b/debian/libhx32.symbols
index 4e58b1d..4921f2a 100644
--- a/debian/libhx32.symbols
+++ b/debian/libhx32.symbols
@@ -22,6 +22,7 @@ libHX.so.32 libhx32 #MINVER#
  HX_getopt_usage_cb@LIBHX_3.25 3.25
  HX_hexdump@LIBHX_3.25 3.25
  HX_init@LIBHX_3.25 3.25
+ HX_ipaddr_is_local@LIBHX_4.9 4.10
  HX_irand@LIBHX_3.25 3.25
  HX_memmem@LIBHX_3.25 3.25
  HX_mkdir@LIBHX_3.25 3.25
@@ -29,10 +30,15 @@ libHX.so.32 libhx32 #MINVER#
  HX_readlink@LIBHX_3.25 3.25
  HX_realpath@LIBHX_3.25 3.25
  HX_rrmdir@LIBHX_3.25 3.25
+ HX_sendfile@LIBHX_4.3 4.7
  HX_shconfig@LIBHX_3.25 3.25
  HX_shconfig_free@LIBHX_3.25 3.25
  HX_shconfig_map@LIBHX_3.25 3.25
  HX_shconfig_pv@LIBHX_3.25 3.25
+ HX_slurp_fd@LIBHX_3.27 4.7
+ HX_slurp_file@LIBHX_3.27 4.7
+ HX_sockaddr_is_local@LIBHX_4.9 4.10
+ HX_socket_from_env@LIBHX_3.27 4.7
  HX_split@LIBHX_3.25 3.25
  HX_split_fixed@LIBHX_3.25 3.25
  HX_split_inplace@LIBHX_3.25 3.25
@@ -55,6 +61,9 @@ libHX.so.32 libhx32 #MINVER#
  HX_strrtrim@LIBHX_3.25 3.25
  HX_strsep2@LIBHX_3.25 3.25
  HX_strsep@LIBHX_3.25 3.25
+ HX_strtod_unit@LIBHX_4.2 4.7
+ HX_strtoull_sec@LIBHX_4.3 4.7
+ HX_strtoull_unit@LIBHX_4.2 4.7
  HX_strupper@LIBHX_3.25 3.25
  HX_time_compare@LIBHX_3.25 3.25
  HX_timespec_add@LIBHX_3.25 3.25
@@ -64,6 +73,9 @@ libHX.so.32 libhx32 #MINVER#
  HX_timespec_neg@LIBHX_3.25 3.25
  HX_timespec_sub@LIBHX_3.25 3.25
  HX_timeval_sub@LIBHX_3.25 3.25
+ HX_unit_seconds@LIBHX_4.3 4.7
+ HX_unit_size@LIBHX_4.2 4.7
+ HX_unit_size_cu@LIBHX_4.2 4.7
  HX_zvecfree@LIBHX_3.25 3.25
  HXdeque_del@LIBHX_3.25 3.25
  HXdeque_find@LIBHX_3.25 3.25
@@ -80,6 +92,9 @@ libHX.so.32 libhx32 #MINVER#
  HXdir_close@LIBHX_3.25 3.25
  HXdir_open@LIBHX_3.25 3.25
  HXdir_read@LIBHX_3.25 3.25
+ HXformat3_aprintf@LIBHX_4.9 4.10
+ HXformat3_fprintf@LIBHX_4.9 4.10
+ HXformat3_sprintf@LIBHX_4.9 4.10
  HXformat_add@LIBHX_3.25 3.25
  HXformat_aprintf@LIBHX_3.25 3.25
  HXformat_fprintf@LIBHX_3.25 3.25
@@ -122,5 +137,11 @@ libHX.so.32 libhx32 #MINVER#
  HXmc_zvecfree@LIBHX_3.25 3.25
  HXproc_run_async@LIBHX_3.25 3.25
  HXproc_run_sync@LIBHX_3.25 3.25
+ HXproc_switch_user@LIBHX_3.27 4.7
+ HXproc_top_fd@LIBHX_3.27 4.7
  HXproc_wait@LIBHX_3.25 3.25
  LIBHX_3.25@LIBHX_3.25 3.25
+ LIBHX_3.27@LIBHX_3.27 4.7
+ LIBHX_4.2@LIBHX_4.2 4.7
+ LIBHX_4.3@LIBHX_4.3 4.7
+ LIBHX_4.9@LIBHX_4.9 4.10
diff --git a/debian/not-installed b/debian/not-installed
index 68cbb21..831a487 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,2 +1,2 @@
 usr/lib/*/*.la
-usr/share/doc/libhx/libHX_Documentation.pdf
+#usr/share/doc/libhx/libHX_Documentation.pdf
diff --git a/debian/patches/hurd-path-max-define b/debian/patches/hurd-path-max-define
index da80024..d6b0cdb 100644
--- a/debian/patches/hurd-path-max-define
+++ b/debian/patches/hurd-path-max-define
@@ -7,9 +7,9 @@ Index: trunk/src/io.c
 ===================================================================
 --- trunk.orig/src/io.c
 +++ trunk/src/io.c
-@@ -31,6 +31,11 @@
- #include <libHX/string.h>
- #include "internal.h"
+@@ -39,6 +39,11 @@
+ #	define O_CLOEXEC 0
+ #endif
  
 +#ifndef PATH_MAX
 +#define PATH_MAX 4096 /* Hurd does not define PATH_MAX in limits.h */
diff --git a/debian/rules b/debian/rules
index 4101bc0..ad51b7c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ override_dh_auto_configure:
 
 override_dh_installchangelogs:
 # install custom changelog
-	dh_installchangelogs doc/changelog.txt
+	dh_installchangelogs doc/changelog.rst
 
 override_dh_makeshlibs:
 	dh_makeshlibs
diff --git a/debian/watch b/debian/watch
index 1343f88..b16de01 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 # watch control file for uscan
-version=3
-http://sf.net/libhx/libHX-(.*)\.tar\.xz
+version=4
+https://inai.de/files/libhx/libHX-(.*).tar.xz