--- pygtk-2.11.0.orig/config.sub +++ pygtk-2.11.0/config.sub @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2004-03-12' +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 @@ -21,14 +22,15 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. - +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. + # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. # @@ -70,7 +72,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -83,11 +85,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -99,7 +101,7 @@ *local*) # First pass through any local machine types. echo $1 - exit 0;; + exit ;; * ) break ;; @@ -118,8 +120,9 @@ # Here we must recognize all the valid KERNEL-OS combinations. 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/'` ;; @@ -145,7 +148,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis) + -apple | -axis | -knuth | -cray) os= basic_machine=$1 ;; @@ -170,6 +173,10 @@ -hiux*) os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -186,6 +193,10 @@ # 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/'` + ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -230,14 +241,16 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | 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 \ | 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 \ - | m32r | m32rle | m68000 | m68k | m88k | mcore \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -246,6 +259,7 @@ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ @@ -254,20 +268,24 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | mt \ | msp430 \ + | nios | nios2 \ | ns16k | ns32k \ - | openrisc | or32 \ + | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | score \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | 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 \ | we32k \ - | x86 | xscale | xstormy16 | xtensa \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -278,6 +296,9 @@ ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; + ms1) + basic_machine=mt-unknown + ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -297,20 +318,20 @@ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ - | bs2000-* \ + | avr-* | avr32-* \ + | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | cydra-* \ + | 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-* \ | ip2k-* | iq2000-* \ - | m32r-* | m32rle-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -319,6 +340,7 @@ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ @@ -326,24 +348,28 @@ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ | msp430-* \ - | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ + | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | 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-* | sparc86x-* | sparclet-* | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ - | xtensa-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; @@ -445,6 +471,10 @@ basic_machine=j90-cray os=-unicos ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; cr16c) basic_machine=cr16c-unknown os=-elf @@ -452,6 +482,9 @@ crds | unos) basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; @@ -481,6 +514,10 @@ basic_machine=m88k-motorola os=-sysv3 ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -659,10 +696,6 @@ mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; - mmix*) - basic_machine=mmix-knuth - os=-mmixware - ;; monitor) basic_machine=m68k-rom68k os=-coff @@ -675,6 +708,9 @@ basic_machine=i386-pc os=-msdos ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; mvs) basic_machine=i370-ibm os=-mvs @@ -743,10 +779,6 @@ np1) basic_machine=np1-gould ;; - nv1) - basic_machine=nv1-cray - os=-unicosmp - ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -754,9 +786,8 @@ basic_machine=hppa1.1-oki os=-proelf ;; - or32 | or32-*) + openrisc | openrisc-*) basic_machine=or32-unknown - os=-coff ;; os400) basic_machine=powerpc-ibm @@ -787,6 +818,12 @@ pc532 | pc532-*) 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 ;; @@ -843,6 +880,10 @@ basic_machine=i586-unknown os=-pw32 ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -869,6 +910,10 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -880,6 +925,9 @@ basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -1029,6 +1077,10 @@ basic_machine=hppa1.1-winbond os=-proelf ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; xps | xps100) basic_machine=xps100-honeywell ;; @@ -1059,6 +1111,9 @@ romp) basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm ;; @@ -1075,13 +1130,10 @@ we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; - sparc | sparcv8 | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1154,20 +1206,23 @@ | -aos* \ | -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* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -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* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1185,7 +1240,7 @@ os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) @@ -1294,6 +1349,9 @@ -kaos*) os=-kaos ;; + -zvmoe) + os=-zvmoe + ;; -none) ;; *) @@ -1316,6 +1374,12 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1325,9 +1389,9 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 @@ -1353,6 +1417,9 @@ m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; @@ -1371,9 +1438,15 @@ *-be) os=-beos ;; + *-haiku) + os=-haiku + ;; *-ibm) os=-aix ;; + *-knuth) + os=-mmixware + ;; *-wec) os=-proelf ;; @@ -1539,7 +1612,7 @@ esac echo $basic_machine$os -exit 0 +exit # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) --- pygtk-2.11.0.orig/config.guess +++ pygtk-2.11.0/config.guess @@ -1,9 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2004-03-12' +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 @@ -17,13 +18,15 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. + # Originally written by Per Bothner . # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. @@ -53,7 +56,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -66,11 +69,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -104,7 +107,7 @@ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; 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 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; @@ -123,7 +126,7 @@ ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ;' +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -158,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 @@ -196,64 +200,23 @@ # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" - exit 0 ;; - amd64:OpenBSD:*:*) - echo x86_64-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - cats:OpenBSD:*:*) - echo arm-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - macppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pegasos:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mipseb-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit 0 ;; + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} - exit 0 ;; + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -306,40 +269,43 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; - Alpha*:OpenVMS:*:*) - echo alpha-hp-vms - exit 0 ;; + exit ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead # of the specific Alpha model? echo alpha-pc-interix - exit 0 ;; + exit ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 - exit 0 ;; + exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 - exit 0;; + exit ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos - exit 0 ;; + exit ;; *:[Mm]orph[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-morphos - exit 0 ;; + exit ;; *:OS/390:*:*) echo i370-ibm-openedition - exit 0 ;; + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; *:OS400:*:*) echo powerpc-ibm-os400 - exit 0 ;; + exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; + exit ;; + arm:riscos:*:*|arm:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp - exit 0;; + exit ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then @@ -347,32 +313,32 @@ else echo pyramid-pyramid-bsd fi - exit 0 ;; + exit ;; NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit 0 ;; + exit ;; DRS?6000:unix:4.0:6*) echo sparc-icl-nx6 - exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7 && exit 0 ;; + sparc) echo sparc-icl-nx7; exit ;; esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; i86pc:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) @@ -381,10 +347,10 @@ esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit 0 ;; + exit ;; sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 @@ -396,10 +362,10 @@ echo sparc-sun-sunos${UNAME_RELEASE} ;; esac - exit 0 ;; + exit ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -410,40 +376,40 @@ # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) echo m68k-milan-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) echo m68k-hades-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} - exit 0 ;; + exit ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; + exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 - exit 0 ;; + exit ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} - exit 0 ;; + exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -467,32 +433,33 @@ exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c \ - && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; + exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax - exit 0 ;; + exit ;; Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix - exit 0 ;; + exit ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 - exit 0 ;; + exit ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 - exit 0 ;; + exit ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` @@ -508,29 +475,29 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit 0 ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 - exit 0 ;; + exit ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 - exit 0 ;; + exit ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd - exit 0 ;; + exit ;; *:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit 0 ;; + exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix - exit 0 ;; + exit ;; ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` @@ -538,7 +505,7 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build @@ -553,14 +520,18 @@ exit(0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 - echo rs6000-ibm-aix3.2.5 + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi - exit 0 ;; + exit ;; *:AIX:*:[45]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then @@ -574,28 +545,28 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:*:*) echo rs6000-ibm-aix - exit 0 ;; + exit ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 - exit 0 ;; + exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit 0 ;; # report: romp-ibm BSD 4.3 + exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx - exit 0 ;; + exit ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 - exit 0 ;; + exit ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd - exit 0 ;; + exit ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 - exit 0 ;; + exit ;; 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in @@ -657,9 +628,19 @@ esac if [ ${HP_ARCH} = "hppa2.0w" ] then - # avoid double evaluation of $set_cc_for_build - test -n "$CC_FOR_BUILD" || eval $set_cc_for_build - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep __LP64__ >/dev/null then HP_ARCH="hppa2.0w" else @@ -667,11 +648,11 @@ fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; ia64:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ia64-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -699,166 +680,182 @@ exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 - exit 0 ;; + exit ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd - exit 0 ;; + exit ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd - exit 0 ;; + exit ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix - exit 0 ;; + exit ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf - exit 0 ;; + exit ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit 0 ;; + exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi - exit 0 ;; + exit ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites - exit 0 ;; + exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit 0 ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit 0 ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit 0 ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit 0 ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; *:UNICOS/mp:*:*) - echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; + exit ;; 5000:UNIX_System_V:4.*:*) FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; + exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:FreeBSD:*:*) - # Determine whether the default compiler uses glibc. - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #if __GLIBC__ >= 2 - LIBC=gnu - #else - LIBC= - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - # GNU/KFreeBSD systems have a "k" prefix to indicate we are using - # FreeBSD's kernel, but not the complete OS. - case ${LIBC} in gnu) kernel_only='k' ;; esac - echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} - exit 0 ;; + 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*:*) echo ${UNAME_MACHINE}-pc-cygwin - exit 0 ;; - i*:MINGW*:*) + exit ;; + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 - exit 0 ;; + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 - exit 0 ;; - x86:Interix*:[34]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - exit 0 ;; + 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 0 ;; + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? echo i586-pc-interix - exit 0 ;; + exit ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin - exit 0 ;; + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin - exit 0 ;; + exit ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; *:GNU:*:*) # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; + exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit 0 ;; + exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; + exit ;; arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu - exit 0 ;; + exit ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-gnu + exit ;; + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; mips:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -875,8 +872,12 @@ #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + 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; } ;; mips64:Linux:*:*) eval $set_cc_for_build @@ -894,15 +895,22 @@ #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + 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; } ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu - exit 0 ;; + exit ;; ppc64:Linux:*:*) echo powerpc64-unknown-linux-gnu - exit 0 ;; + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -916,7 +924,7 @@ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit 0 ;; + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -924,25 +932,31 @@ PA8*) echo hppa2.0-unknown-linux-gnu ;; *) echo hppa-unknown-linux-gnu ;; esac - exit 0 ;; + exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) echo hppa64-unknown-linux-gnu - exit 0 ;; + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; + exit ;; sh64*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu - exit 0 ;; + 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 @@ -960,15 +974,15 @@ ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; + exit ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit 0 ;; + exit ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit 0 ;; + exit ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -985,7 +999,7 @@ LIBC=gnulibc1 # endif #else - #ifdef __INTEL_COMPILER + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) LIBC=gnu #else LIBC=gnuaout @@ -995,16 +1009,23 @@ LIBC=dietlibc #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 + 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}" + exit + } + test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. echo i386-sequent-sysv4 - exit 0 ;; + exit ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... @@ -1012,27 +1033,27 @@ # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; + exit ;; i*86:XTS-300:*:STOP) echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; + exit ;; i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; - i*86:syllable:*:*) + exit ;; + i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable - exit 0 ;; + exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; + exit ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then @@ -1040,15 +1061,16 @@ else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi - exit 0 ;; - i*86:*:5:[78]*) + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi - exit 0 ;; + exit ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv - exit 0 ;; + exit ;; mc68k:UNIX:SYSTEM5:3.51m) echo m68k-convergent-sysv - exit 0 ;; + exit ;; M680?0:D-NIX:5.3:*) echo m68k-diab-dnix - exit 0 ;; - M68*:*:R3V[567]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) + exit ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4.3${OS_REL} && exit 0 + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4 && exit 0 ;; + && { echo i486-ncr-sysv4; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 - exit 0 ;; + exit ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} - exit 0 ;; + exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -1140,68 +1162,81 @@ else echo ns32k-sni-sysv fi - exit 0 ;; + exit ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says echo i586-unisys-sysv4 - exit 0 ;; + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 - exit 0 ;; + exit ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 - exit 0 ;; + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos - exit 0 ;; + exit ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} - exit 0 ;; + exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 - exit 0 ;; + exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else echo mips-unknown-sysv${UNAME_RELEASE} fi - exit 0 ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos - exit 0 ;; + exit ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. echo powerpc-apple-beos - exit 0 ;; + exit ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos - exit 0 ;; + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} - exit 0 ;; + 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 0 ;; + exit ;; *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Darwin:*:*) - case `uname -p` in - *86) UNAME_PROCESSOR=i686 ;; - powerpc) UNAME_PROCESSOR=powerpc ;; + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in + unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit 0 ;; + exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then @@ -1209,22 +1244,25 @@ UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit 0 ;; + exit ;; *:QNX:*:4*) echo i386-pc-qnx - exit 0 ;; + exit ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; + exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux - exit 0 ;; + exit ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv - exit 0 ;; + exit ;; DS/*:UNIX_System_V:*:*) echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 @@ -1235,31 +1273,47 @@ UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 - exit 0 ;; + exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 - exit 0 ;; + exit ;; *:TENEX:*:*) echo pdp10-unknown-tenex - exit 0 ;; + exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 - exit 0 ;; + exit ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) echo pdp10-xkl-tops20 - exit 0 ;; + exit ;; *:TOPS-20:*:*) echo pdp10-unknown-tops20 - exit 0 ;; + exit ;; *:ITS:*:*) echo pdp10-unknown-its - exit 0 ;; + exit ;; SEI:*:*:SEIUX) echo mips-sei-seiux${UNAME_RELEASE} - exit 0 ;; + exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + 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 #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1291,7 +1345,7 @@ #endif #if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix"); exit (0); + printf ("arm-acorn-riscix\n"); exit (0); #endif #if defined (hp300) && !defined (hpux) @@ -1380,11 +1434,12 @@ } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } # Convex versions that predate uname can use getsysinfo(1) @@ -1393,22 +1448,22 @@ case `getsysinfo -f cpu_type` in c1*) echo c1-convex-bsd - exit 0 ;; + exit ;; c2*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; c34*) echo c34-convex-bsd - exit 0 ;; + exit ;; c38*) echo c38-convex-bsd - exit 0 ;; + exit ;; c4*) echo c4-convex-bsd - exit 0 ;; + exit ;; esac fi @@ -1419,7 +1474,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - ftp://ftp.gnu.org/pub/gnu/config/ + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess +and + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub If the version you run ($0) is already up to date, please send the following data and any information you think might be --- pygtk-2.11.0.orig/configure +++ pygtk-2.11.0/configure @@ -10576,14 +10576,10 @@ echo $ECHO_N "checking for headers required to compile python extensions... $ECHO_C" >&6; } py_prefix=`$PYTHON -c "import sys; print sys.prefix"` py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` -if test -x "$PYTHON-config"; then -PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null` -else PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" if test "$py_prefix" != "$py_exec_prefix"; then PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" fi -fi save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" --- pygtk-2.11.0.orig/debian/patches/00list +++ pygtk-2.11.0/debian/patches/00list @@ -0,0 +1,3 @@ +01_glade_example_README.dpatch +10_use-default-python.dpatch +30_ship_gtk-extrafuncs.defs.dpatch --- pygtk-2.11.0.orig/debian/patches/30_ship_gtk-extrafuncs.defs.dpatch +++ pygtk-2.11.0/debian/patches/30_ship_gtk-extrafuncs.defs.dpatch @@ -0,0 +1,31 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_ship_gtk-extrafuncs.defs.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad pygtk-2.11.0~/gtk/Makefile.am pygtk-2.11.0/gtk/Makefile.am +--- pygtk-2.11.0~/gtk/Makefile.am 2007-08-28 00:46:58.000000000 +0200 ++++ pygtk-2.11.0/gtk/Makefile.am 2007-08-28 00:48:47.000000000 +0200 +@@ -138,7 +138,7 @@ + if BUILD_GTK + pygtkexec_LTLIBRARIES += _gtk.la + defs_DATA += $(GDK_DEFS) $(GDK_TYPES_DEFS) $(GTK_DEFS) $(GTK_TYPES_DEFS) \ +- gdk.defs gtk.defs gdk-types.defs gtk-types.defs ++ gdk.defs gtk.defs gdk-types.defs gtk-types.defs gtk-extrafuncs.defs + endif + + # libglade module +diff -urNad pygtk-2.11.0~/gtk/Makefile.in pygtk-2.11.0/gtk/Makefile.in +--- pygtk-2.11.0~/gtk/Makefile.in 2007-08-28 00:46:58.000000000 +0200 ++++ pygtk-2.11.0/gtk/Makefile.in 2007-08-28 00:49:18.000000000 +0200 +@@ -47,7 +47,7 @@ + @HAVE_GTK_2_12_TRUE@am__append_7 = gtk-2.12-types.defs + @BUILD_GTK_TRUE@am__append_8 = _gtk.la + @BUILD_GTK_TRUE@am__append_9 = $(GDK_DEFS) $(GDK_TYPES_DEFS) $(GTK_DEFS) $(GTK_TYPES_DEFS) \ +-@BUILD_GTK_TRUE@ gdk.defs gtk.defs gdk-types.defs gtk-types.defs ++@BUILD_GTK_TRUE@ gdk.defs gtk.defs gdk-types.defs gtk-types.defs gtk-extrafuncs.defs + + @BUILD_LIBGLADE_TRUE@am__append_10 = glade.la + @BUILD_LIBGLADE_TRUE@am__append_11 = $(LIBGLADE_DEFS) --- pygtk-2.11.0.orig/debian/patches/10_use-default-python.dpatch +++ pygtk-2.11.0/debian/patches/10_use-default-python.dpatch @@ -0,0 +1,30 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_use-default-python.dpatch by Loic Minier +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad pygtk-2.10.3~/codegen/pygtk-codegen-2.0.in pygtk-2.10.3/codegen/pygtk-codegen-2.0.in +--- pygtk-2.10.3~/codegen/pygtk-codegen-2.0.in 2005-08-17 18:47:18.000000000 +0200 ++++ pygtk-2.10.3/codegen/pygtk-codegen-2.0.in 2006-10-04 23:29:09.000000000 +0200 +@@ -8,4 +8,9 @@ + PYTHONPATH=$codegendir + export PYTHONPATH + +-exec @PYTHON@ $codegendir/codegen.py "$@" ++python=/usr/bin/python ++if [ -x "$PYTHON" ]; then ++ python="$PYTHON" ++fi ++ ++exec $python $codegendir/codegen.py "$@" +diff -urNad pygtk-2.10.3~/examples/pygtk-demo/pygtk-demo.in pygtk-2.10.3/examples/pygtk-demo/pygtk-demo.in +--- pygtk-2.10.3~/examples/pygtk-demo/pygtk-demo.in 2005-02-17 16:44:16.000000000 +0100 ++++ pygtk-2.10.3/examples/pygtk-demo/pygtk-demo.in 2006-10-04 23:29:55.000000000 +0200 +@@ -1,4 +1,4 @@ +-#! @PYTHON@ ++#!/usr/bin/python + + import sys + import os.path --- pygtk-2.11.0.orig/debian/patches/01_glade_example_README.dpatch +++ pygtk-2.11.0/debian/patches/01_glade_example_README.dpatch @@ -0,0 +1,26 @@ +#! /bin/sh -e + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch -f --no-backup-if-mismatch -p0 < $0;; + -unpatch) patch -f --no-backup-if-mismatch -R -p0 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac +exit 0 + +--- examples/glade/README~ 1998-12-06 08:08:08.000000000 -0200 ++++ examples/glade/README 2005-09-21 14:17:54.733557009 -0300 +@@ -3,7 +3,7 @@ + GLADE UI builder. + + Just put a glade file in this directory and run: +- ./glade.py filename.glade ++ ./glade-demo.py filename.glade + + The pyglade module should make it even easier to prototype interfaces in + python, since you can get it to look right, and act correctly when signals --- pygtk-2.11.0.orig/debian/README.Debian +++ pygtk-2.11.0/debian/README.Debian @@ -0,0 +1,11 @@ +pygtk for Debian +---------------- + +To use the new gtk, you'll need to use the following code: + +import pygtk +pygtk.require('2.0') +import gtk + + + -- Gustavo Noronha Silva , Wed Sep 21 10:59:53 2005 --- pygtk-2.11.0.orig/debian/changelog +++ pygtk-2.11.0/debian/changelog @@ -0,0 +1,829 @@ +pygtk (2.11.0-0ubuntu1) gutsy; urgency=low + + * New upstream version: + - Defs file tweaks + - Documentation building fixes + - Improve reverse wrapper + - Code generator improvements + - Update to Gtk+ 2.12 API + - Update to Pango 1.16 API + - Update to Atk+ 1.12 API + - Wrap new GtkTreeView coordinate methods + - Add wrappers for all GtkImage constructors + - Wrap GtkBuilder + - Add GtkBuilder and tooltip demons + - Wrap GtkContainer.do_forall + - Add new API to simplify custom GenericTreeModels + - Allow None to set_focus_child/set_focus + - Update documentation + - Make GtkToolTips.tips_data_list always return an empty list + * debian/control.in: + - updated requirements on libatk, libglib, libgtk + * debian/patches/20_python-includes.dpatch: + - dropped, fixed with the new version + * debian/patches/30_ship_gtk-extrafuncs.defs.dpatch: + - updated + + -- Sebastien Bacher Tue, 28 Aug 2007 00:38:19 +0200 + +pygtk (2.10.6-0ubuntu2) gutsy; urgency=low + + * Make sure to ship gtk-extrafuncs.defs too. + + -- Tollef Fog Heen Wed, 22 Aug 2007 13:08:20 +0200 + +pygtk (2.10.6-0ubuntu1) gutsy; urgency=low + + * New upstream version: + - Fix regression in handling return values of virtual methods + * debian/control.in: + - add a python-gtk2-doc Depends on python-gobject-doc (LP: #121181) + + -- Sebastien Bacher Tue, 10 Jul 2007 14:08:29 +0100 + +pygtk (2.10.5-0ubuntu1) gutsy; urgency=low + + * New upstream version: + - Do access private GtkTooltip member tips_data_list, fixes build + against Gtk+ 2.11.x + - Allow None to gtk_rc_get_style_by_paths + - Fix defs file inconsistencies + - Documentation build fixes + - Code generator improvements + - Include atk-types.defs when building using distutils, so gtk.Accessible + is available on win32 + * debian/patches/30_pygtk-tests.dpatch: + - dropped, fixed with the new version + + -- Sebastien Bacher Wed, 04 Jul 2007 15:59:10 +0200 + +pygtk (2.10.4-2ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - Build python debug packages python-gtk2-dbg and python-glade2-dbg. + - python-glade2-dbg: Depend on python-gtk2-dbg. + - debian/rules: Don't remove intermediate stamp files. + * debian/patches/30_pygtk-tests.dpatch + - Added patch from upstream to fix test issues with garbage collection + + -- Andrew Mitchell Mon, 21 May 2007 20:08:01 +1200 + +pygtk (2.10.4-2) unstable; urgency=low + + * Honor CFLAGS we set in rules, doh! + * Set some sane default CFLAGS and honor noopt in DEB_BUILD_OPTIONS. + * Wrap build-deps and deps. + * Upload to unstable; drop check-dist include. + * Fix URL in copyright. + * Add XS and XB-Python-Version. + * Only pass --host to configure if DEB_HOST_GNU_TYPE and DEB_BUILD_GNU_TYPE + differ. + * Cleanups. + + -- Loic Minier Mon, 16 Apr 2007 13:02:48 +0200 + +pygtk (2.10.4-1) experimental; urgency=low + + * Cleanup rules. + * Build-depend on autotools-dev. + * New upstream stable release. + - Drop patch 02_doc_licensing, mostly merged upstream. + + -- Loic Minier Sun, 11 Mar 2007 17:22:53 +0100 + +pygtk (2.10.4-0ubuntu3) feisty; urgency=low + + * python-glade2-dbg: Depend on python-gtk2-dbg. + * debian/rules: Don't remove intermediate stamp files. + + -- Matthias Klose Wed, 21 Feb 2007 12:38:04 +0100 + +pygtk (2.10.4-0ubuntu2) feisty; urgency=low + + * Build python debug packages python-gtk2-dbg and python-glade2-dbg. + * New patch 20_python-includes, fixing detection of the python + include directories. + * Set Ubuntu maintainer address. + + -- Matthias Klose Sat, 17 Feb 2007 16:37:01 +0100 + +pygtk (2.10.4-0ubuntu1) feisty; urgency=low + + [ Sebastien Bacher ] + * New upstream version: + - Documentation build fixes + - Return NULL on error in TextBuffer.register_serialize_format + - Do not overwrite sys.argv + - Add status icon example + - Make it possible to remove rows in the gtk.TreeModel.foreach callback + - Code generator fix for %define + - Duplicate GdkEvent.string member when setting it + - Make it possible to use automake 1.10 + - distutils build fixes (Ubuntu: #75327) + - Allow None to be passed into gdk.Display + - Undeprecate gtk.container_class_list_child_properties + - Fix memory leak in gtk.Container.child_get + * debian/patches/20_install_createdefs.py.dpatch: + - fixed with the new version + * debian/rules: + - don't install .pyc and .pyo to the package + + -- Sebastien Bacher Tue, 6 Feb 2007 11:27:28 +0100 + +pygtk (2.10.3-2) experimental; urgency=low + + * Add a get-orig-source target to retrieve the upstream tarball. + * Include the new check-dist Makefile to prevent accidental uploads to + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + * Bump up libgtk2.0-dev dep to >= 2.10.0. + + -- Loic Minier Fri, 26 Jan 2007 18:29:33 +0100 + +pygtk (2.10.3-1) experimental; urgency=low + + * New upstream release. + + -- Josselin Mouette Thu, 4 Jan 2007 20:53:33 +0100 + +pygtk (2.10.3-0ubuntu4) feisty; urgency=low + + * debian/patches/20_install_createdefs.py.dpatch: + - patch by Michael Bienia, "Install codegen/createdefs.py" (Ubuntu: #75606) + + -- Sebastien Bacher Thu, 21 Dec 2006 12:03:29 +0100 + +pygtk (2.10.3-0ubuntu3) edgy; urgency=low + + * debian/patches/10_use-default-python.dpatch: + - updated, use non-versioned python for pygtk-demo too + + -- Sebastien Bacher Wed, 4 Oct 2006 23:30:05 +0200 + +pygtk (2.10.3-0ubuntu2) edgy; urgency=low + + * debian/python-gtk2.examples, debian/python-gtk2.install, debian/rules: + - install the pygtk-demo the upstream way, moving it was required + when we had several python packages conflicting which is fixed now + + -- Sebastien Bacher Wed, 4 Oct 2006 16:50:30 +0200 + +pygtk (2.10.3-0ubuntu1) edgy; urgency=low + + * New upstream version: + - Fix a crasher bug introduced in 2.10.2 + - Make PyGTK work with Python 2.5 and 64-bit + (when used in conjunction with the soon-to-be-released PyGObject 2.12.2) + + -- Sebastien Bacher Tue, 3 Oct 2006 20:59:21 +0200 + +pygtk (2.10.2-0ubuntu1) edgy; urgency=low + + * New upstream version: + - distutils / win32 compilation fixes + - gtk.TreeSelection.selected_foreach bug fix (Ubuntu: #56744) + - Fix compilation older C compilers + + -- Sebastien Bacher Tue, 3 Oct 2006 14:06:06 +0200 + +pygtk (2.10.1-3) experimental; urgency=low + + * python-gtk2-dev depends on python-dev (closes: #401896). + * rules: remove .py[co] files created in the examples directory. + * Build-depend on docbook-xsl (closes: #397811). + * python-gtk2-dev depends on python-gobject-dev (closes: #405348). + + -- Josselin Mouette Tue, 2 Jan 2007 22:26:06 +0100 + +pygtk (2.10.1-2) experimental; urgency=low + + * Switch to cdbs for patch handling. + * 02_doc_licensing.patch: stolen from upstream CVS. Upstream agreed to + relicense the documentation to LGPL. + * copyright: document that. + * rules: binary-indep depends on build and install. + + -- Josselin Mouette Thu, 12 Oct 2006 22:19:30 +0200 + +pygtk (2.10.1-1) experimental; urgency=low + + * New upstream release. + * Update watch file. + * Depend on python-gobject. + * Remove uses of dh_python and pycompat. + * Add appropriate build-dependencies. + * python-gtk2.examples: install all examples. + * python-gtk2.{install,links}: install documentation. + + -- Josselin Mouette Wed, 27 Sep 2006 23:36:13 +0200 + +pygtk (2.10.1-0ubuntu2) edgy; urgency=low + + * Rebuild to add support for python2.5. + + -- Matthias Klose Fri, 8 Sep 2006 13:31:41 +0000 + +pygtk (2.10.1-0ubuntu1) edgy; urgency=low + + * New upstream release: + + Require pygobject 2.12.0 + * debian/control.in: + + and bump build dependency on python-gobject-dev to (>= 2.12.1) as + configure doesn't want 2.12.0 but 2.12.1 + + -- Sebastian Dröge Tue, 5 Sep 2006 13:41:26 +0200 + +pygtk (2.10.0-0ubuntu2) edgy; urgency=low + + * debian/control.in: + + Bump pygobject build dependency to (>= 2.12.0-0ubuntu2) to prevent use + of the broken version-check macro that was used in versions before this. + + -- Sebastian Dröge Tue, 5 Sep 2006 00:37:45 +0200 + +pygtk (2.10.0-0ubuntu1) edgy; urgency=low + + * New upstream version: + - Issue a warning when a DISPLAY is not set + - Copy style.css from pygobject docs when installing docs. + - Include the built docs in the tarball + * debian/rules: + - run the testsuite again + * debian/watch: + - updated + + -- Sebastien Bacher Mon, 4 Sep 2006 23:43:29 +0200 + +pygtk (2.9.6-0ubuntu2) edgy; urgency=low + + * debian/control.in: + - Build-Depends on python-gobject-doc + + -- Sebastien Bacher Wed, 9 Aug 2006 15:50:41 +0200 + +pygtk (2.9.6-0ubuntu1) edgy; urgency=low + + * New upstream version: + - GtkTreePath can be converted from integers again + - Fix parallel build + - Reduce exception abuse in code generator + - Documentation improvements + * debian/control.in: + - updated python-gobject requirement + + -- Sebastien Bacher Tue, 8 Aug 2006 16:05:38 +0200 + +pygtk (2.9.5-0ubuntu1) edgy; urgency=low + + * New upstream version: + - Make it possible to build with GTK+ 2.10 + - Make sure dir(gtk.keysyms) work again + - reloading the gtk module works again + + -- Sebastien Bacher Sun, 6 Aug 2006 23:52:10 +0200 + +pygtk (2.9.4-0ubuntu1) edgy; urgency=low + + * New upstream version: + - Include John Finlay's PyGTK reference manual + - Setters and getters for GtkWidget.activate_signal + - GtkToolItemType setter/getter + - Code generator fixes + - Add more gtk+ 2.10 API + - Don't copy treeiters in callbacks + - Provide full information for GtkTreeSelection.set_select_function + - Export less symbols and reduce the size of the libraries + - Allow negative values for GtkTreeModel.set/getitem + - Much improved interface/virtual method support + - Remove evil 100ms timeout timer + * debian/control.in: + - Build-Depends on xsltproc, docbook-xsl + - updated pygoject requirement according to configure + * debian/python-gtk2-dev.install, debian/python-gtk2-doc.install: + - install the reference manual + + -- Sebastien Bacher Sat, 5 Aug 2006 12:37:34 +0200 + +pygtk (2.9.3-0ubuntu1) edgy; urgency=low + + * New upstream version: + - Update to latest gtk+ 2.10 API changes + - Many more new gtk+ 2.10 APIs wrapped + - Wrap gtk_widget_class_find_style_property + - gtk.gdk.CairoContext.rectangle bug fix + - Update defs for atk 1.8 + - Misc. module cleanups + - New pango APIs wrapped + - Fix refcount error in gtk.Clipboard + - Enable GDK X11-specific APIs available also with gtk+ 2.8 + * debian/patches/11_new_gtk_print_job_api.dpatch, + debian/patches/12_remove_obsolete_gtk_print_settings_functions.dpatch: + - fixed with the new version + + -- Sebastien Bacher Wed, 12 Jul 2006 19:30:13 +0200 + +pygtk (2.9.2-0ubuntu2) edgy; urgency=low + + * Let the -dev package Depend on python-gobject-dev + + -- Sebastian Dröge Sat, 8 Jul 2006 01:17:23 +0200 + +pygtk (2.9.2-0ubuntu1) edgy; urgency=low + + * New upstream release + * Sync with Debian: + Remaining Ubuntu Changes + + debian/control.in: + - Add python-gobject-dev, xvfb to Build-Depends + - Add python-gobject to the Depends of python-gtk2 + + debian/rules: + - don't run the test suite for now + + debian/*.{postinst,prerm}: + - dropped the useless alternative installation/removal + + debian/python-gtk2.install, + debian/rules: + - the pygtk module is installed with python-gobject so drop it here + * debian/patches/11_new_gtk_print_job_api.patch: + + Patch from CVS to work with the final GtkPrintJob API + * debian/patches/12_remove_obsolete_gtk_print_settings_functions: + + Patch from CVS to remove removed functions from the bindings + + -- Sebastian Dröge Fri, 7 Jul 2006 20:55:32 +0200 + +pygtk (2.8.6-6) unstable; urgency=low + + * Drop alternatives usage (closes: #384189, #385027). + + python-gtk2.install: install pygtk.py in the standard directory. + + python-gtk2.prerm: removed. + + python-gtk2.postinst: remove the alternatives call. + * Add a conflict against python-gtk-1.2 (<< 0.6.12-7). + * Remove abusive Replaces: python-gtk-1.2. + + -- Josselin Mouette Fri, 22 Sep 2006 21:18:07 +0200 + +pygtk (2.8.6-5) unstable; urgency=low + + * Add debian/control to the pyversions -r call since it's mandatory, even if + the man page claims it's optional. + * Update rtupdate script to handle calls with three arguments. + + -- Loic Minier Sat, 5 Aug 2006 22:54:26 +0200 + +pygtk (2.8.6-4) unstable; urgency=low + + * Attempt at supporting pkg-config files for multiple Python runtimes: + - Move *.pc files for each runtime in /usr/lib/pkg-config/pythonXXX. + - Symlink the *.pc files for the default runtime in /usr/lib/pkg-config + during python-gtk2-dev's postinst and remove the symlinks in prerm. + - Delete and re-create the symlinks on default runtime change via a + *.rtupdate script shipped by python-gtk2-dev. + * Misc cleanups in rules. + * Drop useless dh_installdirs call. + * Check that all builds with various Python runtimes produced the same + *.defs files, codegen, and headers, and ship files produced by the default + Python version. + + -- Loic Minier Fri, 21 Jul 2006 22:26:15 +0200 + +pygtk (2.8.6-3) unstable; urgency=low + + * New dpatch, 10_use-default-python, to use $PYTHON when non-empty or the + /usr/bin/python interpreter otherise in pygtk-codegen-2.0 instead of using + the build-time Python interpreter. (Closes: #376013, #376027) + + -- Loic Minier Fri, 30 Jun 2006 18:28:01 +0200 + +pygtk (2.8.6-2) unstable; urgency=low + + * python-gtk2.prerm: run update-python-modules before the alternative + removal. + + -- Josselin Mouette Sun, 25 Jun 2006 15:57:05 +0200 + +pygtk (2.8.6-1) unstable; urgency=low + + [ Marco Cabizza ] + * New upstream version + * Added the watch file + * debian/control, debian/control.in: + - Standards-Version is 3.7.2 + * debian/compat: + - Debhelper compatibility is 5 + + [ Josselin Mouette ] + * Revert changes from the NMU (closes: #374804, #374811). + * Require debhelper 5.0.37.2 and python-support 0.3.4. + * Make package binNMU-able by having python-gtk2-dev depend on + python-gtk2 >= ${Source-Version}. + * pycompat: python standards = 2. + * pyversions: we need python >= 2.3. + * Make the package comply with the new policy: + + Remove python2.3-* and python2.4-* packages. + + Correct package descriptions accordingly. + * Replace the multiple alternatives in the postinst by a single + alternative pointing to /usr/share/python-support/python-gtk. + * python-glade2.examples: move examples one directory up. + * rules: rework and simplify. + * Remove move_files and use *.install files instead. + + Don't install the .la files, which are useless anyway. + * rules: don't use config.status as the configure target because of + the stupid way make treats intermediary files. + * Require some minimum versions for python-cairo and python-numeric. + * python-gtk2.postinst: cleanup pygtk.py[co] from the former package, + as they were not handled. + + -- Josselin Mouette Sat, 24 Jun 2006 12:26:15 +0200 + +pygtk (2.8.2-3) unstable; urgency=low + + * Upload to unstable. + + -- Jordi Mallach Mon, 9 Jan 2006 18:29:31 +0100 + +pygtk (2.8.2-2) experimental; urgency=low + + * debian/control.in: + - python-gtk2-dev Depends on libglib2.0-dev libgtk2.0-dev. + - updated the requirements on glib/gtk. + * debian/rules: + - install the example files to the versionned packages. + + -- Sebastien Bacher Thu, 20 Oct 2005 11:06:23 +0200 + +pygtk (2.8.2-1) experimental; urgency=low + + * New upstream release. + + -- Loic Minier Tue, 18 Oct 2005 17:25:11 +0200 + +pygtk (2.8.1-1) experimental; urgency=low + + * New upstream release. + * Copy python2.3-glade2.examples to python2.4-glade2.examples. + (Closes: #331403) [debian/python2.4-glade2.examples] + * Fix python 2.3 / 2.4 substitution, patch by Roland Stigge. + (Closes: #331402) [debian/rules] + + -- Loic Minier Sun, 9 Oct 2005 13:54:06 +0200 + +pygtk (2.8.0-1) experimental; urgency=low + + * New upstream version (Closes: #325986) + * debian/control.in: + - Build-Dep on gtk+ >= 2.8.0, libxrender-dev (added) + - Build-Dep on python-cairo-dev + - python2.?-gtk2 Depend on the corresponding python2.?-cairo packages + + -- Gustavo Noronha Silva Tue, 27 Sep 2005 14:38:26 -0300 + +pygtk (2.6.3-1) unstable; urgency=low + + * New upstream version + * debian/patches/01_glade_example_README.dpatch (added), debian/rules: + - fix name of the script to be called on the README and do not compress + the sample glade files (Closes: #270478) + * debian/copyright: + - fix FSF's address + * debian/control.in: + - upgraded Standards-Version to 3.6.2 with no changes + + -- Gustavo Noronha Silva Wed, 21 Sep 2005 14:35:43 -0300 + +pygtk (2.6.2-3) UNRELEASED; urgency=low + + * debian/control.in, debian/rules, python2.4-gtk2.{postinst,prerm}: + - support 2.4 versions of the packages (Closes: #292796, #329029) + - some help from Bastian Kleineidam 's patch and + advice from Ross Burton and Sebastien Bacher were used + * debian/rules: + - readded the code to update config.{sub,guess} + * debian/control.in, debian/changelog, debian/README.Debian: + - change source package name + + -- Gustavo Noronha Silva Wed, 21 Sep 2005 11:00:19 -0300 + +python-gtk2 (2.6.2-2) UNRELEASED; urgency=low + + * Move source to pkg-gnome, and add GNOME Team to uploaders + * Remove useless Mesa build-dep + * Add missing libglib2.0-dev build-dep + * Remove useless (I hope) patch to config.sub/config.guess + + -- Ross Burton Fri, 9 Sep 2005 17:31:51 +0100 + +python-gtk2 (2.6.2-1) unstable; urgency=low + + * New upstream version. + + -- Sebastien Bacher Mon, 9 May 2005 23:53:44 +0200 + +python-gtk2 (2.6.1-2) unstable; urgency=low + + * CVS patch to fix the crash when argv is not set (Closes: #299328). + + -- Sebastien Bacher Thu, 17 Mar 2005 17:08:41 +0100 + +python-gtk2 (2.6.1-1) unstable; urgency=low + + * New upstream release. + * CVS patch to fix the crash when argv is not set (Closes: #299328). + + -- Sebastien Bacher Thu, 17 Mar 2005 15:17:17 +0100 + +python-gtk2 (2.6.0-1) unstable; urgency=low + + * New upstream release. + * debian/control: + - updated the Build-Depends. + * debian/python2.3-gtk2.examples: + - now pygtk-demo is in the standard installation. + * debian/rules: + - install pygtk-demo in /usr/bin. + + -- Sebastien Bacher Wed, 9 Mar 2005 19:11:55 +0100 + +python-gtk2 (2.4.1-2) unstable; urgency=low + + * debian/control: + - python-gtk2 depends on the current version of python2.3-gtk2 + (Closes: #281488). + * debian/install-examples: + - not needed since the examples are uncompressed now. + * debian/rules: + - dont' compress examples (Closes: #279604). + - removed extra .pyc files (Closes: #276353). + + -- Sebastien Bacher Mon, 22 Nov 2004 11:48:19 +0100 + +python-gtk2 (2.4.1-1) unstable; urgency=low + + * New upstream release. + + -- Sebastien Bacher Sun, 7 Nov 2004 18:08:22 +0100 + +python-gtk2 (2.4.0-2) unstable; urgency=low + + * apply the CVS fix to not use "typename" which is a C++ keyword + (Closes: #276518). + + -- Sebastien Bacher Thu, 14 Oct 2004 19:20:01 +0200 + +python-gtk2 (2.4.0-1) unstable; urgency=low + + * New upstream release. + + -- Sebastien Bacher Mon, 4 Oct 2004 00:08:21 +0200 + +python-gtk2 (2.3.97-1) experimental; urgency=low + + * New upstream release. + + -- Sebastien Bacher Tue, 28 Sep 2004 17:34:16 +0200 + +python-gtk2 (2.3.96-1) experimental; urgency=low + + * New upstream version + - fixes the crash with gtk.icon_size_register (Closes: #261109). + * debian/control: + - Build-Depends on python2.3-numeric. + * debian/move_files: + - fixed the regexp to get python versions to use. + + -- Sebastien Bacher Fri, 6 Aug 2004 19:19:57 +0200 + +python-gtk2 (2.3.95-1) experimental; urgency=low + + * New upstream release + - require python 2.3 and gtk+ 2.4. + * debian/control: + - removed the python2.2-* packages. + - updated the Build-Depends. + * debian/python2.2*: + - removed. + * debian/rules: + - removed python2.2-* build. + + -- Sebastien Bacher Mon, 2 Aug 2004 14:25:53 +0200 + +python-gtk2 (2.3.94-1) experimental; urgency=low + + * New upstream release. + + -- Sebastien Bacher Thu, 22 Jul 2004 00:16:46 +0200 + +python-gtk2 (2.3.93-2) experimental; urgency=low + + * CVS patch to fix the libglade problem. + + -- Sebastien Bacher Tue, 20 Jul 2004 16:53:28 +0200 + +python-gtk2 (2.3.93-1) experimental; urgency=low + + * New upstream release: + - fix gtk.gdk.window_lookup assertion (Closes: #237125). + * debian/control: + - Build-Depends on python. + + -- Sebastien Bacher Mon, 19 Jul 2004 18:45:30 +0200 + +python-gtk2 (2.3.92-1) experimental; urgency=low + + * New upstream release. + + -- Sebastien Bacher Sat, 22 May 2004 13:12:10 +0200 + +python-gtk2 (2.3.91-1) experimental; urgency=low + + * New upstream release. + + -- Sebastien Bacher Fri, 16 Apr 2004 21:38:01 +0200 + +python-gtk2 (2.3.90-1) experimental; urgency=low + + * New upstream release. + + -- Sebastien Bacher Wed, 7 Apr 2004 23:39:54 +0200 + +python-gtk2 (2.2.0-1) unstable; urgency=low + + * New upstream release: + + removed gtkgl bindings. + * debian/control: + + remove gtkgl packages. + * debian/patches/01pixmap_foreign_new_leak.dpatch: + + removed since the changes are in new version. + + -- Sebastien Bacher Thu, 11 Mar 2004 23:10:34 +0100 + +python-gtk2 (2.0.0-4) unstable; urgency=low + + * debian/patches/01pixmap_foreign_new_leak.dpatch: + + patch to fix a mem leak with pixmaps. + + -- Sebastien Bacher Sun, 22 Feb 2004 22:39:34 +0100 + +python-gtk2 (2.0.0-3) unstable; urgency=low + + * Removed pygtk.py[co] (Closes: #222473, #222985). + + -- Sebastien Bacher Fri, 5 Dec 2003 17:27:46 +0100 + +python-gtk2 (2.0.0-2) unstable; urgency=low + + * Removed python2.2-gtkgl2 since python-opengl is only for python2.3. + * Removed pygtk 1.2 examples (Closes: #210987). + + -- Sebastien Bacher Wed, 17 Sep 2003 16:41:58 +0200 + +python-gtk2 (2.0.0-1) unstable; urgency=low + + * New upstream. + * Stable version is out, it's time to switch pygtk default version + from 1.2 to 2 (Closes: #163253). + * Fixed install-examples (Closes: #208234). + + -- Sebastien Bacher Mon, 1 Sep 2003 18:15:40 +0200 + +python-gtk2 (1.99.18-1) unstable; urgency=low + + * New upstream release. + * Updated to Standards-Version 3.6.1.0. + + -- Sebastien Bacher Sun, 24 Aug 2003 17:41:23 +0200 + +python-gtk2 (1.99.17-6) unstable; urgency=low + + * Added missing depends on python-numeric (Closes: #205362). + + -- Sebastien Bacher Thu, 14 Aug 2003 13:42:58 +0200 + +python-gtk2 (1.99.17-5) unstable; urgency=low + + * Added missing pygtk-codegen-2.0 to python-gtk2-dev. + + -- Sebastien Bacher Thu, 14 Aug 2003 01:45:33 +0200 + +python-gtk2 (1.99.17-4) unstable; urgency=low + + * Fixed overwrite problem (Closes: #205176). + * Added python-gtk2-dev package with devel files. + + -- Sebastien Bacher Wed, 13 Aug 2003 14:38:32 +0200 + +python-gtk2 (1.99.17-3) unstable; urgency=low + + * Fixed depends. + * debian/rules + + Changed header of py files with Matthias Klose's script. + + -- Sebastien Bacher Tue, 12 Aug 2003 22:09:50 +0200 + +python-gtk2 (1.99.17-2) unstable; urgency=low + + * Now python 2.3 is the default version. + * Use dh_python. + + -- Sebastien Bacher Mon, 11 Aug 2003 13:19:09 +0200 + +python-gtk2 (1.99.17-1) unstable; urgency=low + + * New upstream release. + * I've more interest on pygtk than Torsten for the moment, so we switch + maintainer and uploaders field. + + -- Sebastien Bacher Thu, 31 Jul 2003 18:38:46 +0200 + +python-gtk2 (1.99.16-3) unstable; urgency=low + + * Added Depends on python-opengl for python-gtkgl2 (Closes: #196064). + * Added a "install-examples" script in examples dir to install gunzip + demos (Closes: #193841) + * Updated to standards version 3.6.0. + * Added homepage and author to the description. + + -- Sebastien Bacher Fri, 13 Jun 2003 22:29:49 +0200 + +python-gtk2 (1.99.16-2) unstable; urgency=low + + * Fixed libglade example (Closes: #189321). + * Updated to standards version 3.5.9. + * Added Depends on ${misc:Depends}. + * Changed section to python. + + -- Sebastien Bacher Fri, 2 May 2003 12:22:29 +0200 + +python-gtk2 (1.99.16-1) unstable; urgency=low + + * New upstream release. + + -- Sebastien Bacher Mon, 24 Mar 2003 01:44:07 +0100 + +python-gtk2 (1.99.15-2) unstable; urgency=low + + * Remove *.pyc and *.pyo from the package. These files are compiled after + the installation (that change the size of the files and make the debsums + failed), so we don't need to have them in the package (Closes: #181211). + + -- Sebastien Bacher Sat, 22 Feb 2003 15:25:25 +0100 + +python-gtk2 (1.99.15-1) unstable; urgency=low + + * Co-maintainer upload. + * New upstream version. + * Depends on a versioned python2.2-gtk2 (Closes: #179376). + * Updated to standards-version 3.5.8. + + -- Sebastien Bacher Fri, 21 Feb 2003 17:50:28 +0100 + +python-gtk2 (1.99.14-1) unstable; urgency=low + + * Co-maintainer upload. + * New upstream version. (Closes: #174997). + * Package is compiled with thread support (Closes: #163037). + * Corrected depend on libgtk2.0-0 (Closes: #162382). + * Added a README.Debian file (Closes: #160342). + * Corrected descriptions in control file to fix some lintian error. + * Fixed examples (Closes: #171982, #167945, #163794). + + -- Sebastien Bacher Fri, 31 Jan 2003 18:12:00 +0100 + +python-gtk2 (1.99.13-4) unstable; urgency=low + + * Rebuild against latest python2.3 (closes: #173819). + + -- Torsten Landschoff Sat, 21 Dec 2002 02:28:41 +0100 + +python-gtk2 (1.99.13-3) unstable; urgency=low + + * debian/rules: Explicitely enable threading support since the default + seems to disable it. Noticed by Matthias Urlichs - I did not notice + I was missing something. + + -- Torsten Landschoff Wed, 2 Oct 2002 00:06:29 +0200 + +python-gtk2 (1.99.13-2) unstable; urgency=low + + * debian/move_files: Fix the check_completeness function (find's return + code is not really useful it seems). + * debian/control: + + Add Sebastien Bacher as co-maintainer. + + Make the package conflict with older python-gtk versions that + don't support the pygtk.py alternative. + * debian/python2.*-gtk2.{postinst,prerm}: Manage the pygtk.py alternatives. + + -- Torsten Landschoff Sat, 31 Aug 2002 19:04:24 +0200 + +python-gtk2 (1.99.13-1) unstable; urgency=low + + * New upstream release. + * Build modules for python 2.2 as well as for 2.3. + * Create dummy packages python-* to pull the right package for + the default python release. + + -- Torsten Landschoff Fri, 30 Aug 2002 18:47:09 +0200 + +python-gtk2 (1.99.12-1) unstable; urgency=low + + * Initial Release. + + -- Torsten Landschoff Tue, 6 Aug 2002 21:50:17 +0200 + --- pygtk-2.11.0.orig/debian/compat +++ pygtk-2.11.0/debian/compat @@ -0,0 +1 @@ +5 --- pygtk-2.11.0.orig/debian/python-glade2.examples +++ pygtk-2.11.0/debian/python-glade2.examples @@ -0,0 +1 @@ +examples/glade/* --- pygtk-2.11.0.orig/debian/pycompat +++ pygtk-2.11.0/debian/pycompat @@ -0,0 +1 @@ +2 --- pygtk-2.11.0.orig/debian/copyright +++ pygtk-2.11.0/debian/copyright @@ -0,0 +1,26 @@ +This package was debianized by Torsten Landschoff on +Tue, 6 Aug 2002 21:50:17 +0200. + +It was downloaded from: + + +Upstream Author: James Henstridge + +Copyright: + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + On Debian systems you should have a local copy of the GNU Library + General Public License in /usr/share/common-licenses/LGPL-2. If you + downloaded the source you will find it in the file COPYING; if not, + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + --- pygtk-2.11.0.orig/debian/control +++ pygtk-2.11.0/debian/control @@ -0,0 +1,147 @@ +Source: pygtk +Section: python +Priority: optional +Maintainer: Ubuntu Core developers +XSBC-Original-Maintainer: Sebastien Bacher +Uploaders: Torsten Landschoff , Debian GNOME Maintainers , Loic Minier +Build-Depends: debhelper (>= 5.0.37.2), + python-support (>= 0.4), + gnome-pkg-tools (>= 0.10), + dpatch, + cdbs, + python-all-dev (>= 2.3.5-11), + python-all-dbg, + libgtk2.0-dev (>= 2.11.6), + libglib2.0-dev (>= 2.8.0), + libpango1.0-dev (>= 1.16.0), + libatk1.0-dev (>= 1.12.0), + libglade2-dev (>= 2.5.0), + python-numeric (>= 24.2-3), + python-cairo-dev (>= 1.0.2), + python-gobject-dev (>= 2.12.1), + python-gobject-dbg, + xvfb, + xsltproc, + docbook-xsl, + autotools-dev +XS-Python-Version: >= 2.3 +Standards-Version: 3.7.2 + +Package: python-gtk2 +Architecture: any +Depends: ${python:Depends}, + ${shlibs:Depends}, + ${misc:Depends}, + python-numeric (>= 24.2-3), + python-cairo (>= 1.0.2-1.1), + python-gobject (>= 2.12.1) +Provides: ${python:Provides} +Suggests: python-gtk2-dbg +Replaces: python-gtk-1.2, python2.4-gtk2 +XS-Python-Version: ${python:Version} +Conflicts: python-gdk-imlib, + python-glade, + python-gnome, + python-gtk, + python2.3-gtk2, + python2.4-gtk2, + python-gtk-1.2 (<< 0.6.12-7) +Description: Python bindings for the GTK+ widget set + This archive contains modules that allow you to use GTK+ in Python + programs. This package contains the bindings for the version 2.0 + of that toolkit. + . + URL: http://www.daa.com.au/~james/software/pygtk/ + +Package: python-gtk2-dbg +Architecture: any +Priority: extra +Depends: python-gtk2 (= ${Source-Version}), + python-dbg, + python-numeric-dbg, + python-cairo-dbg, + python-gobject-dbg, + ${shlibs:Depends} +Description: Python bindings for the GTK+ widget set (debug extension) + This archive contains modules that allow you to use GTK+ in Python + programs. This package contains the bindings for the version 2.0 + of that toolkit. + . + This package contains the extension built for the python debug interpreter. + +Package: python-gtk2-dev +Architecture: all +Depends: ${python:Depends}, + python-gtk2 (>= ${Source-Version}), + libglib2.0-dev (>= 2.8), + libgtk2.0-dev (>= 2.11.6), + python-dev, + python-gobject-dev (>= 2.12.1) +Replaces: python2.2-gtk2 (<< 1.99.17-4), + python2.3-gtk2 (<< 1.99.17-4), + python2.2-glade2 (<< 1.99.17-4), + python2.3-glade2 (<< 1.99.17-4) +Conflicts: python2.2-gtk2 (<< 1.99.17-4), + python2.3-gtk2 (<< 1.99.17-4), + python2.2-glade2 (<< 1.99.17-4), + python2.3-glade2 (<< 1.99.17-4), + python-gdk-imlib, + python-glade, + python-gnome, + python-gtk +Description: GTK+ bindings: devel files + This archive contains files that allow you to build wrappers for addon + that interoperate python-gtk2 (pygtk). + . + URL: http://www.daa.com.au/~james/software/pygtk/ + +Package: python-gtk2-doc +Section: doc +Architecture: all +Depends: ${misc:Depends}, python-gobject-doc +Description: Python bindings for the GTK+ widget set - documentation + This archive contains modules that allow you to use GTK+ in Python + programs. + . + This package contains gtk-doc-based documentation, fit for viewing on + DevHelp and other gtk-doc clients. + . + URL: http://www.daa.com.au/~james/software/pygtk/ + +Package: python-glade2 +Architecture: any +Depends: ${python:Depends}, + ${shlibs:Depends}, + ${misc:Depends}, + python-gtk2 (= ${Source-Version}) +Conflicts: python-gdk-imlib, + python-glade, + python-gnome, + python-gtk, + python2.3-glade2, + python2.4-glade2 +Provides: ${python:Provides} +Suggests: python-glade2-dbg +Description: GTK+ bindings: Glade support + Contains bindings for the glade library from use within Python. Glade + makes it very easy to create a user interface. In the target + application you just need to load the interface description from + the .glade file instead of constructing the GUI at runtime. + . + URL: http://www.daa.com.au/~james/software/pygtk/ + +Package: python-glade2-dbg +Architecture: any +Priority: extra +Depends: python-glade2 (= ${Source-Version}), + python-dbg, + python-gtk2-dbg, + ${shlibs:Depends} +Description: GTK+ bindings: Glade support (debug extension) + Contains bindings for the glade library from use within Python. Glade + makes it very easy to create a user interface. In the target + application you just need to load the interface description from + the .glade file instead of constructing the GUI at runtime. + . + This package contains the extension built for the python debug interpreter. + --- pygtk-2.11.0.orig/debian/python-gtk2.install +++ pygtk-2.11.0/debian/python-gtk2.install @@ -0,0 +1,4 @@ +debian/tmp/usr/bin/pygtk-demo +debian/tmp/usr/lib/pygtk/2.0 +debian/tmp/usr/lib/python*/site-packages/gtk-2.0/*.{so,py} +debian/tmp/usr/lib/python*/site-packages/gtk-2.0/gtk/{_gtk.so,*.py} --- pygtk-2.11.0.orig/debian/watch +++ pygtk-2.11.0/debian/watch @@ -0,0 +1,2 @@ +version=2 +ftp://ftp.gnome.org/pub/GNOME/sources/pygtk/2.10/pygtk-(.*)\.tar\.gz --- pygtk-2.11.0.orig/debian/python-gtk2-doc.install +++ pygtk-2.11.0/debian/python-gtk2-doc.install @@ -0,0 +1 @@ +debian/tmp/usr/share/gtk-doc/html --- pygtk-2.11.0.orig/debian/python-glade2.install +++ pygtk-2.11.0/debian/python-glade2.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/python*/site-packages/gtk-2.0/gtk/glade.so --- pygtk-2.11.0.orig/debian/docs +++ pygtk-2.11.0/debian/docs @@ -0,0 +1,5 @@ +NEWS +README +TODO +MAPPING +THREADS --- pygtk-2.11.0.orig/debian/python-gtk2-dev.install +++ pygtk-2.11.0/debian/python-gtk2-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/include +debian/tmp/usr/bin/pygtk-codegen-2.0 +debian/tmp/usr/lib/pkgconfig +debian/tmp/usr/share/pygtk/2.0 --- pygtk-2.11.0.orig/debian/control.in +++ pygtk-2.11.0/debian/control.in @@ -0,0 +1,147 @@ +Source: pygtk +Section: python +Priority: optional +Maintainer: Ubuntu Core developers +XSBC-Original-Maintainer: Sebastien Bacher +Uploaders: Torsten Landschoff , @GNOME_TEAM@ +Build-Depends: debhelper (>= 5.0.37.2), + python-support (>= 0.4), + gnome-pkg-tools (>= 0.10), + dpatch, + cdbs, + python-all-dev (>= 2.3.5-11), + python-all-dbg, + libgtk2.0-dev (>= 2.11.6), + libglib2.0-dev (>= 2.8.0), + libpango1.0-dev (>= 1.16.0), + libatk1.0-dev (>= 1.12.0), + libglade2-dev (>= 2.5.0), + python-numeric (>= 24.2-3), + python-cairo-dev (>= 1.0.2), + python-gobject-dev (>= 2.12.1), + python-gobject-dbg, + xvfb, + xsltproc, + docbook-xsl, + autotools-dev +XS-Python-Version: >= 2.3 +Standards-Version: 3.7.2 + +Package: python-gtk2 +Architecture: any +Depends: ${python:Depends}, + ${shlibs:Depends}, + ${misc:Depends}, + python-numeric (>= 24.2-3), + python-cairo (>= 1.0.2-1.1), + python-gobject (>= 2.12.1) +Provides: ${python:Provides} +Suggests: python-gtk2-dbg +Replaces: python-gtk-1.2, python2.4-gtk2 +XS-Python-Version: ${python:Version} +Conflicts: python-gdk-imlib, + python-glade, + python-gnome, + python-gtk, + python2.3-gtk2, + python2.4-gtk2, + python-gtk-1.2 (<< 0.6.12-7) +Description: Python bindings for the GTK+ widget set + This archive contains modules that allow you to use GTK+ in Python + programs. This package contains the bindings for the version 2.0 + of that toolkit. + . + URL: http://www.daa.com.au/~james/software/pygtk/ + +Package: python-gtk2-dbg +Architecture: any +Priority: extra +Depends: python-gtk2 (= ${Source-Version}), + python-dbg, + python-numeric-dbg, + python-cairo-dbg, + python-gobject-dbg, + ${shlibs:Depends} +Description: Python bindings for the GTK+ widget set (debug extension) + This archive contains modules that allow you to use GTK+ in Python + programs. This package contains the bindings for the version 2.0 + of that toolkit. + . + This package contains the extension built for the python debug interpreter. + +Package: python-gtk2-dev +Architecture: all +Depends: ${python:Depends}, + python-gtk2 (>= ${Source-Version}), + libglib2.0-dev (>= 2.8), + libgtk2.0-dev (>= 2.11.6), + python-dev, + python-gobject-dev (>= 2.12.1) +Replaces: python2.2-gtk2 (<< 1.99.17-4), + python2.3-gtk2 (<< 1.99.17-4), + python2.2-glade2 (<< 1.99.17-4), + python2.3-glade2 (<< 1.99.17-4) +Conflicts: python2.2-gtk2 (<< 1.99.17-4), + python2.3-gtk2 (<< 1.99.17-4), + python2.2-glade2 (<< 1.99.17-4), + python2.3-glade2 (<< 1.99.17-4), + python-gdk-imlib, + python-glade, + python-gnome, + python-gtk +Description: GTK+ bindings: devel files + This archive contains files that allow you to build wrappers for addon + that interoperate python-gtk2 (pygtk). + . + URL: http://www.daa.com.au/~james/software/pygtk/ + +Package: python-gtk2-doc +Section: doc +Architecture: all +Depends: ${misc:Depends}, python-gobject-doc +Description: Python bindings for the GTK+ widget set - documentation + This archive contains modules that allow you to use GTK+ in Python + programs. + . + This package contains gtk-doc-based documentation, fit for viewing on + DevHelp and other gtk-doc clients. + . + URL: http://www.daa.com.au/~james/software/pygtk/ + +Package: python-glade2 +Architecture: any +Depends: ${python:Depends}, + ${shlibs:Depends}, + ${misc:Depends}, + python-gtk2 (= ${Source-Version}) +Conflicts: python-gdk-imlib, + python-glade, + python-gnome, + python-gtk, + python2.3-glade2, + python2.4-glade2 +Provides: ${python:Provides} +Suggests: python-glade2-dbg +Description: GTK+ bindings: Glade support + Contains bindings for the glade library from use within Python. Glade + makes it very easy to create a user interface. In the target + application you just need to load the interface description from + the .glade file instead of constructing the GUI at runtime. + . + URL: http://www.daa.com.au/~james/software/pygtk/ + +Package: python-glade2-dbg +Architecture: any +Priority: extra +Depends: python-glade2 (= ${Source-Version}), + python-dbg, + python-gtk2-dbg, + ${shlibs:Depends} +Description: GTK+ bindings: Glade support (debug extension) + Contains bindings for the glade library from use within Python. Glade + makes it very easy to create a user interface. In the target + application you just need to load the interface description from + the .glade file instead of constructing the GUI at runtime. + . + This package contains the extension built for the python debug interpreter. + --- pygtk-2.11.0.orig/debian/rules +++ pygtk-2.11.0/debian/rules @@ -0,0 +1,142 @@ +#!/usr/bin/make -f + +export DH_VERBOSE=1 + +# Include dpatch stuff. +include /usr/share/dpatch/dpatch.make + +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +CFLAGS += -Wall -g + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +configure_flags += --prefix=/usr --enable-thread --build=$(DEB_BUILD_GNU_TYPE) + +ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) + configure_flags += --host=$(DEB_HOST_GNU_TYPE) +endif + +PYVERS=$(shell pyversions -vr 2>/dev/null) + +.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp + +build-%/configure-stamp: + dh_testdir + mkdir -p build-$* + cd build-$* && \ + PYTHON=/usr/bin/python$* CFLAGS="$(CFLAGS) -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)" \ + $(CURDIR)/configure $(configure_flags) + touch $@ + +build-%/build-stamp: build-%/configure-stamp + dh_testdir + $(MAKE) -C build-$* + xvfb-run $(MAKE) -C build-$* check + touch $@ + +dbg-build-%/configure-stamp: + dh_testdir + mkdir -p dbg-build-$* + cd dbg-build-$* && CFLAGS="$(CFLAGS) -O0" PYTHON=/usr/bin/python$*-dbg \ + ../configure --host=$(DEB_HOST_GNU_TYPE) \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr --enable-thread + touch $@ + +dbg-build-%/build-stamp: dbg-build-%/configure-stamp + dh_testdir + $(MAKE) -C dbg-build-$* + touch $@ + +build: patch $(PYVERS:%=build-%/build-stamp) $(PYVERS:%=dbg-build-%/build-stamp) + +install-clean: + dh_testdir + dh_testroot + dh_clean -k + +install-%: build-%/build-stamp + dh_testdir + dh_testroot + $(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp + +dbg-install-%: dbg-build-%/build-stamp + dh_testdir + dh_testroot + $(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-gtk2-dbg + find debian/python-gtk2-dbg ! -type d ! -name '*.so' | xargs rm -f + find debian/python-gtk2-dbg -depth -empty -exec rmdir {} \; + mkdir -p debian/python-glade2-dbg/usr/lib/python$*/site-packages/gtk-2.0/gtk + mv debian/python-gtk2-dbg/usr/lib/python$*/site-packages/gtk-2.0/gtk/glade.so debian/python-glade2-dbg/usr/lib/python$*/site-packages/gtk-2.0/gtk/ + +install: build install-clean $(PYVERS:%=install-%) $(PYVERS:%=dbg-install-%) + dh_installdirs + dh_install + find debian -name "*.py[co]" -exec rm -f {} \; + + for i in $$(find debian/python-*-dbg -name '*.so'); do \ + b=$$(basename $$i .so); \ + mv $$i $$(dirname $$i)/$${b}_d.so; \ + done + +clean:: unpatch + dh_testdir + dh_testroot + rm -Rf debian/tmp-* + rm -Rf build-* dbg-build-* + -test -f config.sub && \ + test -r /usr/share/misc/config.sub && \ + cp -f /usr/share/misc/config.sub config.sub + -test -f config.guess && \ + test -r /usr/share/misc/config.guess && \ + cp -f /usr/share/misc/config.guess config.guess + find -name '*.py[co]' | xargs -r rm -f + dh_clean + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir -i + dh_testroot -i + dh_installdocs -i + dh_installexamples -i + dh_installchangelogs ChangeLog -i + dh_link -i + dh_compress -i -X.py -X.glade + dh_fixperms -i + # More permission fixing + #chmod 755 `grep -rl "^#\!.*python" debian/python-gtk2-dev/usr` + dh_pysupport -i /usr/share/pygtk/2.0/codegen/ + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs -a + dh_installexamples -a + dh_installchangelogs ChangeLog -a + dh_strip -ppython-gtk2 --dbg-package=python-gtk2-dbg + rm -rf debian/python-gtk2-dbg/usr/share/doc/python-gtk2-dbg + ln -s python-gtk2 debian/python-gtk2-dbg/usr/share/doc/python-gtk2-dbg + dh_strip -ppython-glade2 --dbg-package=python-glade2-dbg + rm -rf debian/python-glade2-dbg/usr/share/doc/python-glade2-dbg + ln -s python-glade2 debian/python-glade2-dbg/usr/share/doc/python-glade2-dbg + dh_link -a + dh_compress -a -X.py -X.glade + dh_fixperms -a + dh_pysupport -a + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-arch binary-indep +.PHONY: build clean binary-indep binary-arch binary install