[Python-apps-commits] r12600 - in packages/frescobaldi/trunk/debian (3 files)

[foka at users.alioth.debian.org]

    Date: Saturday, November 21, 2015 @ 07:11:19
  Author: foka
Revision: 12600

Merge Ubuntu's frescobaldi (2.18.1+ds1-2ubuntu1)

frescobaldi (2.18.1+ds1-2ubuntu1) xenial; urgency=medium

  * fix-typeerror-qbrush.diff: Fix failure on startup. (LP: #1513757)

 -- Timo Aaltonen <tjaalton at debian.org>  Fri, 06 Nov 2015 10:47:17 +0200

Downloaded from:
http://archive.ubuntu.com/ubuntu/pool/universe/f/frescobaldi/frescobaldi_2.18.1+ds1-2ubuntu1.dsc

Upstream fix:
https://github.com/wbsoft/frescobaldi/commit/ef3ab90986a0f18549b0a16a62b581b5678cb228

Added:
  packages/frescobaldi/trunk/debian/patches/fix-typeerror-qbrush.diff
Modified:
  packages/frescobaldi/trunk/debian/changelog
  packages/frescobaldi/trunk/debian/patches/series

Modified: packages/frescobaldi/trunk/debian/changelog
===================================================================
--- packages/frescobaldi/trunk/debian/changelog	2015-11-20 12:18:19 UTC (rev 12599)
+++ packages/frescobaldi/trunk/debian/changelog	2015-11-21 07:11:19 UTC (rev 12600)
@@ -1,3 +1,9 @@
+frescobaldi (2.18.1+ds1-2ubuntu1) xenial; urgency=medium
+
+  * fix-typeerror-qbrush.diff: Fix failure on startup. (LP: #1513757)
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Fri, 06 Nov 2015 10:47:17 +0200
+
 frescobaldi (2.18.1+ds1-2) unstable; urgency=high
 
   * Patch /usr/bin/frescobaldi to search in /usr/share/frescobaldi

Added: packages/frescobaldi/trunk/debian/patches/fix-typeerror-qbrush.diff
===================================================================
--- packages/frescobaldi/trunk/debian/patches/fix-typeerror-qbrush.diff	                        (rev 0)
+++ packages/frescobaldi/trunk/debian/patches/fix-typeerror-qbrush.diff	2015-11-21 07:11:19 UTC (rev 12600)
@@ -0,0 +1,24 @@
+commit ef3ab90986a0f18549b0a16a62b581b5678cb228
+Author: Wilbert Berendsen <wbsoft at xs4all.nl>
+Date:   Sun Sep 6 08:58:06 2015 +0200
+
+    fix TypeError: QPen(): argument 1 has unexpected type QBrush
+    
+    reported by a Debian user:
+    Frescobaldi: 2.17.2
+    
+    Python: 2.7.10 -- Qt: 4.8.7 -- PyQt4: 4.11.4 -- sip: 4.16.9
+    
+    OS: Linux-4.1.0-2-amd64-x86_64-with-debian-stretch-sid
+
+--- a/frescobaldi_app/widgets/charmap.py
++++ b/frescobaldi_app/widgets/charmap.py
+@@ -138,7 +138,7 @@ class CharMap(QWidget):
+         selected_tile.setAlpha(96)
+         selected_box = self.palette().color(QPalette.Highlight)
+         
+-        text_pen = QPen(self.palette().text())
++        text_pen = QPen(self.palette().text().color())
+         disabled_pen = QPen(self.palette().color(QPalette.Disabled, QPalette.Text))
+         selection_pen = QPen(selected_box)
+         for row in rows:

Modified: packages/frescobaldi/trunk/debian/patches/series
===================================================================
--- packages/frescobaldi/trunk/debian/patches/series	2015-11-20 12:18:19 UTC (rev 12599)
+++ packages/frescobaldi/trunk/debian/patches/series	2015-11-21 07:11:19 UTC (rev 12600)
@@ -1 +1,2 @@
 private-module-directory.patch
+fix-typeerror-qbrush.diff