[SCM] kde-gtk-config packaging branch, master, updated. debian/5.2.0-1-27-g5aa1162

Maximiliano Curia maxy at moszumanska.debian.org
Thu Mar 26 12:42:29 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kde-gtk-config.git;a=commitdiff;h=035f3b8

The following commit has been merged in the master branch:
commit 035f3b89a6f05b9524923cd76289cd6aaf8c16e4
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Mar 25 15:59:36 2015 +0100

    Remove patch: fix_fonthelper
---
 debian/changelog              |  1 +
 debian/patches/fix_fonthelper | 13 -------------
 debian/patches/series         |  1 -
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index efef4d6..8e93706 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ kde-gtk-config (4:5.2.2-1~) UNRELEASED; urgency=medium
   * New upstream release (5.2.1).
   * New patch: fix_fonthelper
   * New upstream release (5.2.2).
+  * Remove patch: fix_fonthelper
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 25 Mar 2015 09:58:28 +0100
 
diff --git a/debian/patches/fix_fonthelper b/debian/patches/fix_fonthelper
deleted file mode 100644
index 8f43100..0000000
--- a/debian/patches/fix_fonthelper
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kde-gtk-config/src/fontshelpers.cpp
-===================================================================
---- kde-gtk-config.orig/src/fontshelpers.cpp	2015-02-08 21:43:38.058943788 +0100
-+++ kde-gtk-config/src/fontshelpers.cpp	2015-03-24 20:11:37.755641509 +0100
-@@ -43,7 +43,7 @@
-             familyIdx = idx;
-         }
-     }
--    QRegExp fontRx(QString("( [a-zA-Z0-9 ]*) +([0-9]+)$"));
-+    QRegExp fontRx(QString("(.*) +([0-9]+)$"));
-     fontRx.indexIn(font, familyIdx);
- 
-     QString fontStyle = fontRx.cap(1).trimmed();
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index eb01e8d..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix_fonthelper

-- 
kde-gtk-config packaging



More information about the pkg-kde-commits mailing list