From 0f6bfdb4c37f222ea2833237bc9946d752e211db Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Sun, 24 Jan 2010 20:48:38 +0000
Subject: Merge rbutil CREDITS file with main one and use that.

Similar to removing the separate CREDITS file for the manual remove the
rbutil one as discussed on IRC.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24329 a1c6a512-1295-4272-9138-f99709370657
---
 docs/CREDITS                      |  1 +
 rbutil/rbutilqt/deploy-release.py |  1 +
 rbutil/rbutilqt/docs/CREDITS      | 13 -------------
 rbutil/rbutilqt/rbutilqt.cpp      |  9 +++++++--
 rbutil/rbutilqt/rbutilqt.qrc      |  2 +-
 5 files changed, 10 insertions(+), 16 deletions(-)
 delete mode 100644 rbutil/rbutilqt/docs/CREDITS

diff --git a/docs/CREDITS b/docs/CREDITS
index 79abd8aab7..be55bb7314 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -521,6 +521,7 @@ Phinitnun Chanasabaeng
 Tse-Hsien Chiang
 Szymon Dziok
 Domenico Di Misa
+Delyan Kratunov
 
 The libmad team
 The wavpack team
diff --git a/rbutil/rbutilqt/deploy-release.py b/rbutil/rbutilqt/deploy-release.py
index 2e6063cdf5..c2071a29d7 100755
--- a/rbutil/rbutilqt/deploy-release.py
+++ b/rbutil/rbutilqt/deploy-release.py
@@ -89,6 +89,7 @@ svnpaths = [ "rbutil/",
              "tools/rbspeex",
              "apps/codecs/libspeex",
              "docs/COPYING",
+             "docs/CREDITS",
              "tools/iriver.c",
              "tools/Makefile",
              "tools/mkboot.h",
diff --git a/rbutil/rbutilqt/docs/CREDITS b/rbutil/rbutilqt/docs/CREDITS
deleted file mode 100644
index 27d1785164..0000000000
--- a/rbutil/rbutilqt/docs/CREDITS
+++ /dev/null
@@ -1,13 +0,0 @@
-Christi Alice Scarborough
-Dave Chapman
-Dominik Wenger
-Bryan Childs
-Dave Hooper
-Dominik Riebeling
-Tomer Shalev
-Yoshihisa Uchida
-Alexander Spyridakis
-Rui Araújo
-Delyan Kratunov
-Adilson Xavier
-Pavel Rzehák
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index 85d990a775..8997c386bf 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -287,8 +287,13 @@ void RbUtilQt::about()
     credits.open(QIODevice::ReadOnly);
     QTextStream r(&credits);
     r.setCodec(QTextCodec::codecForName("UTF-8"));
-    QString rline = r.readAll();
-    about.browserCredits->insertPlainText(rline);
+    while(!r.atEnd()) {
+        QString line = r.readLine();
+        // filter out header.
+        line.remove(QRegExp("^[^A-Z]+.*"));
+        line.remove(QRegExp("^People.*"));
+        about.browserCredits->append(line);
+    }
     about.browserCredits->moveCursor(QTextCursor::Start, QTextCursor::MoveAnchor);
     QString title = QString("<b>The Rockbox Utility</b><br/>Version %1").arg(FULLVERSION);
     about.labelTitle->setText(title);
diff --git a/rbutil/rbutilqt/rbutilqt.qrc b/rbutil/rbutilqt/rbutilqt.qrc
index 60c7538027..ccb1272d63 100644
--- a/rbutil/rbutilqt/rbutilqt.qrc
+++ b/rbutil/rbutilqt/rbutilqt.qrc
@@ -1,6 +1,6 @@
 <RCC>
     <qresource prefix="/" >
-        <file>docs/CREDITS</file>
+        <file>../../docs/CREDITS</file>
         <file>docs/gpl-2.0.html</file>
     </qresource>
      <qresource>
-- 
cgit v1.2.3