[texmaker] 72/103: New upstream version (updated patches)

[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 16db78b9808621ca51ca87f26487950e59852c2f
Author: Andreas Tille <tille at debian.org>
Date:   Mon Sep 9 08:13:14 2013 +0000

    New upstream version (updated patches)
---
 debian/changelog                      |  7 +++
 debian/patches/10_spelling_dict.patch |  6 +--
 debian/patches/30-fix-ftbfs-arm.patch | 80 -----------------------------------
 debian/patches/series                 |  1 -
 4 files changed, 10 insertions(+), 84 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 571a3c7..3c5aa43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+texmaker (4.0.4-1) UNRELEASED; urgency=low
+
+  * New upstream version
+    Patch 30-fix-ftbfs-arm.patch is applied upstream
+
+ -- Andreas Tille <tille at debian.org>  Mon, 09 Sep 2013 10:12:21 +0200
+
 texmaker (4.0.3-2) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/patches/10_spelling_dict.patch b/debian/patches/10_spelling_dict.patch
index de70947..0503d5e 100644
--- a/debian/patches/10_spelling_dict.patch
+++ b/debian/patches/10_spelling_dict.patch
@@ -1,9 +1,9 @@
 Author: Andreas Tille <tille at debian.org>
 Purpose: Adapt default search directory for spelling dictionaries to Debian default
 Closes: #591340
---- texmaker-4.0.3.orig/texmaker.pro
-+++ texmaker-4.0.3/texmaker.pro
-@@ -318,6 +318,8 @@
+--- a/texmaker.pro
++++ b/texmaker.pro
+@@ -326,6 +326,8 @@ utilities.path = $${PREFIX}/share/texmak
  desktop.path = $${DESKTOPDIR}
  icon.path = $${ICONDIR}
  
diff --git a/debian/patches/30-fix-ftbfs-arm.patch b/debian/patches/30-fix-ftbfs-arm.patch
deleted file mode 100644
index b33c080..0000000
--- a/debian/patches/30-fix-ftbfs-arm.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Author: Pascal Brachet <pbrachet at xm1math.net>
-Purpose: Fix FTBFS on armel and armhf arches.
---- a/documentview.cpp
-+++ b/documentview.cpp
-@@ -680,12 +680,12 @@
-     {
-         PageItem* page = m_pages.at(m_currentPage - 1);
- 
--        setScaleFactor(qMin(page->scaleFactor() + 0.1, s_maximumScaleFactor));
-+        setScaleFactor(qMin(page->scaleFactor() + 0.1f, s_maximumScaleFactor));
-         setScaleMode(ScaleFactor);
-     }
-     else
-     {
--        setScaleFactor(qMin(scaleFactor() + 0.1, s_maximumScaleFactor));
-+        setScaleFactor(qMin(scaleFactor() + 0.1f, s_maximumScaleFactor));
-     }
- }
- 
-@@ -696,12 +696,12 @@
-     {
-         PageItem* page = m_pages.at(m_currentPage - 1);
- 
--        setScaleFactor(qMax(page->scaleFactor() - 0.1, s_minimumScaleFactor));
-+        setScaleFactor(qMax(page->scaleFactor() - 0.1f, s_minimumScaleFactor));
-         setScaleMode(ScaleFactor);
-     }
-     else
-     {
--        setScaleFactor(qMax(scaleFactor() - 0.1, s_minimumScaleFactor));
-+        setScaleFactor(qMax(scaleFactor() - 0.1f, s_minimumScaleFactor));
-     }
- }
- 
-@@ -1352,7 +1352,7 @@
- 
-                 pageHeight = boundingRect.height();
- 
--                left = qMin(left, -boundingRect.width() - 1.5 * s_pageSpacing);
-+                left = qMin(left, -boundingRect.width() - 1.5f * s_pageSpacing);
-             }
-             else
-             {
-@@ -1360,7 +1360,7 @@
- 
-                 pageHeight = qMax(pageHeight, boundingRect.height());
- 
--                right = qMax(right, boundingRect.width() + 1.5 * s_pageSpacing);
-+                right = qMax(right, boundingRect.width() + 1.5f * s_pageSpacing);
-                 height += pageHeight + s_pageSpacing;
-             }
-         }
-@@ -1372,15 +1372,15 @@
- 
-             pageHeight = boundingRect.height();
- 
--            left = qMin(left, -0.5 * boundingRect.width() - s_pageSpacing);
--            right = qMax(right, 0.5 * boundingRect.width() + s_pageSpacing);
-+            left = qMin(left, -0.5f * boundingRect.width() - s_pageSpacing);
-+            right = qMax(right, 0.5f * boundingRect.width() + s_pageSpacing);
-             height += pageHeight + s_pageSpacing;
-         }
-     }
- 
-     if(m_twoPagesMode && m_numberOfPages % 2 != 0)
-     {
--        right = qMax(right, 0.5 * s_pageSpacing);
-+        right = qMax(right, 0.5f * s_pageSpacing);
-         height += pageHeight + s_pageSpacing;
-     }
- 
-@@ -1434,7 +1434,7 @@
-                 QRectF boundingRect = page->boundingRect().translated(page->pos());
- 
-                 top = qMin(top, boundingRect.top() - s_pageSpacing);
--                height = qMax(height, boundingRect.height() + 2.0 * s_pageSpacing);
-+                height = qMax(height, boundingRect.height() + 2.0f * s_pageSpacing);
-             }
-             else
-             {
diff --git a/debian/patches/series b/debian/patches/series
index f823fef..3f0ad86 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 10_spelling_dict.patch
 20-add-keywords-desktop-file.patch
-30-fix-ftbfs-arm.patch

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