[SCM] Packaging for ASEPRITE branch, master, updated. debian/0.9.5-1-2-gbbed81c

[Tobias Hansen]

The following commit has been merged in the master branch:
commit 05d4da318a3128bf4186be652634c437dabb6754
Author: Tobias Hansen <tobias.han at gmx.de>
Date:   Wed Oct 3 17:59:05 2012 +0200

    Undef major and minor macros on alternative kernels.

diff --git a/debian/patches/series b/debian/patches/series
index 37ebaba..5e12f5b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 find-static-gtest.patch
 disable-file-unittest.patch
+undef-major-and-minor.patch
diff --git a/debian/patches/undef-major-and-minor.patch b/debian/patches/undef-major-and-minor.patch
new file mode 100644
index 0000000..81d3342
--- /dev/null
+++ b/debian/patches/undef-major-and-minor.patch
@@ -0,0 +1,20 @@
+Description: Undef major and minor in version.h+
+ These are macros on kfreebsd and Hurd and cause a FTBFS.
+Author: Tobias Hansen <thansen at debian.org>
+
+--- a/src/base/version.h
++++ b/src/base/version.h
+@@ -7,6 +7,13 @@
+ #ifndef BASE_VERSION_H_INCLUDED
+ #define BASE_VERSION_H_INCLUDED
+ 
++#ifdef major
++#undef major
++#endif
++#ifdef minor
++#undef minor
++#endif
++
+ #include <string>
+ #include <vector>
+ 

-- 
Packaging for ASEPRITE