[Pkg-kde-commits] rev 501 - branches/kde-3.4.0/common-patches
Adeodato Simó
dato-guest@costa.debian.org
Sat, 26 Feb 2005 06:18:25 +0100
Author: dato-guest
Date: 2005-02-26 06:18:24 +0100 (Sat, 26 Feb 2005)
New Revision: 501
Modified:
branches/kde-3.4.0/common-patches/02_autotools_update.diff
branches/kde-3.4.0/common-patches/03_libtool_update.diff
branches/kde-3.4.0/common-patches/update.sh
Log:
common-patches/update.sh:
- cdbs doesn't like us updating config.{sub,guess} in a patch. Skip
them.
- call ./update.sh
Modified: branches/kde-3.4.0/common-patches/02_autotools_update.diff
===================================================================
--- branches/kde-3.4.0/common-patches/02_autotools_update.diff 2005-02-26 05:13:16 UTC (rev 500)
+++ branches/kde-3.4.0/common-patches/02_autotools_update.diff 2005-02-26 05:18:24 UTC (rev 501)
@@ -1,6 +1,6 @@
diff -Nrua a/admin/compile b/admin/compile
--- a/admin/compile 2002-09-30 14:18:17.000000000 +0200
-+++ b/admin/compile 2005-02-26 05:06:19.698080550 +0100
++++ b/admin/compile 2005-02-26 06:17:26.726682545 +0100
@@ -1,8 +1,9 @@
#! /bin/sh
-
@@ -182,191 +182,9 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -Nrua a/admin/config.guess b/admin/config.guess
---- a/admin/config.guess 2004-08-02 16:17:40.000000000 +0200
-+++ b/admin/config.guess 2005-02-26 05:06:19.720076702 +0100
-@@ -3,7 +3,7 @@
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-
--timestamp='2004-06-24'
-+timestamp='2004-11-12'
-
- # 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
-@@ -203,9 +203,6 @@
- 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 ;;
-@@ -230,18 +227,12 @@
- mvmeppc: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 ;;
-@@ -328,6 +319,9 @@
- *:OS/390:*:*)
- echo i370-ibm-openedition
- exit 0 ;;
-+ *:z/VM:*:*)
-+ echo s390-ibm-zvmoe
-+ exit 0 ;;
- *:OS400:*:*)
- echo powerpc-ibm-os400
- exit 0 ;;
-@@ -351,7 +345,7 @@
- DRS?6000:unix:4.0:6*)
- echo sparc-icl-nx6
- exit 0 ;;
-- DRS?6000:UNIX_SV:4.2*:7*)
-+ 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 ;;
- esac ;;
-@@ -833,6 +827,12 @@
- cris:Linux:*:*)
- echo cris-axis-linux-gnu
- exit 0 ;;
-+ crisv32:Linux:*:*)
-+ echo crisv32-axis-linux-gnu
-+ exit 0 ;;
-+ frv:Linux:*:*)
-+ echo frv-unknown-linux-gnu
-+ exit 0 ;;
- ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
-@@ -1081,7 +1081,7 @@
- exit 0 ;;
- 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=''
- test -r /etc/.relid \
- && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-@@ -1179,9 +1179,10 @@
- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
- exit 0 ;;
- *:Darwin:*:*)
-- case `uname -p` in
-+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-+ case $UNAME_PROCESSOR in
- *86) UNAME_PROCESSOR=i686 ;;
-- powerpc) UNAME_PROCESSOR=powerpc ;;
-+ unknown) UNAME_PROCESSOR=powerpc ;;
- esac
- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
- exit 0 ;;
-@@ -1249,7 +1250,10 @@
- A*) echo alpha-dec-vms && exit 0 ;;
- I*) echo ia64-dec-vms && exit 0 ;;
- V*) echo vax-dec-vms && exit 0 ;;
-- esac
-+ esac ;;
-+ *:XENIX:*:SysV)
-+ echo i386-pc-xenix
-+ exit 0 ;;
- esac
-
- #echo '(No uname command or uname output not recognized.)' 1>&2
-diff -Nrua a/admin/config.sub b/admin/config.sub
---- a/admin/config.sub 2004-08-02 16:17:40.000000000 +0200
-+++ b/admin/config.sub 2005-02-26 05:06:19.750071456 +0100
-@@ -3,7 +3,7 @@
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-
--timestamp='2004-06-24'
-+timestamp='2004-11-30'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -267,7 +267,7 @@
- | tahoe | thumb | tic4x | tic80 | tron \
- | v850 | v850e \
- | we32k \
-- | x86 | xscale | xstormy16 | xtensa \
-+ | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
- | z8k)
- basic_machine=$basic_machine-unknown
- ;;
-@@ -343,8 +343,8 @@
- | tron-* \
- | v850-* | v850e-* | vax-* \
- | we32k-* \
-- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-- | xtensa-* \
-+ | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-+ | xstormy16-* | xtensa-* \
- | ymp-* \
- | z8k-*)
- ;;
-@@ -457,6 +457,9 @@
- crds | unos)
- basic_machine=m68k-crds
- ;;
-+ crisv32 | crisv32-* | etraxfs*)
-+ basic_machine=crisv32-axis
-+ ;;
- cris | cris-* | etrax*)
- basic_machine=cris-axis
- ;;
-@@ -486,6 +489,10 @@
- basic_machine=m88k-motorola
- os=-sysv3
- ;;
-+ djgpp)
-+ basic_machine=i586-pc
-+ os=-msdosdjgpp
-+ ;;
- dpx20 | dpx20-*)
- basic_machine=rs6000-bull
- os=-bosx
-@@ -1026,6 +1033,10 @@
- basic_machine=hppa1.1-winbond
- os=-proelf
- ;;
-+ xbox)
-+ basic_machine=i686-pc
-+ os=-mingw32
-+ ;;
- xps | xps100)
- basic_machine=xps100-honeywell
- ;;
-@@ -1294,6 +1305,9 @@
- -kaos*)
- os=-kaos
- ;;
-+ -zvmoe)
-+ os=-zvmoe
-+ ;;
- -none)
- ;;
- *)
diff -Nrua a/admin/depcomp b/admin/depcomp
--- a/admin/depcomp 2003-04-16 23:53:18.000000000 +0200
-+++ b/admin/depcomp 2005-02-26 05:06:19.764069007 +0100
++++ b/admin/depcomp 2005-02-26 06:17:26.733681321 +0100
@@ -1,7 +1,9 @@
#! /bin/sh
-
@@ -850,7 +668,7 @@
+# End:
diff -Nrua a/admin/install-sh b/admin/install-sh
--- a/admin/install-sh 2003-08-07 11:41:31.000000000 +0200
-+++ b/admin/install-sh 2005-02-26 05:06:19.772067608 +0100
++++ b/admin/install-sh 2005-02-26 06:17:26.757677124 +0100
@@ -1,19 +1,38 @@
#!/bin/sh
-#
@@ -1402,7 +1220,7 @@
+# End:
diff -Nrua a/admin/missing b/admin/missing
--- a/admin/missing 2002-10-26 18:44:28.000000000 +0200
-+++ b/admin/missing 2005-02-26 05:06:19.775067083 +0100
++++ b/admin/missing 2005-02-26 06:17:26.761676424 +0100
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
@@ -1675,7 +1493,7 @@
+# End:
diff -Nrua a/admin/mkinstalldirs b/admin/mkinstalldirs
--- a/admin/mkinstalldirs 2002-10-26 18:53:16.000000000 +0200
-+++ b/admin/mkinstalldirs 2005-02-26 05:06:19.777066734 +0100
++++ b/admin/mkinstalldirs 2005-02-26 06:17:26.766675550 +0100
@@ -1,21 +1,33 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
@@ -1804,7 +1622,7 @@
-# mkinstalldirs ends here
diff -Nrua a/admin/ylwrap b/admin/ylwrap
--- a/admin/ylwrap 2001-10-05 02:46:36.000000000 +0200
-+++ b/admin/ylwrap 2005-02-26 05:06:19.783065684 +0100
++++ b/admin/ylwrap 2005-02-26 06:17:26.777673626 +0100
@@ -1,6 +1,11 @@
#! /bin/sh
# ylwrap - wrapper for lex/yacc invocations.
Modified: branches/kde-3.4.0/common-patches/03_libtool_update.diff
===================================================================
--- branches/kde-3.4.0/common-patches/03_libtool_update.diff 2005-02-26 05:13:16 UTC (rev 500)
+++ branches/kde-3.4.0/common-patches/03_libtool_update.diff 2005-02-26 05:18:24 UTC (rev 501)
@@ -1,6 +1,6 @@
diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
--- a/admin/libtool.m4.in 2005-02-03 11:19:06.000000000 +0100
-+++ b/admin/libtool.m4.in 2005-02-26 05:06:19.661087021 +0100
++++ b/admin/libtool.m4.in 2005-02-26 06:17:26.591706156 +0100
@@ -23,6 +23,7 @@
## the same distribution terms that you use for the rest of that program.
@@ -1418,7 +1418,7 @@
])
diff -Nrua a/admin/ltmain.sh b/admin/ltmain.sh
--- a/admin/ltmain.sh 2005-01-03 15:24:20.000000000 +0100
-+++ b/admin/ltmain.sh 2005-02-26 05:06:19.664086496 +0100
++++ b/admin/ltmain.sh 2005-02-26 06:17:26.633698810 +0100
@@ -1,7 +1,7 @@
# ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun configure.
Modified: branches/kde-3.4.0/common-patches/update.sh
===================================================================
--- branches/kde-3.4.0/common-patches/update.sh 2005-02-26 05:13:16 UTC (rev 500)
+++ branches/kde-3.4.0/common-patches/update.sh 2005-02-26 05:18:24 UTC (rev 501)
@@ -30,6 +30,11 @@
( cd b/admin
for file in *; do
+ case "$file" in
+ config.guess|config.sub)
+ continue
+ ;;
+ esac
if test -r "$AUTOMAKE_DIR/$file"; then
cp -f "$AUTOMAKE_DIR/$file" "$file"
fi