[boinc] 03/09: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-boinc/boinc
Steffen Möller
moeller at alioth.debian.org
Tue Nov 5 09:31:23 UTC 2013
This is an automated email from the git hooks/post-receive script.
moeller pushed a commit to branch master
in repository boinc.
commit a1fa7e273a6f04752e71c8e83add8d0c26a1ee34
Merge: fadaa8b fd89ac9
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date: Fri Sep 27 15:27:39 2013 +0200
Merge branch 'master' of git+ssh://git.debian.org/git/pkg-boinc/boinc
android/.android2po | 9 +
android/BOINC/AndroidManifest.xml | 5 +-
android/BOINC/assets/all_projects_list.xml | 826 +++----
android/BOINC/lint.xml | 4 +
android/BOINC/res/drawable-hdpi/acctmgrb.png | Bin 0 -> 3784 bytes
android/BOINC/res/drawable-ldpi/acctmgrb.png | Bin 0 -> 3313 bytes
android/BOINC/res/drawable-mdpi/acctmgrb.png | Bin 0 -> 3508 bytes
.../shape_light_blue_background_wo_stroke.xml | 22 +
.../res/layout/attach_project_acctmgr_layout.xml | 166 ++
.../res/layout/attach_project_list_layout.xml | 57 +-
.../BOINC/res/layout/projects_layout_listitem.xml | 29 +-
...em.xml => projects_layout_listitem_acctmgr.xml} | 53 +-
android/BOINC/res/values-bg/strings.xml | 247 ++
android/BOINC/res/values-ca/strings.xml | 247 ++
android/BOINC/res/values-cs/strings.xml | 247 ++
android/BOINC/res/values-da/strings.xml | 2 +
android/BOINC/res/values-de/strings.xml | 226 ++
android/BOINC/res/values-el/strings.xml | 226 ++
android/BOINC/res/values-es/strings.xml | 2 +
android/BOINC/res/values-fi/strings.xml | 227 ++
android/BOINC/res/values-fr/strings.xml | 2 +
android/BOINC/res/values-he/strings.xml | 2 +
android/BOINC/res/values-hr/strings.xml | 2 +
android/BOINC/res/values-hu/strings.xml | 2 +
android/BOINC/res/values-it-rIT/strings.xml | 247 ++
android/BOINC/res/values-ja/strings.xml | 2 +
android/BOINC/res/values-ko/strings.xml | 247 ++
android/BOINC/res/values-lt/strings.xml | 2 +
android/BOINC/res/values-lv/strings.xml | 2 +
android/BOINC/res/values-nb/strings.xml | 2 +
android/BOINC/res/values-nl/strings.xml | 2 +
android/BOINC/res/values-pl/strings.xml | 2 +
android/BOINC/res/values-pt-rBR/strings.xml | 2 +
android/BOINC/res/values-pt-rPT/strings.xml | 2 +
android/BOINC/res/values-ro/strings.xml | 247 ++
android/BOINC/res/values-ru/strings.xml | 247 ++
android/BOINC/res/values-sk/strings.xml | 2 +
android/BOINC/res/values-sl/strings.xml | 2 +
android/BOINC/res/values-tr/strings.xml | 247 ++
android/BOINC/res/values-uk/strings.xml | 2 +
android/BOINC/res/values-zh-rCN/strings.xml | 2 +
android/BOINC/res/values-zh-rTW/strings.xml | 247 ++
android/BOINC/res/values/configuration.xml | 14 +-
android/BOINC/res/values/strings.xml | 29 +-
...vity.java => AttachProjectAcctMgrActivity.java} | 66 +-
.../berkeley/boinc/AttachProjectListActivity.java | 15 +-
.../berkeley/boinc/AttachProjectLoginActivity.java | 2 +-
.../boinc/AttachProjectRegistrationActivity.java | 2 +-
.../boinc/AttachProjectWorkingActivity.java | 215 +-
.../src/edu/berkeley/boinc/ProjectsActivity.java | 181 +-
.../boinc/adapter/ProjectControlsListAdapter.java | 7 +
.../boinc/adapter/ProjectsListAdapter.java | 134 +-
.../edu/berkeley/boinc/client/ClientStatus.java | 9 +-
.../src/edu/berkeley/boinc/client/Monitor.java | 121 +-
.../src/edu/berkeley/boinc/rpc/AcctMgrInfo.java | 30 +
.../edu/berkeley/boinc/rpc/AcctMgrInfoParser.java | 88 +
.../edu/berkeley/boinc/rpc/AcctMgrRPCReply.java | 27 +
.../berkeley/boinc/rpc/AcctMgrRPCReplyParser.java | 82 +
.../src/edu/berkeley/boinc/rpc/RpcClient.java | 83 +
.../src/edu/berkeley/boinc/utils/BOINCErrors.java | 1 +
client/gpu_detect.cpp | 35 +-
client/gpu_detect.h | 2 +
client/gpu_opencl.cpp | 91 +-
configure.ac | 2 +-
debian/changelog | 11 +
debian/patches/disable_silent_rules.patch | 12 +
debian/patches/series | 1 +
debian/rules | 26 +-
lib/Makefile.am | 3 +
lib/coproc.cpp | 229 --
lib/coproc.h | 49 +-
lib/hostinfo.cpp | 22 +-
lib/hostinfo.h | 4 +-
lib/opencl_boinc.cpp | 314 +++
lib/opencl_boinc.h | 84 +
lib/win_util.cpp | 28 +-
locale/bg/BOINC-Android.po | 1045 +++++++++
locale/bg/BOINC-Client.mo | Bin 5642 -> 6144 bytes
locale/bg/BOINC-Client.po | 15 +-
locale/bg/BOINC-Manager.mo | Bin 92316 -> 106598 bytes
locale/bg/BOINC-Manager.po | 583 +++--
locale/bg/BOINC-Project-Generic.po | 50 +-
locale/bg/BOINC-Setup.mo | Bin 554 -> 3816 bytes
locale/bg/BOINC-Setup.po | 52 +-
locale/bg/BOINC-Web.mo | Bin 39859 -> 47557 bytes
locale/bg/BOINC-Web.po | 83 +-
locale/ca/BOINC-Android.po | 1045 +++++++++
locale/ca/BOINC-Web.mo | Bin 33985 -> 36176 bytes
locale/ca/BOINC-Web.po | 29 +-
locale/cs/BOINC-Android.po | 1045 +++++++++
locale/cs/BOINC-Client.mo | Bin 4846 -> 4881 bytes
locale/cs/BOINC-Client.po | 11 +-
locale/cs/BOINC-Web.mo | Bin 30491 -> 35637 bytes
locale/cs/BOINC-Web.po | 69 +-
locale/da/BOINC-Android.po | 1027 ++++++++
locale/de/BOINC-Android.po | 1064 +++++++++
locale/de/BOINC-Manager.mo | Bin 83556 -> 83587 bytes
locale/de/BOINC-Manager.po | 50 +-
locale/de/BOINC-Project-Generic.po | 17 +-
locale/de/BOINC-Web.mo | Bin 33983 -> 35216 bytes
locale/de/BOINC-Web.po | 60 +-
locale/el/BOINC-Android.po | 1064 +++++++++
locale/es/BOINC-Android.po | 1027 ++++++++
locale/es/BOINC-Manager.mo | Bin 82915 -> 82943 bytes
locale/es/BOINC-Manager.po | 9 +-
locale/es/BOINC-Project-Generic.po | 10 +-
locale/es/BOINC-Web.mo | Bin 22694 -> 22783 bytes
locale/es/BOINC-Web.po | 13 +-
locale/fi/BOINC-Android.po | 1036 +++++++++
locale/fi/BOINC-Manager.mo | Bin 78177 -> 78742 bytes
locale/fi/BOINC-Manager.po | 23 +-
locale/fi/BOINC-Project-Generic.po | 8 +-
locale/fi/BOINC-Setup.mo | Bin 2843 -> 2850 bytes
locale/fi/BOINC-Setup.po | 6 +-
locale/fi/BOINC-Web.mo | Bin 31895 -> 33027 bytes
locale/fi/BOINC-Web.po | 21 +-
locale/fr/BOINC-Android.po | 1032 +++++++++
locale/he/BOINC-Android.po | 1027 ++++++++
locale/hr/BOINC-Android.po | 1027 ++++++++
locale/hu/BOINC-Android.po | 1027 ++++++++
locale/hu/BOINC-Client.mo | Bin 4696 -> 4759 bytes
locale/hu/BOINC-Client.po | 9 +-
locale/hu/BOINC-Project-Generic.po | 42 +-
locale/hu/BOINC-Setup.mo | Bin 554 -> 798 bytes
locale/hu/BOINC-Setup.po | 15 +-
locale/it_IT/BOINC-Android.po | 1048 +++++++++
locale/it_IT/BOINC-Client.mo | Bin 4551 -> 4927 bytes
locale/it_IT/BOINC-Client.po | 11 +-
locale/it_IT/BOINC-Manager.mo | Bin 78515 -> 82833 bytes
locale/it_IT/BOINC-Manager.po | 76 +-
locale/it_IT/BOINC-Project-Generic.po | 82 +-
locale/it_IT/BOINC-Web.mo | Bin 30550 -> 35778 bytes
locale/it_IT/BOINC-Web.po | 76 +-
locale/ja/BOINC-Android.po | 1027 ++++++++
locale/ko/BOINC-Android.po | 1032 +++++++++
locale/ko/BOINC-Manager.mo | Bin 85453 -> 85469 bytes
locale/ko/BOINC-Manager.po | 9 +-
locale/ko/BOINC-Web.po | 3 -
locale/lt/BOINC-Android.po | 1027 ++++++++
locale/lt/BOINC-Client.mo | Bin 4198 -> 4517 bytes
locale/lt/BOINC-Client.po | 26 +-
locale/lt/BOINC-Manager.mo | Bin 45271 -> 46390 bytes
locale/lt/BOINC-Manager.po | 77 +-
locale/lv/BOINC-Android.po | 1027 ++++++++
locale/nb/BOINC-Android.po | 1027 ++++++++
locale/nl/BOINC-Android.po | 1036 +++++++++
locale/nl/BOINC-Web.mo | Bin 34088 -> 35648 bytes
locale/nl/BOINC-Web.po | 28 +-
locale/pl/BOINC-Android.po | 1027 ++++++++
locale/pt_BR/BOINC-Android.po | 1027 ++++++++
locale/pt_PT/BOINC-Android.po | 1031 ++++++++
locale/pt_PT/BOINC-Client.mo | Bin 4893 -> 4939 bytes
locale/pt_PT/BOINC-Client.po | 72 +-
locale/pt_PT/BOINC-Manager.mo | Bin 82266 -> 82305 bytes
locale/pt_PT/BOINC-Manager.po | 145 +-
locale/pt_PT/BOINC-Project-Generic.po | 110 +-
locale/pt_PT/BOINC-Web.mo | Bin 33497 -> 35107 bytes
locale/pt_PT/BOINC-Web.po | 322 +--
locale/ro/BOINC-Android.po | 1044 +++++++++
locale/ro/BOINC-Project-Generic.po | 1174 +++++-----
locale/ro/BOINC-Web.mo | Bin 18950 -> 36016 bytes
locale/ro/BOINC-Web.po | 146 +-
locale/ru/BOINC-Android.po | 1050 +++++++++
locale/ru/BOINC-Web.mo | Bin 46195 -> 49341 bytes
locale/ru/BOINC-Web.po | 30 +-
locale/sk/BOINC-Android.po | 1027 ++++++++
locale/sl/BOINC-Android.po | 1027 ++++++++
locale/templates/BOINC-Android.pot | 1028 ++++++++
locale/tr/BOINC-Android.po | 1043 +++++++++
locale/tr/BOINC-Client.mo | Bin 4972 -> 5010 bytes
locale/tr/BOINC-Client.po | 36 +-
locale/tr/BOINC-Manager.mo | Bin 83657 -> 84123 bytes
locale/tr/BOINC-Manager.po | 141 +-
locale/tr/BOINC-Project-Generic.po | 391 ++--
locale/tr/BOINC-Web.mo | Bin 16064 -> 24124 bytes
locale/tr/BOINC-Web.po | 77 +-
locale/uk/BOINC-Android.po | 1043 +++++++++
locale/uk/BOINC-Client.mo | Bin 6238 -> 6338 bytes
locale/uk/BOINC-Client.po | 47 +-
locale/uk/BOINC-Web.mo | Bin 44926 -> 48050 bytes
locale/uk/BOINC-Web.po | 33 +-
locale/zh_CN/BOINC-Android.po | 1029 ++++++++
locale/zh_CN/BOINC-Project-Generic.po | 15 +-
locale/zh_CN/BOINC-Setup.mo | Bin 2720 -> 2756 bytes
locale/zh_CN/BOINC-Setup.po | 11 +-
locale/zh_CN/BOINC-Web.mo | Bin 30677 -> 30877 bytes
locale/zh_CN/BOINC-Web.po | 17 +-
locale/zh_TW/BOINC-Android.po | 1033 +++++++++
locale/zh_TW/BOINC-Client.mo | Bin 4579 -> 4599 bytes
locale/zh_TW/BOINC-Client.po | 19 +-
locale/zh_TW/BOINC-Manager.mo | Bin 75327 -> 75416 bytes
locale/zh_TW/BOINC-Manager.po | 175 +-
locale/zh_TW/BOINC-Project-Generic.po | 43 +-
locale/zh_TW/BOINC-Setup.mo | Bin 2701 -> 2743 bytes
locale/zh_TW/BOINC-Setup.po | 14 +-
locale/zh_TW/BOINC-Web.mo | Bin 30184 -> 31704 bytes
locale/zh_TW/BOINC-Web.po | 36 +-
samples/glut/Roman.stroke | 604 -----
samples/glut/glut.h | 595 -----
samples/glut/glut_roman.c | 2451 --------------------
samples/glut/glut_stroke.c | 42 -
samples/glut/glut_swidth.c | 58 -
samples/glut/glutbitmap.h | 30 -
samples/glut/glutint.h | 24 -
samples/glut/glutstroke.h | 42 -
samples/glut/glutwin32.h | 18 -
samples/glut/stroke.h | 134 --
samples/glut/win32_glx.c | 255 --
samples/glut/win32_glx.h | 58 -
samples/glut/win32_util.c | 82 -
samples/glut/win32_x11.c | 401 ----
samples/glut/win32_x11.h | 319 ---
212 files changed, 39826 insertions(+), 8131 deletions(-)
diff --cc debian/changelog
index 90e76a1,fcb19ae..8cc77e5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,18 +1,21 @@@
+ boinc (7.2.17+dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Guo Yixuan <culu.gyx at gmail.com> Mon, 23 Sep 2013 13:29:53 -0400
+
boinc (7.2.14+dfsg-1exp2) UNRELEASED; urgency=low
+ [ Steffen Moeller ]
* Adapting for upstream's additional directories in html/
+ * boinc-server-maker
+ - works with Apache 2.4's extra security
+ - added recommends for coreutils because of 'arch' utility
+ [ Guo Yixuan ]
+ * Disabled silent rules for build log check.
+ (debian/patches/disable_silent_rules.patch)
+
-- Steffen Moeller <moeller at debian.org> Sat, 31 Aug 2013 20:08:38 +0200
boinc (7.2.14+dfsg-1exp1) experimental; urgency=low
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git
More information about the pkg-boinc-commits
mailing list