[SCM] BOINC packaging branch, master, updated. debian/7.0.33+dfsg-1-16-g916b1f3

[Guo Yixuan]

The following commit has been merged in the master branch:
commit 9e979a7ffd013a83692f707177ec56fa6c6a1e73
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Fri Aug 24 11:52:08 2012 +0800

    fix duplicate conflicts fields

diff --git a/debian/control.in b/debian/control.in
index ff089e9..4ffabab 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -220,11 +220,11 @@ Description: development files to build applications for BOINC projects
 Package: libboinc-app7
 Provides: libboinc-app
 Replaces: libboinc-app (<< 7.0.33+dfsg-1)
-Conflicts: libboinc-app (<< 7.0.33+dfsg-1)
+Conflicts: libboinc-app (<< 7.0.33+dfsg-1),
+ boinc-dev (<= 7.0.28+dfsg-2)
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: boinc-dev (<= 7.0.28+dfsg-2)
 Description: libraries for BOINC's scientific applications
  The Berkeley Open Infrastructure for Network Computing (BOINC) is a
  software platform for distributed computing using volunteered computer

-- 
BOINC packaging