Author: frankie
Date: 2007-05-02 10:39:06 +0000 (Wed, 02 May 2007)
New Revision: 799

Added:
   packages/qgis/trunk/debian/patches/gcc43-fixes.dpatch
Modified:
   packages/qgis/trunk/config.guess
   packages/qgis/trunk/config.sub
   packages/qgis/trunk/debian/changelog
   packages/qgis/trunk/debian/patches/00list
Log:
Preparing 0.8.0-3


Modified: packages/qgis/trunk/config.guess
===================================================================
--- packages/qgis/trunk/config.guess    2007-04-30 18:16:37 UTC (rev 798)
+++ packages/qgis/trunk/config.guess    2007-05-02 10:39:06 UTC (rev 799)
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2006-07-02'
+timestamp='2007-03-06'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -161,6 +161,7 @@
            arm*) machine=arm-unknown ;;
            sh3el) machine=shl-unknown ;;
            sh3eb) machine=sh-unknown ;;
+           sh5el) machine=sh5le-unknown ;;
            *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
        esac
        # The Operating System including object format, if it has switched
@@ -780,7 +781,7 @@
     i*:CYGWIN*:*)
        echo ${UNAME_MACHINE}-pc-cygwin
        exit ;;
-    i*:MINGW*:*)
+    *:MINGW*:*)
        echo ${UNAME_MACHINE}-pc-mingw32
        exit ;;
     i*:windows32*:*)
@@ -790,12 +791,15 @@
     i*:PW*:*)
        echo ${UNAME_MACHINE}-pc-pw32
        exit ;;
-    x86:Interix*:[3456]*)
-       echo i586-pc-interix${UNAME_RELEASE}
-       exit ;;
-    EM64T:Interix*:[3456]*)
-       echo x86_64-unknown-interix${UNAME_RELEASE}
-       exit ;;
+    *:Interix*:[3456]*)
+       case ${UNAME_MACHINE} in
+           x86) 
+               echo i586-pc-interix${UNAME_RELEASE}
+               exit ;;
+           EM64T | authenticamd)
+               echo x86_64-unknown-interix${UNAME_RELEASE}
+               exit ;;
+       esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
        echo i${UNAME_MACHINE}-pc-mks
        exit ;;
@@ -950,6 +954,9 @@
     x86_64:Linux:*:*)
        echo x86_64-unknown-linux-gnu
        exit ;;
+    xtensa:Linux:*:*)
+       echo xtensa-unknown-linux-gnu
+       exit ;;
     i*86:Linux:*:*)
        # The BFD linker knows what the default object file format is, so
        # first see if it will tell us. cd to the root directory to prevent
@@ -1208,6 +1215,15 @@
     SX-6:SUPER-UX:*:*)
        echo sx6-nec-superux${UNAME_RELEASE}
        exit ;;
+    SX-7:SUPER-UX:*:*)
+       echo sx7-nec-superux${UNAME_RELEASE}
+       exit ;;
+    SX-8:SUPER-UX:*:*)
+       echo sx8-nec-superux${UNAME_RELEASE}
+       exit ;;
+    SX-8R:SUPER-UX:*:*)
+       echo sx8r-nec-superux${UNAME_RELEASE}
+       exit ;;
     Power*:Rhapsody:*:*)
        echo powerpc-apple-rhapsody${UNAME_RELEASE}
        exit ;;

Modified: packages/qgis/trunk/config.sub
===================================================================
--- packages/qgis/trunk/config.sub      2007-04-30 18:16:37 UTC (rev 798)
+++ packages/qgis/trunk/config.sub      2007-05-02 10:39:06 UTC (rev 799)
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2006-09-20'
+timestamp='2007-01-18'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -245,12 +245,12 @@
        | bfin \
        | c4x | clipper \
        | d10v | d30v | dlx | dsp16xx \
-       | fr30 | frv \
+       | fido | fr30 | frv \
        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
        | i370 | i860 | i960 | ia64 \
        | ip2k | iq2000 \
        | m32c | m32r | m32rle | m68000 | m68k | m88k \
-       | maxq | mb | microblaze | mcore \
+       | maxq | mb | microblaze | mcore | mep \
        | mips | mipsbe | mipseb | mipsel | mipsle \
        | mips16 \
        | mips64 | mips64el \
@@ -324,7 +324,7 @@
        | clipper-* | craynv-* | cydra-* \
        | d10v-* | d30v-* | dlx-* \
        | elxsi-* \
-       | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+       | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
        | h8300-* | h8500-* \
        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
        | i*86-* | i860-* | i960-* | ia64-* \
@@ -925,6 +925,9 @@
                basic_machine=sh-hitachi
                os=-hms
                ;;
+       sh5el)
+               basic_machine=sh5le-unknown
+               ;;
        sh64)
                basic_machine=sh64-unknown
                ;;
@@ -1219,7 +1222,7 @@
              | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
              | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-             | -skyos* | -haiku* | -rdos* | -toppers*)
+             | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
        # Remember, each alternative MUST END IN *, to match a version number.
                ;;
        -qnx*)
@@ -1414,6 +1417,9 @@
        m68*-cisco)
                os=-aout
                ;;
+        mep-*)
+               os=-elf
+               ;;
        mips*-cisco)
                os=-elf
                ;;

