Bug#594700: unblock: zbar/0.10+doc-4

[Bernd Zeimetz <bzed@debian.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: freeze-exception

Please unblock package zbar. Main reason for the upload was to remove
two conflicts which were introduced by the former maintainer and not
reviewed before - they are completely unnecessary now. Full diff is
attached.

Cheers and thanks,

Bernd


unblock zbar/0.10+doc-4



--
 Bernd Zeimetz                            Debian GNU/Linux Developer
 http://bzed.de                                http://www.debian.org
 GPG Fingerprints: 06C8 C9A2 EAAD E37E 5B2C BE93 067A AD04 C93B FF79
                   ECA1 E3F2 8E11 2432 D485 DD95 EB36 171A 6FF9 435F

diff --git a/debian/changelog b/debian/changelog
index a3d869c..be9ad64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+zbar (0.10+doc-4) unstable; urgency=low
+
+  * [abdd6f9f] Use better dependencies for zbar-dbg.
+  * [5c639854] Remove conflicts of libzbar-dev. libzbar replaced zebra
+    in directory names by zbar, so clashes with quagga and libpacklib1-
+    dev are avoided. So there is no need to conflict against the
+    packages anymore.
+  * [75f615f2] Use Breaks instead of Conflicts as suggested by lintian.
+
+ -- Bernd Zeimetz <bzed@debian.org>  Sat, 28 Aug 2010 15:01:46 +0200
+
 zbar (0.10+doc-3) unstable; urgency=low
 
   * [6b190c39] Enable VfL only on Linux instead of excluding kfreebsd
diff --git a/debian/control b/debian/control
index 8ed775b..d994686 100644
--- a/debian/control
+++ b/debian/control
@@ -26,16 +26,17 @@ Priority: extra
 Section: debug
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
- zbar-tools (= ${binary:Version}),
- libzbar0 (= ${binary:Version}),
- libzbar-dev (= ${binary:Version}),
- python-zbarpygtk (= ${binary:Version}),
- python-zbar (= ${binary:Version}), python-gtk2-dbg,
- libzbargtk0 (= ${binary:Version}),
- libzbargtk-dev (= ${binary:Version}),
- libzbarqt0 (= ${binary:Version}),
- libzbarqt-dev (= ${binary:Version}),
+ zbar-tools (= ${binary:Version}) |
+ libzbar0 (= ${binary:Version}) |
+ libzbar-dev (= ${binary:Version}) |
+ python-zbarpygtk (= ${binary:Version}) |
+ python-zbar (= ${binary:Version}) |
+ libzbargtk0 (= ${binary:Version}) |
+ libzbargtk-dev (= ${binary:Version}) |
+ libzbarqt0 (= ${binary:Version}) |
+ libzbarqt-dev (= ${binary:Version}) |
  libbarcode-zbar-perl (= ${binary:Version})
+Recommends: python-gtk2-dbg
 Description: bar code scanner and decoder (debug)
  ZBar is a library for scanning and decoding bar codes from various sources
  such as video streams, image files or raw intensity sensors. It supports
@@ -57,7 +58,6 @@ Package: libzbar-dev
 Section: libdevel
 Architecture: any
 Depends: libzbar0 (= ${binary:Version}), ${misc:Depends}, libmagick++9-dev, libx11-dev
-Conflicts: libpacklib1-dev, quagga
 Description: bar code scanner and decoder (development)
  ZBar is a library for scanning and decoding bar codes from various sources
  such as video streams, image files or raw intensity sensors. It supports
@@ -69,7 +69,7 @@ Package: python-zbar
 Section: python
 Architecture: any
 Replaces: python-zbarpygtk (<< 0.10+doc)
-Conflicts: python-zbarpygtk (<< 0.10+doc)
+Breaks: python-zbarpygtk (<< 0.10+doc)
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
  libzbar0 (= ${binary:Version})
 Description: bar code scanner and decoder (Python bindings)