Merge pull request #406 from xroche/debian/libhttrack3-rename

debian: rename libhttrack2 to libhttrack3 to follow the SONAME
debian: drop the dead libhttrack-swf1.files and fix the overrides comment
2026-06-21 09:38:24 +03:00 · 2026-06-20 15:04:12 +02:00 · 2026-06-20 14:59:00 +02:00 · 2026-06-20 14:46:14 +02:00 · 2026-06-20 14:43:43 +02:00
8 changed files with 23 additions and 14 deletions
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+httrack (3.49.8-2) unstable; urgency=medium
+
+  * Rename libhttrack2 to libhttrack3 to follow the SONAME, which the 3.49.8
+    ABI bump moved to libhttrack.so.3 (package-name-doesnt-match-sonames). In
+    3.49.8-1 the libhttrack2.files glob still matched .so.2, so the runtime
+    libraries fell through into the httrack package and libhttrack2 shipped no
+    library. The new .files uses a .so.3* wildcard so a future SONAME bump no
+    longer silently misplaces the libraries. New binary package, via NEW.
+  * Drop the stale debian/libhttrack-swf1.files: the swf module is no longer
+    built and no libhttrack-swf1 package exists.
+
+ -- Xavier Roche <xavier@debian.org>  Sat, 20 Jun 2026 14:42:13 +0200
+
 httrack (3.49.8-1) unstable; urgency=medium

  * New upstream release: HTTPS-proxy CONNECT tunnelling and wider srcset
--- a/debian/control
+++ b/debian/control
@@ -58,13 +58,13 @@ Description: webhttrack common files
 This package is the common files of webhttrack, website copier and
 mirroring utility

-Package: libhttrack2
+Package: libhttrack3
 Architecture: any
 Multi-Arch: same
 Section: libs
-Replaces: libhttrack1
-Conflicts: libhttrack1
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Replaces: libhttrack2, httrack (<< 3.49.8-2~)
+Breaks: libhttrack2, httrack (<< 3.49.8-2~)
 Description: Httrack website copier library
 This package is the library part of httrack, website copier and mirroring
 utility
--- a/debian/libhttrack-swf1.files
+++ b/debian/libhttrack-swf1.files
@@ -1,2 +0,0 @@
-usr/lib/*/libhtsswf.so.1.0.0
-usr/lib/*/libhtsswf.so.1
--- a/debian/libhttrack2.files
+++ b/debian/libhttrack2.files
@@ -1,5 +0,0 @@
-usr/lib/*/libhttrack.so.2.0.49
-usr/lib/*/libhttrack.so.2
-usr/lib/*/libhtsjava.so.2.0.49
-usr/lib/*/libhtsjava.so.2
-usr/share/httrack/templates
--- a/debian/libhttrack2.lintian-overrides
+++ b/debian/libhttrack2.lintian-overrides
@@ -1,3 +0,0 @@
-# The shared libraries ship without a versioned symbols control file (ABI is
-# tracked via the SONAME and a strict =version dependency, see debian/rules).
-libhttrack2: no-symbols-control-file usr/lib/*
--- a/debian/libhttrack3.files
+++ b/debian/libhttrack3.files
@@ -0,0 +1,3 @@
+usr/lib/*/libhttrack.so.3*
+usr/lib/*/libhtsjava.so.3*
+usr/share/httrack/templates
--- a/debian/libhttrack3.lintian-overrides
+++ b/debian/libhttrack3.lintian-overrides
@@ -0,0 +1,3 @@
+# The shared libraries ship without a versioned symbols control file (ABI is
+# tracked via the SONAME plus a >= upstream-version dependency, see debian/rules).
+libhttrack3: no-symbols-control-file usr/lib/*
--- a/debian/rules
+++ b/debian/rules
@@ -135,7 +135,7 @@ binary-arch: build install
 	dh_makeshlibs -a -X/usr/lib/$(DEB_HOST_MULTIARCH)/httrack/libtest --version-info
 	dh_installdeb -a
 	# we depend on the current version (ABI may change)
-	dh_shlibdeps -a -ldebian/libhttrack2/usr/lib/$(DEB_HOST_MULTIARCH)
+	dh_shlibdeps -a -ldebian/libhttrack3/usr/lib/$(DEB_HOST_MULTIARCH)
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a
Author	SHA1	Message	Date
Xavier Roche	fdb243e5a2	Merge pull request #406 from xroche/debian/libhttrack3-rename debian: rename libhttrack2 to libhttrack3 to follow the SONAME	2026-06-20 15:04:12 +02:00
Xavier Roche	f8546e146d	debian: drop the dead libhttrack-swf1.files and fix the overrides comment Two packaging nits surfaced while reviewing the libhttrack3 rename, both debian/-only: - debian/libhttrack-swf1.files listed libhtsswf.so.1* but there is no libhttrack-swf1 package in debian/control and the swf module is no longer built (lib_LTLIBRARIES is just libhttrack/libhtsjava). dh_movefiles only consults built packages, so the list was dead. Remove it. - libhttrack3.lintian-overrides claimed the ABI is tracked via "a strict =version dependency", but dh_makeshlibs --version-info emits the conservative (>= upstream-version) form, which is the correct choice for a soname-versioned library; a = ${binary:Version} shlibs dependency draws lintian's distant-prerequisite-in-shlibs. Correct the comment to match. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Signed-off-by: Xavier Roche <roche@httrack.com>	2026-06-20 14:59:00 +02:00
Xavier Roche	b7f602f2eb	debian: rename libhttrack2 to libhttrack3 to follow the SONAME The 3.49.8 ABI bump moved the soname to libhttrack.so.3, but the packaging still globbed .so.2 in debian/libhttrack2.files, so the runtime libraries matched nothing there and fell through into the catch-all httrack package; libhttrack2 shipped no library (lintian package-name-doesnt-match-sonames). Rename the binary package to libhttrack3, take over the misplaced libraries from httrack and the old libhttrack2 via Breaks/Replaces, and switch the .files globs to a .so.3* wildcard so a future soname bump no longer silently misplaces the libraries. Ships as 3.49.8-2; new binary name goes through NEW. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Signed-off-by: Xavier Roche <roche@httrack.com>	2026-06-20 14:46:14 +02:00
Xavier Roche	550100b56a	Merge pull request #405 from xroche/feature/mkdeb-sbuild mkdeb: optional --sbuild clean-room build gate	2026-06-20 14:43:43 +02:00