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
diff --git a/docs/CREDITS b/docs/CREDITS
index 79abd8a..be55bb7 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -521,6 +521,7 @@
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 2e6063c..c2071a2 100755
--- a/rbutil/rbutilqt/deploy-release.py
+++ b/rbutil/rbutilqt/deploy-release.py
@@ -89,6 +89,7 @@
"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 27d1785..0000000
--- 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 85d990a..8997c38 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -287,8 +287,13 @@
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 60c7538..ccb1272 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>