2008-07-09 Frederik Schüler <fs@debian.org>

* debian/rules: Remove the broken udeb creation routines, and redo the
	complete install procedure using debhelper.
	* debian/strace.docs: New file, list for dh_installdocs.
	* debian/strace.examples: New file, list for dh_installexamples.
	* debian/strace.install: New file, list for dh_install.
	* debian/strace-udeb.install: New file, list for dh_install.
	* debian/strace.manpages : New file, list for dh_installmanpages.
	* debian/copyright: Update.
	* debian/control: Fix libc6 build dependency for alpha and ia64.
	(strace-udeb: XC-Package-Type): Add header.
This commit is contained in:
Roland McGrath 2008-07-18 00:49:31 +00:00
parent 812376ab1f
commit 9a001a75f9
7 changed files with 37 additions and 58 deletions

3
debian/control vendored
View File

@ -3,7 +3,7 @@ Section: utils
Priority: standard Priority: standard
Maintainer: Roland McGrath <frob@debian.org> Maintainer: Roland McGrath <frob@debian.org>
Uploaders: Frederik Schüler <fs@debian.org> Uploaders: Frederik Schüler <fs@debian.org>
Build-Depends: libc6-dev (>= 2.2.2-1) [!alpha !ia64], libc6.1-dev (>= 2.2.2-1) [alpha ia64], gcc-multilib [i386 powerpc s390 sparc], debhelper (>= 5.0.0) Build-Depends: libc6-dev (>= 2.2.2) [!alpha !ia64], libc6.1-dev (>= 2.2.2) [alpha ia64], gcc-multilib [i386 powerpc s390 sparc], debhelper (>= 5.0.0)
Standards-Version: 3.8.0 Standards-Version: 3.8.0
Homepage: http://sourceforge.net/projects/strace/ Homepage: http://sourceforge.net/projects/strace/
@ -22,6 +22,7 @@ Description: A system call tracer
Package: strace-udeb Package: strace-udeb
Section: debian-installer Section: debian-installer
XC-Package-Type: udeb
Priority: extra Priority: extra
Architecture: alpha amd64 arm armeb armel hppa i386 ia64 m68k mips mipsel powerpc ppc64 s390 sh sparc Architecture: alpha amd64 arm armeb armel hppa i386 ia64 m68k mips mipsel powerpc ppc64 s390 sh sparc
Depends: ${shlibs:Depends} Depends: ${shlibs:Depends}

7
debian/copyright vendored
View File

@ -1,7 +1,7 @@
This is the Debian packaged version of strace. For a complete list of This is the Debian packaged version of strace. For a complete list of
changes from the upstream version please see the changelog. changes from the upstream version please see the changelog.
The upstream sources can be found at http://www.liacs.nl/~wichert/strace/ The upstream sources can be found at http://sourceforge.net/projects/strace/
This is the copyright as found in the upstream sources: This is the copyright as found in the upstream sources:
@ -10,7 +10,10 @@ Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
Copyright (c) 1993 Ulrich Pegelow <pegelow@moorea.uni-muenster.de> Copyright (c) 1993 Ulrich Pegelow <pegelow@moorea.uni-muenster.de>
Copyright (c) 1995, 1996 Michael Elizabeth Chastain <mec@duracef.shout.net> Copyright (c) 1995, 1996 Michael Elizabeth Chastain <mec@duracef.shout.net>
Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com> Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
Copyright (C) 1998-2001 Wichert Akkerman <wakkerma@deephackmode.org> Copyright (C) 1998-2003 Wichert Akkerman <wakkerma@deephackmode.org>
Copyright (c) 2002-2008 Roland McGrath <roland@redhat.com>
Copyright (c) 2003-2008 Dmitry V. Levin <ldv@altlinux.org>
Copyright (c) 2007-2008 Jan Kratochvil <jan.kratochvil@redhat.com>
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without

80
debian/rules vendored
View File

