From 73166c3fd1247eaa5412d54ba06fc25ccca2b2c5 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Sun, 25 Feb 2018 00:31:14 +0000 Subject: [PATCH] debian: sync with 4.21-1 package Versioned dependency on debhelper is not updated for backwards compatibility. * debian/changelog.in: Fix ancient changelog entries. * debian/control (Build-Depends): Add dependency on libbluetooth-dev. (Standards-Version): Update to 4.1.3. (Vcs-Git, Vcs-Browser): Move from alioth to salsa.d.o. (strace, strace-udeb) : Change to linux-any. (strace64, strace-udeb) : Change to optional. * debian/rules: Use /usr/share/dpkg/architecture.mk instead of manually setting build variables. (configure): New target. (build/Makefile, build-udeb/Makefile, build64/Makefile): Depend on it. (binary-arch): Use build64/strace.1 for strace64 subpackage. * debian/strace.manpages: Add build/ prefix. * debian/strace64.manpages: Add build64/ prefix. --- debian/changelog.in | 9 +++++---- debian/control | 16 ++++++++-------- debian/rules | 16 ++++++++-------- debian/strace.manpages | 4 ++-- debian/strace64.manpages | 2 +- 5 files changed, 24 insertions(+), 23 deletions(-) diff --git a/debian/changelog.in b/debian/changelog.in index ed4d8d46..f9f7c202 100644 --- a/debian/changelog.in +++ b/debian/changelog.in @@ -935,23 +935,24 @@ strace (3.1-4) unstable; urgency=low * Fixed changestemplate - -- Wichert Akkerman , Thu Sep 12 14:59:44 MET DST 1996 + -- Wichert Akkerman Thu, 12 Sep 1996 14:59:44 +0200 strace (3.1-3) unstable; urgency=low * Revamped debian files - -- Wichert Akkerman , Thu Jul 11 20:19:11 MET DST 1996 + -- Wichert Akkerman Thu, 11 Jul 1996 20:19:11 +0200 strace (3.1-2) unstable; urgency=low + * Added some #ifdef's around IPX stuff to make it compilable on non-Linux systems. * changed debian.control and debian.rules to conform to new debian naming schemes * added architecture-option to debian.rules and debian.control - -- Wichert Akkerman + -- Wichert Akkerman Thu, 1 Jul 1996 00:00:00 +0000 strace (3.1-1) unstable; urgency=low @@ -964,4 +965,4 @@ strace (3.1-1) unstable; urgency=low * added IP, IPX and TCP support to get-/setsockopt() * added IPX support - -- Wichert Akkerman + -- Wichert Akkerman Thu, 1 Jun 1996 00:00:00 +0000 diff --git a/debian/control b/debian/control index 477b9d98..3caffd18 100644 --- a/debian/control +++ b/debian/control @@ -2,14 +2,14 @@ Source: strace Maintainer: Steve McIntyre <93sam@debian.org> Section: utils Priority: optional -Build-Depends: libc6-dev (>= 2.2.2) [!alpha !ia64], libc6.1-dev (>= 2.2.2) [alpha ia64], gcc-multilib [amd64 i386 powerpc ppc64 s390 sparc sparc64 x32], debhelper (>= 7.0.0), gawk, libunwind-dev [amd64], libiberty-dev [amd64] -Standards-Version: 3.9.8 +Build-Depends: libc6-dev (>= 2.2.2) [!alpha !ia64], libc6.1-dev (>= 2.2.2) [alpha ia64], gcc-multilib [amd64 i386 powerpc ppc64 s390 sparc sparc64 x32], debhelper (>= 7.0.0), gawk, libunwind-dev [amd64], libiberty-dev [amd64], libbluetooth-dev +Standards-Version: 4.1.3 Homepage: https://strace.io -Vcs-Git: https://anonscm.debian.org/git/collab-maint/strace.git -Vcs-Browser: https://anonscm.debian.org/git/collab-maint/strace.git +Vcs-Git: https://salsa.debian.org/debian/strace.git +Vcs-Browser: https://salsa.debian.org/debian/strace Package: strace -Architecture: alpha amd64 arm64 armeb armel armhf hppa i386 ia64 m68k mips mipsel mips64 mips64el or1k powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32 +Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends} Description: System call tracer strace is a system call tracer, i.e. a debugging tool which prints out @@ -23,7 +23,7 @@ Description: System call tracer Package: strace64 Architecture: i386 powerpc s390 sparc -Priority: extra +Priority: optional Depends: ${shlibs:Depends}, ${misc:Depends} Description: System call tracer for 64bit binaries strace is a system call tracer, i.e. a debugging tool which prints out @@ -41,8 +41,8 @@ Description: System call tracer for 64bit binaries Package: strace-udeb Section: debian-installer XC-Package-Type: udeb -Priority: extra -Architecture: alpha amd64 arm64 armeb armel armhf hppa i386 ia64 m68k mips mipsel mips64 mips64el or1k powerpc powerpcspe ppc64 ppc64el s390 sh4 sparc sparc64 x32 +Priority: optional +Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends} Description: System call tracer strace is a system call tracer, i.e. a debugging tool which prints out diff --git a/debian/rules b/debian/rules index 2ba864bf..f335fedf 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk +include /usr/share/dpkg/architecture.mk CFLAGS += -Wall -g @@ -19,10 +20,6 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) MAKEFLAGS += -j$(NUMJOBS) endif -DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) - extra_build_targets += build-udeb-stamp arch64_map = i386=x86_64 powerpc=powerpc64 sparc=sparc64 s390=s390x @@ -46,6 +43,9 @@ build: build-arch build-indep build-arch: build-stamp $(extra_build_targets) build-indep: build-stamp $(extra_build_targets) +configure: + ./bootstrap + %-stamp: %/Makefile $(MAKE) -C $* ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) @@ -54,16 +54,16 @@ ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) endif touch $@ -build/Makefile: +build/Makefile: configure mkdir -p $(@D) cd $(@D); sh ../configure --enable-mpers=check --prefix=/usr $(CONFIG_OPTS) -build-udeb/Makefile: +build-udeb/Makefile: configure mkdir -p $(@D) cd $(@D); sh ../configure --enable-mpers=check --prefix=/usr \ --without-libunwind --without-libiberty $(CONFIG_OPTS) -build64/Makefile: +build64/Makefile: configure mkdir -p $(@D) cd $(@D); CC="$(CC64)" sh ../configure --enable-mpers=check --prefix=/usr --build=$(DEB_BUILD_GNU_TYPE) --host=$(HOST64) @@ -82,7 +82,7 @@ binary-arch: build # prepare 64bit executable and manpage, if it has been built test -f build64-stamp && ( mv build64/strace build64/strace64 ; \ - cp strace.1 strace64.1 ) || true + mv build64/strace.1 build64/strace64.1 ) || true dh_testdir -a dh_testroot -a diff --git a/debian/strace.manpages b/debian/strace.manpages index d3b94482..9fb376b3 100644 --- a/debian/strace.manpages +++ b/debian/strace.manpages @@ -1,2 +1,2 @@ -strace.1 -strace-log-merge.1 +build/strace.1 +build/strace-log-merge.1 diff --git a/debian/strace64.manpages b/debian/strace64.manpages index e3adc937..fb5fb240 100644 --- a/debian/strace64.manpages +++ b/debian/strace64.manpages @@ -1 +1 @@ -strace64.1 +build64/strace64.1 -- 2.40.0