r38466 - in /packages/texmaker/trunk/debian: changelog control patches/20_gcc_4.6.patch patches/series rules

[tille at users.alioth.debian.org]

Author: tille
Date: Sat Apr 30 08:25:07 2011
New Revision: 38466

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38466
Log:
New upstream version + fix FTBFS with gcc-4.6

Added:
    packages/texmaker/trunk/debian/patches/20_gcc_4.6.patch
Modified:
    packages/texmaker/trunk/debian/changelog
    packages/texmaker/trunk/debian/control
    packages/texmaker/trunk/debian/patches/series
    packages/texmaker/trunk/debian/rules

Modified: packages/texmaker/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/texmaker/trunk/debian/changelog?rev=38466&op=diff
==============================================================================
--- packages/texmaker/trunk/debian/changelog (original)
+++ packages/texmaker/trunk/debian/changelog Sat Apr 30 08:25:07 2011
@@ -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

Modified: packages/texmaker/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/texmaker/trunk/debian/control?rev=38466&op=diff
==============================================================================
--- packages/texmaker/trunk/debian/control (original)
+++ packages/texmaker/trunk/debian/control Sat Apr 30 08:25:07 2011
@@ -7,7 +7,7 @@
  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/

Added: packages/texmaker/trunk/debian/patches/20_gcc_4.6.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/texmaker/trunk/debian/patches/20_gcc_4.6.patch?rev=38466&op=file
==============================================================================
--- packages/texmaker/trunk/debian/patches/20_gcc_4.6.patch (added)
+++ packages/texmaker/trunk/debian/patches/20_gcc_4.6.patch Sat Apr 30 08:25:07 2011
@@ -1,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) \

Modified: packages/texmaker/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/texmaker/trunk/debian/patches/series?rev=38466&op=diff
==============================================================================
--- packages/texmaker/trunk/debian/patches/series (original)
+++ packages/texmaker/trunk/debian/patches/series Sat Apr 30 08:25:07 2011
@@ -1,1 +1,2 @@
 10_spelling_dict.patch
+20_gcc_4.6.patch

Modified: packages/texmaker/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/texmaker/trunk/debian/rules?rev=38466&op=diff
==============================================================================
--- packages/texmaker/trunk/debian/rules (original)
+++ packages/texmaker/trunk/debian/rules Sat Apr 30 08:25:07 2011
@@ -27,3 +27,10 @@
 	    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