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

sebastic pushed a commit to branch master
in repository h5utils.

commit 6a02f19941e40ff8704f70af0fe1305d8ad76492
Merge: a5764b9 a1be952
Author: Francesco Paolo Lovergine <fran...@debian.org>
Date:   Sun Apr 4 20:07:33 2010 +0200

    Imported Debian patch 1.12.1-1

 ChangeLog                  |   15 +
 Makefile.in                |    1 +
 NEWS                       |    5 +
 configure                  |   72 +-
 configure.ac               |   11 +-
 debian/changelog           |   11 +
 debian/control             |    4 +-
 debian/patches/octave.diff | 2413 --------------------------------------------
 debian/patches/series      |    2 +-
 debian/rules               |    2 +-
 10 files changed, 106 insertions(+), 2430 deletions(-)

diff --cc debian/changelog
index 75ba0fa,0000000..debc931
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,243 -1,0 +1,254 @@@
++h5utils (1.12.1-1) unstable; urgency=low
++
++  * New upstream release with better Octave autodetection.
++  * Dropped octave.diff patch.
++  * Ack of previous NMU with merge of moving to Octave 3.2 support.
++    (closes: #574020)
++  * Policy bumped to 3.8.4, no changes required.
++  * Fixed LFS support detection for HDF5 in debian/rules.
++
++ -- Francesco Paolo Lovergine <fran...@debian.org>  Sun, 04 Apr 2010 20:07:33 
+0200
++
 +h5utils (1.12-2) unstable; urgency=low
 +
 +  * Changed build-dep in libhdf4-dev instead of libhdf4g-dev.
 +    (closes: #540400)
 +  * Added a versioned build-dep on hdf5 >= 1.8.3 to force rebuilding
 +    with a current version of the library.
 +  * Now protects quilt pushing.
 +    (closes: #538549)
 +
 + -- Francesco Paolo Lovergine <fran...@debian.org>  Wed, 04 Nov 2009 22:04:55 
+0100
 +
 +h5utils (1.12-1) unstable; urgency=low
 +
 +  * New upstream release.
 +    (closes: #532934, #525176, #491579)
 +  * Added quilt build-dep to provide patches to upstream stuff.
 +  * Partially ack NMU 1.10-7.1 to fix obsolete octave dependency and depend
 +    on octave-config instead of running octave at building time. Autotools
 +    stuff is properly regenerated to updated in respect with the new 
 +    configure.ac. Resulting quilt patch is patches/octave.diff.
 +    (closes: #516453)
 +  * Added Homepage and Vcs-* fields in debian/control.
 +  * Policy bumped to 3.8.2.
 +  * [Lintian] debian-rules-ignores-make-clean-error fixed.
 +
 + -- Francesco Paolo Lovergine <fran...@debian.org>  Wed, 24 Jun 2009 15:25:38 
+0200
 +
 +h5utils (1.10-7) unstable; urgency=low
 +
 +  * New maintainership team. Added me as uploader.
 +    (closes: #393101)
 +  * Debhelper level set to 5.
 +
 + -- Francesco Paolo Lovergine <fran...@debian.org>  Fri, 25 May 2007 09:53:01 
+0200
 +
 +h5utils (1.10-6) unstable; urgency=low
 +
 +  * QA upload.
 +  * Fixed package description (Closes: #363631).
 +
 + -- Nico Golde <n...@debian.org>  Mon, 23 Apr 2007 21:28:51 +0200
 +
 +h5utils (1.10-5) unstable; urgency=low
 +
 +  * Orphan package.
 +
 + -- Josselin Mouette <j...@debian.org>  Sun, 15 Oct 2006 03:10:31 +0200
 +
 +h5utils (1.10-4) unstable; urgency=low
 +
 +  * Rebuild against HDF5 1.6.5.
 +    + Build-depend on this version at least.
 +
 + -- Josselin Mouette <j...@debian.org>  Sat,  4 Mar 2006 17:05:59 +0100
 +
 +h5utils (1.10-3) unstable; urgency=low
 +
 +  * Makefile.am:
 +    + Really build the plugin with -fPIC (closes: #338088).
 +    + Use mkoctfile's -s option.
 +  * Re-run aclocal and automake.
 +
 + -- Josselin Mouette <j...@debian.org>  Thu, 10 Nov 2005 21:46:22 +0100
 +
 +h5utils (1.10-2) unstable; urgency=low
 +
 +  * control:
 +    + Build-depend on octave2.1-headers.
 +    + Mention the octave plugin in the description.
 +  * rules:
 +    + Build the octave h5read plugin.
 +    + Use DESTDIR instead of hacking the prefix.
 +    + Clean h5read.oct.
 +  * Makefile.{am,in}: build the octave plugin with -fPIC.
 +  * compat: switch to compatibility level 4 for debhelper.
 +
 + -- Josselin Mouette <j...@debian.org>  Mon,  7 Nov 2005 21:44:20 +0100
 +
 +h5utils (1.10-1) unstable; urgency=low
 +
 +  * New upstream release (closes: #326402).
 +  * Standards-version is 3.6.2.
 +  * Configure with --with-hdf4.
 +
 + -- Josselin Mouette <j...@debian.org>  Sat,  3 Sep 2005 16:55:40 +0200
 +
 +h5utils (1.9.1-3) unstable; urgency=low
 +
 +  * Rebuild against HDF5 1.6.4-0c2.
 +
 + -- Josselin Mouette <j...@debian.org>  Wed, 31 Aug 2005 16:29:01 +0200
 +
 +h5utils (1.9.1-2) unstable; urgency=low
 +
 +  * Rebuild against HDF5 1.6.4.
 +    + Build-depend on version 1.6.4 at least.
 +  * Build-depend on libpng-dev instead of libpng12-dev.
 +
 + -- Josselin Mouette <j...@debian.org>  Sun,  5 Jun 2005 17:44:56 +0200
 +
 +h5utils (1.9.1-1) unstable; urgency=low
 +
 +  * New upstream release (closes: #259095).
 +  * control: build-depend on libmatheval1-dev.
 +
 + -- Josselin Mouette <j...@debian.org>  Fri, 22 Oct 2004 11:40:55 +0200
 +
 +h5utils (1.8-1) unstable; urgency=low
 +
 +  * New upstream release (closes: #250400).
 +
 + -- Josselin Mouette <j...@debian.org>  Mon, 24 May 2004 13:44:43 +0200
 +
 +h5utils (1.7.2-9) unstable; urgency=low
 +
 +  * Rebuild against hdf5 1.6.2.
 +
 + -- Josselin Mouette <j...@debian.org>  Mon, 22 Mar 2004 18:04:56 +0100
 +
 +h5utils (1.7.2-8) unstable; urgency=low
 +
 +  * Rebuild against hdf5 1.6.1.
 +  * Standards-version is 3.6.1, no changes.
 +
 + -- Josselin Mouette <j...@debian.org>  Tue, 28 Oct 2003 16:47:43 +0100
 +
 +h5utils (1.7.2-7) unstable; urgency=low
 +
 +  * Rebuild against new hdf5 packages.
 +
 + -- Josselin Mouette <j...@debian.org>  Mon, 21 Jul 2003 23:56:14 +0200
 +
 +h5utils (1.7.2-6) unstable; urgency=low
 +
 +  * Rebuild against HDF5 1.6.0.
 +  * Standards-version is 3.6.0.
 +  * Update libpng stuff.
 +
 + -- Josselin Mouette <j...@debian.org>  Wed, 16 Jul 2003 00:37:01 +0200
 +
 +h5utils (1.7.2-5) unstable; urgency=low
 +
 +  * Rebuild against HDF5 1.4.5.
 +  * Don't build h5read.oct anymore, as octave 2.1 now natively reads
 +    HDF5 slices.
 +  * Cleanup rules file a bit.
 +
 + -- Josselin Mouette <j...@debian.org>  Mon, 10 Mar 2003 17:57:27 +0100
 +
 +h5utils (1.7.2-4) unstable; urgency=low
 +
 +  * Build h5fromh4 (build-depend on libhdf4g-dev).
 +  * Enable LFS when HDF5 is built with LFS support.
 +
 + -- Josselin Mouette <j...@debian.org>  Thu, 10 Oct 2002 21:09:18 +0200
 +
 +h5utils (1.7.2-3) unstable; urgency=low
 +
 +  * Build-depend on g++-3.0 on ia64 (which is a workaround for a bug in
 +    mkoctfile), to solve the build regression.
 +  * debian/rules: should now follow 3.5.7 standards-version.
 +
 + -- Josselin Mouette <j...@debian.org>  Wed,  2 Oct 2002 18:35:23 +0200
 +
 +h5utils (1.7.2-2) unstable; urgency=high
 +
 +  * Rebuild against HDF5 1.4.4, with a build-time dependency.
 +  * Add upstream URL in package description.
 +  * Remove debian/shlibs.local.
 +
 + -- Josselin Mouette <j...@debian.org>  Fri, 27 Sep 2002 12:17:48 +0200
 +
 +h5utils (1.7.2-1) unstable; urgency=low
 +
 +  * New upstream release (1.7.1-7 patch went upstream).
 +  * Makefile.in: build h5read.oct with -fPIC (closes: #152987).
 +
 + -- Josselin Mouette <j...@debian.org>  Tue, 16 Jul 2002 14:58:26 +0200
 +
 +h5utils (1.7.1-7) unstable; urgency=low
 +
 +  * h5read.cc: corrected string typo for G++ 3.0 (closes: #152987).
 +  * debian/copyright: detail typo.
 +
 + -- Josselin Mouette <j...@debian.org>  Mon, 15 Jul 2002 10:41:19 +0200
 +
 +h5utils (1.7.1-6) unstable; urgency=low
 +
 +  * debian/rules: added upstream changelog to documentation.
 +
 + -- Josselin Mouette <j...@debian.org>  Wed, 19 Jun 2002 12:14:56 +0200
 +
 +h5utils (1.7.1-5) unstable; urgency=low
 +
 +  * Makefile.in: clean for h5topng.1
 +  * debian/control: changed short description (closes: #148440).
 +
 + -- Josselin Mouette <j...@debian.org>  Wed, 19 Jun 2002 11:29:05 +0200
 +
 +h5utils (1.7.1-4) unstable; urgency=low
 +
 +  * debian/rules: changed command line to get octave architecture.
 +
 + -- Josselin Mouette <j...@debian.org>  Sat, 25 May 2002 01:50:27 +0200
 +
 +h5utils (1.7.1-3) unstable; urgency=low
 +
 +  * Makefile.in: added -s option to mkoctfile.
 +  * debian/rules: stripping h5read.oct.
 +
 + -- Josselin Mouette <j...@debian.org>  Thu, 25 Apr 2002 13:09:29 +0200
 +
 +h5utils (1.7.1-2) unstable; urgency=low
 +
 +  * debian/control: changed maintainer email.
 +  * First upload to Debian (closes: #143269).
 +
 + -- Josselin Mouette <j...@debian.org>  Wed, 17 Apr 2002 11:06:23 +0200
 +
 +h5utils (1.7.1-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Josselin Mouette <josselin.moue...@ens-lyon.org>  Sun, 17 Mar 2002 
03:09:19 +0100
 +
 +h5utils (1.7-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Josselin Mouette <josselin.moue...@ens-lyon.org>  Tue, 12 Mar 2002 
17:12:46 +0100
 +
 +h5utils (1.6-1) unstable; urgency=low
 +
 +  * Initial Release.
 +  * Suppressed h5tov5d (requires too big software),
 +    h5read (obsoleted by octave-2.1) and h5fromh4
 +    (obsoleted by libhdf5).
 +
 + -- Josselin Mouette <josselin.moue...@ens-lyon.org>  Tue, 23 Oct 2001 
11:47:53 +0200
 +
 +Local variables:
 +mode: debian-changelog
 +End:
diff --cc debian/control
index 294c917,0000000..4d9afed
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,30 -1,0 +1,30 @@@
 +Source: h5utils
 +Section: science
 +Priority: optional
 +Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
 +Uploaders: Francesco Paolo Lovergine <fran...@debian.org>
 +Build-Depends: debhelper (>= 7), libhdf5-serial-dev (>= 1.8.3), libz-dev, 
libpng-dev, hdf5-tools, 
-  libhdf4-dev, libmatheval1-dev, octave3.0-headers, quilt
- Standards-Version: 3.8.2
++ libhdf4-dev, libmatheval1-dev, octave3.2-headers, quilt
++Standards-Version: 3.8.4
 +Homepage: http://ab-initio.mit.edu/h5utils/
 +Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/h5utils/trunk/
 +Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/h5utils/trunk
 +
 +Package: h5utils
 +Architecture: any
 +Depends: ${shlibs:Depends}
 +Recommends: hdf5-tools
 +Description: HDF5 files visualization tools
 + HDF5 (Hierarchical Data Format 5) is a file format for storing
 + scientific data. These tools allow to convert other formats to
 + HDF5 and to visualize HDF5 files. They include:
 +  - h5topng, which extracts a 2d slice of an HDF5 file and
 +    outputs a corresponding image in PNG format;
 +  - h5totxt, which extracts 2d slices and outputs comma-delimited
 +    text (suitable for import into a spreadsheet);
 +  - h5fromtxt, which converts simple text input into
 +    multi-dimensional numeric HDF5 datasets;
 +  - h5fromh4, which converts HDF4 data to HDF5;
 +  - h5tovtk, which converts HDF5 files to VTK files for
 +    visualization with VTK-aware programs;
 +  - h5read, a plugin for the Octave numerical language.
diff --cc debian/patches/series
index 78f4caa,0000000..9cb90eb
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,1 @@@
- octave.diff -p1
++# no patch
diff --cc debian/rules
index f9e332b,0000000..97a8b79
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,85 -1,0 +1,85 @@@
 +#!/usr/bin/make -f
 +# Sample debian/rules that uses debhelper.
 +# GNU copyright 1997 to 1999 by Joey Hess.
 +
 +# Uncomment this to turn on verbose mode.
 +#export DH_VERBOSE=1
 +
 +# These are used for cross-compiling and for saving the configure script
 +# from having to guess our platform (since we know it already)
 +DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 +DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 +
 +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 +        CFLAGS += -g
 +endif
 +
 +# LFS support
- ifeq ($(shell grep '^[[:space:]]*Linux Large File Support (LFS)' 
/usr/lib/libhdf5.settings | sed 's/^[[:space:]]*Linux Large File Support 
(LFS):[[:space:]]*//'),Enabled)
++ifeq ($(shell grep '^[[:space:]]*Linux Large File Support (LFS)' 
/usr/lib/libhdf5.settings | sed 's/^[[:space:]]*Linux Large File Support 
(LFS):[[:space:]]*//'),yes)
 + CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 
-D_POSIX_SOURCE -D_BSD_SOURCE
 + export CPPFLAGS
 +endif
 +
 +patch: patch-stamp
 +patch-stamp:
 +      QUILT_PATCHES=debian/patches quilt push --color=auto -a || [ $$? = 2 ]
 +      touch $@
 +
 +unpatch:
 +      QUILT_PATCHES=debian/patches quilt pop -a || true
 +      rm -rf .pc patch-stamp
 +
 +configure: patch config.status
 +config.status:
 +      dh_testdir
 +      ./configure --prefix=/usr --mandir=\$${prefix}/share/man \
 +              --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 +              --with-octave --with-hdf4
 +
 +build: configure build-stamp
 +build-stamp: 
 +      dh_testdir
 +      $(MAKE)
 +      touch $@
 +
 +clean: unpatch
 +      dh_testdir
 +      dh_testroot
 +      
 +      [ ! -f Makefile ] || $(MAKE) distclean
 +      
 +      dh_clean h5read.oct
 +
 +install: build
 +      dh_testdir
 +      dh_testroot
 +      dh_prep
 +      dh_installdirs
 +
 +      $(MAKE) install DESTDIR=$(CURDIR)/debian/h5utils
 +
 +# Build architecture-independent files here.
 +binary-indep: build install
 +# We have nothing to do by default.
 +
 +# Build architecture-dependent files here.
 +binary-arch: build install
 +      dh_testdir
 +      dh_testroot
 +      dh_installdocs
 +      dh_installexamples
 +      dh_installmenu
 +      dh_installman
 +      dh_installchangelogs ChangeLog
 +      dh_link
 +      dh_strip
 +      dh_compress
 +      dh_fixperms
 +      dh_installdeb
 +      dh_shlibdeps
 +      dh_gencontrol
 +      dh_md5sums
 +      dh_builddeb
 +
 +binary: binary-indep binary-arch
 +.PHONY: build clean binary-indep binary-arch binary install unpatch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/h5utils.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

Reply via email to