[libpdl-netcdf-perl] 05/09: Imported Debian patch 4.16-1

Bas Couwenberg sebastic at debian.org
Sun Jun 12 17:41:53 UTC 2016


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository libpdl-netcdf-perl.

commit 8b93d4052b14abe895e37dbd9fa1e7d59d843753
Merge: 810f029 8fc9945
Author: Henning Glawe <glaweh at debian.org>
Date:   Mon May 28 10:05:36 2012 +0200

    Imported Debian patch 4.16-1

 Changes                                   |  38 ++
 MANIFEST                                  |   3 +-
 META.json                                 |  47 +++
 META.yml                                  |   6 +-
 Makefile.PL                               |  74 +++-
 debian/README.source                      |   3 -
 debian/changelog                          |  33 ++
 debian/compat                             |   2 +-
 debian/control                            |  15 +-
 debian/copyright                          |   7 +-
 debian/patches/00list                     |   1 -
 debian/patches/010-OpenDAP_support.dpatch |  59 ---
 debian/patches/perl-5.14-ccflags.patch    |  11 +
 debian/patches/series                     |   1 +
 debian/rules                              |  31 +-
 debian/source/format                      |   1 +
 netcdf.pd                                 | 580 +++++++++++++++++++++++-------
 t/01-Netcdf3.t                            |  60 +++-
 t/threedimstring.nc                       | Bin 0 -> 4164 bytes
 typemap                                   |   6 +
 20 files changed, 740 insertions(+), 238 deletions(-)

