DEB compiz-trinity: Changes to silence lintian reports.HEADmaster

+ Added lintian-overrides installation.
+ Bump debhelper compatibility level to 10.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

13 files changed, 60 insertions, 14 deletions

diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/changelog b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/changelog
index 24c446c3..1da32fce 100644
--- a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/changelog
+++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/changelog
@@ -1,3 +1,11 @@
+compiz-trinity (0.8.4-3debian14.0.0+19~a) forky; urgency=low
+
+  * Changes to silence lintian reports.
+  * Added lintian-overrides installation.
+  * Bump debhelper compatibility to 10.
+
+ -- Slávek Banko <slavek.banko@axis.cz>  Thu, 05 Feb 2026 20:36:20 +0100
+
 compiz-trinity (0.8.4-3debian14.0.0+18~a) forky; urgency=low
 
   * Replace TRUE/FALSE with boolean values true/false.
diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/compat b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/compat
index ec635144..f599e28b 100644
--- a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/compat
+++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/compiz-core-trinity.lintian-overrides b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/compiz-core-trinity.lintian-overrides
new file mode 100644
index 00000000..2b0ce009
--- /dev/null
+++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/compiz-core-trinity.lintian-overrides
@@ -0,0 +1,2 @@
+# We are intentionally installing to /opt, so we have to live with that for now.
+compiz-core-trinity: dir-or-file-in-opt
diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/compiz-plugins-trinity.lintian-overrides b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/compiz-plugins-trinity.lintian-overrides
new file mode 100644
index 00000000..1d79874d
--- /dev/null
+++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/compiz-plugins-trinity.lintian-overrides
@@ -0,0 +1,5 @@
+# We are intentionally installing to /opt, so we have to live with that for now.
+compiz-plugins-trinity: dir-or-file-in-opt
+
+# Because of the location in /opt, we are looking on custom path.
+compiz-plugins-trinity: custom-library-search-path
diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/compiz-tde-trinity.lintian-overrides b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/compiz-tde-trinity.lintian-overrides
new file mode 100644
index 00000000..d3001b55
--- /dev/null
+++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/compiz-tde-trinity.lintian-overrides
@@ -0,0 +1,5 @@
+# We are intentionally installing to /opt, so we have to live with that for now.
+compiz-tde-trinity: dir-or-file-in-opt
+
+# Because of the location in /opt, we are looking on custom path.
+compiz-tde-trinity: custom-library-search-path
diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/compiz-trinity-dev.lintian-overrides b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/compiz-trinity-dev.lintian-overrides
new file mode 100644
index 00000000..4d81cce5
--- /dev/null
+++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/compiz-trinity-dev.lintian-overrides
@@ -0,0 +1,2 @@
+# We are intentionally installing to /opt, so we have to live with that for now.
+compiz-trinity-dev: dir-or-file-in-opt
diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/control b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/control
index de38e915..530d2137 100644
--- a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/control
+++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/control
@@ -4,12 +4,12 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: Thierry Reding <thierry@gilfi.de>, David Nusinow <dnusinow@debian.org>
-Build-Depends: debhelper (>= 9~), quilt (>= 0.40), automake, libtool, libglib2.0-dev, libpng-dev, libxcomposite-dev (>= 1:0.3-2), libxfixes-dev (>= 1:4.0.1), libxdamage-dev (>=1:1.0.3), libxrandr-dev (>= 2:1.1.0.2), libxrender-dev (>= 1:0.9.1), libice-dev(>= 1:1.0.1), libsm-dev (>= 1:1.0.1), libgl1-mesa-dev (>= 6.5.1) | libgl-dev, libcairo-dev, librsvg2-dev, libdbus-1-dev, libdbus-glib-1-dev, libwnck-3-dev | libwnck-dev, x11proto-gl-dev (>= 1.4.8), libxinerama-dev, tdebase-trinity-dev, libxcursor-dev, libxml2-dev, libxslt1-dev, libxml-parser-perl, libglu1-mesa-dev, xsltproc, libx11-xcb-dev, intltool
+Build-Depends: debhelper (>= 10~), quilt (>= 0.40), automake, libtool, libglib2.0-dev, libpng-dev, libxcomposite-dev (>= 1:0.3-2), libxfixes-dev (>= 1:4.0.1), libxdamage-dev (>=1:1.0.3), libxrandr-dev (>= 2:1.1.0.2), libxrender-dev (>= 1:0.9.1), libice-dev(>= 1:1.0.1), libsm-dev (>= 1:1.0.1), libgl-dev | libgl1-mesa-dev (>= 6.5.1), libcairo-dev, librsvg2-dev, libdbus-1-dev, libdbus-glib-1-dev, libwnck-3-dev | libwnck-dev, x11proto-gl-dev (>= 1.4.8), libxinerama-dev, tdebase-trinity-dev, libxcursor-dev, libxml2-dev, libxslt1-dev, libxml-parser-perl, libglu1-mesa-dev, xsltproc, libx11-xcb-dev, intltool
 Standards-Version: 3.8.4
 
 Package: compiz-trinity
 Architecture: all
-Depends: compiz-core-trinity, compiz-plugins-trinity, compiz-fusion-plugins-main-trinity, compiz-fusion-plugins-extra-trinity, libcompizconfig0-trinity
+Depends: compiz-core-trinity, compiz-plugins-trinity, compiz-fusion-plugins-main-trinity, compiz-fusion-plugins-extra-trinity, libcompizconfig0-trinity, ${shlibs:Depends}, ${misc:Depends}
 Description: OpenGL window and compositing manager [Trinity]
  Compiz brings to life a variety of visual effects that make the Linux desktop
  easier to use, more powerful and intuitive, and more accessible for users
