diffstat for gnumeric-1.10.17 gnumeric-1.10.17

 changelog                                  |    8 
 patches/refresh-config-sub-guess-1.10.17-1 | 1167 -----------------------------
 patches/series                             |    1
 rules                                      |   14 4 files changed, 11 
insertions(+), 1179 deletions(-)

The refresh-config-sub-guess-1.10.17-1 patch is unnecessary,
implementing Paul's patch and adding the base of the original clean
target into the build target solves the issues with config.sub and
config.guess properly.

diff -Nru gnumeric-1.10.17/debian/rules gnumeric-1.10.17/debian/rules
--- gnumeric-1.10.17/debian/rules       2011-06-18 12:43:08.000000000
+0100 +++ gnumeric-1.10.17/debian/rules       2012-05-12
15:02:53.000000000 +0100 @@ -107,6 +107,8 @@
        # Prepare for build
         
        mkdir build
+       cp /usr/share/misc/config.sub .
+       cp /usr/share/misc/config.guess .
        cd build && env srcdir=`pwd`/.. \
                ../configure $(confflags) "CC=$(CC) $(LDFLAGS)" "CFLAGS=
$(CFLAGS)" 
@@ -139,17 +141,7 @@
 
        rm -rf debian/tmp build
 
-       # Update config.{sub,guess} from autotools-dev, if possible.
-       -for f in config.sub config.guess ; do \
-               if test -r /usr/share/misc/$$f ; then \
-                       OLDDATE=`./$$f -t | tr -d -` ; \
-                       NEWDATE=`/usr/share/misc/$$f -t | tr -d -` ; \
-                       if [ $$OLDDATE -lt $$NEWDATE ] ; then \
-                               echo "GNU config automated update of $$f 
(replacing $$OLDDATE with $$NEWDATE)" 1>&2 ; \
-                               cp -f /usr/share/misc/$$f $$f ; \
-                       fi; \
-               fi; \
-       done
+       rm -f config.sub config.guess
 
        debconf-updatepo
 

Maintainer: Neil Williams <codeh...@debian.org>
Date: Sat, 12 May 2012 14:58:17 +0100
Closes: 663193
Changes: 
 gnumeric (1.10.17-1.1) unstable; urgency=low
 .
   * Non-maintainer upload.
   * Fix unexpected upstream changes with patch from Paul
     Wise, extended to remove previous config.sub patch.  (Closes: #663193)
   * Also add explicit build-depends on autotools-dev for config.sub and
     config.guess




-- 


Neil Williams
=============
http://www.linux.codehelp.co.uk/

Attachment: pgpOGF5ZGS4k5.pgp
Description: PGP signature

Reply via email to