diff options
7 files changed, 52 insertions, 17 deletions
diff --git a/debian/_base/metapackages/sudo-trinity/debian/changelog b/debian/_base/metapackages/sudo-trinity/debian/changelog index 6d79a642a..2614640d5 100644 --- a/debian/_base/metapackages/sudo-trinity/debian/changelog +++ b/debian/_base/metapackages/sudo-trinity/debian/changelog @@ -1,3 +1,14 @@ +sudo-trinity (4:14.1.6~pre1) forky; urgency=low + + * Switched from cdbs to debhelper. + * Added copyright file. + * Install directories with normal permissions. + * Added overrides for version number and compression. + * Removed Replaces and Breaks referring to themselves. + * The epoch change is for historical reasons from the KDE3 era. + + -- Slávek Banko <slavek.banko@axis.cz> Fri, 20 Feb 2026 14:06:56 +0100 + sudo-trinity (1.0) lucid; urgency=low * Initial release diff --git a/debian/_base/metapackages/sudo-trinity/debian/control b/debian/_base/metapackages/sudo-trinity/debian/control index 6e2268706..57a238ccb 100644 --- a/debian/_base/metapackages/sudo-trinity/debian/control +++ b/debian/_base/metapackages/sudo-trinity/debian/control @@ -1,14 +1,14 @@ Source: sudo-trinity Section: tde -Priority: extra +Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 10~), cdbs +Build-Depends: debhelper (>= 10~) Standards-Version: 3.8.4 Package: sudo-trinity Architecture: all -Depends: sudo -Replaces: sudo-kde3 (<< 4:14.0.0~), sudo-trinity (<< 4:14.0.0~) -Breaks: sudo-kde3 (<< 4:14.0.0~), sudo-trinity (<< 4:14.0.0~) +Depends: ${misc:Depends}, sudo +Replaces: sudo-kde3 (<< 4:14.0.0~) +Breaks: sudo-kde3 (<< 4:14.0.0~) Description: TDE sudo TDE configuration files for sudo diff --git a/debian/_base/metapackages/sudo-trinity/debian/copyright b/debian/_base/metapackages/sudo-trinity/debian/copyright new file mode 100644 index 000000000..45d7efdf8 --- /dev/null +++ b/debian/_base/metapackages/sudo-trinity/debian/copyright @@ -0,0 +1,10 @@ +This package was created by Timothy Pearson (kb9vqf@pearsoncomputing.net) + +Copyright: + +Copyright 2011-2026 TDE Debian Team <team-debian@trinitydesktop.org> + +License: + +All files in this package are released under the GPL-2+ +(/usr/share/common-licenses/GPL-2+). diff --git a/debian/_base/metapackages/sudo-trinity/debian/distrospecific/Makefile b/debian/_base/metapackages/sudo-trinity/debian/distrospecific/Makefile index f106ff05e..60fb5f0ea 100644 --- a/debian/_base/metapackages/sudo-trinity/debian/distrospecific/Makefile +++ b/debian/_base/metapackages/sudo-trinity/debian/distrospecific/Makefile @@ -6,7 +6,9 @@ build: clean: install: - mkdir -p /etc + mkdir -p $(DESTDIR)/etc cp -Rp etc/* $(DESTDIR)/etc/ - chmod -R 644 $(DESTDIR)/etc - chmod -R 0440 $(DESTDIR)/etc/sudoers.d/tde-secure-path + find $(DESTDIR)/etc/ -type d -print0 |\ + xargs -r0 chmod 755 + find $(DESTDIR)/etc/ -type f -print0 |\ + xargs -r0 chmod 440 diff --git a/debian/_base/metapackages/sudo-trinity/debian/lintian-overrides b/debian/_base/metapackages/sudo-trinity/debian/lintian-overrides new file mode 100644 index 000000000..ff160a338 --- /dev/null +++ b/debian/_base/metapackages/sudo-trinity/debian/lintian-overrides @@ -0,0 +1,2 @@ +# Maybe we'll get our own section sometime in the future. +sudo-trinity: unknown-section tde diff --git a/debian/_base/metapackages/sudo-trinity/debian/rules b/debian/_base/metapackages/sudo-trinity/debian/rules index a653797dd..bbc464623 100755 --- a/debian/_base/metapackages/sudo-trinity/debian/rules +++ b/debian/_base/metapackages/sudo-trinity/debian/rules @@ -1,11 +1,4 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/class/makefile.mk -include /usr/share/cdbs/1/rules/debhelper.mk - -CFLAGS=-g -Wall -fPIC - -DEB_MAKE_INSTALL_TARGET := install DESTDIR="$(DEB_DESTDIR)" -DEB_INSTALL_DOCS_ALL := # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -17,7 +10,8 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) endif -pre-build:: debian/stamp-distrospecific +%: + dh $@ debian/stamp-distrospecific: dh_testdir @@ -26,9 +20,13 @@ debian/stamp-distrospecific: tee debian/stamp-distrospecific | \ tr "\n" "\0" | (cd debian/distrospecific && xargs -r0 mv -t ../..) -clean:: +override_dh_prep: debian/stamp-distrospecific + dh_prep + +override_dh_clean: dh_testdir [ ! -e debian/stamp-distrospecific ] || \ cat debian/stamp-distrospecific | \ tr "\n" "\0" | xargs -r0 mv -t debian/distrospecific rm -f debian/stamp-distrospecific + dh_clean diff --git a/debian/_base/metapackages/sudo-trinity/debian/source.lintian-overrides b/debian/_base/metapackages/sudo-trinity/debian/source.lintian-overrides new file mode 100644 index 000000000..254165f99 --- /dev/null +++ b/debian/_base/metapackages/sudo-trinity/debian/source.lintian-overrides @@ -0,0 +1,12 @@ +# We build for many distribution versions and therefore need +# the distribution version as part of the package version, +# which is unintentionally understood as NMU. +sudo-trinity source: source-nmu-has-incorrect-version-number +sudo-trinity source: binary-nmu-debian-revision-in-source +sudo-trinity source: no-nmu-in-changelog + +# We want XZ regardless of the default compression. +sudo-trinity source: custom-compression-in-debian-source-options + +# The metapackage contains files in the debian/distro-specific directory. +sudo-trinity source: empty-upstream-sources |