tags 382642 patch
thanks

This bug is caused by terrible mingling of arch: any and arch: all packages
in the binary-arch target.  I really don't know what the thought process
here was, but building arch: all packages in the binary-arch target is very,
very wrong.

The attached patch fixes this build failure.  I will be uploading this 0-day
NMU shortly after testing the fix on i386/amd64/alpha, as there are a number
of packages waiting on this new version of gmime.

-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
[EMAIL PROTECTED]                                   http://www.debian.org/
diff -u gmime2.2-2.2.3/config.guess gmime2.2-2.2.3/config.guess
--- gmime2.2-2.2.3/config.guess
+++ gmime2.2-2.2.3/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, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2006-02-23'
+timestamp='2006-07-02'
 
 # 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
@@ -210,7 +211,7 @@
        echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
        exit ;;
     macppc:MirBSD:*:*)
-       echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+       echo powerpc-unknown-mirbsd${UNAME_RELEASE}
        exit ;;
     *:MirBSD:*:*)
        echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -770,6 +771,8 @@
        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
@@ -780,9 +783,6 @@
     i*:MINGW*:*)
        echo ${UNAME_MACHINE}-pc-mingw32
        exit ;;
-    i*:MSYS_NT-*:*:*)
-       echo ${UNAME_MACHINE}-pc-mingw32
-       exit ;;
     i*:windows32*:*)
        # uname -m includes "-pc" on this system.
        echo ${UNAME_MACHINE}-mingw32
@@ -790,10 +790,10 @@
     i*:PW*:*)
        echo ${UNAME_MACHINE}-pc-pw32
        exit ;;
-    x86:Interix*:[345]*)
+    x86:Interix*:[3456]*)
        echo i586-pc-interix${UNAME_RELEASE}
        exit ;;
-    EM64T:Interix*:[345]*)
+    EM64T:Interix*:[3456]*)
        echo x86_64-unknown-interix${UNAME_RELEASE}
        exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@@ -831,6 +831,9 @@
     arm*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
        exit ;;
+    avr32*:Linux:*:*)
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
+       exit ;;
     cris:Linux:*:*)
        echo cris-axis-linux-gnu
        exit ;;
@@ -989,7 +992,7 @@
        LIBC=gnulibc1
        # endif
        #else
-       #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
+       #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) 
|| defined(__SUNPRO_CC)
        LIBC=gnu
        #else
        LIBC=gnuaout
diff -u gmime2.2-2.2.3/config.sub gmime2.2-2.2.3/config.sub
--- gmime2.2-2.2.3/config.sub
+++ gmime2.2-2.2.3/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, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2006-02-23'
+timestamp='2006-07-02'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -240,7 +241,7 @@
        | 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 \
@@ -248,7 +249,8 @@
        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
        | i370 | i860 | i960 | ia64 \
        | ip2k | iq2000 \
-       | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore 
\
+       | m32c | m32r | m32rle | m68000 | m68k | m88k \
+       | maxq | mb | microblaze | mcore \
        | mips | mipsbe | mipseb | mipsel | mipsle \
        | mips16 \
        | mips64 | mips64el \
@@ -274,11 +276,11 @@
        | pdp10 | pdp11 | pj | pjl \
        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
        | pyramid \
-       | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | 
sh[1234]le | sh3ele \
+       | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | 
sh[1234]le | sh3ele \
        | sh64 | sh64le \
-       | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-       | sparcv8 | sparcv9 | sparcv9b \
-       | strongarm \
+       | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | 
sparclite \
+       | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+       | spu | strongarm \
        | tahoe | thumb | tic4x | tic80 | tron \
        | v850 | v850e \
        | we32k \
@@ -286,9 +288,6 @@
        | z8k)
                basic_machine=$basic_machine-unknown
                ;;
-       m32c)
-               basic_machine=$basic_machine-unknown
-               ;;
        m6811 | m68hc11 | m6812 | m68hc12)
                # Motorola 68HC11/12.
                basic_machine=$basic_machine-unknown
@@ -318,7 +317,7 @@
        | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
        | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-       | avr-* \
+       | avr-* | avr32-* \
        | bfin-* | bs2000-* \
        | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
        | clipper-* | craynv-* | cydra-* \
@@ -329,7 +328,7 @@
        | 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-* | maxq-* | mcore-* \
        | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -358,11 +357,11 @@
        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
        | pyramid-* \
        | romp-* | rs6000-* \
-       | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+       | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | 
shbe-* \
        | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-       | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+       | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | 
sparclet-* \
        | sparclite-* \
-       | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+       | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* 
| sx?-* \
        | tahoe-* | thumb-* \
        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
        | tron-* \
@@ -373,8 +372,6 @@
        | ymp-* \
        | z8k-*)
                ;;
-       m32c-*)
-               ;;
        # Recognize the various machine names and aliases which stand
        # for a CPU type and a company and sometimes even an OS.
        386bsd)
@@ -1128,7 +1125,7 @@
        sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
                basic_machine=sh-unknown
                ;;
-       sparc | sparcv8 | sparcv9 | sparcv9b)
+       sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
                basic_machine=sparc-sun
                ;;
        cydra)
@@ -1217,7 +1214,7 @@
              | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
              | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-             | -skyos* | -haiku* | -rdos*)
+             | -skyos* | -haiku* | -rdos* | -toppers*)
        # Remember, each alternative MUST END IN *, to match a version number.
                ;;
        -qnx*)
