[Pkg-mono-svn-commits] [libgdiplus] 02/04: Merge tag 'upstream/4.2'

[Jo Shields]

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

directhex pushed a commit to annotated tag debian/4.2-1
in repository libgdiplus.

commit 0f642d6fbdd8a65a254c6b0ab48f97e2fb087548
Merge: f6d52ef f55e3da
Author: Jo Shields <directhex at apebox.org>
Date:   Sun Dec 20 17:35:53 2015 +0000

    Merge tag 'upstream/4.2'
    
    Upstream version 4.2

 Makefile.in         |  47 ++++---
 aclocal.m4          | 122 +++++++++++++-----
 compile             |   2 +-
 config.guess        | 192 ++++-----------------------
 config.sub          |  30 +++--
 configure           |  33 ++---
 configure.ac        |   2 +-
 depcomp             |   2 +-
 install-sh          | 366 ++++++++++++++++++++++++----------------------------
 libgdiplus0.spec.in |   7 +-
 ltmain.sh           |   4 +-
 missing             |   2 +-
 src/Makefile.in     |  24 +++-
 src/gifcodec.c      |  86 +++++++++---
 src/graphics-path.c |   5 +-
 src/image.c         |  16 +--
 test-driver         |  15 ++-
 tests/Makefile.am   |   3 +-
 tests/Makefile.in   |  30 +++--
 19 files changed, 499 insertions(+), 489 deletions(-)

diff --cc Makefile.in
index 946be7a,d9768af..7b34ba6
--- a/Makefile.in
+++ b/Makefile.in
@@@ -645,13 -654,9 +654,13 @@@ dist-xz: distdi
  	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
  	$(am__post_remove_distdir)
  
 +dist-xz: distdir
 +	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 +	$(am__remove_distdir)
 +
  dist-tarZ: distdir
- 	@echo WARNING: "Support for shar distribution archives is" \
- 	               "deprecated." >&2
+ 	@echo WARNING: "Support for distribution archives compressed with" \
+ 		       "legacy program 'compress' is deprecated." >&2
  	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
  	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
  	$(am__post_remove_distdir)
diff --cc src/Makefile.in
index c9a51fa,ebde3fe..ad6e242
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@@ -817,8 -827,9 +827,10 @@@ uninstall-am: uninstall-libLTLIBRARIE
  	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
  	tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES
  
+ .PRECIOUS: Makefile
+ 
  
 +
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
diff --cc tests/Makefile.in
index f37e977,f60fd13..6e8e146
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -1035,8 -1047,9 +1047,10 @@@ uninstall-am
  	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
  	recheck tags tags-am uninstall uninstall-am
  
+ .PRECIOUS: Makefile
+ 
  
 +
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mono/packages/libgdiplus.git