Fixed and modernize lintian handling

10 files changed, 12 insertions, 18 deletions

diff --git a/debian/httrack-doc.files b/debian/httrack-doc.files
index 9f9385b..e5c13d2 100644
--- a/debian/httrack-doc.files
+++ b/debian/httrack-doc.files
@@ -1,4 +1,3 @@
 usr/share/httrack/html
 usr/share/doc/httrack
 usr/share/doc/httrack/httrack-doc.html
-usr/share/lintian/overrides/httrack-doc
diff --git a/debian/httrack-doc.lintian-overrides b/debian/httrack-doc.lintian-overrides
index 5cddf2e..be0afce 100644
--- a/debian/httrack-doc.lintian-overrides
+++ b/debian/httrack-doc.lintian-overrides
@@ -1,3 +1,2 @@
-duplicate-changelog-files usr/share/doc/httrack/changelog.gz usr/share/doc/httrack/history.txt.gz
-package-contains-documentation-outside-usr-share-doc usr/share/httrack/*
-extended-description-is-probably-too-short
+httrack-doc: extra-license-file usr/share/httrack/html/license.txt
+httrack-doc: package-contains-documentation-outside-usr-share-doc usr/share/httrack/*
diff --git a/debian/httrack.lintian-overrides b/debian/httrack.lintian-overrides
deleted file mode 100644
index 4c6c745..0000000
--- a/debian/httrack.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-duplicate-changelog-files usr/share/doc/httrack/changelog.gz usr/share/doc/httrack/history.txt.gz
-source-is-missing html/* templates/*
diff --git a/debian/libhttrack-dev.files b/debian/libhttrack-dev.files
index 3878ba8..76eb4e6 100644
--- a/debian/libhttrack-dev.files
+++ b/debian/libhttrack-dev.files
@@ -3,4 +3,3 @@ usr/lib/*/libhttrack.{so}
 usr/lib/*/libhtsjava.{so}
 usr/share/httrack/libtest
 usr/lib/*/httrack/libtest
-usr/share/lintian/overrides/libhttrack-dev
diff --git a/debian/libhttrack-dev.lintian-overrides b/debian/libhttrack-dev.lintian-overrides
index 4df9f41..b70291b 100644
--- a/debian/libhttrack-dev.lintian-overrides
+++ b/debian/libhttrack-dev.lintian-overrides
@@ -1,2 +1,5 @@
-library-not-linked-against-libc usr/lib/*/httrack/libtest/libfilename.so.1.0.0
-breakout-link *
+libhttrack-dev: breakout-link *
+libhttrack-dev: hardening-no-fortify-functions usr/lib/x86_64-linux-gnu/httrack/libtest/*
+libhttrack-dev: library-not-linked-against-libc usr/lib/*/httrack/libtest/libfilename.so.1.0.0
+libhttrack-dev: package-contains-documentation-outside-usr-share-doc usr/share/httrack/libtest/readme.txt
+libhttrack-dev: package-name-defined-in-config-h usr/include/httrack/config.h
diff --git a/debian/libhttrack2.lintian-overrides b/debian/libhttrack2.lintian-overrides
new file mode 100644
index 0000000..a76af2b
--- /dev/null
+++ b/debian/libhttrack2.lintian-overrides
@@ -0,0 +1,2 @@
+libhttrack2: no-symbols-control-file usr/lib/*
+libhttrack2: spelling-error-in-binary usr/lib/*/libhttrack.so.* updat update
diff --git a/debian/rules b/debian/rules
index 6cc0320..a70e604 100755
--- a/debian/rules
+++ b/debian/rules
@@ -100,14 +100,7 @@ install: build
 	ln -s /usr/share/httrack/libtest/readme.txt \
 		 $(CURDIR)/debian/httrack/usr/lib/$(DEB_HOST_MULTIARCH)/httrack/libtest/readme.txt
 
-	# Lintian overrides
-	mkdir -p $(CURDIR)/debian/httrack/usr/share/lintian/overrides
-	cp $(CURDIR)/debian/httrack.lintian-overrides \
-		$(CURDIR)/debian/httrack/usr/share/lintian/overrides/httrack
-	cp $(CURDIR)/debian/libhttrack-dev.lintian-overrides \
-		$(CURDIR)/debian/httrack/usr/share/lintian/overrides/libhttrack-dev
-	cp $(CURDIR)/debian/httrack-doc.lintian-overrides \
-		$(CURDIR)/debian/httrack/usr/share/lintian/overrides/httrack-doc
+	dh_lintian
 
 	dh_movefiles --sourcedir=debian/httrack
 
diff --git a/debian/source.lintian-overrides b/debian/source/lintian-overrides
index 84436eb..84436eb 100644
--- a/debian/source.lintian-overrides
+++ b/debian/source/lintian-overrides
diff --git a/debian/webhttrack-common.lintian-overrides b/debian/webhttrack-common.lintian-overrides
new file mode 100644
index 0000000..b53f686
--- /dev/null
+++ b/debian/webhttrack-common.lintian-overrides
@@ -0,0 +1 @@
+webhttrack-common: package-contains-documentation-outside-usr-share-doc *
diff --git a/debian/webhttrack.lintian-overrides b/debian/webhttrack.lintian-overrides
index f4634d1..ecaa127 100644
--- a/debian/webhttrack.lintian-overrides
+++ b/debian/webhttrack.lintian-overrides
@@ -1 +1 @@
-missing-depends-on-sensible-utils usr/bin/webhttrack
+webhttrack: missing-depends-on-sensible-utils sensible-browser usr/bin/webhttrack