tags 303321 patch
thanks
On Wed, Apr 06, 2005 at 04:04:50AM +0200, Frank Lichtenheld wrote:
> Package: uim
> Severity: serious
>
> Several of the binary packages build from uim conflict with each other,
> I confirmed this at least for
> libuim0-nox <-> libuim0 (e.g. usr/lib/uim/plugin/libuim-custom-enabler.so)
> libuim-nox-dev <-> libuim-dev (e.g. usr/lib/pkgconfig/uim.pc)
>
> but there may be others as well.
Proposed patch:
diff -Naur uim-0.4.6final1.bak/config.guess uim-0.4.6final1/config.guess
--- uim-0.4.6final1.bak/config.guess 2005-04-13 16:54:54.366706034 +0200
+++ uim-0.4.6final1/config.guess 2005-04-13 17:04:46.904776443 +0200
@@ -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, 2004 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2004-11-12'
+timestamp='2005-03-24'
# 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)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
2002, 2003, 2004
+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
@@ -804,6 +804,9 @@
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
exit 0 ;;
+ amd64:CYGWIN*:*:*)
+ echo x86_64-unknown-cygwin
+ exit 0 ;;
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin
exit 0 ;;
@@ -1197,6 +1200,9 @@
*:QNX:*:4*)
echo i386-pc-qnx
exit 0 ;;
+ NSE-?:NONSTOP_KERNEL:*:*)
+ echo nse-tandem-nsk${UNAME_RELEASE}
+ exit 0 ;;
NSR-?:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
exit 0 ;;
@@ -1413,7 +1419,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
diff -Naur uim-0.4.6final1.bak/config.sub uim-0.4.6final1/config.sub
--- uim-0.4.6final1.bak/config.sub 2005-04-13 16:54:54.368706754 +0200
+++ uim-0.4.6final1/config.sub 2005-04-13 17:04:46.875766011 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2004-11-30'
+timestamp='2005-02-10'
# 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="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
2002, 2003, 2004
+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
@@ -237,7 +237,7 @@
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
- | m32r | m32rle | m68000 | m68k | m88k | mcore \
+ | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -310,7 +310,7 @@
| ip2k-* | iq2000-* \
| 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-* \
diff -Naur uim-0.4.6final1.bak/debian/changelog uim-0.4.6final1/debian/changelog
--- uim-0.4.6final1.bak/debian/changelog 2005-04-13 16:54:54.711830137
+0200
+++ uim-0.4.6final1/debian/changelog 2005-04-13 16:56:15.154756561 +0200
@@ -1,3 +1,11 @@
+uim (1:0.4.6final1-2.1) unstable; urgency=high
+
+ * Non-maintainer upload
+ * Bug fix: "Several undeclared conflicts between binary packages from
+ this source package" (Closes: #303321).
+
+ -- Frank Lichtenheld <[EMAIL PROTECTED]> Wed, 13 Apr 2005 16:56:14 +0200
+
uim (1:0.4.6final1-2) unstable; urgency=low
* Add Build-Depends: intltool and libtool.
diff -Naur uim-0.4.6final1.bak/debian/control uim-0.4.6final1/debian/control
--- uim-0.4.6final1.bak/debian/control 2005-04-13 16:54:54.371707833 +0200
+++ uim-0.4.6final1/debian/control 2005-04-13 16:57:46.709678740 +0200
@@ -66,6 +66,7 @@
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, uim-common
+Conflicts: libuim0
Description: Simple, secure, and flexible input method collection and library
(without X11)
uim is a input method module library supporting various languages, which
become a frontend for Anthy, SKK, Canna, T-Code, TUT-Code, Pinyin(Chinese
@@ -101,6 +102,7 @@
Section: libdevel
Architecture: any
Depends: libuim0-nox (= ${Source-Version}), uim-common
+Conflicts: libuim-dev
Description: Development files for uim (without X11)
uim is a input method module library supporting various languages, which
become a frontend for Anthy, SKK, Canna, T-Code, TUT-Code, Pinyin(Chinese
@@ -133,6 +135,7 @@
Section: libdevel
Architecture: any
Depends: libuim0-nox (= ${Source-Version}), uim-common
+Conflicts: libuim0-dbg
Description: uim libraries and debugging symbols (without X11)
uim is a input method module library supporting various languages, which
become a frontend for Anthy, SKK, Canna, T-Code, TUT-Code, Pinyin(Chinese
Gruesse,
--
Frank Lichtenheld <[EMAIL PROTECTED]>
www: http://www.djpig.de/
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
