Changeset 7

Timestamp:

03/25/07 10:21:43 (6 years ago)

Author:

alanbach-guest

Message:

[svn-inject] Applying Debian modifications to trunk

Location:

pkg/pygtk/trunk

Files:

• config.guess (modified) (13 diffs)
• config.sub (modified) (24 diffs)
• debian (added)
• debian/README.Debian (added)
• debian/changelog (added)
• debian/compat (added)
• debian/control (added)
• debian/control.in (added)
• debian/copyright (added)
• debian/docs (added)
• debian/patches (added)
• debian/patches/01_glade_example_README.patch (added)
• debian/patches/10_use-default-python.patch (added)
• debian/python-glade2.examples (added)
• debian/python-glade2.install (added)
• debian/python-gtk2-dev.install (added)
• debian/python-gtk2-dev.postinst (added)
• debian/python-gtk2-dev.prerm (added)
• debian/python-gtk2-dev.rtupdate (added)
• debian/python-gtk2.examples (added)
• debian/python-gtk2.install (added)
• debian/python-gtk2.links (added)
• debian/python-gtk2.postinst (added)
• debian/pyversions (added)
• debian/rules (added)
• debian/watch (added)

pkg/pygtk/trunk/config.guess

@@ -2 +2 @@
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-timestamp='2005-08-03'
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
+
+timestamp='2006-07-02'
 
 # This file is free software; you can redistribute it and/or modify it
@@ -107 +108 @@
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
@@ -207 +208 @@
         echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
         exit ;;
+    *:SolidBSD:*:*)
+        echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+        exit ;;
     macppc:MirBSD:*:*)
-        echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+        echo powerpc-unknown-mirbsd${UNAME_RELEASE}
         exit ;;
     *:MirBSD:*:*)
@@ -765 +769 @@
         exit ;;
     *:FreeBSD:*:*)
-        echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+        case ${UNAME_MACHINE} in
+            pc98)
+                echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+            amd64)
+                echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+            *)
+                echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+        esac
         exit ;;
     i*:CYGWIN*:*)
@@ -780 +791 @@
         echo ${UNAME_MACHINE}-pc-pw32
         exit ;;
-    x86:Interix*:[34]*)
-        echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+    x86:Interix*:[3456]*)
+        echo i586-pc-interix${UNAME_RELEASE}
+        exit ;;
+    EM64T:Interix*:[3456]*)
+        echo x86_64-unknown-interix${UNAME_RELEASE}
         exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@@ -816 +830 @@
         exit ;;
     arm*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit ;;
+    avr32*:Linux:*:*)
         echo ${UNAME_MACHINE}-unknown-linux-gnu
         exit ;;
@@ -852 +869 @@
         #endif
 EOF
-        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+        eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+            /^CPU/{
+                s: ::g
+                p
+            }'`"
         test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
         ;;
@@ -871 +892 @@
         #endif
 EOF
-        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+        eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+            /^CPU/{
+                s: ::g
+                p
+            }'`"
         test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
         ;;
@@ -919 +944 @@
     sparc:Linux:*:* | sparc64:Linux:*:*)
         echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit ;;
+    vax:Linux:*:*)
+        echo ${UNAME_MACHINE}-dec-linux-gnu
         exit ;;
     x86_64:Linux:*:*)
@@ -965 +993 @@
         # endif
         #else
-        #ifdef __INTEL_COMPILER
+        #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
         LIBC=gnu
         #else
@@ -975 +1003 @@
         #endif
 EOF
-        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+        eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+            /^LIBC/{
+                s: ::g
+                p
+            }'`"
         test x"${LIBC}" != x && {
                 echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
@@ -1186 +1218 @@
         UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
         case $UNAME_PROCESSOR in
-            *86) UNAME_PROCESSOR=i686 ;;
             unknown) UNAME_PROCESSOR=powerpc ;;
         esac
@@ -1264 +1295 @@
     i*86:skyos:*:*)
         echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+        exit ;;
+    i*86:rdos:*:*)
+        echo ${UNAME_MACHINE}-pc-rdos
         exit ;;
 esac

pkg/pygtk/trunk/config.sub

@@ -2 +2 @@
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-timestamp='2005-07-08'
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
+
+timestamp='2006-07-02'
 
 # This file is (in principle) common to ALL GNU software.
@@ -120 +121 @@
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -172 +174 @@
                 os=-hiuxwe2
                 ;;
+        -sco6)
+                os=-sco5v6
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
         -sco5)
                 os=-sco3.2v5
@@ -185 +191 @@
                 ;;
         -sco3.2v[4-9]*)
