[texmaker] 48/103: New upstream version + fix FTBFS with gcc-4.6

[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 bac8fcb0363990273002ea391309be6f1fa7f8e2
Author: Andreas Tille <tille at debian.org>
Date:   Sat Apr 30 08:25:07 2011 +0000

    New upstream version + fix FTBFS with gcc-4.6
---
 debian/changelog                | 13 +++++++++++++
 debian/control                  |  2 +-
 debian/patches/20_gcc_4.6.patch | 19 +++++++++++++++++++
 debian/patches/series           |  1 +
 debian/rules                    |  7 +++++++
 5 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index cdccd9c..e7cd346 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+texmaker (3.0.2-1) unstable; urgency=low
+
+  * New upstream version
+  * Standards-Version: 3.9.2 (no changes needed)
+  * debian/patches/20_gcc_4.6.patch: Fix FTBFS with 4.6 (thanks for the
+    patch to Maia Kozheva <sikon at ubuntu.com>)
+    Closes: #624611
+  * debian/rules: Make sure icons are properly named (thanks for the
+    patch to Maia Kozheva <sikon at ubuntu.com>)
+    Closes: #624613
+
+ -- Andreas Tille <tille at debian.org>  Sat, 30 Apr 2011 08:37:54 +0200
+
 texmaker (3.0-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/control b/debian/control
index ccf9dda..7ee1e00 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Andreas Tille <tille at debian.org>,
  Ruben Molina <rmolina at udea.edu.co>
 Build-Depends: debhelper (>= 8), libqt4-dev (>=4.5.1), libglib2.0-dev, libpoppler-qt4-dev,
  quilt (>= 0.47), libqtwebkit-dev
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/texmaker/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/texmaker/trunk/
 Homepage: http://www.xm1math.net/texmaker/
diff --git a/debian/patches/20_gcc_4.6.patch b/debian/patches/20_gcc_4.6.patch
new file mode 100644
index 0000000..3307856
--- /dev/null
+++ b/debian/patches/20_gcc_4.6.patch
@@ -0,0 +1,19 @@
+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.0.2.orig/hunspell/htypes.hxx
++++ texmaker-3.0.2/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 dc14f3e..89a07ae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 10_spelling_dict.patch
+20_gcc_4.6.patch
diff --git a/debian/rules b/debian/rules
index 3f9d439..4b17556 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,3 +27,10 @@ override_dh_installdocs:
 	    ln -s ../doc/$(pkg)/html/`basename $${docfile}` $(CURDIR)/debian/$(data)/usr/share/$(pkg) ; \
 	done
 
+override_dh_install:
+	dh_install
+	# Rename all hicolor icons to texmaker.png
+	for i in 16 22 32 48 64 128 ; do \
+	    mv $(CURDIR)/debian/$(data)/usr/share/icons/hicolor/$${i}x$${i}/apps/$(pkg)$${i}x$${i}.png \
+	        $(CURDIR)/debian/$(data)/usr/share/icons/hicolor/$${i}x$${i}/apps/$(pkg).png ; \
+	done

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