debian/rules: don't include buildflags.mk manually

[libam7xxx.git] / debian / control

diff --git a/debian/control b/debian/control
index 87a8cd3..9508e55 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,15 @@
 Source: libam7xxx
 Section: libdevel
 Priority: extra
 Source: libam7xxx
 Section: libdevel
 Priority: extra

-Maintainer: Antonio Ospite <ospite@studenti.unina.it>
+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,
 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
 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
 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})
 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.
  .
  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.
  .


@@ -85,11 +86,13 @@ Description: library for accessing am7xxx based devices -- development files
  This is the development package containing the libraries and header for
  software development with libam7xxx.
 
  This is the development package containing the libraries and header for
  software development with libam7xxx.
 

-Package: libam7xxx-bin
+Package: libam7xxx0.1-bin

 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 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.
  .
  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.
  .


@@ -109,11 +112,13 @@ Description: library for accessing am7xxx devices -- utilities and samples
  .
  This package includes utilities and sample programs for libam7xxx.
 
  .
  This package includes utilities and sample programs for libam7xxx.
 

-Package: libam7xxx-doc
+Package: libam7xxx0.1-doc

 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
 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.
  .
  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.
  .