[texmaker] 52/103: Upstream has applied gcc4.6 patch

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository texmaker.

commit f858fc181516d0318bce01ab149baaccc3344810
Author: Andreas Tille <tille at debian.org>
Date:   Thu Nov 10 12:52:39 2011 +0000

    Upstream has applied gcc4.6 patch
---
 debian/changelog                |  6 ++++++
 debian/patches/20_gcc_4.6.patch | 19 -------------------
 debian/patches/series           |  1 -
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fccba47..7dacb35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+texmaker (3.1-2) UNRELEASED; urgency=low
+
+  * debian/patches/20_gcc_4.6.patch: Patch applied upstream
+
+ -- Andreas Tille <tille at debian.org>  Thu, 10 Nov 2011 13:46:03 +0100
+
 texmaker (3.1-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/patches/20_gcc_4.6.patch b/debian/patches/20_gcc_4.6.patch
deleted file mode 100644
index ca4b924..0000000
--- a/debian/patches/20_gcc_4.6.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Fix FTBFS with GCC 4.6
- Include <cstddef> in htypes.hxx; otherwise the build fails with GCC 4.6
- due to the missing definition of offsetof.
-Origin: Ubuntu
-Author: Maia Kozheva <sikon at ubuntu.com>
-Bug-Debian: http://bugs.debian.org/624611
-Last-Update: 2011-04-30
----
---- texmaker-3.1.orig/hunspell/htypes.hxx
-+++ texmaker-3.1/hunspell/htypes.hxx
-@@ -1,6 +1,8 @@
- #ifndef _HTYPES_HXX_
- #define _HTYPES_HXX_
- 
-+#include <cstddef>
-+
- #define ROTATE_LEN   5
- 
- #define ROTATE(v,q) \
diff --git a/debian/patches/series b/debian/patches/series
index f62e8f6..f67d265 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 10_spelling_dict.patch
-20_gcc_4.6.patch
 20_spelling_default_dict.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/texmaker.git