[SCM] Debian MIG packaging branch, master, updated. svn/end-25-g2363fee

[Guillem Jover]

The following commit has been merged in the master branch:
commit 649e116eeced3696a0f11a9d77ec66c856200d1f
Author: Guillem Jover <address@hidden>
Date:   Sat Jun 30 17:50:56 2012 +0200

    Fix a format string build failure due to hardened build flags
    
    Add bison to Build-Depends as the patch touches parser.y.

diff --git a/debian/changelog b/debian/changelog
index d8bc900..d464d09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ mig (1.3.1.99-3) UNRELEASED; urgency=low
     install-arch in debian/rules.
   * Pass CFLAGS correctly to $(MAKE), instead of passing them as CCOPTIONS.
   * Use dpkg-buildflags to set CPPFLAGS, CFLAGS and LDFLAGS.
+  * Fix a format string build failure in error() function. Add bison to
+    Build-Depends as the patch touches parser.y.
 
   [ Samuel Thibault ]
   * Add Multi-Arch: foreign to allow installing the 32bit version on a 64bit
diff --git a/debian/control b/debian/control
index 8c9e781..a181b63 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Guillem Jover <address@hidden>,
 Homepage: http://www.gnu.org/software/hurd/mig.html
 Vcs-Browser: http://git.debian.org/?p=pkg-hurd/mig.git
 Vcs-Git: git://git.debian.org/pkg-hurd/mig.git
-Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 7), gnumach-dev, flex
+Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 7), gnumach-dev, flex, bison
 Standards-Version: 3.9.3
 
 Package: mig
diff --git a/debian/patches/format-string.patch 
b/debian/patches/format-string.patch
new file mode 100644
index 0000000..df7974a
--- /dev/null
+++ b/debian/patches/format-string.patch
@@ -0,0 +1,15 @@
+---
+ parser.y |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/parser.y
++++ b/parser.y
+@@ -131,7 +131,7 @@ static const char *import_name(statement
+ void
+ yyerror(const char *s)
+ {
+-    error(s);
++    error("%s", s);
+ }
+ %}
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 5ec11df..9334ed6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+format-string.patch
 no_dealloc_ool.patch

-- 
Debian MIG packaging