[Pkg-sysvinit-devel] Bug#777914: NMU diff

[Adam Borowski]

Hi!
As this FTBFS rots with a patch for almost a year, I'm hereby uploading a
NMU.  Debdiff attached.


Meow!
-- 
A tit a day keeps the vet away.
-------------- next part --------------
diff -Nru insserv-1.14.0/debian/changelog insserv-1.14.0/debian/changelog
--- insserv-1.14.0/debian/changelog	2012-11-18 02:58:04.000000000 +0100
+++ insserv-1.14.0/debian/changelog	2016-01-26 13:52:43.000000000 +0100
@@ -1,3 +1,12 @@
+insserv (1.14.0-5.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS with gcc-5, using Mohit Bhakkad's version of the patch that
+    handles clang as well. (Closes: #777914)
+  * Remove DM-Upload-Allowed.
+
+ -- Adam Borowski <kilobyte at angband.pl>  Tue, 26 Jan 2016 13:52:27 +0100
+
 insserv (1.14.0-5) unstable; urgency=low
 
   * Add +mountall-bootclean to $local_fs virtual facility definition in
diff -Nru insserv-1.14.0/debian/control insserv-1.14.0/debian/control
--- insserv-1.14.0/debian/control	2012-04-09 13:25:37.000000000 +0200
+++ insserv-1.14.0/debian/control	2016-01-26 13:48:25.000000000 +0100
@@ -5,7 +5,6 @@
 Uploaders: Kel Modderman <kel at otaku42.de>
 Build-Depends: debhelper (>= 8), po-debconf, bash-completion
 Standards-Version: 3.9.3
-DM-Upload-Allowed: yes
 Homepage: http://savannah.nongnu.org/projects/sysvinit
 Vcs-Svn: svn://svn.debian.org/initscripts-ng/trunk/src/insserv
 Vcs-Browser: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/
diff -Nru insserv-1.14.0/debian/patches/170_undeclared_extension.patch insserv-1.14.0/debian/patches/170_undeclared_extension.patch
--- insserv-1.14.0/debian/patches/170_undeclared_extension.patch	1970-01-01 01:00:00.000000000 +0100
+++ insserv-1.14.0/debian/patches/170_undeclared_extension.patch	2016-01-26 13:46:58.000000000 +0100
@@ -0,0 +1,19 @@
+Description: fix FTBFS with gcc-5 and clang.
+Author: Mohit Bhakkad <mohit.bhakkad at gmail.com>
+Bug-Debian: https://bugs.debian.org/777914
+
+--- insserv-1.14.0.orig/listing.h
++++ insserv-1.14.0/listing.h
+@@ -47,9 +47,9 @@ typedef unsigned int uint;
+ # ifndef  asm
+ #  define asm			__asm__
+ # endif
+-# ifndef  extension
+-#  define extension		__extension__
+-# endif
++#endif
++#ifndef  extension
++# define extension             __extension__
+ #endif
+ #ifndef  attribute
+ # define attribute(attr)	__attribute__(attr)
diff -Nru insserv-1.14.0/debian/patches/series insserv-1.14.0/debian/patches/series
--- insserv-1.14.0/debian/patches/series	2012-07-05 13:07:28.000000000 +0200
+++ insserv-1.14.0/debian/patches/series	2016-01-26 13:46:22.000000000 +0100
@@ -10,3 +10,4 @@
 140_debian_test_suite.patch
 150_core_string_test.patch
 160_manual_page_update.patch
+170_undeclared_extension.patch