Control: tags 798789 + patch

Dear maintainer,

I've prepared a patch for netperf (versioned as 2.6.0-2.1) which
fixes the FTBFS.

Best regards,
Sascha

diff -Nru netperf-2.6.0/debian/changelog netperf-2.6.0/debian/changelog
--- netperf-2.6.0/debian/changelog      2013-05-08 21:13:43.000000000 +0000
+++ netperf-2.6.0/debian/changelog      2016-04-05 10:02:33.000000000 +0000
@@ -1,3 +1,10 @@
+netperf (2.6.0-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Adjust inline statements to fix FTBFS (Closes: #798789)
+
+ -- Sascha Steinbiss <sas...@steinbiss.name>  Tue, 05 Apr 2016 10:02:00 +0000
+
 netperf (2.6.0-2) unstable; urgency=low
 
   * [cbaabea7] [rules] removed explicit call of patchsys-quilt.mk
diff -Nru netperf-2.6.0/debian/patches/11_inline_statement.patch 
netperf-2.6.0/debian/patches/11_inline_statement.patch
--- netperf-2.6.0/debian/patches/11_inline_statement.patch      1970-01-01 
00:00:00.000000000 +0000
+++ netperf-2.6.0/debian/patches/11_inline_statement.patch      2016-04-05 
10:02:58.000000000 +0000
@@ -0,0 +1,25 @@
+Description: move around inline statement
+Author: Sascha Steinbiss <sas...@steinbiss.name>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=798789
+--- a/src/netlib.c
++++ b/src/netlib.c
+@@ -4026,7 +4026,7 @@
+    inline directive has to appear in netlib.h... */
+ void demo_interval_tick(uint32_t units)
+ #else
+-  inline void demo_interval_tick(uint32_t units)
++  void demo_interval_tick(uint32_t units)
+ #endif
+ {
+   double actual_interval = 0.0;
+--- a/src/netlib.h
++++ b/src/netlib.h
+@@ -504,7 +504,7 @@
+ extern void   demo_rr_interval(uint32_t units);
+ extern void   demo_rr_setup(uint32_t units);
+ extern void   demo_stream_interval(uint32_t units);
+-extern void   demo_interval_tick(uint32_t units);
++extern inline void   demo_interval_tick(uint32_t units);
+ extern void   demo_interval_final();
+ #endif
+ #endif 
diff -Nru netperf-2.6.0/debian/patches/series 
netperf-2.6.0/debian/patches/series
--- netperf-2.6.0/debian/patches/series 2013-05-08 21:13:43.000000000 +0000
+++ netperf-2.6.0/debian/patches/series 2016-04-05 10:03:06.000000000 +0000
@@ -1,2 +1,3 @@
 20_fix_debug_file_location.diff
 10_man_fix_unknown_macro.diff
+11_inline_statement.patch

Reply via email to