[SCM] BOINC packaging branch, backports/squeeze, updated. debian/7.0.33+dfsg-1-29-gdfb03b9

[Steffen Moeller]

The following commit has been merged in the backports/squeeze branch:
commit dfb03b9fcc10808e530f0603eac7f50198282ef8
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Thu Aug 30 21:07:31 2012 +0200

    Conflict resolution, curated control.in after control

diff --git a/debian/control.in b/debian/control.in
index dcad090..3468520 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -15,9 +15,7 @@ Build-Depends: debhelper (>= 7.0.50~), po-debconf, dh-buildinfo, pkg-config (>=
  zlib1g-dev, libssl-dev, libcurl4-openssl-dev (>= 7.17.1),
  libsm-dev, libice-dev, libxmu-dev, libxi-dev, libx11-dev, libnotify-dev (>= 0.7.0),
  freeglut3-dev, libwxgtk2.8-dev, libgtk2.0-dev,
- libsqlite3-dev, libmysqlclient-dev, python, libfcgi-dev, libjpeg-dev,
- libxcb-util0-dev,
- libxss-dev
+ libsqlite3-dev, libmysqlclient-dev, python, libfcgi-dev, libjpeg-dev
 Homepage: http://boinc.berkeley.edu/
 Vcs-Git: git://git.debian.org/git/pkg-boinc/boinc.git
 Vcs-Browser: http://git.debian.org/?p=pkg-boinc/boinc.git
diff --git a/debian/patches/series b/debian/patches/series
index 9572172..de3dc7e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,6 @@
 # patches to get Debian going
-<<<<<<< HEAD
-texfont_removal.patch
-=======
 #texfont_removal.patch
 #libnotify-0.7.patch
->>>>>>> squeeze-backports
 # undisputed patches above
 #libnotify-0.7.patch
 # undisputed for Wheezy and beyond above

-- 
BOINC packaging