[SCM] epr-api branch, master, updated. debian/2.2-1-15-g43b0d8d
The following commit has been merged in the master branch:
commit 43b0d8d6b624e740bd0c75af249f7242654f5cc1
Author: Antonio Valentino
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 Sat, 17 Mar 2012
19:02:28 +0100
+ -- Antonio Valentino 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
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] epr-api branch, master, updated. debian/2.2-1-15-g43b0d8d
The following commit has been merged in the master branch: commit 8bc1624e5ad8cdd603961a4cac16450700f84e07 Author: Antonio Valentino Date: Sat Mar 17 19:03:37 2012 +0100 New patch for generating the static library diff --git a/debian/changelog b/debian/changelog index d5890b5..b75496c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,9 @@ epr-api (2.2-3) UNRELEASED; urgency=low - fixed formatting of the package descripton * debian/patches - patches regenerated with gbp-pq +- new patch for generating the static library - -- Antonio Valentino Sat, 17 Mar 2012 18:49:44 +0100 + -- Antonio Valentino Sat, 17 Mar 2012 19:02:28 +0100 epr-api (2.2-2) unstable; urgency=low diff --git a/debian/patches/0003-static-lib.patch b/debian/patches/0003-static-lib.patch new file mode 100644 index 000..20403ed --- /dev/null +++ b/debian/patches/0003-static-lib.patch @@ -0,0 +1,23 @@ +From: Antonio Valentino +Date: Sat, 17 Mar 2012 18:57:06 +0100 +Subject: static lib + +--- + makefile |3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/makefile b/makefile +index 6824a71..0a9bdd0 100644 +--- a/makefile b/makefile +@@ -118,6 +118,9 @@ clean: + ### + + ++$(OUTDIR)/libepr_api.a : $(OBJECTS) ++ $(AR) rcs $@ $(OBJECTS) ++ + $(TARGET) : $(OBJECTS) + $(LINK) $(LDFLAGS) -o $@ $(OBJECTS) -lm -lc + +-- diff --git a/debian/patches/series b/debian/patches/series index 6b55c2c..32b1d47 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 0001-fix-build-flags.patch 0002-spelling.patch +0003-static-lib.patch -- ENVISAT Product Reader API for C ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] epr-api branch, master, updated. debian/2.2-1-15-g43b0d8d
The following commit has been merged in the master branch:
commit 61f4f18fbecf1011e8dc4ba6ecceb20b466d7dff
Author: Antonio Valentino
Date: Sat Mar 17 18:48:13 2012 +0100
Patches regenerated with gbp-pq
diff --git a/debian/changelog b/debian/changelog
index 6898b4b..d5890b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ epr-api (2.2-3) UNRELEASED; urgency=low
- 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
- -- Antonio Valentino Sat, 17 Mar 2012
18:22:36 +0100
+ -- Antonio Valentino Sat, 17 Mar 2012
18:49:44 +0100
epr-api (2.2-2) unstable; urgency=low
diff --git a/debian/patches/0001-fix-build-flags.patch
b/debian/patches/0001-fix-build-flags.patch
index 0a1742b..81b6c08 100644
--- a/debian/patches/0001-fix-build-flags.patch
+++ b/debian/patches/0001-fix-build-flags.patch
@@ -1,12 +1,14 @@
From: Debian GIS Project
Date: Sun, 19 Dec 2010 11:09:07 +0100
-Subject: [PATCH] 0001-fix-build-flags
+Subject: fix build flags
Fix build and link flags.
---
makefile |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
+diff --git a/makefile b/makefile
+index 42f1400..6824a71 100644
--- a/makefile
+++ b/makefile
@@ -15,7 +15,7 @@ OUTDIR = ./build/$(CONFIG)
diff --git a/debian/patches/0002-spelling.patch
b/debian/patches/0002-spelling.patch
index a097d5c..ac00228 100644
--- a/debian/patches/0002-spelling.patch
+++ b/debian/patches/0002-spelling.patch
@@ -1,12 +1,14 @@
From: Antonio Valentino
Date: Fri, 17 Dec 2010 00:03:11 +0100
-Subject: [PATCH] spelling
+Subject: spelling
Fix spelling errors in record descriptions.
---
src/epr_dddb.c |8
1 files changed, 4 insertions(+), 4 deletions(-)
+diff --git a/src/epr_dddb.c b/src/epr_dddb.c
+index bcbde0a..038f460 100644
--- a/src/epr_dddb.c
+++ b/src/epr_dddb.c
@@ -3280,7 +3280,7 @@ static const struct DatasetDescriptor
ATS_TOA_1P_dataset_data[] = {
--
ENVISAT Product Reader API for C
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] epr-api branch, master, updated. debian/2.2-1-15-g43b0d8d
The following commit has been merged in the master branch:
commit a4a235c382a0b5007605efa4150d06a16db86e00
Author: Antonio Valentino
Date: Sat Mar 17 18:37:35 2012 +0100
Reverted last change on Provides and Conflicts fields
diff --git a/debian/changelog b/debian/changelog
index 9471a05..6898b4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,10 +5,9 @@ epr-api (2.2-3) UNRELEASED; urgency=low
* debian/control
- standard version bumped to 3.9.3 (no changes)
- fixed dependency spcification of the -dev package from libepr-api2
-- fixed Provides and Conflicts fields of the libepr-api2-dev package
- fixed formatting of the package descripton
- -- Antonio Valentino Sun, 11 Mar 2012
12:03:55 +0100
+ -- Antonio Valentino Sat, 17 Mar 2012
18:22:36 +0100
epr-api (2.2-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index d3c3f1a..f75ceb8 100644
--- a/debian/control
+++ b/debian/control
@@ -29,8 +29,8 @@ Section: libdevel
Architecture: all
Depends: ${misc:Depends}, libc6-dev, libepr-api2 (>= ${binary:Version}),
libepr-api2 (<< ${binary:Version}.1~)
-Provides: libepr-api2-dev
-Conflicts: libepr-api2-dev
+Provides: libepr-api-dev
+Conflicts: libepr-api-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
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
