[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.0-beta2-1-5-g8e8d35a

[Modestas Vainius]

The following commit has been merged in the experimental-snapshots branch:
commit 8e8d35a2f1f9862265a00edf8d4414b4ebe3fce0
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Wed Jul 14 08:46:13 2010 +0300

    Remove conflicts against old (predating etch) qt-x11-free (Qt3) packages.
    
    This fixes the mess I made in the previous commit.
---
 debian/changelog |    2 +-
 debian/control   |    3 ---
 2 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7eaf4eb..b67fe05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ qt4-x11 (4:4.7.0~beta2-3) UNRELEASED; urgency=low
     latest version which this conflict is supposed to cover is 0~svn29752-1.
   * Add Breaks (or turn Conflicts into Breaks) next to Replaces as recommended
     by policy 3.9.0.
-  * Make conflicts against old qt-x11-free (Qt3) packages versionless.
+  * Remove conflicts against old (predating etch) qt-x11-free (Qt3) packages.
 
  -- Modestas Vainius <modax at debian.org>  Tue, 13 Jul 2010 21:45:54 +0300
 
diff --git a/debian/control b/debian/control
index e356e22..018de3d 100644
--- a/debian/control
+++ b/debian/control
@@ -385,7 +385,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libqtcore4 (= ${binary:Version}),
  libqt4-help (= ${binary:Version}), libqt4-test (= ${binary:Version}),
  libqt4-declarative (= ${binary:Version}), qt4-qmake (= ${binary:Version})
 Recommends: libqt4-opengl-dev (= ${binary:Version})
-Conflicts: qt3-dev-tools
 Breaks: libqtwebkit-dev (<< 2.0~), libqt4-opengl-dev (<< 4.4.0-2)
 Replaces: libqtwebkit-dev (<< 2.0~), libqt4-opengl-dev (<< 4.4.0-2)
 Suggests: qt4-dev-tools, qt4-doc, libmysqlclient-dev, libsqlite0-dev, libsqlite3-dev, libpq-dev, unixodbc-dev, firebird2.1-dev
@@ -470,7 +469,6 @@ Package: qt4-dev-tools
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-sql-sqlite
-Conflicts: qt3-assistant, qt3-designer qt3-linguist, qt3-dev-tools-embedded
 Breaks: libqt4-core (<< 4.4.0~beta1-1)
 Replaces: libqt4-core (<< 4.4.0~beta1-1)
 Recommends: libqt4-dev, qt4-doc, qt4-designer
@@ -508,7 +506,6 @@ Package: qt4-qtconfig
 Architecture: any
 Section: x11
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: qt3-qtconfig
 Breaks: libqt4-gui (<< 4.1.0), libqt4-core (<< 4.4.0~beta1-1)
 Replaces: libqt4-gui (<< 4.1.0), libqt4-core (<< 4.4.0~beta1-1)
 Description: Qt 4 configuration tool

-- 
Qt 4 packaging