glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

debian: sync with 4.21-1 package

Browse Source 
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) <Architecture>: Change to linux-any.
(strace64, strace-udeb) <Priority>: 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.
This commit is contained in:
Дмитрий Левин 2018-02-25 00:31:14 +00:00
parent 3e13994e67
commit 73166c3fd1
5 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
debian/changelog.in vendored
View File

@ -935,23 +935,24 @@ strace (3.1-4) unstable; urgency=low
* Fixed changestemplate * Fixed changestemplate
-- Wichert Akkerman <wakkerma@wi.leidenuniv.nl>, Thu Sep 12 14:59:44 MET DST 1996 -- Wichert Akkerman <wakkerma@wi.leidenuniv.nl> Thu, 12 Sep 1996 14:59:44 +0200
strace (3.1-3) unstable; urgency=low strace (3.1-3) unstable; urgency=low
* Revamped debian files * Revamped debian files
-- Wichert Akkerman <wakkerma@wi.leidenuniv.nl>, Thu Jul 11 20:19:11 MET DST 1996 -- Wichert Akkerman <wakkerma@wi.leidenuniv.nl> Thu, 11 Jul 1996 20:19:11 +0200
strace (3.1-2) unstable; urgency=low strace (3.1-2) unstable; urgency=low
* Added some #ifdef's around IPX stuff to make it compilable on non-Linux * Added some #ifdef's around IPX stuff to make it compilable on non-Linux
systems. systems.
* changed debian.control and debian.rules to conform to new debian naming * changed debian.control and debian.rules to conform to new debian naming
schemes schemes
* added architecture-option to debian.rules and debian.control * added architecture-option to debian.rules and debian.control
-- Wichert Akkerman <wakkerma@wi.leidenuniv.nl> -- Wichert Akkerman <wakkerma@wi.leidenuniv.nl> Thu, 1 Jul 1996 00:00:00 +0000
strace (3.1-1) unstable; urgency=low 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 IP, IPX and TCP support to get-/setsockopt()
* added IPX support * added IPX support
-- Wichert Akkerman <wakkerma@wi.leidenuniv.nl> -- Wichert Akkerman <wakkerma@wi.leidenuniv.nl> Thu, 1 Jun 1996 00:00:00 +0000

16
debian/control vendored
View File

@ -2,14 +2,14 @@ Source: strace
Maintainer: Steve McIntyre <93sam@debian.org> Maintainer: Steve McIntyre <93sam@debian.org>
Section: utils Section: utils
Priority: optional 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] 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: 3.9.8 Standards-Version: 4.1.3
Homepage: https://strace.io Homepage: https://strace.io
Vcs-Git: https://anonscm.debian.org/git/collab-maint/strace.git Vcs-Git: https://salsa.debian.org/debian/strace.git
Vcs-Browser: https://anonscm.debian.org/git/collab-maint/strace.git Vcs-Browser: https://salsa.debian.org/debian/strace
Package: 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} Depends: ${shlibs:Depends}, ${misc:Depends}
Description: System call tracer Description: System call tracer
strace is a system call tracer, i.e. a debugging tool which prints out strace is a system call tracer, i.e. a debugging tool which prints out
@ -23,7 +23,7 @@ Description: System call tracer
Package: strace64 Package: strace64
Architecture: i386 powerpc s390 sparc Architecture: i386 powerpc s390 sparc
Priority: extra Priority: optional
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}
Description: System call tracer for 64bit binaries Description: System call tracer for 64bit binaries
strace is a system call tracer, i.e. a debugging tool which prints out 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 Package: strace-udeb
Section: debian-installer Section: debian-installer
XC-Package-Type: udeb XC-Package-Type: udeb
Priority: extra Priority: optional
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 Architecture: linux-any
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}
Description: System call tracer Description: System call tracer
strace is a system call tracer, i.e. a debugging tool which prints out strace is a system call tracer, i.e. a debugging tool which prints out

16
debian/rules vendored
View File

@ -5,6 +5,7 @@
export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_BUILD_MAINT_OPTIONS = hardening=+all
DPKG_EXPORT_BUILDFLAGS = 1 DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk include /usr/share/dpkg/buildflags.mk
include /usr/share/dpkg/architecture.mk
CFLAGS += -Wall -g CFLAGS += -Wall -g
@ -19,10 +20,6 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS) MAKEFLAGS += -j$(NUMJOBS)
endif 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 extra_build_targets += build-udeb-stamp
arch64_map = i386=x86_64 powerpc=powerpc64 sparc=sparc64 s390=s390x 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-arch: build-stamp $(extra_build_targets)
build-indep: build-stamp $(extra_build_targets) build-indep: build-stamp $(extra_build_targets)
configure:
./bootstrap
%-stamp: %/Makefile %-stamp: %/Makefile
$(MAKE) -C $* $(MAKE) -C $*
ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
@ -54,16 +54,16 @@ ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
endif endif
touch $@ touch $@
build/Makefile: build/Makefile: configure
mkdir -p $(@D) mkdir -p $(@D)
cd $(@D); sh ../configure --enable-mpers=check --prefix=/usr $(CONFIG_OPTS) cd $(@D); sh ../configure --enable-mpers=check --prefix=/usr $(CONFIG_OPTS)
build-udeb/Makefile: build-udeb/Makefile: configure
mkdir -p $(@D) mkdir -p $(@D)
cd $(@D); sh ../configure --enable-mpers=check --prefix=/usr \ cd $(@D); sh ../configure --enable-mpers=check --prefix=/usr \
--without-libunwind --without-libiberty $(CONFIG_OPTS) --without-libunwind --without-libiberty $(CONFIG_OPTS)
build64/Makefile: build64/Makefile: configure
mkdir -p $(@D) mkdir -p $(@D)
cd $(@D); CC="$(CC64)" sh ../configure --enable-mpers=check --prefix=/usr --build=$(DEB_BUILD_GNU_TYPE) --host=$(HOST64) 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 # prepare 64bit executable and manpage, if it has been built
test -f build64-stamp && ( mv build64/strace build64/strace64 ; \ 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_testdir -a
dh_testroot -a dh_testroot -a

4
debian/strace.manpages vendored
View File

@ -1,2 +1,2 @@
strace.1 build/strace.1
strace-log-merge.1 build/strace-log-merge.1

2
debian/strace64.manpages vendored
View File

@ -1 +1 @@
strace64.1 build64/strace64.1