Modified: packages/qgis/trunk/debian/changelog
===================================================================
--- packages/qgis/trunk/debian/changelog        2007-04-30 18:16:37 UTC (rev 
798)
+++ packages/qgis/trunk/debian/changelog        2007-05-02 10:39:06 UTC (rev 
799)
@@ -1,9 +1,11 @@
-qgis (0.8.0-3) UNRELEASED; urgency=low
+qgis (0.8.0-3) unstable; urgency=low
 
   * Added missing flex/bison build-deps.
     (closes: #421143)
+  * Added gcc4.3-fixes based the patch by tbm.
+    (closes: #417522)
 
- -- Francesco Paolo Lovergine <[EMAIL PROTECTED]>  Mon, 30 Apr 2007 20:13:00 
+0200
+ -- Francesco Paolo Lovergine <[EMAIL PROTECTED]>  Mon, 30 Apr 2007 23:24:02 
+0200
 
 qgis (0.8.0-2) unstable; urgency=low
 

Modified: packages/qgis/trunk/debian/patches/00list
===================================================================
--- packages/qgis/trunk/debian/patches/00list   2007-04-30 18:16:37 UTC (rev 
798)
+++ packages/qgis/trunk/debian/patches/00list   2007-05-02 10:39:06 UTC (rev 
799)
@@ -1,5 +1,3 @@
-#gcc41-extra-qualifications
 move-doc-dir
-#remove-empty-readme
-#ogr-path-fix
 gridmaker_bin
+gcc43-fixes

Added: packages/qgis/trunk/debian/patches/gcc43-fixes.dpatch
===================================================================
--- packages/qgis/trunk/debian/patches/gcc43-fixes.dpatch       2007-04-30 
18:16:37 UTC (rev 798)
+++ packages/qgis/trunk/debian/patches/gcc43-fixes.dpatch       2007-05-02 
10:39:06 UTC (rev 799)
@@ -0,0 +1,62 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## gcc43-fixes.dpatch by Francesco Paolo Lovergine <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+diff -urNad qgis~/src/composer/qgscomposition.cpp 
qgis/src/composer/qgscomposition.cpp
+--- qgis~/src/composer/qgscomposition.cpp      2006-12-08 05:26:10.000000000 
+0100
++++ qgis/src/composer/qgscomposition.cpp       2007-04-30 20:29:23.000000000 
+0200
+@@ -30,6 +30,7 @@
+ #include <QMatrix>
+ #include <QMessageBox>
+ 
++#include <cstdlib>
+ #include <iostream>
+ 
+ QgsCompositionPaper::QgsCompositionPaper ( QString name, int w, int h, bool 
c) 
+diff -urNad qgis~/src/providers/grass/qgsgrass.cpp 
qgis/src/providers/grass/qgsgrass.cpp
+--- qgis~/src/providers/grass/qgsgrass.cpp     2006-12-24 22:56:43.000000000 
+0100
++++ qgis/src/providers/grass/qgsgrass.cpp      2007-04-30 20:29:57.000000000 
+0200
+@@ -15,6 +15,7 @@
+  ***************************************************************************/
+ /* $Id: qgsgrass.cpp 6290 2006-12-20 04:51:35Z telwertowski $ */
+ 
++#include <cstdlib>
+ #include <iostream>
+ 
+ #include "qstring.h"
+diff -urNad qgis~/src/providers/postgres/qgspostgisbox2d.cpp 
qgis/src/providers/postgres/qgspostgisbox2d.cpp
+--- qgis~/src/providers/postgres/qgspostgisbox2d.cpp   2006-03-03 
21:38:20.000000000 +0100
++++ qgis/src/providers/postgres/qgspostgisbox2d.cpp    2007-04-30 
20:30:26.000000000 +0200
+@@ -17,6 +17,7 @@
+  ***************************************************************************/
+ /* $Id: qgspostgisbox2d.cpp 4501 2006-01-08 01:17:57Z timlinux $ */
+ 
++#include <cstdlib>
+ #include <fstream>
+ 
+ #include <qstring.h>
+diff -urNad qgis~/src/providers/postgres/qgspostgisbox3d.cpp 
qgis/src/providers/postgres/qgspostgisbox3d.cpp
+--- qgis~/src/providers/postgres/qgspostgisbox3d.cpp   2006-03-03 
21:38:20.000000000 +0100
++++ qgis/src/providers/postgres/qgspostgisbox3d.cpp    2007-04-30 
20:31:01.000000000 +0200
+@@ -17,6 +17,7 @@
+  ***************************************************************************/
+ /* $Id: qgspostgisbox3d.cpp 4501 2006-01-08 01:17:57Z timlinux $ */
+ 
++#include <cstdlib>
+ #include <fstream>
+ 
+ #include <qstring.h>
+diff -urNad qgis~/src/providers/postgres/qgspostgresextentthread.cpp 
qgis/src/providers/postgres/qgspostgresextentthread.cpp
+--- qgis~/src/providers/postgres/qgspostgresextentthread.cpp   2006-03-03 
21:38:20.000000000 +0100
++++ qgis/src/providers/postgres/qgspostgresextentthread.cpp    2007-04-30 
20:32:38.000000000 +0200
+@@ -17,6 +17,7 @@
+  ***************************************************************************/
+ /* $Id: qgspostgresextentthread.cpp 4501 2006-01-08 01:17:57Z timlinux $ */
+ 
++#include <cstdlib>
+ #include <fstream>
+ #include <qevent.h>
+ #include <qapplication.h>


Property changes on: packages/qgis/trunk/debian/patches/gcc43-fixes.dpatch
___________________________________________________________________
Name: svn:executable
   + *


_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

Reply via email to