[SCM] maria packaging branch, master, updated. upstream/1.2-22-gc4c33c2

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 40d0ccaa981504f14c05f828a47e4f8a352d1f46
Author: Ralf Treinen <treinen at debian.org>
Date:   Tue May 3 07:13:20 2011 +0200

    Imported Debian patch 1.3.5-3

diff --git a/debian/changelog b/debian/changelog
index 307d7fd..f6e9bc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+maria (1.3.5-3) unstable; urgency=low
+
+  * Patch gcc4.6: add missing #includes to fix FTBFS with gcc4.6
+    (closes: #624926).
+  * Standards-Version 3.9.2 (no change)
+
+ -- Ralf Treinen <treinen at debian.org>  Tue, 03 May 2011 07:13:20 +0200
+
 maria (1.3.5-2) unstable; urgency=low
 
   * debhelper compatibility level 7.
diff --git a/debian/control b/debian/control
index 808f26c..d3b59b4 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ralf Treinen <treinen at debian.org>
 Build-Depends: debhelper (>= 7.0), libreadline-dev, libncurses5-dev, flex, bison
 Build-Depends-Indep: texinfo, texi2html
-Standards-Version: 3.8.3
+Standards-Version: 3.9.2
 Homepage: http://www.tcs.hut.fi/Software/maria/
 
 Package: maria
diff --git a/debian/patches/include-stdlib b/debian/patches/gcc4.6
similarity index 94%
rename from debian/patches/include-stdlib
rename to debian/patches/gcc4.6
index dc1c962..37596bf 100644
--- a/debian/patches/include-stdlib
+++ b/debian/patches/gcc4.6
@@ -1,3 +1,8 @@
+Author: Ralf Treinen <treinen at debian.org>
+Description: Add missing includes of <cstddef>, necessary for compilation
+  with gcc4.6
+Debian-bug: #624926
+
 Index: maria-1.3.5/parser/VariableStackMap.C
 ===================================================================
 --- maria-1.3.5.orig/parser/VariableStackMap.C	2011-05-03 06:41:32.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
index dbf3263..082f952 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 lefty_path
 compile_options
-include-stdlib
+gcc4.6

-- 
maria packaging