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

[Guo Yixuan]

The following commit has been merged in the master branch:
commit 27f253b12603ee7c487e684844b0bdae7b252ae8
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Sat Oct 13 22:18:07 2012 +0800

    Fixed lintian warnings: conflicts-with-version
    
    use Breaks plus Replaces, not Conflicts plus Replaces for moving files
    bwtween packages.

diff --git a/debian/changelog b/debian/changelog
index b0bd415..4807fad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
 boinc (7.0.36+dfsg-2) UNRELEASED; urgency=low
 
   [ Guo Yixuan ]
-  * debian/control: Removed the deprecated DMUA field.
+  * debian/control:
+    - Removed the deprecated DMUA field.
+    - Use Breaks plus Replaces for moving files from boinc-dev
+      to libboinc*.
   * debian/patches:
     - Removed some old patches (those not in series anymore).
     - Refreshed cppcheck_avoid_redundant_check.patch.
diff --git a/debian/control.in b/debian/control.in
index 434f0a1..f635dcc 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -42,8 +42,8 @@ Description: metapackage for the BOINC client and the manager
 
 Package: libboinc7
 Provides: libboinc
+Breaks: libboinc (<= 7.0.34+dfsg-1)
 Replaces: libboinc (<= 7.0.34+dfsg-1)
-Conflicts: libboinc (<= 7.0.34+dfsg-1)
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -210,7 +210,8 @@ Depends: ${misc:Depends},
  libboinc-app7 (<< ${source:Version}+1~),
  libc6-dev | libc-dev,
  libstdc++6-4.3-dev | libstdc++-dev, libssl-dev, libmysqlclient-dev
-Conflicts: boinc-dev (<= 7.0.28+dfsg-2)
+Breaks: boinc-dev (<= 7.0.28+dfsg-2)
+Replaces: boinc-dev (<= 7.0.28+dfsg-2)
 Description: development files to build applications for BOINC projects
  The Berkeley Open Infrastructure for Network Computing (BOINC) is a
  software platform for distributed computing using volunteered computer
@@ -222,8 +223,9 @@ Description: development files to build applications for BOINC projects
 
 Package: libboinc-app7
 Provides: libboinc-app
-Replaces: libboinc-app (<= 7.0.34+dfsg-1)
-Conflicts: libboinc-app (<= 7.0.34+dfsg-1),
+Breaks: libboinc-app (<= 7.0.34+dfsg-1),
+ boinc-dev (<= 7.0.28+dfsg-2)
+Replaces: libboinc-app (<= 7.0.34+dfsg-1),
  boinc-dev (<= 7.0.28+dfsg-2)
 Section: libs
 Architecture: any

-- 
BOINC packaging