[SCM] BOINC packaging branch, more-ldadd, updated. debian/7.0.27+dfsg-3-41-gb405e1c
Guo Yixuan
culu.gyx at gmail.com
Thu Jul 5 13:10:54 UTC 2012
The following commit has been merged in the more-ldadd branch:
commit 4e4d077a700026b00142404970c7af1d5d35810b
Merge: 67f7cbea0c06fa4db3a812fd2b6be046f983b9c3 42aabb094035cba52acb1d59734459b47fe52320
Author: Guo Yixuan <culu.gyx at gmail.com>
Date: Thu Jul 5 20:42:58 2012 +0800
Merge branch 'master' into more-ldadd
Conflicts:
debian/patches/series
diff --combined debian/patches/series
index a956c10,62bacd6..c85db07
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -59,5 -59,6 +59,7 @@@ screen_saver_boinc_extra.patc
#socklenBuildFixByDavid.patch
boinclib_shared.patch
dynamic_libboinc.patch
- boinc_manager_project_info_page.patch
+ #boinc_manager_project_info_page.patch
+ ensure_there_is_no_newline_in_passwd.patch
+ Missing_libSched.patch
+more-ldadd.patch
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list