@@ -1369,6 +1366,9 @@
 # system, and we'll never get to this point.
 
 case $basic_machine in
+        spu-*)
+               os=-elf
+               ;;
        *-acorn)
                os=-riscix1.2
                ;;
@@ -1378,9 +1378,9 @@
        arm*-semi)
                os=-aout
                ;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
+        c4x-* | tic4x-*)
+               os=-coff
+               ;;
        # This must come before the *-dec entry.
        pdp10-*)
                os=-tops20
diff -u gmime2.2-2.2.3/debian/changelog gmime2.2-2.2.3/debian/changelog
--- gmime2.2-2.2.3/debian/changelog
+++ gmime2.2-2.2.3/debian/changelog
@@ -1,3 +1,16 @@
+gmime2.2 (2.2.3-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Properly split the binary-arch and binary-indep targets, and the
+    build-depends as well, instead of wrongly processing all arch: all
+    packages in the binary-arch target and failing whenever the C#
+    packages aren't installed.  In addition, move these mono build-deps
+    into Build-Depends-Indep where they belong, as well as the packages
+    used for doc building (docbook-utils, gtk-doc-tools).
+    Closes: #382642.
+
+ -- Steve Langasek <[EMAIL PROTECTED]>  Sat,  9 Sep 2006 23:31:49 -0700
+
 gmime2.2 (2.2.3-1) unstable; urgency=low
 
   * New upstream release (Closes: #366231)
diff -u gmime2.2-2.2.3/debian/rules gmime2.2-2.2.3/debian/rules
--- gmime2.2-2.2.3/debian/rules
+++ gmime2.2-2.2.3/debian/rules
@@ -72,32 +72,51 @@
 
 
 binary-indep: build install
-
-binary-arch: build install
-       dh_testdir -s -i
-       dh_testroot -s -i
+       dh_testdir
+       dh_testroot
        # move files to where they supposedly belong
-       dh_install -a -i --sourcedir=debian/tmp
-       rm -f debian/libgmime-2.0-2-dev/usr/bin/uu{decode,encode}
+       dh_install -i --sourcedir=debian/tmp
        chmod 644 
debian/libgmime2.2-cil/usr/lib/cli/gmime-sharp-2.2/gmime-sharp.dll
 
-       dh_installdocs -s -i
-       dh_installman -s -i
-       dh_installinfo -s -i
-       dh_installchangelogs -s -i ChangeLog
-       dh_link -s -i
-       dh_strip -s -i
-       dh_compress -s -i
-       dh_fixperms -s -i
-       dh_makeshlibs -s -i
+       dh_installdocs -i
+       dh_installman -i
+       dh_installinfo -i
+       dh_installchangelogs -i ChangeLog
+       dh_link -i
+       dh_strip -i
+       dh_compress -i
+       dh_fixperms -i
+       dh_makeshlibs -i
        dh_makeclilibs -plibgmime2.2-cil -m $(UPVERSION)
        dh_installcligac -plibgmime2.2-cil
-       dh_installdeb -s -i
-       dh_shlibdeps -s -i
+       dh_installdeb -i
+       dh_shlibdeps -i
        dh_clideps -d -plibgmime2.2-cil
-       dh_gencontrol -s -i
-       dh_md5sums -s -i
-       dh_builddeb -s -i
+       dh_gencontrol -i
+       dh_md5sums -i
+       dh_builddeb -i
+
+binary-arch: build install
+       dh_testdir
+       dh_testroot
+       # move files to where they supposedly belong
+       dh_install -s --sourcedir=debian/tmp
+       rm -f debian/libgmime-2.0-2-dev/usr/bin/uu{decode,encode}
+
+       dh_installdocs -s
+       dh_installman -s
+       dh_installinfo -s
+       dh_installchangelogs -s ChangeLog
+       dh_link -s
+       dh_strip -s
+       dh_compress -s
+       dh_fixperms -s
+       dh_makeshlibs -s
+       dh_installdeb -s
+       dh_shlibdeps -s
+       dh_gencontrol -s
+       dh_md5sums -s
+       dh_builddeb -s
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure patch 
unpatch
diff -u gmime2.2-2.2.3/debian/control gmime2.2-2.2.3/debian/control
--- gmime2.2-2.2.3/debian/control
+++ gmime2.2-2.2.3/debian/control
@@ -3,7 +3,8 @@
 Priority: optional
 Maintainer: Guus Sliepen <[EMAIL PROTECTED]>
 Uploaders: Jose Carlos Garcia Sogo <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4.0.0), libglib2.0-dev, gtk-doc-tools, 
autotools-dev, docbook-utils, zlib1g-dev, cli-common-dev (>= 0.4.0) [i386 
powerpc amd64 ia64], mono-mcs [i386 powerpc amd64 ia64], mono-gac [i386 powerpc 
amd64 ia64], libgtk2.0-cil [i386 powerpc amd64 ia64], gtk-sharp2-gapi (>= 
2.4.0) [i386 powerpc amd64 ia64], dpatch
+Build-Depends: debhelper (>> 4.0.0), libglib2.0-dev, autotools-dev, 
zlib1g-dev, dpatch
+Build-Depends-Indep: cli-common-dev (>= 0.4.0), mono-mcs, mono-gac, 
libgtk2.0-cil, gtk-sharp2-gapi (>= 2.4.0), gtk-doc-tools, docbook-utils
 Standards-Version: 3.7.2
 
 Package: libgmime-2.0-2-dev

Reply via email to