@@ -38,7 +38,7 @@ Description: OpenGL window and compositing manager [Trinity]
 
 Package: compiz-trinity-dev
 Architecture: any
-Depends: libgl1-mesa-dev | libgl-dev, libpng-dev, libxcomposite-dev, libxdamage-dev, libxfixes-dev, libxcursor-dev, libxinerama-dev, libxrandr-dev, libice-dev, libsm-dev, libstartup-notification0-dev, libx11-xcb-dev, libxml2-dev, libxslt1-dev, ${shlibs:Depends}, ${misc:Depends}
+Depends: libgl-dev | libgl1-mesa-dev, libpng-dev, libxcomposite-dev, libxdamage-dev, libxfixes-dev, libxcursor-dev, libxinerama-dev, libxrandr-dev, libice-dev, libsm-dev, libstartup-notification0-dev, libx11-xcb-dev, libxml2-dev, libxslt1-dev, ${shlibs:Depends}, ${misc:Depends}
 Description: OpenGL window and compositing manager - development files [Trinity]
  Compiz brings to life a variety of visual effects that make the Linux desktop
  easier to use, more powerful and intuitive, and more accessible for users
diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/copyright b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/copyright
index 77dfea2c..fa55fa29 100644
--- a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/copyright
+++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/copyright
@@ -69,9 +69,7 @@ For the 'place' plugin:
      * General Public License for more details.
      *
      * You should have received a copy of the GNU General Public License
-     * along with this program; if not, write to the Free Software
-     * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-     * MA 02110-1301, USA.
+     * along with this program.  If not, see <https://www.gnu.org/licenses/>.
      */
 
 The 'plane' plugin was written by Søren Sandmann <sandmann@redhat.com>:
diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/libdecoration0-trinity-dev.lintian-overrides b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/libdecoration0-trinity-dev.lintian-overrides
new file mode 100644
index 00000000..e030006b
--- /dev/null
+++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/libdecoration0-trinity-dev.lintian-overrides
@@ -0,0 +1,2 @@
+# We are intentionally installing to /opt, so we have to live with that for now.
+libdecoration0-trinity-dev: dir-or-file-in-opt
diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/libdecoration0-trinity.lintian-overrides b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/libdecoration0-trinity.lintian-overrides
new file mode 100644
index 00000000..13670800
--- /dev/null
+++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/libdecoration0-trinity.lintian-overrides
@@ -0,0 +1,5 @@
+# We are intentionally installing to /opt, so we have to live with that for now.
+libdecoration0-trinity: dir-or-file-in-opt
+
+# Actually, trigger is not unnecessary because of dynamic modules like plugings.
+libdecoration0-trinity: package-has-unnecessary-activation-of-ldconfig-trigger
diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/rules b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/rules
index 7e4dd77d..4938fdb4 100755
--- a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/rules
+++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/rules
@@ -25,12 +25,12 @@ PACKAGE = compiz-trinity
 export MANDIR=/opt/trinity/share/man
 
 CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(findstring noopt,$(shell dpkg-buildflags --get CFLAGS)))
 	CFLAGS += -O0
 else
 	CFLAGS += -O2
 endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ifeq (,$(findstring nostrip,$(shell dpkg-buildflags --get CFLAGS)))
 	INSTALL_PROGRAM += -s
 endif
 
@@ -95,7 +95,7 @@ clean: prune
 install:
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
@@ -109,6 +109,20 @@ install:
 	# remove unneeded .la files
 	find $(CURDIR)/debian/tmp/opt/trinity/lib -type f -name '*.la' | xargs rm -f
 
+	# install lintian-overrides
+	mkdir -p $(CURDIR)/debian
+	for P in \
+		compiz-core-trinity \
+		compiz-plugins-trinity \
+		compiz-tde-trinity \
+		compiz-trinity-dev \
+		libdecoration0-trinity-dev \
+		libdecoration0-trinity \
+	; do \
+		mkdir -p $(CURDIR)/debian/$$P//usr/share/lintian/overrides; \
+		$(INSTALL) --mode 0644 debian/$$P.lintian-overrides $(CURDIR)/debian/$$P/usr/share/lintian/overrides/$$P; \
+	done
+
 # Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir
diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/source.lintian-overrides b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/source.lintian-overrides
new file mode 100644
index 00000000..9545c190
--- /dev/null
+++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/source.lintian-overrides
@@ -0,0 +1,9 @@
+# We build for many distribution versions and therefore need
+# the distribution version as part of the package version,
+# which is unintentionally understood as NMU.
+compiz-trinity source: source-nmu-has-incorrect-version-number
+compiz-trinity source: binary-nmu-debian-revision-in-source
+compiz-trinity source: no-nmu-in-changelog
+
+# We want XZ regardless of the default compression.
+compiz-trinity source: custom-compression-in-debian-source-options
diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/watch b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/watch
deleted file mode 100644
index 943afcb7..00000000
--- a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/watch
+++ /dev/null
@@ -1,4 +0,0 @@
-version=3
-http://xorg.freedesktop.org/releases/individual/app/ compiz-(.*)\.tar\.gz
-
-