[SCM] epr-api branch, master, updated. debian/2.2-1-16-gb442651

[Antonio Valentino]

The following commit has been merged in the master branch:
commit b44265100eca5484b880c1fec20a6345a1c869c8
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sat Mar 24 13:23:40 2012 +0100

    Rename the -dev package into libepr-api-dev
    
    Provides and Conflicts have to stay in until the -dev package is renamed

diff --git a/debian/changelog b/debian/changelog
index 60c39a2..a29e025 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,21 +1,19 @@
-epr-api (2.2-3) UNRELEASED; urgency=low
+epr-api (2.2-3) unstable; urgency=low
 
   * standard version bumped to 3.9.3 (no changes)
+  * the -dev package has been renamed from libepr-api2-dev into libepr-api-dev
   * now the -dev package also provides a static version of the library
   * debian/control
     - the -dev package is now architecture any
     - the -dev package now Depends from libepr-api2 (= ${binary:Version})
-    - removed Provides and Conflicts fields
+    - fixed formatting of the package descriptonv
   * debian/copyright
     - use versioned copyright format uri
-  * debian/control
-    - fixed dependency spcification of the -dev package from libepr-api2
-    - fixed formatting of the package descripton
   * debian/patches
     - patches regenerated with gbp-pq
     - new patch for generating the static library
 
- -- Antonio Valentino <antonio.valentino at tiscali.it>  Sat, 17 Mar 2012 19:29:55 +0100
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Sun, 25 Mar 2012 11:00:26 +0200
 
 epr-api (2.2-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 2aed430..7b1be4e 100644
--- a/debian/control
+++ b/debian/control
@@ -24,10 +24,12 @@ Description: ENVISAT Product Reader API for C
      software systems which allow for extension using a C or C++
      interface.
 
-Package: libepr-api2-dev
+Package: libepr-api-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends}, libc6-dev, libepr-api2 (= ${binary:Version})
+Provides: libepr-api2-dev
+Replaces: 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
diff --git a/debian/libepr-api2-dev.doc-base b/debian/libepr-api-dev.doc-base
similarity index 65%
rename from debian/libepr-api2-dev.doc-base
rename to debian/libepr-api-dev.doc-base
index e01cf98..2fab604 100644
--- a/debian/libepr-api2-dev.doc-base
+++ b/debian/libepr-api-dev.doc-base
@@ -6,5 +6,5 @@ Abstract: This document describes the libepr-api
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libepr-api2-dev/epr_c_api/index.html
-Files: /usr/share/doc/libepr-api2-dev/epr_c_api/*.html
+Index: /usr/share/doc/libepr-api-dev/epr_c_api/index.html
+Files: /usr/share/doc/libepr-api-dev/epr_c_api/*.html
diff --git a/debian/libepr-api2-dev.docs b/debian/libepr-api-dev.docs
similarity index 100%
rename from debian/libepr-api2-dev.docs
rename to debian/libepr-api-dev.docs
diff --git a/debian/libepr-api2-dev.examples b/debian/libepr-api-dev.examples
similarity index 100%
rename from debian/libepr-api2-dev.examples
rename to debian/libepr-api-dev.examples
diff --git a/debian/libepr-api2-dev.install b/debian/libepr-api-dev.install
similarity index 100%
rename from debian/libepr-api2-dev.install
rename to debian/libepr-api-dev.install
diff --git a/debian/libepr-api2-dev.links b/debian/libepr-api-dev.links
similarity index 51%
rename from debian/libepr-api2-dev.links
rename to debian/libepr-api-dev.links
index aebe6e2..25cf5e5 100644
--- a/debian/libepr-api2-dev.links
+++ b/debian/libepr-api-dev.links
@@ -1,3 +1,3 @@
 usr/lib/libepr_api.so.2 usr/lib/libepr_api.so
-usr/share/doc/libepr-api2/changelog.gz usr/share/doc/libepr-api2-dev/changelog.gz
-usr/share/doc/libepr-api2/README.txt.gz usr/share/doc/libepr-api2-dev/README.txt.gz
+usr/share/doc/libepr-api2/changelog.gz usr/share/doc/libepr-api-dev/changelog.gz
+usr/share/doc/libepr-api2/README.txt.gz usr/share/doc/libepr-api-dev/README.txt.gz
diff --git a/debian/rules b/debian/rules
index 96295c4..64e4148 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ makebuilddir/libepr-api2::
 build/libepr-api2::
 	strip --strip-unneeded $(DEB_BUILDDIR)/build/release/libepr_api.so
 
-build/libepr-api2-dev::
+build/libepr-api-dev::
 	cd $(DEB_BUILDDIR)/build && ln -sf ../docs/*.html ../docs/*.txt .
 	cd $(DEB_BUILDDIR)/build && ln -sf ../docs/images
 	mkdir -p $(DEB_BUILDDIR)/build/epr_c_api
@@ -28,7 +28,7 @@ install/libepr-api2::
 	install -D --mode=0644 $(DEB_BUILDDIR)/build/release/libepr_api.so $(DEB_DESTDIR)/usr/lib/libepr_api.so.2
 
 
-install/libepr-api2-dev::
+install/libepr-api-dev::
 	install -D --mode=0644 $(DEB_SRCDIR)/src/epr_api.h $(DEB_DESTDIR)/usr/include/epr_api.h
 	install -D --mode=0644 $(DEB_SRCDIR)/src/epr_ptrarray.h $(DEB_DESTDIR)/usr/include/epr_ptrarray.h
 	install -D --mode=0644 $(DEB_BUILDDIR)/build/release/libepr_api.a $(DEB_DESTDIR)/usr/lib/libepr_api.a

-- 
ENVISAT Product Reader API for C