From e1ea72a5fb1a90c7cfdd01956cab720ff42d9d0b Mon Sep 17 00:00:00 2001 From: Marcelo Roberto Jimenez Date: Sun, 21 Mar 2010 16:13:59 +0000 Subject: [PATCH] Backport of svn revision 510: SF Patch Tracker [ 2964973 ] install: will not overwrite just-created ...blah... with... Submitted: Nick Leverton ( leveret ) - 2010-03-07 05:18 Full error: /usr/bin/install: will not overwrite just-created `/tmp/buildd/libupnp-1.6.6/debian/tmp/usr/share/doc/libupnp3-dev/examples/s ample_util.c' with `common/sample_util.c' This seems to be from Automake 1.11 which doesn't like having duplicate files in a Makefile.am. Patch attached, kindly provided by Stefan Potyra for Debian (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=543068) This fix will be needed for both 1.6.x and 1.8.x branches. git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/branches/branch-1.6.x@511 119443c7-1b9e-41f8-b6fc-b9c35fce742c --- ChangeLog | 18 +++++++++++++++++- upnp/sample/Makefile.am | 5 +++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 47774b9..6a5d327 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,23 @@ Version 1.6.7 ******************************************************************************* -2010-03-20 Marcelo Jimenez +2010-03-21 Marcelo Jimenez + * SF Patch Tracker [ 2964973 ] install: will not overwrite just-created + ...blah... with... + Submitted: Nick Leverton ( leveret ) - 2010-03-07 05:18 + + Full error: + /usr/bin/install: will not overwrite just-created + `/tmp/buildd/libupnp-1.6.6/debian/tmp/usr/share/doc/libupnp3-dev/examples/s + ample_util.c' with `common/sample_util.c' + + This seems to be from Automake 1.11 which doesn't like having duplicate + files in a Makefile.am. Patch attached, kindly provided by Stefan Potyra + for Debian (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=543068) + + This fix will be needed for both 1.6.x and 1.8.x branches. + +2010-03-21 Marcelo Jimenez * Backport of svn revision 504: SF Patch Tracker [ 2969188 ] 1.8.0: patch for FreeBSD compilation Submitted By: Nick Leverton (leveret) diff --git a/upnp/sample/Makefile.am b/upnp/sample/Makefile.am index 2a7b0b8..db8063e 100644 --- a/upnp/sample/Makefile.am +++ b/upnp/sample/Makefile.am @@ -69,8 +69,9 @@ upnp_tv_combo_SOURCES = \ if WITH_DOCUMENTATION examplesdir = $(docdir)/examples examples_DATA = \ - $(upnp_tv_ctrlpt_SOURCES) \ - $(upnp_tv_device_SOURCES) + $(sort \ + $(upnp_tv_ctrlpt_SOURCES) \ + $(upnp_tv_device_SOURCES)) endif