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

11 files changed, 38 insertions, 24 deletions

diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 0000000..53b9a7f
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1,2 @@
+# debian
+files
diff --git a/debian/changelog b/debian/changelog
index fe8f574..5471467 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,25 @@
-libhx (4.17-1) unstable; urgency=medium
+libhx (4.23-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #1064734).
+  * Add debian/.gitignore
+  * Remove not longer needed debian/libhx-dev.lintian-overrides.
+  * Fix debian/libhx32t64.lintian-overrides.
+  * debian/copyright:
+    - Add 2024 to myself.
+  * debian/control:
+    - Readd BD dpkg-dev (>= 1.22.5).
+      Thanks to Tobias Frost <tobi@debian.org>
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sun, 17 Mar 2024 15:23:31 +0100
+
+libhx (4.19-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062369
+
+ -- Benjamin Drung <bdrung@debian.org>  Wed, 28 Feb 2024 12:48:09 +0000
+
+libhx (4.19-1) unstable; urgency=medium
 
   * New upstream release.
     - Refresh symbols files.
diff --git a/debian/control b/debian/control
index 470c2bb..af2d9a2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: libhx
 Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Build-Depends:
- debhelper-compat (= 13)
+ debhelper-compat (= 13),
+ dpkg-dev (>= 1.22.5)
 Standards-Version: 4.6.2.0
 Section: libs
 Rules-Requires-Root: no
@@ -10,7 +11,10 @@ Homepage: https://inai.de/projects/libhx/
 Vcs-Git: git://git.jff.email/libhx.git
 Vcs-Browser: https://git.jff.email/cgit/libhx.git
 
-Package: libhx32
+Package: libhx32t64
+Provides: ${t64:Provides}
+Replaces: libhx32
+Breaks: libhx32 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -30,7 +34,7 @@ Section: libdevel
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends:
- libhx32 (= ${binary:Version}),
+ libhx32t64 (= ${binary:Version}),
  ${shlibs:Depends},
  ${misc:Depends}
 Description: Development files for libhx
diff --git a/debian/copyright b/debian/copyright
index b879cf7..5e10518 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-2023 Jörg Frings-Fürst <debian@jff.email>
+           2015-2024 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-3+
 
 Files: debian/patches/*
diff --git a/debian/libhx-dev.lintian-overrides b/debian/libhx-dev.lintian-overrides
deleted file mode 100644
index 586a22d..0000000
--- a/debian/libhx-dev.lintian-overrides
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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: no-code-sections
diff --git a/debian/libhx-dev.symbols b/debian/libhx-dev.symbols
deleted file mode 100644
index 6469e5c..0000000
--- a/debian/libhx-dev.symbols
+++ /dev/null
@@ -1,10 +0,0 @@
-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.11@LIBHX_4.11 4.12
- LIBHX_4.15@LIBHX_4.15 4.17
- LIBHX_4.16@LIBHX_4.16 4.17
- 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/libhx32.dirs b/debian/libhx32t64.dirs
index 6845771..6845771 100644
--- a/debian/libhx32.dirs
+++ b/debian/libhx32t64.dirs
diff --git a/debian/libhx32.install b/debian/libhx32t64.install
index 3ddde58..3ddde58 100644
--- a/debian/libhx32.install
+++ b/debian/libhx32t64.install
diff --git a/debian/libhx32t64.lintian-overrides b/debian/libhx32t64.lintian-overrides
new file mode 100644
index 0000000..e93c817
--- /dev/null
+++ b/debian/libhx32t64.lintian-overrides
@@ -0,0 +1 @@
+libhx32t64: package-name-doesnt-match-sonames libHX32
diff --git a/debian/libhx32.symbols b/debian/libhx32t64.symbols
index f2abcd6..e66a253 100644
--- a/debian/libhx32.symbols
+++ b/debian/libhx32t64.symbols
@@ -1,4 +1,4 @@
-libHX.so.32 libhx32 #MINVER#
+libHX.so.32 libhx32t64 #MINVER#
 * Build-Depends-Package: libhx-dev
  HX_addrport_split@LIBHX_4.11 4.12
  HX_basename@LIBHX_3.25 3.25
@@ -18,6 +18,7 @@ libHX.so.32 libhx32 #MINVER#
  HX_flprf@LIBHX_4.15 4.17
  HX_fls@LIBHX_3.25 3.25
  HX_getl@LIBHX_3.25 3.25
+ HX_getopt5@LIBHX_4.18 4.19
  HX_getopt@LIBHX_3.25 3.25
  HX_getopt_help@LIBHX_3.25 3.25
  HX_getopt_help_cb@LIBHX_3.25 3.25
@@ -152,6 +153,7 @@ libHX.so.32 libhx32 #MINVER#
  LIBHX_4.11@LIBHX_4.11 4.12
  LIBHX_4.15@LIBHX_4.15 4.17
  LIBHX_4.16@LIBHX_4.16 4.17
+ LIBHX_4.18@LIBHX_4.18 4.19
  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/rules b/debian/rules
index ad51b7c..97c42d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,10 +17,9 @@ override_dh_installchangelogs:
 
 override_dh_makeshlibs:
 	dh_makeshlibs
-	dpkg-gensymbols -v$(VERSION) -Pdebian/libhx32 -plibhx32
-	dpkg-gensymbols -v$(VERSION) -Pdebian/libhx-dev -plibhx-dev
+	dpkg-gensymbols -v$(VERSION) -Pdebian/libhx32t64 -plibhx32t64
 
 override_dh_installdocs:
 	dh_installdocs -i -plibhx-doc --doc-main-package=libhx-doc
 	dh_installdocs -a -plibhx-dev
-	dh_installdocs -a -plibhx32
+	dh_installdocs -a -plibhx32t64