Merge tag 'experimental/3.25-1_exp1' into develop

new upstream release

7 files changed, 24 insertions, 10 deletions

diff --git a/debian/changelog b/debian/changelog
index 11467e0..eaf471c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libhx (3.25-1) UNRELEASED; urgency=medium
+libhx (3.25-1~exp1) experimental; urgency=medium
 
   * New upstream release.
   * Migrate to debhelper 13:
@@ -7,8 +7,18 @@ libhx (3.25-1) UNRELEASED; urgency=medium
   * Bump package name depending on the SONAME to libhx32.
   * debian/copyright:
     - Refresh years.
-
- -- Jörg Frings-Fürst <debian@jff.email>  Sat, 16 May 2020 16:34:44 +0200
+    - Add Upstream-Contact.
+    - Replace Homepage.
+    - Fix lintian *-globbing-patterns errors.
+  * debian/control:
+    - Change homepage.
+    - Add Replaces / Breaks.
+    - Add Rules-Requires-Root: no.
+  * Refresh patch.
+  * debian/libhx-dev.lintian-overrides:
+    - Rename tags.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sun, 30 Aug 2020 21:56:37 +0200
 
 libhx (3.24-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 9e84c0c..bd61fb0 100644
--- a/debian/control
+++ b/debian/control
@@ -5,13 +5,16 @@ Build-Depends:
  debhelper-compat (= 13)
 Standards-Version: 4.5.0
 Section: libs
-Homepage: http://libhx.sourceforge.net/
+Rules-Requires-Root: no
+Homepage: https://inai.de/projects/libhx/
 Vcs-Git: git://jff.email/opt/git/libhx.git
 Vcs-Browser: https://jff.email/cgit/libhx.git
 
 Package: libhx32
 Architecture: any
 Multi-Arch: same
+Replaces: libhx28 (<< 3.25.1-1~)
+Breaks: libhx28 (<< 3.25.1-1~)
 Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${shlibs:Depends},
diff --git a/debian/copyright b/debian/copyright
index 14f6335..817eb20 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,9 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: libhx
-Source: http://libhx.sourceforge.net/
+Upstream-Contact: Jan Engelhardt <jengelh@inai.de>
+Source: https://inai.de/projects/libhx/
 
 Files: *
-       src/tc-compile.c
-       src/tc-deque.c
-       src/tc-link.c
 Copyright: 1999-2014 Jan Engelhardt <jengelh@gmx.de>
 License: LGPL-2.1+
 
diff --git a/debian/libhx-dev.lintian-overrides b/debian/libhx-dev.lintian-overrides
index ad0b640..15979c8 100644
--- a/debian/libhx-dev.lintian-overrides
+++ b/debian/libhx-dev.lintian-overrides
@@ -1,4 +1,4 @@
 # libHX_rtcheck is used to enable more internal checks dynamically
 libhx-dev: package-name-doesnt-match-sonames libHX-rtcheck
-libhx-dev: shlib-without-versioned-soname usr/lib/x86_64-linux-gnu/libHX_rtcheck.so libHX_rtcheck.so
-libhx-dev: shared-lib-without-dependency-information usr/lib/x86_64-linux-gnu/libHX_rtcheck.so
+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
diff --git a/debian/libhx-dev.symbols b/debian/libhx-dev.symbols
index a7153eb..abfb1ac 100644
--- a/debian/libhx-dev.symbols
+++ b/debian/libhx-dev.symbols
@@ -1,2 +1,3 @@
 libHX_rtcheck.so libhx-dev #MINVER#
+* Build-Depends-Package: libhx-dev
  LIBHX_3.25@LIBHX_3.25 3.25
diff --git a/debian/libhx32.symbols b/debian/libhx32.symbols
index 23345bb..4e58b1d 100644
--- a/debian/libhx32.symbols
+++ b/debian/libhx32.symbols
@@ -1,4 +1,5 @@
 libHX.so.32 libhx32 #MINVER#
+* Build-Depends-Package: libhx-dev
  HX_basename@LIBHX_3.25 3.25
  HX_basename_exact@LIBHX_3.25 3.25
  HX_chomp@LIBHX_3.25 3.25
diff --git a/debian/patches/hurd-path-max-define b/debian/patches/hurd-path-max-define
index 05994a7..da80024 100644
--- a/debian/patches/hurd-path-max-define
+++ b/debian/patches/hurd-path-max-define
@@ -1,4 +1,5 @@
 Description: Add missing define of PATH_MAX for hurd.
+Forwarded: not-needed
 Last-Update: 2015-02-04
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/