[ethtool] 19/20: Update packaging for 4.5

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository ethtool.

commit 949b3826452fe9303f2659e03f64fe433eea4a68
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Mar 14 11:13:41 2016 +0000

    Update packaging for 4.5
    
    Drop patches that have been included upstream
---
 debian/changelog                                   |  6 ++++
 ...-function-declarations-when-building-test.patch | 41 ----------------------
 .../fix-return-type-of-test_free-prorotype.patch   | 27 --------------
 debian/patches/series                              |  2 --
 4 files changed, 6 insertions(+), 70 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f681ce8..4e5202b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ethtool (1:4.5-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Mon, 14 Mar 2016 11:12:27 +0000
+
 ethtool (1:4.2-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/fix-missing-function-declarations-when-building-test.patch b/debian/patches/fix-missing-function-declarations-when-building-test.patch
deleted file mode 100644
index d660058..0000000
--- a/debian/patches/fix-missing-function-declarations-when-building-test.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Ben Hutchings <ben at decadent.org.uk>
-Date: Fri, 9 Oct 2015 03:59:30 +0100
-Subject: [PATCH ethtool 1/2] Fix missing function declarations when building
- tests
-Origin: https://git.kernel.org/cgit/network/ethtool/ethtool.git/commit/?id=0732e9a7b30af903793c313eef4bd93cdad51099
-
-Fix these compiler warnings by declaring test_exit() and test_main()
-regardless of whether TEST_NO_WRAPPERS is defined:
-
-test-cmdline.c: In function ‘send_ioctl’:
-test-cmdline.c:268:2: warning: implicit declaration of function ‘test_exit’ [-Wimplicit-function-declaration]
-  test_exit(0);
-  ^
-test-common.c: In function ‘test_cmdline’:
-test-common.c:361:21: warning: implicit declaration of function ‘test_main’ [-Wimplicit-function-declaration]
-  rc = rc ? rc - 1 : test_main(argc, argv);
-                     ^
-
-Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
----
- internal.h | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/internal.h b/internal.h
-index 444810d..156770c 100644
---- a/internal.h
-+++ b/internal.h
-@@ -132,10 +132,11 @@ struct cmd_expect {
- int test_ioctl(const struct cmd_expect *expect, void *cmd);
- #define TEST_IOCTL_MISMATCH (-2)
- 
--#ifndef TEST_NO_WRAPPERS
- int test_main(int argc, char **argp);
--#define main(...) test_main(__VA_ARGS__)
- void test_exit(int rc) __attribute__((noreturn));
-+
-+#ifndef TEST_NO_WRAPPERS
-+#define main(...) test_main(__VA_ARGS__)
- #undef exit
- #define exit(rc) test_exit(rc)
- void *test_malloc(size_t size);
diff --git a/debian/patches/fix-return-type-of-test_free-prorotype.patch b/debian/patches/fix-return-type-of-test_free-prorotype.patch
deleted file mode 100644
index 0cdd9b3..0000000
--- a/debian/patches/fix-return-type-of-test_free-prorotype.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Ben Hutchings <ben at decadent.org.uk>
-Date: Fri, 9 Oct 2015 04:01:18 +0100
-Subject: [PATCH ethtool 2/2] Fix return type of test_free() prorotype
-Bug-Debian: https://bugs.debian.org/747959
-Origin: https://git.kernel.org/cgit/network/ethtool/ethtool.git/commit/?id=89a949e67102cf5ea8e906b24850816cae946397
-
-The return type should be void, consistent with the definition and
-with the standard free() function.
-
-Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
----
- internal.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/internal.h b/internal.h
-index 156770c..b5ef646 100644
---- a/internal.h
-+++ b/internal.h
-@@ -148,7 +148,7 @@ void *test_calloc(size_t nmemb, size_t size);
- char *test_strdup(const char *s);
- #undef strdup
- #define strdup(s) test_strdup(s)
--void *test_free(void *ptr);
-+void test_free(void *ptr);
- #undef free
- #define free(ptr) test_free(ptr)
- void *test_realloc(void *ptr, size_t size);
diff --git a/debian/patches/series b/debian/patches/series
index 5abb24c..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-fix-missing-function-declarations-when-building-test.patch
-fix-return-type-of-test_free-prorotype.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/ethtool.git