[SCM] epr-api branch, master, updated. debian/2.2-1-17-gd29a970

[Antonio Valentino]

The following commit has been merged in the master branch:
commit d29a97008f9b8be65a0a8fc6b47e9d5eea036dbd
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sun Mar 25 11:45:17 2012 +0200

    Added missing conflicts field

diff --git a/debian/changelog b/debian/changelog
index a29e025..3d36775 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,7 +13,7 @@ epr-api (2.2-3) unstable; urgency=low
     - patches regenerated with gbp-pq
     - new patch for generating the static library
 
- -- Antonio Valentino <antonio.valentino at tiscali.it>  Sun, 25 Mar 2012 11:00:26 +0200
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Sun, 25 Mar 2012 11:44:09 +0200
 
 epr-api (2.2-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 7b1be4e..c2c8b29 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,7 @@ Architecture: any
 Depends: ${misc:Depends}, libc6-dev, libepr-api2 (= ${binary:Version})
 Provides: libepr-api2-dev
 Replaces: libepr-api2-dev
+Conflicts: libepr-api2-dev
 Description: ENVISAT Product Reader API for C - Development files
  The ENVISAT Product Reader API is a set of C-source code files
  supporting developers who want to use MERIS, AATSR, and ASAR data

-- 
ENVISAT Product Reader API for C