diff --cc debian/changelog
index c25c3c2,0000000..4f88767
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,56 -1,0 +1,89 @@@
++libpdl-netcdf-perl (4.16-1) unstable; urgency=low
++
++  * new upstream version
++  * acknowledge NMUs
++  * switch to packaging format "3.0 quilt" (closes: #670669)
++  * include $Config{ccflags} in CCFLAGS (closes: #636753)
++  * remove 010-OpenDAP-support patch, upstream now allows opening OpenDAP URLs
++    if no mode is requested
++  * build-depend on new pdl package including dh_pdl to setup pdl dependencies
++  * use dpkg-buildflags to setup build flags
++  * use dh_auto_configure to call Makefile.PL
++
++ -- Henning Glawe <glaweh at debian.org>  Mon, 28 May 2012 10:05:36 +0200
++
++libpdl-netcdf-perl (4.07-1.2) unstable; urgency=low
++
++  * Non-maintainer upload.
++  * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
++  * Update to Standards-Version to 3.9.3 and debhelper to 9.
++  * Add build-arch and build-indep targets; use dh_prep in rules file.
++  * Fix copyright-with-old-dh-make-debian-copyright (Lintian).
++
++ -- Jari Aalto <jari.aalto at cante.net>  Fri, 27 Apr 2012 22:51:42 +0300
++
++libpdl-netcdf-perl (4.07-1.1) unstable; urgency=low
++
++  * Non-maintainer upload.
++  * Fix "broken build with perl 5.14: CCFLAGS should include $Config{ccflags},
++    but build does not fail": new patch 020-perl-5.14-ccflags.dpatch: add
++    $Config{ccflags} to CCFLAGS (closes: #636753).
++
++ -- gregor herrmann <gregoa at debian.org>  Sun, 16 Oct 2011 20:48:25 +0200
++
 +libpdl-netcdf-perl (4.07-1) unstable; urgency=low
 +
 +  * new upstream version
 +  * include patch to support OpenDAP URLs (closes: #611346).
 +  * update standards version (no changes required)
 +
 + -- Henning Glawe <glaweh at debian.org>  Wed, 02 Feb 2011 11:46:59 +0100
 +
 +libpdl-netcdf-perl (4.03-1) unstable; urgency=low
 +
 +  * new upstream version
 +  * acknowledge NMU, thanks Gregor Herrmann (closes: #574217).
 +  * remove postinst/preinst script, documentation index updates are
 +    handled by dpkg triggers of PDL package now
 +  * update Standards-Version to 3.8.4
 +  * add misc:Depends to dependency list (needed due to debhelper)
 +
 + -- Henning Glawe <glaweh at debian.org>  Fri, 07 May 2010 23:15:05 +0200
 +
 +libpdl-netcdf-perl (4.02-1.1) unstable; urgency=low
 +
 +  * Non-maintainer upload.
 +  * Fix "package purge (after dependencies removal) fails": check for
 +    existence of used scripts in .postrm (closes: #574217).
 +
 + -- gregor herrmann <gregoa at debian.org>  Sat, 17 Apr 2010 14:54:00 +0200
 +
 +libpdl-netcdf-perl (4.02-1) unstable; urgency=low
 +
 +  * initial upload to debian (closes: #559476)
 +  * New upstream release
 +  * take over package for debian
 +  * register the documentation to pdldoc
 +  * recreate HTML docs on install, upgrade and uninstall
 +  * run test suite in verbose mode in separate debian/rules target
 +  * include dpatch in package build process, write appropriate README.source
 +  * update standards-version to 3.8.3
 +  * bump debhelper build-dep
 +  * repair POD docs to make them available in pdldoc
 +
 + -- Henning Glawe <glaweh at debian.org>  Sun, 06 Dec 2009 17:19:02 +0100
 +
 +libpdl-netcdf-perl (4.01-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Adding watch
 +  * Fixing dependencies for lintian
 +  * Fixing license for lintian
 +
 + -- Heiko Klein <heiko.klein at met.no>  Thu, 18 Jun 2009 11:08:06 +0200
 +
 +libpdl-netcdf-perl (0.94-1) unstable; urgency=low
 +
 +  * Initial Release.
 +
 + -- Heiko Klein <heiko.klein at met.no>  Thu, 16 Apr 2009 11:49:16 +0200
diff --cc debian/compat
index 7ed6ff8,0000000..ec63514
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 5
++9
diff --cc debian/control
index 72192ea,0000000..69df892
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,26 -1,0 +1,35 @@@
 +Source: libpdl-netcdf-perl
 +Section: perl
 +Priority: optional
- Build-Depends: libnetcdf-dev, pdl, perl, debhelper (>=5), dpatch
++Build-Depends:
++ libnetcdf-dev,
++ pdl (>=2.4.11),
++ perl,
++ debhelper (>= 9),
++ dpkg-dev (>= 1.16.1~)
 +Maintainer: Henning Glawe <glaweh at debian.org>
- Standards-Version: 3.9.1
++Standards-Version: 3.9.3
 +Homepage: http://search.cpan.org/dist/PDL-NetCDF/
 +
 +Package: libpdl-netcdf-perl
 +Architecture: any
- Depends: pdl (>=2.4.6), ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}
++Depends:
++ ${pdl:Depends},
++ ${shlibs:Depends},
++ ${perl:Depends},
++ ${misc:Depends}
 +Description: Netcdf-IO for PDL
 + This is the PDL interface to the Unidata NetCDF library.  It uses the
 + netCDF version 3 library to make a subset of netCDF functionality
 + available to PDL users in a clean, object-oriented interface.
 + .
 + Another NetCDF perl interface, which allows access to the entire range
 + of netCDF functionality (but in a non-object-oriented
 + style which uses perl arrays instead of PDLs) is available through Unidata at
 + http://www.unidata.ucar.edu/packages/netcdf/index.html.
 + .
 + The NetCDF standard allows N-dimensional binary data to be efficiently
 + stored, annotated and exchanged between many platforms.
 + .
 + When one creates a new netCDF object, this object is associated with one
 + netCDF file.
diff --cc debian/copyright
index 8bfcc0a,0000000..85080ad
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,15 -1,0 +1,16 @@@
 +This is the debian package for the PDL-NetCDF module.
 +It was created by Heiko Klein <heiko.klein at met.no>.
 +It was modified by Henning Glawe <glaweh at debian.org>
 +
 +It was downloaded from http://search.cpan.org/dist/PDL-NetCDF/
 +
 +Copyright (c) 1997-2009 Douglas Hunt. All rights reserved. This program
 +is free software; you can redistribute it and/or modify it under the same
 +terms as Perl itself.  See /usr/share/common-licenses/Artistic
 +
 +The upstream author is: Douglas Hunt (dhunt at ucar.edu).
 +
- The Debian packaging is (C) 2009, Heiko Klein <heiko.klein at met.no> and
- (C) 2009, Henning Glawe <glaweh at debian.org> and
- is licensed under the same terms as the software itself (see above).
++The Debian packaging is Copyright (C) 2009, Heiko Klein
++<heiko.klein at met.no> and (C) 2009, Henning Glawe <glaweh at debian.org>
++and is licensed under the same terms as the software itself (see
++above).
diff --cc debian/patches/perl-5.14-ccflags.patch
index 0000000,0000000..46881cf
new file mode 100644
--- /dev/null
+++ b/debian/patches/perl-5.14-ccflags.patch
@@@ -1,0 -1,0 +1,11 @@@
++--- a/Makefile.PL
+++++ b/Makefile.PL
++@@ -82,7 +82,7 @@
++ 	      'NAME'  	     => 'PDL::NetCDF',
++ 	      'AUTHOR'       => 'Douglas Hunt (dhunt at ucar.edu)',
++ 	      'PREREQ_PM'    => { PDL => 2.2 },
++-	      'CCFLAGS'      => "$define_bool -g",  
+++	      'CCFLAGS'      => "$define_bool $Config{ccflags}",  
++ 	      'VERSION_FROM' => 'netcdf.pd',
++ 	      'META_MERGE'   =>  {provides => {PDL::NetCDF => {file => 'netcdf.pd', version => 4.16}}},
++ 	      'TYPEMAPS'     => [&PDL_TYPEMAP()], 
diff --cc debian/patches/series
index 0000000,0000000..105ef68
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++perl-5.14-ccflags.patch
diff --cc debian/rules
index b61fcad,0000000..1adfa06
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,108 -1,0 +1,111 @@@
 +#!/usr/bin/make -f
 +# This debian/rules file is provided as a template for normal perl
 +# packages. It was created by Marc Brockschmidt <marc at dch-faq.de> for
 +# the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may
 +# be used freely wherever it is useful.
 +
 +# Uncomment this to turn on verbose mode.
 +#export DH_VERBOSE=1
 +
- include /usr/share/dpatch/dpatch.make
 +# If set to a true value then MakeMaker's prompt function will
 +# always return the default without waiting for user input.
 +export PERL_MM_USE_DEFAULT=1
 +
 +PACKAGE=$(shell dh_listpackages)
 +
 +ifndef PERL
 +PERL = /usr/bin/perl
 +endif
 +
 +TMP     =$(CURDIR)/debian/$(PACKAGE)
 +
- # Allow disabling build optimation by setting noopt in
- # $DEB_BUILD_OPTIONS
- CFLAGS = -Wall -g
 +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-         CFLAGS += -O0
++	export DEB_CFLAGS_MAINT_APPEND:=-Wall
 +else
-         CFLAGS += -O2
++	export DEB_CFLAGS_MAINT_APPEND:=-Wall -ffunction-sections
 +endif
 +
++export DEB_LDFLAGS_MAINT_APPEND:=-Wl,--as-needed
++
++DPKG_EXPORT_BUILDFLAGS = 1
++include /usr/share/dpkg/buildflags.mk
++
 +configure: configure-stamp
- configure-stamp: patch-stamp
++configure-stamp:
 +	dh_testdir
 +	# Add here commands to configure the package
- 	$(PERL) Makefile.PL INSTALLDIRS=vendor \
- 		INSTALLVENDORARCH=/usr/lib/perl5/ \
- 		VENDORARCHEXP=/usr/lib/perl5/
++	dh_auto_configure
 +
 +	touch configure-stamp
 +
++
++build-arch: build
++build-indep: build
++
 +build: build-stamp
 +build-stamp: configure
 +	dh_testdir
 +
 +	# As this is a architecture dependent package, we are not
 +	# supposed to install stuff to /usr/share. MakeMaker creates
 +	# the dirs, we prevent this by setting the INSTALLVENDORARCH
 +	# and VENDORARCHEXP environment variables.
 +
 +	# Add commands to compile the package here
- 	$(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
++	$(MAKE) LD_RUN_PATH=""
 +
 +	touch $@
 +
 +test: test-stamp
 +test-stamp: build-stamp
 +	dh_testdir
 +	-$(MAKE) TEST_VERBOSE=1 DISPLAY="" test
 +	touch test-stamp
 +
- clean: clean-patched unpatch
- clean-patched:
++clean:
 +	dh_testdir
 +	dh_testroot
 +
 +	dh_clean build-stamp configure-stamp install-stamp
 +
 +	# Add commands to clean up after the build process here
 +	[ ! -f Makefile ] || $(MAKE) realclean
 +
 +install: install-stamp
 +install-stamp: build-stamp test
 +	dh_testdir
 +	dh_testroot
- 	dh_clean -k
++	dh_prep
 +
 +	# Add commands to install the package into debian/$PACKAGE_NAME here
 +	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
 +
 +	touch $@
 +
 +# Build architecture-independent files here.
 +binary-indep: build install
 +# We have nothing to do here for an architecture-dependent package
 +
 +# Build architecture-dependent files here.
 +binary-arch: build install
 +	dh_testdir
 +	dh_testroot
 +	dh_installexamples 
 +	dh_installdocs README
 +	dh_installchangelogs Changes
 +	dh_shlibdeps
 +	dh_strip
 +	dh_perl
++	dh_pdl
 +	dh_compress
 +	dh_fixperms
 +	dh_installdeb
 +	dh_gencontrol
 +	dh_md5sums
 +	dh_builddeb
 +
 +source diff:
 +	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
 +
 +binary: binary-indep binary-arch
 +.PHONY: build clean binary-indep binary-arch binary install configure
diff --cc debian/source/format
index 0000000,0000000..163aaf8
new file mode 100644
--- /dev/null
+++ b/debian/source/format
@@@ -1,0 -1,0 +1,1 @@@
++3.0 (quilt)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libpdl-netcdf-perl.git



More information about the Pkg-perl-cvs-commits mailing list