From e6d7e8e6936e70e1d6a7d1f5df5171280befbfd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 15 Jan 2014 20:07:03 +0100 Subject: Update remaining metapackages on Debian and Ubuntu to conform the current automated scripts on build-farm --- debian/lenny/metapackages/rename-meta/Makefile | 8 -------- debian/lenny/metapackages/rename-meta/debian/rules | 1 - debian/lenny/metapackages/sudo-trinity/Makefile | 12 ------------ debian/lenny/metapackages/sudo-trinity/debian/changelog | 0 debian/lenny/metapackages/sudo-trinity/debian/compat | 0 debian/lenny/metapackages/sudo-trinity/debian/dirs | 0 .../sudo-trinity/debian/distrospecific/Makefile | 12 ++++++++++++ .../debian/distrospecific/etc/sudoers.d/tde-secure-path | 1 + debian/lenny/metapackages/sudo-trinity/debian/rules | 16 ++++++++++++++++ .../sudo-trinity/etc/sudoers.d/tde-secure-path | 1 - 10 files changed, 29 insertions(+), 22 deletions(-) delete mode 100644 debian/lenny/metapackages/rename-meta/Makefile delete mode 100755 debian/lenny/metapackages/sudo-trinity/Makefile mode change 100755 => 100644 debian/lenny/metapackages/sudo-trinity/debian/changelog mode change 100755 => 100644 debian/lenny/metapackages/sudo-trinity/debian/compat mode change 100755 => 100644 debian/lenny/metapackages/sudo-trinity/debian/dirs create mode 100644 debian/lenny/metapackages/sudo-trinity/debian/distrospecific/Makefile create mode 100644 debian/lenny/metapackages/sudo-trinity/debian/distrospecific/etc/sudoers.d/tde-secure-path delete mode 100644 debian/lenny/metapackages/sudo-trinity/etc/sudoers.d/tde-secure-path (limited to 'debian/lenny/metapackages') diff --git a/debian/lenny/metapackages/rename-meta/Makefile b/debian/lenny/metapackages/rename-meta/Makefile deleted file mode 100644 index a36e6a1c9..000000000 --- a/debian/lenny/metapackages/rename-meta/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -FPACKAGE = ubuntu-trinity-rename-meta -VERSION = 1.0 - -build: - -clean: - -install: diff --git a/debian/lenny/metapackages/rename-meta/debian/rules b/debian/lenny/metapackages/rename-meta/debian/rules index a9e7e66cb..bcf749744 100755 --- a/debian/lenny/metapackages/rename-meta/debian/rules +++ b/debian/lenny/metapackages/rename-meta/debian/rules @@ -1,5 +1,4 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/class/makefile.mk include /usr/share/cdbs/1/rules/debhelper.mk DEB_BUILD_OPTIONS := nostrip diff --git a/debian/lenny/metapackages/sudo-trinity/Makefile b/debian/lenny/metapackages/sudo-trinity/Makefile deleted file mode 100755 index bc4653675..000000000 --- a/debian/lenny/metapackages/sudo-trinity/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -FPACKAGE = sudo-trinity -VERSION = 1.0 - -build: - -clean: - -install: - mkdir -p /etc - cp -Rp etc/* $(DESTDIR)/etc/ - chmod -R 644 $(DESTDIR)/etc - chmod -R 0440 $(DESTDIR)/etc/sudoers.d/tde-secure-path \ No newline at end of file diff --git a/debian/lenny/metapackages/sudo-trinity/debian/changelog b/debian/lenny/metapackages/sudo-trinity/debian/changelog old mode 100755 new mode 100644 diff --git a/debian/lenny/metapackages/sudo-trinity/debian/compat b/debian/lenny/metapackages/sudo-trinity/debian/compat old mode 100755 new mode 100644 diff --git a/debian/lenny/metapackages/sudo-trinity/debian/dirs b/debian/lenny/metapackages/sudo-trinity/debian/dirs old mode 100755 new mode 100644 diff --git a/debian/lenny/metapackages/sudo-trinity/debian/distrospecific/Makefile b/debian/lenny/metapackages/sudo-trinity/debian/distrospecific/Makefile new file mode 100644 index 000000000..f106ff05e --- /dev/null +++ b/debian/lenny/metapackages/sudo-trinity/debian/distrospecific/Makefile @@ -0,0 +1,12 @@ +FPACKAGE = sudo-trinity +VERSION = 1.0 + +build: + +clean: + +install: + mkdir -p /etc + cp -Rp etc/* $(DESTDIR)/etc/ + chmod -R 644 $(DESTDIR)/etc + chmod -R 0440 $(DESTDIR)/etc/sudoers.d/tde-secure-path diff --git a/debian/lenny/metapackages/sudo-trinity/debian/distrospecific/etc/sudoers.d/tde-secure-path b/debian/lenny/metapackages/sudo-trinity/debian/distrospecific/etc/sudoers.d/tde-secure-path new file mode 100644 index 000000000..f3c34f20a --- /dev/null +++ b/debian/lenny/metapackages/sudo-trinity/debian/distrospecific/etc/sudoers.d/tde-secure-path @@ -0,0 +1 @@ +Defaults secure_path=/usr/local/sbin:/usr/local/bin:/opt/trinity/sbin:/usr/sbin:/opt/trinity/bin:/usr/bin:/sbin:/bin:/usr/X11R6/bin diff --git a/debian/lenny/metapackages/sudo-trinity/debian/rules b/debian/lenny/metapackages/sudo-trinity/debian/rules index f8c89d5db..e5e2870b7 100755 --- a/debian/lenny/metapackages/sudo-trinity/debian/rules +++ b/debian/lenny/metapackages/sudo-trinity/debian/rules @@ -9,3 +9,19 @@ DEB_INSTALL_DOCS_ALL := DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) + +pre-build:: debian/stamp-distrospecific + +debian/stamp-distrospecific: + dh_testdir + [ -e debian/stamp-distrospecific ] || \ + ls -a1 debian/distrospecific | grep -v "^\.*$$" | \ + tee debian/stamp-distrospecific | \ + tr "\n" "\0" | (cd debian/distrospecific && xargs -r0 mv -t ../..) + +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 diff --git a/debian/lenny/metapackages/sudo-trinity/etc/sudoers.d/tde-secure-path b/debian/lenny/metapackages/sudo-trinity/etc/sudoers.d/tde-secure-path deleted file mode 100644 index f3c34f20a..000000000 --- a/debian/lenny/metapackages/sudo-trinity/etc/sudoers.d/tde-secure-path +++ /dev/null @@ -1 +0,0 @@ -Defaults secure_path=/usr/local/sbin:/usr/local/bin:/opt/trinity/sbin:/usr/sbin:/opt/trinity/bin:/usr/bin:/sbin:/bin:/usr/X11R6/bin -- cgit v1.2.1