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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 588798e47e6170d55b5028e4ead47cdaf66979e9
Merge: c1ce00eadb9c468e656360b6fcd32957a604b8ec 27f253b12603ee7c487e684844b0bdae7b252ae8
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Sat Oct 20 02:33:13 2012 +0200

    Merge branch 'master' of ssh://git.debian.org/git/pkg-boinc/boinc

diff --combined debian/control.in
index df119e1,f635dcc..34f3488
--- a/debian/control.in
+++ b/debian/control.in
@@@ -42,8 -42,8 +42,8 @@@ Description: metapackage for the BOINC 
  
  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}
@@@ -63,7 -63,6 +63,7 @@@ Description: libraries of BOINC the cli
  Package: boinc-nvidia-cuda
  Architecture: amd64 i386
  Section: contrib/net
 +Priority: extra
  Depends: ${misc:Depends}, boinc, libcuda1|nvidia-current,
  Recommends: libcuda1-ia32 [amd64]|nvidia-current [amd64], ia32-libs [amd64]|nvidia-current [amd64]
  Description: metapackage for CUDA-savvy BOINC client and manager
@@@ -85,7 -84,6 +85,7 @@@
  #Package: boinc-amd-opencl
  #Architecture: amd64 i386
  #Section: contrib/net
 +#Priority: extra
  #Depends: ${misc:Depends}, boinc, fglrx-driver, amd-libopencl1
  #Description: metapackage for AMD/ATI OpenCL-savvy BOINC client and manager
  # The Berkeley Open Infrastructure for Network Computing (BOINC) is a
@@@ -212,7 -210,8 +212,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
@@@ -224,8 -223,9 +225,9 @@@
  
  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