[hdf4] 08/10: Drop install-examples.diff, no longer required.
Bas Couwenberg
sebastic at debian.org
Thu Jun 30 23:23:23 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository hdf4.
commit f4e3115c8a759a73981b3d46adc0b1b6fc3363d3
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Jun 30 21:32:16 2016 +0200
Drop install-examples.diff, no longer required.
---
debian/changelog | 1 +
debian/patches/install-examples.diff | 233 -----------------------------------
debian/patches/series | 1 -
3 files changed, 1 insertion(+), 234 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4517789..d5d023e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ libhdf4 (4.2.12-1) UNRELEASED; urgency=medium
* Drop unused ARCHIVE variable from rules file.
* Drop obsolete README.source.
* Refresh patches.
+ * Drop install-examples.diff, no longer required.
-- Bas Couwenberg <sebastic at debian.org> Thu, 30 Jun 2016 19:38:29 +0200
diff --git a/debian/patches/install-examples.diff b/debian/patches/install-examples.diff
deleted file mode 100644
index 5259583..0000000
--- a/debian/patches/install-examples.diff
+++ /dev/null
@@ -1,233 +0,0 @@
-Description: Fix examples installation.
-Author: Matthias Klose <doko at ubuntu.com>
-
---- a/config/examples.am
-+++ b/config/examples.am
-@@ -44,7 +44,7 @@ CHECK_CLEANFILES+= *.hdf
- CLEANFILES=$(EXAMPLE_PROG)
-
- # How to create EXAMPLEDIR if it doesn't already exist
--$(EXAMPLEDIR):
-+$(DESTDIR)$(EXAMPLEDIR):
- mkdir -p $@
-
- # Install and uninstall rules. We install the source files, not the
-@@ -54,27 +54,27 @@ install-data-local:
- uninstall-local:
- @$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
-
--install-examples: $(EXAMPLEDIR)
-+install-examples: $(DESTDIR)$(EXAMPLEDIR)
- @for f in X $(INSTALL_FILES); do \
- if test $$f != X; then \
-- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1); \
-- chmod a-x $(EXAMPLEDIR)/$$f; \
-+ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLEDIR)/. || exit 1); \
-+ chmod a-x $(DESTDIR)$(EXAMPLEDIR)/$$f; \
- fi; \
- done
- @for f in X $(INSTALL_SCRIPT_FILES); do \
- if test $$f != X; then \
-- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1); \
-+ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLEDIR)/. || exit 1); \
- fi; \
- done
- @for f in X $(INSTALL_TOP_FILES); do \
- if test $$f != X; then \
-- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-- chmod a-x $(EXAMPLETOPDIR)/$$f; \
-+ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLETOPDIR)/. || exit 1); \
-+ chmod a-x $(DESTDIR)$(EXAMPLETOPDIR)/$$f; \
- fi; \
- done
- @for f in X $(INSTALL_TOP_SCRIPT_FILES); do \
- if test $$f != X; then \
-- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-+ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLETOPDIR)/. || exit 1); \
- fi; \
- done
-
---- a/hdf/examples/Makefile.in
-+++ b/hdf/examples/Makefile.in
-@@ -1182,7 +1182,7 @@ AN_get_annotation_info: $(srcdir)/AN_get
- AN_read_annotation: $(srcdir)/AN_read_annotation.c
-
- # How to create EXAMPLEDIR if it doesn't already exist
--$(EXAMPLEDIR):
-+$(DESTDIR)$(EXAMPLEDIR):
- mkdir -p $@
-
- # Install and uninstall rules. We install the source files, not the
-@@ -1192,27 +1192,27 @@ install-data-local:
- uninstall-local:
- @$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
-
--install-examples: $(EXAMPLEDIR)
-+install-examples: $(DESTDIR)$(EXAMPLEDIR)
- @for f in X $(INSTALL_FILES); do \
- if test $$f != X; then \
-- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1); \
-- chmod a-x $(EXAMPLEDIR)/$$f; \
-+ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLEDIR)/. || exit 1); \
-+ chmod a-x $(DESTDIR)$(EXAMPLEDIR)/$$f; \
- fi; \
- done
- @for f in X $(INSTALL_SCRIPT_FILES); do \
- if test $$f != X; then \
-- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1); \
-+ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLEDIR)/. || exit 1); \
- fi; \
- done
- @for f in X $(INSTALL_TOP_FILES); do \
- if test $$f != X; then \
-- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-- chmod a-x $(EXAMPLETOPDIR)/$$f; \
-+ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLETOPDIR)/. || exit 1); \
-+ chmod a-x $(DESTDIR)$(EXAMPLETOPDIR)/$$f; \
- fi; \
- done
- @for f in X $(INSTALL_TOP_SCRIPT_FILES); do \
- if test $$f != X; then \
-- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-+ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLETOPDIR)/. || exit 1); \
- fi; \
- done
-
---- a/hdf/fortran/examples/Makefile.in
-+++ b/hdf/fortran/examples/Makefile.in
-@@ -1139,7 +1139,7 @@ AN_get_annotation_info: $(srcdir)/AN_get
- AN_read_annotation: $(srcdir)/AN_read_annotation.f
-
- # How to create EXAMPLEDIR if it doesn't already exist
--$(EXAMPLEDIR):
-+$(DESTDIR)$(EXAMPLEDIR):
- mkdir -p $@
-
- # Install and uninstall rules. We install the source files, not the
-@@ -1149,27 +1149,27 @@ install-data-local:
- uninstall-local:
- @$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
-
--install-examples: $(EXAMPLEDIR)
-+install-examples: $(DESTDIR)$(EXAMPLEDIR)
- @for f in X $(INSTALL_FILES); do \
- if test $$f != X; then \
-- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1); \
-- chmod a-x $(EXAMPLEDIR)/$$f; \
-+ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLEDIR)/. || exit 1); \
-+ chmod a-x $(DESTDIR)$(EXAMPLEDIR)/$$f; \
- fi; \
- done
- @for f in X $(INSTALL_SCRIPT_FILES); do \
- if test $$f != X; then \
-- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1); \
-+ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLEDIR)/. || exit 1); \
- fi; \
- done
- @for f in X $(INSTALL_TOP_FILES); do \
- if test $$f != X; then \
-- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-- chmod a-x $(EXAMPLETOPDIR)/$$f; \
-+ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLETOPDIR)/. || exit 1); \
-+ chmod a-x $(DESTDIR)$(EXAMPLETOPDIR)/$$f; \
- fi; \
- done
- @for f in X $(INSTALL_TOP_SCRIPT_FILES); do \
- if test $$f != X; then \
-- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-+ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLETOPDIR)/. || exit 1); \
- fi; \
- done
-
---- a/mfhdf/examples/Makefile.in
-+++ b/mfhdf/examples/Makefile.in
-@@ -1055,7 +1055,7 @@ get_attr: $(srcdir)/SD_get_attr.c
- chunking_example: $(srcdir)/SD_chunking_example.c
-
- # How to create EXAMPLEDIR if it doesn't already exist
--$(EXAMPLEDIR):
-+$(DESTDIR)$(EXAMPLEDIR):
- mkdir -p $@
-
- # Install and uninstall rules. We install the source files, not the
-@@ -1065,27 +1065,27 @@ install-data-local:
- uninstall-local:
- @$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
-
--install-examples: $(EXAMPLEDIR)
-+install-examples: $(DESTDIR)$(EXAMPLEDIR)
- @for f in X $(INSTALL_FILES); do \
- if test $$f != X; then \
-- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1); \
-- chmod a-x $(EXAMPLEDIR)/$$f; \
-+ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLEDIR)/. || exit 1); \
-+ chmod a-x $(DESTDIR)$(EXAMPLEDIR)/$$f; \
- fi; \
- done
- @for f in X $(INSTALL_SCRIPT_FILES); do \
- if test $$f != X; then \
-- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1); \
-+ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLEDIR)/. || exit 1); \
- fi; \
- done
- @for f in X $(INSTALL_TOP_FILES); do \
- if test $$f != X; then \
-- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-- chmod a-x $(EXAMPLETOPDIR)/$$f; \
-+ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLETOPDIR)/. || exit 1); \
-+ chmod a-x $(DESTDIR)$(EXAMPLETOPDIR)/$$f; \
- fi; \
- done
- @for f in X $(INSTALL_TOP_SCRIPT_FILES); do \
- if test $$f != X; then \
-- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-+ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLETOPDIR)/. || exit 1); \
- fi; \
- done
-
---- a/mfhdf/fortran/examples/Makefile.in
-+++ b/mfhdf/fortran/examples/Makefile.in
-@@ -1056,7 +1056,7 @@ SD_compress_sds: $(srcdir)/SD_compress_s
- SD_chunking_example: $(srcdir)/SD_chunking_example.f
-
- # How to create EXAMPLEDIR if it doesn't already exist
--$(EXAMPLEDIR):
-+$(DESTDIR)$(EXAMPLEDIR):
- mkdir -p $@
-
- # Install and uninstall rules. We install the source files, not the
-@@ -1066,27 +1066,27 @@ install-data-local:
- uninstall-local:
- @$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
-
--install-examples: $(EXAMPLEDIR)
-+install-examples: $(DESTDIR)$(EXAMPLEDIR)
- @for f in X $(INSTALL_FILES); do \
- if test $$f != X; then \
-- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1); \
-- chmod a-x $(EXAMPLEDIR)/$$f; \
-+ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLEDIR)/. || exit 1); \
-+ chmod a-x $(DESTDIR)$(EXAMPLEDIR)/$$f; \
- fi; \
- done
- @for f in X $(INSTALL_SCRIPT_FILES); do \
- if test $$f != X; then \
-- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1); \
-+ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLEDIR)/. || exit 1); \
- fi; \
- done
- @for f in X $(INSTALL_TOP_FILES); do \
- if test $$f != X; then \
-- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-- chmod a-x $(EXAMPLETOPDIR)/$$f; \
-+ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLETOPDIR)/. || exit 1); \
-+ chmod a-x $(DESTDIR)$(EXAMPLETOPDIR)/$$f; \
- fi; \
- done
- @for f in X $(INSTALL_TOP_SCRIPT_FILES); do \
- if test $$f != X; then \
-- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-+ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLETOPDIR)/. || exit 1); \
- fi; \
- done
-
diff --git a/debian/patches/series b/debian/patches/series
index 0f31cc5..5ab34ee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,6 @@ hdfi.h
kfreebsd
ppc64el.diff
hdf-4.2.10-aarch64.patch
-install-examples.diff
missing-includes.diff
ppc64el.patch
enablesharedfortran.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/hdf4.git
More information about the Pkg-grass-devel
mailing list