+                # Don't forget version if it is 3.2v4 or newer.
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
+        -sco5v6*)
                 # Don't forget version if it is 3.2v4 or newer.
                 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -232 +242 @@
         | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
         | am33_2.0 \
-        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
         | bfin \
         | c4x | clipper \
@@ -240 +250 @@
         | i370 | i860 | i960 | ia64 \
         | ip2k | iq2000 \
-        | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+        | m32c | m32r | m32rle | m68000 | m68k | m88k \
+        | maxq | mb | microblaze | mcore \
         | mips | mipsbe | mipseb | mipsel | mipsle \
         | mips16 \
@@ -258 +269 @@
         | mipstx39 | mipstx39el \
         | mn10200 | mn10300 \
-        | ms1 \
+        | mt \
         | msp430 \
+        | nios | nios2 \
         | ns16k | ns32k \
         | or32 \
@@ -265 +277 @@
         | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
         | pyramid \
-        | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+        | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
         | sh64 | sh64le \
-        | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-        | sparcv8 | sparcv9 | sparcv9b \
-        | strongarm \
+        | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+        | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+        | spu | strongarm \
         | tahoe | thumb | tic4x | tic80 | tron \
         | v850 | v850e \
@@ -277 +289 @@
                 basic_machine=$basic_machine-unknown
                 ;;
-        m32c)
-                basic_machine=$basic_machine-unknown
-                ;;
         m6811 | m68hc11 | m6812 | m68hc12)
                 # Motorola 68HC11/12.
@@ -286 +295 @@
                 ;;
         m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+                ;;
+        ms1)
+                basic_machine=mt-unknown
                 ;;
 
@@ -306 +318 @@
         | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
         | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-        | avr-* \
+        | avr-* | avr32-* \
         | bfin-* | bs2000-* \
         | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
@@ -317 +329 @@
         | i*86-* | i860-* | i960-* | ia64-* \
         | ip2k-* | iq2000-* \
-        | m32r-* | m32rle-* \
+        | m32c-* | m32r-* | m32rle-* \
         | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
         | m88110-* | m88k-* | maxq-* | mcore-* \
@@ -337 +349 @@
         | mipstx39-* | mipstx39el-* \
         | mmix-* \
-        | ms1-* \
+        | mt-* \
         | msp430-* \
+        | nios-* | nios2-* \
         | none-* | np1-* | ns16k-* | ns32k-* \
         | orion-* \
@@ -345 +358 @@
         | pyramid-* \
         | romp-* | rs6000-* \
-        | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+        | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
         | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-        | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+        | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
         | sparclite-* \
-        | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+        | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
         | tahoe-* | thumb-* \
         | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
@@ -360 +373 @@
         | z8k-*)
                 ;;
-        m32c-*)
-                ;;
         # Recognize the various machine names and aliases which stand
         # for a CPU type and a company and sometimes even an OS.
@@ -696 +707 @@
                 basic_machine=i386-pc
                 os=-msdos
+                ;;
+        ms1-*)
+                basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
                 ;;
         mvs)
@@ -804 +818 @@
                 basic_machine=ns32k-pc532
                 ;;
+        pc98)
+                basic_machine=i386-pc
+                ;;
+        pc98-*)
+                basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
         pentium | p5 | k5 | k6 | nexgen | viac3)
                 basic_machine=i586-pc
@@ -859 +879 @@
                 basic_machine=i586-unknown
                 os=-pw32
+                ;;
+        rdos)
+                basic_machine=i386-pc
+                os=-rdos
                 ;;
         rom68k)
@@ -1102 +1126 @@
                 basic_machine=sh-unknown
                 ;;
-        sparc | sparcv8 | sparcv9 | sparcv9b)
+        sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
                 basic_machine=sparc-sun
                 ;;
@@ -1175 +1199 @@
               | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
               | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-              | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+              | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+              | -openbsd* | -solidbsd* \
               | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
               | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
@@ -1182 +1207 @@
               | -chorusos* | -chorusrdb* \
               | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-              | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+              | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+              | -uxpv* | -beos* | -mpeix* | -udk* \
               | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
               | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1189 +1215 @@
               | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
               | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-              | -skyos* | -haiku*)
+              | -skyos* | -haiku* | -rdos* | -toppers*)
         # Remember, each alternative MUST END IN *, to match a version number.
                 ;;
@@ -1341 +1367 @@
 
 case $basic_machine in
+        spu-*)
+                os=-elf
+                ;;
         *-acorn)
                 os=-riscix1.2
@@ -1350 +1379 @@
                 os=-aout
                 ;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
+        c4x-* | tic4x-*)
+                os=-coff
+                ;;
         # This must come before the *-dec entry.
         pdp10-*)