[libterralib] tag debian/4.3.0+dfsg.2-11 created (now 6aefeb5)
This is an automated email from the git hooks/post-receive script. mckinstry pushed a change to tag debian/4.3.0+dfsg.2-11 in repository libterralib. at 6aefeb5 (commit) No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libterralib] 02/08: switch to build depend on the metapackage default-libmysqlclient-dev Closes: #845868
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch debian/master in repository libterralib. commit 9d92e091a11e724c48006ef17474ec538f1c0b3e Author: Alastair McKinstry <mckins...@debian.org> Date: Fri Dec 9 12:36:21 2016 + switch to build depend on the metapackage default-libmysqlclient-dev Closes: #845868 --- debian/changelog | 9 - debian/control | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b59cb88..74068f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,16 @@ +libterralib (4.3.0+dfsg.2-8) UNRELEASED; urgency=medium + + * switch to build depend on the metapackage default-libmysqlclient-dev +Closes: #845868 + * Use debhelper 10 + + -- Alastair McKinstry <mckins...@debian.org> Fri, 09 Dec 2016 12:35:48 + + libterralib (4.3.0+dfsg.2-7) unstable; urgency=medium * Add patch for g++6 (-std11) changes. * Build -std11 in prep. for g++-6 * Standards-Version: 3.9.8 - * Use debhelper 10 -- Alastair McKinstry <mckins...@debian.org> Mon, 02 May 2016 16:46:24 +0100 diff --git a/debian/control b/debian/control index 467f9cc..b152d81 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 10), libqwt-qt5-dev, libshp-dev, libdxflib-dev (>= 3.12.2), - libmysqlclient-dev, + default-libmysqlclient-dev, libpq-dev, firebird-dev Standards-Version: 3.9.8 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libterralib] 05/08: Merge branch 'debian/master' into newmaster
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch debian/master in repository libterralib. commit be7eb3229f85b5f60acd9d3cc1a875c6f9c4b237 Merge: 8cc28c3 a4d5d69 Author: Alastair McKinstry <mckins...@debian.org> Date: Mon Dec 12 10:20:55 2016 + Merge branch 'debian/master' into newmaster debian/changelog | 8 debian/compat| 2 +- debian/control | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --cc debian/changelog index b475844,74068f2..a9bb709 --- a/debian/changelog +++ b/debian/changelog @@@ -1,17 -1,11 +1,25 @@@ -libterralib (4.3.0+dfsg.2-8) UNRELEASED; urgency=medium ++libterralib (4.3.0+dfsg.2-10) UNRELEASED; urgency=medium + + * switch to build depend on the metapackage default-libmysqlclient-dev + Closes: #845868 + * Use debhelper 10 + + -- Alastair McKinstry <mckins...@debian.org> Fri, 09 Dec 2016 12:35:48 + + +libterralib (4.3.0+dfsg.2-9) unstable; urgency=medium + + * Patch from Set C locale when archiving object files to get a deterministic order. +Thanks to Eduard Sanou. Closes: #831093. + + -- Alastair McKinstry <mckins...@debian.org> Tue, 02 Aug 2016 11:04:35 +0100 + +libterralib (4.3.0+dfsg.2-8) unstable; urgency=medium + + * Fix for ::isnan change for G++ 5.4, 6.1. Closes: #830463 + * Drop Petter Reinholsen as uploader. Closes: #830910. + + -- Alastair McKinstry <mckins...@debian.org> Thu, 14 Jul 2016 17:36:39 +0100 + libterralib (4.3.0+dfsg.2-7) unstable; urgency=medium * Add patch for g++6 (-std11) changes. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libterralib] branch debian/master created (now 6aefeb5)
This is an automated email from the git hooks/post-receive script. mckinstry pushed a change to branch debian/master in repository libterralib. at 6aefeb5 Update FSF address in debian/copyright This branch includes the following new commits: new 390cbc9 Use debhelper 10 new 9d92e09 switch to build depend on the metapackage default-libmysqlclient-dev Closes: #845868 new a4d5d69 Typo in std def new 8cc28c3 Include accidentally dropped patches new be7eb32 Merge branch 'debian/master' into newmaster new a5568cb prep for release new d7eff0f * Ack. patch and close bug: Closes: #831903 * Standards-Version: 4.0.0; no changes required new 6aefeb5 Update FSF address in debian/copyright The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libterralib] tag debian/4.3.0+dfsg.2-9 created (now 8cc28c3)
This is an automated email from the git hooks/post-receive script. mckinstry pushed a change to tag debian/4.3.0+dfsg.2-9 in repository libterralib. at 8cc28c3 (commit) No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libterralib] 03/08: Typo in std def
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch debian/master in repository libterralib. commit a4d5d69290f569b65b5422fc7738f99f1f4d9592 Author: Alastair McKinstry <mckins...@debian.org> Date: Fri Dec 9 13:03:11 2016 + Typo in std def --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 75ccaec..b33c0a1 100755 --- a/debian/rules +++ b/debian/rules @@ -17,7 +17,7 @@ DEB_BUILD_MAINT_OPTIONS:= hardening=+all DEB_CFLAGS_MAINT_APPEND:= -Wall -pedantic export DEB_BUILD_MAINT_OPTIONS export DEB_CFLAGS_MAINT_APPEND -CXXFLAGS:= $(shell dpkg-buildflags --get CXXFLAGS) -std11 +CXXFLAGS:= $(shell dpkg-buildflags --get CXXFLAGS) -std=c++11 CXXFLAGS:= '$(CXXFLAGS) -fpermissive -I/usr/include/geotiff -I/usr/include/dxflib -I/usr/include/qwt' override_dh_auto_build: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libterralib] 08/08: Update FSF address in debian/copyright
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch debian/master in repository libterralib. commit 6aefeb5d3f8e37821997372a0bef11f37bac8f6a Author: Alastair McKinstry <mckins...@debian.org> Date: Sun Jul 30 11:47:58 2017 +0100 Update FSF address in debian/copyright --- debian/changelog | 1 + debian/copyright | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5e88672..33cb0db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ libterralib (4.3.0+dfsg.2-11) unstable; urgency=medium * Ack. patch and close bug: Closes: #831903 * Standards-Version: 4.0.0; no changes required + * Update FSF address in debian/copyright -- Alastair McKinstry <mckins...@debian.org> Sun, 30 Jul 2017 11:42:15 +0100 diff --git a/debian/copyright b/debian/copyright index 0778b40..5a27953 100644 --- a/debian/copyright +++ b/debian/copyright @@ -330,7 +330,7 @@ License: GPL-2 . You should have received a copy of the GNU General Public License along with this package; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA . On Debian systems, the full text of the GNU General Public @@ -690,8 +690,8 @@ License: ANSI2KNR . 5. If you wish to incorporate parts of Ghostscript into other free programs whose distribution conditions are different, write to the Free - Software Foundation at 675 Mass Ave, Cambridge, MA 02139. We have not - yet worked out a simple rule that can be stated here, but we will often + Software Foundation at 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + We have not yet worked out a simple rule that can be stated here, but we will often permit this. We will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libterralib] 04/08: Include accidentally dropped patches
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch debian/master in repository libterralib. commit 8cc28c396d4c776e2f51d8d6286b8bc6d0f8197a Author: Alastair McKinstry <mckins...@debian.org> Date: Mon Dec 12 10:17:48 2016 + Include accidentally dropped patches --- debian/changelog | 14 ++ debian/control | 3 +-- debian/patches/g++-6-fixes.patch | 9 ++--- debian/rules | 4 ++-- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 53b73a5..b475844 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +libterralib (4.3.0+dfsg.2-9) unstable; urgency=medium + + * Patch from Set C locale when archiving object files to get a deterministic order. +Thanks to Eduard Sanou. Closes: #831093. + + -- Alastair McKinstry <mckins...@debian.org> Tue, 02 Aug 2016 11:04:35 +0100 + +libterralib (4.3.0+dfsg.2-8) unstable; urgency=medium + + * Fix for ::isnan change for G++ 5.4, 6.1. Closes: #830463 + * Drop Petter Reinholsen as uploader. Closes: #830910. + + -- Alastair McKinstry <mckins...@debian.org> Thu, 14 Jul 2016 17:36:39 +0100 + libterralib (4.3.0+dfsg.2-7) unstable; urgency=medium * Add patch for g++6 (-std11) changes. diff --git a/debian/control b/debian/control index 9e4ad62..2e7955e 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,6 @@ Source: libterralib Maintainer: Debian GIS Team <pkg-grass-devel@lists.alioth.debian.org> -Uploaders: Petter Reinholdtsen <p...@debian.org>, - Alastair McKinstry <mckins...@debian.org> +Uploaders: Alastair McKinstry <mckins...@debian.org> Section: libs Priority: optional Build-Depends: debhelper (>= 9), diff --git a/debian/patches/g++-6-fixes.patch b/debian/patches/g++-6-fixes.patch index 6abced6..228f1a8 100644 --- a/debian/patches/g++-6-fixes.patch +++ b/debian/patches/g++-6-fixes.patch @@ -7,12 +7,15 @@ Index: libterralib-4.3.0+dfsg.2/src/terralib/kernel/TeDefines.h === --- libterralib-4.3.0+dfsg.2.orig/src/terralib/kernel/TeDefines.h +++ libterralib-4.3.0+dfsg.2/src/terralib/kernel/TeDefines.h -@@ -205,7 +205,7 @@ const std::string TeDBVERSION = "4.0.0"; +@@ -204,8 +204,9 @@ const std::string TeDBVERSION = "4.0.0"; + #include #define TeISNAN( x ) _isnan( x ) #elif TePLATFORM == TePLATFORMCODE_LINUX || TePLATFORM == TePLATFORMCODE_AIX - #include +- #include - #define TeISNAN( x ) isnan( x ) -+#define TeISNAN( x ) std::isnan( x ) ++ #include ++using std::isnan; ++#define TeISNAN( x ) ::isnan( x ) #else #error "ERROR: Unsupported platform" #endif diff --git a/debian/rules b/debian/rules index 75ccaec..cc899ad 100755 --- a/debian/rules +++ b/debian/rules @@ -17,7 +17,7 @@ DEB_BUILD_MAINT_OPTIONS:= hardening=+all DEB_CFLAGS_MAINT_APPEND:= -Wall -pedantic export DEB_BUILD_MAINT_OPTIONS export DEB_CFLAGS_MAINT_APPEND -CXXFLAGS:= $(shell dpkg-buildflags --get CXXFLAGS) -std11 +CXXFLAGS:= $(shell dpkg-buildflags --get CXXFLAGS) -std=c++11 CXXFLAGS:= '$(CXXFLAGS) -fpermissive -I/usr/include/geotiff -I/usr/include/dxflib -I/usr/include/qwt' override_dh_auto_build: @@ -33,7 +33,7 @@ override_dh_auto_build: # ( cd build/qt/$$d && qmake QMAKE_CXXFLAGS=$(CXXFLAGS) $$d.pro && $(MAKE) ) ; \ # done for d in terralib te_functions te_utils terralibpdi shapelib te_shapelib te_mysql te_postgresql te_dxf stat ; do \ - ar rcs Release/lib$$d.a Release/linux-g++/obj/$$d/*.o ;\ + ar rcs Release/lib$$d.a `LC_ALL=C ls Release/linux-g++/obj/$$d/*.o` ;\ done override_dh_clean: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libterralib] tag debian/4.3.0+dfsg.2-10 created (now a5568cb)
This is an automated email from the git hooks/post-receive script. mckinstry pushed a change to tag debian/4.3.0+dfsg.2-10 in repository libterralib. at a5568cb (commit) No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libterralib] 07/08: * Ack. patch and close bug: Closes: #831903 * Standards-Version: 4.0.0; no changes required
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch debian/master in repository libterralib. commit d7eff0f6a41db863c4d33565feab5ba039de5cc9 Author: Alastair McKinstry <mckins...@debian.org> Date: Sun Jul 30 11:42:57 2017 +0100 * Ack. patch and close bug: Closes: #831903 * Standards-Version: 4.0.0; no changes required --- debian/changelog | 7 +++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index cce14cc..5e88672 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libterralib (4.3.0+dfsg.2-11) unstable; urgency=medium + + * Ack. patch and close bug: Closes: #831903 + * Standards-Version: 4.0.0; no changes required + + -- Alastair McKinstry <mckins...@debian.org> Sun, 30 Jul 2017 11:42:15 +0100 + libterralib (4.3.0+dfsg.2-10) unstable; urgency=medium * switch to build depend on the metapackage default-libmysqlclient-dev diff --git a/debian/control b/debian/control index b152d81..b08f670 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 10), default-libmysqlclient-dev, libpq-dev, firebird-dev -Standards-Version: 3.9.8 +Standards-Version: 4.0.0 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/libterralib.git Vcs-Git: git://anonscm.debian.org/pkg-grass/libterralib.git Homepage: http://www.terralib.org/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libterralib] 01/08: Use debhelper 10
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch debian/master in repository libterralib. commit 390cbc978ec45dccffeb6044060f58dfbbe0abf8 Author: Alastair McKinstry <mckins...@debian.org> Date: Fri Dec 9 12:34:34 2016 + Use debhelper 10 --- debian/changelog | 1 + debian/compat| 2 +- debian/control | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 53b73a5..b59cb88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ libterralib (4.3.0+dfsg.2-7) unstable; urgency=medium * Add patch for g++6 (-std11) changes. * Build -std11 in prep. for g++-6 * Standards-Version: 3.9.8 + * Use debhelper 10 -- Alastair McKinstry <mckins...@debian.org> Mon, 02 May 2016 16:46:24 +0100 diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index 2e7955e..467f9cc 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Maintainer: Debian GIS Team <pkg-grass-devel@lists.alioth.debian.org> Uploaders: Alastair McKinstry <mckins...@debian.org> Section: libs Priority: optional -Build-Depends: debhelper (>= 9), +Build-Depends: debhelper (>= 10), libgeotiff-dev, libjpeg-dev, libtiff-dev, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libterralib] 06/08: prep for release
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch debian/master in repository libterralib. commit a5568cb253a41a74676c64f622b9600229e6130b Author: Alastair McKinstry <mckins...@debian.org> Date: Mon Dec 12 10:59:25 2016 + prep for release --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a9bb709..cce14cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libterralib (4.3.0+dfsg.2-10) UNRELEASED; urgency=medium +libterralib (4.3.0+dfsg.2-10) unstable; urgency=medium * switch to build depend on the metapackage default-libmysqlclient-dev Closes: #845868 * Use debhelper 10 - -- Alastair McKinstry <mckins...@debian.org> Fri, 09 Dec 2016 12:35:48 + + -- Alastair McKinstry <mckins...@debian.org> Mon, 12 Dec 2016 10:59:07 + libterralib (4.3.0+dfsg.2-9) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Re: [netcdf] 11/31: DH_COMPAT=10
On 12/10/2016 07:17, Sebastiaan Couwenberg wrote: > On 10/11/2016 12:44 PM, Alastair McKinstry wrote: >> DH_COMPAT=10 > Why did you bump the debhelper compatibility? To test it. > Debian stretch and Ubuntu yaketty are the first distributions to support > it properly. Unless debhelper 10 features are required, it's best to > stick to compat level 9 which is widely supported and doesn't require > backports (e.g. for OSGeo-Live) to change it. Ok, I'll undo it. > Kind Regards, > > Bas > Best regards Alastair -- Alastair McKinstry, <alast...@sceal.ie>, <mckins...@debian.org>, https://diaspora.sceal.ie/u/amckinstry Misentropy: doubting that the Universe is becoming more disordered. signature.asc Description: OpenPGP digital signature ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 28/31: remove unnecessary parameters
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit b7ca961417a518c19ab968fa006de0365bd46199
Author: Alastair McKinstry <mckins...@debian.org>
Date: Wed Oct 5 11:24:36 2016 +0100
remove unnecessary parameters
---
debian/rules | 2 --
1 file changed, 2 deletions(-)
diff --git a/debian/rules b/debian/rules
index 96a626a..cc7cbc4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,8 +53,6 @@ override_dh_auto_configure:
-DUSE_HDF5=ON \
-DHDF5_INCLUDE_DIR=$(INCDIR)/hdf5/$(MPI) \
-DHDF5_LIBRARY_PATH=$(LIBRARY)/hdf5/$(MPI) \
- -DHDF5_C_LIBRARY=$(LIBDIR)/hdf5/$(MPI)/libhdf5.so \
- -DHDF5_HL_LIBRARY=$(LIBDIR)/hdf5/$(MPI)/libhdf5_hl.so \
-DHDF5_C_LIBRARIES=$(LIBDIR)/hdf5/$(MPI)/libhdf5.so \
-DHDF5_HL_LIBRARIES=$(LIBDIR)/hdf5/$(MPI)/libhdf5_hl.so \
-DCMAKE_C_FLAGS="${CFLAGS} -DHDF5_PARALLEL" \
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/netcdf.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 30/31: Drop _serial suffix on serial version
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch dev-coinstallable in repository netcdf. commit 2e4d1b57c1b888f5843691d6671a37324957e7ee Author: Alastair McKinstry <mckins...@debian.org> Date: Mon Oct 10 17:22:46 2016 +0100 Drop _serial suffix on serial version --- debian/rules | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/debian/rules b/debian/rules index cc7cbc4..efd54ee 100755 --- a/debian/rules +++ b/debian/rules @@ -94,16 +94,14 @@ override_dh_auto_install: dh_link -p libnetcdf-$$d-dev /usr/include $(LIBDIR)/netcdf/$$d/include ; \ done # Serial; one-off only - cp debian/tmp-serial/$(LIBDIR)/libnetcdf.so.$(SO_VERSION) debian/tmp/$(LIBDIR)/libnetcdf_serial.so.$(SO_VERSION) ; \ echo "prefix=$(LIBDIR)/netcdf/serial" > debian/tmp/$(LIBDIR)/pkgconfig/netcdf-serial.pc grep -v "prefix=" debian/tmp-serial/$(LIBDIR)/pkgconfig/netcdf.pc >> debian/tmp/$(LIBDIR)/pkgconfig/netcdf-serial.pc cp -a debian/tmp-serial/$(LIBDIR)/cmake/netCDF debian/tmp/$(LIBDIR)/cmake/netCDF cp -a debian/tmp-pnetcdf/usr/include debian/tmp/usr cp -a debian/tmp-serial/usr/share debian/tmp/usr cp -a debian/tmp-serial/usr/bin debian/tmp/usr - dh_link -p libnetcdf-dev $(LIBDIR)/libnetcdf_serial.so.$(SO_VERSION) $(LIBDIR)/netcdf/serial/libnetcdf.so - dh_link -p libnetcdf-dev $(LIBDIR)/libnetcdf_serial.so.$(SO_VERSION) $(LIBDIR)/libnetcdf_serial.so - dh_link -p libnetcdf-$(SO_MAJOR) $(LIBDIR)/libnetcdf_serial.so.$(SO_VERSION) $(LIBDIR)/libnetcdf_serial.so.$(SO_MAJOR) + dh_link -p libnetcdf-dev $(LIBDIR)/libnetcdf.so.$(SO_VERSION) $(LIBDIR)/netcdf/serial/libnetcdf.so + dh_link -p libnetcdf$(SO_MAJOR) $(LIBDIR)/libnetcdf.so.$(SO_VERSION) $(LIBDIR)/libnetcdf.so.$(SO_MAJOR) $(RM) debian/tmp/usr/share/doc/netCDF/html/jquery.js sed -e 's%@MULTIARCH@%$(DEB_HOST_MULTIARCH)%g' < debian/libnetcdf-dev.postinst.in \ > debian/libnetcdf-dev.postinst -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 27/31: Undo libname change for serial as it changes soname
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch dev-coinstallable in repository netcdf. commit 9c3652b5e1df46a26d463e359beb79997d086cf8 Author: Alastair McKinstry <mckins...@debian.org> Date: Wed Oct 5 06:07:57 2016 +0100 Undo libname change for serial as it changes soname --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index aa910aa..96a626a 100755 --- a/debian/rules +++ b/debian/rules @@ -37,7 +37,7 @@ override_dh_auto_configure: -DHDF5_INCLUDE_DIR=$(INCDIR)/hdf5/serial \ -DHDF5_LIBRARY_PATH=$(LIBRARY)/hdf5/serial \ -DLIBLIB_VERSION_SCRIPT=-Wl,--version-script,$(CURDIR)/debian/netcdf-serial.ver \ - -DNETCDF_LIB_NAME=netcdf_serial + -DNETCDF_LIB_NAME=netcdf dh_auto_configure --builddirectory=build-pnetcdf -- \ $(CMAKE_FLAGS) \ -DHDF5_INCLUDE_DIR=$(INCDIR)/hdf5/serial \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 29/31: revert name of serial to libnetcdf11 to avoid transition
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit d95abc0e93c8790aad0d1ac3b7dccd6b2aacb9c5
Author: Alastair McKinstry <mckins...@debian.org>
Date: Sat Oct 8 15:07:35 2016 +0100
revert name of serial to libnetcdf11 to avoid transition
---
debian/control| 4 ++--
debian/libnetcdf-11.install | 1 -
debian/libnetcdf-11.lintian-overrides | 1 -
debian/libnetcdf11.install| 1 +
4 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/debian/control b/debian/control
index 0a3007d..d6e081e 100644
--- a/debian/control
+++ b/debian/control
@@ -39,7 +39,7 @@ Description: Documentation for NetCDF
This package contains documentation for the NetCDF library in a
variety of formats.
-Package: libnetcdf-11
+Package: libnetcdf11
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
@@ -93,7 +93,7 @@ Description: Interface for scientific data access to large
binary data
Package: libnetcdf-dev
Architecture: any
Section: libdevel
-Depends: libnetcdf-11 (= ${binary:Version}),
+Depends: libnetcdf11 (= ${binary:Version}),
libhdf5-dev (>= 1.8.6-1~),
libcurl4-gnutls-dev | libcurl-ssl-dev,
${misc:Depends}, pkg-config
diff --git a/debian/libnetcdf-11.install b/debian/libnetcdf-11.install
deleted file mode 100644
index 771e23e..000
--- a/debian/libnetcdf-11.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libnetcdf_serial.so.*
diff --git a/debian/libnetcdf-11.lintian-overrides
b/debian/libnetcdf-11.lintian-overrides
deleted file mode 100644
index 088215a..000
--- a/debian/libnetcdf-11.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libnetcdf-11: package-name-doesnt-match-sonames libnetcdf11
diff --git a/debian/libnetcdf11.install b/debian/libnetcdf11.install
new file mode 100644
index 000..bbaec81
--- /dev/null
+++ b/debian/libnetcdf11.install
@@ -0,0 +1 @@
+usr/lib/*/libnetcdf.so.*
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/netcdf.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 24/31: Merge common CMAKE_FLAGS; add BUILD_TYPE=Release
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch dev-coinstallable in repository netcdf. commit 2a4c5720ee131c07b9b45bbd57b11c3bffcf2e17 Author: Alastair McKinstry <mckins...@debian.org> Date: Wed Oct 5 04:43:07 2016 +0100 Merge common CMAKE_FLAGS; add BUILD_TYPE=Release --- debian/rules | 33 - 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/debian/rules b/debian/rules index 4e25b1d..fa3eac8 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,5 @@ #!/usr/bin/make -f -#export DH_VERBOSE=1 - # Enable hardening build flags, except: # pie: causes build failure export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie @@ -12,7 +10,7 @@ INCDIR:=/usr/include UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://') SO_MAJOR:=11 -SO_VERSION:=11.0.0 +SO_VERSION:=11.3.0 include /usr/share/mpi-default-dev/debian_defaults MPI:=$(ARCH_DEFAULT_MPI_IMPL) @@ -26,39 +24,32 @@ CFLAGS:= $(shell dpkg-buildflags --get CFLAGS) %: dh $@ --buildsystem=cmake --parallel -override_dh_auto_configure: - dh_auto_configure --builddirectory=build-serial -- \ +CMAKE_FLAGS:= -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DENABLE_TESTS:BOOL=ON \ -DENABLE_DOXYGEN:BOOL=ON \ -DENABLE_MMAP=ON \ - -DUSE_SZIP=ON \ + -DUSE_SZIP=ON + +override_dh_auto_configure: + dh_auto_configure --builddirectory=build-serial -- \ + $(CMAKE_FLAGS) \ -DHDF5_INCLUDE_DIR=$(INCDIR)/hdf5/serial \ - -DHDF5_C_LIBRARY=$(LIBDIR)/hdf5/serial/libhdf5.so \ - -DHDF5_HL_LIBRARY=$(LIBDIR)/hdf5/serial/libhdf5_hl.so \ - -DHDF5_C_LIBRARIES=$(LIBDIR)/hdf5/serial/libhdf5.so \ - -DHDF5_HL_LIBRARIES=$(LIBDIR)/hdf5/serial/libhdf5_hl.so \ - -DLIBLIB_VERSION_SCRIPT=-Wl,--version-script,$(CURDIR)/debian/netcdf-serial.ver + -DHDF5_LIBRARY_PATH=$(LIBRARY)/hdf5/serial \ + -DLIBLIB_VERSION_SCRIPT=-Wl,--version-script,$(CURDIR)/debian/netcdf-serial.ver \ + -DNETCDF_LIB_NAME=netcdf_serial dh_auto_configure --builddirectory=build-pnetcdf -- \ - -DCMAKE_SKIP_RPATH:BOOL=ON \ + $(CMAKE_FLAGS) -DHDF5_INCLUDE_DIR=$(INCDIR)/hdf5/serial \ -DHDF5_LIBRARY_PATH=$(LIBRARY)/hdf5/serial \ - -DENABLE_TESTS:BOOL=ON \ - -DENABLE_MMAP=ON \ - -DUSE_SZIP=ON \ - -DENABLE_DOXYGEN:BOOL=ON \ -DENABLE_PNETCDF=ON \ -DPNETCDF_INCLUDE_DIR=/usr/include \ -DLIBLIB_VERSION_SCRIPT=-Wl,--version-script,$(CURDIR)/debian/netcdf-pnetcdf.ver \ -DCMAKE_C_COMPILER=mpicc \ -DNETCDF_LIB_NAME=netcdf_pnetcdf dh_auto_configure --builddirectory=build-mpi -- \ - -DCMAKE_SKIP_RPATH:BOOL=ON \ + $(CMAKE_FLAGS) -DENABLE_PARALLEL_TESTS:BOOL=OFF \ - -DENABLE_TESTS:BOOL=ON \ - -DENABLE_DOXYGEN:BOOL=ON \ - -DENABLE_MMAP=ON \ - -DUSE_SZIP=ON \ -DUSE_HDF5=ON \ -DHDF5_INCLUDE_DIR=$(INCDIR)/hdf5/$(MPI) \ -DHDF5_LIBRARY_PATH=$(LIBRARY)/hdf5/$(MPI) \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 26/31: copy libs to ./tmp
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch dev-coinstallable in repository netcdf. commit 973307ae7ab6dd6782f5ccfb66b0177c2c8696d5 Author: Alastair McKinstry <mckins...@debian.org> Date: Wed Oct 5 05:54:09 2016 +0100 copy libs to ./tmp --- debian/rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/rules b/debian/rules index fa3eac8..aa910aa 100755 --- a/debian/rules +++ b/debian/rules @@ -39,7 +39,7 @@ override_dh_auto_configure: -DLIBLIB_VERSION_SCRIPT=-Wl,--version-script,$(CURDIR)/debian/netcdf-serial.ver \ -DNETCDF_LIB_NAME=netcdf_serial dh_auto_configure --builddirectory=build-pnetcdf -- \ - $(CMAKE_FLAGS) + $(CMAKE_FLAGS) \ -DHDF5_INCLUDE_DIR=$(INCDIR)/hdf5/serial \ -DHDF5_LIBRARY_PATH=$(LIBRARY)/hdf5/serial \ -DENABLE_PNETCDF=ON \ @@ -48,7 +48,7 @@ override_dh_auto_configure: -DCMAKE_C_COMPILER=mpicc \ -DNETCDF_LIB_NAME=netcdf_pnetcdf dh_auto_configure --builddirectory=build-mpi -- \ - $(CMAKE_FLAGS) + $(CMAKE_FLAGS) \ -DENABLE_PARALLEL_TESTS:BOOL=OFF \ -DUSE_HDF5=ON \ -DHDF5_INCLUDE_DIR=$(INCDIR)/hdf5/$(MPI) \ @@ -77,6 +77,7 @@ override_dh_auto_install: mkdir -p debian/tmp/$(LIBDIR)/netcdf/$$d/cmake debian/tmp/$(LIBDIR)/cmake debian/tmp/$(LIBDIR)/pkgconfig ; \ cp debian/tmp-$$d/$(LIBDIR)/libnetcdf.settings debian/tmp/$(LIBDIR)/netcdf/$$d/libnetcdf.settings ; \ cp -a debian/tmp-$$d/$(LIBDIR)/cmake/netCDF debian/tmp/$(LIBDIR)/cmake/netCDF_$$d ; \ + cp -a debian/tmp-$$d/$(LIBDIR)/libnetcdf_*.so* debian/tmp/$(LIBDIR) ; \ dh_link -p libnetcdf-$$d-dev $(LIBDIR)/cmake/netCDF_$$d $(LIBDIR)/netcdf/$$d/cmake/netCDF ; \ done # Parallel versions @@ -105,7 +106,6 @@ override_dh_auto_install: dh_link -p libnetcdf-dev $(LIBDIR)/libnetcdf_serial.so.$(SO_VERSION) $(LIBDIR)/netcdf/serial/libnetcdf.so dh_link -p libnetcdf-dev $(LIBDIR)/libnetcdf_serial.so.$(SO_VERSION) $(LIBDIR)/libnetcdf_serial.so dh_link -p libnetcdf-$(SO_MAJOR) $(LIBDIR)/libnetcdf_serial.so.$(SO_VERSION) $(LIBDIR)/libnetcdf_serial.so.$(SO_MAJOR) - #dh_link -p libnetcdf-$(SO_MAJOR) $(LIBDIR)/libnetcdf_serial.so.$(SO_VERSION) $(LIBDIR)/libnetcdf.so.$(SO_MAJOR) $(RM) debian/tmp/usr/share/doc/netCDF/html/jquery.js sed -e 's%@MULTIARCH@%$(DEB_HOST_MULTIARCH)%g' < debian/libnetcdf-dev.postinst.in \ > debian/libnetcdf-dev.postinst -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 25/31: Delete accidental patch include
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch dev-coinstallable in repository netcdf. commit 1a5dcc8b5b2f817cbe19248ccc8a1ab29d51af7f Author: Alastair McKinstry <mckins...@debian.org> Date: Wed Oct 5 04:43:43 2016 +0100 Delete accidental patch include --- debian/patches/series | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/patches/series b/debian/patches/series index 9fa6f6a..5153b93 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,4 +7,3 @@ hdf5-library-path.patch hdf5-location.patch pnetcdf-settings.patch tst-fix.patch -ignore -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 31/31: Fix install of libnetcdf.so.*
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch dev-coinstallable in repository netcdf. commit 94e927359b3de7b195e6e7cc2d63a9c6265f14fc Author: Alastair McKinstry <mckins...@debian.org> Date: Mon Oct 10 19:15:24 2016 +0100 Fix install of libnetcdf.so.* --- debian/libnetcdf11.install | 1 - debian/rules | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/libnetcdf11.install b/debian/libnetcdf11.install deleted file mode 100644 index bbaec81..000 --- a/debian/libnetcdf11.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libnetcdf.so.* diff --git a/debian/rules b/debian/rules index efd54ee..bfb8a57 100755 --- a/debian/rules +++ b/debian/rules @@ -96,6 +96,7 @@ override_dh_auto_install: # Serial; one-off only echo "prefix=$(LIBDIR)/netcdf/serial" > debian/tmp/$(LIBDIR)/pkgconfig/netcdf-serial.pc grep -v "prefix=" debian/tmp-serial/$(LIBDIR)/pkgconfig/netcdf.pc >> debian/tmp/$(LIBDIR)/pkgconfig/netcdf-serial.pc + cp debian/tmp-serial/$(LIBDIR)/libnetcdf.so.$(SO_VERSION) debian/tmp/$(LIBDIR) cp -a debian/tmp-serial/$(LIBDIR)/cmake/netCDF debian/tmp/$(LIBDIR)/cmake/netCDF cp -a debian/tmp-pnetcdf/usr/include debian/tmp/usr cp -a debian/tmp-serial/usr/share debian/tmp/usr -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 11/31: DH_COMPAT=10
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit 85bb7501ab915e2c5b70bdb1d3063af95d5ab776
Author: Alastair McKinstry <mckins...@debian.org>
Date: Tue Oct 4 16:51:04 2016 +0100
DH_COMPAT=10
---
debian/changelog | 1 +
debian/compat| 2 +-
debian/control | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7b0208e..b4c7143 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ netcdf (1:4.4.1~rc1-1exp2) UNRELEASED; urgency=medium
* use libaec-dev to provide SZIP, now that HDF5 uses SZIP.
* Build-depend on libpnetcdf-dev
* Enable MMAP in diskless.
+ * DH_COMPAT=10
-- Alastair McKinstry <mckins...@debian.org> Tue, 19 Apr 2016 00:54:19 +0100
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 478756f..fe97472 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Francesco Paolo Lovergine <fran...@debian.org>,
Alastair McKinstry <mckins...@debian.org>
Section: science
Priority: optional
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 10),
cmake (>= 2.8.12),
chrpath,
m4,
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/netcdf.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 23/31: Add patch to fix linking tst_fileinfo
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit 4162424b18792a08fa93f341c0746003ec50871f
Author: Alastair McKinstry <mckins...@debian.org>
Date: Wed Oct 5 04:42:43 2016 +0100
Add patch to fix linking tst_fileinfo
---
debian/patches/series| 2 ++
debian/patches/tst-fix.patch | 18 ++
2 files changed, 20 insertions(+)
diff --git a/debian/patches/series b/debian/patches/series
index 42994eb..9fa6f6a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,5 @@ reproducible.patch
hdf5-library-path.patch
hdf5-location.patch
pnetcdf-settings.patch
+tst-fix.patch
+ignore
diff --git a/debian/patches/tst-fix.patch b/debian/patches/tst-fix.patch
new file mode 100644
index 000..5b3283b
--- /dev/null
+++ b/debian/patches/tst-fix.patch
@@ -0,0 +1,18 @@
+Author: Alastair McKinstry <mckins...@debian.org>
+Description: tst_fileinfo needs to be linked to other libs (-lhdf5)
+Last-Updated: 2016-10-07
+Forwarded: no
+
+Index: netcdf-4.4.1/ncdump/CMakeLists.txt
+===
+--- netcdf-4.4.1.orig/ncdump/CMakeLists.txt
netcdf-4.4.1/ncdump/CMakeLists.txt
+@@ -61,7 +61,7 @@ IF(ENABLE_TESTS)
+
+ IF(ENABLE_FILEINFO)
+ ADD_EXECUTABLE(tst_fileinfo tst_fileinfo.c)
+- TARGET_LINK_LIBRARIES(tst_fileinfo netcdf)
++ TARGET_LINK_LIBRARIES(tst_fileinfo netcdf ${ALL_TLL_LIBS})
+ add_sh_test(ncdump tst_fileinfo)
+ ENDIF()
+
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/netcdf.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 16/31: Revert SOVERSION 12 -> 11, accidentally incremented in upstream
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit efd828a26a92834cd2879b0638c581dc10a30b6b
Author: Alastair McKinstry <mckins...@debian.org>
Date: Wed Oct 5 02:50:34 2016 +0100
Revert SOVERSION 12 -> 11, accidentally incremented in upstream
---
debian/control | 18 +-
.../{libnetcdf-12.install => libnetcdf-11.install} | 0
debian/libnetcdf-11.lintian-overrides | 1 +
debian/libnetcdf-12.lintian-overrides | 1 -
...cdf-mpi-12.install => libnetcdf-mpi-11.install} | 0
debian/libnetcdf-mpi-11.lintian-overrides | 1 +
...cdf-mpi-12.symbols => libnetcdf-mpi-11.symbols} | 0
debian/libnetcdf-mpi-12.lintian-overrides | 1 -
...cdf-12.install => libnetcdf-pnetcdf-11.install} | 0
debian/libnetcdf-pnetcdf-11.lintian-overrides | 1 +
debian/libnetcdf-pnetcdf-12.lintian-overrides | 1 -
.../{libnetcdf12.symbols => libnetcdf11.symbols} | 2 +-
debian/rules | 22 --
13 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/debian/control b/debian/control
index fe97472..4a0bae6 100644
--- a/debian/control
+++ b/debian/control
@@ -39,7 +39,7 @@ Description: Documentation for NetCDF
This package contains documentation for the NetCDF library in a
variety of formats.
-Package: libnetcdf-12
+Package: libnetcdf-11
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
@@ -60,7 +60,7 @@ Description: Interface for scientific data access to large
binary data
This package contains the C run-time shared libraries required
by programs.
-Package: libnetcdf-mpi-12
+Package: libnetcdf-mpi-11
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -75,7 +75,7 @@ Description: Interface for scientific data access to large
binary data
This package contains the C run-time shared libraries required
by programs.
-Package: libnetcdf-pnetcdf-12
+Package: libnetcdf-pnetcdf-11
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -93,7 +93,7 @@ Description: Interface for scientific data access to large
binary data
Package: libnetcdf-dev
Architecture: any
Section: libdevel
-Depends: libnetcdf-12 (= ${binary:Version}),
+Depends: libnetcdf-11 (= ${binary:Version}),
libhdf5-dev (>= 1.8.6-1~),
libcurl4-gnutls-dev | libcurl-ssl-dev,
${misc:Depends}, pkg-config
@@ -115,7 +115,7 @@ Package: libnetcdf-mpi-dev
Architecture: any
Section: libdevel
Depends: libnetcdf-dev(= ${binary:Version}),
- libnetcdf-mpi-12 (= ${binary:Version}),
+ libnetcdf-mpi-11 (= ${binary:Version}),
${shlibs:Depends}, ${misc:Depends},
pkg-config
Suggests: netcdf-bin, netcdf-doc
@@ -133,7 +133,7 @@ Package: libnetcdf-pnetcdf-dev
Architecture: any
Section: libdevel
Depends: libnetcdf-dev(= ${binary:Version}),
- libnetcdf-pnetcdf-12 (= ${binary:Version}),
+ libnetcdf-pnetcdf-11 (= ${binary:Version}),
${shlibs:Depends}, ${misc:Depends},
pkg-config
Suggests: netcdf-bin, netcdf-doc
@@ -151,9 +151,9 @@ Package: netcdf-dbg
Architecture: any
Section: debug
Priority: extra
-Depends: libnetcdf-12 (= ${binary:Version}),
- libnetcdf-mpi-12 (= ${binary:Version}),
- libnetcdf-pnetcdf-12 (= ${binary:Version}),
+Depends: libnetcdf-11 (= ${binary:Version}),
+ libnetcdf-mpi-11 (= ${binary:Version}),
+ libnetcdf-pnetcdf-11 (= ${binary:Version}),
${misc:Depends}
Suggests: gdb
Description: debugging symbols for NetCDF
diff --git a/debian/libnetcdf-12.install b/debian/libnetcdf-11.install
similarity index 100%
rename from debian/libnetcdf-12.install
rename to debian/libnetcdf-11.install
diff --git a/debian/libnetcdf-11.lintian-overrides
b/debian/libnetcdf-11.lintian-overrides
new file mode 100644
index 000..088215a
--- /dev/null
+++ b/debian/libnetcdf-11.lintian-overrides
@@ -0,0 +1 @@
+libnetcdf-11: package-name-doesnt-match-sonames libnetcdf11
diff --git a/debian/libnetcdf-12.lintian-overrides
b/debian/libnetcdf-12.lintian-overrides
deleted file mode 100644
index c856a76..000
--- a/debian/libnetcdf-12.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libnetcdf-12: package-name-doesnt-match-sonames libnetcdf12
diff --git a/debian/libnetcdf-mpi-12.install b/debian/libnetcdf-mpi-11.install
similarity index 100%
rename from debian/libnetcdf-mpi-12.install
rename to debian/libnetcdf-mpi-11.install
diff --git a/debian/libnetcdf-mpi-11.lintian-overrides
b/debian/libnetcdf-mpi-11.lintian-overrides
new file mode 100644
index 000..4f82348
--- /dev/null
+++ b/debian/libnetcdf-mpi-11.lintian-overrides
@@ -0,0 +1 @@
+libnetcdf-mpi-11: package-name-doesnt-match-sonames libnetcdf-mpi11
diff --git a/debian/libnetcdf-mpi-12.symbols b/debian/libnetcd
[netcdf] 05/31: attributes-typo not needed
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch dev-coinstallable in repository netcdf. commit 4351fc9a013511bf56e07645710eaf344bebc040 Author: Alastair McKinstry <mckins...@debian.org> Date: Fri May 13 21:44:12 2016 +0100 attributes-typo not needed --- debian/patches/series | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/series b/debian/patches/series index 0100547..74139d7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,7 +4,7 @@ privacy-breach-logo.patch nc-config.patch reproducible.patch hdf5-library-path.patch -attributes-typo.patch +#attributes-typo.patch m4-generated-sources.patch hdf5-location.patch #hdf5-library-path.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 18/31: Change pkg version ro 4.3.1~rc3
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch dev-coinstallable in repository netcdf. commit 148a2fd365157bd364ab8fdbe124f9fd61f8912e Author: Alastair McKinstry <mckins...@debian.org> Date: Wed Oct 5 02:52:00 2016 +0100 Change pkg version ro 4.3.1~rc3 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b4c7143..b77b060 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -netcdf (1:4.4.1~rc1-1exp2) UNRELEASED; urgency=medium +netcdf (1:4.4.1~rc3-1) UNRELEASED; urgency=medium * Add mpi, pnetcdf variants of netcdf. Closes: #708638. * use libaec-dev to provide SZIP, now that HDF5 uses SZIP. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 08/31: install fix: libnetcdf_serial.so.*
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch dev-coinstallable in repository netcdf. commit 096de27e96c0d37c8649a2befbd662a36677fcab Author: Alastair McKinstry <mckins...@debian.org> Date: Fri May 13 22:23:06 2016 +0100 install fix: libnetcdf_serial.so.* --- debian/libnetcdf-12.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/libnetcdf-12.install b/debian/libnetcdf-12.install index 3ddde58..771e23e 100644 --- a/debian/libnetcdf-12.install +++ b/debian/libnetcdf-12.install @@ -1 +1 @@ -usr/lib/*/lib*.so.* +usr/lib/*/libnetcdf_serial.so.* -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 20/31: And change pkg name to 4.4.1
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch dev-coinstallable in repository netcdf. commit 86d0b38617c86f889bc4d51f2b462a140f8415d7 Author: Alastair McKinstry <mckins...@debian.org> Date: Wed Oct 5 02:53:42 2016 +0100 And change pkg name to 4.4.1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b77b060..5c28353 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -netcdf (1:4.4.1~rc3-1) UNRELEASED; urgency=medium +netcdf (1:4.4.1-1) UNRELEASED; urgency=medium * Add mpi, pnetcdf variants of netcdf. Closes: #708638. * use libaec-dev to provide SZIP, now that HDF5 uses SZIP. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 21/31: SO_VERSION is 11.3.0
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch dev-coinstallable in repository netcdf. commit 2e584213ad88aa5bbba8199f3c7145a16e85ef21 Author: Alastair McKinstry <mckins...@debian.org> Date: Wed Oct 5 03:10:16 2016 +0100 SO_VERSION is 11.3.0 --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index fc2aa1d..bb37a66 100755 --- a/debian/rules +++ b/debian/rules @@ -12,7 +12,7 @@ INCDIR:=/usr/include UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://') SO_MAJOR:=11 -SO_VERSION:=11.0.0 +SO_VERSION:=11.3.0 include /usr/share/mpi-default-dev/debian_defaults MPI:=$(ARCH_DEFAULT_MPI_IMPL) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 19/31: Merge tag 'upstream/4.4.1' into dev-coinstallable
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch dev-coinstallable in repository netcdf. commit ece76c3db11e3d5b51d7de2e929c0f1eee8c043c Merge: 148a2fd a32f19a Author: Alastair McKinstry <mckins...@debian.org> Date: Wed Oct 5 02:52:52 2016 +0100 Merge tag 'upstream/4.4.1' into dev-coinstallable Upstream version 4.4.1 CMakeLists.txt |4 +- RELEASE_NOTES.md|7 +- cf |2 +- configure | 28 +- configure.ac|4 +- docs/Doxyfile.developer |2 +- docs/Doxyfile.in|1 - docs/release_header.html|1 + docs/static-pages/README.md |1 + docs/static-pages/software.html | 2844 +++ docs/types.dox |6 +- docs/windows-binaries.md| 26 +- libdap2/Makefile.am |4 +- libdap2/Makefile.in |4 +- libdap2/constraints.c |3 +- libdap2/dceparse.c |2 +- libdap2/dceparselex.h |5 + libdap2/dcetab.c| 1639 ++ libdap2/dcetab.h| 47 +- libdap2/ncd2dispatch.c | 15 +- liblib/Makefile.am |2 +- liblib/Makefile.in |2 +- libsrc/var.c| 14 +- libsrc4/nc4hdf.c|5 + ncgen/main.c|4 +- 25 files changed, 3683 insertions(+), 989 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 14/31: Lintian overrides on soname mismatch
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch dev-coinstallable in repository netcdf. commit 6a21c3e9fee3fd4bb1c6ab3a59bce5349400d3c5 Author: Alastair McKinstry <mckins...@debian.org> Date: Tue Oct 4 17:33:47 2016 +0100 Lintian overrides on soname mismatch --- debian/libnetcdf-12.lintian-overrides | 1 + debian/libnetcdf-mpi-12.lintian-overrides | 1 + debian/libnetcdf-pnetcdf-12.lintian-overrides | 1 + 3 files changed, 3 insertions(+) diff --git a/debian/libnetcdf-12.lintian-overrides b/debian/libnetcdf-12.lintian-overrides new file mode 100644 index 000..c856a76 --- /dev/null +++ b/debian/libnetcdf-12.lintian-overrides @@ -0,0 +1 @@ +libnetcdf-12: package-name-doesnt-match-sonames libnetcdf12 diff --git a/debian/libnetcdf-mpi-12.lintian-overrides b/debian/libnetcdf-mpi-12.lintian-overrides new file mode 100644 index 000..a6b326c --- /dev/null +++ b/debian/libnetcdf-mpi-12.lintian-overrides @@ -0,0 +1 @@ +libnetcdf-mpi-12: package-name-doesnt-match-sonames libnetcdf-mpi12 diff --git a/debian/libnetcdf-pnetcdf-12.lintian-overrides b/debian/libnetcdf-pnetcdf-12.lintian-overrides new file mode 100644 index 000..891cf17 --- /dev/null +++ b/debian/libnetcdf-pnetcdf-12.lintian-overrides @@ -0,0 +1 @@ +libnetcdf-pnetcdf-12: package-name-doesnt-match-sonames libnetcdf-pnetcdf12 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 06/31: remove m4-generated-sources, too
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch dev-coinstallable in repository netcdf. commit fd5a26fd914d5be0cd8d9da596285b25c65e8a0f Author: Alastair McKinstry <mckins...@debian.org> Date: Fri May 13 21:48:34 2016 +0100 remove m4-generated-sources, too --- debian/patches/series | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/series b/debian/patches/series index 74139d7..780d350 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,7 +5,7 @@ nc-config.patch reproducible.patch hdf5-library-path.patch #attributes-typo.patch -m4-generated-sources.patch +#m4-generated-sources.patch hdf5-location.patch #hdf5-library-path.patch pnetcdf-settings.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 12/31: Drop -DHDF5_INCLUDE_PATH
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch dev-coinstallable in repository netcdf. commit 1d7599fd5cb035bfda5354b79c248ed4ccb5c05e Author: Alastair McKinstry <mckins...@debian.org> Date: Tue Oct 4 16:55:19 2016 +0100 Drop -DHDF5_INCLUDE_PATH --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index e8d76ee..74b5d8d 100755 --- a/debian/rules +++ b/debian/rules @@ -32,7 +32,6 @@ override_dh_auto_configure: -DENABLE_MMAP=ON \ -DUSE_SZIP=ON \ -DHDF5_INCLUDE_DIR=$(INCDIR)/hdf5/serial \ - -DHDF5_INCLUDE_PATH=$(INCDIR)/hdf5/serial \ -DHDF5_LIBRARY_PATH=$(LIBRARY)/hdf5/serial \ -DHDF5_C_LIBRARY=$(LIBDIR)/hdf5/serial/libhdf5.so \ -DHDF5_HL_LIBRARY=$(LIBDIR)/hdf5/serial/libhdf5_hl.so \ @@ -41,6 +40,8 @@ override_dh_auto_configure: -DLIBLIB_VERSION_SCRIPT=-Wl,--version-script,$(CURDIR)/debian/netcdf-serial.ver dh_auto_configure --builddirectory=build-pnetcdf -- \ -DCMAKE_SKIP_RPATH:BOOL=ON \ + -DHDF5_INCLUDE_DIR=$(INCDIR)/hdf5/serial \ + -DHDF5_LIBRARY_PATH=$(LIBRARY)/hdf5/serial \ -DENABLE_TESTS:BOOL=ON \ -DENABLE_MMAP=ON \ -DUSE_SZIP=ON \ @@ -59,7 +60,6 @@ override_dh_auto_configure: -DUSE_SZIP=ON \ -DUSE_HDF5=ON \ -DHDF5_INCLUDE_DIR=$(INCDIR)/hdf5/$(MPI) \ - -DHDF5_INCLUDE_PATH=$(INCDIR)/hdf5/$(MPI) \ -DHDF5_LIBRARY_PATH=$(LIBRARY)/hdf5/$(MPI) \ -DHDF5_C_LIBRARY=$(LIBDIR)/hdf5/$(MPI)/libhdf5.so \ -DHDF5_HL_LIBRARY=$(LIBDIR)/hdf5/$(MPI)/libhdf5_hl.so \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 22/31: Remove -dbg package now we have -dbgsym packages
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit de5bca539f5ab65fc130116f8c512dfd1d7e50e5
Author: Alastair McKinstry <mckins...@debian.org>
Date: Wed Oct 5 03:27:38 2016 +0100
Remove -dbg package now we have -dbgsym packages
---
debian/changelog | 1 +
debian/control | 14 --
debian/rules | 6 +-
3 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5c28353..b43d22b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ netcdf (1:4.4.1-1) UNRELEASED; urgency=medium
* Build-depend on libpnetcdf-dev
* Enable MMAP in diskless.
* DH_COMPAT=10
+ * Remove -dbg package now we have -dbgsym packages
-- Alastair McKinstry <mckins...@debian.org> Tue, 19 Apr 2016 00:54:19 +0100
diff --git a/debian/control b/debian/control
index 4a0bae6..0a3007d 100644
--- a/debian/control
+++ b/debian/control
@@ -147,20 +147,6 @@ Description: creation, access, and sharing of
array-oriented scientific data
.
This package provides headers.
-Package: netcdf-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: libnetcdf-11 (= ${binary:Version}),
- libnetcdf-mpi-11 (= ${binary:Version}),
- libnetcdf-pnetcdf-11 (= ${binary:Version}),
- ${misc:Depends}
-Suggests: gdb
-Description: debugging symbols for NetCDF
- This package contains the files that make it possible to debug the
- NetCDF binaries and programs that use the NetCDF libraries with a
- source-level debugger like gdb.
-
Package: netcdf-bin
Architecture: any
Depends: ${shlibs:Depends},
diff --git a/debian/rules b/debian/rules
index bb37a66..4e25b1d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ INCDIR:=/usr/include
UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version:
\(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
SO_MAJOR:=11
-SO_VERSION:=11.3.0
+SO_VERSION:=11.0.0
include /usr/share/mpi-default-dev/debian_defaults
MPI:=$(ARCH_DEFAULT_MPI_IMPL)
@@ -34,7 +34,6 @@ override_dh_auto_configure:
-DENABLE_MMAP=ON \
-DUSE_SZIP=ON \
-DHDF5_INCLUDE_DIR=$(INCDIR)/hdf5/serial \
- -DHDF5_LIBRARY_PATH=$(LIBRARY)/hdf5/serial \
-DHDF5_C_LIBRARY=$(LIBDIR)/hdf5/serial/libhdf5.so \
-DHDF5_HL_LIBRARY=$(LIBDIR)/hdf5/serial/libhdf5_hl.so \
-DHDF5_C_LIBRARIES=$(LIBDIR)/hdf5/serial/libhdf5.so \
@@ -137,9 +136,6 @@ override_dh_auto_test:
override_dh_installchangelogs:
dh_installchangelogs RELEASE_NOTES.md
-override_dh_strip:
- dh_strip --dbg-package=netcdf-dbg
-
override_dh_makeshlibs:
dh_makeshlibs -- -v$(UPSTREAM_VERSION)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/netcdf.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 03/31: typo: missing line
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit d007cbb482ccfcba7f5691131e96a299e3ccffe2
Author: Alastair McKinstry <mckins...@debian.org>
Date: Fri May 13 21:27:07 2016 +0100
typo: missing line
---
debian/control | 1 -
1 file changed, 1 deletion(-)
diff --git a/debian/control b/debian/control
index c0eb031..4374d75 100644
--- a/debian/control
+++ b/debian/control
@@ -75,7 +75,6 @@ Description: Interface for scientific data access to large
binary data
by programs.
Package: libnetcdf-pnetcdf-12
-
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/netcdf.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 07/31: Initial netcdf-netcdf.ver
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit c574ee6764e63d9c4487fc9c15f307045aac4d4c
Author: Alastair McKinstry <mckins...@debian.org>
Date: Fri May 13 21:57:59 2016 +0100
Initial netcdf-netcdf.ver
---
debian/netcdf-pnetcdf.ver | 1572 +
1 file changed, 1572 insertions(+)
diff --git a/debian/netcdf-pnetcdf.ver b/debian/netcdf-pnetcdf.ver
new file mode 100644
index 000..c7cb47a
--- /dev/null
+++ b/debian/netcdf-pnetcdf.ver
@@ -0,0 +1,1572 @@
+/* Symbol versioning script for NetCDF (MPI version)
+ * Alastair McKinstry, <mckins...@debian.org> 2014-06-05
+ * Last-Updated: 2014-06-05
+ */
+
+NETCDF_PNETCDF_4.1.3 {
+global:
+Cde2h;
+Cdh2e;
+DAPparse;
+NC3__enddef;
+NC3_abort;
+NC3_close;
+NC3_create;
+NC3_def_dim;
+NC3_def_var;
+NC3_del_att;
+NC3_dispatch_table;
+NC3_get_att;
+NC3_get_vara;
+NC3_initialize;
+NC3_inq;
+NC3_inq_att;
+NC3_inq_attid;
+NC3_inq_attname;
+NC3_inq_base_pe;
+NC3_inq_dim;
+NC3_inq_dimid;
+NC3_inq_format;
+NC3_inq_format_extended;
+NC3_inq_type;
+NC3_inq_unlimdim;
+NC3_inq_var;
+NC3_inq_varid;
+NC3_open;
+NC3_put_att;
+NC3_put_vara;
+NC3_redef;
+NC3_rename_att;
+NC3_rename_dim;
+NC3_rename_var;
+NC3_set_base_pe;
+NC3_set_fill;
+NC3_sync;
+NC4__enddef;
+NC4_abort;
+NC4_close;
+NC4_create;
+NC4_def_compound;
+NC4_def_dim;
+NC4_def_enum;
+NC4_def_grp;
+NC4_def_opaque;
+NC4_def_var;
+NC4_def_var_chunking;
+NC4_def_var_deflate;
+NC4_def_var_endian;
+NC4_def_var_fill;
+NC4_def_var_fletcher32;
+NC4_def_vlen;
+NC4_del_att;
+NC4_dispatch_table;
+NC4_get_att;
+NC4_get_var_chunk_cache;
+NC4_get_vara;
+NC4_get_vlen_element;
+NC4_initialize;
+NC4_inq;
+NC4_inq_att;
+NC4_inq_attid;
+NC4_inq_attname;
+NC4_inq_base_pe;
+NC4_inq_compound_field;
+NC4_inq_compound_fieldindex;
+NC4_inq_dim;
+NC4_inq_dimid;
+NC4_inq_dimids;
+NC4_inq_enum_ident;
+NC4_inq_enum_member;
+NC4_inq_format;
+NC4_inq_format_extended;
+NC4_inq_grp_full_ncid;
+NC4_inq_grp_parent;
+NC4_inq_grpname;
+NC4_inq_grpname_full;
+NC4_inq_grps;
+NC4_inq_ncid;
+NC4_inq_type;
+NC4_inq_type_equal;
+NC4_inq_typeid;
+NC4_inq_typeids;
+NC4_inq_unlimdim;
+NC4_inq_unlimdims;
+NC4_inq_user_type;
+NC4_inq_var_all;
+NC4_inq_varid;
+NC4_inq_varids;
+NC4_insert_array_compound;
+NC4_insert_compound;
+NC4_insert_enum;
+NC4_open;
+NC4_put_att;
+NC4_put_vara;
+NC4_put_vlen_element;
+NC4_redef;
+NC4_rename_att;
+NC4_rename_dim;
+NC4_rename_grp;
+NC4_rename_var;
+NC4_set_base_pe;
+NC4_set_fill;
+NC4_set_var_chunk_cache;
+NC4_show_metadata;
+NC4_sync;
+NC4_var_par_access;
+NCD2_close;
+NCD2_dispatch_table;
+NCD2_initialize;
+NCD2_inq_format_extended;
+NCD2_open;
+NCDAP_ping;
+NCDEFAULT_get_varm;
+NCDEFAULT_get_vars;
+NCDEFAULT_put_varm;
+NCDEFAULT_put_vars;
+NCDISPATCH_initialize;
+NCSUBSTRATE_dispatch_table;
+NCSUBSTRATE_initialize;
+NC_atomictypelen;
+NC_atomictypename;
+NC_calcsize;
+NC_check_id;
+NC_check_name;
+NC_check_vlen;
+NC_coord_one;
+NC_coord_zero;
+NC_create;
+NC_dispatch_overlay;
+NC_findattr;
+NC_findtestserver;
+NC_findvar;
+NC_get_dispatch_override;
+NC_get_vara;
+NC_getshape;
+NC_initialize;
+NC_is_recvar;
+NC_lookupvar;
+NC_open;
+NC_set_dispatch_override;
+NC_sync;
+NC_testurl;
+NC_urlmodel;
+NC_var_shape;
+add_to_NCList;
+arg_list;
+array_indices;
+atomic_name;
+attach;
+attachsubset;
+buildcachenode;
+buildcdftree;
+buildconstraintstring;
+buildprojectionstring;
+buildselectionstring;
+buildvaraprojection;
+cdChar2Comp;
+cdParseRelunits;
+cdRel2Iso;
+cdflegalname;
+clauselist;
+clonenodenamepath;
+collectnodepath;
+collectocpath;
+compute_n
[netcdf] 04/31: refresh patches
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit 33bd9d46051fbd01c5c1a3a205d26b3b325b1091
Author: Alastair McKinstry <mckins...@debian.org>
Date: Fri May 13 21:43:03 2016 +0100
refresh patches
---
debian/patches/hdf5-library-path.patch | 20 +---
debian/patches/hdf5-location.patch | 8
debian/patches/nc-config.patch | 21 +++--
debian/patches/pnetcdf-settings.patch| 14 +++---
debian/patches/privacy-breach-logo.patch | 12
debian/patches/reproducible.patch| 6 +++---
6 files changed, 46 insertions(+), 35 deletions(-)
diff --git a/debian/patches/hdf5-library-path.patch
b/debian/patches/hdf5-library-path.patch
index f49a62e..3c1d32c 100644
--- a/debian/patches/hdf5-library-path.patch
+++ b/debian/patches/hdf5-library-path.patch
@@ -5,8 +5,10 @@ Description: Append HDF5 library & include paths to nc-config
& netcdf.pc.
Author: Bas Couwenberg <sebas...@debian.org>
Forwarded: not-needed
a/CMakeLists.txt
-+++ b/CMakeLists.txt
+Index: netcdf-4.4.1~rc1/CMakeLists.txt
+===
+--- netcdf-4.4.1~rc1.orig/CMakeLists.txt
netcdf-4.4.1~rc1/CMakeLists.txt
@@ -1599,6 +1599,17 @@ SET(libdir ${CMAKE_INSTALL_PREFIX}/${CMA
SET(includedir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR})
SET(CC ${CMAKE_C_COMPILER})
@@ -25,8 +27,10 @@ Forwarded: not-needed
# Process all dependency libraries and create a string
# used when parsing netcdf.pc.in
a/nc-config.cmake.in
-+++ b/nc-config.cmake.in
+Index: netcdf-4.4.1~rc1/nc-config.cmake.in
+===
+--- netcdf-4.4.1~rc1.orig/nc-config.cmake.in
netcdf-4.4.1~rc1/nc-config.cmake.in
@@ -10,8 +10,8 @@ libdir="@CMAKE_INSTALL_PREFIX@/@CMAKE_IN
includedir="@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@"
@@ -38,9 +42,11 @@ Forwarded: not-needed
has_dap="@USE_DAP@"
if [ -z $has_dap ]; then
a/netcdf.pc.in
-+++ b/netcdf.pc.in
-@@ -8,6 +8,6 @@ Name: @PACKAGE@
+Index: netcdf-4.4.1~rc1/netcdf.pc.in
+===
+--- netcdf-4.4.1~rc1.orig/netcdf.pc.in
netcdf-4.4.1~rc1/netcdf.pc.in
+@@ -15,6 +15,6 @@ Name: @PACKAGE@
Description: NetCDF Client Library for C
URL: http://www.unidata.ucar.edu/netcdf
Version: @PACKAGE_VERSION@
diff --git a/debian/patches/hdf5-location.patch
b/debian/patches/hdf5-location.patch
index f387afa..1a62515 100644
--- a/debian/patches/hdf5-location.patch
+++ b/debian/patches/hdf5-location.patch
@@ -1,8 +1,8 @@
-Index: netcdf-4.4.0/CMakeLists.txt
+Index: netcdf-4.4.1~rc1/CMakeLists.txt
===
netcdf-4.4.0.orig/CMakeLists.txt
-+++ netcdf-4.4.0/CMakeLists.txt
-@@ -596,8 +596,12 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
+--- netcdf-4.4.1~rc1.orig/CMakeLists.txt
netcdf-4.4.1~rc1/CMakeLists.txt
+@@ -607,8 +607,12 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
# Find out if HDF5 was built with parallel support.
# Do that by checking for the targets H5Pget_fapl_mpiposx and
# H5Pget_fapl_mpio in ${HDF5_LIB}.
diff --git a/debian/patches/nc-config.patch b/debian/patches/nc-config.patch
index 73e5384..8495e7d 100644
--- a/debian/patches/nc-config.patch
+++ b/debian/patches/nc-config.patch
@@ -4,15 +4,13 @@ Description: Adapt nc-config to use pkg-config, necessary
because
Last-Updated: 2016-01-16
Forwarded: not-needed
-Index: netcdf-4.4.0~rc5/nc-config.in
+Index: netcdf-4.4.1~rc1/nc-config.in
===
netcdf-4.4.0~rc5.orig/nc-config.in
-+++ netcdf-4.4.0~rc5/nc-config.in
-@@ -3,19 +3,20 @@
- # This forms the basis for the nc-config utility, which tells you
+--- netcdf-4.4.1~rc1.orig/nc-config.in
netcdf-4.4.1~rc1/nc-config.in
+@@ -4,20 +4,19 @@
# various things about the netCDF installation. This code was
# contributed by netCDF user Arlindo DaSilva. Thanks Arlindo!
-+# adapted by Alastair McKinstry to read from pkg-config for multiarch
-prefix=@prefix@
-exec_prefix=${prefix}
@@ -21,14 +19,16 @@ Index: netcdf-4.4.0~rc5/nc-config.in
+exec_prefix=`pkg-config netcdf --variable=prefix`
+includedir=`pkg-config netcdf --variable=includedir`
+-
-cc="@CC@"
--cflags=" -I${includedir} @CPPFLAGS@"
+-cflags=" -I${includedir} @CPPFLAGS@"
-has_dap="@HAS_DAP@"
-has_nc2="@HAS_NC2@"
-has_nc4="@HAS_NC4@"
-has_hdf4="@HAS_HDF4@"
-has_pnetcdf="@HAS_PNETCDF@"
-has_hdf5="@HAS_HDF5@"
+-has_logging="@HAS_LOGGING@"
+cc=`pkg-config netcdf --variable=ccompile`
+cflags=`pkg-config netcdf --variable=cflags`
+has_dap=`pkg-config netcdf --variable=has_dap`
@@ -37
[netcdf] 17/31: Merge tag 'upstream/4.4.1_rc3' into dev-coinstallable
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch dev-coinstallable in repository netcdf. commit 3f5dbe3c44191bac386438af2dd483893c2db103 Merge: efd828a 0d7125e Author: Alastair McKinstry <mckins...@debian.org> Date: Wed Oct 5 02:50:51 2016 +0100 Merge tag 'upstream/4.4.1_rc3' into dev-coinstallable Upstream version 4.4.1~rc3 .gitignore | 10 - .travis.yml| 12 +- CMakeLists.txt | 34 +- README.md | 27 +- RELEASE_NOTES.md | 16 + cf | 11 +- cf.cmake | 19 +- config.h.cmake.in |2 + config.h.in|3 + configure | 77 +- configure.ac | 38 +- docs/Doxyfile.developer|2 +- docs/Doxyfile.in |1 + docs/Makefile.am |2 +- docs/Makefile.in |2 +- docs/attribute_conventions.md | 58 ++ docs/bestpractices.md | 353 + docs/file_format_specifications.md |5 +- docs/guide.dox | 26 +- docs/tests.md | 23 + docs/windows-binaries.md | 30 +- include/nc.h |2 + include/nc3internal.h | 59 +- include/nc4internal.h | 87 ++- include/nc_hashmap.h | 28 - libdap2/ncd2dispatch.c | 71 +- libdap2/ncd2dispatch.h | 188 ++--- libdispatch/datt.c |3 +- libdispatch/nclistmgr.c| 10 + liblib/Makefile.am |3 +- liblib/Makefile.in |3 +- liblib/nc_initialize.c | 24 +- libsrc/lookup3.c |2 +- libsrc/nc_hashmap.c| 17 - libsrc4/CMakeLists.txt |2 +- libsrc4/Makefile.am|3 + libsrc4/Makefile.in| 24 +- libsrc4/nc4attr.c | 334 - libsrc4/nc4dim.c | 41 - libsrc4/nc4file.c | 269 +++ libsrc4/nc4hdf.c | 304 +++- libsrc4/nc4info.c | 211 ++ libsrc4/nc4internal.c | 58 +- libsrc4/nc4var.c | 214 +- libsrc4/ncfunc.c |6 - nc_test/Make0 | 35 +- nc_test4/CMakeLists.txt|8 +- nc_test4/Make0 | 18 +- nc_test4/Makefile.am | 12 +- nc_test4/Makefile.in | 57 +- nc_test4/run_empty_vlen_test.sh| 15 +- nc_test4/run_par_test.sh |7 +- nc_test4/tdset.h5 | Bin 0 -> 7648 bytes nc_test4/tst_empty_vlen_unlim.c|4 +- nc_test4/tst_fill_attr_vanish.c| 137 nc_test4/tst_hdf4_read_var.sh | 23 + nc_test4/tst_misc.sh | 26 + nc_test4/tst_simplerw_coll_r.c | 249 +++ ncdump/CMakeLists.txt | 34 +- ncdump/Make0 | 41 +- ncdump/Makefile.am | 11 +- ncdump/Makefile.in | 74 +- ncdump/cdl.h |1 + ncdump/ncdump.c| 125 +++- ncdump/ncdump.h|3 +- ncdump/ref_tst_ncf213.cdl |3 + ncdump/ref_tst_special_atts.cdl|3 + ncdump/tst_fileinfo.c | 198 + ncdump/tst_fileinfo.sh | 59 ++ ncdump/tst_lengths.sh | 19 +- ncdump/tst_netcdf4.sh |7 +- ncdump/tst_netcdf4_4.sh|6 +- ncdump/utils.c | 17 + ncdump/utils.h |1 + ncgen/CMakeLists.txt |3 +- ncgen/Makefile.am |2 +- ncgen/Makefile.in |2 +- ncgen/cvt.c|2 +- ncgen/data.h |3 - ncgen/genc.c |2 +- ncgen/genlib.h |4 +- ncgen/includes.h |5 + ncgen/main.c |7 +- ncgen/ncgen.h | 30 +- ncgen/ncgen.l | 32 +- ncgen/ncgen.y | 91 ++- ncgen/ncgenl.c | 1440 +++- ncgen/ncgeny.c | 1125 ++-- ncgen/ncgeny.h | 14 +- ncgen/run_tests.sh |5 +- ncgen/semantics.c |3 +- ncgen/util.c | 16 + ncgen/util.h |1 + nctest/Makefile.am |3 +- nctest/Makefile.in |3 +- nctest/atttests.c |3 + update_hdf5_compat_files.sh|7 - 97 files changed, 4336 i
[netcdf] 13/31: lintian overrides for self-recursive symlinks
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch dev-coinstallable in repository netcdf. commit 45599490e9cbbde3a8f3eeba361c6e2e929b5fcd Author: Alastair McKinstry <mckins...@debian.org> Date: Tue Oct 4 17:15:38 2016 +0100 lintian overrides for self-recursive symlinks --- debian/libnetcdf-dev.lintian-overrides | 1 + debian/libnetcdf-mpi-dev.lintian-overrides | 1 + debian/libnetcdf-pnetcdf-dev.lintian-overrides | 1 + 3 files changed, 3 insertions(+) diff --git a/debian/libnetcdf-dev.lintian-overrides b/debian/libnetcdf-dev.lintian-overrides new file mode 100644 index 000..66234d6 --- /dev/null +++ b/debian/libnetcdf-dev.lintian-overrides @@ -0,0 +1 @@ +libnetcdf-dev: symlink-is-self-recursive * diff --git a/debian/libnetcdf-mpi-dev.lintian-overrides b/debian/libnetcdf-mpi-dev.lintian-overrides new file mode 100644 index 000..44bc387 --- /dev/null +++ b/debian/libnetcdf-mpi-dev.lintian-overrides @@ -0,0 +1 @@ +libnetcdf-mpi-dev: symlink-is-self-recursive * diff --git a/debian/libnetcdf-pnetcdf-dev.lintian-overrides b/debian/libnetcdf-pnetcdf-dev.lintian-overrides new file mode 100644 index 000..768caf2 --- /dev/null +++ b/debian/libnetcdf-pnetcdf-dev.lintian-overrides @@ -0,0 +1 @@ +libnetcdf-pnetcdf-dev: symlink-is-self-recursive * -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 10/31: remove obsolete patch references
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch dev-coinstallable in repository netcdf. commit 93fbaf0057b565e5e953346558cfff209d31129f Author: Alastair McKinstry <mckins...@debian.org> Date: Tue Oct 4 01:58:08 2016 +0100 remove obsolete patch references --- debian/patches/series | 3 --- 1 file changed, 3 deletions(-) diff --git a/debian/patches/series b/debian/patches/series index 780d350..42994eb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,8 +4,5 @@ privacy-breach-logo.patch nc-config.patch reproducible.patch hdf5-library-path.patch -#attributes-typo.patch -#m4-generated-sources.patch hdf5-location.patch -#hdf5-library-path.patch pnetcdf-settings.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 15/31: disable unnecessary symlink
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch dev-coinstallable in repository netcdf. commit cef488421c8aba58a815bc8985ffb50ca7c5d38e Author: Alastair McKinstry <mckins...@debian.org> Date: Tue Oct 4 18:40:02 2016 +0100 disable unnecessary symlink --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 74b5d8d..064d12d 100755 --- a/debian/rules +++ b/debian/rules @@ -113,7 +113,7 @@ override_dh_auto_install: dh_link -p libnetcdf-dev $(LIBDIR)/libnetcdf_serial.so.12.0.0 $(LIBDIR)/netcdf/serial/libnetcdf.so dh_link -p libnetcdf-dev $(LIBDIR)/libnetcdf_serial.so.12.0.0 $(LIBDIR)/libnetcdf_serial.so dh_link -p libnetcdf-12 $(LIBDIR)/libnetcdf_serial.so.12.0.0 $(LIBDIR)/libnetcdf_serial.so.12 - dh_link -p libnetcdf-12 $(LIBDIR)/libnetcdf_serial.so.12.0.0 $(LIBDIR)/libnetcdf.so.12 + #dh_link -p libnetcdf-12 $(LIBDIR)/libnetcdf_serial.so.12.0.0 $(LIBDIR)/libnetcdf.so.12 $(RM) debian/tmp/usr/share/doc/netCDF/html/jquery.js sed -e 's%@MULTIARCH@%$(DEB_HOST_MULTIARCH)%g' < debian/libnetcdf-dev.postinst.in \ > debian/libnetcdf-dev.postinst -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 09/31: Add libpnetcdf-dev dependency
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch dev-coinstallable in repository netcdf. commit 5d421ecde5feceab51475ebf6a15d07edeb515fd Author: Alastair McKinstry <mckins...@debian.org> Date: Tue Oct 4 01:47:40 2016 +0100 Add libpnetcdf-dev dependency --- debian/changelog | 1 + debian/control | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 696..7b0208e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ netcdf (1:4.4.1~rc1-1exp2) UNRELEASED; urgency=medium * Add mpi, pnetcdf variants of netcdf. Closes: #708638. * use libaec-dev to provide SZIP, now that HDF5 uses SZIP. + * Build-depend on libpnetcdf-dev * Enable MMAP in diskless. -- Alastair McKinstry <mckins...@debian.org> Tue, 19 Apr 2016 00:54:19 +0100 diff --git a/debian/control b/debian/control index 4374d75..478756f 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,8 @@ Build-Depends: debhelper (>= 9), libaec-dev, libhdf5-dev (>= 1.8.6-1~), libhdf5-mpi-dev (>= 1.8.13+docs~), - libcurl4-gnutls-dev | libcurl-ssl-dev + libcurl4-gnutls-dev | libcurl-ssl-dev, + libpnetcdf-dev Standards-Version: 3.9.8 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/netcdf.git Vcs-Git: https://anonscm.debian.org/git/pkg-grass/netcdf.git -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 01/31: merge 4.4.1~rc1
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch dev-coinstallable in repository netcdf. commit 818f7b409921520132d0bdf3fe8c53ae53f50ade Merge: 51cd56c 05921e8 Author: Alastair McKinstry <mckins...@debian.org> Date: Tue Apr 19 00:57:48 2016 +0100 merge 4.4.1~rc1 .github/ISSUE_TEMPLATE.md |26 + .gitignore |13 +- .travis.yml|18 +- .travis.yml.old|52 - CMakeLists.txt | 123 +- CONTRIBUTING.html | 248 - CONTRIBUTING.md|77 + Makefile.in| 1 + RELEASE_NOTES.md |18 +- cf | 2 +- config.h.cmake.in |10 +- config.h.in| 6 + configure |99 +- configure.ac |33 +- debian/changelog |25 +- debian/control |24 +- debian/copyright | 2 +- debian/libnetcdf-11.install| 1 - debian/libnetcdf-11.symbols| 1463 -- debian/libnetcdf-12.install| 1 + ...cdf-mpi-11.install => libnetcdf-mpi-12.install} | 0 ...cdf-mpi-11.symbols => libnetcdf-mpi-12.symbols} | 0 ...cdf-11.install => libnetcdf-pnetcdf-12.install} | 0 debian/libnetcdf12.symbols | 1526 ++ debian/netcdf-bin.lintian-overrides| 2 + debian/patches/attributes-typo.patch |16 - debian/patches/hdf5-library-path.patch |14 +- debian/patches/m4-generated-sources.patch | 503 - debian/patches/privacy-breach-logo.patch |11 + debian/rules | 6 + docs/CMakeLists.txt| 1 + docs/Doxyfile.developer| 4 +- docs/Doxyfile.in |29 +- docs/FAQ.md|10 +- docs/Makefile.am | 4 +- docs/Makefile.in | 5 +- docs/OPeNDAP.dox | 3 +- docs/credits.md| 4 +- docs/esg.html | 222 - docs/esg.md| 223 + docs/guide.dox | 7 +- docs/images/Makefile.in| 1 + docs/mainpage.dox |13 +- docs/obsolete/fan_utils.html | 1437 ++ docs/release.css | 4 +- docs/release_header.html | 2 +- docs/software.md |18 +- docs/types.dox | 8 +- docs/windows-binaries.md |28 +- examples/C/Makefile.in | 1 + examples/CDL/Makefile.in | 1 + examples/Makefile.in | 1 + h5_test/CMakeLists.txt | 2 +- h5_test/Makefile.in| 1 + include/CMakeLists.txt |23 + include/Makefile.am| 2 +- include/Makefile.in| 5 +- include/nc.h | 1 - include/nc3internal.h | 9 +- include/nc4internal.h |34 +- include/nc_hashmap.h |39 + include/nc_tests.h | 3 + include/ncdispatch.h |34 +- include/netcdf.h | 2 +- include/netcdf_mem.h |53 +- include/netcdf_meta.h.in | 2 +- include/netcdf_par.h |11 +- libdap2/Makefile.in| 1 + libdap2/dapcvt.c |33 +- libdap2/dapdebug.h | 4 +- libdap2/env|14 +- libdap2/getvara.c | 2 +- libdap2/nccommon.h | 4 + libdap2/ncd2dispatch.c | 817 +- libdap2
[netcdf] branch dev-coinstallable updated (51cd56c -> 94e9273)
This is an automated email from the git hooks/post-receive script. mckinstry pushed a change to branch dev-coinstallable in repository netcdf. from 51cd56c revert adds c152f90 Update Vcs-Git URL to use HTTPS. adds 03cd33d Add changelog entry for Vcs-Git URL change. adds e003c2c Bump Standards-Version to 3.9.7, no changes. adds e1a489c Add build dependency on graphviz for dot. adds 9748e8c Enable all hardening buildflags, except PIE (breaks the build). adds 50ba7db Set distribution to unstable. adds 02e49ce Imported Upstream version 4.4.1~rc1 adds eb021bc Merge tag 'upstream/4.4.1_rc1' adds 4a91190 New upstream release candidate. adds ea90d5b Drop patches applied upstream. adds f3a47aa Bump Standards-Version to 3.9.8, no changes. adds 1839170 Update copyright file, update copyright years for Unidata. adds fb17f40 Rename library package for SONAME bump. adds 673d57c Update privacy-breach-logo.patch to also remove favicon link. adds 4b06e11 Update symbols for 4.4.1-rc1. adds 05921e8 Set distribution to experimental. new 818f7b4 merge 4.4.1~rc1 new 8be9af6 Change SOVERSION to 12 new d007cbb typo: missing line new 33bd9d4 refresh patches new 4351fc9 attributes-typo not needed new fd5a26f remove m4-generated-sources, too new c574ee6 Initial netcdf-netcdf.ver new 096de27 install fix: libnetcdf_serial.so.* new 5d421ecAdd libpnetcdf-dev dependency new 93fbaf0 remove obsolete patch references new 85bb750 DH_COMPAT=10 new 1d7599f Drop -DHDF5_INCLUDE_PATH new 4559949 lintian overrides for self-recursive symlinks new 6a21c3e Lintian overrides on soname mismatch new cef4884 disable unnecessary symlink new efd828a Revert SOVERSION 12 -> 11, accidentally incremented in upstream adds 66c0aba Imported Upstream version 4.4.1~rc2 adds 0d7125e Imported Upstream version 4.4.1~rc3 new 3f5dbe3 Merge tag 'upstream/4.4.1_rc3' into dev-coinstallable new 148a2fd Change pkg version ro 4.3.1~rc3 adds a32f19a Imported Upstream version 4.4.1 new ece76c3 Merge tag 'upstream/4.4.1' into dev-coinstallable new 86d0b38 And change pkg name to 4.4.1 new 2e58421 SO_VERSION is 11.3.0 new de5bca5 Remove -dbg package now we have -dbgsym packages new 4162424 Add patch to fix linking tst_fileinfo new 2a4c572 Merge common CMAKE_FLAGS; add BUILD_TYPE=Release new 1a5dcc8 Delete accidental patch include new 973307a copy libs to ./tmp new 9c3652b Undo libname change for serial as it changes soname new b7ca961 remove unnecessary parameters new d95abc0 revert name of serial to libnetcdf11 to avoid transition new 2e4d1b5 Drop _serial suffix on serial version new 94e9273 Fix install of libnetcdf.so.* The 31 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: .github/ISSUE_TEMPLATE.md |26 + .gitignore | 3 - .travis.yml|28 +- .travis.yml.old|52 - CMakeLists.txt | 145 +- CONTRIBUTING.html | 248 - CONTRIBUTING.md|77 + Makefile.in| 1 + README.md |27 +- RELEASE_NOTES.md |39 +- cf |13 +- cf.cmake |19 +- config.h.cmake.in |12 +- config.h.in| 9 + configure | 146 +- configure.ac |65 +- debian/changelog |28 +- debian/compat | 2 +- debian/control |28 +- debian/copyright | 2 +- debian/libnetcdf-11.install| 1 - debian/libnetcdf-11.symbols| 1463 -- debian/libnetcdf-dev.lintian-overrides | 1 + debian/libnetcdf-mpi-11.lintian-overrides | 1 + debian/libnetcdf-mpi-dev.lintian-overrides | 1 + debian/libnetcdf-pnetcdf-11.lintian-overrides | 1 +
[netcdf] 02/31: Change SOVERSION to 12
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch dev-coinstallable in repository netcdf. commit 8be9af6f6dc3f45931a705886302cb48d0756cc0 Author: Alastair McKinstry <mckins...@debian.org> Date: Fri May 13 21:26:57 2016 +0100 Change SOVERSION to 12 --- debian/rules | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/rules b/debian/rules index 236c683..e8d76ee 100755 --- a/debian/rules +++ b/debian/rules @@ -89,31 +89,31 @@ override_dh_auto_install: done # Parallel versions for d in mpi pnetcdf ; do \ - cp debian/tmp-$$d/$(LIBDIR)/libnetcdf_$$d.so.11.0.0 debian/tmp/$(LIBDIR)/libnetcdf_$$d.so.11.0.0 ; \ + cp debian/tmp-$$d/$(LIBDIR)/libnetcdf_$$d.so.12.0.0 debian/tmp/$(LIBDIR)/libnetcdf_$$d.so.12.0.0 ; \ sed -e 's%@MULTIARCH@%$(DEB_HOST_MULTIARCH)%g' < debian/libnetcdf-$$d-dev.postinst.in \ > debian/libnetcdf-$$d-dev.postinst ; \ echo "prefix=$(LIBDIR)/netcdf/$$d" > debian/tmp/$(LIBDIR)/pkgconfig/netcdf-$$d.pc ; \ sed -e 's/-lnetcdf/-lnetcdf_$$d/' < debian/tmp-$$d/$(LIBDIR)/pkgconfig/netcdf.pc \ | grep -v "prefix=" \ >> debian/tmp/$(LIBDIR)/pkgconfig/netcdf-$$d.pc ; \ - dh_link -p libnetcdf-$$d-dev $(LIBDIR)/libnetcdf_$$d.so.11.0.0 $(LIBDIR)/netcdf/$$d/libnetcdf.so ; \ - dh_link -p libnetcdf-$$d-dev $(LIBDIR)/libnetcdf_$$d.so.11.0.0 $(LIBDIR)/libnetcdf_$$d.so ; \ - dh_link -p libnetcdf-$$d-11 $(LIBDIR)/libnetcdf_$$d.so.11.0.0 $(LIBDIR)/libnetcdf_$$d.so.11 ; \ + dh_link -p libnetcdf-$$d-dev $(LIBDIR)/libnetcdf_$$d.so.12.0.0 $(LIBDIR)/netcdf/$$d/libnetcdf.so ; \ + dh_link -p libnetcdf-$$d-dev $(LIBDIR)/libnetcdf_$$d.so.12.0.0 $(LIBDIR)/libnetcdf_$$d.so ; \ + dh_link -p libnetcdf-$$d-12 $(LIBDIR)/libnetcdf_$$d.so.12.0.0 $(LIBDIR)/libnetcdf_$$d.so.12 ; \ dh_link -p libnetcdf-$$d-dev $(LIBDIR)/netcdf/$$d $(LIBDIR)/netcdf/$$d/lib ; \ dh_link -p libnetcdf-$$d-dev /usr/include $(LIBDIR)/netcdf/$$d/include ; \ done # Serial; one-off only - cp debian/tmp-serial/$(LIBDIR)/libnetcdf.so.11.0.0 debian/tmp/$(LIBDIR)/libnetcdf_serial.so.11.0.0 ; \ + cp debian/tmp-serial/$(LIBDIR)/libnetcdf.so.12.0.0 debian/tmp/$(LIBDIR)/libnetcdf_serial.so.12.0.0 ; \ echo "prefix=$(LIBDIR)/netcdf/serial" > debian/tmp/$(LIBDIR)/pkgconfig/netcdf-serial.pc grep -v "prefix=" debian/tmp-serial/$(LIBDIR)/pkgconfig/netcdf.pc >> debian/tmp/$(LIBDIR)/pkgconfig/netcdf-serial.pc cp -a debian/tmp-serial/$(LIBDIR)/cmake/netCDF debian/tmp/$(LIBDIR)/cmake/netCDF cp -a debian/tmp-pnetcdf/usr/include debian/tmp/usr cp -a debian/tmp-serial/usr/share debian/tmp/usr cp -a debian/tmp-serial/usr/bin debian/tmp/usr - dh_link -p libnetcdf-dev $(LIBDIR)/libnetcdf_serial.so.11.0.0 $(LIBDIR)/netcdf/serial/libnetcdf.so - dh_link -p libnetcdf-dev $(LIBDIR)/libnetcdf_serial.so.11.0.0 $(LIBDIR)/libnetcdf_serial.so - dh_link -p libnetcdf-11 $(LIBDIR)/libnetcdf_serial.so.11.0.0 $(LIBDIR)/libnetcdf_serial.so.11 - dh_link -p libnetcdf-11 $(LIBDIR)/libnetcdf_serial.so.11.0.0 $(LIBDIR)/libnetcdf.so.11 + dh_link -p libnetcdf-dev $(LIBDIR)/libnetcdf_serial.so.12.0.0 $(LIBDIR)/netcdf/serial/libnetcdf.so + dh_link -p libnetcdf-dev $(LIBDIR)/libnetcdf_serial.so.12.0.0 $(LIBDIR)/libnetcdf_serial.so + dh_link -p libnetcdf-12 $(LIBDIR)/libnetcdf_serial.so.12.0.0 $(LIBDIR)/libnetcdf_serial.so.12 + dh_link -p libnetcdf-12 $(LIBDIR)/libnetcdf_serial.so.12.0.0 $(LIBDIR)/libnetcdf.so.12 $(RM) debian/tmp/usr/share/doc/netCDF/html/jquery.js sed -e 's%@MULTIARCH@%$(DEB_HOST_MULTIARCH)%g' < debian/libnetcdf-dev.postinst.in \ > debian/libnetcdf-dev.postinst -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Re: libterralib_4.3.0+dfsg.2-8_amd64.changes ACCEPTED into unstable
Hi Sebastian Thanks, this is now done. Best regards Alastair On 14/07/2016 20:30, Sebastiaan Couwenberg wrote: > Hi Alastair, > > Thanks for your continued work on libterralib. > > On 07/14/2016 09:24 PM, Debian FTP Masters wrote: >> libterralib (4.3.0+dfsg.2-8) unstable; urgency=medium >> . >>* Fix for ::isnan change for G++ 5.4, 6.1. Closes: #830463 >>* Drop Petter Reinholsen as uploader. Closes: #830910. > Can you push your changes for libterralib to the git repository on > Alioth? The latest version there is still 4.3.0+dfsg.2-4. > > Because of the changes since -4 on Alioth, simply pushing your changes > as documented in the policy [0] is probably not sufficient, and you'll > need to rebase your changes on top of those from Alioth. > > Please let me know if you need help getting your changes to Alioth. > > [0] > https://pkg-grass.alioth.debian.org/policy/packaging.html#git-push-to-alioth > > Kind Regards, > > Bas > -- Alastair McKinstry, <alast...@sceal.ie>, <mckins...@debian.org>, https://diaspora.sceal.ie/u/amckinstry Misentropy: doubting that the Universe is becoming more disordered. signature.asc Description: OpenPGP digital signature ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libterralib] 01/01: rebase on alioth
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch master in repository libterralib. commit a683f4b031068d914353cf0019ac2bb17aee889e Merge: 1a66d5b 62d8d4d Author: Alastair McKinstry <mckins...@debian.org> Date: Fri Jul 15 11:59:26 2016 +0100 rebase on alioth debian/control | 3 +-- debian/patches/g++-6-fixes.patch | 9 ++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --cc debian/patches/g++-6-fixes.patch index 6abced6,000..0187bd7 mode 100644,00..100644 --- a/debian/patches/g++-6-fixes.patch +++ b/debian/patches/g++-6-fixes.patch @@@ -1,18 -1,0 +1,21 @@@ +Description: C++ -std11 fix needed for magics + Disambiguate isnan() for users of TeDefines.h +Author: Alastair McKinstry <mckins...@debian.org> +Last-Update: 2016-05-02 +Forwarded: no +Index: libterralib-4.3.0+dfsg.2/src/terralib/kernel/TeDefines.h +=== +--- libterralib-4.3.0+dfsg.2.orig/src/terralib/kernel/TeDefines.h libterralib-4.3.0+dfsg.2/src/terralib/kernel/TeDefines.h - @@ -205,7 +205,7 @@ const std::string TeDBVERSION = "4.0.0"; ++@@ -204,8 +204,9 @@ const std::string TeDBVERSION = "4.0.0"; ++ #include + #define TeISNAN( x ) _isnan( x ) + #elif TePLATFORM == TePLATFORMCODE_LINUX || TePLATFORM == TePLATFORMCODE_AIX -#include ++- #include +- #define TeISNAN( x ) isnan( x ) - +#define TeISNAN( x ) std::isnan( x ) +++#include +++ using ::isnan; +++#define TeISNAN( x ) ::isnan( x ) + #else + #error "ERROR: Unsupported platform" + #endif -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libterralib] branch master updated (62d8d4d -> a683f4b)
This is an automated email from the git hooks/post-receive script. mckinstry pushed a change to branch master in repository libterralib. from 62d8d4d Update Vcs-* URLs to use HTTPS. adds 082d312 Depend on dxflib >= 3.12.2 for transition. adds a19ef83 Standards-Version: 3.9.7; no changes required. adds 3a54bbe Prep 4.3.0+dfsg.2-5 for upload adds 738af83 Build with libqwt-qt5-dev, don't mix qt4. Closes: #814857. adds f966a10 Fix Typo in debian/rules includes; thanks to Dmitry Shachnev adds a4594ca Enable qwt, TerraView libs adds 8ffcc85 Prep -6 for qwt transition adds 1a66d5b * Add patch for g++6 (-std11) changes. * Build -std11 in prep. for g++-6 * Standards-Version: 3.9.8 new a683f4b rebase on alioth The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 26 +- debian/control | 13 +++-- debian/patches/g++-6-fixes.patch | 21 + debian/patches/series| 1 + debian/rules | 8 ++-- 5 files changed, 56 insertions(+), 13 deletions(-) create mode 100644 debian/patches/g++-6-fixes.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libterralib] 04/05: Prep -6 for qwt transition
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to tag debian/4.3.0+dfsg.2-6 in repository libterralib. commit 8ffcc85a593d11e7eae816785d130838f6e77b5c Author: Alastair McKinstry <mckins...@debian.org> Date: Tue Mar 8 12:46:01 2016 + Prep -6 for qwt transition --- debian/changelog | 3 +-- debian/control | 3 ++- debian/rules | 7 --- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index ae18500..5f55fb9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,7 @@ -libterralib (4.3.0+dfsg.2-6) UNRELEASED; urgency=medium +libterralib (4.3.0+dfsg.2-6) unstable; urgency=medium * Build with libqwt-qt5-dev, don't mix qt4. Closes: #814857. * Fix Typo in debian/rules includes; thanks to Dmitry Shachnev - * Enable qwt, TerraView libs -- Alastair McKinstry <mckins...@debian.org> Mon, 07 Mar 2016 00:51:24 + diff --git a/debian/control b/debian/control index 45a92cf..b28b17e 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,8 @@ Build-Depends: debhelper (>= 9), libshp-dev, libdxflib-dev (>= 3.12.2), libmysqlclient-dev, - libpq-dev + libpq-dev, + firebird-dev Standards-Version: 3.9.7 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/libterralib.git Vcs-Git: git://anonscm.debian.org/pkg-grass/libterralib.git diff --git a/debian/rules b/debian/rules index 33f17ff..02f7fbe 100755 --- a/debian/rules +++ b/debian/rules @@ -28,9 +28,10 @@ override_dh_auto_build: for d in terralib te_functions te_utils image_processing PostgreSQL MySQL shapelib stat te_dxf te_shapelib ; do \ ( cd build/qt4/$$d && qmake QMAKE_CXXFLAGS=$(CXXFLAGS) $$d.pro && $(MAKE) ) ; \ done - for d in qwt ; do \ - ( cd build/qt/$$d && qmake QMAKE_CXXFLAGS=$(CXXFLAGS) $$d.pro && $(MAKE) ) ; \ - done + # Disable qwt, terraView work until after libqwt-qt5-dev transition + #for d in qwt ; do \ + # ( cd build/qt/$$d && qmake QMAKE_CXXFLAGS=$(CXXFLAGS) $$d.pro && $(MAKE) ) ; \ + # done for d in terralib te_functions te_utils terralibpdi shapelib te_shapelib te_mysql te_postgresql te_dxf stat ; do \ ar rcs Release/lib$$d.a Release/linux-g++/obj/$$d/*.o ;\ done -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libterralib] tag debian/4.3.0+dfsg.2-6 created (now 1a66d5b)
This is an automated email from the git hooks/post-receive script. mckinstry pushed a change to tag debian/4.3.0+dfsg.2-6 in repository libterralib. at 1a66d5b (commit) This tag includes the following new commits: new 082d312 Depend on dxflib >= 3.12.2 for transition. new a19ef83 Standards-Version: 3.9.7; no changes required. new 3a54bbe Prep 4.3.0+dfsg.2-5 for upload new 738af83 Build with libqwt-qt5-dev, don't mix qt4. Closes: #814857. new f966a10 Fix Typo in debian/rules includes; thanks to Dmitry Shachnev new a4594ca Enable qwt, TerraView libs new 8ffcc85 Prep -6 for qwt transition new 1a66d5b * Add patch for g++6 (-std11) changes. * Build -std11 in prep. for g++-6 * Standards-Version: 3.9.8 The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libterralib] 02/05: Fix Typo in debian/rules includes; thanks to Dmitry Shachnev
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to tag debian/4.3.0+dfsg.2-6
in repository libterralib.
commit f966a1022850ceb1f6239ea52c94e2c7c22bb4da
Author: Alastair McKinstry <mckins...@debian.org>
Date: Mon Mar 7 01:44:35 2016 +
Fix Typo in debian/rules includes; thanks to Dmitry Shachnev
---
debian/changelog | 1 +
debian/rules | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index c978e93..078161a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libterralib (4.3.0+dfsg.2-6) experimental; urgency=medium
* Build with libqwt-qt5-dev, don't mix qt4. Closes: #814857.
+ * Fix Typo in debian/rules includes; thanks to Dmitry Shachnev
-- Alastair McKinstry <mckins...@debian.org> Mon, 07 Mar 2016 00:51:24 +
diff --git a/debian/rules b/debian/rules
index 15651f9..1a86773 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ DEB_CFLAGS_MAINT_APPEND:= -Wall -pedantic
export DEB_BUILD_MAINT_OPTIONS
export DEB_CFLAGS_MAINT_APPEND
CXXFLAGS:= $(shell dpkg-buildflags --get CXXFLAGS)
-CXXFLAGS:= '$(CXXFLAGS) -fpermissive -I/usr/include/geotiff
-I/usr/include/dxflib -I/usr/incluce/qwt'
+CXXFLAGS:= '$(CXXFLAGS) -fpermissive -I/usr/include/geotiff
-I/usr/include/dxflib -I/usr/include/qwt'
override_dh_auto_build:
find examples -type f -exec chmod 644 {} \;
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/libterralib.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libterralib] 03/05: Enable qwt, TerraView libs
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to tag debian/4.3.0+dfsg.2-6 in repository libterralib. commit a4594ca1a103f5ef64e8467761ec068d0b81cd77 Author: Alastair McKinstry <mckins...@debian.org> Date: Tue Mar 8 09:09:37 2016 + Enable qwt, TerraView libs --- debian/changelog | 3 ++- debian/rules | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 078161a..ae18500 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ -libterralib (4.3.0+dfsg.2-6) experimental; urgency=medium +libterralib (4.3.0+dfsg.2-6) UNRELEASED; urgency=medium * Build with libqwt-qt5-dev, don't mix qt4. Closes: #814857. * Fix Typo in debian/rules includes; thanks to Dmitry Shachnev + * Enable qwt, TerraView libs -- Alastair McKinstry <mckins...@debian.org> Mon, 07 Mar 2016 00:51:24 + diff --git a/debian/rules b/debian/rules index 1a86773..33f17ff 100755 --- a/debian/rules +++ b/debian/rules @@ -28,6 +28,9 @@ override_dh_auto_build: for d in terralib te_functions te_utils image_processing PostgreSQL MySQL shapelib stat te_dxf te_shapelib ; do \ ( cd build/qt4/$$d && qmake QMAKE_CXXFLAGS=$(CXXFLAGS) $$d.pro && $(MAKE) ) ; \ done + for d in qwt ; do \ + ( cd build/qt/$$d && qmake QMAKE_CXXFLAGS=$(CXXFLAGS) $$d.pro && $(MAKE) ) ; \ + done for d in terralib te_functions te_utils terralibpdi shapelib te_shapelib te_mysql te_postgresql te_dxf stat ; do \ ar rcs Release/lib$$d.a Release/linux-g++/obj/$$d/*.o ;\ done -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libterralib] tag debian/4.3.0+dfsg.2-5 created (now 3a54bbe)
This is an automated email from the git hooks/post-receive script. mckinstry pushed a change to tag debian/4.3.0+dfsg.2-5 in repository libterralib. at 3a54bbe (commit) This tag includes the following new commits: new 082d312 Depend on dxflib >= 3.12.2 for transition. new a19ef83 Standards-Version: 3.9.7; no changes required. new 3a54bbe Prep 4.3.0+dfsg.2-5 for upload The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libterralib] tag debian/4.3.0+dfsg.2-7 created (now 1a66d5b)
This is an automated email from the git hooks/post-receive script. mckinstry pushed a change to tag debian/4.3.0+dfsg.2-7 in repository libterralib. at 1a66d5b (commit) This tag includes the following new commits: new 082d312 Depend on dxflib >= 3.12.2 for transition. new a19ef83 Standards-Version: 3.9.7; no changes required. new 3a54bbe Prep 4.3.0+dfsg.2-5 for upload new 738af83 Build with libqwt-qt5-dev, don't mix qt4. Closes: #814857. new f966a10 Fix Typo in debian/rules includes; thanks to Dmitry Shachnev new a4594ca Enable qwt, TerraView libs new 8ffcc85 Prep -6 for qwt transition new 1a66d5b * Add patch for g++6 (-std11) changes. * Build -std11 in prep. for g++-6 * Standards-Version: 3.9.8 The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libterralib] 01/05: Build with libqwt-qt5-dev, don't mix qt4. Closes: #814857.
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to tag debian/4.3.0+dfsg.2-6 in repository libterralib. commit 738af83a24d0793218352932998ce4b9bfc702b5 Author: Alastair McKinstry <mckins...@debian.org> Date: Mon Mar 7 01:42:44 2016 + Build with libqwt-qt5-dev, don't mix qt4. Closes: #814857. --- debian/changelog | 6 ++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0b92eba..c978e93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libterralib (4.3.0+dfsg.2-6) experimental; urgency=medium + + * Build with libqwt-qt5-dev, don't mix qt4. Closes: #814857. + + -- Alastair McKinstry <mckins...@debian.org> Mon, 07 Mar 2016 00:51:24 + + libterralib (4.3.0+dfsg.2-5) unstable; urgency=medium * Depend on dxflib >= 3.12.2 for transition. diff --git a/debian/control b/debian/control index 8dfa0c2..45a92cf 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 9), qt5-qmake, qtbase5-dev, zlib1g-dev, - libqwt-dev, + libqwt-qt5-dev, libshp-dev, libdxflib-dev (>= 3.12.2), libmysqlclient-dev, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libterralib] 03/03: Prep 4.3.0+dfsg.2-5 for upload
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to tag debian/4.3.0+dfsg.2-5 in repository libterralib. commit 3a54bbe6d373079c053090a3dfa85db6997d5fbe Author: Alastair McKinstry <mckins...@debian.org> Date: Mon Feb 22 12:32:52 2016 + Prep 4.3.0+dfsg.2-5 for upload --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 20ea28a..0b92eba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libterralib (4.3.0+dfsg.2-5) UNRELEASED; urgency=medium +libterralib (4.3.0+dfsg.2-5) unstable; urgency=medium * Depend on dxflib >= 3.12.2 for transition. * Standards-Version: 3.9.7; no changes required. - -- Alastair McKinstry <mckins...@debian.org> Sun, 10 Jan 2016 15:44:49 +0000 + -- Alastair McKinstry <mckins...@debian.org> Mon, 22 Feb 2016 12:23:10 + libterralib (4.3.0+dfsg.2-4) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 08/19: Use NETCDF_LIB_NAME to change sonames
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit 4388d8ab859cff989d2e39e30d013291670fcb05
Author: Alastair McKinstry <mckins...@debian.org>
Date: Sat Feb 20 09:12:26 2016 +
Use NETCDF_LIB_NAME to change sonames
---
debian/rules | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/debian/rules b/debian/rules
index 96d79d3..36c58d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,7 +40,8 @@ override_dh_auto_configure:
-DENABLE_DOXYGEN:BOOL=ON \
-DENABLE_PNETCDF=ON \
-DPNETCDF_INCLUDE_DIR=/usr/include \
- -DCMAKE_C_COMPILER=mpicc
+ -DCMAKE_C_COMPILER=mpicc \
+ -DNETCDF_LIB_NAME=netcdf_pnetcdf
dh_auto_configure --builddirectory=build-mpi -- \
-DCMAKE_SKIP_RPATH:BOOL=ON \
-DENABLE_PARALLEL_TESTS:BOOL=OFF \
@@ -56,7 +57,8 @@ override_dh_auto_configure:
-DHDF5_HL_LIB=$(LIBDIR)/hdf5/$(MPI)/libhdf5_hl.so \
-DCMAKE_C_FLAGS="${CFLAGS} -DHDF5_PARALLEL" \
-DLIBLIB_VERSION_SCRIPT=-Wl,--version-script,$(CURDIR)/debian/netcdf-mpi.ver \
- -DCMAKE_C_COMPILER=mpicc
+ -DCMAKE_C_COMPILER=mpicc \
+ -DNETCDF_LIB_NAME=netcdf_pnetcdf
override_dh_auto_build:
$(MAKE) -C build-serial
@@ -102,7 +104,7 @@ override_dh_auto_install:
sed -e 's%@MULTIARCH@%$(DEB_HOST_MULTIARCH)%g' <
debian/libnetcdf-dev.postinst.in \
> debian/libnetcdf-dev.postinst
# Strip RPATH
- -find $(CURDIR)/debian/tmp/usr/bin -type f -not -name nc-config -exec
chrpath --delete {} \;
+ -find $(CURDIR)/debian/tmp/usr/bin -type f -not -name nc-config -exec
hrpath --delete {} \;
-find $(CURDIR)/debian/tmp/usr/lib -type f -name "*.so*" -exec chrpath
--delete {} \;
dh_link -p libnetcdf-dev .$(LIBDIR)/netcdf/serial/lib
dh_link -p libnetcdf-dev /usr/include $(LIBDIR)/netcdf/serial/include
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/netcdf.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 17/19: WIP: find MPI libs
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit c1d7eea9f21dbebf039a4c95b813c8a9be0dcc6c
Author: Alastair McKinstry <mckins...@debian.org>
Date: Tue Apr 12 19:31:22 2016 +0100
WIP: find MPI libs
---
debian/rules | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/debian/rules b/debian/rules
index b3cd8ec..f55528c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,8 +39,6 @@ override_dh_auto_configure:
-DENABLE_DOXYGEN:BOOL=ON \
-DENABLE_PNETCDF=ON \
-DPNETCDF_INCLUDE_DIR=/usr/include \
- -DHDF5_C_LIBRARY=$(LIBDIR)/hdf5/serial/libhdf5.so \
- -DHDF5_HL_LIBRARY=$(LIBDIR)/hdf5/serial/libhdf5_hl.so \
-DLIBLIB_VERSION_SCRIPT=-Wl,--version-script,$(CURDIR)/debian/netcdf-pnetcdf.ver
\
-DCMAKE_C_COMPILER=mpicc \
-DNETCDF_LIB_NAME=netcdf_pnetcdf
@@ -53,16 +51,21 @@ override_dh_auto_configure:
-DENABLE_PARALLEL4=ON \
-DENABLE_NETCDF_4=ON \
-DUSE_SZIP=ON \
+ -DUSE_HDF5=ON \
-DHDF5_INCLUDE_DIR=$(INCDIR)/hdf5/$(MPI) \
-DHDF5_INCLUDE_PATH=$(INCDIR)/hdf5/$(MPI) \
-DHDF5_C_LIBRARY=$(LIBDIR)/hdf5/$(MPI)/libhdf5.so \
-DHDF5_HL_LIBRARY=$(LIBDIR)/hdf5/$(MPI)/libhdf5_hl.so \
+ -DHDF5_C_LIBRARIES=$(LIBDIR)/hdf5/$(MPI)/libhdf5.so \
+ -DHDF5_HL_LIBRARIES=$(LIBDIR)/hdf5/$(MPI)/libhdf5_hl.so \
-DHDF5_LIBRARY_PATH=$(LIBRARY)/hdf5/$(MPI) \
-DCMAKE_C_FLAGS="${CFLAGS} -DHDF5_PARALLEL" \
-DLIBLIB_VERSION_SCRIPT=-Wl,--version-script,$(CURDIR)/debian/netcdf-mpi.ver \
-DCMAKE_C_COMPILER=mpicc \
-DNETCDF_LIB_NAME=netcdf_mpi
+
+
override_dh_auto_build:
$(MAKE) -C build-serial
$(MAKE) -C build-pnetcdf
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/netcdf.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 16/19: WIP: specify libs
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit 63cfc72d32edf25fa41cf89f25e48d9385bd5e5a
Author: Alastair McKinstry <mckins...@debian.org>
Date: Tue Feb 23 01:31:34 2016 +
WIP: specify libs
---
debian/rules | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/debian/rules b/debian/rules
index 28ea438..b3cd8ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,8 +26,10 @@ override_dh_auto_configure:
-DENABLE_MMAP=ON \
-DUSE_SZIP=ON \
-DHDF5_INCLUDE_DIR=$(INCDIR)/hdf5/serial \
- -DHDF5_LIB=$(LIBDIR)/hdf5/serial/libhdf5.so \
- -DHDF5_HL_LIB=$(LIBDIR)/hdf5/serial/libhdf5_hl.so \
+ -DHDF5_INCLUDE_PATH=$(INCDIR)/hdf5/serial \
+ -DHDF5_LIBRARY_PATH=$(LIBRARY)/hdf5/serial \
+ -DHDF5_C_LIBRARY=$(LIBDIR)/hdf5/serial/libhdf5.so \
+ -DHDF5_HL_LIBRARY=$(LIBDIR)/hdf5/serial/libhdf5_hl.so \
-DLIBLIB_VERSION_SCRIPT=-Wl,--version-script,$(CURDIR)/debian/netcdf-serial.ver
dh_auto_configure --builddirectory=build-pnetcdf -- \
-DCMAKE_SKIP_RPATH:BOOL=ON \
@@ -37,6 +39,9 @@ override_dh_auto_configure:
-DENABLE_DOXYGEN:BOOL=ON \
-DENABLE_PNETCDF=ON \
-DPNETCDF_INCLUDE_DIR=/usr/include \
+ -DHDF5_C_LIBRARY=$(LIBDIR)/hdf5/serial/libhdf5.so \
+ -DHDF5_HL_LIBRARY=$(LIBDIR)/hdf5/serial/libhdf5_hl.so \
+
-DLIBLIB_VERSION_SCRIPT=-Wl,--version-script,$(CURDIR)/debian/netcdf-pnetcdf.ver
\
-DCMAKE_C_COMPILER=mpicc \
-DNETCDF_LIB_NAME=netcdf_pnetcdf
dh_auto_configure --builddirectory=build-mpi -- \
@@ -45,13 +50,14 @@ override_dh_auto_configure:
-DENABLE_TESTS:BOOL=ON \
-DENABLE_DOXYGEN:BOOL=ON \
-DENABLE_MMAP=ON \
- -DHDF5_IS_PARALLEL=ON \
-DENABLE_PARALLEL4=ON \
-DENABLE_NETCDF_4=ON \
-DUSE_SZIP=ON \
-DHDF5_INCLUDE_DIR=$(INCDIR)/hdf5/$(MPI) \
- -DHDF5_LIB=$(LIBDIR)/hdf5/$(MPI)/libhdf5.so \
- -DHDF5_HL_LIB=$(LIBDIR)/hdf5/$(MPI)/libhdf5_hl.so \
+ -DHDF5_INCLUDE_PATH=$(INCDIR)/hdf5/$(MPI) \
+ -DHDF5_C_LIBRARY=$(LIBDIR)/hdf5/$(MPI)/libhdf5.so \
+ -DHDF5_HL_LIBRARY=$(LIBDIR)/hdf5/$(MPI)/libhdf5_hl.so \
+ -DHDF5_LIBRARY_PATH=$(LIBRARY)/hdf5/$(MPI) \
-DCMAKE_C_FLAGS="${CFLAGS} -DHDF5_PARALLEL" \
-DLIBLIB_VERSION_SCRIPT=-Wl,--version-script,$(CURDIR)/debian/netcdf-mpi.ver \
-DCMAKE_C_COMPILER=mpicc \
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/netcdf.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 12/19: Add .so links in libdir
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch dev-coinstallable in repository netcdf. commit c99a17890f9878a4fb058a9c7e35b83e1ab64348 Author: Alastair McKinstry <mckins...@debian.org> Date: Sun Feb 21 09:07:26 2016 + Add .so links in libdir --- debian/rules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/rules b/debian/rules index 6fe302a..30db495 100755 --- a/debian/rules +++ b/debian/rules @@ -84,6 +84,7 @@ override_dh_auto_install: | grep -v "prefix=" \ >> debian/tmp/$(LIBDIR)/pkgconfig/netcdf-$$d.pc ; \ dh_link -p libnetcdf-$$d-dev $(LIBDIR)/libnetcdf_$$d.so.11.0.0 $(LIBDIR)/netcdf/$$d/libnetcdf.so ; \ + dh_link -p libnetcdf-$$d-dev $(LIBDIR)/libnetcdf_$$d.so.11.0.0 $(LIBDIR)/libnetcdf_$$d.so ; \ dh_link -p libnetcdf-$$d-11 $(LIBDIR)/libnetcdf_$$d.so.11.0.0 $(LIBDIR)/libnetcdf_$$d.so.11 ; \ dh_link -p libnetcdf-$$d-dev $(LIBDIR) $(LIBDIR)/netcdf/$$d/lib ; \ dh_link -p libnetcdf-$$d-dev /usr/include $(LIBDIR)/netcdf/$$d/include ; \ @@ -97,6 +98,7 @@ override_dh_auto_install: cp -a debian/tmp-serial/usr/share debian/tmp/usr cp -a debian/tmp-serial/usr/bin debian/tmp/usr dh_link -p libnetcdf-dev $(LIBDIR)/libnetcdf_serial.so.11.0.0 $(LIBDIR)/netcdf/serial/libnetcdf.so + dh_link -p libnetcdf-dev $(LIBDIR)/libnetcdf_serial.so.11.0.0 $(LIBDIR)/libnetcdf_serial.so dh_link -p libnetcdf-11 $(LIBDIR)/libnetcdf_serial.so.11.0.0 $(LIBDIR)/libnetcdf_serial.so.11 dh_link -p libnetcdf-11 $(LIBDIR)/libnetcdf_serial.so.11.0.0 $(LIBDIR)/libnetcdf.so.11 $(RM) debian/tmp/usr/share/doc/netCDF/html/jquery.js -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 09/19: Set prefix= to the appropriate dir $LIBDIR/netcdf/$type in pkgconfig files
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch dev-coinstallable in repository netcdf. commit b0cd15303180f2845fc1b55a6f0c24d6b3621a46 Author: Alastair McKinstry <mckins...@debian.org> Date: Sat Feb 20 12:50:27 2016 + Set prefix= to the appropriate dir $LIBDIR/netcdf/$type in pkgconfig files --- debian/rules | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 36c58d9..f6560b1 100755 --- a/debian/rules +++ b/debian/rules @@ -81,8 +81,10 @@ override_dh_auto_install: for d in mpi pnetcdf ; do \ sed -e 's%@MULTIARCH@%$(DEB_HOST_MULTIARCH)%g' < debian/libnetcdf-$$d-dev.postinst.in \ > debian/libnetcdf-$$d-dev.postinst ; \ + echo "prefix=$(LIBDIR)/netcdf/$$(d)" > debian/tmp/$(LIBDIR)/pkgconfig/netcdf-$$d.pc ; \ sed -e 's/-lnetcdf/-lnetcdf_$$d/' < debian/tmp-$$d/$(LIBDIR)/pkgconfig/netcdf.pc \ - > debian/tmp/$(LIBDIR)/pkgconfig/netcdf-$$d.pc ; \ + | grep -v "prefix=" \ + >> debian/tmp/$(LIBDIR)/pkgconfig/netcdf-$$d.pc ; \ mv debian/tmp-$$d/$(LIBDIR)/libnetcdf.so.11.0.0 debian/tmp/$(LIBDIR)/libnetcdf_$$d.so.11.0.0 ; \ ln -sf $(LIBDIR)/libnetcdf_$$d.so.11.0.0 debian/tmp/$(LIBDIR)/netcdf/$$d/libnetcdf.so ; \ ln -sf libnetcdf_$$d.so.11.0.0 debian/tmp/$(LIBDIR)/libnetcdf_$$d.so.11; \ @@ -91,7 +93,8 @@ override_dh_auto_install: dh_link -p libnetcdf-$$d-dev /usr/include $(LIBDIR)/netcdf/$$d/include ; \ done # Serial; one-off only - cp -a debian/tmp-serial/$(LIBDIR)/pkgconfig/netcdf.pc debian/tmp/$(LIBDIR)/pkgconfig/netcdf-serial.pc + echo "prefix=$(LIBDIR)/netcdf/serial" > debian/tmp/$(LIBDIR)/pkgconfig/netcdf-serial.pc + grep -v "prefix=" debian/tmp-serial/$(LIBDIR)/pkgconfig/netcdf.pc >> debian/tmp/$(LIBDIR)/pkgconfig/netcdf-serial.pc cp -a debian/tmp-serial/$(LIBDIR)/cmake/netCDF debian/tmp/$(LIBDIR)/cmake/netCDF cp -a debian/tmp-pnetcdf/usr/include debian/tmp/usr cp -a debian/tmp-serial/usr/share debian/tmp/usr -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 11/19: Change pkg names to -11 format to be consistent with sonames and hdf5
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit d9251e63961cf04a62b1aea481c450777450c60a
Author: Alastair McKinstry <mckins...@debian.org>
Date: Sun Feb 21 08:59:20 2016 +
Change pkg names to -11 format to be consistent with sonames and hdf5
---
debian/control | 18 +-
debian/{libnetcdf11.install => libnetcdf-11.install} | 0
debian/{libnetcdf11.symbols => libnetcdf-11.symbols} | 0
...ibnetcdf11-mpi.install => libnetcdf-mpi-11.install} | 0
...ibnetcdf11-mpi.symbols => libnetcdf-mpi-11.symbols} | 0
...11-pnetcdf.install => libnetcdf-pnetcdf-11.install} | 0
debian/rules | 6 +++---
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/debian/control b/debian/control
index e14be9c..94d60fe 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ Description: Documentation for NetCDF
This package contains documentation for the NetCDF library in a
variety of formats.
-Package: libnetcdf11
+Package: libnetcdf-11
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
@@ -58,7 +58,7 @@ Description: Interface for scientific data access to large
binary data
This package contains the C run-time shared libraries required
by programs.
-Package: libnetcdf11-mpi
+Package: libnetcdf-mpi-11
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -73,7 +73,7 @@ Description: Interface for scientific data access to large
binary data
This package contains the C run-time shared libraries required
by programs.
-Package: libnetcdf11-pnetcdf
+Package: libnetcdf-pnetcdf-11
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -91,7 +91,7 @@ Description: Interface for scientific data access to large
binary data
Package: libnetcdf-dev
Architecture: any
Section: libdevel
-Depends: libnetcdf11 (= ${binary:Version}),
+Depends: libnetcdf-11 (= ${binary:Version}),
libhdf5-dev (>= 1.8.6-1~),
libcurl4-gnutls-dev | libcurl-ssl-dev,
${misc:Depends}, pkg-config
@@ -113,7 +113,7 @@ Package: libnetcdf-mpi-dev
Architecture: any
Section: libdevel
Depends: libnetcdf-dev(= ${binary:Version}),
- libnetcdf11-mpi (= ${binary:Version}),
+ libnetcdf-mpi-11 (= ${binary:Version}),
${shlibs:Depends}, ${misc:Depends},
pkg-config
Suggests: netcdf-bin, netcdf-doc
@@ -131,7 +131,7 @@ Package: libnetcdf-pnetcdf-dev
Architecture: any
Section: libdevel
Depends: libnetcdf-dev(= ${binary:Version}),
- libnetcdf11-pnetcdf (= ${binary:Version}),
+ libnetcdf-pnetcdf-11 (= ${binary:Version}),
${shlibs:Depends}, ${misc:Depends},
pkg-config
Suggests: netcdf-bin, netcdf-doc
@@ -149,9 +149,9 @@ Package: netcdf-dbg
Architecture: any
Section: debug
Priority: extra
-Depends: libnetcdf11 (= ${binary:Version}),
- libnetcdf11-mpi (= ${binary:Version}),
- libnetcdf11-pnetcdf (= ${binary:Version}),
+Depends: libnetcdf-11 (= ${binary:Version}),
+ libnetcdf-mpi-11 (= ${binary:Version}),
+ libnetcdf-pnetcdf-11 (= ${binary:Version}),
${misc:Depends}
Suggests: gdb
Description: debugging symbols for NetCDF
diff --git a/debian/libnetcdf11.install b/debian/libnetcdf-11.install
similarity index 100%
rename from debian/libnetcdf11.install
rename to debian/libnetcdf-11.install
diff --git a/debian/libnetcdf11.symbols b/debian/libnetcdf-11.symbols
similarity index 100%
rename from debian/libnetcdf11.symbols
rename to debian/libnetcdf-11.symbols
diff --git a/debian/libnetcdf11-mpi.install b/debian/libnetcdf-mpi-11.install
similarity index 100%
rename from debian/libnetcdf11-mpi.install
rename to debian/libnetcdf-mpi-11.install
diff --git a/debian/libnetcdf11-mpi.symbols b/debian/libnetcdf-mpi-11.symbols
similarity index 100%
rename from debian/libnetcdf11-mpi.symbols
rename to debian/libnetcdf-mpi-11.symbols
diff --git a/debian/libnetcdf11-pnetcdf.install
b/debian/libnetcdf-pnetcdf-11.install
similarity index 100%
rename from debian/libnetcdf11-pnetcdf.install
rename to debian/libnetcdf-pnetcdf-11.install
diff --git a/debian/rules b/debian/rules
index 93b4efd..6fe302a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -84,7 +84,7 @@ override_dh_auto_install:
| grep -v "prefix=" \
>> debian/tmp/$(LIBDIR)/pkgconfig/netcdf-$$d.pc ; \
dh_link -p libnetcdf-$$d-dev $(LIBDIR)/libnetcdf_$$d.so.11.0.0
$(LIBDIR)/netcdf/$$d/libnetcdf.so ; \
- dh_link -p libnetcdf11-$$d $(LIBDIR)/libnetcdf_$$d.so.11.0.0
$(LIBDIR)/libnetcdf_$$d.so.11 ; \
+ dh_link -p libnetcdf-$$d-11 $(LIBDIR)/libnetcdf_$$d.so.11.0.0
$(LIBDIR)/libnetcdf_$$d.so.11 ; \
dh_link -p libnetcdf-$$
[netcdf] 05/19: Update symbols file to 4.4.0
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch dev-coinstallable in repository netcdf. commit e300412238bd714e3944f0dfcad451f6061d4e65 Author: Alastair McKinstry <mckins...@debian.org> Date: Fri Feb 19 16:23:47 2016 + Update symbols file to 4.4.0 --- debian/libnetcdf11-mpi.symbols | 2926 1 file changed, 1463 insertions(+), 1463 deletions(-) diff --git a/debian/libnetcdf11-mpi.symbols b/debian/libnetcdf11-mpi.symbols index fdc796f..171f3d5 100644 --- a/debian/libnetcdf11-mpi.symbols +++ b/debian/libnetcdf11-mpi.symbols @@ -1,1463 +1,1463 @@ -libnetcdf.so.7 libnetcdf7 #MINVER# - Cde2h@NETCDF_MPI_4.1.3 4.4.0~rc5 - Cdh2e@NETCDF_MPI_4.1.3 4.4.0~rc5 - DAPparse@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3__enddef@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_abort@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_close@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_create@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_def_dim@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_def_var@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_del_att@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_dispatch_table@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_finalize@NETCDF_MPI_4.4.0 4.4.0~rc5 - NC3_get_att@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_get_vara@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_initialize@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_inq@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_inq_att@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_inq_attid@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_inq_attname@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_inq_base_pe@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_inq_dim@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_inq_dimid@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_inq_format@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_inq_format_extended@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_inq_type@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_inq_unlimdim@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_inq_var@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_inq_varid@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_open@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_put_att@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_put_vara@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_redef@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_rename_att@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_rename_dim@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_rename_var@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_set_base_pe@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_set_fill@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC3_sync@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4__enddef@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_abort@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_close@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_create@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_def_compound@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_def_dim@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_def_enum@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_def_grp@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_def_opaque@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_def_var@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_def_var_chunking@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_def_var_deflate@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_def_var_endian@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_def_var_fill@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_def_var_fletcher32@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_def_vlen@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_del_att@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_dispatch_table@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_finalize@NETCDF_MPI_4.4.0 4.4.0~rc5 - NC4_get_att@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_get_var_chunk_cache@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_get_vara@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_get_vlen_element@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_initialize@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_inq@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_inq_att@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_inq_attid@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_inq_attname@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_inq_base_pe@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_inq_compound_field@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_inq_compound_fieldindex@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_inq_dim@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_inq_dimid@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_inq_dimids@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_inq_enum_ident@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_inq_enum_member@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_inq_format@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_inq_format_extended@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_inq_grp_full_ncid@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_inq_grp_parent@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_inq_grpname@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_inq_grpname_full@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_inq_grps@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_inq_ncid@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_inq_type@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_inq_type_equal@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_inq_typeid@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_inq_typeids@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_inq_unlimdim@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_inq_unlimdims@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_inq_user_type@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_inq_var_all@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_inq_varid@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_inq_varids@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_insert_array_compound@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_insert_compound@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_insert_enum@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_open@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_put_att@NETCDF_MPI_4.1.3 4.4.0~rc5 - NC4_put_vara@NETCDF_MPI_4.1.3 4.4
[netcdf] 19/19: revert
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch dev-coinstallable in repository netcdf. commit 51cd56cbff7a61b617eb3f793bc0add7c1a0d734 Author: Alastair McKinstry <mckins...@debian.org> Date: Wed Apr 13 00:05:28 2016 +0100 revert --- debian/patches/series | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/series b/debian/patches/series index 29cfe5b..0100547 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,5 +7,5 @@ hdf5-library-path.patch attributes-typo.patch m4-generated-sources.patch hdf5-location.patch -hdf5-library-path.patch +#hdf5-library-path.patch pnetcdf-settings.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 18/19: Add hdf5-library-path.patch back
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit 6af7d2101a50dd3da5976980bdf5eab3fb00d6ed
Author: Alastair McKinstry <mckins...@debian.org>
Date: Wed Apr 13 00:04:16 2016 +0100
Add hdf5-library-path.patch back
---
debian/patches/hdf5_mpi_libs.patch | 69 ++
debian/patches/series | 1 +
debian/rules | 8 ++---
3 files changed, 73 insertions(+), 5 deletions(-)
diff --git a/debian/patches/hdf5_mpi_libs.patch
b/debian/patches/hdf5_mpi_libs.patch
new file mode 100644
index 000..ed5bb6a
--- /dev/null
+++ b/debian/patches/hdf5_mpi_libs.patch
@@ -0,0 +1,69 @@
+Description:
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ netcdf (1:4.4.0-2~exp1) UNRELEASED; urgency=medium
+ .
+ * Add mpi, pnetcdf variants of netcdf. Closes: #708638.
+ * use libaec-dev to provide SZIP, now that HDF5 uses SZIP.
+ * Enable MMAP in diskless.
+Author: Alastair McKinstry <mckins...@debian.org>
+Bug-Debian: https://bugs.debian.org/708638
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>,
+Bug:
+Bug-Debian: https://bugs.debian.org/
+Bug-Ubuntu: https://launchpad.net/bugs/
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By:
+Last-Update:
+
+Index: netcdf-4.4.0/CMakeLists.txt
+===
+--- netcdf-4.4.0.orig/CMakeLists.txt
netcdf-4.4.0/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-## This is a CMake file, part of Unidata's netCDF package.
++# This is a CMake file, part of Unidata's netCDF package.
+ # Copyright 2012-2014, see the COPYRIGHT file for more information.
+ #
+
+@@ -495,6 +495,8 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
+ SET(HDF5_LIBRARIES ${HDF5_C_LIBRARY} ${HDF5_HL_LIBRARY})
+ MESSAGE(STATUS "Using HDF5 C Library: ${HDF5_C_LIBRARY}")
+ MESSAGE(STATUS "Using HDF5 HL LIbrary: ${HDF5_HL_LIBRARY}")
++SET(HDF5_LIBRARIES "${HDF5_C_LIBRARY};${HDF5_HL_LIBRARY}")
++INCLUDE_DIRECTORIES(${HDF5_INCLUDE_DIR})
+ ELSE(HDF5_C_LIBRARY AND HDF5_HL_LIBRARY AND HDF5_INCLUDE_DIR) # We are
seeking out HDF5 with Find Package.
+ ###
+ # For now we assume that if we are building netcdf
+@@ -524,7 +526,12 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
+ SET(SEARCH_PACKAGE_NAME ${HDF5_PACKAGE_NAME})
+ FIND_PACKAGE(HDF5 NAMES ${SEARCH_PACKAGE_NAME} COMPONENTS C HL
NO_MODULES REQUIRED ${NC_HDF5_LINK_TYPE})
+ ELSE(MSVC)
+- FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED)
++ IF (HDF5_C_LIBRARY AND HDF5_HL_LIBRARY)
++ SET(ALL_TLL_LIBS "${HDF5_C_LIBRARY};${HDF5_HL_LIBRARY};${ALL_TLL_LIBS}")
++ ELSE()
++ # Only do this if not set, otherwise we only get serial versions, for
some reason
++ FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED)
++ ENDIF()
+ ENDIF(MSVC)
+
+ ##
+@@ -1199,6 +1206,7 @@ CHECK_FUNCTION_EXISTS(sysconf HAVE_SYSCO
+ CHECK_FUNCTION_EXISTS(getrlimit HAVE_GETRLIMIT)
+ CHECK_FUNCTION_EXISTS(_filelengthi64 HAVE_FILE_LENGTH_I64)
+
++
+ #
+ # End system inspection checks.
+ #
diff --git a/debian/patches/series b/debian/patches/series
index 39cb20c..29cfe5b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,5 @@ hdf5-library-path.patch
attributes-typo.patch
m4-generated-sources.patch
hdf5-location.patch
+hdf5-library-path.patch
pnetcdf-settings.patch
diff --git a/debian/rules b/debian/rules
index f55528c..3ff527b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,6 +30,8 @@ override_dh_auto_configure:
-DHDF5_LIBRARY_PATH=$(LIBRARY)/hdf5/serial \
-DHDF5_C_LIBRARY=$(LIBDIR)/hdf5/serial/libhdf5.so \
-DHDF5_HL_LIBRARY=$(LIBDIR)/hdf5/serial/libhdf5_hl.so \
+ -DHDF5_C_LIBRARIES=$(LIBDIR)/hdf5/serial/libhdf5.so \
+ -DHDF5_HL_LIBRARIES=$(LIBDIR)/hdf5/serial/libhdf5_hl.so \
-DLIBLIB_VERSION_SCRIPT=-Wl,--version-script,$(CURDIR)/debian/netcdf-serial.ver
dh_auto_configure --builddirectory=build-pnetcdf -- \
-DCMAKE_SKIP_RPATH:BOOL=ON \
@@ -48,24 +50,20 @@ override_dh_auto_configure:
-DENABLE_TESTS:BOOL=ON \
-DENABLE_DOXYGEN:BOOL=ON \
-DENABLE_MMAP=ON \
- -DENABLE_PARALLEL4=ON \
- -DENABLE_NETCDF_4=ON \
-DUSE_SZIP=ON \
-DUSE_H
[netcdf] 14/19: WIP: hdf5 location fix
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit bce96fe1251820f8ce889efc475f27f95204f629
Author: Alastair McKinstry <mckins...@debian.org>
Date: Sun Feb 21 14:27:52 2016 +
WIP: hdf5 location fix
---
debian/patches/hdf5-location.patch | 15 +++
debian/patches/series | 1 +
2 files changed, 16 insertions(+)
diff --git a/debian/patches/hdf5-location.patch
b/debian/patches/hdf5-location.patch
new file mode 100644
index 000..e3d4bd0
--- /dev/null
+++ b/debian/patches/hdf5-location.patch
@@ -0,0 +1,15 @@
+Index: netcdf-4.4.0/CMakeLists.txt
+===
+--- netcdf-4.4.0.orig/CMakeLists.txt
netcdf-4.4.0/CMakeLists.txt
+@@ -596,8 +596,8 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
+ # Find out if HDF5 was built with parallel support.
+ # Do that by checking for the targets H5Pget_fapl_mpiposx and
+ # H5Pget_fapl_mpio in ${HDF5_LIB}.
+-CHECK_LIBRARY_EXISTS(hdf5 H5Pget_fapl_mpiposix ""
HDF5_IS_PARALLEL_MPIPOSIX)
+-CHECK_LIBRARY_EXISTS(hdf5 H5Pget_fapl_mpio "" HDF5_IS_PARALLEL_MPIO)
++CHECK_LIBRARY_EXISTS(hdf5 H5Pget_fapl_mpiposix ${HDF5_C_LIBRARY}
HDF5_IS_PARALLEL_MPIPOSIX)
++CHECK_LIBRARY_EXISTS(hdf5 H5Pget_fapl_mpio ${HDF5_C_LIBRARY}
HDF5_IS_PARALLEL_MPIO)
+ IF(HDF5_IS_PARALLEL_MPIPOSIX OR HDF5_IS_PARALLEL_MPIO)
+ SET(HDF5_PARALLEL ON)
+ ELSE()
diff --git a/debian/patches/series b/debian/patches/series
index 04678ad..86e4aba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ reproducible.patch
hdf5-library-path.patch
attributes-typo.patch
m4-generated-sources.patch
+hdf5-location.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/netcdf.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 04/19: Change package names 7->11
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit 44e10b30047fa12d776da967e1bc8b4886a428af
Author: Alastair McKinstry <mckins...@debian.org>
Date: Fri Feb 19 16:08:59 2016 +
Change package names 7->11
---
debian/control | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/debian/control b/debian/control
index a90297c..19d307f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Debian GIS Project
<pkg-grass-devel@lists.alioth.debian.org>
Uploaders: Francesco Paolo Lovergine <fran...@debian.org>,
Nico Schlömer <nico.schloe...@gmail.com>,
Bas Couwenberg <sebas...@debian.org>,
- Alastair McKinstry <mckins...@debian.org>
+ Alastair McKinstry <mckins...@debian.org>
Section: science
Priority: optional
Build-Depends: debhelper (>= 9),
@@ -58,12 +58,10 @@ Description: Interface for scientific data access to large
binary data
This package contains the C run-time shared libraries required
by programs.
-Package: libnetcdf7-mpi
+Package: libnetcdf11-mpi
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libnetcdfc7 (<= 4.2.0), libnetcdf6 (<< 1:4.1.1-7~), libnetcdf4
-Breaks: libnetcdfc7 (<= 4.2.0), libnetcdf6 (<< 1:4.1.1-7~), libnetcdf4
Description: Interface for scientific data access to large binary data
NetCDF (network Common Data Form) is an interface for scientific
data access and a freely-distributed software library that provides an
@@ -75,7 +73,7 @@ Description: Interface for scientific data access to large
binary data
This package contains the C run-time shared libraries required
by programs.
-Package: libnetcdf7-pnetcdf
+Package: libnetcdf11-pnetcdf
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/netcdf.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 13/19: recursive lib symlink
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit eece181dafd9b67d0547c630c6cb4dd6c56601dd
Author: Alastair McKinstry <mckins...@debian.org>
Date: Sun Feb 21 09:08:32 2016 +
recursive lib symlink
---
debian/rules | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/debian/rules b/debian/rules
index 30db495..28ea438 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,7 +72,7 @@ override_dh_auto_install:
mkdir -p debian/tmp/$(LIBDIR)/netcdf/$$d/cmake
debian/tmp/$(LIBDIR)/cmake debian/tmp/$(LIBDIR)/pkgconfig ; \
cp debian/tmp-$$d/$(LIBDIR)/libnetcdf.settings
debian/tmp/$(LIBDIR)/netcdf/$$d/libnetcdf.settings ; \
cp -a debian/tmp-$$d/$(LIBDIR)/cmake/netCDF
debian/tmp/$(LIBDIR)/cmake/netCDF_$$d ; \
- ln -fs $(LIBDIR)/cmake/netCDF_$$d
debian/tmp/$(LIBDIR)/netcdf/$$d/cmake/netCDF ; \
+ dh_link -p libnetcdf-$$d-dev $(LIBDIR)/cmake/netCDF_$$d
$(LIBDIR)/netcdf/$$d/cmake/netCDF ; \
done
# Parallel versions
for d in mpi pnetcdf ; do \
@@ -86,7 +86,7 @@ override_dh_auto_install:
dh_link -p libnetcdf-$$d-dev $(LIBDIR)/libnetcdf_$$d.so.11.0.0
$(LIBDIR)/netcdf/$$d/libnetcdf.so ; \
dh_link -p libnetcdf-$$d-dev $(LIBDIR)/libnetcdf_$$d.so.11.0.0
$(LIBDIR)/libnetcdf_$$d.so ; \
dh_link -p libnetcdf-$$d-11 $(LIBDIR)/libnetcdf_$$d.so.11.0.0
$(LIBDIR)/libnetcdf_$$d.so.11 ; \
- dh_link -p libnetcdf-$$d-dev $(LIBDIR) $(LIBDIR)/netcdf/$$d/lib
; \
+ dh_link -p libnetcdf-$$d-dev $(LIBDIR)/netcdf/$$d
$(LIBDIR)/netcdf/$$d/lib ; \
dh_link -p libnetcdf-$$d-dev /usr/include
$(LIBDIR)/netcdf/$$d/include ; \
done
# Serial; one-off only
@@ -107,7 +107,7 @@ override_dh_auto_install:
# Strip RPATH
-find $(CURDIR)/debian/tmp/usr/bin -type f -not -name nc-config -exec
chrpath --delete {} \;
-find $(CURDIR)/debian/tmp/usr/lib -type f -name "*.so*" -exec chrpath
--delete {} \;
- dh_link -p libnetcdf-dev $(LIBDIR)
$(LIBDIR)/netcdf/serial/lib
+ dh_link -p libnetcdf-dev $(LIBDIR)/netcdf/serial
$(LIBDIR)/netcdf/serial/lib
dh_link -p libnetcdf-dev /usr/include
$(LIBDIR)/netcdf/serial/include
override_dh_auto_test:
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/netcdf.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 10/19: Don't install libnetcdf.so in
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit b2d650be6a6581c829ae2a6f88e5ea2cfdc5420c
Author: Alastair McKinstry <mckins...@debian.org>
Date: Sat Feb 20 17:00:43 2016 +
Don't install libnetcdf.so in
---
debian/libnetcdf-dev.install | 1 -
debian/libnetcdf-mpi-dev.install | 1 -
debian/libnetcdf-pnetcdf-dev.install | 1 -
debian/libnetcdf11.install | 2 +-
debian/rules | 38
5 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/debian/libnetcdf-dev.install b/debian/libnetcdf-dev.install
index f81a9be..9dcfcac 100644
--- a/debian/libnetcdf-dev.install
+++ b/debian/libnetcdf-dev.install
@@ -1,7 +1,6 @@
usr/bin/nc-config
usr/include/netcdf.h
usr/include/netcdf_meta.h
-usr/lib/*/libnetcdf.so
#usr/lib/*/libnetcdf.a
usr/lib/*/netcdf/serial
usr/lib/*/cmake/netCDF
diff --git a/debian/libnetcdf-mpi-dev.install b/debian/libnetcdf-mpi-dev.install
index a56f410..cbd32ec 100644
--- a/debian/libnetcdf-mpi-dev.install
+++ b/debian/libnetcdf-mpi-dev.install
@@ -1,5 +1,4 @@
usr/lib/*/pkgconfig/netcdf-mpi.pc
-usr/lib/*/libnetcdf_mpi.so
#usr/lib/*/libnetcdf_mpi.a
usr/lib/*/netcdf/mpi
usr/lib/*/netcdf/mpi/libnetcdf.settings
diff --git a/debian/libnetcdf-pnetcdf-dev.install
b/debian/libnetcdf-pnetcdf-dev.install
index 83982ee..ac260b4 100644
--- a/debian/libnetcdf-pnetcdf-dev.install
+++ b/debian/libnetcdf-pnetcdf-dev.install
@@ -1,5 +1,4 @@
usr/include/netcdf_par.h
-usr/lib/*/libnetcdf_pnetcdf.so
#usr/lib/*/libnetcdf_pnetcdf.a
usr/lib/*/netcdf/pnetcdf
usr/lib/*/pkgconfig/netcdf-pnetcdf.pc
diff --git a/debian/libnetcdf11.install b/debian/libnetcdf11.install
index bbaec81..771e23e 100644
--- a/debian/libnetcdf11.install
+++ b/debian/libnetcdf11.install
@@ -1 +1 @@
-usr/lib/*/libnetcdf.so.*
+usr/lib/*/libnetcdf_serial.so.*
diff --git a/debian/rules b/debian/rules
index f6560b1..93b4efd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,9 @@
#!/usr/bin/make -f
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-LIBDIR:=/usr/lib/${DEB_HOST_MULTIARCH}
+LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
INCDIR:=/usr/include
-HDF5_INCLUDE_PATH=/usr/include/hdf5/serial
-HDF5_LIBRARY_PATH=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
-
UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version:
\(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
include /usr/share/mpi-default-dev/debian_defaults
@@ -58,7 +55,7 @@ override_dh_auto_configure:
-DCMAKE_C_FLAGS="${CFLAGS} -DHDF5_PARALLEL" \
-DLIBLIB_VERSION_SCRIPT=-Wl,--version-script,$(CURDIR)/debian/netcdf-mpi.ver \
-DCMAKE_C_COMPILER=mpicc \
- -DNETCDF_LIB_NAME=netcdf_pnetcdf
+ -DNETCDF_LIB_NAME=netcdf_mpi
override_dh_auto_build:
$(MAKE) -C build-serial
@@ -79,43 +76,42 @@ override_dh_auto_install:
done
# Parallel versions
for d in mpi pnetcdf ; do \
+ cp debian/tmp-$$d/$(LIBDIR)/libnetcdf_$$d.so.11.0.0
debian/tmp/$(LIBDIR)/libnetcdf_$$d.so.11.0.0 ; \
sed -e 's%@MULTIARCH@%$(DEB_HOST_MULTIARCH)%g' <
debian/libnetcdf-$$d-dev.postinst.in \
> debian/libnetcdf-$$d-dev.postinst ; \
- echo "prefix=$(LIBDIR)/netcdf/$$(d)" >
debian/tmp/$(LIBDIR)/pkgconfig/netcdf-$$d.pc ; \
+ echo "prefix=$(LIBDIR)/netcdf/$$d" >
debian/tmp/$(LIBDIR)/pkgconfig/netcdf-$$d.pc ; \
sed -e 's/-lnetcdf/-lnetcdf_$$d/' <
debian/tmp-$$d/$(LIBDIR)/pkgconfig/netcdf.pc \
| grep -v "prefix=" \
>> debian/tmp/$(LIBDIR)/pkgconfig/netcdf-$$d.pc ; \
- mv debian/tmp-$$d/$(LIBDIR)/libnetcdf.so.11.0.0
debian/tmp/$(LIBDIR)/libnetcdf_$$d.so.11.0.0 ; \
- ln -sf $(LIBDIR)/libnetcdf_$$d.so.11.0.0
debian/tmp/$(LIBDIR)/netcdf/$$d/libnetcdf.so ; \
- ln -sf libnetcdf_$$d.so.11.0.0
debian/tmp/$(LIBDIR)/libnetcdf_$$d.so.11; \
- ln -sf libnetcdf_$$d.so.11.0.0
debian/tmp/$(LIBDIR)/libnetcdf_$$d.so; \
- dh_link -p libnetcdf-$$d-dev . $(LIBDIR)/netcdf/$$d/lib ; \
+ dh_link -p libnetcdf-$$d-dev $(LIBDIR)/libnetcdf_$$d.so.11.0.0
$(LIBDIR)/netcdf/$$d/libnetcdf.so ; \
+ dh_link -p libnetcdf11-$$d $(LIBDIR)/libnetcdf_$$d.so.11.0.0
$(LIBDIR)/libnetcdf_$$d.so.11 ; \
+ dh_link -p libnetcdf-$$d-dev $(LIBDIR) $(LIBDIR)/netcdf/$$d/lib
; \
dh_link -p libnetcdf-$$d-dev /usr/include
$(LIBDIR)/netcdf/$$d/include ; \
done
# Serial; one-off only
+ cp debian/tmp-serial/$(LIBDIR)/libnetcdf.so.11.0.0
debian/tmp/$(LIBDIR)/libnetcdf_serial.so.11.0.0 ; \
echo "prefix=$(LIBDIR)/netcdf/serial"
[netcdf] 15/19: CMakeList Fixes
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit c515c7d75e3994d0d3587f45774665f590a32417
Author: Alastair McKinstry <mckins...@debian.org>
Date: Mon Feb 22 02:16:49 2016 +
CMakeList Fixes
---
debian/patches/hdf5-library-path.patch | 2 +-
debian/patches/hdf5-location.patch | 10 +++---
debian/patches/pnetcdf-settings.patch | 12
debian/patches/series | 1 +
4 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/debian/patches/hdf5-library-path.patch
b/debian/patches/hdf5-library-path.patch
index 3633778..c91723d 100644
--- a/debian/patches/hdf5-library-path.patch
+++ b/debian/patches/hdf5-library-path.patch
@@ -20,7 +20,7 @@ Forwarded: not-needed
+
+IF(USE_HDF5 AND DEFINED HDF5_INCLUDE_PATH)
+ SET(HDF5_INCS "-I${HDF5_INCLUDE_PATH}")
-+ENDIF(USE_HDF5 AND DEFINED HDF5_LIBRARY_PATH)
++ENDIF(USE_HDF5 AND DEFINED HDF5_INCLUDE_PATH)
+
# Process all dependency libraries and create a string
# used when parsing netcdf.pc.in
diff --git a/debian/patches/hdf5-location.patch
b/debian/patches/hdf5-location.patch
index e3d4bd0..f387afa 100644
--- a/debian/patches/hdf5-location.patch
+++ b/debian/patches/hdf5-location.patch
@@ -2,14 +2,18 @@ Index: netcdf-4.4.0/CMakeLists.txt
===
--- netcdf-4.4.0.orig/CMakeLists.txt
+++ netcdf-4.4.0/CMakeLists.txt
-@@ -596,8 +596,8 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
+@@ -596,8 +596,12 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
# Find out if HDF5 was built with parallel support.
# Do that by checking for the targets H5Pget_fapl_mpiposx and
# H5Pget_fapl_mpio in ${HDF5_LIB}.
-CHECK_LIBRARY_EXISTS(hdf5 H5Pget_fapl_mpiposix ""
HDF5_IS_PARALLEL_MPIPOSIX)
-CHECK_LIBRARY_EXISTS(hdf5 H5Pget_fapl_mpio "" HDF5_IS_PARALLEL_MPIO)
-+CHECK_LIBRARY_EXISTS(hdf5 H5Pget_fapl_mpiposix ${HDF5_C_LIBRARY}
HDF5_IS_PARALLEL_MPIPOSIX)
-+CHECK_LIBRARY_EXISTS(hdf5 H5Pget_fapl_mpio ${HDF5_C_LIBRARY}
HDF5_IS_PARALLEL_MPIO)
++SET(H5C_LIB hdf5)
++IF (HDF5_C_LIBRARY)
++ SET(H5C_LIB ${HDF5_C_LIBRARY})
++ENDIF()
++CHECK_LIBRARY_EXISTS(${H5C_LIB} H5Pget_fapl_mpiposix ""
HDF5_IS_PARALLEL_MPIPOSIX)
++CHECK_LIBRARY_EXISTS(${H5C_LIB} H5Pget_fapl_mpio "" HDF5_IS_PARALLEL_MPIO)
IF(HDF5_IS_PARALLEL_MPIPOSIX OR HDF5_IS_PARALLEL_MPIO)
SET(HDF5_PARALLEL ON)
ELSE()
diff --git a/debian/patches/pnetcdf-settings.patch
b/debian/patches/pnetcdf-settings.patch
new file mode 100644
index 000..4ec4c67
--- /dev/null
+++ b/debian/patches/pnetcdf-settings.patch
@@ -0,0 +1,12 @@
+Index: netcdf-4.4.0/CMakeLists.txt
+===
+--- netcdf-4.4.0.orig/CMakeLists.txt
netcdf-4.4.0/CMakeLists.txt
+@@ -948,6 +948,7 @@ IF(ENABLE_PNETCDF)
+ MESSAGE(STATUS "Cannot find pNetCDF library. Disabling pNetCDF support.")
+ SET(USE_PNETCDF OFF CACHE BOOL "")
+ ELSE(NOT PNETCDF)
++SET(STATUS_PNETCDF "ON")
+ SET(USE_PARALLEL ON CACHE BOOL "")
+ ENDIF(NOT PNETCDF)
+ # ELSE()
diff --git a/debian/patches/series b/debian/patches/series
index 86e4aba..39cb20c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ hdf5-library-path.patch
attributes-typo.patch
m4-generated-sources.patch
hdf5-location.patch
+pnetcdf-settings.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/netcdf.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] branch dev-coinstallable updated (a4efb0e -> 51cd56c)
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a change to branch dev-coinstallable
in repository netcdf.
from a4efb0e Merge with 4.4.0
new 0e747fa Disable tests for pnetcdf for the moment
new 6c8aecc Move version numbers 7.3.0 -> 11.0.0
new d092d29 Update libnetcdf11.symbols; adds NETCDF_*
new 44e10b3 Change package names 7->11
new e300412 Update symbols file to 4.4.0
new 8f7919d add sed -e//g to ensure multiple substs in postinst
new 19680ef Fix more refs to v7.
new 4388d8a Use NETCDF_LIB_NAME to change sonames
new b0cd153 Set prefix= to the appropriate dir $LIBDIR/netcdf/$type
in pkgconfig files
new b2d650b Don't install libnetcdf.so in
new d9251e6 Change pkg names to -11 format to be consistent with
sonames and hdf5
new c99a178 Add .so links in libdir
new eece181 recursive lib symlink
new bce96fe WIP: hdf5 location fix
new c515c7d CMakeList Fixes
new 63cfc72 WIP: specify libs
new c1d7eea WIP: find MPI libs
new 6af7d21 Add hdf5-library-path.patch back
new 51cd56c revert
The 19 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
debian/control | 20 +-
debian/libnetcdf-11.install|1 +
debian/libnetcdf-11.symbols| 1463
debian/libnetcdf-dev.install |1 -
...etcdf7-mpi.install => libnetcdf-mpi-11.install} |0
debian/libnetcdf-mpi-11.symbols| 1463
debian/libnetcdf-mpi-dev.install |1 -
...netcdf.install => libnetcdf-pnetcdf-11.install} |0
debian/libnetcdf-pnetcdf-dev.install |1 -
debian/libnetcdf11.install |1 -
debian/libnetcdf11.symbols | 1460 ---
debian/libnetcdf7-mpi.symbols | 1463
debian/patches/hdf5-library-path.patch |2 +-
debian/patches/hdf5-location.patch | 19 +
debian/patches/hdf5_mpi_libs.patch | 69 +
debian/patches/pnetcdf-settings.patch | 12 +
debian/patches/series |3 +
debian/rules | 79 +-
18 files changed, 3087 insertions(+), 2971 deletions(-)
create mode 100644 debian/libnetcdf-11.install
create mode 100644 debian/libnetcdf-11.symbols
rename debian/{libnetcdf7-mpi.install => libnetcdf-mpi-11.install} (100%)
create mode 100644 debian/libnetcdf-mpi-11.symbols
rename debian/{libnetcdf7-pnetcdf.install => libnetcdf-pnetcdf-11.install}
(100%)
delete mode 100644 debian/libnetcdf11.install
delete mode 100644 debian/libnetcdf11.symbols
delete mode 100644 debian/libnetcdf7-mpi.symbols
create mode 100644 debian/patches/hdf5-location.patch
create mode 100644 debian/patches/hdf5_mpi_libs.patch
create mode 100644 debian/patches/pnetcdf-settings.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/netcdf.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 01/19: Disable tests for pnetcdf for the moment
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch dev-coinstallable in repository netcdf. commit 0e747fa6d51c01f8936840e09aaa0391f83668e4 Author: Alastair McKinstry <mckins...@debian.org> Date: Fri Feb 19 13:07:49 2016 + Disable tests for pnetcdf for the moment --- debian/rules | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index e290e0c..6d06fc4 100755 --- a/debian/rules +++ b/debian/rules @@ -111,7 +111,10 @@ override_dh_auto_test: ARGS="--output-on-failure" dh_auto_test --max-parallel=1 || echo "Ignoring test failures" LD_LIBRARY_PATH=$(CURDIR)/build-serial/liblib $(MAKE) -C build-serial test LD_LIBRARY_PATH=$(CURDIR)/build-mpi/liblib$(MAKE) -C build-mpi test - LD_LIBRARY_PATH=$(CURDIR)/build-pnetcdf/liblib$(MAKE) -C build-pnetcdf test + # Disable tests for pnetcdf. Multiple failures in nc_test where char conversions give: + # test_put.c: NetCDF: Numeric conversion not representablea + # This for 1.7.0pre1 + # LD_LIBRARY_PATH=$(CURDIR)/build-pnetcdf/liblib$(MAKE) -C build-pnetcdf test override_dh_installchangelogs: dh_installchangelogs RELEASE_NOTES.md -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 02/19: Move version numbers 7.3.0 -> 11.0.0
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit 6c8aeccf6b70a999c9c0e2d956840afc531dd0dc
Author: Alastair McKinstry <mckins...@debian.org>
Date: Fri Feb 19 13:58:52 2016 +
Move version numbers 7.3.0 -> 11.0.0
---
.../{libnetcdf7-mpi.install => libnetcdf11-mpi.install} | 0
.../{libnetcdf7-mpi.symbols => libnetcdf11-mpi.symbols} | 0
...tcdf7-pnetcdf.install => libnetcdf11-pnetcdf.install} | 0
debian/rules | 16
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/debian/libnetcdf7-mpi.install b/debian/libnetcdf11-mpi.install
similarity index 100%
rename from debian/libnetcdf7-mpi.install
rename to debian/libnetcdf11-mpi.install
diff --git a/debian/libnetcdf7-mpi.symbols b/debian/libnetcdf11-mpi.symbols
similarity index 100%
rename from debian/libnetcdf7-mpi.symbols
rename to debian/libnetcdf11-mpi.symbols
diff --git a/debian/libnetcdf7-pnetcdf.install
b/debian/libnetcdf11-pnetcdf.install
similarity index 100%
rename from debian/libnetcdf7-pnetcdf.install
rename to debian/libnetcdf11-pnetcdf.install
diff --git a/debian/rules b/debian/rules
index 6d06fc4..73be72d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,10 +81,10 @@ override_dh_auto_install:
> debian/libnetcdf-$$d-dev.postinst ; \
sed -e 's/-lnetcdf/-lnetcdf_$$d/' <
debian/tmp-$$d/$(LIBDIR)/pkgconfig/netcdf.pc \
> debian/tmp/$(LIBDIR)/pkgconfig/netcdf-$$d.pc ; \
- mv debian/tmp-$$d/$(LIBDIR)/libnetcdf.so.7.3.0
debian/tmp/$(LIBDIR)/libnetcdf_$$d.so.7.3.0 ; \
- ln -sf $(LIBDIR)/libnetcdf_$$d.so.7.3.0
debian/tmp/$(LIBDIR)/netcdf/$$d/libnetcdf.so ; \
- ln -sf libnetcdf_$$d.so.7.3.0
debian/tmp/$(LIBDIR)/libnetcdf_$$d.so.7; \
- ln -sf libnetcdf_$$d.so.7.3.0
debian/tmp/$(LIBDIR)/libnetcdf_$$d.so; \
+ mv debian/tmp-$$d/$(LIBDIR)/libnetcdf.so.11.0.0
debian/tmp/$(LIBDIR)/libnetcdf_$$d.so.11.0.0 ; \
+ ln -sf $(LIBDIR)/libnetcdf_$$d.so.11.0.0
debian/tmp/$(LIBDIR)/netcdf/$$d/libnetcdf.so ; \
+ ln -sf libnetcdf_$$d.so.11.0.0
debian/tmp/$(LIBDIR)/libnetcdf_$$d.so.11; \
+ ln -sf libnetcdf_$$d.so.11.0.0
debian/tmp/$(LIBDIR)/libnetcdf_$$d.so; \
dh_link -p libnetcdf-$$d-dev . $(LIBDIR)/netcdf/$$d/lib ; \
dh_link -p libnetcdf-$$d-dev /usr/include
$(LIBDIR)/netcdf/$$d/include ; \
done
@@ -94,10 +94,10 @@ override_dh_auto_install:
cp -a debian/tmp-pnetcdf/usr/include debian/tmp/usr
cp -a debian/tmp-serial/usr/share debian/tmp/usr
cp -a debian/tmp-serial/usr/bin debian/tmp/usr
- cp debian/tmp-serial/$(LIBDIR)/libnetcdf.so.7.3.0 debian/tmp/$(LIBDIR)
- ln -sf libnetcdf.so.7.3.0 debian/tmp/$(LIBDIR)/libnetcdf.so.7
- ln -sf libnetcdf.so.7.3.0 debian/tmp/$(LIBDIR)/libnetcdf.so
- ln -sf $(LIBDIR)/libnetcdf.so.7.3.0
debian/tmp/$(LIBDIR)/netcdf/serial/libnetcdf.so
+ cp debian/tmp-serial/$(LIBDIR)/libnetcdf.so.11.0.0 debian/tmp/$(LIBDIR)
+ ln -sf libnetcdf.so.11.0.0 debian/tmp/$(LIBDIR)/libnetcdf.so.11
+ ln -sf libnetcdf.so.11.0.0 debian/tmp/$(LIBDIR)/libnetcdf.so
+ ln -sf $(LIBDIR)/libnetcdf.so.11.0.0
debian/tmp/$(LIBDIR)/netcdf/serial/libnetcdf.so
$(RM) debian/tmp/usr/share/doc/netCDF/html/jquery.js
sed -e 's%@MULTIARCH@%$(DEB_HOST_MULTIARCH)%' <
debian/libnetcdf-dev.postinst.in \
> debian/libnetcdf-dev.postinst
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/netcdf.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 06/19: add sed -e//g to ensure multiple substs in postinst
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit 8f7919d46744bdd91c0ded35eab67a7e3029577d
Author: Alastair McKinstry <mckins...@debian.org>
Date: Sat Feb 20 07:30:16 2016 +
add sed -e//g to ensure multiple substs in postinst
---
debian/rules | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/rules b/debian/rules
index 73be72d..96d79d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,7 +77,7 @@ override_dh_auto_install:
done
# Parallel versions
for d in mpi pnetcdf ; do \
- sed -e 's%@MULTIARCH@%$(DEB_HOST_MULTIARCH)%' <
debian/libnetcdf-$$d-dev.postinst.in \
+ sed -e 's%@MULTIARCH@%$(DEB_HOST_MULTIARCH)%g' <
debian/libnetcdf-$$d-dev.postinst.in \
> debian/libnetcdf-$$d-dev.postinst ; \
sed -e 's/-lnetcdf/-lnetcdf_$$d/' <
debian/tmp-$$d/$(LIBDIR)/pkgconfig/netcdf.pc \
> debian/tmp/$(LIBDIR)/pkgconfig/netcdf-$$d.pc ; \
@@ -99,7 +99,7 @@ override_dh_auto_install:
ln -sf libnetcdf.so.11.0.0 debian/tmp/$(LIBDIR)/libnetcdf.so
ln -sf $(LIBDIR)/libnetcdf.so.11.0.0
debian/tmp/$(LIBDIR)/netcdf/serial/libnetcdf.so
$(RM) debian/tmp/usr/share/doc/netCDF/html/jquery.js
- sed -e 's%@MULTIARCH@%$(DEB_HOST_MULTIARCH)%' <
debian/libnetcdf-dev.postinst.in \
+ sed -e 's%@MULTIARCH@%$(DEB_HOST_MULTIARCH)%g' <
debian/libnetcdf-dev.postinst.in \
> debian/libnetcdf-dev.postinst
# Strip RPATH
-find $(CURDIR)/debian/tmp/usr/bin -type f -not -name nc-config -exec
chrpath --delete {} \;
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/netcdf.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 07/19: Fix more refs to v7.
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit 19680ef4f3d1e259a5fe4b10b3cd6184897fc181
Author: Alastair McKinstry <mckins...@debian.org>
Date: Sat Feb 20 07:46:03 2016 +
Fix more refs to v7.
---
debian/control | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index 19d307f..e14be9c 100644
--- a/debian/control
+++ b/debian/control
@@ -113,7 +113,7 @@ Package: libnetcdf-mpi-dev
Architecture: any
Section: libdevel
Depends: libnetcdf-dev(= ${binary:Version}),
- libnetcdf7-mpi (= ${binary:Version}),
+ libnetcdf11-mpi (= ${binary:Version}),
${shlibs:Depends}, ${misc:Depends},
pkg-config
Suggests: netcdf-bin, netcdf-doc
@@ -131,7 +131,7 @@ Package: libnetcdf-pnetcdf-dev
Architecture: any
Section: libdevel
Depends: libnetcdf-dev(= ${binary:Version}),
- libnetcdf7-pnetcdf (= ${binary:Version}),
+ libnetcdf11-pnetcdf (= ${binary:Version}),
${shlibs:Depends}, ${misc:Depends},
pkg-config
Suggests: netcdf-bin, netcdf-doc
@@ -150,6 +150,8 @@ Architecture: any
Section: debug
Priority: extra
Depends: libnetcdf11 (= ${binary:Version}),
+ libnetcdf11-mpi (= ${binary:Version}),
+ libnetcdf11-pnetcdf (= ${binary:Version}),
${misc:Depends}
Suggests: gdb
Description: debugging symbols for NetCDF
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/netcdf.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 03/19: Update libnetcdf11.symbols; adds NETCDF_*
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch dev-coinstallable in repository netcdf. commit d092d29cbaff91bcfd42b387243b669b777febc8 Author: Alastair McKinstry <mckins...@debian.org> Date: Fri Feb 19 15:11:42 2016 + Update libnetcdf11.symbols; adds NETCDF_* --- debian/libnetcdf11.symbols | 2921 ++-- 1 file changed, 1462 insertions(+), 1459 deletions(-) diff --git a/debian/libnetcdf11.symbols b/debian/libnetcdf11.symbols index 857da77..47a3bac 100644 --- a/debian/libnetcdf11.symbols +++ b/debian/libnetcdf11.symbols @@ -1,1460 +1,1463 @@ libnetcdf.so.11 libnetcdf11 #MINVER# - Cde2h@Base 4.3.3 - Cdh2e@Base 4.3.3 - DAPparse@Base 4.1.3 - NC3__enddef@Base 4.1.3 - NC3_abort@Base 4.1.3 - NC3_close@Base 4.1.3 - NC3_create@Base 4.1.3 - NC3_def_dim@Base 4.1.3 - NC3_def_var@Base 4.1.3 - NC3_del_att@Base 4.1.3 - NC3_dispatch_table@Base 4.1.3 - NC3_finalize@Base 4.4.0~rc4 - NC3_get_att@Base 4.1.3 - NC3_get_vara@Base 4.1.3 - NC3_initialize@Base 4.1.3 - NC3_inq@Base 4.1.3 - NC3_inq_att@Base 4.1.3 - NC3_inq_attid@Base 4.1.3 - NC3_inq_attname@Base 4.1.3 - NC3_inq_base_pe@Base 4.1.3 - NC3_inq_dim@Base 4.1.3 - NC3_inq_dimid@Base 4.1.3 - NC3_inq_format@Base 4.1.3 - NC3_inq_format_extended@Base 4.3.3 - NC3_inq_type@Base 4.1.3 - NC3_inq_unlimdim@Base 4.1.3 - NC3_inq_var@Base 4.1.3 - NC3_inq_varid@Base 4.1.3 - NC3_open@Base 4.1.3 - NC3_put_att@Base 4.1.3 - NC3_put_vara@Base 4.1.3 - NC3_redef@Base 4.1.3 - NC3_rename_att@Base 4.1.3 - NC3_rename_dim@Base 4.1.3 - NC3_rename_var@Base 4.1.3 - NC3_set_base_pe@Base 4.1.3 - NC3_set_fill@Base 4.1.3 - NC3_sync@Base 4.1.3 - NC4__enddef@Base 4.1.3 - NC4_abort@Base 4.1.3 - NC4_close@Base 4.1.3 - NC4_create@Base 4.1.3 - NC4_def_compound@Base 4.1.3 - NC4_def_dim@Base 4.1.3 - NC4_def_enum@Base 4.1.3 - NC4_def_grp@Base 4.1.3 - NC4_def_opaque@Base 4.1.3 - NC4_def_var@Base 4.1.3 - NC4_def_var_chunking@Base 4.1.3 - NC4_def_var_deflate@Base 4.1.3 - NC4_def_var_endian@Base 4.1.3 - NC4_def_var_fill@Base 4.1.3 - NC4_def_var_fletcher32@Base 4.1.3 - NC4_def_vlen@Base 4.1.3 - NC4_del_att@Base 4.1.3 - NC4_dispatch_table@Base 4.1.3 - NC4_finalize@Base 4.4.0~rc4 - NC4_get_att@Base 4.1.3 - NC4_get_var_chunk_cache@Base 4.1.3 - NC4_get_vara@Base 4.1.3 - NC4_get_vlen_element@Base 4.1.3 - NC4_initialize@Base 4.1.3 - NC4_inq@Base 4.1.3 - NC4_inq_att@Base 4.1.3 - NC4_inq_attid@Base 4.1.3 - NC4_inq_attname@Base 4.1.3 - NC4_inq_base_pe@Base 4.1.3 - NC4_inq_compound_field@Base 4.1.3 - NC4_inq_compound_fieldindex@Base 4.1.3 - NC4_inq_dim@Base 4.1.3 - NC4_inq_dimid@Base 4.1.3 - NC4_inq_dimids@Base 4.1.3 - NC4_inq_enum_ident@Base 4.1.3 - NC4_inq_enum_member@Base 4.1.3 - NC4_inq_format@Base 4.1.3 - NC4_inq_format_extended@Base 4.3.3 - NC4_inq_grp_full_ncid@Base 4.1.3 - NC4_inq_grp_parent@Base 4.1.3 - NC4_inq_grpname@Base 4.1.3 - NC4_inq_grpname_full@Base 4.1.3 - NC4_inq_grps@Base 4.1.3 - NC4_inq_ncid@Base 4.1.3 - NC4_inq_type@Base 4.1.3 - NC4_inq_type_equal@Base 4.1.3 - NC4_inq_typeid@Base 4.1.3 - NC4_inq_typeids@Base 4.1.3 - NC4_inq_unlimdim@Base 4.1.3 - NC4_inq_unlimdims@Base 4.1.3 - NC4_inq_user_type@Base 4.1.3 - NC4_inq_var_all@Base 4.1.3 - NC4_inq_varid@Base 4.1.3 - NC4_inq_varids@Base 4.1.3 - NC4_insert_array_compound@Base 4.1.3 - NC4_insert_compound@Base 4.1.3 - NC4_insert_enum@Base 4.1.3 - NC4_open@Base 4.1.3 - NC4_put_att@Base 4.1.3 - NC4_put_vara@Base 4.1.3 - NC4_put_vlen_element@Base 4.1.3 - NC4_redef@Base 4.1.3 - NC4_rename_att@Base 4.1.3 - NC4_rename_dim@Base 4.1.3 - NC4_rename_grp@Base 4.3.3 - NC4_rename_var@Base 4.1.3 - NC4_set_base_pe@Base 4.1.3 - NC4_set_fill@Base 4.1.3 - NC4_set_var_chunk_cache@Base 4.1.3 - NC4_show_metadata@Base 4.1.3 - NC4_sync@Base 4.1.3 - NC4_var_par_access@Base 4.1.3 - NCD2_close@Base 4.3.3 - NCD2_dispatch_table@Base 4.3.3 - NCD2_finalize@Base 4.4.0~rc4 - NCD2_initialize@Base 4.3.3 - NCD2_inq_format_extended@Base 4.3.3 - NCD2_open@Base 4.3.3 - NCDAP_ping@Base 4.3.3 - NCDEFAULT_get_varm@Base 4.1.3 - NCDEFAULT_get_vars@Base 4.1.3 - NCDEFAULT_put_varm@Base 4.1.3 - NCDEFAULT_put_vars@Base 4.1.3 - NCDISPATCH_finalize@Base 4.4.0~rc4 - NCDISPATCH_initialize@Base 4.3.3 - NCSUBSTRATE_dispatch_table@Base 4.3.3 - NCSUBSTRATE_finalize@Base 4.4.0~rc4 - NCSUBSTRATE_initialize@Base 4.3.3 - NC_argc@Base 4.4.0~rc4 - NC_argv@Base 4.4.0~rc4 - NC_atomictypelen@Base 4.1.3 - NC_atomictypename@Base 4.1.3 - NC_calcsize@Base 3.6.1 - NC_check_id@Base 3.6.1 - NC_check_name@Base 3.6.1 - NC_check_vlen@Base 3.6.1 - NC_coord_one@Base 4.3.3 - NC_coord_zero@Base 4.3.3 - NC_create@Base 4.1.3 - NC_dispatch_overlay@Base 4.1.3 - NC_finalized@Base 4.4.0~rc4 - NC_findattr@Base 3.6.1 - NC_findtestserver@Base 4.3.3 - NC_findvar@Base 3.6.1 - NC_get_dispatch_override@Base 4.1.3 - NC_get_vara@Base 4.1.3 - NC_getshape@Base 4.3.3 - NC_initialized@Base 4.4.0~rc4 - NC_inq_recvar@Base 4.4.0~rc2 - NC_is_recvar@Base 4.3.3 - NC_lookupvar@Base 3.6.1 - NC_open@Base 4.1.3 - NC_set_dispatch_override@Base 4.1.3 - NC_syn
[netcdf] 01/01: Merge with 4.4.0
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit a4efb0e2af9bbc1ffa3804753c55fa3cd08352de
Merge: 6bd25e2 40c1983
Author: Alastair McKinstry <mckins...@debian.org>
Date: Fri Feb 19 09:38:52 2016 +
Merge with 4.4.0
.gitignore | 4 -
.travis.yml|63 +-
.travis.yml => .travis.yml.old | 0
CMakeLists.txt | 230 +-
CONTRIBUTING.html | 248 +
Makefile.in| 1 -
RELEASE_NOTES.md |32 +-
cf |13 +-
cf.cmake |70 +-
config.h.cmake.in |23 +-
config.h.in| 3 +
configure |53 +-
configure.ac |22 +-
debian/changelog |23 +-
debian/control | 6 +-
debian/copyright |42 +-
debian/{libnetcdf7.install => libnetcdf11.install} | 0
debian/libnetcdf11.symbols | 1460 ++
debian/libnetcdf7.symbols | 1463 --
debian/patches/attributes-typo.patch |16 +
debian/patches/hdf5-library-path.patch | 2 +-
debian/patches/m4-generated-sources.patch | 503 +
debian/patches/series | 4 +-
debian/rules | 6 +-
docs/Doxyfile.developer| 2 +-
docs/Makefile.in | 1 -
docs/images/Makefile.in| 1 -
docs/release_header.html | 4 +-
docs/software.md | 113 +-
docs/tutorial.dox |22 +-
docs/windows-binaries.md |26 +-
examples/C/Makefile.in | 1 -
examples/C/simple_xy_nc4_rd.c | 4 +-
examples/C/simple_xy_nc4_wr.c | 5 +-
examples/CDL/Makefile.in | 1 -
examples/Makefile.in | 1 -
h5_test/Makefile.in| 1 -
include/Makefile.in| 1 -
include/nc.h |18 +-
include/netcdf.h |23 +-
include/onstack.h | 8 +-
libdap2/Makefile.in| 1 -
libdap2/ncd2dispatch.c |12 +-
libdispatch/Makefile.in| 1 -
libdispatch/dattget.c | 109 +-
libdispatch/dattput.c |54 +-
libdispatch/dstring.c |48 +-
libdispatch/dvar.c |18 +-
liblib/Makefile.am | 4 +-
liblib/Makefile.in | 5 +-
libnetcdf.settings.in | 7 +-
libsrc/Makefile.in | 1 -
libsrc/dim.c |11 +-
libsrc/ncx.h |53 +-
libsrc/ncx.m4 |38 +-
libsrc/posixio.c | 4 +
libsrc/putget.m4 |16 +-
libsrc/v1hpg.c | 145 +-
libsrc4/Makefile.in| 1 -
libsrc4/nc4var.c | 259 +-
libsrcp/Makefile.in| 1 -
nc_test/CMakeLists.txt | 1 +
nc_test/Makefile.in| 1 -
nc_test/nc_test.c |17 +-
nc_test/test_get.c | 18662 +++
nc_test/test_put.c | 23884 +--
nc_test/test_read.c|67 +-
nc_test/test_write.c |62 +-
nc_test/tests.h|18 +-
nc_test/util.c | 101 +-
nc_test4/CMakeLists.txt| 5 +-
nc_test4/Makefile.am | 3 +-
nc_test4/Makefile.in | 4 +-
nc_test4/bm_many_objs.c
[netcdf] branch dev-coinstallable updated (6bd25e2 -> a4efb0e)
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a change to branch dev-coinstallable
in repository netcdf.
from 6bd25e2 Enable MMAP in diskless.
adds 7fe383c Imported Upstream version 4.4.0
adds 78a0158 Merge tag 'upstream/4.4.0'
adds cc9e153 New upstream release.
adds a44e384 Update copyright file, add license & copyright for Bison
files.
adds b181c4b Rename library package for SONAME bump.
adds d5236b3 Refresh patches.
adds b84f02d Add patch for 'attributes' typo.
adds bc9e45c Set distribution to experimental.
adds 94ceb36 Mark attributes-typo.patch as Applied-Upstream.
adds c1a09b8 Add patch to fix conflicting type errors on arm.
adds d4dc5ca Set distribution to experimental.
adds c58e6c7 Add Bug header for m4-generated-sources.patch.
adds 40c1983 Move from experimental to unstable.
new a4efb0e Merge with 4.4.0
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 4 -
.travis.yml|63 +-
.travis.yml => .travis.yml.old | 0
CMakeLists.txt | 230 +-
CONTRIBUTING.html | 248 +
Makefile.in| 1 -
RELEASE_NOTES.md |32 +-
cf |13 +-
cf.cmake |70 +-
config.h.cmake.in |23 +-
config.h.in| 3 +
configure |53 +-
configure.ac |22 +-
debian/changelog |23 +-
debian/control | 6 +-
debian/copyright |42 +-
debian/{libnetcdf7.install => libnetcdf11.install} | 0
debian/libnetcdf11.symbols | 1460 ++
debian/libnetcdf7.symbols | 1463 --
debian/patches/attributes-typo.patch |16 +
debian/patches/hdf5-library-path.patch | 2 +-
debian/patches/m4-generated-sources.patch | 503 +
debian/patches/series | 4 +-
debian/rules | 6 +-
docs/Doxyfile.developer| 2 +-
docs/Makefile.in | 1 -
docs/images/Makefile.in| 1 -
docs/release_header.html | 4 +-
docs/software.md | 113 +-
docs/tutorial.dox |22 +-
docs/windows-binaries.md |26 +-
examples/C/Makefile.in | 1 -
examples/C/simple_xy_nc4_rd.c | 4 +-
examples/C/simple_xy_nc4_wr.c | 5 +-
examples/CDL/Makefile.in | 1 -
examples/Makefile.in | 1 -
h5_test/Makefile.in| 1 -
include/Makefile.in| 1 -
include/nc.h |18 +-
include/netcdf.h |23 +-
include/onstack.h | 8 +-
libdap2/Makefile.in| 1 -
libdap2/ncd2dispatch.c |12 +-
libdispatch/Makefile.in| 1 -
libdispatch/dattget.c | 109 +-
libdispatch/dattput.c |54 +-
libdispatch/dstring.c |48 +-
libdispatch/dvar.c |18 +-
liblib/Makefile.am | 4 +-
liblib/Makefile.in | 5 +-
libnetcdf.settings.in | 7 +-
libsrc/Makefile.in | 1 -
libsrc/dim.c |11 +-
libsrc/ncx.h |53 +-
libsrc/ncx.m4 |38 +-
libsrc/posixio.c | 4 +
libsrc/putget.m4 |16 +-
libsrc/v1hpg.c | 145 +-
libsrc4/Makefile.in| 1 -
libsrc4/nc4var.c
[netcdf] branch dev-coinstallable updated (80bb58a -> 6bd25e2)
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a change to branch dev-coinstallable
in repository netcdf.
from 80bb58a Install pkgconfig in right place
adds ff508ec updated to netCDF nightly 2014-06-12
adds de96a13 Merge branch 'upstream'
adds 2d36915 Incorporate NMU for hdf5 transition
adds d9a581e Add describe-current-version & get-orig-source targets to
d/rules
adds 0f2682c Start new version from git snapshot
adds 5856aa8 Explain get-orig-source target for the team
adds 508c81d Update watch file due to debian version with git commit ID
adds a0fca9c Add gbp configuration file
adds f41b298 make the build type RelWithDebInfo
adds 2313cc9 Revert "make the build type RelWithDebInfo"
adds c40947b use a verbose makefile while developing
adds 4dcb673 update to 2014-06-13 snapshot
adds 4d2b23d Merge branch 'upstream' into split-c-f-cxx
adds 6bc2343 rename .docs-base to .doc-base
adds 622688c added missing space in doc-base
adds e174b96 added installation file for doc
adds 15fb66b corrected doc file
adds 789cd96 clean up debian/rules
adds 354061b Fixed file path in doc-base
adds 117a435 lift cmake version requirement to 2.8.12
adds 303a7c1 corrected location of cmake export files
adds 1827f42 parallel build
adds 2aec215 add patch for linking TPLs privately
adds c514d9c correct patch
adds 1c0759f patch update
adds fdf93ca put doc-base file into netcdf-doc
adds 1d01119 fix for html doc location
adds ed39029 update to netCDF-4.3.3-rc3
adds 909ed37 Merge branch 'upstream' into split-c-f-cxx
adds b75dc05 Update version in changelog for 4.3.3-rc3.
adds 594559f Update watch file to use GitHub releases.
adds bd88b83 Add gbp.conf to use pristine-tar by default.
adds a207404 Use canonical Vcs-* URLs.
adds 9d879b4 Bump debhelper compatibility to 9.
adds a440625 Restructure control file with cme.
adds a578536 Remove duplicate section from netcdf-bin.
adds 619567f Enable verbose make output.
adds 5f5375c Enable parallel builds.
adds eb8ddb6 Override dh_strip to use netcdf-dbg explicitly.
adds 926cf43 Add DEP3 headers to link-private.patch.
adds a390ffe Fix privacy-breach-logo lintian error by using the local
copy.
adds 92d3f64 Remove unused substitution variable ${shlibs:Depends}
from libnetcdf-dev.
adds ef9c526 Use libjs-jquery instead of jquery.js from Doxygen.
adds 5586d86 Add patch to fix 'absence' typo in ncgen man page.
adds 00c20a3 Move nc-config from netcdf-bin to libnetcdf-dev.
adds 0465b1c add myself to uploaders
adds 6dc4e51 bump Standards-Version
adds 7c0f211 remove unnecessary dependency on dpkg (>= 1.15.4)
adds 1d3a993 remove references to inexistant libnetcdf4
adds 9d6653e shorten synopsis of libnetcdf-dev
adds 576f021 Install RELEASE_NOTES.md as upstream changelog.
adds 25fa60e Add patch to fix hyphen-used-as-minus-sign lintian issues
in man pages.
adds bafdb50 Add man page for nc-config.
adds 0204509 Update copyright file using copyright-format 1.0.
adds 6b899f1 Restructure control file with cme.
adds 5221a4c Add symbols file for libnetcdf.
adds ca1e3b7 Update hyphen-used-as-minus-sign.patch to fix another
occurance.
adds 3bff97b Add upstream metadata.
adds 402a64a Add changelog entries for Nicos changes, remove parallel
builds TODO.
adds 910aa6c Drop README.source, no longer applicable.
adds 0b684b4 Bump Standards-Version to 3.9.6, changes: canonical Vcs-*
URLs, minimal dh rules, copyright-format 1.0, symbols.
adds eda4bc7 Close malformed URL Bug in changelog
adds 380f0d1 Close mayhem bugs in the changelog
adds 33a9e6c Update changelog with closed parallel build bug
adds 4e68010 Mark patches as Forwarded & Applied-Upstream.
adds 6d32bbd Add second Forwarded header.
adds d992be2 Also mark second part of hyphen-used-as-minus-sign.patch
as Applied Upstream.
adds f91a394 Merge branch 'split-c-f-cxx'
adds 99f5706 Incorporate previous NMUs in changelog
adds e6bf4a8 Imported Upstream version 4.3.3-rc3
adds b76f7f0 Imported Upstream version 4.3.3-rc3
adds 620eaff Imported Upstream version 4.3.3.1
adds 3d5ea5c Merge branch 'upstream'
adds 5dd864d updated changelog
adds 86ef9e3 removed patches (went upstream)
adds 455a6fb Update years in copyright file, add OPeNPDAP copyright
holder.
adds b5dbb8b Add myself to Uploaders.
adds 2b85714 Merge branch 'master' of
[netcdf] 05/08: Depend, rather than Recommend, pkg-config as nc-config changes require it
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit ac7ceaac05f307b7493fd17c57acbedc90a10efa
Author: Alastair McKinstry <mckins...@debian.org>
Date: Sat Jan 16 20:33:02 2016 +
Depend, rather than Recommend, pkg-config as nc-config changes require it
---
debian/control | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/debian/control b/debian/control
index 3346815..15cf353 100644
--- a/debian/control
+++ b/debian/control
@@ -80,8 +80,7 @@ Section: libdevel
Depends: libnetcdf7 (= ${binary:Version}),
libhdf5-dev (>= 1.8.6-1~),
libcurl4-gnutls-dev | libcurl-ssl-dev,
- ${misc:Depends}
-Recommends: pkg-config
+ ${misc:Depends}, pkg-config
Breaks: netcdf-bin (<< 1:4.3.3.1)
Replaces: netcdf-bin (<< 1:4.3.3.1)
Suggests: netcdf-bin,
@@ -101,9 +100,9 @@ Architecture: any
Section: libdevel
Depends: libnetcdf-dev(= ${binary:Version}),
libnetcdf7-mpi (= ${binary:Version}),
- ${shlibs:Depends}, ${misc:Depends}
+ ${shlibs:Depends}, ${misc:Depends},
+ pkg-config
Suggests: netcdf-bin, netcdf-doc
-Recommends: pkg-config
Description: creation, access, and sharing of array-oriented scientific data
NetCDF (network Common Data Form) is a set of interfaces for array-oriented
data access and a freely distributed collection of data access libraries for
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/netcdf.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 06/08: Fix install paths
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit a3cdede4aa3f339289ea316e3cd8cdfe94c2
Author: Alastair McKinstry <mckins...@debian.org>
Date: Sat Jan 16 20:35:17 2016 +
Fix install paths
---
debian/TODO | 7
debian/changelog | 2 +-
debian/control | 32 +++
debian/libnetcdf-dev.install | 5 ++-
debian/libnetcdf-dev.postinst.in | 10 +
debian/libnetcdf-mpi-dev.install | 7 +++-
debian/libnetcdf-mpi-dev.postinst.in | 10 +
debian/libnetcdf-pnetcdf-dev.install | 6 +++
debian/libnetcdf-pnetcdf-dev.postinst.in | 10 +
debian/libnetcdf7-mpi.install| 2 +-
debian/libnetcdf7-pnetcdf.install| 1 +
debian/libnetcdf7.install| 2 +-
debian/rules | 67 +++-
13 files changed, 136 insertions(+), 25 deletions(-)
diff --git a/debian/TODO b/debian/TODO
new file mode 100644
index 000..79f11af
--- /dev/null
+++ b/debian/TODO
@@ -0,0 +1,7 @@
+* Audit symbols files
+* pkg-config. has_* variables not being set?
+* Test nc-config patch.
+* Add pkg-config files to libaec,
+
+* CMAKE Config files: HAS_PNETCDF not set correctly. Why?
+
diff --git a/debian/changelog b/debian/changelog
index 68e717a..9374947 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
netcdf (1:4.4.0~rc5-1~exp2) UNRELEASED; urgency=medium
- * Test netcdf-parallel changes
+ * Add mpi, pnetcdf variants of netcdf. Closes: #708638.
-- Alastair McKinstry <mckins...@debian.org> Thu, 14 Jan 2016 16:56:32 +
diff --git a/debian/control b/debian/control
index 15cf353..5b14aee 100644
--- a/debian/control
+++ b/debian/control
@@ -74,6 +74,21 @@ Description: Interface for scientific data access to large
binary data
This package contains the C run-time shared libraries required
by programs.
+Package: libnetcdf7-pnetcdf
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Interface for scientific data access to large binary data
+ NetCDF (network Common Data Form) is an interface for scientific
+ data access and a freely-distributed software library that provides an
+ implementation of the interface. The netCDF library also defines a
+ machine-independent format for representing scientific data.
+ Together, the interface, library, and format support the creation,
+ access, and sharing of scientific data.
+ .
+ This package contains the C run-time shared libraries required
+ by programs.
+
Package: libnetcdf-dev
Architecture: any
Section: libdevel
@@ -113,6 +128,23 @@ Description: creation, access, and sharing of
array-oriented scientific data
.
This package provides headers.
+Package: libnetcdf-pnetcdf-dev
+Architecture: any
+Section: libdevel
+Depends: libnetcdf-dev(= ${binary:Version}),
+ libnetcdf7-pnetcdf (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends},
+ pkg-config
+Suggests: netcdf-bin, netcdf-doc
+Description: creation, access, and sharing of array-oriented scientific data
+ NetCDF (network Common Data Form) is a set of interfaces for array-oriented
+ data access and a freely distributed collection of data access libraries for
+ C, Fortran, C++, Java, and other languages. The netCDF libraries support a
+ machine-independent format for representing scientific data. Together, the
+ interfaces, libraries, and format support the creation, access, and sharing of
+ scientific data.
+ .
+ This package provides headers.
Package: netcdf-dbg
Architecture: any
diff --git a/debian/libnetcdf-dev.install b/debian/libnetcdf-dev.install
index bde9845..888bea7 100644
--- a/debian/libnetcdf-dev.install
+++ b/debian/libnetcdf-dev.install
@@ -1,7 +1,8 @@
usr/bin/nc-config
usr/include/*
-usr/lib/*/lib*.so
-usr/lib/*/libnetcdf.settings
+usr/lib/*/netcdf/libnetcdf.so
+#usr/lib/*/netcdf/libnetcdf.a
+usr/lib/*/netcdf/serial
usr/lib/*/cmake/netCDF
usr/lib/*/pkgconfig/netcdf-serial.pc
usr/share/man/man3
diff --git a/debian/libnetcdf-dev.postinst.in b/debian/libnetcdf-dev.postinst.in
new file mode 100644
index 000..ffa301c
--- /dev/null
+++ b/debian/libnetcdf-dev.postinst.in
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+update-alternatives \
+--install /usr/lib/@MULTIARCH@/pkgconfig/netcdf.pc netcdf.pc
/usr/lib/@MULTIARCH@/pkgconfig/netcdf-serial.pc 40 \
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/libnetcdf-mpi-dev.install b/debian/libnetcdf-mpi-dev.install
index cb292fc..a56f410 100644
--- a/debian/libnetcdf-mpi-dev.install
+++ b/debian/libnetcdf-mpi-dev.install
@@ -1 +1,6 @@
-/usr/lib/*/pkgconfig/*mpi*
+usr/lib/*/pkgconfig/netcdf-mpi.pc
+usr/lib/*/libnetcdf_mpi.so
+#usr/lib/*/libnetcdf_mpi.a
+usr/lib/*/netcdf/mpi
+usr/lib/*/netcdf/mpi/libnetcdf.settings
+usr/lib/*/cmake/net
[netcdf] 07/08: Use SZIP
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch dev-coinstallable in repository netcdf. commit 5ad12ea3c8dd17ab8fea17a24bbe311258abb7fd Author: Alastair McKinstry <mckins...@debian.org> Date: Mon Jan 25 09:03:52 2016 + Use SZIP --- debian/changelog | 1 + debian/control | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9374947..fcc0f16 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ netcdf (1:4.4.0~rc5-1~exp2) UNRELEASED; urgency=medium * Add mpi, pnetcdf variants of netcdf. Closes: #708638. + * use libaec-dev to provide SZIP, now that HDF5 uses SZIP. -- Alastair McKinstry <mckins...@debian.org> Thu, 14 Jan 2016 16:56:32 + diff --git a/debian/control b/debian/control index 5b14aee..19c28bf 100644 --- a/debian/control +++ b/debian/control @@ -12,6 +12,7 @@ Build-Depends: debhelper (>= 9), m4, doxygen, libjs-jquery, + libaec-dev, libhdf5-dev (>= 1.8.6-1~), libhdf5-mpi-dev (>= 1.8.13+docs~), libcurl4-gnutls-dev | libcurl-ssl-dev -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 02/08: Fix include paths
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit 71fea2f548e7e607e8a16c1580881cb4aded5745
Author: Alastair McKinstry <mckins...@debian.org>
Date: Thu Jan 14 17:01:52 2016 +
Fix include paths
---
debian/rules | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/debian/rules b/debian/rules
index e5df35f..7c5d73a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,8 +28,8 @@ override_dh_auto_configure:
-DENABLE_TESTS:BOOL=ON \
-DENABLE_DOXYGEN:BOOL=ON \
-DUSE_PARALLEL=OFF \
- -DHDF5_C_INCLUDE_DIR="/usr/include/serial/hdf5" \
- -DHDF5_HL_INCLUDE_DIR="/usr/include/serial/hdf5" \
+ -DHDF5_C_INCLUDE_DIR="/usr/include/hdf5/serial" \
+ -DHDF5_HL_INCLUDE_DIR="/usr/include/hdf5/serial" \
-DHDF5_hdf5_hl_LIBRARY_RELEASE=${LIB}/libhdf5_serial_hl.so \
-DHDF5_hdf5_LIBRARY_RELEASE=${LIB}/libhdf5_serial.so \
-DLIBLIB_VERSION_SCRIPT=-Wl,--version-script,${TOP}/debian/netcdf-serial.ver
@@ -39,8 +39,8 @@ override_dh_auto_configure:
-DENABLE_TESTS:BOOL=ON \
-DENABLE_DOXYGEN:BOOL=ON \
-DUSE_PARALLEL=ON \
- -DHDF5_C_INCLUDE_DIR=/usr/include/${MPI}/hdf5 \
- -DHDF5_HL_INCLUDE_DIR=/usr/include/${MPI}/hdf5 \
+ -DHDF5_C_INCLUDE_DIR=/usr/include/hdf5/${MPI} \
+ -DHDF5_HL_INCLUDE_DIR=/usr/include//hdf5/${MPI} \
-DHDF5_hdf5_hl_LIBRARY_RELEASE=${LIB}/libhdf5_${MPI}_hl.so \
-DHDF5_hdf5_LIBRARY_RELEASE=${LIB}/libhdf5_${MPI}.so \
-DLIBLIB_VERSION_SCRIPT=-Wl,--version-script,${TOP}/debian/netcdf-mpi.ver \
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/netcdf.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 04/08: Fix patches
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit da19351a755a2f22c15176d991905a0a88817d7b
Author: Alastair McKinstry <mckins...@debian.org>
Date: Sat Jan 16 14:52:21 2016 +
Fix patches
---
debian/patches/version-script.patch | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/debian/patches/version-script.patch
b/debian/patches/version-script.patch
index bd57853..1bc0c0a 100644
--- a/debian/patches/version-script.patch
+++ b/debian/patches/version-script.patch
@@ -7,15 +7,12 @@ Index: netcdf-4.4.0~rc5/liblib/CMakeLists.txt
===
--- netcdf-4.4.0~rc5.orig/liblib/CMakeLists.txt
+++ netcdf-4.4.0~rc5/liblib/CMakeLists.txt
-@@ -90,7 +90,13 @@ ENDIF()
+@@ -90,7 +90,10 @@ ENDIF()
IF(NOT MSVC)
IF(BUILD_SHARED_LIBS)
-SET_TARGET_PROPERTIES(netcdf PROPERTIES LINK_FLAGS -shared)
+IF (NOT LIBLIB_VERSION_SCRIPT)
-+ SET(LIBLIB_VERSION_SCRIPT "")
-+ENDIF()
-+IF (NOT LIBLIB_VERSION_SCRIPT)
+ SET(LIBLIB_VERSION_SCRIPT "")
+ENDIF()
+SET_TARGET_PROPERTIES(netcdf PROPERTIES LINK_FLAGS "-shared
${LIBLIB_VERSION_SCRIPT}")
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/netcdf.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[netcdf] 08/08: Enable MMAP in diskless.
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit 6bd25e2a3add1dcd7135b09182caa797e6816a1a
Author: Alastair McKinstry <mckins...@debian.org>
Date: Tue Jan 26 06:27:59 2016 +
Enable MMAP in diskless.
---
debian/changelog | 1 +
debian/libnetcdf-dev.install | 7 ---
debian/rules | 30 --
3 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fcc0f16..f4b2c55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ netcdf (1:4.4.0~rc5-1~exp2) UNRELEASED; urgency=medium
* Add mpi, pnetcdf variants of netcdf. Closes: #708638.
* use libaec-dev to provide SZIP, now that HDF5 uses SZIP.
+ * Enable MMAP in diskless.
-- Alastair McKinstry <mckins...@debian.org> Thu, 14 Jan 2016 16:56:32 +
diff --git a/debian/libnetcdf-dev.install b/debian/libnetcdf-dev.install
index 888bea7..f81a9be 100644
--- a/debian/libnetcdf-dev.install
+++ b/debian/libnetcdf-dev.install
@@ -1,7 +1,8 @@
usr/bin/nc-config
-usr/include/*
-usr/lib/*/netcdf/libnetcdf.so
-#usr/lib/*/netcdf/libnetcdf.a
+usr/include/netcdf.h
+usr/include/netcdf_meta.h
+usr/lib/*/libnetcdf.so
+#usr/lib/*/libnetcdf.a
usr/lib/*/netcdf/serial
usr/lib/*/cmake/netCDF
usr/lib/*/pkgconfig/netcdf-serial.pc
diff --git a/debian/rules b/debian/rules
index 5a2f403..da6d435 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,24 +26,34 @@ override_dh_auto_configure:
-DCMAKE_SKIP_RPATH:BOOL=ON \
-DENABLE_TESTS:BOOL=ON \
-DENABLE_DOXYGEN:BOOL=ON \
- -DUSE_PARALLEL=OFF \
- -DHDF5_INCLUDE_PATH=$(INCDIR)/hdf5/serial \
- -DHDF5_LIBRARY_PATH=$(LIBDIR)/hdf5/serial \
+ -DENABLE_MMAP=ON \
+ -DUSE_SZIP=ON \
+ -DHDF5_INCLUDE_DIR=$(INCDIR)/hdf5/serial \
+ -DHDF5_LIB=$(LIBDIR)/hdf5/serial/libhdf5.so \
+ -DHDF5_HL_LIB=$(LIBDIR)/hdf5/serial/libhdf5_hl.so \
-DLIBLIB_VERSION_SCRIPT=-Wl,--version-script,$(CURDIR)/debian/netcdf-serial.ver
dh_auto_configure --builddirectory=build-pnetcdf -- \
-DCMAKE_SKIP_RPATH:BOOL=ON \
-DENABLE_TESTS:BOOL=ON \
+ -DENABLE_MMAP=ON \
+ -DUSE_SZIP=ON \
-DENABLE_DOXYGEN:BOOL=ON \
-DENABLE_PNETCDF=ON \
+ -DPNETCDF_INCLUDE_DIR=/usr/include \
-DCMAKE_C_COMPILER=mpicc
dh_auto_configure --builddirectory=build-mpi -- \
-DCMAKE_SKIP_RPATH:BOOL=ON \
-DENABLE_PARALLEL_TESTS:BOOL=OFF \
-DENABLE_TESTS:BOOL=ON \
-DENABLE_DOXYGEN:BOOL=ON \
- -DUSE_PARALLEL=ON \
- -DHDF5_INCLUDE_PATH=$(INCDIR)/hdf5/$(MPI) \
- -DHDF5_LIBRARY_PATH=$(LIBDIR)/hdf5/$(MPI) \
+ -DENABLE_MMAP=ON \
+ -DHDF5_IS_PARALLEL=ON \
+ -DENABLE_PARALLEL4=ON \
+ -DENABLE_NETCDF_4=ON \
+ -DUSE_SZIP=ON \
+ -DHDF5_INCLUDE_DIR=$(INCDIR)/hdf5/$(MPI) \
+ -DHDF5_LIB=$(LIBDIR)/hdf5/$(MPI)/libhdf5.so \
+ -DHDF5_HL_LIB=$(LIBDIR)/hdf5/$(MPI)/libhdf5_hl.so \
-DCMAKE_C_FLAGS="${CFLAGS} -DHDF5_PARALLEL" \
-DLIBLIB_VERSION_SCRIPT=-Wl,--version-script,$(CURDIR)/debian/netcdf-mpi.ver \
-DCMAKE_C_COMPILER=mpicc
@@ -60,9 +70,7 @@ override_dh_auto_install:
# install all versions
for d in serial mpi pnetcdf ; do \
$(MAKE) -C build-$$d install DESTDIR=$(CURDIR)/debian/tmp-$$d ;
\
- mkdir -p debian/tmp/$(LIBDIR)/netcdf/$$d/cmake ; \
- sed -e 's/-lnetcdf/-lnetcdf_$$d/' <
debian/tmp-$$d/$(LIBDIR)/pkgconfig/netcdf.pc \
- > debian/tmp/$(LIBDIR)/pkgconfig/netcdf-$$d.pc ; \
+ mkdir -p debian/tmp/$(LIBDIR)/netcdf/$$d/cmake
debian/tmp/$(LIBDIR)/cmake debian/tmp/$(LIBDIR)/pkgconfig ; \
cp debian/tmp-$$d/$(LIBDIR)/libnetcdf.settings
debian/tmp/$(LIBDIR)/netcdf/$$d/libnetcdf.settings ; \
cp -a debian/tmp-$$d/$(LIBDIR)/cmake/netCDF
debian/tmp/$(LIBDIR)/cmake/netCDF_$$d ; \
ln -fs $(LIBDIR)/cmake/netCDF_$$d
debian/tmp/$(LIBDIR)/netcdf/$$d/cmake/netCDF ; \
@@ -71,6 +79,8 @@ override_dh_auto_install:
for d in mpi pnetcdf ; do \
sed -e 's%@MULTIARCH@%$(DEB_HOST_MULTIARCH)%' <
debian/libnetcdf-$$d-dev.postinst.in \
> debian/libnetcdf-$$d-dev.postinst ; \
+ sed -e 's/-lnetcdf/-lnetcdf_$$d/' <
debian/tmp-$$d/$(LIBDIR)/pkgconfig/netcdf.pc \
+ > debian/tmp/$(LIBDIR)/pkgconfig/netcdf-$$d.pc ; \
mv debian/tmp-$$d/$(LIBDIR)/libnetcdf.s
[netcdf] 01/08: Merge debian/master to previous work
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit 07f0d41d19d83ce92cf034b85391e31c9f939e23
Merge: 80bb58a 5d7898a
Author: Alastair McKinstry <mckins...@debian.org>
Date: Thu Jan 14 16:56:57 2016 +
Merge debian/master to previous work
.gitignore |19 +-
.travis.yml|52 +
CMakeInstallation.cmake| 130 +
CMakeLists.txt | 1213 +-
COPYRIGHT | 4 -
CTestConfig.cmake.in | 5 +-
Doxyfile | 1934 --
INSTALL| 259 -
INSTALL.cmake | 161 -
docs/install.dox => INSTALL.md | 317 +-
Make0 |35 +-
Makefile.am|80 +-
Makefile.in| 1201 ++
PostInstall.cmake | 1 +
README.md |71 +-
RELEASE_NOTES.md | 310 +-
aclocal.m4 | 1194 +
cf | 142 +-
cf.cmake |16 +
compile| 347 +
config.guess | 1421 ++
config.h.in.cmake => config.h.cmake.in |20 +-
config.h.in| 556 +
config.sub | 1807 ++
configure | 21515 +++
configure.ac | 542 +-
debian/README.source |13 -
debian/changelog | 162 +-
debian/compat | 2 +-
debian/control |70 +-
debian/copyright | 406 +-
debian/gbp.conf|16 +
debian/libnetcdf-dev.install | 6 +-
debian/libnetcdf-dev.manpages | 2 +-
debian/libnetcdf7.symbols | 2769 +--
debian/nc-config.1 |43 +
debian/netcdf-bin.install | 6 +-
debian/netcdf-bin.manpages | 4 -
...libnetcdf-dev.docs-base => netcdf-doc.doc-base} | 3 +-
debian/netcdf-doc.install | 2 +
debian/netcdf-doc.links| 1 +
debian/patches/hdf5-library-path.patch |51 +
debian/patches/link-private.patch |14 +
debian/patches/privacy-breach-logo.patch |15 +
debian/patches/series | 3 +
debian/rules | 104 +-
debian/upstream/metadata | 6 +
debian/watch | 9 +-
depcomp| 791 +
docs/.gitignore| 2 +
docs/CMakeLists.txt| 106 +-
COPYRIGHT => docs/COPYRIGHT.dox|11 +-
docs/{Doxyfile.guide.in => Doxyfile.developer} | 343 +-
docs/Doxyfile.in | 190 +-
docs/Doxyfile.tutorial.in | 2344 --
docs/DoxygenLayout.xml |12 +-
docs/FAQ.md| 1957 ++
docs/Makefile.am |30 +-
docs/Makefile.in | 747 +
docs/OPeNDAP.dox | 692 +
docs/all-error-codes.md| 117 +-
docs/architecture.dox |15 +-
docs/attribute_conventions.md | 128 +
docs/auth.html | 476 +
docs/building-with-cmake.md| 2 +-
docs/cdl.dox |44 +-
docs/cmake_faq.md |51 +-
docs/credits.md| 118 +
docs/docmap.pdf| Bin 0 -> 64347 bytes
docs/errors.dox.old|51 -
docs/esg.html | 1 +
docs/file_format_specifications.md | 744 +
docs/footer.html |
Bug#811093: hdf5: Please link against libaec-dev for libsz
Source: hdf5 Severity: normal libaec-dev has recently entered sid (and testing/backports). It is a free implementation of the SZLIB compression library, and provides a drop-in replacement for the libsz library used in HDF5, particularly for climate and weather data. -- System Information: Debian Release: 8.2 APT prefers stable-updates APT policy: (500, 'stable-updates'), (500, 'stable') Architecture: i386 (i686) Kernel: Linux 3.16.0-4-686-pae (SMP w/1 CPU core) Locale: LANG=en_IE.UTF-8, LC_CTYPE=en_IE.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to en_IE.UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#749859: Fwd: Re: [EXTERNAL] netcdf sizes in exodus
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 - Forwarded Message Subject: Re: [EXTERNAL] netcdf sizes in exodus Date: Tue, 10 Nov 2015 18:31:19 + From: Sjaardema, Gregory D <gdsj...@sandia.gov> To: Alastair McKinstry <mckins...@debian.org> I’ve (re)opened an issue with the netcdf project — https://github.com/Unidata/netcdf-c/issues/148 _..Greg_ _ _ - -- "A supercomputer is a device for turning compute-bound problems into I/O-bound problems” From: Alastair McKinstry <mckins...@debian.org <mailto:mckins...@debian.org>> Organization: Debian Date: Tuesday, November 10, 2015 at 9:50 AM To: "Sjaardema, Gregory D" <gdsj...@sandia.gov <mailto:gdsj...@sandia.gov>> Subject: [EXTERNAL] netcdf sizes in exodus Hi, I am the maintainer of Exodus in Debian (packaged for use in VisIT, etc). You wrote a README note in which you state: Exodus requires NetCDF version 4.2.1.1 or later. The netcdf library must be modified slightly in order to handle the exodus datamodel. The specific changes are: 1. include/netcdf.h -- Modify the following defines: #define NC_MAX_DIMS 65536/* max dimensions per file */ #define NC_MAX_VARS 524288 /* max variables per file */ #define NC_MAX_VAR_DIMS 8/* max per variable dimensions */ This has led to a bug report in netcdf: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=749859 As of now, Debian has NetCDF 4.4.0. As of the discussion at: http://lists.mcs.anl.gov/pipermail/moab-dev/2013/005870.html it appears that limits may no longer need to be changed. Can you confirm whether this change is still required? Best regards Alastair McKinstry PS. Are you at Supercomputing'15 ? -BEGIN PGP SIGNATURE- Version: GnuPG v2 iQIcBAEBCAAGBQJWQ0yoAAoJEMvmu05dmtOlXyAQAJXO+GSX8TzuvfaRRpB5ZMc0 g9BpGVvvNQhuIUliOBRgcgAjHgpLGx4lRBEkZKkjBMOLZEt9kiGWIgD2tUJu0cgM frvvjVOXXkDVsfT/zymE5HO2QR3vJ7M6Zf2piRHcVt/Vw2snwa/A8b4OO7ce5uUO Md5jiU4NEJvqGRfoyqRI1IFqXZRtAE1AsQ6BleQ2zLIugbJuv+qWpt+9hRk/W+UD unsqvr/Um+Ib/AAVnOcSy3l6ZlL7I7XFmwxlAcx1DbUV4/ANBtMyw8bFFJrS4pGC HB1kUi9qOs5VwBmQdl+NkzbsyjUmntT0Cg9ahVV8+UnmxmMc4JG3yVmb6JGA/Aci x8I4cew72eEVd9pCrIWcgacQHsT+Qsobh4iYxFHDDFVkIpo36mkMBuf53M8l21w7 S9PN1fw6MtEsD4goDKrDvwRa9msjHxKpmVWyRAhQ7VYoJHJN/o4o1DmJDuVB0Mw2 i+f+agkn3+GqkFFm8/h/1MrD6f61PEsN5QNEf5Qlj1dmdJWlS2gGtMLO5WSZZrMV /rpznGX/aWt5tC3gOOld39d0mIb9Helv56/VWGoa16S/qyr/rzLD2YmVVJ4xrD11 tRFrlH3CSQkQmlkKgTcig4LViE7dL9RBqk5YerSUl5c1sTCJGuLUz7Wotaegfk1Y 1DFOiNVwoSIBEuSMPtE+ =/OjX -END PGP SIGNATURE- ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#749859: netcdf: Please increase size of netcdf models for exodus
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
Hi Bas
I don't know how many 'large' models there are.
As the documentation states, the netcdf library does not statically
define anything based on these arbitrary limits, so I believe there is
no impact on netcdf itself. Certainly exodus works fine when netcdf is
changed to meet these limits.
If there is a negative impact, it may be due to certain codes that use
classic netcdf statically allocating in order to meet these potential
limits, but I've never heard or seen such issues.
regards
Alastair
On 08/11/2015 7:52 p.m., Sebastiaan Couwenberg wrote:
> notfound 749859 4.2.1+
> found 749859 netcdf/1:4.3.3.1+ds-1~exp1
> tags 749859 upstream
> thanks
>
> Hi Alastair,
>
> On 30-05-14 11:36, Alastair McKinstry wrote:
>> The netcdf library must be modified slightly in order to handle the
>> exodus datamodel. The specific changes are:
>>
>> 1. include/netcdf.h -- Modify the following defines:
>>
>> #define NC_MAX_DIMS 65536/* max dimensions per file */
>> #define NC_MAX_VARS 524288 /* max variables per file */
>> #define NC_MAX_VAR_DIMS 8/* max per variable dimensions */
>>
>> If these changes are not made, the exodus library will still function
>> for "normal" size models, but it will fail for "large" models. The
>> error message from exodus/netcdf should be somewhat clear when this
>> happens...
>
> As you know, we have NetCDF 4.4.0~rc2 in testing/unstable for some time
> now. While that meets the 4.2.1 version requirements, but not the
> NC_MAX_* values:
>
> /**
> Maximum for classic library.
>
> In the classic netCDF model there are maximum values for the number of
> dimensions in the file (\ref NC_MAX_DIMS), the number of global or per
> variable attributes (\ref NC_MAX_ATTRS), the number of variables in
> the file (\ref NC_MAX_VARS), and the length of a name (\ref
> NC_MAX_NAME).
>
> These maximums are enforced by the interface, to facilitate writing
> applications and utilities. However, nothing is statically allocated
> to these sizes internally.
>
> These maximums are not used for netCDF-4/HDF5 files unless they were
> created with the ::NC_CLASSIC_MODEL flag.
>
> As a rule, NC_MAX_VAR_DIMS <= NC_MAX_DIMS.
> */
> /**@{*/
> #define NC_MAX_DIMS 1024
> #define NC_MAX_ATTRS8192
> #define NC_MAX_VARS 8192
> #define NC_MAX_NAME 256
> #define NC_MAX_VAR_DIMS 1024 /**< max per variable dimensions */
> /**@}*/
>
>
> I'm not comfortable changing these values, because I cannot oversee the
> impact.
>
> How common are the "large" models? Is it not a very specialised use case?
>
> Kind Regards,
>
> Bas
>
- --
Alastair McKinstry, <alast...@sceal.ie>, <mckins...@debian.org>,
https://diaspora.sceal.ie/u/amckinstry
Misentropy: doubting that the Universe is becoming more disordered.
-BEGIN PGP SIGNATURE-
Version: GnuPG v2
iQIcBAEBCAAGBQJWQEJBAAoJEMvmu05dmtOlF6MP/39dDi4Pb2QoB8aMHct5eTt/
0xwMLSx5k23G+WwtLn2ZBrmQHhpVhJda+cOjGDKhd+eetpWm3gWYjo8Z3Qfi2Axi
MuP1knVRzrulw0pnSyRDeZTjF0XOpdDeCIaglnqjw5dHTWsmskloWy4d87BHccnS
njZxJ6fd/rXiIg42w5eRbi1mNxoW56M+5dHtSIBEG4R43HzqQzuVIhYWoxybw86I
9OqD/C0JN95itmwy1GuaWMvb/0it9cA5ubGX2kfK9mgFTbubztiWSpraoyk+a4C8
tqDjCB3aPZF+hGmwAKjsgBsN3RL6jkwEP1NZjAzsnWc3f/si0TXpRAhDbHw2Ykqx
c+ZHWTzET8y0eC3FEec9ckZYU38T/RpNmoas62pkUMk7YyMlumipAXTar0+R2vfF
qtTkjAS2QRpjlwRC7NE9CCloH/PCTDPPNH2NMAPdFsMFKHtfXfzaRx3bLGbVL+qZ
2ZRzDChgMxS7Yj2ZSCes28QEjP1GvFd/J7ZlgJ9oukKLeBYEWQOSChWszLVgNqvJ
nY+yThn5K5rD5dB+KCOYQ8M7puJp3PY4goUavTz4eAWil5zC1WD2yPuiutXqIlqQ
2VPs/LUP5tJNTcKMWpubI1CghmlcHq67yCllihs9na51ewjWaRIwZqLEoYgvni7m
1/RmcJDxeXQRthGTiNOl
=7hzg
-END PGP SIGNATURE-
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libterralib] 01/01: Depend on dxflib >= 2.5.0.0-4 for g++-5 transition.
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch master in repository libterralib. commit f08dff977fcdfa4a294fa73e4706158b24dce789 Author: Alastair McKinstry <mckins...@debian.org> Date: Fri Sep 11 09:42:37 2015 +0100 Depend on dxflib >= 2.5.0.0-4 for g++-5 transition. --- debian/changelog | 6 ++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4940cb6..3d06fae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libterralib (4.3.0+dfsg.2-5) unstable; urgency=medium + + * Depend on dxflib >= 2.5.0.0-4 for g++-5 transition. + + -- Alastair McKinstry <mckins...@debian.org> Fri, 11 Sep 2015 09:42:27 +0100 + libterralib (4.3.0+dfsg.2-4) unstable; urgency=medium * Remove libspl, te_spl plugin as broken on Hurd, KFreeBSD. diff --git a/debian/control b/debian/control index ad8d76b..6b42b14 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 9), zlib1g-dev, libqwt-dev, libshp-dev, - libdxflib-dev, + libdxflib-dev (>= 2.5.0.0-4), libmysqlclient-dev, libpq-dev Standards-Version: 3.9.6 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libterralib] branch master updated (2918b77 - c390cf8)
This is an automated email from the git hooks/post-receive script. mckinstry pushed a change to branch master in repository libterralib. from 2918b77 Add libpq-dev, libmysqlcient-dev as B-D. new c390cf8 Remove libspl, te_spl plugin as broken on Hurd, KFreeBSD. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 6 ++ debian/libterralib-dev.install.in | 2 -- debian/libterralib-dev.links.in | 2 -- debian/libterralib3.install.in| 2 -- debian/rules | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libterralib] tag debian/4.3.0+dfsg.2-4 created (now c390cf8)
This is an automated email from the git hooks/post-receive script. mckinstry pushed a change to tag debian/4.3.0+dfsg.2-4 in repository libterralib. at c390cf8 (commit) No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libterralib] 01/01: Remove libspl, te_spl plugin as broken on Hurd, KFreeBSD.
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository libterralib.
commit c390cf84c1b3f4ae7f0bdaa93f7840dd717e4ba6
Author: Alastair McKinstry mckins...@debian.org
Date: Sun Aug 30 01:09:32 2015 +0100
Remove libspl, te_spl plugin as broken on Hurd, KFreeBSD.
---
debian/changelog | 6 ++
debian/libterralib-dev.install.in | 2 --
debian/libterralib-dev.links.in | 2 --
debian/libterralib3.install.in| 2 --
debian/rules | 6 +++---
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 45930a8..4940cb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libterralib (4.3.0+dfsg.2-4) unstable; urgency=medium
+
+ * Remove libspl, te_spl plugin as broken on Hurd, KFreeBSD.
+
+ -- Alastair McKinstry mckins...@debian.org Fri, 07 Aug 2015 20:05:54 +0100
+
libterralib (4.3.0+dfsg.2-3) unstable; urgency=medium
* Add libpq-dev, libmysqlcient-dev as B-D.
diff --git a/debian/libterralib-dev.install.in
b/debian/libterralib-dev.install.in
index d09b84f..596ded1 100644
--- a/debian/libterralib-dev.install.in
+++ b/debian/libterralib-dev.install.in
@@ -6,8 +6,6 @@ Release/libshapelib.a usr/lib/@DEB_HOST_MULTIARCH@
Release/libte_shapelib.a usr/lib/@DEB_HOST_MULTIARCH@
Release/libte_mysql.a usr/lib/@DEB_HOST_MULTIARCH@
Release/libte_postgresql.a usr/lib/@DEB_HOST_MULTIARCH@
-Release/libspl.a usr/lib/@DEB_HOST_MULTIARCH@
-Release/libte_spl.a usr/lib/@DEB_HOST_MULTIARCH@
Release/libte_dxf.a usr/lib/@DEB_HOST_MULTIARCH@
Release/libstat.a usr/lib/@DEB_HOST_MULTIARCH@
src/terralib/dtm/*.h usr/include/terralib/dtm
diff --git a/debian/libterralib-dev.links.in b/debian/libterralib-dev.links.in
index 2225751..decd954 100644
--- a/debian/libterralib-dev.links.in
+++ b/debian/libterralib-dev.links.in
@@ -6,8 +6,6 @@
/usr/lib/@DEB_HOST_MULTIARCH@/libshapelib.so.3.6.1
usr/lib/@DEB_HOST_MULTIARCH@/libshapelib.so
/usr/lib/@DEB_HOST_MULTIARCH@/libte_mysql.so.3.6.1
usr/lib/@DEB_HOST_MULTIARCH@/libte_mysql.so
/usr/lib/@DEB_HOST_MULTIARCH@/libte_dxf.so.3.6.1
usr/lib/@DEB_HOST_MULTIARCH@/libte_dxf.so
-/usr/lib/@DEB_HOST_MULTIARCH@/libte_spl.so.3.6.1
usr/lib/@DEB_HOST_MULTIARCH@/libte_spl.so
-/usr/lib/@DEB_HOST_MULTIARCH@/libspl.so.3.6.1
usr/lib/@DEB_HOST_MULTIARCH@/libspl.so
/usr/lib/@DEB_HOST_MULTIARCH@/libte_postgresql.so.3.6.1
usr/lib/@DEB_HOST_MULTIARCH@/libte_postgresql.so
/usr/lib/@DEB_HOST_MULTIARCH@/libte_utils.so.3.6.1
usr/lib/@DEB_HOST_MULTIARCH@/libte_utils.so
/usr/lib/@DEB_HOST_MULTIARCH@/libstat.so.3.6.1
usr/lib/@DEB_HOST_MULTIARCH@/libstat.so
diff --git a/debian/libterralib3.install.in b/debian/libterralib3.install.in
index 5e648a6..def7d23 100644
--- a/debian/libterralib3.install.in
+++ b/debian/libterralib3.install.in
@@ -6,8 +6,6 @@ Release/linux-g++/libte_shapelib.so.*
usr/lib/@DEB_HOST_MULTIARCH@
Release/linux-g++/libshapelib.so.* usr/lib/@DEB_HOST_MULTIARCH@
Release/linux-g++/libte_mysql.so.* usr/lib/@DEB_HOST_MULTIARCH@
Release/linux-g++/libte_dxf.so.* usr/lib/@DEB_HOST_MULTIARCH@
-Release/linux-g++/libspl.so.* usr/lib/@DEB_HOST_MULTIARCH@
-Release/linux-g++/libte_spl.so.* usr/lib/@DEB_HOST_MULTIARCH@
Release/linux-g++/libte_postgresql.so.*
usr/lib/@DEB_HOST_MULTIARCH@
Release/linux-g++/libte_utils.so.* usr/lib/@DEB_HOST_MULTIARCH@
Release/linux-g++/libstat.so.* usr/lib/@DEB_HOST_MULTIARCH@
diff --git a/debian/rules b/debian/rules
index c2cc32d..15651f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,10 +25,10 @@ override_dh_auto_build:
for f in ${AUTOGENERATED} ; do \
sed -e 's%@DEB_HOST_MULTIARCH@%${DEB_HOST_MULTIARCH}%g'
debian/$$f.in debian/$$f ; \
done
- for d in terralib te_functions te_utils image_processing libspl
PostgreSQL MySQL shapelib stat te_dxf te_shapelib te_spl ; do \
+ for d in terralib te_functions te_utils image_processing PostgreSQL
MySQL shapelib stat te_dxf te_shapelib ; do \
( cd build/qt4/$$d qmake QMAKE_CXXFLAGS=$(CXXFLAGS) $$d.pro
$(MAKE) ) ; \
done
- for d in terralib te_functions te_utils terralibpdi shapelib
te_shapelib te_mysql te_spl spl te_postgresql te_dxf stat ; do \
+ for d in terralib te_functions te_utils terralibpdi shapelib
te_shapelib te_mysql te_postgresql te_dxf stat ; do \
ar rcs Release/lib$$d.a Release/linux-g++/obj/$$d/*.o ;\
done
@@ -37,6 +37,6 @@ override_dh_clean:
rm -rf Release
rm -f $(patsubst %, debian/%, ${AUTOGENERATED})
find . -name '.cvsignore' -delete
- for d in terralib te_functions te_utils
[libterralib] tag debian/4.3.0+dfsg.2-3 created (now 2918b77)
This is an automated email from the git hooks/post-receive script. mckinstry pushed a change to tag debian/4.3.0+dfsg.2-3 in repository libterralib. at 2918b77 (commit) No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libterralib] branch master updated (5e2aa44 - 2918b77)
This is an automated email from the git hooks/post-receive script. mckinstry pushed a change to branch master in repository libterralib. from 5e2aa44 Typo in rules led to no libs installed in empty libterralib3 package new 2918b77 Add libpq-dev, libmysqlcient-dev as B-D. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 6 ++ debian/control | 4 +++- debian/patches/build-fix.patch | 5 + 3 files changed, 14 insertions(+), 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libterralib] 01/01: Add libpq-dev, libmysqlcient-dev as B-D.
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch master in repository libterralib. commit 2918b77c2981293783b368d67616a23166fb5c42 Author: Alastair McKinstry mckins...@debian.org Date: Fri Aug 7 14:31:44 2015 +0100 Add libpq-dev, libmysqlcient-dev as B-D. --- debian/changelog | 6 ++ debian/control | 4 +++- debian/patches/build-fix.patch | 5 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5eed378..45930a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libterralib (4.3.0+dfsg.2-3) unstable; urgency=medium + + * Add libpq-dev, libmysqlcient-dev as B-D. + + -- Alastair McKinstry mckins...@debian.org Fri, 07 Aug 2015 14:31:10 +0100 + libterralib (4.3.0+dfsg.2-2) unstable; urgency=medium * Add Hurd, KFreeBSD support to libspl. diff --git a/debian/control b/debian/control index 134e056..ad8d76b 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,9 @@ Build-Depends: debhelper (= 9), zlib1g-dev, libqwt-dev, libshp-dev, - libdxflib-dev + libdxflib-dev, + libmysqlclient-dev, + libpq-dev Standards-Version: 3.9.6 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/libterralib.git Vcs-Git: git://anonscm.debian.org/pkg-grass/libterralib.git diff --git a/debian/patches/build-fix.patch b/debian/patches/build-fix.patch index 7d8a910..e6aaf33 100644 --- a/debian/patches/build-fix.patch +++ b/debian/patches/build-fix.patch @@ -1,3 +1,8 @@ +Author: Alastair McKinstry mckins...@debian.org +Description: Link against libs shipped in Debian rather than versions built in terralib +Forwarded: not-needed +Last-Updated: 2015-08-05 + Index: libterralib-4.3.0+dfsg.2/build/qt4/image_processing/image_processing.pro === --- libterralib-4.3.0+dfsg.2.orig/build/qt4/image_processing/image_processing.pro -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libterralib] 02/08: Merge tag 'upstream/4.3.0+dfsg.2'
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch master in repository libterralib. commit 38917052e2e055e066bab207569ee49f35e15865 Merge: d907b3e d519a8e Author: Alastair McKinstry mckins...@debian.org Date: Sun Aug 2 23:53:53 2015 +0100 Merge tag 'upstream/4.3.0+dfsg.2' src/DSDK/include/base/lt_cacheStatus.h | 28 - src/DSDK/include/base/lt_encryptStatus.h | 63 - src/DSDK/include/base/lti_bbbImageReader.h | 154 - src/DSDK/include/base/lti_bbbImageWriter.h | 71 - src/DSDK/include/base/lti_coreStatus.h | 142 - src/DSDK/include/base/lti_delegates.h | 97 - src/DSDK/include/base/lti_geoCoord.h | 393 - src/DSDK/include/base/lti_geoFileImageWriter.h | 173 - src/DSDK/include/base/lti_geoImageReader.h | 71 - src/DSDK/include/base/lti_image.h | 672 -- src/DSDK/include/base/lti_imageFilter.h| 114 - src/DSDK/include/base/lti_imageReader.h| 87 - src/DSDK/include/base/lti_imageStage.h | 414 - src/DSDK/include/base/lti_imageStageManager.h | 84 - src/DSDK/include/base/lti_imageWriter.h| 276 - src/DSDK/include/base/lti_navigator.h | 393 - src/DSDK/include/base/lti_pixel.h | 444 -- src/DSDK/include/base/lti_pixelLookupTable.h | 142 - src/DSDK/include/base/lti_rawImageReader.h | 308 - src/DSDK/include/base/lti_rawImageWriter.h | 104 - src/DSDK/include/base/lti_sample.h | 220 - src/DSDK/include/base/lti_scene.h | 488 -- src/DSDK/include/base/lti_sceneBuffer.h| 642 -- src/DSDK/include/base/lti_types.h | 194 - src/DSDK/include/base/lti_utils.h | 202 - src/DSDK/include/base/lti_version.h| 22 - src/DSDK/include/base/mg2_status.h | 332 - src/DSDK/include/base/mg3_status.h | 215 - src/DSDK/include/c_api/lt_ioCStream.h | 212 - src/DSDK/include/c_api/ltic_api.h | 462 -- src/DSDK/include/filters/lti_bandSelectFilter.h| 208 - src/DSDK/include/filters/lti_colorTransformer.h| 101 - src/DSDK/include/filters/lti_cropFilter.h | 100 - src/DSDK/include/filters/lti_datatypeTransformer.h | 84 - src/DSDK/include/filters/lti_dynamicRangeFilter.h | 148 - src/DSDK/include/filters/lti_embeddedImage.h | 148 - src/DSDK/include/filters/lti_filtersStatus.h | 99 - src/DSDK/include/filters/lti_mosaicFilter.h| 184 - src/DSDK/include/filters/lti_multiresFilter.h | 161 - src/DSDK/include/filters/lti_staticZoomFilter.h| 79 - src/DSDK/include/filters/lti_statisticsFilter.h| 95 - src/DSDK/include/filters/lti_translationFilter.h | 80 - src/DSDK/include/filters/lti_viewerImageFilter.h | 94 - src/DSDK/include/filters/lti_watermarkFilter.h | 97 - src/DSDK/include/j2k_readers/J2KImageReader.h | 304 - src/DSDK/include/j2k_readers/NITFImageManager.h| 246 - src/DSDK/include/j2k_readers/NITFImageReader.h | 170 - src/DSDK/include/j2k_readers/j2k_types.h | 73 - src/DSDK/include/j2k_readers/lti_j2kStatus.h | 160 - src/DSDK/include/j2k_readers/lti_nitfStatus.h | 111 - src/DSDK/include/j2k_readers/nitf_types.h | 73 - src/DSDK/include/metadata/lti_geoMetadataStatus.h | 62 - src/DSDK/include/metadata/lti_metadataDatabase.h | 269 - src/DSDK/include/metadata/lti_metadataDumper.h | 109 - src/DSDK/include/metadata/lti_metadataReader.h | 89 - src/DSDK/include/metadata/lti_metadataRecord.h | 331 - src/DSDK/include/metadata/lti_metadataStatus.h | 47 - src/DSDK/include/metadata/lti_metadataTypes.h | 187 - src/DSDK/include/metadata/lti_metadataUtils.h | 82 - src/DSDK/include/metadata/lti_metadataWriter.h | 90 - .../mrsid_readers/MG3CompositeImageReader.h| 272 - src/DSDK/include/mrsid_readers/MrSIDImageReader.h | 184 - .../include/mrsid_readers/MrSIDImageReaderBase.h | 235 - .../include/mrsid_readers/MrSIDPasswordDelegate.h | 171 - .../include/mrsid_readers/lti_mrsidReadersStatus.h | 67 - src/DSDK/include/support/lt_base.h | 30 - src/DSDK/include/support/lt_define.h | 154 - src/DSDK/include/support/lt_fileSpec.h | 251 - src/DSDK/include/support/lt_ioBufferedStream.h | 79 - src/DSDK/include/support/lt_ioCallbackStream.h | 121 - .../include/support/lt_ioCallbackStreamTypes.h | 133 - src/DSDK/include/support/lt_ioDynamicMemStream.h | 196 - src/DSDK/include/support/lt_ioFile64Stream.h | 242 - src/DSDK/include/support/lt_ioFileStream.h | 249 - src/DSDK/include/support/lt_ioMemStream.h | 91 - src/DSDK/include/support/lt_ioStatus.h | 55 - src/DSDK/include
[libterralib] tag debian/4.3.0+dfsg.2-1 created (now 3513c9f)
This is an automated email from the git hooks/post-receive script. mckinstry pushed a change to tag debian/4.3.0+dfsg.2-1 in repository libterralib. at 3513c9f (commit) This tag includes the following new commits: new 433b594 Remove Oracle drivers too new 3513c9f Remove Oracle drivers too The 2 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libterralib] 08/08: Typo in rules led to no libs installed in empty libterralib3 package
This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch master in repository libterralib. commit 5e2aa440317bbdd9c0501c2c872c01a91dce623a Author: Alastair McKinstry mckins...@debian.org Date: Fri Aug 7 05:58:41 2015 +0100 Typo in rules led to no libs installed in empty libterralib3 package --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 5c7438c..c2cc32d 100755 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,7 @@ export DH_VERBOSE=1 export QT_SELECT=5 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -AUTOGENERATED:= libterralib-dev.links libterralib.install libterralib-dev.install libterralib.pc +AUTOGENERATED:= libterralib-dev.links libterralib3.install libterralib-dev.install libterralib.pc # To enable all, uncomment following line DEB_BUILD_MAINT_OPTIONS:= hardening=+all -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libterralib] 07/08: Add Hurd, KFreeBSD support to libspl.
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository libterralib.
commit f249bc39ec5db559fc4adee28236a5e641d58129
Author: Alastair McKinstry mckins...@debian.org
Date: Thu Aug 6 07:34:13 2015 +0100
Add Hurd, KFreeBSD support to libspl.
---
debian/changelog | 6 ++
debian/patches/archs.patch | 138 +
debian/patches/series | 1 +
3 files changed, 145 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 105e64e..5eed378 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libterralib (4.3.0+dfsg.2-2) unstable; urgency=medium
+
+ * Add Hurd, KFreeBSD support to libspl.
+
+ -- Alastair McKinstry mckins...@debian.org Thu, 06 Aug 2015 07:18:31 +0100
+
libterralib (4.3.0+dfsg.2-1) unstable; urgency=medium
[ Bas Couwenberg ]
diff --git a/debian/patches/archs.patch b/debian/patches/archs.patch
new file mode 100644
index 000..f5d3968
--- /dev/null
+++ b/debian/patches/archs.patch
@@ -0,0 +1,138 @@
+Author: Alastair McKinstry mckins...@debian.org
+Description: Support for Hurd and KFreeBSD to libspl
+Last-Updated: 2015-08-06
+Forwarded: no
+
+Index: libterralib-4.3.0+dfsg.2/src/libspl/include/spl_platform.h
+===
+--- libterralib-4.3.0+dfsg.2.orig/src/libspl/include/spl_platform.h
libterralib-4.3.0+dfsg.2/src/libspl/include/spl_platform.h
+@@ -42,6 +42,8 @@ Andreas Loeffler (www.unitedbytes.de)
+ #define SPL_PLATFORM_LINUX 2
+ #define SPL_PLATFORM_APPLE 3
+ #define SPL_PLATFORM_SOLARIS4
++#define SPL_PLATFORM_HURD 5
++#define SPL_PLATFORM_KFREEBSD 6
+
+ //
+ // COMPILER DEFINES
+@@ -68,6 +70,14 @@ Andreas Loeffler (www.unitedbytes.de)
+
+ #define SPL_PLATFORMSPL_PLATFORM_LINUX
+
++#elif defined( __GNU__ )
++
++ #define SPL_PLATFORMSPL_PLATFORM_HURD
++
++#elif defined( __GLIBC__ )
++
++ #define SPL_PLATFORMSPL_PLATFORM_KFREEBSD
++
+ #elif defined( __APPLE_CC__ ) || defined( APPLE_CC )
+
+ #define SPL_PLATFORMSPL_PLATFORM_APPLE
+Index: libterralib-4.3.0+dfsg.2/src/libspl/include/spl_mutex.h
+===
+--- libterralib-4.3.0+dfsg.2.orig/src/libspl/include/spl_mutex.h
libterralib-4.3.0+dfsg.2/src/libspl/include/spl_mutex.h
+@@ -1,4 +1,3 @@
+-
+ /*!
+
+ \section terms_of_use Terms of Use
+@@ -45,6 +44,11 @@ Ren� Stuhr (www.unitedbytes.de)
+ #includepthread.h
+ #endif
+
++#if (SPL_PLATFORM == SPL_PLATFORM_HURD) || (SPL_PLATFORM ==
SPL_PLATFORM_KFREEBSD)
++ #includeerrno.h
++ #includepthread.h
++#endif
++
+ #if SPL_PLATFORM == SPL_PLATFORM_WIN32
+ #includewindows.h
+ #endif
+@@ -128,7 +132,7 @@ private:
+ HANDLE m_access;
/// WIN32 mutex.
+ SECURITY_ATTRIBUTES m_sa;
+
+-#elif SPL_PLATFORM == SPL_PLATFORM_LINUX
++#elif (SPL_PLATFORM == SPL_PLATFORM_LINUX) || (SPL_PLATFORM ==
SPL_PLATFORM_HURD) || (SPL_PLATFORM_KFREEBSD)
+
+ pthread_mutex_t m_access; ///
POSIX mutex.
+
+Index: libterralib-4.3.0+dfsg.2/src/libspl/include/spl_threadlock.h
+===
+--- libterralib-4.3.0+dfsg.2.orig/src/libspl/include/spl_threadlock.h
libterralib-4.3.0+dfsg.2/src/libspl/include/spl_threadlock.h
+@@ -44,7 +44,7 @@ Ren� Stuhr (www.unitedbytes.de)
+ #include spl_mutex.h
+ #endif
+
+-#if SPL_PLATFORM == SPL_PLATFORM_LINUX
++#if (SPL_PLATFORM == SPL_PLATFORM_LINUX) || (SPL_PLATFORM ==
SPL_PLATFORM_HURD) || (SPL_PLATFORM == SPL_PLATFORM_KFREEBSD)
+ #include errno.h
+ #endif
+
+Index: libterralib-4.3.0+dfsg.2/src/libspl/source/spl_mutex.cpp
+===
+--- libterralib-4.3.0+dfsg.2.orig/src/libspl/source/spl_mutex.cpp
libterralib-4.3.0+dfsg.2/src/libspl/source/spl_mutex.cpp
+@@ -45,7 +45,7 @@ using namespace SPL;
+
+ slcMutex::slcMutex( void )
+ {
+-#if SPL_PLATFORM == SPL_PLATFORM_LINUX
++#if (SPL_PLATFORM == SPL_PLATFORM_LINUX) || (SPL_PLATFORM ==
SPL_PLATFORM_HURD) || (SPL_PLATFORM == SPL_PLATFORM_KFREEBSD)
+
+ pthread_mutexattr_t access_attr;
+ pthread_mutexattr_init( access_attr );
+@@ -75,7 +75,7 @@ slcMutex::slcMutex( void )
+
+ slcMutex::~slcMutex( void )
+ {
+-#if SPL_PLATFORM == SPL_PLATFORM_LINUX
++#if (SPL_PLATFORM == SPL_PLATFORM_LINUX) || (SPL_PLATFORM ==
SPL_PLATFORM_HURD) || (SPL_PLATFORM
