[metview] 57/97: metview_4.4.8+dfsg.1-8.debian.tar.xz
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Sep 1 09:18:48 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository metview.
commit 87ac9e5a114c07f11e1cabf33c5bc4893a35eaf6
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sat May 2 13:27:51 2015 +0100
metview_4.4.8+dfsg.1-8.debian.tar.xz
---
debian/changelog | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++
debian/control | 14 ++++++-----
debian/patches/series | 4 +++
debian/rules | 27 ++++++++++++---------
4 files changed, 94 insertions(+), 18 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 45bc778..df65d96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,70 @@
+metview (4.4.8+dfsg.1-8) unstable; urgency=medium
+
+ * Add Build-conflicts on openjpeg-dev. Closes: #767746.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 03 Nov 2014 11:58:27 +0000
+
+metview (4.4.8+dfsg.1-7) unstable; urgency=medium
+
+ * Depend on libmagics++-dev >= 2.22.7.dfsg.1-3 to get header files
+ which went missing. Closes: 765130.
+ * Remove scm dependencies on arm64, ppc64 archs for which it is
+ not currently available.
+ * Patch socklen-fix to fix missing type conversion on alphas.
+ * Standards-Version: 3.9.6, no changes required.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sat, 18 Oct 2014 15:32:06 +0100
+
+metview (4.4.8+dfsg.1-6) unstable; urgency=medium
+
+ * Fix for FTBFS on kFreeBSD systems (sys_errlist).
+ * Acknowledge closed bug: Closes: #760520.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 10 Sep 2014 18:43:48 +0100
+
+metview (4.4.8+dfsg.1-5) unstable; urgency=medium
+
+ * Don't delete ConfigDef in clean target;
+ * make find . also conditional on arch-only buildds.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 10 Sep 2014 15:33:20 +0100
+
+metview (4.4.8+dfsg.1-4) unstable; urgency=medium
+
+ * Make chown in debian/rules conditional so it won't break on
+ arch-only buildd's.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 10 Sep 2014 12:12:06 +0100
+
+metview (4.4.8+dfsg.1-3) unstable; urgency=medium
+
+ * Add patch to convert color in GRIB.xpm that 'convert' now complains
+ is undefined.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 08 Sep 2014 20:38:01 +0100
+
+metview (4.4.8+dfsg.1-2) unstable; urgency=medium
+
+ * Set $HOME in debian/rules to tmp directory; scripts run during install
+ fail under sbuild if its not set.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 04 Sep 2014 15:01:34 +0100
+
+metview (4.4.8+dfsg.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Also need libqtwebkit-dev, libxmu-dev Closes: #760028.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 01 Sep 2014 09:09:29 +0100
+
+metview (4.4.7+dfsg.1-2) unstable; urgency=medium
+
+ * Add libtqt4-dev to Build-Depends to configure qmake correctly.
+ Closes: #760028.
+ * no-m32.patch for configure.ac: don't compile everything !amd64 as '-m32'.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 31 Aug 2014 12:54:05 +0100
+
metview (4.4.7+dfsg.1-1) unstable; urgency=low
* Initial release. (Closes: #693834)
diff --git a/debian/control b/debian/control
index 090c431..5580bfb 100644
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,16 @@ Section: science
Priority: optional
Maintainer: Alastair McKinstry <mckinstry at debian.org>
Build-Depends: debhelper (>= 9), gfortran,
- qt4-dev-tools, libgrib-api-dev, libemos-dev,
- libmagics++-metview-dev, libmagics++-dev, scm,
- libmotif-dev, libgdbm-dev, libcurl4-gnutls-dev,
+ qt4-dev-tools, libqt4-dev, libqtwebkit-dev,
+ libgrib-api-dev, libemos-dev, libboost1.55-dev,
+ libmagics++-metview-dev, libmagics++-dev (>= 2.22.7.dfsg.1-3),
+ libmotif-dev, libxmu-dev, libgdbm-dev, libcurl4-gnutls-dev,
libcairo2-dev, pkg-config, swig, libexpat1-dev,
libterralib-dev, dh-autoreconf, ksh, libproj-dev,
- libgd-dev, imagemagick, libjasper-dev, libnetcdf-dev
-Build-Conflicts: lesstif2-dev
-Standards-Version: 3.9.5
+ libgd-dev, imagemagick, libjasper-dev, libnetcdf-dev,
+ scm [!arm64 !ppc64]
+Build-Conflicts: lesstif2-dev, libopenjpeg-dev
+Standards-Version: 3.9.6
Homepage: https://software.ecmwf.int/wiki/display/METV/Home
Package: metview
diff --git a/debian/patches/series b/debian/patches/series
index 561cbe9..631cd23 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,6 @@
+syserrlist.patch
fix-paths.patch
fix-scripts.patch
+no-m32.patch
+fix-colors.patch
+socklen-fix.patch
diff --git a/debian/rules b/debian/rules
index 6ddb5df..4db9e77 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,18 +3,18 @@
# Uncomment this to turn on verbose mode.
export DH_VERBOSE=1
-#DEB_BUILD_MAINT_OPTIONS:= hardening=+all,-format
-#DEB_CFLAGS_MAINT_APPEND:= -Wall -pedantic -fPIC
-#export DEB_BUILD_MAINT_OPTIONS
-#export DEB_CFLAGS_MAINT_APPEND
+DEB_BUILD_MAINT_OPTIONS:= hardening=+all,-format
+DEB_CFLAGS_MAINT_APPEND:= -Wall -pedantic -fPIC
+export DEB_BUILD_MAINT_OPTIONS
+export DEB_CFLAGS_MAINT_APPEND
-DESTDIR:=`pwd`/debian/tmp/
+DESTDIR:=$(CURDIR)/debian/tmp/
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
-TOP:=$(shell pwd)
-export METVIEW_DIR_DEV=$(TOP)
-
-MV_COMP:=$(TOP)/debian/tmp/usr/bin/Metview/mv_compress
+export METVIEW_DIR_DEV=$(CURDIR)
+PATH:=$(PATH):$(CURDIR)/scripts
+HOME:=$(CURDIR)/debian/tmp
+MV_COMP:=$(CURDIR)/debian/tmp/usr/bin/Metview/mv_compress
# magic debhelper rule
%:
@@ -25,7 +25,7 @@ override_dh_auto_clean:
dh_clean
rm -f share/metview/icons/make.dep config/CONFIG.site \
share/metview/app-defaults/MvVersionDetails \
- share/metview/etc/ConfigDef include/macro_api.h etc/ConfigDef
+ include/macro_api.h etc/ConfigDef
find . -type l -delete
find . -name '*.db' -delete
@@ -39,6 +39,7 @@ override_dh_auto_configure:
LIBS=" -lterralib -lm" CPPFLAGS=" -I/usr/include/terralib/kernel " \
CXXFLAGS=" -fPIC " CFLAGS=" -fPIC"
cp debian/CONFIG.site config/CONFIG.site
+ chmod +x ./scripts/*.mv
override_dh_auto_test:
@echo "Checks disabled for the moment due to syntax errors in tests"
@@ -54,7 +55,6 @@ override_dh_auto_install:
override_dh_fixperms:
dh_fixperms
rm -rf debian/metview-data/usr/share/applications
- chmod -R -x debian/metview-data/usr/share/metview/*
chmod +x debian/metview/usr/lib/metview/mv_compress
chmod -x debian/metview/usr/lib/metview/*.magml
chmod -x debian/metview/usr/lib/metview/metview_*.common
@@ -62,4 +62,7 @@ override_dh_fixperms:
chmod -x debian/metview/usr/lib/metview/metview_patches
chmod -x debian/metview/usr/lib/metview/*txt
chmod -x debian/metview/usr/lib/metview/*.xml
- find debian/metview-data/usr/share/metview -type d -exec chmod 755 {} \;
+ # This directory won't exist on arch-only builds, so ...
+ [ ! -d debian/metview-data/usr/share/metview ] || ( \
+ chmod -R -x debian/metview-data/usr/share/metview/* ; \
+ find debian/metview-data/usr/share/metview -type d -exec chmod 755 {} \; )
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/metview.git
More information about the debian-science-commits
mailing list