[ncview] 01/02: Merge tag 'debian/2.1.6+ds-1' into jessie-backports
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Nov 6 19:36:39 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch jessie-backports
in repository ncview.
commit d303adc23ec9912947e0c95a787095c2aa611f99
Merge: df1d750 cab417e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Nov 6 20:29:22 2015 +0100
Merge tag 'debian/2.1.6+ds-1' into jessie-backports
Conflicts:
debian/changelog
debian/control
debian/changelog | 20 ++++++++++++++++++++
debian/control | 2 +-
debian/patches/netcdf-cc.patch | 35 +++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/watch | 4 ++--
src/calcalcs.c | 12 ++++++++----
src/calcalcs.h | 4 ++--
src/file_netcdf.c | 19 ++++++++++++++++---
src/ncview.c | 5 +++++
src/ncview.defines.h | 5 +++--
src/udu.c | 5 +++++
src/utCalendar2_cal.c | 36 ++++++++++++++++++++++++++++--------
src/view.c | 4 ++++
13 files changed, 130 insertions(+), 22 deletions(-)
diff --cc debian/changelog
index 8c448f6,cf393fb..592c5c3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,23 +1,30 @@@
+ ncview (2.1.6+ds-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 31 Oct 2015 10:26:50 +0100
+
+ ncview (2.1.5+ds1-3) unstable; urgency=medium
+
+ * Update Vcs-Browser URL to use HTTPS.
+ * Rebuild for netcdf transition.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 24 Aug 2015 15:39:20 +0200
+
+ ncview (2.1.5+ds1-2) unstable; urgency=medium
+
+ * Add patch to disable NetCDF compiler check.
+ (closes: #793902)
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 31 Jul 2015 21:51:43 +0200
+
+ncview (2.1.5+ds1-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+ * Update branch in gbp.conf and Vcs-Git URL.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 05 May 2015 15:48:57 +0200
+
ncview (2.1.5+ds1-1) unstable; urgency=medium
* Move from experimental to unstable.
diff --cc debian/control
index a8a8229,48f2ddc..589b148
--- a/debian/control
+++ b/debian/control
@@@ -17,8 -17,8 +17,8 @@@ Build-Depends: debhelper (>= 9)
libudunits2-dev,
libxaw7-dev
Standards-Version: 3.9.6
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/ncview.git
+ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/ncview.git
-Vcs-Git: git://anonscm.debian.org/pkg-grass/ncview.git
+Vcs-Git: git://anonscm.debian.org/pkg-grass/ncview.git -b jessie-backports
Homepage: http://meteora.ucsd.edu/~pierce/ncview_home_page.html
Package: ncview
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/ncview.git
More information about the Pkg-grass-devel
mailing list