From 75808db17caf8b960b351e3408e74142f4c85aac Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 14 Apr 2024 15:42:30 +0200 Subject: Adding upstream version 2.117.0. Signed-off-by: Daniel Baumann --- .../usrmerge/usrmerge-bin/build-spec/debian/install | 2 ++ .../checks/usrmerge/usrmerge-bin/build-spec/debian/script | 2 ++ .../checks/usrmerge/usrmerge-bin/build-spec/fill-values | 3 +++ t/recipes/checks/usrmerge/usrmerge-bin/eval/desc | 2 ++ t/recipes/checks/usrmerge/usrmerge-bin/eval/hints | 1 + .../usrmerge/usrmerge-lib/build-spec/debian/compat.in | 1 + .../usrmerge/usrmerge-lib/build-spec/debian/control.in | 15 +++++++++++++++ .../checks/usrmerge/usrmerge-lib/build-spec/debian/rules | 5 +++++ .../checks/usrmerge/usrmerge-lib/build-spec/fill-values | 6 ++++++ .../checks/usrmerge/usrmerge-lib/build-spec/orig/Makefile | 14 ++++++++++++++ .../checks/usrmerge/usrmerge-lib/build-spec/orig/basic.c | 3 +++ t/recipes/checks/usrmerge/usrmerge-lib/eval/desc | 2 ++ t/recipes/checks/usrmerge/usrmerge-lib/eval/hints | 1 + 13 files changed, 57 insertions(+) create mode 100644 t/recipes/checks/usrmerge/usrmerge-bin/build-spec/debian/install create mode 100755 t/recipes/checks/usrmerge/usrmerge-bin/build-spec/debian/script create mode 100644 t/recipes/checks/usrmerge/usrmerge-bin/build-spec/fill-values create mode 100644 t/recipes/checks/usrmerge/usrmerge-bin/eval/desc create mode 100644 t/recipes/checks/usrmerge/usrmerge-bin/eval/hints create mode 100644 t/recipes/checks/usrmerge/usrmerge-lib/build-spec/debian/compat.in create mode 100644 t/recipes/checks/usrmerge/usrmerge-lib/build-spec/debian/control.in create mode 100644 t/recipes/checks/usrmerge/usrmerge-lib/build-spec/debian/rules create mode 100644 t/recipes/checks/usrmerge/usrmerge-lib/build-spec/fill-values create mode 100644 t/recipes/checks/usrmerge/usrmerge-lib/build-spec/orig/Makefile create mode 100644 t/recipes/checks/usrmerge/usrmerge-lib/build-spec/orig/basic.c create mode 100644 t/recipes/checks/usrmerge/usrmerge-lib/eval/desc create mode 100644 t/recipes/checks/usrmerge/usrmerge-lib/eval/hints (limited to 't/recipes/checks/usrmerge') diff --git a/t/recipes/checks/usrmerge/usrmerge-bin/build-spec/debian/install b/t/recipes/checks/usrmerge/usrmerge-bin/build-spec/debian/install new file mode 100644 index 0000000..fbf30f5 --- /dev/null +++ b/t/recipes/checks/usrmerge/usrmerge-bin/build-spec/debian/install @@ -0,0 +1,2 @@ +debian/script /bin/ +debian/script /usr/bin diff --git a/t/recipes/checks/usrmerge/usrmerge-bin/build-spec/debian/script b/t/recipes/checks/usrmerge/usrmerge-bin/build-spec/debian/script new file mode 100755 index 0000000..0e930fe --- /dev/null +++ b/t/recipes/checks/usrmerge/usrmerge-bin/build-spec/debian/script @@ -0,0 +1,2 @@ +#!/bin/sh +true \ No newline at end of file diff --git a/t/recipes/checks/usrmerge/usrmerge-bin/build-spec/fill-values b/t/recipes/checks/usrmerge/usrmerge-bin/build-spec/fill-values new file mode 100644 index 0000000..24458eb --- /dev/null +++ b/t/recipes/checks/usrmerge/usrmerge-bin/build-spec/fill-values @@ -0,0 +1,3 @@ +Skeleton: upload-native +Testname: usrmerge-bin +Description: Check for file installed in /usr/bin /bin diff --git a/t/recipes/checks/usrmerge/usrmerge-bin/eval/desc b/t/recipes/checks/usrmerge/usrmerge-bin/eval/desc new file mode 100644 index 0000000..0fbab15 --- /dev/null +++ b/t/recipes/checks/usrmerge/usrmerge-bin/eval/desc @@ -0,0 +1,2 @@ +Testname: usrmerge-bin +Check: usrmerge diff --git a/t/recipes/checks/usrmerge/usrmerge-bin/eval/hints b/t/recipes/checks/usrmerge/usrmerge-bin/eval/hints new file mode 100644 index 0000000..429f9fc --- /dev/null +++ b/t/recipes/checks/usrmerge/usrmerge-bin/eval/hints @@ -0,0 +1 @@ +usrmerge-bin (binary): file-in-root-and-usr already in: usr/bin/script [bin/script] diff --git a/t/recipes/checks/usrmerge/usrmerge-lib/build-spec/debian/compat.in b/t/recipes/checks/usrmerge/usrmerge-lib/build-spec/debian/compat.in new file mode 100644 index 0000000..640a566 --- /dev/null +++ b/t/recipes/checks/usrmerge/usrmerge-lib/build-spec/debian/compat.in @@ -0,0 +1 @@ +[% $dh_compat_level %] diff --git a/t/recipes/checks/usrmerge/usrmerge-lib/build-spec/debian/control.in b/t/recipes/checks/usrmerge/usrmerge-lib/build-spec/debian/control.in new file mode 100644 index 0000000..87597d3 --- /dev/null +++ b/t/recipes/checks/usrmerge/usrmerge-lib/build-spec/debian/control.in @@ -0,0 +1,15 @@ +Source: [% $source %] +Priority: optional +Section: libs +Maintainer: [% $author %] +Standards-Version: [% $standards_version %] +Build-Depends: [% $build_depends %] +Rules-Requires-Root: no + +Package: libbasic2 +Architecture: [% $package_architecture %] +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: [% $description %] + This is a test package designed to exercise some feature or tag of + Lintian. It is part of the Lintian test suite and may do very odd + things. It should not be installed like a regular package. diff --git a/t/recipes/checks/usrmerge/usrmerge-lib/build-spec/debian/rules b/t/recipes/checks/usrmerge/usrmerge-lib/build-spec/debian/rules new file mode 100644 index 0000000..b5970cb --- /dev/null +++ b/t/recipes/checks/usrmerge/usrmerge-lib/build-spec/debian/rules @@ -0,0 +1,5 @@ +#!/usr/bin/make -f +%: + dh $@ + +override_dh_movetousr: diff --git a/t/recipes/checks/usrmerge/usrmerge-lib/build-spec/fill-values b/t/recipes/checks/usrmerge/usrmerge-lib/build-spec/fill-values new file mode 100644 index 0000000..2345c1a --- /dev/null +++ b/t/recipes/checks/usrmerge/usrmerge-lib/build-spec/fill-values @@ -0,0 +1,6 @@ +Skeleton: upload-native +Testname: usrmerge-lib +Package-Architecture: any +Default-Build-Depends: debhelper (>= 9.20151004~) +Dh-Compat-Level: 9 +Description: Check for file installed in /usr/lib /lib diff --git a/t/recipes/checks/usrmerge/usrmerge-lib/build-spec/orig/Makefile b/t/recipes/checks/usrmerge/usrmerge-lib/build-spec/orig/Makefile new file mode 100644 index 0000000..09936bd --- /dev/null +++ b/t/recipes/checks/usrmerge/usrmerge-lib/build-spec/orig/Makefile @@ -0,0 +1,14 @@ +all: + gcc $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -fPIC -shared -Wl,--no-as-needed -Wl,-z,defs -Wl,-soname,libbasic.so.2 -o libbasic.so.2 basic.c + +install: + # install it under the correct triplet directory + install -d $(DESTDIR)/usr/lib/ + install -d $(DESTDIR)/lib/ + install -m 644 -c -s libbasic.so.2 $(DESTDIR)/lib/libbasic.so.2 + install -m 644 -c -s libbasic.so.2 $(DESTDIR)/usr/lib/libbasic.so.2 + +clean distclean: + rm -f libbasic.so.2 + +check test: diff --git a/t/recipes/checks/usrmerge/usrmerge-lib/build-spec/orig/basic.c b/t/recipes/checks/usrmerge/usrmerge-lib/build-spec/orig/basic.c new file mode 100644 index 0000000..764b4fc --- /dev/null +++ b/t/recipes/checks/usrmerge/usrmerge-lib/build-spec/orig/basic.c @@ -0,0 +1,3 @@ +int hello() { + return 1; +} diff --git a/t/recipes/checks/usrmerge/usrmerge-lib/eval/desc b/t/recipes/checks/usrmerge/usrmerge-lib/eval/desc new file mode 100644 index 0000000..d1d5372 --- /dev/null +++ b/t/recipes/checks/usrmerge/usrmerge-lib/eval/desc @@ -0,0 +1,2 @@ +Testname: usrmerge-lib +Check: usrmerge diff --git a/t/recipes/checks/usrmerge/usrmerge-lib/eval/hints b/t/recipes/checks/usrmerge/usrmerge-lib/eval/hints new file mode 100644 index 0000000..d9c1428 --- /dev/null +++ b/t/recipes/checks/usrmerge/usrmerge-lib/eval/hints @@ -0,0 +1 @@ +libbasic2 (binary): library-in-root-and-usr already in: usr/lib/libbasic.so.2 [lib/libbasic.so.2] -- cgit v1.2.3