Bug#275570: gnome-icon-theme tries to overwrite files from kdebase
Steve Langasek
Steve Langasek <vorlon@debian.org>, 275570@bugs.debian.org
Sun, 17 Oct 2004 21:07:59 -0700
--5p8PegU4iirBW1oA
Content-Type: multipart/mixed; boundary="ZmUaFz6apKcXQszQ"
Content-Disposition: inline
--ZmUaFz6apKcXQszQ
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
tags 275570 patch
thanks
I have prepared an NMU for this issue, which will be uploaded shortly.
The (trivial) patch is attached.
Thanks,
--=20
Steve Langasek
postmodern programmer
--ZmUaFz6apKcXQszQ
Content-Type: text/plain; charset=utf-8
Content-Disposition: attachment; filename="gnome-icon-theme-275570.diff"
Content-Transfer-Encoding: quoted-printable
diff -u gnome-icon-theme-1.2.3/debian/control gnome-icon-theme-1.2.3/debian=
/control
--- gnome-icon-theme-1.2.3/debian/control
+++ gnome-icon-theme-1.2.3/debian/control
@@ -2,8 +2,9 @@
Section: gnome
Priority: optional
Maintainer: Takuo KITAME <kitame@debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.de=
bian.org>, Akira TAGOH <tagoh@debian.org>, Andreas Rottmann <rotty@debian.o=
rg>, Andrew Lau <netsnipe@users.sourceforge.net>, Carlos Perell=C3=B3 Mar=
=C3=ADn <carlos@pemas.net>, Edd Dumbill <ejad@debian.org>, Emil Soleyman-Zo=
malan <emil@nishra.com>, Gustavo Noronha Silva <kov@debian.org>, J.H.M. Das=
sen (Ray) <jdassen@debian.org>, Johannes Rohr <j.rohr@comlink.org>, Jordi M=
allach <jordi@debian.org>, Jose Carlos Garcia Sogo <jsogo@debian.org>, Joss=
elin Mouette <joss@debian.org>, Ond=C5=99ej Sur=C3=BD <ondrej@debian.org>, =
Rob Bradford <rob@debianplanet.org>, Rob Taylor <robtaylor@fastmail.fm>, Ro=
bert McQueen <robot101@debian.org>, Ross Burton <ross@debian.org>, Sebastie=
n Bacher <seb128@debian.org>,
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.de=
bian.org>, Akira TAGOH <tagoh@debian.org>, Andreas Rottmann <rotty@debian.o=
rg>, Andrew Lau <netsnipe@users.sourceforge.net>, Carlos Perell=C3=B3 Mar=
=C3=ADn <carlos@pemas.net>, Edd Dumbill <ejad@debian.org>, Emil Soleyman-Zo=
malan <emil@nishra.com>, Gustavo Noronha Silva <kov@debian.org>, J.H.M. Das=
sen (Ray) <jdassen@debian.org>, Joe Drew <drew@debian.org>, Johannes Rohr <=
j.rohr@comlink.org>, Jordi Mallach <jordi@debian.org>, Jose Carlos Garcia S=
ogo <jsogo@debian.org>, Josselin Mouette <joss@debian.org>, Marc 'HE' Brock=
schmidt <he@debian.org>, Ond=C5=99ej Sur=C3=BD <ondrej@debian.org>, Rob Bra=
dford <rob@debianplanet.org>, Robert McQueen <robot101@debian.org>, Ross Bu=
rton <ross@debian.org>, Sebastien Bacher <seb128@debian.org>,
Build-Depends-Indep: debhelper (>=3D 4.0), gettext, intltool (>=3D 0.28), =
hicolor-icon-theme, gnome-pkg-tools
+Replaces: kdebase (<< 4:3.2.2-1)
Standards-Version: 3.6.1.0
=20
Package: gnome-icon-theme
diff -u gnome-icon-theme-1.2.3/debian/control.in gnome-icon-theme-1.2.3/deb=
ian/control.in
--- gnome-icon-theme-1.2.3/debian/control.in
+++ gnome-icon-theme-1.2.3/debian/control.in
@@ -4,6 +4,7 @@
Maintainer: Takuo KITAME <kitame@debian.org>
Uploaders: @GNOME_TEAM@
Build-Depends-Indep: debhelper (>=3D 4.0), gettext, intltool (>=3D 0.28), =
hicolor-icon-theme, gnome-pkg-tools
+Replaces: kdebase (<< 4:3.2.2-1)
Standards-Version: 3.6.1.0
=20
Package: gnome-icon-theme
diff -u gnome-icon-theme-1.2.3/debian/changelog gnome-icon-theme-1.2.3/debi=
an/changelog
--- gnome-icon-theme-1.2.3/debian/changelog
+++ gnome-icon-theme-1.2.3/debian/changelog
@@ -1,3 +1,12 @@
+gnome-icon-theme (1.2.3-1.1) unstable; urgency=3Dhigh
+
+ * Non-maintainer upload.
+ * High-urgency upload for sarge-targetted RC bugfix.
+ * Document Replaces: kdebase, to allow smooth upgrades from woody
+ (closes: #275570).
+
+ -- Steve Langasek <vorlon@debian.org> Sun, 17 Oct 2004 16:46:50 -0700
+
gnome-icon-theme (1.2.3-1) unstable; urgency=3Dlow
=20
* GNOME Team Upload.
diff -u gnome-icon-theme-1.2.3/config.sub gnome-icon-theme-1.2.3/config.sub
--- gnome-icon-theme-1.2.3/config.sub
+++ gnome-icon-theme-1.2.3/config.sub
@@ -1,9 +1,9 @@
#! /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 Free Software Foundation, Inc.
=20
-timestamp=3D'2004-03-12'
+timestamp=3D'2004-06-24'
=20
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -70,7 +70,7 @@
version=3D"\
GNU config.sub ($timestamp)
=20
-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
Free Software Foundation, Inc.
=20
This is free software; see the source for copying conditions. There is NO
@@ -145,7 +145,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=3D
basic_machine=3D$1
;;
@@ -300,7 +300,7 @@
| avr-* \
| 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-* \
@@ -326,8 +326,9 @@
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipstx39-* | mipstx39el-* \
+ | mmix-* \
| msp430-* \
- | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+ | none-* | np1-* | ns16k-* | ns32k-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
@@ -445,6 +446,10 @@
basic_machine=3Dj90-cray
os=3D-unicos
;;
+ craynv)
+ basic_machine=3Dcraynv-cray
+ os=3D-unicosmp
+ ;;
cr16c)
basic_machine=3Dcr16c-unknown
os=3D-elf
@@ -659,10 +664,6 @@
mips3*)
basic_machine=3D`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
;;
- mmix*)
- basic_machine=3Dmmix-knuth
- os=3D-mmixware
- ;;
monitor)
basic_machine=3Dm68k-rom68k
os=3D-coff
@@ -743,10 +744,6 @@
np1)
basic_machine=3Dnp1-gould
;;
- nv1)
- basic_machine=3Dnv1-cray
- os=3D-unicosmp
- ;;
nsr-tandem)
basic_machine=3Dnsr-tandem
;;
@@ -1059,6 +1056,9 @@
romp)
basic_machine=3Dromp-ibm
;;
+ mmix)
+ basic_machine=3Dmmix-knuth
+ ;;
rs6000)
basic_machine=3Drs6000-ibm
;;
@@ -1374,6 +1374,9 @@
*-ibm)
os=3D-aix
;;
+ *-knuth)
+ os=3D-mmixware
+ ;;
*-wec)
os=3D-proelf
;;
diff -u gnome-icon-theme-1.2.3/config.guess gnome-icon-theme-1.2.3/config.g=
uess
--- gnome-icon-theme-1.2.3/config.guess
+++ gnome-icon-theme-1.2.3/config.guess
@@ -1,9 +1,9 @@
#! /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 Free Software Foundation, Inc.
=20
-timestamp=3D'2004-03-12'
+timestamp=3D'2004-08-13'
=20
# 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
@@ -53,7 +53,7 @@
GNU config.guess ($timestamp)
=20
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
Free Software Foundation, Inc.
=20
This is free software; see the source for copying conditions. There is NO
@@ -203,15 +203,15 @@
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 ;;
+ luna88k:OpenBSD:*:*)
+ echo m88k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
mac68k:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
@@ -227,21 +227,12 @@
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}
+ echo mips64-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 ;;
*:OpenBSD:*:*)
echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
@@ -307,9 +298,6 @@
# 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 ;;
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
@@ -764,7 +752,7 @@
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
*:UNICOS/mp:*:*)
- echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=3D`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklm=
nopqrstuvwxyz'`
@@ -787,21 +775,7 @@
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit 0 ;;
*:FreeBSD:*:*)
- # Determine whether the default compiler uses glibc.
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #include <features.h>
- #if __GLIBC__ >=3D 2
- LIBC=3Dgnu
- #else
- LIBC=3D
- #endif
-EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=3D`
- # 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=3D'k' ;; esac
- echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}=
|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(=
].*//'`
exit 0 ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
@@ -1096,9 +1070,9 @@
M680?0:D-NIX:5.3:*)
echo m68k-diab-dnix
exit 0 ;;
- M68*:*:R3V[567]*:*)
+ M68*:*:R3V[5678]*:*)
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)
+ 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=3D''
test -r /etc/.relid \
&& OS_REL=3D.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1196,9 +1170,10 @@
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
exit 0 ;;
*:Darwin:*:*)
- case `uname -p` in
+ UNAME_PROCESSOR=3D`uname -p` || UNAME_PROCESSOR=3Dunknown
+ case $UNAME_PROCESSOR in
*86) UNAME_PROCESSOR=3Di686 ;;
- powerpc) UNAME_PROCESSOR=3Dpowerpc ;;
+ unknown) UNAME_PROCESSOR=3Dpowerpc ;;
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit 0 ;;
@@ -1260,6 +1235,13 @@
*:DragonFly:*:*)
echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[=
-(].*//'`
exit 0 ;;
+ *:*VMS:*:*)
+ UNAME_MACHINE=3D`(uname -p) 2>/dev/null`
+ case "${UNAME_MACHINE}" in
+ A*) echo alpha-dec-vms && exit 0 ;;
+ I*) echo ia64-dec-vms && exit 0 ;;
+ V*) echo vax-dec-vms && exit 0 ;;
+ esac
esac
=20
#echo '(No uname command or uname output not recognized.)' 1>&2
--ZmUaFz6apKcXQszQ--
--5p8PegU4iirBW1oA
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)
iD8DBQFBc0GZKN6ufymYLloRApLfAKDTZIFLMZfpm7hh/bt4w6AuJTi0wACfbOfl
n14UmMOVRoJ3Y3fnZ1vpbB8=
=efjW
-----END PGP SIGNATURE-----
--5p8PegU4iirBW1oA--