[SCM] ois/master: Remove Conflicts on libois1, it is not available in Squeeze.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8d682124d72d705a99c250626230bec0cf2e12bc
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri May 13 13:09:29 2011 +0200

    Remove Conflicts on libois1, it is not available in Squeeze.

diff --git a/debian/control b/debian/control
index 6a21970..97e7b23 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,16 @@
 Source: ois
 Priority: extra
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Philippe Coval <rzr at gna.org>, Federico Di Gregorio <fog at debian.org>
-Build-Depends: debhelper (>= 5), automake (>= 1.9), autotools-dev, autoconf, libtool, libltdl3-dev, libxaw7-dev, libx11-dev
+Uploaders: Philippe Coval <rzr at gna.org>,
+ Federico Di Gregorio <fog at debian.org>
+Build-Depends: debhelper (>= 5),
+ automake (>= 1.9),
+ autotools-dev,
+ autoconf,
+ libtool,
+ libltdl3-dev,
+ libxaw7-dev,
+ libx11-dev
 Standards-Version: 3.9.2
 Section: libs
 Homepage: http://sourceforge.net/projects/wgois
@@ -12,7 +20,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/ois.git
 Package: libois-dev
 Section: libdevel
 Architecture: any
-Depends: libois (= ${binary:Version}), ${misc:Depends} 
+Depends: libois (= ${binary:Version}),
+ ${misc:Depends}
 Description: Object Oriented Input System library (C++ development headers)
  Object Oriented Input System (OIS) is meant to be a cross platform,
  simple solution for using all kinds of Input Devices
@@ -27,7 +36,6 @@ Depends: ${shlibs:Depends},
  ${misc:Depends}
 Breaks: libois-1.2.0
 Replaces: libois-1.2.0
-Conflicts: libois1
 Description: Object Oriented Input System library (C++)
  Object Oriented Input System (OIS) is meant to be a cross platform,
  simple solution for using all kinds of Input Devices

-- 
ois packaging