debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Merge changes from sid up 3.10-4 

svn path=/dists/trunk/linux-tools/; revision=20720
This commit is contained in:
Ben Hutchings 2013-10-19 00:13:33 +00:00
parent 2dc5dfb9f5 b26b7ec848
commit 2ea8e5867c
3 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
debian/build/scripts/mod/modpost.c vendored
View File

@ -1,4 +1,5 @@
#include <elf.h>
#include <errno.h>
#include <getopt.h>
#include <stdio.h>
#include <stdlib.h>
@ -57,8 +58,16 @@ int main (int argc, char *argv[])
}
if (getline (&name, &name_len, file) < 0)
{
fprintf (stderr, "Can't read \"%s\"\n", list_name);
return EXIT_FAILURE;
if (errno)
{
fprintf (stderr, "Can't read \"%s\"\n", list_name);
return EXIT_FAILURE;
}
else
{
/* Empty list */
return EXIT_SUCCESS;
}
}
if (!is_stdin)
fclose(file);
@ -80,6 +89,7 @@ int main (int argc, char *argv[])
}
else
{
/* Empty list */
return EXIT_SUCCESS;
}

13
debian/changelog vendored
View File

@ -8,6 +8,19 @@ linux-tools (3.11~rc4-1~exp1) experimental; urgency=low
-- Ben Hutchings <ben@decadent.org.uk> Thu, 08 Aug 2013 16:21:00 +0200
linux-tools (3.10-4) unstable; urgency=low
* Sourceful upload for the perl 5.18 transition
* usbip: Fix package version override to be binNMU-safe
-- Ben Hutchings <ben@decadent.org.uk> Fri, 30 Aug 2013 12:44:56 +0100
linux-tools (3.10-3) unstable; urgency=low
* linux-kbuild: Fix no-modules case in modpost wrapper (Closes: #719129)
-- Ben Hutchings <ben@decadent.org.uk> Thu, 08 Aug 2013 21:49:02 +0200
linux-tools (3.10-2) unstable; urgency=low
* linux-kbuild: Fix use of getline() in modpost wrapper (Closes: #717195)

8
debian/rules.real vendored
View File

@ -4,6 +4,10 @@ include debian/rules.defs
DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
# VERSION_DEBIAN is the package source version; VERSION_DEBIAN_FULL
# includes any binNMU part.
VERSION_DEBIAN_FULL := $(shell dpkg-parsechangelog | sed -ne 's,^Version: *\(.*\)$$,\1,p')
binary-arch: install-kbuild install-usbip
ifneq ($(filter alpha amd64 armel armhf hppa i386 powerpc ppc64 s390 s390x sh4 sparc sparc64,$(DEB_BUILD_ARCH)),)
binary-arch: install-tools
@ -74,7 +78,7 @@ install-usbip: $(STAMPS_DIR)/build
dh_fixperms
dh_installdeb
dh_shlibdeps
test -n "$(VERSION)" -a -n "$(VERSION_DEBIAN)"
dh_gencontrol -- -v$(VERSION)+$(VERSION_DEBIAN)
test -n "$(VERSION)" -a -n "$(VERSION_DEBIAN_FULL)"
dh_gencontrol -- -v$(VERSION)+$(VERSION_DEBIAN_FULL)
dh_md5sums
dh_builddeb