[SCM] epr-api branch, master, updated. debian/2.2-1-15-g43b0d8d

[Antonio Valentino]

The following commit has been merged in the master branch:
commit 43b0d8d6b624e740bd0c75af249f7242654f5cc1
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sat Mar 17 19:35:35 2012 +0100

    Provide a static version of the library

diff --git a/debian/changelog b/debian/changelog
index b75496c..60c39a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,21 @@
 epr-api (2.2-3) UNRELEASED; urgency=low
 
+  * standard version bumped to 3.9.3 (no changes)
+  * 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
   * debian/copyright
     - use versioned copyright format uri
   * debian/control
-    - standard version bumped to 3.9.3 (no changes)
     - 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:02:28 +0100
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Sat, 17 Mar 2012 19:29:55 +0100
 
 epr-api (2.2-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index f75ceb8..2aed430 100644
--- a/debian/control
+++ b/debian/control
@@ -26,11 +26,8 @@ Description: ENVISAT Product Reader API for C
 
 Package: libepr-api2-dev
 Section: libdevel
-Architecture: all
-Depends: ${misc:Depends}, libc6-dev, libepr-api2 (>= ${binary:Version}),
-         libepr-api2 (<< ${binary:Version}.1~)
-Provides: libepr-api-dev
-Conflicts: libepr-api-dev
+Architecture: any
+Depends: ${misc:Depends}, libc6-dev, libepr-api2 (= ${binary:Version})
 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.install b/debian/libepr-api2-dev.install
index 41a1414..495aeee 100644
--- a/debian/libepr-api2-dev.install
+++ b/debian/libepr-api2-dev.install
@@ -1 +1,2 @@
 usr/include/*
+usr/lib/libepr_api.a
diff --git a/debian/rules b/debian/rules
index 55476e8..96295c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,7 @@ build/libepr-api2-dev::
 	cd $(DEB_BUILDDIR)/build && ln -sf ../docs/images
 	mkdir -p $(DEB_BUILDDIR)/build/epr_c_api
 	cd $(DEB_BUILDDIR)/build && doxygen Doxyfile.txt
+	$(MAKE) -C $(DEB_BUILDDIR) CONFIG=release $(DEB_BUILDDIR)/build/release/libepr_api.a
 
 
 install/libepr-api2::
@@ -30,6 +31,7 @@ install/libepr-api2::
 install/libepr-api2-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
 
 
 clean::

-- 
ENVISAT Product Reader API for C