[Pkg-kde-commits] rev 316 - in branches/kde-3.3.2/kdeaccessibility/debian: . patches
Christopher Martin
chrsmrtn-guest@haydn.debian.org
Thu, 16 Dec 2004 13:03:27 -0700
Author: chrsmrtn-guest
Date: 2004-12-16 13:03:06 -0700 (Thu, 16 Dec 2004)
New Revision: 316
Added:
branches/kde-3.3.2/kdeaccessibility/debian/patches/01_kdeaccessibility_branch.diff
branches/kde-3.3.2/kdeaccessibility/debian/patches/06_automake-1.9.diff
Removed:
branches/kde-3.3.2/kdeaccessibility/debian/patches/01_kdeaccessibility_branch.diff.uu
Modified:
branches/kde-3.3.2/kdeaccessibility/debian/changelog
branches/kde-3.3.2/kdeaccessibility/debian/control
branches/kde-3.3.2/kdeaccessibility/debian/patches/02_autotools_update.diff
branches/kde-3.3.2/kdeaccessibility/debian/patches/03_libtool_arm.diff
branches/kde-3.3.2/kdeaccessibility/debian/patches/04_am_maintainer_mode.diff
branches/kde-3.3.2/kdeaccessibility/debian/patches/05_pedantic-errors.diff
branches/kde-3.3.2/kdeaccessibility/debian/rules
Log:
kdeaccessibility 3.3.2 initial commit.
Modified: branches/kde-3.3.2/kdeaccessibility/debian/changelog
===================================================================
--- branches/kde-3.3.2/kdeaccessibility/debian/changelog 2004-12-16 19:28:19 UTC (rev 315)
+++ branches/kde-3.3.2/kdeaccessibility/debian/changelog 2004-12-16 20:03:06 UTC (rev 316)
@@ -1,3 +1,11 @@
+kdeaccessibility (4:3.3.2-1~pre1) unstable; urgency=low
+
+ * New upstream release.
+ * KDE_3_3_BRANCH update.
+ * Remove build-dependency on automake1.9.
+
+ -- Christopher Martin <chrsmrtn@freeshell.org> Thu, 16 Dec 2004 14:43:11 -0500
+
kdeaccessibility (3.3.1-1) unstable; urgency=low
* New upstream release.
Modified: branches/kde-3.3.2/kdeaccessibility/debian/control
===================================================================
--- branches/kde-3.3.2/kdeaccessibility/debian/control 2004-12-16 19:28:19 UTC (rev 315)
+++ branches/kde-3.3.2/kdeaccessibility/debian/control 2004-12-16 20:03:06 UTC (rev 316)
@@ -2,9 +2,9 @@
Section: kde
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-Uploaders: Christopher L Cheney <ccheney@debian.org>
-Build-Depends: automake1.9, debhelper (>> 4.2.0), gawk, groff-base, kdelibs4-dev (>> 4:3.3.0), libxtst-dev, sharutils
-Standards-Version: 3.6.1.0
+Uploaders: Christopher L Cheney <ccheney@debian.org>, Christopher Martin <chrsmrtn@freeshell.org>
+Build-Depends: debhelper (>> 4.2.0), gawk, groff-base, kdelibs4-dev (>> 4:3.3.0), libxtst-dev, sharutils
+Standards-Version: 3.6.1
Package: kdeaccessibility
Section: kde
Added: branches/kde-3.3.2/kdeaccessibility/debian/patches/01_kdeaccessibility_branch.diff
===================================================================
--- branches/kde-3.3.2/kdeaccessibility/debian/patches/01_kdeaccessibility_branch.diff 2004-12-16 19:28:19 UTC (rev 315)
+++ branches/kde-3.3.2/kdeaccessibility/debian/patches/01_kdeaccessibility_branch.diff 2004-12-16 20:03:06 UTC (rev 316)
@@ -0,0 +1,21 @@
+diff -Nrua kdeaccessibility-release/admin/acinclude.m4.in kdeaccessibility-branch/admin/acinclude.m4.in
+--- kdeaccessibility-release/admin/acinclude.m4.in 2004-11-12 17:48:09.000000000 -0500
++++ kdeaccessibility-branch/admin/acinclude.m4.in 2004-12-09 16:22:14.000000000 -0500
+@@ -4254,7 +4254,8 @@
+
+ AC_DEFUN([KDE_CHECK_PYTHON],
+ [
+- KDE_CHECK_PYTHON_INTERN("2.3",
++ KDE_CHECK_PYTHON_INTERN("2.4",
++ [KDE_CHECK_PYTHON_INTERN("2.3",
+ [KDE_CHECK_PYTHON_INTERN("2.2",
+ [KDE_CHECK_PYTHON_INTERN("2.1",
+ [KDE_CHECK_PYTHON_INTERN("2.0",
+@@ -4262,6 +4263,7 @@
+ ])
+ ])
+ ])
++ ])
+ ])
+
+ AC_DEFUN([KDE_CHECK_STL],
Deleted: branches/kde-3.3.2/kdeaccessibility/debian/patches/01_kdeaccessibility_branch.diff.uu
Modified: branches/kde-3.3.2/kdeaccessibility/debian/patches/02_autotools_update.diff
===================================================================
--- branches/kde-3.3.2/kdeaccessibility/debian/patches/02_autotools_update.diff 2004-12-16 19:28:19 UTC (rev 315)
+++ branches/kde-3.3.2/kdeaccessibility/debian/patches/02_autotools_update.diff 2004-12-16 20:03:06 UTC (rev 316)
@@ -1,19 +1,18 @@
-diff -Nrua kdeaccessibility-3.3.1/admin/compile kdeaccessibility-patched/admin/compile
---- kdeaccessibility-3.3.1/admin/compile 2002-09-30 07:18:17.000000000 -0500
-+++ kdeaccessibility-patched/admin/compile 2004-11-03 20:01:22.000000000 -0600
+--- kdeaccessibility-orig/admin/compile
++++ kdeaccessibility-patched/admin/compile
@@ -1,8 +1,9 @@
#! /bin/sh
-
# Wrapper for compilers which do not understand `-c -o'.
-# Copyright 1999, 2000 Free Software Foundation, Inc.
-+scriptversion=2004-10-12.08
++scriptversion=2004-09-10.20
+
+# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
-@@ -24,76 +25,118 @@
+@@ -24,76 +25,116 @@
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
@@ -165,8 +164,6 @@
if test -f "$cofile"; then
- mv "$cofile" "$ofile"
+ mv "$cofile" "$ofile"
-+elif test -f "${cofile}bj"; then
-+ mv "${cofile}bj" "$ofile"
fi
-rmdir $lockdir
@@ -182,9 +179,8 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -Nrua kdeaccessibility-3.3.1/admin/config.guess kdeaccessibility-patched/admin/config.guess
---- kdeaccessibility-3.3.1/admin/config.guess 2004-08-02 09:17:40.000000000 -0500
-+++ kdeaccessibility-patched/admin/config.guess 2004-08-25 09:25:50.000000000 -0500
+--- kdeaccessibility-orig/admin/config.guess
++++ kdeaccessibility-patched/admin/config.guess
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
@@ -246,9 +242,8 @@
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit 0 ;;
-diff -Nrua kdeaccessibility-3.3.1/admin/depcomp kdeaccessibility-patched/admin/depcomp
---- kdeaccessibility-3.3.1/admin/depcomp 2003-04-16 16:53:18.000000000 -0500
-+++ kdeaccessibility-patched/admin/depcomp 2004-11-03 20:01:22.000000000 -0600
+--- kdeaccessibility-orig/admin/depcomp
++++ kdeaccessibility-patched/admin/depcomp
@@ -1,7 +1,9 @@
#! /bin/sh
-
@@ -719,16 +714,15 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -Nrua kdeaccessibility-3.3.1/admin/install-sh kdeaccessibility-patched/admin/install-sh
---- kdeaccessibility-3.3.1/admin/install-sh 2003-08-07 04:41:31.000000000 -0500
-+++ kdeaccessibility-patched/admin/install-sh 2004-11-03 20:01:22.000000000 -0600
+--- kdeaccessibility-orig/admin/install-sh
++++ kdeaccessibility-patched/admin/install-sh
@@ -1,19 +1,38 @@
#!/bin/sh
-#
# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
+
-+scriptversion=2004-10-22.00
++scriptversion=2004-09-10.20
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
@@ -787,7 +781,7 @@
# put in absolute paths if you don't have them in your path; or use env. vars.
mvprog="${MVPROG-mv}"
-@@ -41,236 +58,266 @@
+@@ -41,236 +58,265 @@
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
@@ -1161,7 +1155,7 @@
+ fi
+
+ # This sed command emulates the dirname command.
-+ dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
++ dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+
+ # Make sure that the destination directory exists.
+
@@ -1174,8 +1168,7 @@
+ oIFS=$IFS
+ # Some sh's can't handle IFS=/ for some reason.
+ IFS='%'
-+ set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-+ shift
++ set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+ IFS=$oIFS
+
+ pathcomp=
@@ -1271,9 +1264,8 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -Nrua kdeaccessibility-3.3.1/admin/missing kdeaccessibility-patched/admin/missing
---- kdeaccessibility-3.3.1/admin/missing 2002-10-26 11:44:28.000000000 -0500
-+++ kdeaccessibility-patched/admin/missing 2004-11-03 20:01:22.000000000 -0600
+--- kdeaccessibility-orig/admin/missing
++++ kdeaccessibility-patched/admin/missing
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
@@ -1530,9 +1522,8 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -Nrua kdeaccessibility-3.3.1/admin/mkinstalldirs kdeaccessibility-patched/admin/mkinstalldirs
---- kdeaccessibility-3.3.1/admin/mkinstalldirs 2002-10-26 11:53:16.000000000 -0500
-+++ kdeaccessibility-patched/admin/mkinstalldirs 2004-11-03 20:01:22.000000000 -0600
+--- kdeaccessibility-orig/admin/mkinstalldirs
++++ kdeaccessibility-patched/admin/mkinstalldirs
@@ -1,20 +1,32 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
@@ -1657,9 +1648,8 @@
+# time-stamp-end: "$"
# End:
-# mkinstalldirs ends here
-diff -Nrua kdeaccessibility-3.3.1/admin/ylwrap kdeaccessibility-patched/admin/ylwrap
---- kdeaccessibility-3.3.1/admin/ylwrap 2001-10-04 19:46:36.000000000 -0500
-+++ kdeaccessibility-patched/admin/ylwrap 2004-11-03 20:01:22.000000000 -0600
+--- kdeaccessibility-orig/admin/ylwrap
++++ kdeaccessibility-patched/admin/ylwrap
@@ -1,6 +1,11 @@
#! /bin/sh
# ylwrap - wrapper for lex/yacc invocations.
Modified: branches/kde-3.3.2/kdeaccessibility/debian/patches/03_libtool_arm.diff
===================================================================
--- branches/kde-3.3.2/kdeaccessibility/debian/patches/03_libtool_arm.diff 2004-12-16 19:28:19 UTC (rev 315)
+++ branches/kde-3.3.2/kdeaccessibility/debian/patches/03_libtool_arm.diff 2004-12-16 20:03:06 UTC (rev 316)
@@ -1,6 +1,5 @@
-diff -Nrua kdeaccessibility-3.2.2/admin/libtool.m4.in kdeaccessibility-patched/admin/libtool.m4.in
---- kdeaccessibility-3.2.2/admin/libtool.m4.in 2004-04-02 09:41:05.000000000 -0600
-+++ kdeaccessibility-patched/admin/libtool.m4.in 2004-04-11 22:53:24.000000000 -0500
+--- kdeaccessibility-orig/admin/libtool.m4.in
++++ kdeaccessibility-patched/admin/libtool.m4.in
@@ -2180,17 +2180,7 @@
# This must be Linux ELF.
Modified: branches/kde-3.3.2/kdeaccessibility/debian/patches/04_am_maintainer_mode.diff
===================================================================
--- branches/kde-3.3.2/kdeaccessibility/debian/patches/04_am_maintainer_mode.diff 2004-12-16 19:28:19 UTC (rev 315)
+++ branches/kde-3.3.2/kdeaccessibility/debian/patches/04_am_maintainer_mode.diff 2004-12-16 20:03:06 UTC (rev 316)
@@ -1,12 +1,11 @@
-diff -Nru kdeutils-3.1.4/admin/configure.in.min kdeutils-patched/admin/configure.in.min
---- kdeutils-3.1.4/admin/configure.in.min 2001-11-07 05:17:28.000000000 -0600
-+++ kdeutils-patched/admin/configure.in.min 2003-10-18 03:10:32.000000000 -0500
+--- kdeaccessibility-orig/admin/configure.in.min
++++ kdeaccessibility-patched/admin/configure.in.min
@@ -38,6 +38,8 @@
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
-
+
+AM_MAINTAINER_MODE
+
KDE_SET_PREFIX
-
+
dnl generate the config header
Modified: branches/kde-3.3.2/kdeaccessibility/debian/patches/05_pedantic-errors.diff
===================================================================
--- branches/kde-3.3.2/kdeaccessibility/debian/patches/05_pedantic-errors.diff 2004-12-16 19:28:19 UTC (rev 315)
+++ branches/kde-3.3.2/kdeaccessibility/debian/patches/05_pedantic-errors.diff 2004-12-16 20:03:06 UTC (rev 316)
@@ -1,6 +1,5 @@
-diff -Nrua kdeaccessibility-3.2.92/admin/acinclude.m4.in kdeaccessibility-patched/admin/acinclude.m4.in
---- kdeaccessibility-3.2.92/admin/acinclude.m4.in 2004-07-27 16:11:36.000000000 -0500
-+++ kdeaccessibility-patched/admin/acinclude.m4.in 2004-07-27 16:12:36.000000000 -0500
+--- kdeaccessibility-orig/admin/acinclude.m4.in
++++ kdeaccessibility-patched/admin/acinclude.m4.in
@@ -2087,9 +2087,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
Added: branches/kde-3.3.2/kdeaccessibility/debian/patches/06_automake-1.9.diff
===================================================================
--- branches/kde-3.3.2/kdeaccessibility/debian/patches/06_automake-1.9.diff 2004-12-16 19:28:19 UTC (rev 315)
+++ branches/kde-3.3.2/kdeaccessibility/debian/patches/06_automake-1.9.diff 2004-12-16 20:03:06 UTC (rev 316)
@@ -0,0 +1,11 @@
+--- kdeaccessibility-orig/admin/detect-autoconf.sh
++++ kdeaccessibility-patched/admin/detect-autoconf.sh
+@@ -11,7 +11,7 @@
+ # needed to compile KDE. Do not forget to include the name/version #
+ # separator if one is present, e.g. -1.2 where - is the separator.
+ KDE_AUTOCONF_VERS="-2.58 -2.57 257 -2.54 -2.53a -2.53 -2.52 -2.5x"
+-KDE_AUTOMAKE_VERS="-1.7 17 -1.6"
++KDE_AUTOMAKE_VERS="-1.9 -1.7 17 -1.6"
+
+ # We don't use variable here for remembering the type ... strings. Local
+ # variables are not that portable, but we fear namespace issues with our
Modified: branches/kde-3.3.2/kdeaccessibility/debian/rules
===================================================================
--- branches/kde-3.3.2/kdeaccessibility/debian/rules 2004-12-16 19:28:19 UTC (rev 315)
+++ branches/kde-3.3.2/kdeaccessibility/debian/rules 2004-12-16 20:03:06 UTC (rev 316)
@@ -72,7 +72,8 @@
# run configure with build tree $(objdir)
cd $(objdir) && \
- ../configure $(configkde) --enable-final
+ ../configure $(configkde) --enable-final \
+ --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
touch configure-stamp
@@ -207,7 +208,7 @@
dh_fixperms
# dh_perl
# dh_python
- dh_makeshlibs -V
+ env DH_COMPAT=3 dh_makeshlibs -V
dh_installdeb
dh_shlibdeps
dh_gencontrol