@ -1,15 +1,11 @@
#! /usr/bin/make -f #! /usr/bin/make -f
# Debian package information #export DH_VERBOSE=1
package = strace
DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
VERSION := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }')
UDEB := strace-udeb_$(VERSION)_$(DEB_HOST_ARCH).udeb
arch64_map = i386=x86_64 powerpc=powerpc64 sparc=sparc64 s390=s390x arch64_map = i386=x86_64 powerpc=powerpc64 sparc=sparc64 s390=s390x
ifneq (,$(filter $(DEB_HOST_ARCH)=%, $(arch64_map))) ifneq (,$(filter $(DEB_HOST_ARCH)=%, $(arch64_map)))
HOST64 = $(strip $(patsubst $(DEB_HOST_ARCH)=%, %, \ HOST64 = $(strip $(patsubst $(DEB_HOST_ARCH)=%, %, \
@ -40,7 +36,7 @@ build64/Makefile:
clean: clean:
dh_clean dh_clean
rm -rf debian/$(package) debian/substvars debian/files debian/files~ rm -rf debian/strace debian/strace-udeb debian/substvars debian/files debian/files~
rm -rf build64 stamp-build64 rm -rf build64 stamp-build64
rm -rf build stamp-build rm -rf build stamp-build
@ -50,55 +46,29 @@ binary-indep:
binary-arch: build checkroot binary-arch: build checkroot
test -f stamp-build || make $(MFLAGS) -f debian/rules build test -f stamp-build || make $(MFLAGS) -f debian/rules build
-rm -rf debian/$(package) debian/files debian/substvars dh_testdir -a
dh_testroot -a
install -d -m 755 -o root -g root debian/$(package) dh_installdirs -a
# reset the mode to work around a bug in install dh_installdocs -a
chmod 755 debian/$(package) dh_installman -a
install -d -m 755 -o root -g root debian/$(package)/DEBIAN dh_installexamples -a
dh_installchangelogs ChangeLog
# Install strace dh_install -a
install -d -o root -g root -m 755 debian/$(package)/usr/bin # install 64bit executable and manpage if it has been built
install -o root -g root -m 755 build/strace \ if test -f stamp-build64; then \
debian/$(package)/usr/bin/strace mv build64/strace build64/strace64 ; \
dh_strip dh_install build64/strace64 usr/bin ; \
dh_link usr/share/man/man1/strace.1 usr/share/man/man1/strace64.1; \
dpkg-gencontrol -is -pstrace-udeb -fdebian/files~ -Pdebian/$(package) else : ; fi
dh_md5sums dh_link -a
dpkg-deb --build debian/$(package) ../$(UDEB) dh_strip -a
dpkg-distaddfile $(UDEB) debian-installer extra dh_compress -a
dh_fixperms -a
# Install documentation dh_installdeb -a
install -d -o root -g root -m 755 \ dh_shlibdeps -a
debian/$(package)/usr/share/doc/$(package) dh_gencontrol -a
install -d -o root -g root -m 755 debian/$(package)/usr/share/man/man1 dh_md5sums -a
install -p -o root -g root -m 644 debian/changelog \ dh_builddeb -a
debian/$(package)/usr/share/doc/$(package)/changelog.Debian
install -p -o root -g root -m 644 TODO \
debian/$(package)/usr/share/doc/$(package)/TODO
install -p -o root -g root -m 644 NEWS \
debian/$(package)/usr/share/doc/$(package)/changelog
gzip -9 debian/$(package)/usr/share/doc/$(package)/*
install -p -o root -g root -m 644 debian/copyright \
debian/$(package)/usr/share/doc/$(package)/copyright
install -p -o root -g root -m 644 strace.1 \
debian/$(package)/usr/share/man/man1/strace.1
gzip -9 debian/$(package)/usr/share/man/man1/strace.1
install -d -o root -g root -m 755 \
debian/$(package)/usr/share/doc/$(package)/examples
install -p -o root -g root -m 755 strace-graph \
debian/$(package)/usr/share/doc/$(package)/examples
ifneq (,$(HOST64))
install -o root -g root -m 755 build64/strace debian/$(package)/usr/bin/strace64
ln -s strace.1.gz debian/$(package)/usr/share/man/man1/strace64.1.gz
dh_strip
endif
dpkg-shlibdeps build/strace $(patsubst yes,build64/strace,$(build64))
dpkg-gencontrol -is -pstrace -Pdebian/$(package)
dpkg-deb --build debian/$(package) ..
checkroot: checkroot:
test root = "`whoami`" test root = "`whoami`"

2
debian/strace.docs vendored Normal file
View File

@ -0,0 +1,2 @@
TODO
NEWS

1
debian/strace.examples vendored Normal file
View File

@ -0,0 +1 @@
strace-graph

1
debian/strace.install vendored Normal file
View File

@ -0,0 +1 @@
build/strace usr/bin

1
debian/strace.manpages vendored Normal file
View File

@ -0,0 +1 @@
strace.1