[SCM] epr-api branch, master, updated. debian/2.2-1-29-ge0d9945
The following commit has been merged in the master branch:
commit 6bdda6eece3ca4f3718efae0dad57a521c3fa84d
Author: Antonio Valentino
Date: Tue Aug 13 18:28:58 2013 +
Use canonical URL for VCS fields
diff --git a/debian/changelog b/debian/changelog
index b154e19..866ab99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ epr-api (2.3~dev20130813-1) UNRELEASED; urgency=low
- the -dev package is now architecture any
- the -dev package now Depends from libepr-api2 (= ${binary:Version})
- fixed formatting of the package descripton
+- use canonical URL for VCS fields
* debian/copyright
- use versioned copyright format uri
- updated dates in copyright statements
diff --git a/debian/control b/debian/control
index f23d5ab..a19b4f4 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,8 @@ Uploaders: Antonio Valentino
Build-Depends: cdbs, debhelper (>= 7.0.50~), doxygen
Standards-Version: 3.9.4
Homepage: http://github.com/bcdev/epr-api
-Vcs-Git: git://git.debian.org/git/pkg-grass/epr-api.git
-Vcs-Browser: http://git.debian.org/?p=pkg-grass/epr-api.git
+Vcs-Git: git://anonscm.debian.org/pkg-grass/epr-api.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/epr-api.git
Package: libepr-api2
Architecture: any
--
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-29-ge0d9945
The following commit has been merged in the master branch:
commit e0d99458e70745516dc79497e66c4ebfc9c41355
Author: Antonio Valentino
Date: Tue Aug 13 16:49:56 2013 +
Switch from cdbs to dh (debhelper command sequencer)
diff --git a/debian/changelog b/debian/changelog
index 0503fdb..1398b72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ epr-api (2.3~dev20130813-1) UNRELEASED; urgency=low
- the -dev package now Depends from libepr-api2 (= ${binary:Version})
- fixed formatting of the package descripton
- use canonical URL for VCS fields
+- added build dependency from cmake
+- dropped build dependency from cdbs
+ * debian/rules
+- switch from cdbs to dh (debhelper command sequencer)
* debian/copyright
- use versioned copyright format uri
- updated dates in copyright statements
diff --git a/debian/control b/debian/control
index ded3f2f..7f363e5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
Priority: optional
Maintainer: Debian GIS Project
Uploaders: Antonio Valentino
-Build-Depends: cdbs, debhelper (>= 9), doxygen
+Build-Depends: debhelper (>= 9), cmake, doxygen
Standards-Version: 3.9.4
Homepage: http://github.com/bcdev/epr-api
Vcs-Git: git://anonscm.debian.org/pkg-grass/epr-api.git
diff --git a/debian/libepr-api-dev.doc-base b/debian/libepr-api-dev.doc-base
index 2fab604..9cc8d26 100644
--- a/debian/libepr-api-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-api-dev/epr_c_api/index.html
-Files: /usr/share/doc/libepr-api-dev/epr_c_api/*.html
+Index: /usr/share/doc/libepr-api-dev/html/index.html
+Files: /usr/share/doc/libepr-api-dev/html/*.html
diff --git a/debian/libepr-api-dev.docs b/debian/libepr-api-dev.docs
deleted file mode 100644
index 78c75b6..000
--- a/debian/libepr-api-dev.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-build/epr_c_api
-docs/images
diff --git a/debian/libepr-api-dev.install b/debian/libepr-api-dev.install
index 495aeee..bd40497 100644
--- a/debian/libepr-api-dev.install
+++ b/debian/libepr-api-dev.install
@@ -1,2 +1,4 @@
usr/include/*
usr/lib/libepr_api.a
+usr/share/doc/epr-api/html usr/share/doc/libepr-api-dev
+usr/share/doc/epr-api/images usr/share/doc/libepr-api-dev
diff --git a/debian/libepr-api2.docs b/debian/libepr-api2.docs
index f0014df..06c9553 100644
--- a/debian/libepr-api2.docs
+++ b/debian/libepr-api2.docs
@@ -1,3 +1,2 @@
-CHANGELOG.txt
README.txt
VERSION.txt
diff --git a/debian/rules b/debian/rules
index 64e4148..785b4c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,45 +1,28 @@
#!/usr/bin/make -f
+# -*- makefile -*-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+CMAKE_EXTRA_FLAGS += -DBUILD_DOCS:BOOL=ON -DBUILD_TESTS:BOOL=ON
-DEB_MAKE_BUILD_TARGET = all_rel
-DEB_MAKE_CLEAN_TARGET = CONFIG=release clean
-DEB_MAKE_EXTRA_ARGS = LDFLAGS="-soname=libepr_api.so.2"
+%:
+ dh $@ --buildsystem=cmake --builddirectory=build
-makebuilddir/libepr-api2::
- mkdir -p $(DEB_BUILDDIR)/build/release
+override_dh_auto_configure:
+ mkdir -p build
+ dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)
-build/libepr-api2::
- strip --strip-unneeded $(DEB_BUILDDIR)/build/release/libepr_api.so
-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
- cd $(DEB_BUILDDIR)/build && doxygen Doxyfile.txt
- $(MAKE) -C $(DEB_BUILDDIR) CONFIG=release
$(DEB_BUILDDIR)/build/release/libepr_api.a
+override_dh_installchangelogs:
+ dh_installchangelogs -k CHANGELOG.txt
-install/libepr-api2::
- install -D --mode=0644 $(DEB_BUILDDIR)/build/release/libepr_api.so
$(DEB_DESTDIR)/usr/lib/libepr_api.so.2
-
-
-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
-
-
-clean::
- rm -rf $(DEB_BUILDDIR)/build
-
-
-.PHONY: get-orig-source
-
get-orig-source:
uscan --force-download --destdir=debian
mv debian/?.?.tar.gz
../$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+
+
+.PHONY: get-orig-source override_dh_auto_configure
override_dh_installchangelogs
--
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-29-ge0d9945
The following commit has been merged in the master branch: commit 989e5eccaafb3bc28b757e588bb440ef5a486d88 Author: Antonio Valentino Date: Tue Aug 13 18:38:26 2013 + Set compat to 9 diff --git a/debian/changelog b/debian/changelog index 866ab99..0503fdb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ epr-api (2.3~dev20130813-1) UNRELEASED; urgency=low - new patch for generating the static library - new patch for setting the SOVERSION - new patch for linking test programs with libm + * Set compat to 9 -- Antonio Valentino Tue, 13 Aug 2013 15:20:14 + diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index a19b4f4..ded3f2f 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: libs Priority: optional Maintainer: Debian GIS Project Uploaders: Antonio Valentino -Build-Depends: cdbs, debhelper (>= 7.0.50~), doxygen +Build-Depends: cdbs, debhelper (>= 9), doxygen Standards-Version: 3.9.4 Homepage: http://github.com/bcdev/epr-api Vcs-Git: git://anonscm.debian.org/pkg-grass/epr-api.git -- 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-29-ge0d9945
The following commit has been merged in the master branch:
commit ee11cf8d81c20500899098bf144338b109ce879b
Author: Antonio Valentino
Date: Tue Aug 13 15:38:15 2013 +
Changelog file update to merge ghanges from version 2.2-3 (never released)
diff --git a/debian/changelog b/debian/changelog
index e55fef0..5994849 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,28 +1,23 @@
epr-api (2.3~dev20130813-1) UNRELEASED; urgency=low
* New upstream snapshot
- * Refresh all patches: fix-build-flags.patch and spelling.patch have been
-removed because applied upstream
- * Updated copyright file (updated dates in copyright statements)
-
- -- Antonio Valentino Tue, 13 Aug 2013
15:20:14 +
-
-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
+ * 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})
-- fixed formatting of the package descriptonv
+- fixed formatting of the package descripton
* debian/copyright
- use versioned copyright format uri
+- updated dates in copyright statements
* debian/patches
- patches regenerated with gbp-pq
- new patch for generating the static library
+- fix-build-flags.patch and spelling.patch patches have been removed
+ because applied upstream
- -- Antonio Valentino Sun, 25 Mar 2012
11:44:09 +0200
+ -- Antonio Valentino Tue, 13 Aug 2013
15:20:14 +
epr-api (2.2-2) unstable; urgency=low
--
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-29-ge0d9945
The following commit has been merged in the master branch: commit 43e24725bf323461179b008a378b4ed4ffd410f7 Merge: d29a97008f9b8be65a0a8fc6b47e9d5eea036dbd 5812e8f0c8add4c105a47b6aa41332aab608bea4 Author: Antonio Valentino Date: Tue Aug 13 11:12:39 2013 + Merge tag 'upstream/2.3_dev20130813' Upstream version 2.3~dev20130813 -- 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-29-ge0d9945
The following commit has been merged in the master branch:
commit 2e725d1afb45f406bbe087425288b38540b0de0b
Author: Antonio Valentino
Date: Tue Aug 13 15:23:12 2013 +
New updtrean snapshot and patch refresh
diff --git a/debian/changelog b/debian/changelog
index 3d36775..6df259f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+epr-api (2.3~dev20130813-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot
+ * Refresh all patches: fix-build-flags.patch and spelling.patch have been
+removed because applied upstream
+
+ -- Antonio Valentino Tue, 13 Aug 2013
15:20:14 +
+
epr-api (2.2-3) unstable; urgency=low
* standard version bumped to 3.9.3 (no changes)
diff --git a/debian/patches/0001-fix-build-flags.patch
b/debian/patches/0001-fix-build-flags.patch
deleted file mode 100644
index 81b6c08..000
--- a/debian/patches/0001-fix-build-flags.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Debian GIS Project
-Date: Sun, 19 Dec 2010 11:09:07 +0100
-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)
- # TARGET = $(OUTDIR)/libepr_api.so
-
- # for linux
--COMPILE = gcc -fPIC -ansi -c -I$(SRCDIR) -I$(THISDIR) $(OPTIONS)
-+COMPILE = $(CC) $(CFLAGS) -fPIC -ansi -c -I$(SRCDIR) -I$(THISDIR) $(OPTIONS)
- LINK= ld -shared
- TARGET = $(OUTDIR)/libepr_api.so
-
-@@ -119,7 +119,7 @@ clean:
-
-
- $(TARGET) : $(OBJECTS)
-- $(LINK) -o $@ $(OBJECTS) -lm
-+ $(LINK) $(LDFLAGS) -o $@ $(OBJECTS) -lm -lc
-
- SRC_1 = $(SRCDIR)/epr_api.c
- $(OUTDIR)/epr_api.o : $(HEADERS) $(SRC_1)
---
diff --git a/debian/patches/0003-static-lib.patch
b/debian/patches/0001-static-lib.patch
similarity index 85%
rename from debian/patches/0003-static-lib.patch
rename to debian/patches/0001-static-lib.patch
index 20403ed..fd30101 100644
--- a/debian/patches/0003-static-lib.patch
+++ b/debian/patches/0001-static-lib.patch
@@ -3,8 +3,8 @@ Date: Sat, 17 Mar 2012 18:57:06 +0100
Subject: static lib
---
- makefile |3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
+ makefile | 3 +++
+ 1 file changed, 3 insertions(+)
diff --git a/makefile b/makefile
index 6824a71..0a9bdd0 100644
@@ -20,4 +20,3 @@ index 6824a71..0a9bdd0 100644
$(TARGET) : $(OBJECTS)
$(LINK) $(LDFLAGS) -o $@ $(OBJECTS) -lm -lc
---
diff --git a/debian/patches/0002-spelling.patch
b/debian/patches/0002-spelling.patch
deleted file mode 100644
index ac00228..000
--- a/debian/patches/0002-spelling.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Antonio Valentino
-Date: Fri, 17 Dec 2010 00:03:11 +0100
-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[] = {
- static const struct DatasetDescriptor MER_FR__1P_dataset_data[] = {
- {"Quality_ADS", "Quality ADS", MER_RR__1P_ADSR_sq_meris_rec_data, "Level
1b Summary Quality ADS(SQ ADS)"},
- {"Scaling_Factor_GADS", "Scaling Factor GADS",
MER_RR__1P_GADS_sfgi_meris_rec_data, "Level 1b GADS Scaling Factor and General
Info"},
--{"Tie_points_ADS", "Tie points ADS",
MER_RR__1P_ADSR_tie_pt_meris_rec_data, "Level 1b ADS Tie Point Location and
Auxilliary Data (LADS)"},
-+{"Tie_points_ADS", "Tie points ADS",
MER_RR__1P_ADSR_tie_pt_meris_rec_data, "Level 1b ADS Tie Point Location and
Auxiliary Data (LADS)"},
- {"Radiance_1", "Radiance MDS(1)", MER_RR__1P_MDSR_1_15_meris_rec_data,
"Level 1b MDS (1) TOA Radiance"},
- {"Radiance_2", "Radiance MDS(2)", MER_RR__1P_MDSR_1_15_meris_rec_data,
"Level 1b MDS (2) TOA Radiance"},
- {"Radiance_3", "Radiance MDS(3)", MER_RR__1P_MDSR_1_15_meris_rec_data,
"Level 1b MDS (3) TOA Radiance"},
-@@ -3302,7 +3302,7 @@ static const struct DatasetDescriptor
MER_FR__1P_dataset_data[] = {
- static const struct DatasetDescriptor MER_FR__1P_IODD5_dataset_data[] = {
- {"Quality_ADS", "Quality ADS", MER_RR__1P_ADSR_sq_meris_rec_data, "Level
1b Summary Quality ADS(SQ ADS)"},
- {"Scaling_Factor_GADS", "Scaling Factor GADS",
MER_RR__1P_GADS_sfgi_meris_rec_data, "Level 1b GADS Scaling Factor and General
Info"},
--{"Tie_points_ADS", "Tie points ADS",
MER_RR__1P_ADSR_tie_pt_meris_rec_data, "Level 1b ADS Tie Point Location and
Auxilliary Data (LADS)"},
-+{"Tie_points_ADS", "Tie points ADS",
MER_RR__1P_ADSR_tie_pt_meris_rec_data, "Level 1b ADS Tie Point Location and
Auxiliary Data (LADS)"},
- {"Radiance_1", "Radiance MDS(1)", MER_RR__1P_MDSR_1_15_meris_rec_data,
"Level 1b MDS (1) TOA Radiance"},
- {"Radiance_2", "Radiance MDS(2)", MER_RR__1P_MDSR_1_15_mer
[SCM] epr-api branch, master, updated. debian/2.2-1-29-ge0d9945
The following commit has been merged in the master branch:
commit fc5390648ce30ee307c622813df6df61808f7095
Author: Antonio Valentino
Date: Tue Aug 13 17:49:00 2013 +
Link test programs with libm
diff --git a/debian/changelog b/debian/changelog
index 1b49751..b154e19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,8 @@ epr-api (2.3~dev20130813-1) UNRELEASED; urgency=low
- fix-build-flags.patch and spelling.patch patches have been removed
because applied upstream
- new patch for generating the static library
-- new patch doe setting the SOVERSION
+- new patch for setting the SOVERSION
+- new patch for linking test programs with libm
-- Antonio Valentino Tue, 13 Aug 2013
15:20:14 +
diff --git a/debian/patches/0003-Link-test-programs-with-libm.patch
b/debian/patches/0003-Link-test-programs-with-libm.patch
new file mode 100644
index 000..bf2e941
--- /dev/null
+++ b/debian/patches/0003-Link-test-programs-with-libm.patch
@@ -0,0 +1,35 @@
+From: Antonio Valentino
+Date: Tue, 13 Aug 2013 17:47:13 +
+Subject: Link test programs with libm
+
+---
+ debian/changelog| 3 ++-
+ src/api-test/CMakeLists.txt | 2 +-
+ src/test/CMakeLists.txt | 2 +-
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/api-test/CMakeLists.txt b/src/api-test/CMakeLists.txt
+index 5f18494..e0d3bd8 100644
+--- a/src/api-test/CMakeLists.txt
b/src/api-test/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ # Copyright (c) 2013 Antonio Valentino
+
+ add_executable(api_tests api_tests.c)
+-target_link_libraries(api_tests epr_api)
++target_link_libraries(api_tests epr_api m)
+
+ #add_test(TEST_API_02 api_tests)
+diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
+index d33d6f5..e16db6b 100644
+--- a/src/test/CMakeLists.txt
b/src/test/CMakeLists.txt
+@@ -7,7 +7,7 @@ set(TARGETS api_unit_tests
+
+ foreach(TEST ${TARGETS})
+ add_executable(${TEST} ${TEST}.c)
+-target_link_libraries(${TEST} epr_api)
++target_link_libraries(${TEST} epr_api m)
+ endforeach(TEST)
+
+ target_link_libraries(epr_main_test bccunit)
diff --git a/debian/patches/series b/debian/patches/series
index f088d53..fa8e344 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
0001-static-lib.patch
0002-Set-SOVERSION.patch
+0003-Link-test-programs-with-libm.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-29-ge0d9945
The following commit has been merged in the master branch: commit b25bc585fb1fece11027bb7db51e3bc5d163d31f Author: Antonio Valentino Date: Tue Aug 13 15:39:36 2013 + Standard version bumped to 3.9.4 diff --git a/debian/changelog b/debian/changelog index 5994849..4108013 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ epr-api (2.3~dev20130813-1) UNRELEASED; urgency=low * New upstream snapshot - * Standard version bumped to 3.9.3 (no changes) + * Standard version bumped to 3.9.4 (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 diff --git a/debian/control b/debian/control index c2c8b29..f23d5ab 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian GIS Project Uploaders: Antonio Valentino Build-Depends: cdbs, debhelper (>= 7.0.50~), doxygen -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Homepage: http://github.com/bcdev/epr-api Vcs-Git: git://git.debian.org/git/pkg-grass/epr-api.git Vcs-Browser: http://git.debian.org/?p=pkg-grass/epr-api.git -- 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-29-ge0d9945
The following commit has been merged in the master branch: commit eea9a43f7274dbee782d64a95269a46ea4ed71da Author: Antonio Valentino Date: Tue Aug 13 15:32:00 2013 + Updated copyright file diff --git a/debian/changelog b/debian/changelog index 6df259f..e55fef0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ epr-api (2.3~dev20130813-1) UNRELEASED; urgency=low * New upstream snapshot * Refresh all patches: fix-build-flags.patch and spelling.patch have been removed because applied upstream + * Updated copyright file (updated dates in copyright statements) -- Antonio Valentino Tue, 13 Aug 2013 15:20:14 + diff --git a/debian/copyright b/debian/copyright index f5d1d40..891cb04 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,11 +3,11 @@ Upstream-Name: epr-api Source: http://github.com/bcdev/epr-api Files: * -Copyright: 2002 Brockmann Consult +Copyright: 2002-2013 Brockmann Consult License: GPL-3.0+ Files: debian/* -Copyright: 2010-2011 Antonio Valentino +Copyright: 2010-2013 Antonio Valentino License: GPL-3.0+ Files: src/examples/tiff*.h -- 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-29-ge0d9945
The following commit has been merged in the master branch:
commit 59f8f8209607020e8e49f4d4d9d590ef024e152a
Author: Antonio Valentino
Date: Tue Aug 13 17:23:06 2013 +
New patch for setting the SOVERSION
diff --git a/debian/changelog b/debian/changelog
index 4108013..1b49751 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,9 +13,10 @@ epr-api (2.3~dev20130813-1) UNRELEASED; urgency=low
- updated dates in copyright statements
* debian/patches
- patches regenerated with gbp-pq
-- new patch for generating the static library
- fix-build-flags.patch and spelling.patch patches have been removed
because applied upstream
+- new patch for generating the static library
+- new patch doe setting the SOVERSION
-- Antonio Valentino Tue, 13 Aug 2013
15:20:14 +
diff --git a/debian/patches/0002-Set-SOVERSION.patch
b/debian/patches/0002-Set-SOVERSION.patch
new file mode 100644
index 000..baf369e
--- /dev/null
+++ b/debian/patches/0002-Set-SOVERSION.patch
@@ -0,0 +1,23 @@
+From: Antonio Valentino
+Date: Tue, 13 Aug 2013 17:21:11 +
+Subject: Set SOVERSION
+
+---
+ src/CMakeLists.txt | 4
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index f1e9540..9af5837 100644
+--- a/src/CMakeLists.txt
b/src/CMakeLists.txt
+@@ -24,6 +24,10 @@ set(SOURCES epr_api.c
+
+ # targets
+ add_library(epr_api SHARED ${SOURCES})
++set_target_properties(epr_api PROPERTIES
++VERSION
"${EPR_API_VERSION_MAJOR}.${EPR_API_VERSION_MINOR}.${EPR_API_VERSION_PATCH}"
++SOVERSION ${EPR_API_VERSION_MAJOR})
++
+
+ if(BUILD_STATIC_LIB)
+ add_library(epr_api_static STATIC ${SOURCES})
diff --git a/debian/patches/series b/debian/patches/series
index a86781a..f088d53 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
0001-static-lib.patch
+0002-Set-SOVERSION.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
