X-Git-Url: https://git.ao2.it/libam7xxx.git/blobdiff_plain/65c3ddc5b7e1fad19cd54e456f94758ec4880ea1..d3f16acf99517e8ba5b35506f6b260e64089afbf:/debian/control?ds=sidebyside

diff --git a/debian/control b/debian/control
index 744d223..9508e55 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,12 @@ Priority: extra
 Maintainer: Antonio Ospite <ao2@ao2.it>
 Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), cmake, pkg-config,
  libusb-1.0-0-dev, libxcb1-dev,
- libavdevice-dev, libavformat-dev, libavcodec-dev, libswscale-dev
-Build-Depends-Indep: doxygen, asciidoc, xmlto
-Standards-Version: 3.9.5
+ libavdevice-dev, libavformat-dev, libavcodec-dev, libswscale-dev,
+ asciidoc, xmlto
+Build-Depends-Indep: doxygen
+Standards-Version: 3.9.6
 Homepage: http://git.ao2.it/libam7xxx.git
-Vcs-Git: git://git.ao2.it/libam7xxx.git -b debian
+Vcs-Git: git://git.ao2.it/libam7xxx.git -b debian/master
 Vcs-Browser: http://git.ao2.it/libam7xxx.git
 
 Package: libam7xxx0.1
@@ -64,7 +65,7 @@ Package: libam7xxx-dev
 Architecture: any
 Depends: ${misc:Depends}, libam7xxx0.1 (= ${binary:Version})
 Recommends: libam7xxx0.1-doc (= ${source:Version})
-Description: library for accessing am7xxx based devices -- development files
+Description: library for accessing am7xxx devices - development files
  libam7xxx is an Open Source library to communicate via USB with projectors and
  Digital Picture Frames based on the Actions Micro AM7XXX family if ICs.
  .
@@ -89,7 +90,9 @@ Package: libam7xxx0.1-bin
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: library for accessing am7xxx devices -- utilities and samples
+Conflicts: libam7xxx-bin
+Replaces: libam7xxx-bin
+Description: library for accessing am7xxx devices - utilities
  libam7xxx is an Open Source library to communicate via USB with projectors and
  Digital Picture Frames based on the Actions Micro AM7XXX family if ICs.
  .
@@ -113,7 +116,9 @@ Package: libam7xxx0.1-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Description: library for accessing am7xxx devices -- documentation
+Conflicts: libam7xxx-doc
+Replaces: libam7xxx-doc
+Description: library for accessing am7xxx devices - documentation
  libam7xxx is an Open Source library to communicate via USB with projectors and
  Digital Picture Frames based on the Actions Micro AM7XXX family if ICs.
  .