[Pkg-kde-commits] rev 379 - in trunk/packages: kdeaccessibility/debian kdeaccessibility/debian/patches kdeadmin/debian kdeadmin/debian/patches kdebase/debian kdebase/debian/local kdebase/debian/patches kdegraphics/debian kdegraphics/debian/patches kdelibs/debian kdelibs/debian/man kdelibs/debian/patches kdemultimedia/debian kdemultimedia/debian/man kdemultimedia/debian/patches kdenetwork/debian kdenetwork/debian/patches kdeutils/debian kdeutils/debian/man kdeutils/debian/patches

Adeodato Simó dato-guest@costa.debian.org
Fri, 07 Jan 2005 18:35:25 +0100 

Author: dato-guest
Date: 2005-01-07 18:35:10 +0100 (Fri, 07 Jan 2005)
New Revision: 379

Added:
   trunk/packages/kdeaccessibility/debian/patches/01_kdeaccessibility_branch.diff.uu
   trunk/packages/kdeaccessibility/debian/patches/06_automake-1.9.diff
   trunk/packages/kdeadmin/debian/patches/01_kdeadmin_branch.diff.uu
   trunk/packages/kdeadmin/debian/patches/06_automake-1.9.diff
   trunk/packages/kdebase/debian/kappfinder.manpages
   trunk/packages/kdebase/debian/kate.manpages
   trunk/packages/kdebase/debian/kdepasswd.manpages
   trunk/packages/kdebase/debian/kfind.manpages
   trunk/packages/kdebase/debian/kmenuedit.manpages
   trunk/packages/kdebase/debian/kpager.manpages
   trunk/packages/kdebase/debian/kwin.postinst
   trunk/packages/kdebase/debian/kwin.prerm
   trunk/packages/kdebase/debian/local/README.Linux-font
   trunk/packages/kdebase/debian/man/
   trunk/packages/kdebase/debian/patches/01_kdebase_branch.diff.uu
   trunk/packages/kdebase/debian/patches/06_automake-1.9.diff
   trunk/packages/kdebase/debian/patches/07_xlibs-static-pic.diff
   trunk/packages/kdebase/debian/patches/10_default_sessionsdirs.diff
   trunk/packages/kdebase/debian/patches/11_genkdmconf.diff
   trunk/packages/kdebase/debian/patches/12_genkdm_make.diff
   trunk/packages/kdebase/debian/patches/13_cups_docroot.diff
   trunk/packages/kdebase/debian/patches/14_konsole_README.Linux-font.diff
   trunk/packages/kdegraphics/debian/extra/
   trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch.diff.uu
   trunk/packages/kdegraphics/debian/patches/06_automake-1.9.diff
   trunk/packages/kdegraphics/debian/patches/07_xlibs-static-pic.diff
   trunk/packages/kdegraphics/debian/patches/10_correct-nedit-invocation.diff
   trunk/packages/kdegraphics/debian/patches/11_ksvgplugin-bump-preference.diff
   trunk/packages/kdelibs/debian/patches/01_kdelibs_branch.diff.uu
   trunk/packages/kdelibs/debian/patches/06_automake-1.9.diff
   trunk/packages/kdelibs/debian/patches/12_cups_docroot.diff
   trunk/packages/kdemultimedia/debian/kaboodle.manpages
   trunk/packages/kdemultimedia/debian/kmix.manpages
   trunk/packages/kdemultimedia/debian/krec.manpages
   trunk/packages/kdemultimedia/debian/man/kaboodle.1
   trunk/packages/kdemultimedia/debian/man/kmix.1
   trunk/packages/kdemultimedia/debian/man/kmixctrl.1
   trunk/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch.diff.uu
   trunk/packages/kdemultimedia/debian/patches/06_automake-1.9.diff
   trunk/packages/kdemultimedia/debian/patches/07_xlibs-static-pic.diff
   trunk/packages/kdenetwork/debian/patches/01_kdenetwork_branch.diff.uu
   trunk/packages/kdenetwork/debian/patches/06_automake-1.9.diff
   trunk/packages/kdenetwork/debian/patches/07_xlibs-static-pic.diff
   trunk/packages/kdenetwork/debian/patches/10_kppp_options.diff
   trunk/packages/kdenetwork/debian/patches/11_kpf-non-ascii-too.diff
   trunk/packages/kdeutils/debian/kcharselect.manpages
   trunk/packages/kdeutils/debian/man/kcharselect.1
   trunk/packages/kdeutils/debian/patches/01_kdeutils_branch.diff.uu
   trunk/packages/kdeutils/debian/patches/06_automake-1.9.diff
   trunk/packages/kdeutils/debian/patches/07_kfloppy-devicename-table.diff
Removed:
   trunk/packages/kdeaccessibility/debian/patches/01_kdeaccessibility_branch.diff.uu
   trunk/packages/kdeadmin/debian/patches/01_kdeadmin_branch.diff.uu
   trunk/packages/kdebase/debian/local/README.linux.console
   trunk/packages/kdebase/debian/patches/01_kdebase_branch.diff.uu
   trunk/packages/kdebase/debian/patches/06_xlibs-static-pic.diff
   trunk/packages/kdebase/debian/patches/10_genkdmconf.diff
   trunk/packages/kdebase/debian/patches/post-3.3.1-kdebase-smb.diff
   trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch.diff.uu
   trunk/packages/kdegraphics/debian/patches/06_xlibs-static-pic.diff
   trunk/packages/kdelibs/debian/patches/01_kdelibs_branch.diff.uu
   trunk/packages/kdelibs/debian/patches/post-3.3.1-kdelibs-khtml.diff
   trunk/packages/kdelibs/debian/patches/post-3.3.1-kdelibs-kio.diff
   trunk/packages/kdelibs/debian/patches/post-3.3.2-kdelibs-htmlframes2.diff
   trunk/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch.diff.uu
   trunk/packages/kdemultimedia/debian/patches/06_xlibs-static-pic.diff
   trunk/packages/kdenetwork/debian/patches/06_xlibs-static-pic.diff
   trunk/packages/kdenetwork/debian/patches/10_pppdargs.diff
   trunk/packages/kdenetwork/debian/patches/11_kget.diff
   trunk/packages/kdeutils/debian/patches/01_kdeutils_branch.diff.uu
Modified:
   trunk/packages/kdeaccessibility/debian/changelog
   trunk/packages/kdeaccessibility/debian/control
   trunk/packages/kdeaccessibility/debian/patches/02_autotools_update.diff
   trunk/packages/kdeaccessibility/debian/patches/03_libtool_arm.diff
   trunk/packages/kdeaccessibility/debian/patches/04_am_maintainer_mode.diff
   trunk/packages/kdeaccessibility/debian/patches/05_pedantic-errors.diff
   trunk/packages/kdeaccessibility/debian/rules
   trunk/packages/kdeadmin/debian/changelog
   trunk/packages/kdeadmin/debian/control
   trunk/packages/kdeadmin/debian/patches/02_autotools_update.diff
   trunk/packages/kdeadmin/debian/patches/03_libtool_arm.diff
   trunk/packages/kdeadmin/debian/patches/04_am_maintainer_mode.diff
   trunk/packages/kdeadmin/debian/patches/05_pedantic-errors.diff
   trunk/packages/kdeadmin/debian/rules
   trunk/packages/kdebase/debian/changelog
   trunk/packages/kdebase/debian/control
   trunk/packages/kdebase/debian/konsole.docs
   trunk/packages/kdebase/debian/patches/02_autotools_update.diff
   trunk/packages/kdebase/debian/patches/03_libtool_arm.diff
   trunk/packages/kdebase/debian/patches/04_am_maintainer_mode.diff
   trunk/packages/kdebase/debian/patches/05_pedantic-errors.diff
   trunk/packages/kdebase/debian/rules
   trunk/packages/kdegraphics/debian/changelog
   trunk/packages/kdegraphics/debian/control
   trunk/packages/kdegraphics/debian/ksvg.install
   trunk/packages/kdegraphics/debian/patches/02_autotools_update.diff
   trunk/packages/kdegraphics/debian/patches/03_libtool_arm.diff
   trunk/packages/kdegraphics/debian/patches/04_am_maintainer_mode.diff
   trunk/packages/kdegraphics/debian/patches/05_pedantic-errors.diff
   trunk/packages/kdegraphics/debian/rules
   trunk/packages/kdelibs/debian/
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/control
   trunk/packages/kdelibs/debian/kdelibs-data.install
   trunk/packages/kdelibs/debian/kdelibs4-dev.install
   trunk/packages/kdelibs/debian/man/
   trunk/packages/kdelibs/debian/man/dcop.sgml
   trunk/packages/kdelibs/debian/patches/02_autotools_update.diff
   trunk/packages/kdelibs/debian/patches/03_libtool_arm.diff
   trunk/packages/kdelibs/debian/patches/04_am_maintainer_mode.diff
   trunk/packages/kdelibs/debian/patches/05_pedantic-errors.diff
   trunk/packages/kdelibs/debian/patches/10_kstandarddirs.diff
   trunk/packages/kdelibs/debian/patches/11_applications_menu.diff
   trunk/packages/kdelibs/debian/rules
   trunk/packages/kdemultimedia/debian/changelog
   trunk/packages/kdemultimedia/debian/control
   trunk/packages/kdemultimedia/debian/patches/02_autotools_update.diff
   trunk/packages/kdemultimedia/debian/patches/03_libtool_arm.diff
   trunk/packages/kdemultimedia/debian/patches/04_am_maintainer_mode.diff
   trunk/packages/kdemultimedia/debian/patches/05_pedantic-errors.diff
   trunk/packages/kdemultimedia/debian/patches/10_dont-define-__64.diff
   trunk/packages/kdemultimedia/debian/rules
   trunk/packages/kdenetwork/debian/changelog
   trunk/packages/kdenetwork/debian/control
   trunk/packages/kdenetwork/debian/kppp.README.Debian
   trunk/packages/kdenetwork/debian/kppp.install
   trunk/packages/kdenetwork/debian/patches/02_autotools_update.diff
   trunk/packages/kdenetwork/debian/patches/03_libtool_arm.diff
   trunk/packages/kdenetwork/debian/patches/04_am_maintainer_mode.diff
   trunk/packages/kdenetwork/debian/patches/05_pedantic-errors.diff
   trunk/packages/kdenetwork/debian/rules
   trunk/packages/kdeutils/debian/changelog
   trunk/packages/kdeutils/debian/control
   trunk/packages/kdeutils/debian/patches/02_autotools_update.diff
   trunk/packages/kdeutils/debian/patches/03_libtool_arm.diff
   trunk/packages/kdeutils/debian/patches/04_am_maintainer_mode.diff
   trunk/packages/kdeutils/debian/patches/05_pedantic-errors.diff
   trunk/packages/kdeutils/debian/rules
Log:
BIG COMMIT: merged branches/kde-3.3.2 back to trunk.


Modified: trunk/packages/kdeaccessibility/debian/changelog
===================================================================
--- trunk/packages/kdeaccessibility/debian/changelog	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdeaccessibility/debian/changelog	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,3 +1,11 @@
+kdeaccessibility (4:3.3.2-0pre1) experimental; 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: trunk/packages/kdeaccessibility/debian/control
===================================================================
--- trunk/packages/kdeaccessibility/debian/control	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdeaccessibility/debian/control	2005-01-07 17:35:10 UTC (rev 379)
@@ -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>, Adeodato Simó <asp16@alu.ua.es>
+Build-Depends: debhelper (>> 4.2.0), gawk, groff-base, kdelibs4-dev (>> 4:3.3.2), libxtst-dev, sharutils
+Standards-Version: 3.6.1
 
 Package: kdeaccessibility
 Section: kde

Deleted: trunk/packages/kdeaccessibility/debian/patches/01_kdeaccessibility_branch.diff.uu

Copied: trunk/packages/kdeaccessibility/debian/patches/01_kdeaccessibility_branch.diff.uu (from rev 378, branches/kde-3.3.2/kdeaccessibility/debian/patches/01_kdeaccessibility_branch.diff.uu)

Modified: trunk/packages/kdeaccessibility/debian/patches/02_autotools_update.diff
===================================================================
--- trunk/packages/kdeaccessibility/debian/patches/02_autotools_update.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdeaccessibility/debian/patches/02_autotools_update.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,6 +1,5 @@
-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
 -
@@ -182,9 +181,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 +244,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,9 +716,8 @@
 +# 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
 -#
@@ -1271,9 +1267,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 +1525,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 +1651,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: trunk/packages/kdeaccessibility/debian/patches/03_libtool_arm.diff
===================================================================
--- trunk/packages/kdeaccessibility/debian/patches/03_libtool_arm.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdeaccessibility/debian/patches/03_libtool_arm.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -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: trunk/packages/kdeaccessibility/debian/patches/04_am_maintainer_mode.diff
===================================================================
--- trunk/packages/kdeaccessibility/debian/patches/04_am_maintainer_mode.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdeaccessibility/debian/patches/04_am_maintainer_mode.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -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: trunk/packages/kdeaccessibility/debian/patches/05_pedantic-errors.diff
===================================================================
--- trunk/packages/kdeaccessibility/debian/patches/05_pedantic-errors.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdeaccessibility/debian/patches/05_pedantic-errors.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -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"

Copied: trunk/packages/kdeaccessibility/debian/patches/06_automake-1.9.diff (from rev 378, branches/kde-3.3.2/kdeaccessibility/debian/patches/06_automake-1.9.diff)

Modified: trunk/packages/kdeaccessibility/debian/rules
===================================================================
--- trunk/packages/kdeaccessibility/debian/rules	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdeaccessibility/debian/rules	2005-01-07 17:35:10 UTC (rev 379)
@@ -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

Modified: trunk/packages/kdeadmin/debian/changelog
===================================================================
--- trunk/packages/kdeadmin/debian/changelog	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdeadmin/debian/changelog	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,3 +1,11 @@
+kdeadmin (4:3.3.2-0pre1) experimental; 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 13:59:53 -0500
+
 kdeadmin (4:3.3.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/kdeadmin/debian/control
===================================================================
--- trunk/packages/kdeadmin/debian/control	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdeadmin/debian/control	2005-01-07 17:35:10 UTC (rev 379)
@@ -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), docbook-to-man, gawk, gettext, kdelibs4-dev (>> 4:3.3.1), libbz2-dev, libpam0g-dev, libqt3-compat-headers, lilo [i386], rpm, sharutils, texinfo
-Standards-Version: 3.6.1.0
+Uploaders: Christopher L Cheney <ccheney@debian.org>, Christopher Martin <chrsmrtn@freeshell.org>, Adeodato Simó <asp16@alu.ua.es>
+Build-Depends: debhelper (>> 4.2.0), docbook-to-man, gawk, gettext, kdelibs4-dev (>> 4:3.3.2), libbz2-dev, libpam0g-dev, libqt3-compat-headers, lilo [i386], rpm, sharutils, texinfo
+Standards-Version: 3.6.1
 
 Package: kdeadmin
 Section: kde

Deleted: trunk/packages/kdeadmin/debian/patches/01_kdeadmin_branch.diff.uu

Copied: trunk/packages/kdeadmin/debian/patches/01_kdeadmin_branch.diff.uu (from rev 378, branches/kde-3.3.2/kdeadmin/debian/patches/01_kdeadmin_branch.diff.uu)

Modified: trunk/packages/kdeadmin/debian/patches/02_autotools_update.diff
===================================================================
--- trunk/packages/kdeadmin/debian/patches/02_autotools_update.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdeadmin/debian/patches/02_autotools_update.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,6 +1,5 @@
-diff -Nrua kdeadmin-3.3.1/admin/compile kdeadmin-patched/admin/compile
---- kdeadmin-3.3.1/admin/compile	2002-09-30 07:18:17.000000000 -0500
-+++ kdeadmin-patched/admin/compile	2004-11-03 20:01:22.000000000 -0600
+--- kdeadmin-orig/admin/compile
++++ kdeadmin-patched/admin/compile
 @@ -1,8 +1,9 @@
  #! /bin/sh
 -
@@ -182,9 +181,8 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nrua kdeadmin-3.3.1/admin/config.guess kdeadmin-patched/admin/config.guess
---- kdeadmin-3.3.1/admin/config.guess	2004-08-02 09:17:40.000000000 -0500
-+++ kdeadmin-patched/admin/config.guess	2004-08-25 09:25:50.000000000 -0500
+--- kdeadmin-orig/admin/config.guess
++++ kdeadmin-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 +244,8 @@
  	esac
  	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
  	exit 0 ;;
-diff -Nrua kdeadmin-3.3.1/admin/depcomp kdeadmin-patched/admin/depcomp
---- kdeadmin-3.3.1/admin/depcomp	2003-04-16 16:53:18.000000000 -0500
-+++ kdeadmin-patched/admin/depcomp	2004-11-03 20:01:22.000000000 -0600
+--- kdeadmin-orig/admin/depcomp
++++ kdeadmin-patched/admin/depcomp
 @@ -1,7 +1,9 @@
  #! /bin/sh
 -
@@ -719,9 +716,8 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nrua kdeadmin-3.3.1/admin/install-sh kdeadmin-patched/admin/install-sh
---- kdeadmin-3.3.1/admin/install-sh	2003-08-07 04:41:31.000000000 -0500
-+++ kdeadmin-patched/admin/install-sh	2004-11-03 20:01:22.000000000 -0600
+--- kdeadmin-orig/admin/install-sh
++++ kdeadmin-patched/admin/install-sh
 @@ -1,19 +1,38 @@
  #!/bin/sh
 -#
@@ -1271,9 +1267,8 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nrua kdeadmin-3.3.1/admin/missing kdeadmin-patched/admin/missing
---- kdeadmin-3.3.1/admin/missing	2002-10-26 11:44:28.000000000 -0500
-+++ kdeadmin-patched/admin/missing	2004-11-03 20:01:22.000000000 -0600
+--- kdeadmin-orig/admin/missing
++++ kdeadmin-patched/admin/missing
 @@ -1,6 +1,10 @@
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.
@@ -1530,9 +1525,8 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nrua kdeadmin-3.3.1/admin/mkinstalldirs kdeadmin-patched/admin/mkinstalldirs
---- kdeadmin-3.3.1/admin/mkinstalldirs	2002-10-26 11:53:16.000000000 -0500
-+++ kdeadmin-patched/admin/mkinstalldirs	2004-11-03 20:01:22.000000000 -0600
+--- kdeadmin-orig/admin/mkinstalldirs
++++ kdeadmin-patched/admin/mkinstalldirs
 @@ -1,20 +1,32 @@
  #! /bin/sh
  # mkinstalldirs --- make directory hierarchy
@@ -1657,9 +1651,8 @@
 +# time-stamp-end: "$"
  # End:
 -# mkinstalldirs ends here
-diff -Nrua kdeadmin-3.3.1/admin/ylwrap kdeadmin-patched/admin/ylwrap
---- kdeadmin-3.3.1/admin/ylwrap	2001-10-04 19:46:36.000000000 -0500
-+++ kdeadmin-patched/admin/ylwrap	2004-11-03 20:01:22.000000000 -0600
+--- kdeadmin-orig/admin/ylwrap
++++ kdeadmin-patched/admin/ylwrap
 @@ -1,6 +1,11 @@
  #! /bin/sh
  # ylwrap - wrapper for lex/yacc invocations.

Modified: trunk/packages/kdeadmin/debian/patches/03_libtool_arm.diff
===================================================================
--- trunk/packages/kdeadmin/debian/patches/03_libtool_arm.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdeadmin/debian/patches/03_libtool_arm.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,6 +1,5 @@
-diff -Nrua kdeadmin-3.2.2/admin/libtool.m4.in kdeadmin-patched/admin/libtool.m4.in
---- kdeadmin-3.2.2/admin/libtool.m4.in	2004-04-02 09:41:05.000000000 -0600
-+++ kdeadmin-patched/admin/libtool.m4.in	2004-04-12 01:22:22.000000000 -0500
+--- kdeadmin-orig/admin/libtool.m4.in
++++ kdeadmin-patched/admin/libtool.m4.in
 @@ -2180,17 +2180,7 @@
  
  # This must be Linux ELF.

Modified: trunk/packages/kdeadmin/debian/patches/04_am_maintainer_mode.diff
===================================================================
--- trunk/packages/kdeadmin/debian/patches/04_am_maintainer_mode.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdeadmin/debian/patches/04_am_maintainer_mode.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,12 +1,11 @@
-diff -Nru kdeadmin-3.1.4/admin/configure.in.min kdeadmin-patched/admin/configure.in.min
---- kdeadmin-3.1.4/admin/configure.in.min	2001-11-07 05:17:28.000000000 -0600
-+++ kdeadmin-patched/admin/configure.in.min	2003-10-16 01:29:02.000000000 -0500
+--- kdeadmin-orig/admin/configure.in.min
++++ kdeadmin-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: trunk/packages/kdeadmin/debian/patches/05_pedantic-errors.diff
===================================================================
--- trunk/packages/kdeadmin/debian/patches/05_pedantic-errors.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdeadmin/debian/patches/05_pedantic-errors.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,6 +1,5 @@
-diff -Nrua kdeadmin-3.2.92/admin/acinclude.m4.in kdeadmin-patched/admin/acinclude.m4.in
---- kdeadmin-3.2.92/admin/acinclude.m4.in	2004-07-27 20:00:58.000000000 -0500
-+++ kdeadmin-patched/admin/acinclude.m4.in	2004-07-27 20:01:50.000000000 -0500
+--- kdeadmin-orig/admin/acinclude.m4.in
++++ kdeadmin-patched/admin/acinclude.m4.in
 @@ -2087,9 +2087,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"

Copied: trunk/packages/kdeadmin/debian/patches/06_automake-1.9.diff (from rev 378, branches/kde-3.3.2/kdeadmin/debian/patches/06_automake-1.9.diff)

Modified: trunk/packages/kdeadmin/debian/rules
===================================================================
--- trunk/packages/kdeadmin/debian/rules	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdeadmin/debian/rules	2005-01-07 17:35:10 UTC (rev 379)
@@ -73,6 +73,7 @@
 	# run configure with build tree $(objdir)
 	cd $(objdir) && \
 	../configure $(configkde) --enable-final \
+	--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 	--without-rpm --with-pam=kde --with-shadow --with-nis \
 	--with-private-groups
 
@@ -203,7 +204,7 @@
 	dh_fixperms
 #	dh_perl
 #	dh_python
-	dh_makeshlibs -V
+	env DH_COMPAT=3 dh_makeshlibs -V
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol

Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdebase/debian/changelog	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,3 +1,46 @@
+kdebase (next upload) experimental; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * Fixed typo in kdebase-bin description. (Closes: #286587)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Date
+
+kdebase (4:3.3.2-0pre1) experimental; urgency=low
+
+  * New upstream release.
+  * KDE_3_3_BRANCH update. Includes the kdebase part of the fix
+    for CAN-2004-1158.
+  * Lower kdeprint's dependency on gv to a Suggests. (Closes: #269590)
+  * kwin is now registered as an x-window-manager. (Closes: #249162)
+  * Added /usr/share/xsessions to KDM's default session path, so
+    .desktop files installed there are found.
+    (Closes: #243770, #247365, #247747, #250384)
+  * kdm can now be installed while building kdebase, without affecting
+    the generated kdmrc and other config files.
+  * Adjust documentation to reflect the CUPS document path used by
+    Debian.
+  * Incorporate new manpages, for kdepasswd, kappfinder, kfind,
+    kmenuedit, kate, kwrite, kpager, from Andre Ramos and
+    Clement Stenac.
+    (Closes: #189574, #207123, #207124, #207125, #207126, #207130)
+  * Incorporate new package descriptions for konqueror, kcontrol,
+    and kate, from Tomas Pospisek. (Closes: #280358, #280362, #280795)
+  * Remove build-dependency on automake1.9.
+  * Acknowledge old NMUs. (Closes: #178507, #261740, #244547, #247407)
+    (Closes: #237062, #237065, #237067)
+  * Take some action wrt #284844: [AS]
+    - rename README.linux.console to README.Linux-font, more explicit
+      and does not create confusion with the original file. Removed
+      note about this file not being the original one.
+    - when talking about dpkg-reconfigure fontconfig, be clear about
+      which one the relevant question is and what the answer has to be.
+    - added patches/14_konsole_README.Linux-font.diff to make the popup
+      that konsole displays when it can find the font specify the full
+      path to the README file. (Closes: #284844)
+
+ -- Christopher Martin <chrsmrtn@freeshell.org>  Sat, 18 Dec 2004 14:54:58 -0500
+
 kdebase (4:3.3.1-4) unstable; urgency=high
 
   +++ Changes by Adeodato Simó:

Modified: trunk/packages/kdebase/debian/control
===================================================================
--- trunk/packages/kdebase/debian/control	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdebase/debian/control	2005-01-07 17:35:10 UTC (rev 379)
@@ -2,8 +2,8 @@
 Section: kde
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-Uploaders: Christopher L Cheney <ccheney@debian.org>, Adeodato Simó <asp16@alu.ua.es>, Isaac Clerencia <isaac@debian.org>
-Build-Depends: automake1.9, debhelper (>= 4.2.0), gawk, gettext, kdelibs4-dev (>> 4:3.3.1), lesstif-dev, libbz2-dev, libcdparanoia0-dev, libdb4.2-dev, libfontconfig1-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libraw1394-dev, libsasl2-dev, libsensors-dev, libsmbclient-dev, libssl-dev, libtiff4-dev, libxtst-dev, sharutils, texinfo, xlibs-static-pic, xutils
+Uploaders: Christopher L Cheney <ccheney@debian.org>, Adeodato Simó <asp16@alu.ua.es>, Christopher Martin <chrsmrtn@freeshell.org>, Isaac Clerencia <isaac@debian.org>
+Build-Depends: debhelper (>= 4.2.0), gawk, gettext, kdelibs4-dev (>> 4:3.3.2), lesstif-dev, libbz2-dev, libcdparanoia0-dev, libdb4.2-dev, libfontconfig1-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libraw1394-dev, libsasl2-dev, libsensors-dev, libsmbclient-dev, libssl-dev, libtiff4-dev, libxtst-dev, sharutils, texinfo, xlibs-static-pic, xutils
 Build-Depends-Indep: doxygen, qt3-doc
 Standards-Version: 3.6.1
 
@@ -45,16 +45,24 @@
 Suggests: aspell | ispell, kate-plugins, khelpcenter, konq-speaker, konsole
 Replaces: kdebase-doc (<< 4:3.0.0)
 Description: KDE Advanced Text Editor
- KDE is a powerful Open Source graphical desktop environment
- for Unix workstations. It combines ease of use, contemporary
- functionality, and outstanding graphical design with the
- technological superiority of the Unix operating system.
+ Kate is a multi document editor, based on a rewritten version of the kwrite
+ editing widget of KDE.
  .
- This package contains the advanced text editor for KDE. It includes
- many features including:
+ It is a multi-view editor that lets you view several instances of the same
+ document with all instances being synced, or view more files at the same
+ time for easy reference or simultaneous editing. The terminal emulation
+ and sidebar are docked windows that can be plugged out of the main window,
+ or replaced therein according to your preference.
  .
-  * Syntax Highlighting
+ Some random features:
+ .
+  * Editing of big files
+  * Extensible syntax highlighting
   * Folding
+  * Dynamic word wrap
+  * Selectable encoding
+  * Filter command
+  * Global grep dialog
  .
  This package is part of the official KDE base module.
 
@@ -66,13 +74,12 @@
 Conflicts: kdebase-libs (<< 4:3.0.0)
 Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0), konqueror (<< 4:3.0.0)
 Description: KDE Control Center
- KDE is a powerful Open Source graphical desktop environment
- for Unix workstations. It combines ease of use, contemporary
- functionality, and outstanding graphical design with the
- technological superiority of the Unix operating system.
+ The KDE Control Center provides you with a centralized and convenient
+ way to configure all of your KDE settings.
  .
- The KDE control center allows you to configure all aspects of your KDE
- desktop.
+ It is made up of multiple modules. Each module is a separate application,
+ but the control center organizes all of these programs into a convenient
+ location.
  .
  This package is part of the official KDE base module.
 
@@ -89,8 +96,8 @@
  functionality, and outstanding graphical design with the
  technological superiority of the Unix operating system.
  .
- This package contains miscellanous programs needed by other KDE
- applications.
+ This package contains miscellaneous programs needed by other
+ KDE applications.
  .
  This package is part of the official KDE base module.
 
@@ -112,7 +119,7 @@
 Package: kdebase-dev
 Section: devel
 Architecture: any
-Depends: kate (= ${Source-Version}), kdesktop (= ${Source-Version}), kicker (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), ksysguard (= ${Source-Version}), kdelibs4-dev (>> 4:3.3.1)
+Depends: kate (= ${Source-Version}), kdesktop (= ${Source-Version}), kicker (= ${Source-Version}), konqueror-nsplugins (= ${Source-Version}), konqueror (= ${Source-Version}), ksysguard (= ${Source-Version}), kdelibs4-dev (>> 4:3.3.2)
 Replaces: kate (<< 4:3.0.0), kdebase (<< 4:3.0.0), konqueror (<< 4:3.0.0)
 Description: KDE Base (development files)
  KDE is a powerful Open Source graphical desktop environment
@@ -174,8 +181,8 @@
 Package: kdeprint
 Section: utils
 Architecture: any
-Depends: ${shlibs:Depends}, enscript, gv, poster, psutils
-Suggests: khelpcenter, efax | hylafax-client | mgetty-fax
+Depends: ${shlibs:Depends}, enscript, poster, psutils
+Suggests: khelpcenter, efax | hylafax-client | mgetty-fax, gv
 Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0)
 Description: KDE Print
  KDE is a powerful Open Source graphical desktop environment
@@ -325,14 +332,24 @@
 Conflicts: kdebase-audiolibs (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0)
 Replaces: kdebase (<< 4:3.0.0), kdebase-audiolibs (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0)
 Description: KDE's advanced File Manager, Web Browser and Document Viewer
- KDE is a powerful Open Source graphical desktop environment
- for Unix workstations. It combines ease of use, contemporary
- functionality, and outstanding graphical design with the
- technological superiority of the Unix operating system.
+ Konqueror is the file manager for the K Desktop Environment.
+ It supports basic file management on local UNIX filesystems,
+ from simple cut/copy and paste operations to advanced remote
+ and local network file browsing.
  .
- Konqueror is a standards-compliant web browser, file manager and
- document viewer.
+ It is also the canvas for all the latest KDE technology,
+ from KIO slaves (which provide mechanisms for file access) to
+ component embedding via the KParts object interface, and it
+ is one of the most customizable applications available.
  .
+ Konqueror is an Open Source web browser with HTML4.0 compliance,
+ supporting Java applets, JavaScript, CSS1 and (partially) CSS2,
+ as well as Netscape plugins (for example, Flash or RealVideo plugins).
+ .
+ It is a universal viewing application, capable of embedding
+ read-only viewing components in itself to view
+ documents without ever launching another application.
+ .
  This package is part of the official KDE base module.
 
 Package: konqueror-nsplugins
@@ -525,7 +542,7 @@
 Package: libkonq4-dev
 Section: libdevel
 Architecture: any
-Depends: libkonq4 (= ${Source-Version}), kdelibs4-dev (>> 4:3.3.1)
+Depends: libkonq4 (= ${Source-Version}), kdelibs4-dev (>> 4:3.3.2)
 Conflicts: libkonq-dev (<< 4:3.0.0), libkonq3 (<< 4:3.0.0)
 Replaces: kdebase-dev (<< 4:3.0.0), libkonq-dev (<< 4:3.0.0), libkonq3 (<< 4:3.0.0)
 Description: Core libraries for KDE's file manager (development files)

Copied: trunk/packages/kdebase/debian/kappfinder.manpages (from rev 378, branches/kde-3.3.2/kdebase/debian/kappfinder.manpages)

Copied: trunk/packages/kdebase/debian/kate.manpages (from rev 378, branches/kde-3.3.2/kdebase/debian/kate.manpages)

Copied: trunk/packages/kdebase/debian/kdepasswd.manpages (from rev 378, branches/kde-3.3.2/kdebase/debian/kdepasswd.manpages)

Copied: trunk/packages/kdebase/debian/kfind.manpages (from rev 378, branches/kde-3.3.2/kdebase/debian/kfind.manpages)

Copied: trunk/packages/kdebase/debian/kmenuedit.manpages (from rev 378, branches/kde-3.3.2/kdebase/debian/kmenuedit.manpages)

Modified: trunk/packages/kdebase/debian/konsole.docs
===================================================================
--- trunk/packages/kdebase/debian/konsole.docs	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdebase/debian/konsole.docs	2005-01-07 17:35:10 UTC (rev 379)
@@ -1 +1 @@
-debian/local/README.linux.console
+debian/local/README.Linux-font

Copied: trunk/packages/kdebase/debian/kpager.manpages (from rev 378, branches/kde-3.3.2/kdebase/debian/kpager.manpages)

Copied: trunk/packages/kdebase/debian/kwin.postinst (from rev 378, branches/kde-3.3.2/kdebase/debian/kwin.postinst)


Property changes on: trunk/packages/kdebase/debian/kwin.postinst
___________________________________________________________________
Name: svn:executable
   + *

Copied: trunk/packages/kdebase/debian/kwin.prerm (from rev 378, branches/kde-3.3.2/kdebase/debian/kwin.prerm)

Copied: trunk/packages/kdebase/debian/local/README.Linux-font (from rev 378, branches/kde-3.3.2/kdebase/debian/local/README.Linux-font)

Deleted: trunk/packages/kdebase/debian/local/README.linux.console

Copied: trunk/packages/kdebase/debian/man (from rev 378, branches/kde-3.3.2/kdebase/debian/man)

Deleted: trunk/packages/kdebase/debian/patches/01_kdebase_branch.diff.uu

Copied: trunk/packages/kdebase/debian/patches/01_kdebase_branch.diff.uu (from rev 378, branches/kde-3.3.2/kdebase/debian/patches/01_kdebase_branch.diff.uu)

Modified: trunk/packages/kdebase/debian/patches/02_autotools_update.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/02_autotools_update.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdebase/debian/patches/02_autotools_update.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,19 +1,18 @@
-diff -Nrua kdebase-3.3.1/admin/compile kdebase-patched/admin/compile
---- kdebase-3.3.1/admin/compile	2002-09-30 07:18:17.000000000 -0500
-+++ kdebase-patched/admin/compile	2004-09-19 17:51:50.000000000 -0500
+--- kdebase-orig/admin/compile
++++ kdebase-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-09-10.20
++scriptversion=2004-10-12.08
 +
 +# 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,116 @@
+@@ -24,76 +25,118 @@
  # configuration script generated by Autoconf, you may include it under
  # the same distribution terms that you use for the rest of that program.
  
@@ -165,6 +164,8 @@
  if test -f "$cofile"; then
 -   mv "$cofile" "$ofile"
 +  mv "$cofile" "$ofile"
++elif test -f "${cofile}bj"; then
++  mv "${cofile}bj" "$ofile"
  fi
  
 -rmdir $lockdir
@@ -180,9 +181,8 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nrua kdebase-3.3.1/admin/config.guess kdebase-patched/admin/config.guess
---- kdebase-3.3.1/admin/config.guess	2004-08-02 09:17:40.000000000 -0500
-+++ kdebase-patched/admin/config.guess	2004-08-25 09:25:50.000000000 -0500
+--- kdebase-orig/admin/config.guess
++++ kdebase-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.
@@ -244,9 +244,8 @@
  	esac
  	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
  	exit 0 ;;
-diff -Nrua kdebase-3.3.1/admin/depcomp kdebase-patched/admin/depcomp
---- kdebase-3.3.1/admin/depcomp	2003-04-16 16:53:18.000000000 -0500
-+++ kdebase-patched/admin/depcomp	2004-09-19 17:51:50.000000000 -0500
+--- kdebase-orig/admin/depcomp
++++ kdebase-patched/admin/depcomp
 @@ -1,7 +1,9 @@
  #! /bin/sh
 -
@@ -717,16 +716,15 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nrua kdebase-3.3.1/admin/install-sh kdebase-patched/admin/install-sh
---- kdebase-3.3.1/admin/install-sh	2003-08-07 04:41:31.000000000 -0500
-+++ kdebase-patched/admin/install-sh	2004-09-19 17:51:50.000000000 -0500
+--- kdebase-orig/admin/install-sh
++++ kdebase-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-09-10.20
++scriptversion=2004-10-22.00
 +
 +# This originates from X11R5 (mit/util/scripts/install.sh), which was
 +# later released in X11R6 (xc/config/util/install.sh) with the
@@ -785,7 +783,7 @@
  # put in absolute paths if you don't have them in your path; or use env. vars.
  
  mvprog="${MVPROG-mv}"
-@@ -41,236 +58,265 @@
+@@ -41,236 +58,266 @@
  rmprog="${RMPROG-rm}"
  mkdirprog="${MKDIRPROG-mkdir}"
  
@@ -1159,7 +1157,7 @@
 +  fi
 +
 +  # This sed command emulates the dirname command.
-+  dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
++  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
 +
 +  # Make sure that the destination directory exists.
 +
@@ -1172,7 +1170,8 @@
 +    oIFS=$IFS
 +    # Some sh's can't handle IFS=/ for some reason.
 +    IFS='%'
-+    set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
++    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
++    shift
 +    IFS=$oIFS
 +
 +    pathcomp=
@@ -1268,9 +1267,8 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nrua kdebase-3.3.1/admin/missing kdebase-patched/admin/missing
---- kdebase-3.3.1/admin/missing	2002-10-26 11:44:28.000000000 -0500
-+++ kdebase-patched/admin/missing	2004-09-19 17:51:50.000000000 -0500
+--- kdebase-orig/admin/missing
++++ kdebase-patched/admin/missing
 @@ -1,6 +1,10 @@
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.
@@ -1527,9 +1525,8 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nrua kdebase-3.3.1/admin/mkinstalldirs kdebase-patched/admin/mkinstalldirs
---- kdebase-3.3.1/admin/mkinstalldirs	2002-10-26 11:53:16.000000000 -0500
-+++ kdebase-patched/admin/mkinstalldirs	2004-09-19 17:51:50.000000000 -0500
+--- kdebase-orig/admin/mkinstalldirs
++++ kdebase-patched/admin/mkinstalldirs
 @@ -1,20 +1,32 @@
  #! /bin/sh
  # mkinstalldirs --- make directory hierarchy
@@ -1654,9 +1651,8 @@
 +# time-stamp-end: "$"
  # End:
 -# mkinstalldirs ends here
-diff -Nrua kdebase-3.3.1/admin/ylwrap kdebase-patched/admin/ylwrap
---- kdebase-3.3.1/admin/ylwrap	2001-10-04 19:46:36.000000000 -0500
-+++ kdebase-patched/admin/ylwrap	2004-09-19 17:51:50.000000000 -0500
+--- kdebase-orig/admin/ylwrap
++++ kdebase-patched/admin/ylwrap
 @@ -1,6 +1,11 @@
  #! /bin/sh
  # ylwrap - wrapper for lex/yacc invocations.

Modified: trunk/packages/kdebase/debian/patches/03_libtool_arm.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/03_libtool_arm.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdebase/debian/patches/03_libtool_arm.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,6 +1,5 @@
-diff -Nrua kdebase-3.2.2/admin/libtool.m4.in kdebase-patched/admin/libtool.m4.in
---- kdebase-3.2.2/admin/libtool.m4.in	2004-04-02 09:41:05.000000000 -0600
-+++ kdebase-patched/admin/libtool.m4.in	2004-04-11 03:20:59.000000000 -0500
+--- kdebase-orig/admin/libtool.m4.in
++++ kdebase-patched/admin/libtool.m4.in
 @@ -2180,17 +2180,7 @@
  
  # This must be Linux ELF.

Modified: trunk/packages/kdebase/debian/patches/04_am_maintainer_mode.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/04_am_maintainer_mode.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdebase/debian/patches/04_am_maintainer_mode.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,12 +1,11 @@
-diff -Nru kdebase-3.1.4/admin/configure.in.min kdebase-patched/admin/configure.in.min
---- kdebase-3.1.4/admin/configure.in.min	2001-11-07 05:17:28.000000000 -0600
-+++ kdebase-patched/admin/configure.in.min	2003-11-09 20:05:20.000000000 -0600
+--- kdebase-orig/admin/configure.in.min
++++ kdebase-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: trunk/packages/kdebase/debian/patches/05_pedantic-errors.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/05_pedantic-errors.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdebase/debian/patches/05_pedantic-errors.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,6 +1,5 @@
-diff -Nrua kdebase-3.2.92/admin/acinclude.m4.in kdebase-patched/admin/acinclude.m4.in
---- kdebase-3.2.92/admin/acinclude.m4.in	2004-07-27 00:37:33.000000000 -0500
-+++ kdebase-patched/admin/acinclude.m4.in	2004-07-27 00:38:21.000000000 -0500
+--- kdebase-orig/admin/acinclude.m4.in
++++ kdebase-patched/admin/acinclude.m4.in
 @@ -2087,9 +2087,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"

Copied: trunk/packages/kdebase/debian/patches/06_automake-1.9.diff (from rev 378, branches/kde-3.3.2/kdebase/debian/patches/06_automake-1.9.diff)

Deleted: trunk/packages/kdebase/debian/patches/06_xlibs-static-pic.diff

Copied: trunk/packages/kdebase/debian/patches/07_xlibs-static-pic.diff (from rev 378, branches/kde-3.3.2/kdebase/debian/patches/07_xlibs-static-pic.diff)

Copied: trunk/packages/kdebase/debian/patches/10_default_sessionsdirs.diff (from rev 378, branches/kde-3.3.2/kdebase/debian/patches/10_default_sessionsdirs.diff)

Deleted: trunk/packages/kdebase/debian/patches/10_genkdmconf.diff

Copied: trunk/packages/kdebase/debian/patches/11_genkdmconf.diff (from rev 378, branches/kde-3.3.2/kdebase/debian/patches/11_genkdmconf.diff)

Copied: trunk/packages/kdebase/debian/patches/12_genkdm_make.diff (from rev 378, branches/kde-3.3.2/kdebase/debian/patches/12_genkdm_make.diff)

Copied: trunk/packages/kdebase/debian/patches/13_cups_docroot.diff (from rev 378, branches/kde-3.3.2/kdebase/debian/patches/13_cups_docroot.diff)

Copied: trunk/packages/kdebase/debian/patches/14_konsole_README.Linux-font.diff (from rev 378, branches/kde-3.3.2/kdebase/debian/patches/14_konsole_README.Linux-font.diff)

Deleted: trunk/packages/kdebase/debian/patches/post-3.3.1-kdebase-smb.diff

Modified: trunk/packages/kdebase/debian/rules
===================================================================
--- trunk/packages/kdebase/debian/rules	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdebase/debian/rules	2005-01-07 17:35:10 UTC (rev 379)
@@ -73,6 +73,7 @@
 	# run configure with build tree $(objdir)
 	cd $(objdir) && \
 	../configure $(configkde) --enable-final \
+	--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 	--with-shadow --without-java \
 	--with-pam=kde --with-kcp-pam=kcheckpass \
 	--with-kdm-pam=kdm --with-kss-pam=kscreensaver \
@@ -119,7 +120,7 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-arch-stamp build-indep-stamp configure-stamp \
-		debian/debiandirs debian/system.kdeglobals debian/man/*.1
+		debian/debiandirs debian/system.kdeglobals
 
 	# Remove Debian specific patches
 	if test -d $(CURDIR)/debian/patches ;\
@@ -210,7 +211,7 @@
 	dh_fixperms -Xusr/bin/fileshareset -Xusr/bin/kdesud
 #	dh_perl
 #	dh_python
-	dh_makeshlibs -V
+	env DH_COMPAT=3 dh_makeshlibs -V
 	dh_installdeb
 	dh_shlibdeps -ldebian/kate/usr/lib:debian/kicker/usr/lib:debian/konqueror/usr/lib:debian/ksplash/usr/lib:debian/ksysguard/usr/lib:debian/kwin/usr/lib:debian/libkonq4/usr/lib
 	dh_gencontrol

Modified: trunk/packages/kdegraphics/debian/changelog
===================================================================
--- trunk/packages/kdegraphics/debian/changelog	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdegraphics/debian/changelog	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,3 +1,41 @@
+kdegraphics (next upload) experimental; urgency=low
+
+  +++ Changes by Adeodato Simó:
+
+  * Update package description for several packages, provided by Jesús
+    Roncero, thanks! These are: kolourpaint, kgamma, kooka, kpovmodeler,
+    kuickshow. (Closes: #286891, #286892, #286893, #286894, #286895, #286881)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Date
+
+kdegraphics (4:3.3.2-0pre1) experimental; urgency=low
+
+  * New upstream release.
+  * KDE_3_3_BRANCH update.
+  * Remove build-dependency on automake1.9.
+  * Tightened build-dep on libsane-dev to >> 1.0.15. (Closes: #270488)
+  * Updated kfax package description. (Closes: #280563)
+
+  +++ Changes by Adeodato Simó:
+
+  * Make konqueror capable of displaying SVG images out-of-the-box, without
+    need of tweaking with mime types in the Control Center (closes: #260201):
+    - this is a workaround until bugs.kde.org/74457 gets fixed.
+    - services/ksvgplugin.desktop: give InitialPreference=11.
+    - added mimelnk/image/svg-xml.desktop since some sites use that mimetype
+      instead of image/svg+xml.
+
+  * debian/control:
+    - make kpdf Provide: pdf-viewer.
+    - version Build-Dependency on libexif-dev to (>= 0.6.9-1), just in case,
+      acknowledging NMU from Steve Langasek. (Closes: #268966)
+
+  * debian/patches:
+    - added new patch 10_correct-nedit-invocation.diff, to invoke NEdit with
+      the proper binary name on Debian systems. (Closes: #274035)
+
+ -- Christopher Martin <chrsmrtn@freeshell.org>  Sun, 19 Dec 2004 20:14:10 -0500
+
 kdegraphics (4:3.3.1-2) unstable; urgency=high
 
   * Upload to fix security vulnerability "kpdf Buffer Overflow Vulnerability".
@@ -5,7 +43,7 @@
     can be triggered by a specially crafted PDF file, and remotely supplied
     pdf files could be used to execute arbitrary code on the client machine.
 
- -- Adeodato Simó <asp16@alu.ua.es>  Thu, 23 Dec 2004 08:35:23 +0100
+ -- Adeodato Simó <asp16@alu.ua.es>  Thu, 23 Dec 2004 08:35:23 +0100
 
 kdegraphics (4:3.3.1-1) unstable; urgency=low
 

Modified: trunk/packages/kdegraphics/debian/control
===================================================================
--- trunk/packages/kdegraphics/debian/control	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdegraphics/debian/control	2005-01-07 17:35:10 UTC (rev 379)
@@ -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>, Adeodato Simó <asp16@alu.ua.es>
-Build-Depends: automake1.9, debhelper (>> 4.2.0), gawk, gettext, imlib11-dev, kdelibs4-dev (>> 4:3.3.0), libexif-dev, libfribidi-dev, libglut3-dev, libgphoto2-2-dev, libgtk1.2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libsane-dev, libtiff4-dev, libtiff-tools, libusb-dev, sharutils, tetex-bin, texinfo, xlibs-static-pic, xpdf-utils
-Standards-Version: 3.6.1.0
+Uploaders: Christopher L Cheney <ccheney@debian.org>, Christopher Martin <chrsmrtn@freeshell.org>, Adeodato Simó <asp16@alu.ua.es>
+Build-Depends: debhelper (>> 4.2.0), gawk, gettext, imlib11-dev, kdelibs4-dev (>> 4:3.3.2), libexif-dev (>= 0.6.9-1), libfribidi-dev, libglut3-dev, libgphoto2-2-dev, libgtk1.2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, tetex-bin, texinfo, xlibs-static-pic, xpdf-utils
+Standards-Version: 3.6.1
 
 Package: kdegraphics
 Section: kde
@@ -19,7 +19,7 @@
  kdegraphics is a collection of graphic oriented applications:
  .
   * kamera: digital camera io_slave for Konqueror. Together gPhoto this
-           allows you to access your camera's picture with the URL camera:/
+            allows you to access your camera's picture with the URL camera:/
   * kcoloredit: contains two programs: a color value editor and also a color
                 picker
   * kdvi: program (and embeddable KPart) to display *.DVI files from TeX
@@ -42,10 +42,10 @@
   * kview: picture viewer, provided as standalone program and embeddable KPart
   * kviewshell: generic framework for viewer applications
  .
- This package also contains two more general libraries:
+ This package also contains the following library:
  .
   * libkscan: library to access scanners used by kooka (and koffice), needs
-             SANE to be used
+              SANE to be used
  .
  This package depends on the KDE Graphics packages.
 
@@ -133,13 +133,13 @@
 Depends: ${shlibs:Depends}, libtiff-tools
 Replaces: kview (<< 4:3.0.0)
 Description: KDE G3/G4 Fax Viewer
+ Fax Viewer for KDE, supporting the G3 and G4 standards.
+ .
  KDE is a powerful Open Source graphical desktop environment
  for Unix workstations. It combines ease of use, contemporary
  functionality, and outstanding graphical design with the
  technological superiority of the Unix operating system.
  .
- KDE G3/G4 Fax Viewer
- .
  This package is part of the official KDE graphics module.
 
 Package: kgamma
@@ -148,13 +148,11 @@
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
 Description: Gamma correction KControl module
- KDE is a powerful Open Source graphical desktop environment
- for Unix workstations. It combines ease of use, contemporary
- functionality, and outstanding graphical design with the
- technological superiority of the Unix operating system.
+ KGamma is a KDE Control Center module for gamma calibration/correction
+ of XFree86. With proper gamma settings, your display (websites, images,
+ etc.) will look the same on your monitor as on other monitors.
  .
- KGamma is a control center module for gamma correction
- of the X11 display.
+ Homepage: http://kgamma.berlios.de/index2.php
  .
  This package is part of the official KDE graphics module.
 
@@ -217,13 +215,20 @@
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
 Description: A Simple Paint Program for KDE
- KDE is a powerful Open Source graphical desktop environment
- for Unix workstations. It combines ease of use, contemporary
- functionality, and outstanding graphical design with the
- technological superiority of the Unix operating system.
+ KolourPaint is a very simple paint program for KDE. It aims to be
+ conceptually simple to understand; providing a level of functionality
+ targeted towards the average user. It's designed for daily tasks like:
  .
- KolourPaint is a very simple paint program for KDE.
+  * Painting - drawing diagrams and "finger painting" 
+  * Image Manipulation - editing screenshots and photos; applying effects 
+  * Icon Editing - drawing clipart and logos with transparency 
  .
+ It's not an unusable and monolithic program where simple tasks like
+ drawing lines become near impossible. Nor is it so simple that it lacks
+ essential features like Undo/Redo.
+ .
+ Homepage: http://kolourpaint.sourceforge.net
+ .
  This package is part of the official KDE graphics module.
 
 Package: kooka
@@ -233,13 +238,17 @@
 Recommends: gocr
 Suggests: khelpcenter
 Description: Scanner program for KDE
- KDE is a powerful Open Source graphical desktop environment
- for Unix workstations. It combines ease of use, contemporary
- functionality, and outstanding graphical design with the
- technological superiority of the Unix operating system.
+ Kooka is an intuitive, easy to use open source GNU/Linux scan program
+ based on SANE and KScan library.
  .
- Kooka is a scanner program based on SANE and KScan library.
+ Kooka helps you to handle the most important scan parameters, find the
+ correct image file format to save and manage your scanned images. It
+ offers support for different OCR modules. Libkscan, a autonomous part
+ of Kooka, provides a scan service for easy and consistent use to all
+ KDE applications.
  .
+ Homepage: http://www.kde.org/apps/kooka
+ .
  This package is part of the official KDE graphics module.
 
 Package: kpdf
@@ -248,6 +257,7 @@
 Depends: ${shlibs:Depends}
 Recommends: kghostview
 Suggests: khelpcenter
+Provides: pdf-viewer
 Description: PDF viewer for KDE
  KDE is a powerful Open Source graphical desktop environment
  for Unix workstations. It combines ease of use, contemporary
@@ -266,13 +276,18 @@
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter, povray
 Description: A graphical editor for povray scenes
- KDE is a powerful Open Source graphical desktop environment
- for Unix workstations. It combines ease of use, contemporary
- functionality, and outstanding graphical design with the
- technological superiority of the Unix operating system.
+ KPovmodeler is a graphical editor for povray scenes. KPovModeler is a
+ modeling and composition program for creating POV-Ray(TM) scenes in
+ KDE.
  .
- KPovmodeler is a graphical editor for povray scenes.
+ For most of the modelers, POV-Ray is nothing but a rendering engine and
+ they bring a lot of limitations to the innate possibilities of POV-Ray
+ scripted language. This is not the case for KPovModeler which allows
+ you to use all the features of POV-Ray through the translation of
+ POV-Ray language into a graphical tree. 
  .
+ Homepage: http://www.kpovmodeler.org
+ .
  This package is part of the official KDE graphics module.
 
 Package: kruler
@@ -329,12 +344,14 @@
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
 Description: KDE image/slideshow viewer
- KDE is a powerful Open Source graphical desktop environment
- for Unix workstations. It combines ease of use, contemporary
- functionality, and outstanding graphical design with the
- technological superiority of the Unix operating system.
+ KuickShow is an image browser/viewer with a nice filebrowser to select
+ images to be shown, slideshow support and the ability to display the
+ following image formats: jpg, gif, tiff, png, bmp, psd, xpm, xbm, pbm
+ and eim. Images can be displayed either in their own window, as large
+ as the image, or fullscreen (which shrinks images too large to
+ display). KuickShow also has a slideshow mode. 
  .
- KDE image/slideshow viewer
+ Homepage: http://kuickshow.sourceforge.net
  .
  This package is part of the official KDE graphics module.
 
@@ -371,7 +388,7 @@
 Package: libkscan-dev
 Section: libdevel
 Architecture: any
-Depends: libkscan1 (= ${Source-Version}), kdelibs4-dev (>> 4:3.3.0), libc6-dev
+Depends: libkscan1 (= ${Source-Version}), kdelibs4-dev (>> 4:3.3.2), libc6-dev
 Description: Scanner library for KDE (development files)
  KDE is a powerful Open Source graphical desktop environment
  for Unix workstations. It combines ease of use, contemporary

Copied: trunk/packages/kdegraphics/debian/extra (from rev 378, branches/kde-3.3.2/kdegraphics/debian/extra)

Modified: trunk/packages/kdegraphics/debian/ksvg.install
===================================================================
--- trunk/packages/kdegraphics/debian/ksvg.install	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdegraphics/debian/ksvg.install	2005-01-07 17:35:10 UTC (rev 379)
@@ -15,3 +15,4 @@
 debian/tmp/usr/share/services/ksvgplugin.desktop
 debian/tmp/usr/share/services/svgthumbnail.desktop
 debian/tmp/usr/share/servicetypes/ksvgrenderer.desktop
+debian/extra/svg-xml.desktop	/usr/share/mimelnk/image

Deleted: trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch.diff.uu

Copied: trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch.diff.uu (from rev 378, branches/kde-3.3.2/kdegraphics/debian/patches/01_kdegraphics_branch.diff.uu)

Modified: trunk/packages/kdegraphics/debian/patches/02_autotools_update.diff
===================================================================
--- trunk/packages/kdegraphics/debian/patches/02_autotools_update.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdegraphics/debian/patches/02_autotools_update.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,6 +1,5 @@
-diff -Nrua kdegraphics-3.3.1/admin/compile kdegraphics-patched/admin/compile
---- kdegraphics-3.3.1/admin/compile	2002-09-30 07:18:17.000000000 -0500
-+++ kdegraphics-patched/admin/compile	2004-11-03 20:01:22.000000000 -0600
+--- kdegraphics-orig/admin/compile
++++ kdegraphics-patched/admin/compile
 @@ -1,8 +1,9 @@
  #! /bin/sh
 -
@@ -182,9 +181,8 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nrua kdegraphics-3.3.1/admin/config.guess kdegraphics-patched/admin/config.guess
---- kdegraphics-3.3.1/admin/config.guess	2004-08-02 09:17:40.000000000 -0500
-+++ kdegraphics-patched/admin/config.guess	2004-08-25 09:25:50.000000000 -0500
+--- kdegraphics-orig/admin/config.guess
++++ kdegraphics-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 +244,8 @@
  	esac
  	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
  	exit 0 ;;
-diff -Nrua kdegraphics-3.3.1/admin/depcomp kdegraphics-patched/admin/depcomp
---- kdegraphics-3.3.1/admin/depcomp	2003-04-16 16:53:18.000000000 -0500
-+++ kdegraphics-patched/admin/depcomp	2004-11-03 20:01:22.000000000 -0600
+--- kdegraphics-orig/admin/depcomp
++++ kdegraphics-patched/admin/depcomp
 @@ -1,7 +1,9 @@
  #! /bin/sh
 -
@@ -719,9 +716,8 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nrua kdegraphics-3.3.1/admin/install-sh kdegraphics-patched/admin/install-sh
---- kdegraphics-3.3.1/admin/install-sh	2003-08-07 04:41:31.000000000 -0500
-+++ kdegraphics-patched/admin/install-sh	2004-11-03 20:01:22.000000000 -0600
+--- kdegraphics-orig/admin/install-sh
++++ kdegraphics-patched/admin/install-sh
 @@ -1,19 +1,38 @@
  #!/bin/sh
 -#
@@ -1271,9 +1267,8 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nrua kdegraphics-3.3.1/admin/missing kdegraphics-patched/admin/missing
---- kdegraphics-3.3.1/admin/missing	2002-10-26 11:44:28.000000000 -0500
-+++ kdegraphics-patched/admin/missing	2004-11-03 20:01:22.000000000 -0600
+--- kdegraphics-orig/admin/missing
++++ kdegraphics-patched/admin/missing
 @@ -1,6 +1,10 @@
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.
@@ -1530,9 +1525,8 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nrua kdegraphics-3.3.1/admin/mkinstalldirs kdegraphics-patched/admin/mkinstalldirs
---- kdegraphics-3.3.1/admin/mkinstalldirs	2002-10-26 11:53:16.000000000 -0500
-+++ kdegraphics-patched/admin/mkinstalldirs	2004-11-03 20:01:22.000000000 -0600
+--- kdegraphics-orig/admin/mkinstalldirs
++++ kdegraphics-patched/admin/mkinstalldirs
 @@ -1,20 +1,32 @@
  #! /bin/sh
  # mkinstalldirs --- make directory hierarchy
@@ -1657,9 +1651,8 @@
 +# time-stamp-end: "$"
  # End:
 -# mkinstalldirs ends here
-diff -Nrua kdegraphics-3.3.1/admin/ylwrap kdegraphics-patched/admin/ylwrap
---- kdegraphics-3.3.1/admin/ylwrap	2001-10-04 19:46:36.000000000 -0500
-+++ kdegraphics-patched/admin/ylwrap	2004-11-03 20:01:22.000000000 -0600
+--- kdegraphics-orig/admin/ylwrap
++++ kdegraphics-patched/admin/ylwrap
 @@ -1,6 +1,11 @@
  #! /bin/sh
  # ylwrap - wrapper for lex/yacc invocations.

Modified: trunk/packages/kdegraphics/debian/patches/03_libtool_arm.diff
===================================================================
--- trunk/packages/kdegraphics/debian/patches/03_libtool_arm.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdegraphics/debian/patches/03_libtool_arm.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,6 +1,5 @@
-diff -Nrua kdegraphics-3.2.2/admin/libtool.m4.in kdegraphics-patched/admin/libtool.m4.in
---- kdegraphics-3.2.2/admin/libtool.m4.in	2004-04-02 09:41:05.000000000 -0600
-+++ kdegraphics-patched/admin/libtool.m4.in	2004-04-13 04:11:09.000000000 -0500
+--- kdegraphics-orig/admin/libtool.m4.in
++++ kdegraphics-patched/admin/libtool.m4.in
 @@ -2180,17 +2180,7 @@
  
  # This must be Linux ELF.

Modified: trunk/packages/kdegraphics/debian/patches/04_am_maintainer_mode.diff
===================================================================
--- trunk/packages/kdegraphics/debian/patches/04_am_maintainer_mode.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdegraphics/debian/patches/04_am_maintainer_mode.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,12 +1,11 @@
-diff -Nru kdegraphics-3.1.4/admin/configure.in.min kdegraphics-patched/admin/configure.in.min
---- kdegraphics-3.1.4/admin/configure.in.min	2001-11-07 05:17:28.000000000 -0600
-+++ kdegraphics-patched/admin/configure.in.min	2003-10-17 17:33:33.000000000 -0500
+--- kdegraphics-orig/admin/configure.in.min
++++ kdegraphics-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: trunk/packages/kdegraphics/debian/patches/05_pedantic-errors.diff
===================================================================
--- trunk/packages/kdegraphics/debian/patches/05_pedantic-errors.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdegraphics/debian/patches/05_pedantic-errors.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,6 +1,5 @@
-diff -Nrua kdegraphics-3.2.92/admin/acinclude.m4.in kdegraphics-patched/admin/acinclude.m4.in
---- kdegraphics-3.2.92/admin/acinclude.m4.in	2004-07-28 00:05:35.000000000 -0500
-+++ kdegraphics-patched/admin/acinclude.m4.in	2004-07-28 00:06:18.000000000 -0500
+--- kdegraphics-orig/admin/acinclude.m4.in
++++ kdegraphics-patched/admin/acinclude.m4.in
 @@ -2087,9 +2087,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"

Copied: trunk/packages/kdegraphics/debian/patches/06_automake-1.9.diff (from rev 378, branches/kde-3.3.2/kdegraphics/debian/patches/06_automake-1.9.diff)

Deleted: trunk/packages/kdegraphics/debian/patches/06_xlibs-static-pic.diff

Copied: trunk/packages/kdegraphics/debian/patches/07_xlibs-static-pic.diff (from rev 378, branches/kde-3.3.2/kdegraphics/debian/patches/07_xlibs-static-pic.diff)

Copied: trunk/packages/kdegraphics/debian/patches/10_correct-nedit-invocation.diff (from rev 378, branches/kde-3.3.2/kdegraphics/debian/patches/10_correct-nedit-invocation.diff)

Copied: trunk/packages/kdegraphics/debian/patches/11_ksvgplugin-bump-preference.diff (from rev 378, branches/kde-3.3.2/kdegraphics/debian/patches/11_ksvgplugin-bump-preference.diff)

Modified: trunk/packages/kdegraphics/debian/rules
===================================================================
--- trunk/packages/kdegraphics/debian/rules	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdegraphics/debian/rules	2005-01-07 17:35:10 UTC (rev 379)
@@ -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
 
@@ -201,7 +202,7 @@
 	dh_fixperms
 #	dh_perl
 #	dh_python
-	dh_makeshlibs -V
+	env DH_COMPAT=3 dh_makeshlibs -V
 	dh_installdeb
 	dh_shlibdeps -ldebian/kghostview/usr/lib:debian/kpovmodeler/usr/lib:debian/ksvg/usr/lib:debian/kview/usr/lib:debian/kviewshell/usr/lib:debian/libkscan1/usr/lib
 	dh_gencontrol


Property changes on: trunk/packages/kdelibs/debian
___________________________________________________________________
Name: svn:ignore
   + tmp
files
debiandirs
substvars

*.substvars
*.debhelper

kdelibs
kdelibs4
kdelibs4-dev
kdelibs4-doc
kdelibs-bin
kdelibs-data


Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdelibs/debian/changelog	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,3 +1,43 @@
+kdelibs (4:3.3.2-0pre1) experimental; urgency=low
+
+  * New upstream release.
+
+  * KDE_3_3_BRANCH update. Includes the kdelibs part of the fix
+    for CAN-2004-1158. [CM]
+
+  * Removed patches:
+    - post-3.3.1-kdelibs-khtml.diff and post-3.3.1-kdelibs-kio.diff since
+      these fixes are in KDE_3_3_BRANCH. [CM]
+
+  * New patches:
+    - 06_automake-1.9.diff
+    - 12_cups_docroot.diff: changed the CUPS document path in kdeprint to
+      reflect the Debian default. [CM]
+
+  * Updated dcop.1 manpage with patch by Helge Kreutzman. (Closes: #250631)
+
+  * New entries in debian/kdelibs-data.install:
+    - usr/share/mimelnk/application/java.desktop
+    - usr/share/mimelnk/application/xml.desktop
+    - usr/share/mimelnk/application/vnd.sun.xml.calc.template.desktop
+    - usr/share/mimelnk/application/vnd.sun.xml.draw.template.desktop
+    - usr/share/mimelnk/application/vnd.sun.xml.impress.template.desktop
+    - usr/share/mimelnk/application/vnd.sun.xml.writer.template.desktop
+    - usr/share/apps/ksgmltools2/customization/cs/entities/underLGPL.docbook
+
+  * New entries in debian/kdelibs4-dev.install:
+    - usr/include/kde/kiobuffer.h
+    - usr/include/kde/kwallettypes.h
+
+  * debian/control:
+    - removed unneeded build-dependency on automake1.9. [CM]
+
+  * debian/rules:
+    - call dh_makeshlibs with DH_COMPAT set to 3, so that -V works again for
+      us (works around debhelper bug #280830). (Closes: #280826)
+
+ -- Adeodato Simó <asp16@alu.ua.es>  Fri, 17 Dec 2004 01:30:13 +0100
+
 kdelibs (4:3.3.1-4) unstable; urgency=high
 
   * The "from kde maintainers to m68k porters with love" release.

Modified: trunk/packages/kdelibs/debian/control
===================================================================
--- trunk/packages/kdelibs/debian/control	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdelibs/debian/control	2005-01-07 17:35:10 UTC (rev 379)
@@ -2,8 +2,8 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-Uploaders: Christopher L Cheney <ccheney@debian.org>, Adeodato Simó <asp16@alu.ua.es>, Riku Voipio <riku.voipio@iki.fi>
-Build-Depends: automake1.9, debhelper (>> 4.2.0), docbook-to-man, gawk, gettext, libart-2.0-dev, libarts1-dev (>> 1.3.0), libaspell-dev, libbz2-dev, libcupsys2-dev, libdb4.2-dev, libfam-dev, libidn11-dev, libjasper-1.701-dev, libldap2-dev, libopenexr-dev (>= 1.2.1), libpam0g-dev, libpcre3-dev, libsasl2-dev, libssl-dev, libtiff4-dev, libxml2-dev, libxml2-utils, libxrender-dev, libxslt1-dev, qt3-doc, sharutils, texinfo, xlibmesa-glu-dev
+Uploaders: Christopher L Cheney <ccheney@debian.org>, Adeodato Simó <asp16@alu.ua.es>, Christopher Martin <chrsmrtn@freeshell.org>, Riku Voipio <riku.voipio@iki.fi>
+Build-Depends: debhelper (>> 4.2.0), docbook-to-man, gawk, gettext, libart-2.0-dev, libarts1-dev (>> 1.3.0), libaspell-dev, libbz2-dev, libcupsys2-dev, libdb4.2-dev, libfam-dev, libidn11-dev, libjasper-1.701-dev, libldap2-dev, libopenexr-dev (>= 1.2.1), libpam0g-dev, libpcre3-dev, libsasl2-dev, libssl-dev, libtiff4-dev, libxml2-dev, libxml2-utils, libxrender-dev, libxslt1-dev, qt3-doc, sharutils, texinfo, xlibmesa-glu-dev
 Build-Depends-Indep: doxygen, qt3-doc
 Standards-Version: 3.6.1
 

Modified: trunk/packages/kdelibs/debian/kdelibs-data.install
===================================================================
--- trunk/packages/kdelibs/debian/kdelibs-data.install	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdelibs/debian/kdelibs-data.install	2005-01-07 17:35:10 UTC (rev 379)
@@ -399,6 +399,7 @@
 debian/tmp/usr/share/apps/ksgmltools2/customization/cs/entities/underBSDLicense.docbook
 debian/tmp/usr/share/apps/ksgmltools2/customization/cs/entities/underFDL.docbook
 debian/tmp/usr/share/apps/ksgmltools2/customization/cs/entities/underGPL.docbook
+debian/tmp/usr/share/apps/ksgmltools2/customization/cs/entities/underLGPL.docbook
 debian/tmp/usr/share/apps/ksgmltools2/customization/cs/entities/underX11License.docbook
 debian/tmp/usr/share/apps/ksgmltools2/customization/cs/entities/update-doc.docbook
 debian/tmp/usr/share/apps/ksgmltools2/customization/cs/lang.entities
@@ -3307,6 +3308,7 @@
 debian/tmp/usr/share/mimelnk/all/all.desktop
 debian/tmp/usr/share/mimelnk/all/allfiles.desktop
 debian/tmp/usr/share/mimelnk/application/illustrator.desktop
+debian/tmp/usr/share/mimelnk/application/java.desktop
 debian/tmp/usr/share/mimelnk/application/mathml+xml.desktop
 debian/tmp/usr/share/mimelnk/application/msexcel.desktop
 debian/tmp/usr/share/mimelnk/application/mspowerpoint.desktop
@@ -3331,10 +3333,14 @@
 debian/tmp/usr/share/mimelnk/application/vnd.palm.desktop
 debian/tmp/usr/share/mimelnk/application/vnd.rn-realmedia.desktop
 debian/tmp/usr/share/mimelnk/application/vnd.sun.xml.calc.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.sun.xml.calc.template.desktop
 debian/tmp/usr/share/mimelnk/application/vnd.sun.xml.draw.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.sun.xml.draw.template.desktop
 debian/tmp/usr/share/mimelnk/application/vnd.sun.xml.impress.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.sun.xml.impress.template.desktop
 debian/tmp/usr/share/mimelnk/application/vnd.sun.xml.writer.desktop
 debian/tmp/usr/share/mimelnk/application/vnd.sun.xml.writer.master.desktop
+debian/tmp/usr/share/mimelnk/application/vnd.sun.xml.writer.template.desktop
 debian/tmp/usr/share/mimelnk/application/wordperfect.desktop
 debian/tmp/usr/share/mimelnk/application/x-abiword.desktop
 debian/tmp/usr/share/mimelnk/application/x-ace.desktop
@@ -3446,6 +3452,7 @@
 debian/tmp/usr/share/mimelnk/application/x-zip.desktop
 debian/tmp/usr/share/mimelnk/application/x-zoo.desktop
 debian/tmp/usr/share/mimelnk/application/xhtml+xml.desktop
+debian/tmp/usr/share/mimelnk/application/xml.desktop
 debian/tmp/usr/share/mimelnk/audio/aac.desktop
 debian/tmp/usr/share/mimelnk/audio/ac3.desktop
 debian/tmp/usr/share/mimelnk/audio/basic.desktop

Modified: trunk/packages/kdelibs/debian/kdelibs4-dev.install
===================================================================
--- trunk/packages/kdelibs/debian/kdelibs4-dev.install	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdelibs/debian/kdelibs4-dev.install	2005-01-07 17:35:10 UTC (rev 379)
@@ -292,6 +292,7 @@
 debian/tmp/usr/include/kde/kimproxyiface.h
 debian/tmp/usr/include/kde/kinputdialog.h
 debian/tmp/usr/include/kde/kinstance.h
+debian/tmp/usr/include/kde/kiobuffer.h
 debian/tmp/usr/include/kde/kio/authinfo.h
 debian/tmp/usr/include/kde/kio/chmodjob.h
 debian/tmp/usr/include/kde/kio/connection.h
@@ -625,6 +626,7 @@
 debian/tmp/usr/include/kde/kuserprofile.h
 debian/tmp/usr/include/kde/kvmallocator.h
 debian/tmp/usr/include/kde/kwallet.h
+debian/tmp/usr/include/kde/kwallettypes.h
 debian/tmp/usr/include/kde/kwin.h
 debian/tmp/usr/include/kde/kwindowinfo.h
 debian/tmp/usr/include/kde/kwindowlistmenu.h


Property changes on: trunk/packages/kdelibs/debian/man
___________________________________________________________________
Name: svn:ignore
   + *.1


Modified: trunk/packages/kdelibs/debian/man/dcop.sgml
===================================================================
--- trunk/packages/kdelibs/debian/man/dcop.sgml	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdelibs/debian/man/dcop.sgml	2005-01-07 17:35:10 UTC (rev 379)
@@ -20,7 +20,7 @@
   <!ENTITY dhfirstname "<firstname>Chris</firstname>">
   <!ENTITY dhsurname   "<surname>Cheney</surname>">
   <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>November  6, 2002</date>">
+  <!ENTITY dhdate      "<date>October 13, 2004</date>">
   <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
        allowed: see man(7), man(1). -->
   <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
@@ -73,7 +73,7 @@
     <para>This manual page documents briefly the
       <command>&dhpackage;</command> command.</para>
 
-    <para><command>&dhpackage;</command> is a console DCOP client.</para>
+    <para><command>&dhpackage;</command> is a console DCOP (Desktop Communications Protocol) client.</para>
 
   </refsect1>
   <refsect1>
@@ -136,6 +136,24 @@
     </variablelist>
   </refsect1>
   <refsect1>
+    <title>EXAMPLES</title>
+    
+    <para><example>
+      <title>Return number of the current desktop, e.g. 2</title>
+        <blockquote><literallayout>
+dcop kwin KWinInterface currentDesktop
+        </literallayout></blockquote>
+    </example></para>
+
+    <para><example>
+      <title>Jump to the next dektop</title>
+        <blockquote><literallayout>
+dcop kwin KWinInterface nextDesktop
+        </literallayout></blockquote>
+    </example></para>
+
+  </refsect1>
+  <refsect1>
     <title>AUTHOR</title>
 
     <para>This manual page was written by &dhusername; &lt;&dhemail;&gt; for
@@ -147,6 +165,11 @@
       Texts and no Back-Cover Texts.</para>
 
   </refsect1>
+  <refsect1>
+    <title>SEE ALSO</title>
+      <para><application>kdcop</application>(1), <application>dcopserver</application>(1)</para>
+  </refsect1>
+
 </refentry>
 
 <!-- Keep this comment at the end of the file

Deleted: trunk/packages/kdelibs/debian/patches/01_kdelibs_branch.diff.uu

Copied: trunk/packages/kdelibs/debian/patches/01_kdelibs_branch.diff.uu (from rev 378, branches/kde-3.3.2/kdelibs/debian/patches/01_kdelibs_branch.diff.uu)

Modified: trunk/packages/kdelibs/debian/patches/02_autotools_update.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/02_autotools_update.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdelibs/debian/patches/02_autotools_update.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,19 +1,18 @@
-diff -Nrua kdelibs-3.3.1/admin/compile kdelibs-patched/admin/compile
---- kdelibs-3.3.1/admin/compile	2002-09-30 07:18:17.000000000 -0500
-+++ kdelibs-patched/admin/compile	2004-09-19 17:51:50.000000000 -0500
+--- kdelibs-orig/admin/compile
++++ kdelibs-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-09-10.20
++scriptversion=2004-10-12.08
 +
 +# 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,116 @@
+@@ -24,76 +25,118 @@
  # configuration script generated by Autoconf, you may include it under
  # the same distribution terms that you use for the rest of that program.
  
@@ -165,6 +164,8 @@
  if test -f "$cofile"; then
 -   mv "$cofile" "$ofile"
 +  mv "$cofile" "$ofile"
++elif test -f "${cofile}bj"; then
++  mv "${cofile}bj" "$ofile"
  fi
  
 -rmdir $lockdir
@@ -180,9 +181,8 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nrua kdelibs-3.3.1/admin/config.guess kdelibs-patched/admin/config.guess
---- kdelibs-3.3.1/admin/config.guess	2004-08-02 09:17:40.000000000 -0500
-+++ kdelibs-patched/admin/config.guess	2004-08-25 09:25:50.000000000 -0500
+--- kdelibs-orig/admin/config.guess
++++ kdelibs-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.
@@ -244,9 +244,8 @@
  	esac
  	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
  	exit 0 ;;
-diff -Nrua kdelibs-3.3.1/admin/depcomp kdelibs-patched/admin/depcomp
---- kdelibs-3.3.1/admin/depcomp	2003-04-16 16:53:18.000000000 -0500
-+++ kdelibs-patched/admin/depcomp	2004-09-19 17:51:50.000000000 -0500
+--- kdelibs-orig/admin/depcomp
++++ kdelibs-patched/admin/depcomp
 @@ -1,7 +1,9 @@
  #! /bin/sh
 -
@@ -717,16 +716,15 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nrua kdelibs-3.3.1/admin/install-sh kdelibs-patched/admin/install-sh
---- kdelibs-3.3.1/admin/install-sh	2003-08-07 04:41:31.000000000 -0500
-+++ kdelibs-patched/admin/install-sh	2004-09-19 17:51:50.000000000 -0500
+--- kdelibs-orig/admin/install-sh
++++ kdelibs-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-09-10.20
++scriptversion=2004-10-22.00
 +
 +# This originates from X11R5 (mit/util/scripts/install.sh), which was
 +# later released in X11R6 (xc/config/util/install.sh) with the
@@ -785,7 +783,7 @@
  # put in absolute paths if you don't have them in your path; or use env. vars.
  
  mvprog="${MVPROG-mv}"
-@@ -41,236 +58,265 @@
+@@ -41,236 +58,266 @@
  rmprog="${RMPROG-rm}"
  mkdirprog="${MKDIRPROG-mkdir}"
  
@@ -1159,7 +1157,7 @@
 +  fi
 +
 +  # This sed command emulates the dirname command.
-+  dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
++  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
 +
 +  # Make sure that the destination directory exists.
 +
@@ -1172,7 +1170,8 @@
 +    oIFS=$IFS
 +    # Some sh's can't handle IFS=/ for some reason.
 +    IFS='%'
-+    set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
++    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
++    shift
 +    IFS=$oIFS
 +
 +    pathcomp=
@@ -1268,9 +1267,8 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nrua kdelibs-3.3.1/admin/missing kdelibs-patched/admin/missing
---- kdelibs-3.3.1/admin/missing	2002-10-26 11:44:28.000000000 -0500
-+++ kdelibs-patched/admin/missing	2004-09-19 17:51:50.000000000 -0500
+--- kdelibs-orig/admin/missing
++++ kdelibs-patched/admin/missing
 @@ -1,6 +1,10 @@
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.
@@ -1527,9 +1525,8 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nrua kdelibs-3.3.1/admin/mkinstalldirs kdelibs-patched/admin/mkinstalldirs
---- kdelibs-3.3.1/admin/mkinstalldirs	2002-10-26 11:53:16.000000000 -0500
-+++ kdelibs-patched/admin/mkinstalldirs	2004-09-19 17:51:50.000000000 -0500
+--- kdelibs-orig/admin/mkinstalldirs
++++ kdelibs-patched/admin/mkinstalldirs
 @@ -1,20 +1,32 @@
  #! /bin/sh
  # mkinstalldirs --- make directory hierarchy
@@ -1654,9 +1651,8 @@
 +# time-stamp-end: "$"
  # End:
 -# mkinstalldirs ends here
-diff -Nrua kdelibs-3.3.1/admin/ylwrap kdelibs-patched/admin/ylwrap
---- kdelibs-3.3.1/admin/ylwrap	2001-10-04 19:46:36.000000000 -0500
-+++ kdelibs-patched/admin/ylwrap	2004-09-19 17:51:50.000000000 -0500
+--- kdelibs-orig/admin/ylwrap
++++ kdelibs-patched/admin/ylwrap
 @@ -1,6 +1,11 @@
  #! /bin/sh
  # ylwrap - wrapper for lex/yacc invocations.

Modified: trunk/packages/kdelibs/debian/patches/03_libtool_arm.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/03_libtool_arm.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdelibs/debian/patches/03_libtool_arm.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,6 +1,5 @@
-diff -Nrua kdelibs-3.2.92/admin/libtool.m4.in kdelibs-patched/admin/libtool.m4.in
---- kdelibs-3.2.92/admin/libtool.m4.in	2004-04-02 09:39:50.000000000 -0600
-+++ kdelibs-patched/admin/libtool.m4.in	2004-07-26 15:57:35.000000000 -0500
+--- kdelibs-orig/admin/libtool.m4.in
++++ kdelibs-patched/admin/libtool.m4.in
 @@ -2180,17 +2180,7 @@
  
  # This must be Linux ELF.

Modified: trunk/packages/kdelibs/debian/patches/04_am_maintainer_mode.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/04_am_maintainer_mode.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdelibs/debian/patches/04_am_maintainer_mode.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,6 +1,5 @@
-diff -Nrua kdelibs-3.2.92/configure.in.in kdelibs-patched/configure.in.in
---- kdelibs-3.2.92/configure.in.in	2004-02-26 15:15:43.000000000 -0600
-+++ kdelibs-patched/configure.in.in	2004-07-26 16:00:17.000000000 -0500
+--- kdelibs-orig/configure.in.in
++++ kdelibs-patched/configure.in.in
 @@ -19,6 +19,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
  AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs

Modified: trunk/packages/kdelibs/debian/patches/05_pedantic-errors.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/05_pedantic-errors.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdelibs/debian/patches/05_pedantic-errors.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,6 +1,5 @@
-diff -Nrua kdelibs-3.2.92/admin/acinclude.m4.in kdelibs-patched/admin/acinclude.m4.in
---- kdelibs-3.2.92/admin/acinclude.m4.in	2004-07-26 16:01:17.000000000 -0500
-+++ kdelibs-patched/admin/acinclude.m4.in	2004-07-26 16:02:01.000000000 -0500
+--- kdelibs-orig/admin/acinclude.m4.in
++++ kdelibs-patched/admin/acinclude.m4.in
 @@ -2087,9 +2087,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"

Copied: trunk/packages/kdelibs/debian/patches/06_automake-1.9.diff (from rev 378, branches/kde-3.3.2/kdelibs/debian/patches/06_automake-1.9.diff)

Modified: trunk/packages/kdelibs/debian/patches/10_kstandarddirs.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/10_kstandarddirs.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdelibs/debian/patches/10_kstandarddirs.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,6 +1,5 @@
-diff -Nrua kdelibs-3.2.92/kdecore/kstandarddirs.cpp kdelibs-patched/kdecore/kstandarddirs.cpp
---- kdelibs-3.2.92/kdecore/kstandarddirs.cpp	2004-07-16 11:10:24.000000000 -0500
-+++ kdelibs-patched/kdecore/kstandarddirs.cpp	2004-07-26 16:06:09.000000000 -0500
+--- kdelibs-orig/kdecore/kstandarddirs.cpp
++++ kdelibs-patched/kdecore/kstandarddirs.cpp
 @@ -747,6 +747,10 @@
                      if ((local || testdir.exists()) && !candidates->contains(path))
                          candidates->append(path);

Modified: trunk/packages/kdelibs/debian/patches/11_applications_menu.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/11_applications_menu.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdelibs/debian/patches/11_applications_menu.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,6 +1,5 @@
-diff -Nru kdelibs-3.2.1/kded/applications.menu kdelibs-patched/kded/applications.menu
---- kdelibs-3.2.1/kded/applications.menu	2004-03-04 20:48:18.000000000 -0600
-+++ kdelibs-patched/kded/applications.menu	2004-03-04 20:48:53.000000000 -0600
+--- kdelibs-orig/kded/applications.menu
++++ kdelibs-patched/kded/applications.menu
 @@ -4,22 +4,36 @@
  <Menu>
  	<Name>KDE</Name>

Copied: trunk/packages/kdelibs/debian/patches/12_cups_docroot.diff (from rev 378, branches/kde-3.3.2/kdelibs/debian/patches/12_cups_docroot.diff)

Deleted: trunk/packages/kdelibs/debian/patches/post-3.3.1-kdelibs-khtml.diff

Deleted: trunk/packages/kdelibs/debian/patches/post-3.3.1-kdelibs-kio.diff

Deleted: trunk/packages/kdelibs/debian/patches/post-3.3.2-kdelibs-htmlframes2.diff

Modified: trunk/packages/kdelibs/debian/rules
===================================================================
--- trunk/packages/kdelibs/debian/rules	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdelibs/debian/rules	2005-01-07 17:35:10 UTC (rev 379)
@@ -76,6 +76,7 @@
 	cd $(objdir) && \
 	../configure $(configkde) --enable-final \
 	--with-distribution="$$version (`cat /etc/debian_version`)" \
+	--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 	--enable-dnotify --enable-mitshm --with-alsa --with-ipv6-lookup=auto \
 	$(FAST_MALLOC)
 
@@ -206,7 +207,7 @@
 	dh_fixperms -Xusr/bin/fileshareset -Xusr/bin/kgrantpty -Xusr/bin/kpac_dhcp_helper
 	dh_perl
 #	dh_python
-	dh_makeshlibs -V
+	env DH_COMPAT=3 dh_makeshlibs -V
 	dh_installdeb
 	dh_shlibdeps -ldebian/kdelibs-bin/usr/lib:debian/kdelibs4/usr/lib
 	dh_gencontrol

Modified: trunk/packages/kdemultimedia/debian/changelog
===================================================================
--- trunk/packages/kdemultimedia/debian/changelog	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdemultimedia/debian/changelog	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,3 +1,25 @@
+kdemultimedia (4:3.3.2-0pre1) experimental; urgency=low
+
+  * New upstream release.
+
+  * KDE_3_3_BRANCH update.
+
+  * New man pages:
+    - kaboodle.1 by Karolina Lindqv. (Closes: #192567)
+    - kmix.1 and kmixctrl.1 by Clément Stenac. (Closes: #207128)
+    - krec.1 by Ryan Waye. (Closes: #258812)
+      [Forgot to include krec.manpages in previous upload.]
+
+  * debian/control:
+    - make kaudiocreator recommend vorbis-tools. (Closes: #285236)
+    - improve the akode package description. (Closes: #264624, #277822)
+    - make akode Enhance: libarts1.
+    - removed build-dependency on automake1.9.
+    - drop the 'KDE is a powerful...' blurb from juk's description, since
+      it has an appropriate long description.
+
+ -- Adeodato Simó <asp16@alu.ua.es>  Mon, 20 Dec 2004 03:20:59 +0100
+
 kdemultimedia (4:3.3.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/kdemultimedia/debian/control
===================================================================
--- trunk/packages/kdemultimedia/debian/control	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdemultimedia/debian/control	2005-01-07 17:35:10 UTC (rev 379)
@@ -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, cdparanoia, debhelper (>> 4.2.0), gawk, gettext, kdelibs4-dev (>> 4:3.3.1), libcdparanoia0-dev, libesd0-dev, libflac-dev, liboggflac-dev, libsamplerate0-dev, libspeex-dev, libtag1-dev (>> 1.3.1), libtiff4-dev, libtunepimp-bin, libtunepimp2-dev, libxaw7-dev, libxine-dev, sharutils, texinfo, xlibs-static-pic
-Standards-Version: 3.6.1.0
+Uploaders: Christopher L Cheney <ccheney@debian.org>, Adeodato Simó <asp16@alu.ua.es>, Christopher Martin <chrsmrtn@freeshell.org>
+Build-Depends: cdparanoia, debhelper (>> 4.2.0), gawk, gettext, kdelibs4-dev (>> 4:3.3.2), libcdparanoia0-dev, libesd0-dev, libflac-dev, liboggflac-dev, libsamplerate0-dev, libspeex-dev, libtag1-dev (>> 1.3.1), libtiff4-dev, libtunepimp-bin, libtunepimp2-dev, libxaw7-dev, libxine-dev, sharutils, texinfo, xlibs-static-pic
+Standards-Version: 3.6.1
 
 Package: kdemultimedia
 Section: kde
@@ -23,7 +23,7 @@
 Package: kdemultimedia-dev
 Section: devel
 Architecture: any
-Depends: kdelibs4-dev (>> 4:3.3.1), akode (=${Source-Version}), artsbuilder (=${Source-Version}), kdemultimedia-kio-plugins (=${Source-Version}), kmid (=${Source-Version}), kmix (=${Source-Version}), krec (=${Source-Version}), kscd (=${Source-Version}), libarts1-mpeglib (=${Source-Version}), libkcddb1 (=${Source-Version}), mpeglib (=${Source-Version}), noatun (=${Source-Version})
+Depends: kdelibs4-dev (>> 4:3.3.2), akode (=${Source-Version}), artsbuilder (=${Source-Version}), kdemultimedia-kio-plugins (=${Source-Version}), kmid (=${Source-Version}), kmix (=${Source-Version}), krec (=${Source-Version}), kscd (=${Source-Version}), libarts1-mpeglib (=${Source-Version}), libkcddb1 (=${Source-Version}), mpeglib (=${Source-Version}), noatun (=${Source-Version})
 Conflicts: libmpeg-dev
 Replaces: artsbuilder (<< 4:3.0.0), mpeglib (<< 4:3.0.0), noatun (<< 4:3.0.0)
 Description: KDE Multimedia (development files)
@@ -40,13 +40,15 @@
 Section: sound
 Architecture: any
 Depends: ${shlibs:Depends}
+Enhances: libarts1
 Description: akode arts plugin
- KDE is a powerful Open Source graphical desktop environment
- for Unix workstations. It combines ease of use, contemporary
- functionality, and outstanding graphical design with the
- technological superiority of the Unix operating system.
+ aKode is a new multithreaded audio library that provides aRts with
+ plugins to play a variety of formats: MP3, Ogg Vorbis, Musepack (MPC),
+ FLAC and Speex. aKode also focuses on performance, and so it means a
+ big enhancement for users runing aRts in non-realtime mode.
  .
- akode arts plugin.
+ It also supersedes mpeglib, which you may safely uninstall once you
+ install the akode package.
  .
  This package is part of the official KDE multimedia module.
 
@@ -71,11 +73,6 @@
 Depends: ${shlibs:Depends}, libtunepimp-bin
 Suggests: khelpcenter
 Description: music organizer and player for KDE
- KDE is a powerful Open Source graphical desktop environment
- for Unix workstations. It combines ease of use, contemporary
- functionality, and outstanding graphical design with the
- technological superiority of the Unix operating system.
- .
  JuK (pronounced "jook") is a jukebox and music manager for the KDE
  desktop similar to jukebox software on other platforms such as
  iTunes or RealOne.
@@ -117,6 +114,7 @@
 Section: sound
 Architecture: any
 Depends: ${shlibs:Depends}, kdemultimedia-kio-plugins
+Recommends: vorbis-tools
 Description: CD ripper and audio encoder frontend
  KDE is a powerful Open Source graphical desktop environment
  for Unix workstations. It combines ease of use, contemporary

Copied: trunk/packages/kdemultimedia/debian/kaboodle.manpages (from rev 378, branches/kde-3.3.2/kdemultimedia/debian/kaboodle.manpages)

Copied: trunk/packages/kdemultimedia/debian/kmix.manpages (from rev 378, branches/kde-3.3.2/kdemultimedia/debian/kmix.manpages)

Copied: trunk/packages/kdemultimedia/debian/krec.manpages (from rev 378, branches/kde-3.3.2/kdemultimedia/debian/krec.manpages)

Copied: trunk/packages/kdemultimedia/debian/man/kaboodle.1 (from rev 378, branches/kde-3.3.2/kdemultimedia/debian/man/kaboodle.1)

Copied: trunk/packages/kdemultimedia/debian/man/kmix.1 (from rev 378, branches/kde-3.3.2/kdemultimedia/debian/man/kmix.1)

Copied: trunk/packages/kdemultimedia/debian/man/kmixctrl.1 (from rev 378, branches/kde-3.3.2/kdemultimedia/debian/man/kmixctrl.1)

Deleted: trunk/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch.diff.uu

Copied: trunk/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch.diff.uu (from rev 378, branches/kde-3.3.2/kdemultimedia/debian/patches/01_kdemultimedia_branch.diff.uu)

Modified: trunk/packages/kdemultimedia/debian/patches/02_autotools_update.diff
===================================================================
--- trunk/packages/kdemultimedia/debian/patches/02_autotools_update.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdemultimedia/debian/patches/02_autotools_update.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,6 +1,5 @@
-diff -Nru kdemultimedia-3.3.1/admin/compile kdemultimedia-patched/admin/compile
---- kdemultimedia-3.3.1/admin/compile	2002-09-30 07:18:17.000000000 -0500
-+++ kdemultimedia-patched/admin/compile	2004-11-03 20:01:22.000000000 -0600
+--- kdemultimedia-orig/admin/compile
++++ kdemultimedia-patched/admin/compile
 @@ -1,8 +1,9 @@
  #! /bin/sh
 -
@@ -182,9 +181,8 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nru kdemultimedia-3.3.1/admin/config.guess kdemultimedia-patched/admin/config.guess
---- kdemultimedia-3.3.1/admin/config.guess	2004-08-02 09:17:40.000000000 -0500
-+++ kdemultimedia-patched/admin/config.guess	2004-08-25 09:25:50.000000000 -0500
+--- kdemultimedia-orig/admin/config.guess
++++ kdemultimedia-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 +244,8 @@
  	esac
  	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
  	exit 0 ;;
-diff -Nru kdemultimedia-3.3.1/admin/depcomp kdemultimedia-patched/admin/depcomp
---- kdemultimedia-3.3.1/admin/depcomp	2003-04-16 16:53:18.000000000 -0500
-+++ kdemultimedia-patched/admin/depcomp	2004-11-03 20:01:22.000000000 -0600
+--- kdemultimedia-orig/admin/depcomp
++++ kdemultimedia-patched/admin/depcomp
 @@ -1,7 +1,9 @@
  #! /bin/sh
 -
@@ -719,9 +716,8 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nru kdemultimedia-3.3.1/admin/install-sh kdemultimedia-patched/admin/install-sh
---- kdemultimedia-3.3.1/admin/install-sh	2003-08-07 04:41:31.000000000 -0500
-+++ kdemultimedia-patched/admin/install-sh	2004-11-03 20:01:22.000000000 -0600
+--- kdemultimedia-orig/admin/install-sh
++++ kdemultimedia-patched/admin/install-sh
 @@ -1,19 +1,38 @@
  #!/bin/sh
 -#
@@ -1271,9 +1267,8 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nru kdemultimedia-3.3.1/admin/missing kdemultimedia-patched/admin/missing
---- kdemultimedia-3.3.1/admin/missing	2002-10-26 11:44:28.000000000 -0500
-+++ kdemultimedia-patched/admin/missing	2004-11-03 20:01:22.000000000 -0600
+--- kdemultimedia-orig/admin/missing
++++ kdemultimedia-patched/admin/missing
 @@ -1,6 +1,10 @@
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.
@@ -1530,9 +1525,8 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nru kdemultimedia-3.3.1/admin/mkinstalldirs kdemultimedia-patched/admin/mkinstalldirs
---- kdemultimedia-3.3.1/admin/mkinstalldirs	2002-10-26 11:53:16.000000000 -0500
-+++ kdemultimedia-patched/admin/mkinstalldirs	2004-11-03 20:01:22.000000000 -0600
+--- kdemultimedia-orig/admin/mkinstalldirs
++++ kdemultimedia-patched/admin/mkinstalldirs
 @@ -1,20 +1,32 @@
  #! /bin/sh
  # mkinstalldirs --- make directory hierarchy
@@ -1657,9 +1651,8 @@
 +# time-stamp-end: "$"
  # End:
 -# mkinstalldirs ends here
-diff -Nru kdemultimedia-3.3.1/admin/ylwrap kdemultimedia-patched/admin/ylwrap
---- kdemultimedia-3.3.1/admin/ylwrap	2001-10-04 19:46:36.000000000 -0500
-+++ kdemultimedia-patched/admin/ylwrap	2004-11-03 20:01:22.000000000 -0600
+--- kdemultimedia-orig/admin/ylwrap
++++ kdemultimedia-patched/admin/ylwrap
 @@ -1,6 +1,11 @@
  #! /bin/sh
  # ylwrap - wrapper for lex/yacc invocations.

Modified: trunk/packages/kdemultimedia/debian/patches/03_libtool_arm.diff
===================================================================
--- trunk/packages/kdemultimedia/debian/patches/03_libtool_arm.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdemultimedia/debian/patches/03_libtool_arm.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,6 +1,5 @@
-diff -Nrua kdemultimedia-3.2.2/admin/libtool.m4.in kdemultimedia-patched/admin/libtool.m4.in
---- kdemultimedia-3.2.2/admin/libtool.m4.in	2004-04-02 09:41:05.000000000 -0600
-+++ kdemultimedia-patched/admin/libtool.m4.in	2004-04-16 00:37:07.000000000 -0500
+--- kdemultimedia-orig/admin/libtool.m4.in
++++ kdemultimedia-patched/admin/libtool.m4.in
 @@ -2180,17 +2180,7 @@
  
  # This must be Linux ELF.

Modified: trunk/packages/kdemultimedia/debian/patches/04_am_maintainer_mode.diff
===================================================================
--- trunk/packages/kdemultimedia/debian/patches/04_am_maintainer_mode.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdemultimedia/debian/patches/04_am_maintainer_mode.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,6 +1,5 @@
-diff -Nru kdemultimedia-3.1.4/admin/configure.in.min kdemultimedia-patched/admin/configure.in.min
---- kdemultimedia-3.1.4/admin/configure.in.min	2001-11-07 05:17:28.000000000 -0600
-+++ kdemultimedia-patched/admin/configure.in.min	2003-10-17 22:10:16.000000000 -0500
+--- kdemultimedia-orig/admin/configure.in.min
++++ kdemultimedia-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

Modified: trunk/packages/kdemultimedia/debian/patches/05_pedantic-errors.diff
===================================================================
--- trunk/packages/kdemultimedia/debian/patches/05_pedantic-errors.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdemultimedia/debian/patches/05_pedantic-errors.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,6 +1,5 @@
-diff -Nrua kdemultimedia-3.2.92/admin/acinclude.m4.in kdemultimedia-patched/admin/acinclude.m4.in
---- kdemultimedia-3.2.92/admin/acinclude.m4.in	2004-07-28 03:54:09.000000000 -0500
-+++ kdemultimedia-patched/admin/acinclude.m4.in	2004-07-28 03:54:40.000000000 -0500
+--- kdemultimedia-orig/admin/acinclude.m4.in
++++ kdemultimedia-patched/admin/acinclude.m4.in
 @@ -2087,9 +2087,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"

Copied: trunk/packages/kdemultimedia/debian/patches/06_automake-1.9.diff (from rev 378, branches/kde-3.3.2/kdemultimedia/debian/patches/06_automake-1.9.diff)

Deleted: trunk/packages/kdemultimedia/debian/patches/06_xlibs-static-pic.diff

Copied: trunk/packages/kdemultimedia/debian/patches/07_xlibs-static-pic.diff (from rev 378, branches/kde-3.3.2/kdemultimedia/debian/patches/07_xlibs-static-pic.diff)

Modified: trunk/packages/kdemultimedia/debian/patches/10_dont-define-__64.diff
===================================================================
--- trunk/packages/kdemultimedia/debian/patches/10_dont-define-__64.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdemultimedia/debian/patches/10_dont-define-__64.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,5 +1,5 @@
---- a/mpeglib/lib/input/cdromAccess.cpp
-+++ b/mpeglib/lib/input/cdromAccess.cpp
+--- kdemultimedia-orig/mpeglib/lib/input/cdromAccess.cpp
++++ kdemultimedia-patched/mpeglib/lib/input/cdromAccess.cpp
 @@ -25,11 +25,13 @@
  #ifdef OS_Linux
    #include <linux/version.h>

Modified: trunk/packages/kdemultimedia/debian/rules
===================================================================
--- trunk/packages/kdemultimedia/debian/rules	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdemultimedia/debian/rules	2005-01-07 17:35:10 UTC (rev 379)
@@ -73,6 +73,7 @@
 	# run configure with build tree $(objdir)
 	cd $(objdir) && \
 	../configure $(configkde) --enable-final \
+	--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 	--with-alsa --with-arts-alsa
 
 	touch configure-stamp
@@ -202,7 +203,7 @@
 	dh_fixperms
 #	dh_perl
 #	dh_python
-	dh_makeshlibs -V
+	env DH_COMPAT=3 dh_makeshlibs -V
 	dh_installdeb
 	dh_shlibdeps -ldebian/akode/usr/lib:debian/artsbuilder/usr/lib:debian/kdemultimedia-kio-plugins/usr/lib:debian/kmid/usr/lib:debian/kscd/usr/lib:debian/libkcddb1/usr/lib:debian/mpeglib/usr/lib:debian/noatun/usr/lib
 	dh_gencontrol

Modified: trunk/packages/kdenetwork/debian/changelog
===================================================================
--- trunk/packages/kdenetwork/debian/changelog	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdenetwork/debian/changelog	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,3 +1,30 @@
+kdenetwork (4:3.3.2-0pre1) experimental; urgency=low
+
+  * New upstream release.
+
+  * KDE_3_3_BRANCH update.
+
+  * debian/control:
+    - removed build-dependency on automake1.9.
+
+  * debian/patches:
+    - dropped 11_kget.diff, fix included upstream.
+    - added 11_kpf-non-ascii-too.diff, to make kpf produce valid links to
+      files with non-ascii chars. (Trivial) Patch backported from CVS HEAD.
+      (Closes: #285883)
+
+  +++ Changes by Christopher Martin:
+
+  * kppp overhaul: replace utterly broken 10_pppdargs.diff patch
+    with 10_kppp_options.diff. kppp now SUID. To connect with kppp,
+    users must now uncomment #noauth in /etc/ppp/peers/kppp-options,
+    and be part of the dip group. No editing of ppp config files,
+    pap/chap-secrets, etc. required. Updated the kppp
+    README.Debian to explain these changes and their security
+    implications. (Closes: #126406, #203318)
+
+ -- Adeodato Simó <asp16@alu.ua.es>  Tue, 21 Dec 2004 00:13:56 +0100
+
 kdenetwork (4:3.3.1-2) unstable; urgency=low
 
   * reapply kget patch, Closes: #280616

Modified: trunk/packages/kdenetwork/debian/control
===================================================================
--- trunk/packages/kdenetwork/debian/control	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdenetwork/debian/control	2005-01-07 17:35:10 UTC (rev 379)
@@ -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>, Riku Voipio <riku.voipio@iki.fi>
-Build-Depends: automake1.9, debhelper (>> 4.2.0), docbook-to-man, doxygen, gawk, gettext, kdelibs4-dev (>> 4:3.3.0), libgadu-dev, libiw-dev, libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, qt3-doc, sharutils, valgrind [i386], xlibs-static-pic, xmms-dev
-Standards-Version: 3.6.1.0
+Uploaders: Christopher L Cheney <ccheney@debian.org>, Riku Voipio <riku.voipio@iki.fi>, Adeodato Simó <asp16@alu.ua.es>, Christopher Martin <chrsmrtn@freeshell.org>
+Build-Depends: debhelper (>> 4.2.0), docbook-to-man, doxygen, gawk, gettext, kdelibs4-dev (>> 4:3.3.2), libgadu-dev, libiw-dev, libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, qt3-doc, sharutils, valgrind [i386], xlibs-static-pic, xmms-dev
+Standards-Version: 3.6.1
 
 Package: kdenetwork
 Section: kde
@@ -137,8 +137,7 @@
 Package: kppp
 Section: net
 Architecture: any
-Depends: ${shlibs:Depends}
-Recommends: ppp
+Depends: ${shlibs:Depends}, ppp
 Suggests: khelpcenter
 Description: KDE dialer and frontend to pppd
  KDE is a powerful Open Source graphical desktop environment for Unix

Modified: trunk/packages/kdenetwork/debian/kppp.README.Debian
===================================================================
--- trunk/packages/kdenetwork/debian/kppp.README.Debian	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdenetwork/debian/kppp.README.Debian	2005-01-07 17:35:10 UTC (rev 379)
@@ -2,20 +2,16 @@
 ==========================
 
 In order to actually use kppp you must first be a part of the "dip" group.
-This is the same for using PPP in general on Debian.  If you are not a part
-of this group you will not be able to actually run pppd or setup proper
-connections.
+This is the standard for using ppp in general with Debian.  If you are not a
+member of this group, you will not be able to run pppd or setup connections.
 
+Furthermore, kppp requires that the ppp daemon be run with the "noauth"
+option.  However, pppd's default setting, in /etc/ppp/options, is "auth",
+and for security reasons it should remain so.  To work around this problem,
+uncomment "noauth" in /etc/ppp/peers/kppp-options.  You should then be able
+to connect.
 
-kppp and immediate disconnects
-==============================
-
-In order for kppp to properly work you must set "noauth" in /etc/ppp/options.
-Keep in mind that you main have /etc/ppp/options.ttyS0 (For example) so make
-sure you change it in the proper (all?) file.
-
-The default is "auth" so if you don't change this most likely you'll connect
-and end up just getting a disconnect shortly after.
-
-
-- Ivan E. Moore II <rkrusty@debian.org>
+Note that if "noauth" is uncommented, a setting of "noauth" in
+/etc/ppp/options will conflict with kppp. Note also that uncommenting
+"noauth" opens the possibility that other malicious members of the "dip"
+group could now potentially abuse the ppp daemon with the "noauth" option.

Modified: trunk/packages/kdenetwork/debian/kppp.install
===================================================================
--- trunk/packages/kdenetwork/debian/kppp.install	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdenetwork/debian/kppp.install	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,3 +1,4 @@
+debian/tmp/etc/ppp/peers/kppp-options
 debian/tmp/usr/bin/kppp
 debian/tmp/usr/bin/kppplogview
 debian/tmp/usr/share/applications/kde/Kppp.desktop

Copied: trunk/packages/kdenetwork/debian/patches/01_kdenetwork_branch.diff.uu (from rev 378, branches/kde-3.3.2/kdenetwork/debian/patches/01_kdenetwork_branch.diff.uu)

Modified: trunk/packages/kdenetwork/debian/patches/02_autotools_update.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/02_autotools_update.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdenetwork/debian/patches/02_autotools_update.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,25 +1,27 @@
-diff -Nrua kdenetwork-3.3.0/admin/compile kdenetwork-patched/admin/compile
---- kdenetwork-3.3.0/admin/compile	2002-09-30 07:18:17.000000000 -0500
-+++ kdenetwork-patched/admin/compile	2004-08-12 21:22:21.000000000 -0500
+--- kdenetwork-orig/admin/compile
++++ kdenetwork-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=2003-11-09.00
++scriptversion=2004-10-12.08
 +
-+# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
++# 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,9 +25,36 @@
+@@ -24,76 +25,118 @@
  # configuration script generated by Autoconf, you may include it under
  # the same distribution terms that you use for the rest of that program.
  
 -# Usage:
 -# compile PROGRAM [ARGS]...
 -# `-o FOO.o' is removed from the args passed to the actual compile.
+-
+-prog=$1
+-shift
 +# This file is maintained in Automake, please report
 +# bugs to <bug-automake@gnu.org> or send patches to
 +# <automake-patches@gnu.org>.
@@ -49,55 +51,68 @@
 +    exit 0
 +    ;;
 +esac
-+
  
- prog=$1
- shift
-@@ -35,39 +63,39 @@
+ ofile=
  cfile=
- args=
- while test $# -gt 0; do
+-args=
+-while test $# -gt 0; do
 -   case "$1" in
-+  case "$1" in
-     -o)
+-    -o)
 -       # configure might choose to run compile as `compile cc -o foo foo.c'.
 -       # So we do something ugly here.
 -       ofile=$2
 -       shift
 -       case "$ofile" in
-+      # configure might choose to run compile as `compile cc -o foo foo.c'.
-+      # So we do something ugly here.
-+      ofile=$2
-+      shift
-+      case "$ofile" in
- 	*.o | *.obj)
+-	*.o | *.obj)
 -	   ;;
-+	  ;;
- 	*)
+-	*)
 -	   args="$args -o $ofile"
 -	   ofile=
 -	   ;;
 -       esac
-+	  args="$args -o $ofile"
-+	  ofile=
-+	  ;;
-+      esac
-        ;;
-     *.c)
+-       ;;
+-    *.c)
 -       cfile=$1
 -       args="$args $1"
 -       ;;
-+      cfile=$1
-+      args="$args $1"
-+      ;;
-     *)
+-    *)
 -       args="$args $1"
 -       ;;
 -   esac
 -   shift
-+      args="$args $1"
-+      ;;
-+  esac
++eat=
++
++for arg
++do
++  if test -n "$eat"; then
++    eat=
++  else
++    case $1 in
++      -o)
++	# configure might choose to run compile as `compile cc -o foo foo.c'.
++	# So we strip `-o arg' only if arg is an object.
++	eat=1
++	case $2 in
++	  *.o | *.obj)
++	    ofile=$2
++	    ;;
++	  *)
++	    set x "$@" -o "$2"
++	    shift
++	    ;;
++	esac
++	;;
++      *.c)
++	cfile=$1
++	set x "$@" "$1"
++	shift
++	;;
++      *)
++	set x "$@" "$1"
++	shift
++	;;
++    esac
++  fi
 +  shift
  done
  
@@ -113,35 +128,50 @@
 +  # normal compilation that the losing compiler can handle.  If no
 +  # `.c' file was seen then we are probably linking.  That is also
 +  # ok.
-+  exec "$prog" $args
++  exec "$@"
  fi
  
  # Name of file we expect compiler to create.
-@@ -79,10 +107,10 @@
+-cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
++cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+ 
+ # Create the lock directory.
+ # Note: use `[/.-]' here to ensure that we don't use the same name
+ # that we are using for the .o file.  Also, base the name on the expected
  # object file name, since that is what matters with a parallel build.
- lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
+-lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
++lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
  while true; do
 -   if mkdir $lockdir > /dev/null 2>&1; then
 -      break
 -   fi
 -   sleep 1
-+  if mkdir $lockdir > /dev/null 2>&1; then
++  if mkdir "$lockdir" >/dev/null 2>&1; then
 +    break
 +  fi
 +  sleep 1
  done
  # FIXME: race condition here if user kills between mkdir and trap.
- trap "rmdir $lockdir; exit 1" 1 2 15
-@@ -92,8 +120,17 @@
- status=$?
+-trap "rmdir $lockdir; exit 1" 1 2 15
++trap "rmdir '$lockdir'; exit 1" 1 2 15
  
+ # Run the compile.
+-"$prog" $args
+-status=$?
++"$@"
++ret=$?
+ 
  if test -f "$cofile"; then
 -   mv "$cofile" "$ofile"
 +  mv "$cofile" "$ofile"
++elif test -f "${cofile}bj"; then
++  mv "${cofile}bj" "$ofile"
  fi
  
- rmdir $lockdir
- exit $status
+-rmdir $lockdir
+-exit $status
++rmdir "$lockdir"
++exit $ret
 +
 +# Local Variables:
 +# mode: shell-script
@@ -151,20 +181,49 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nrua kdenetwork-3.3.0/admin/config.guess kdenetwork-patched/admin/config.guess
---- kdenetwork-3.3.0/admin/config.guess	2004-08-02 09:17:40.000000000 -0500
-+++ kdenetwork-patched/admin/config.guess	2004-08-08 14:36:29.000000000 -0500
+--- kdenetwork-orig/admin/config.guess
++++ kdenetwork-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.
  
 -timestamp='2004-06-24'
-+timestamp='2004-07-19'
++timestamp='2004-08-13'
  
  # 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
-@@ -1081,7 +1081,7 @@
+@@ -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 ;;
+@@ -1081,7 +1072,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)
@@ -172,9 +231,21 @@
  	OS_REL=''
  	test -r /etc/.relid \
  	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-diff -Nrua kdenetwork-3.3.0/admin/depcomp kdenetwork-patched/admin/depcomp
---- kdenetwork-3.3.0/admin/depcomp	2003-04-16 16:53:18.000000000 -0500
-+++ kdenetwork-patched/admin/depcomp	2004-08-12 21:22:21.000000000 -0500
+@@ -1179,9 +1170,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 ;;
+--- kdenetwork-orig/admin/depcomp
++++ kdenetwork-patched/admin/depcomp
 @@ -1,7 +1,9 @@
  #! /bin/sh
 -
@@ -645,16 +716,15 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nrua kdenetwork-3.3.0/admin/install-sh kdenetwork-patched/admin/install-sh
---- kdenetwork-3.3.0/admin/install-sh	2003-08-07 04:41:31.000000000 -0500
-+++ kdenetwork-patched/admin/install-sh	2004-08-12 21:22:21.000000000 -0500
+--- kdenetwork-orig/admin/install-sh
++++ kdenetwork-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-07-05.00
++scriptversion=2004-10-22.00
 +
 +# This originates from X11R5 (mit/util/scripts/install.sh), which was
 +# later released in X11R6 (xc/config/util/install.sh) with the
@@ -713,7 +783,7 @@
  # put in absolute paths if you don't have them in your path; or use env. vars.
  
  mvprog="${MVPROG-mv}"
-@@ -41,236 +58,265 @@
+@@ -41,236 +58,266 @@
  rmprog="${RMPROG-rm}"
  mkdirprog="${MKDIRPROG-mkdir}"
  
@@ -1087,7 +1157,7 @@
 +  fi
 +
 +  # This sed command emulates the dirname command.
-+  dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
++  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
 +
 +  # Make sure that the destination directory exists.
 +
@@ -1100,7 +1170,8 @@
 +    oIFS=$IFS
 +    # Some sh's can't handle IFS=/ for some reason.
 +    IFS='%'
-+    set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
++    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
++    shift
 +    IFS=$oIFS
 +
 +    pathcomp=
@@ -1134,7 +1205,7 @@
 +    rmtmp=$dstdir/_rm.$$_
 +
 +    # Trap to clean up those temp files at exit.
-+    trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
++    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
 +    trap '(exit $?); exit' 1 2 13 15
 +
 +    # Copy the file name to the temp name.
@@ -1196,22 +1267,21 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nrua kdenetwork-3.3.0/admin/missing kdenetwork-patched/admin/missing
---- kdenetwork-3.3.0/admin/missing	2002-10-26 11:44:28.000000000 -0500
-+++ kdenetwork-patched/admin/missing	2004-08-12 21:22:21.000000000 -0500
+--- kdenetwork-orig/admin/missing
++++ kdenetwork-patched/admin/missing
 @@ -1,6 +1,10 @@
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.
 -# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
 +
-+scriptversion=2003-09-02.23
++scriptversion=2004-09-07.08
 +
-+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 
++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
 +#   Free Software Foundation, Inc.
  # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
  
  # This program is free software; you can redistribute it and/or modify
-@@ -38,12 +42,23 @@
+@@ -38,18 +42,24 @@
    configure_ac=configure.in
  fi
  
@@ -1233,9 +1303,15 @@
 +    msg="probably too old"
 +  fi
    ;;
- esac
+-esac
+-
+-# If it does not exist, or fails to run (possibly an outdated version),
+-# try to emulate it.
+-case "$1" in
  
-@@ -74,11 +89,13 @@
+   -h|--h|--he|--hel|--help)
+     echo "\
+@@ -74,11 +84,15 @@
    lex          create \`lex.yy.c', if possible, from existing .c
    makeinfo     touch the output file
    tar          try tar, gnutar, gtar, then tar without non-portable flags
@@ -1243,53 +1319,117 @@
 +  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 +
 +Send bug reports to <bug-automake@gnu.org>."
++    exit 0
      ;;
  
    -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
 -    echo "missing 0.4 - GNU automake"
 +    echo "missing $scriptversion (GNU Automake)"
++    exit 0
      ;;
  
    -*)
-@@ -94,7 +111,7 @@
+@@ -87,14 +101,44 @@
+     exit 1
+     ;;
+ 
+-  aclocal*)
++esac
++
++# Now exit if we have it, but it failed.  Also exit now if we
++# don't have it and --version was passed (most likely to detect
++# the program).
++case "$1" in
++  lex|yacc)
++    # Not GNU programs, they don't have --version.
++    ;;
++
++  tar)
++    if test -n "$run"; then
++       echo 1>&2 "ERROR: \`tar' requires --run"
++       exit 1
++    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
++       exit 1
++    fi
++    ;;
++
++  *)
+     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+        # We have it, but it failed.
+        exit 1
++    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
++       # Could not run --version or --help.  This is probably someone
++       # running `$TOOL --version' or `$TOOL --help' to check whether
++       # $TOOL exists and not knowing $TOOL uses missing.
++       exit 1
      fi
++    ;;
++esac
  
++# If it does not exist, or fails to run (possibly an outdated version),
++# try to emulate it.
++case "$1" in
++  aclocal*)
      echo 1>&2 "\
 -WARNING: \`$1' is missing on your system.  You should only need it if
 +WARNING: \`$1' is $msg.  You should only need it if
           you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
           to install the \`Automake' and \`Perl' packages.  Grab them from
           any GNU archive site."
-@@ -108,7 +125,7 @@
-     fi
+@@ -102,13 +146,8 @@
+     ;;
  
+   autoconf)
+-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+-       # We have it, but it failed.
+-       exit 1
+-    fi
+-
      echo 1>&2 "\
 -WARNING: \`$1' is missing on your system.  You should only need it if
 +WARNING: \`$1' is $msg.  You should only need it if
           you modified \`${configure_ac}'.  You might want to install the
           \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
           archive site."
-@@ -122,7 +139,7 @@
-     fi
+@@ -116,13 +155,8 @@
+     ;;
  
+   autoheader)
+-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+-       # We have it, but it failed.
+-       exit 1
+-    fi
+-
      echo 1>&2 "\
 -WARNING: \`$1' is missing on your system.  You should only need it if
 +WARNING: \`$1' is $msg.  You should only need it if
           you modified \`acconfig.h' or \`${configure_ac}'.  You might want
           to install the \`Autoconf' and \`GNU m4' packages.  Grab them
           from any GNU archive site."
-@@ -146,7 +163,7 @@
-     fi
+@@ -140,13 +174,8 @@
+     ;;
  
+   automake*)
+-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+-       # We have it, but it failed.
+-       exit 1
+-    fi
+-
      echo 1>&2 "\
 -WARNING: \`$1' is missing on your system.  You should only need it if
 +WARNING: \`$1' is $msg.  You should only need it if
           you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
           You might want to install the \`Automake' and \`Perl' packages.
           Grab them from any GNU archive site."
-@@ -162,10 +179,10 @@
-     fi
+@@ -156,16 +185,11 @@
+     ;;
  
+   autom4te)
+-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+-       # We have it, but it failed.
+-       exit 1
+-    fi
+-
      echo 1>&2 "\
 -WARNING: \`$1' is needed, and you do not seem to have it handy on your
 -         system.  You might have modified some files without having the
@@ -1301,7 +1441,7 @@
           archive site."
  
      file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-@@ -185,7 +202,7 @@
+@@ -185,7 +209,7 @@
  
    bison|yacc)
      echo 1>&2 "\
@@ -1310,7 +1450,7 @@
           you modified a \`.y' file.  You may need the \`Bison' package
           in order for those modifications to take effect.  You can get
           \`Bison' from any GNU archive site."
-@@ -215,7 +232,7 @@
+@@ -215,7 +239,7 @@
  
    lex|flex)
      echo 1>&2 "\
@@ -1319,26 +1459,49 @@
           you modified a \`.l' file.  You may need the \`Flex' package
           in order for those modifications to take effect.  You can get
           \`Flex' from any GNU archive site."
-@@ -243,7 +260,7 @@
-     fi
+@@ -237,13 +261,8 @@
+     ;;
  
+   help2man)
+-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+-       # We have it, but it failed.
+-       exit 1
+-    fi
+-
      echo 1>&2 "\
 -WARNING: \`$1' is missing on your system.  You should only need it if
 +WARNING: \`$1' is $msg.  You should only need it if
  	 you modified a dependency of a manual page.  You may need the
  	 \`Help2man' package in order for those modifications to take
  	 effect.  You can get \`Help2man' from any GNU archive site."
-@@ -268,7 +285,7 @@
-     fi
+@@ -262,13 +281,8 @@
+     ;;
  
+   makeinfo)
+-    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
+-       # We have makeinfo, but it failed.
+-       exit 1
+-    fi
+-
      echo 1>&2 "\
 -WARNING: \`$1' is missing on your system.  You should only need it if
 +WARNING: \`$1' is $msg.  You should only need it if
           you modified a \`.texi' or \`.texinfo' file, or any other file
           indirectly affecting the aspect of the manual.  The spurious
           call might also be the consequence of using a buggy \`make' (AIX,
-@@ -323,10 +340,10 @@
+@@ -284,10 +298,6 @@
  
+   tar)
+     shift
+-    if test -n "$run"; then
+-      echo 1>&2 "ERROR: \`tar' requires --run"
+-      exit 1
+-    fi
+ 
+     # We have already tried tar in the generic part.
+     # Look for gnutar/gtar before invocation to avoid ugly error
+@@ -323,10 +333,10 @@
+ 
    *)
      echo 1>&2 "\
 -WARNING: \`$1' is needed, and you do not seem to have it handy on your
@@ -1351,7 +1514,7 @@
           this package.  You may also peek at any GNU archive site, in case
           some other package would contain this missing \`$1' program."
      exit 1
-@@ -334,3 +351,10 @@
+@@ -334,3 +344,10 @@
  esac
  
  exit 0
@@ -1362,9 +1525,8 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nrua kdenetwork-3.3.0/admin/mkinstalldirs kdenetwork-patched/admin/mkinstalldirs
---- kdenetwork-3.3.0/admin/mkinstalldirs	2002-10-26 11:53:16.000000000 -0500
-+++ kdenetwork-patched/admin/mkinstalldirs	2004-08-12 21:22:21.000000000 -0500
+--- kdenetwork-orig/admin/mkinstalldirs
++++ kdenetwork-patched/admin/mkinstalldirs
 @@ -1,20 +1,32 @@
  #! /bin/sh
  # mkinstalldirs --- make directory hierarchy
@@ -1489,17 +1651,16 @@
 +# time-stamp-end: "$"
  # End:
 -# mkinstalldirs ends here
-diff -Nrua kdenetwork-3.3.0/admin/ylwrap kdenetwork-patched/admin/ylwrap
---- kdenetwork-3.3.0/admin/ylwrap	2001-10-04 19:46:36.000000000 -0500
-+++ kdenetwork-patched/admin/ylwrap	2004-08-12 21:22:21.000000000 -0500
+--- kdenetwork-orig/admin/ylwrap
++++ kdenetwork-patched/admin/ylwrap
 @@ -1,6 +1,11 @@
  #! /bin/sh
  # ylwrap - wrapper for lex/yacc invocations.
 -# Copyright 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 +
-+scriptversion=2003-11-18.20
++scriptversion=2004-09-10.20
 +
-+# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003
++# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004
 +#   Free Software Foundation, Inc.
 +#
  # Written by Tom Tromey <tromey@cygnus.com>.
@@ -1606,18 +1767,19 @@
  esac
  
  # FIXME: add hostname here for parallel makes that run commands on
-@@ -79,61 +105,105 @@
+@@ -79,65 +105,118 @@
  
  cd $dirname
  
 -$prog ${1+"$@"} "$input"
+-status=$?
 +case $# in
 +  0) $prog "$input" ;;
 +  *) $prog "$@" "$input" ;;
 +esac
- status=$?
++ret=$?
  
- if test $status -eq 0; then
+-if test $status -eq 0; then
 -   set X $pairlist
 -   shift
 -   first=yes
@@ -1654,6 +1816,7 @@
 -	 # it is better for it to just mention the .y file with no
 -	 # path.
 -	 sed -e "/^#/ s,$input_rx,," "$from" > "$target" || status=$?
++if test $ret -eq 0; then
 +  set X $pairlist
 +  shift
 +  first=yes
@@ -1730,7 +1893,7 @@
 +            -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
 +
 +      sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \
-+          -e "s,$FROM,$TARGET," "$from" >"$target" || status=$?
++          -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$?
 +
 +      # Check whether header files must be updated.
 +      if test $first = no; then
@@ -1748,7 +1911,7 @@
 +      # is not specified, we don't want an error when the header
 +      # file is "missing".
 +      if test $first = yes; then
-+        status=1
++        ret=1
 +      fi
 +    fi
 +    shift
@@ -1757,14 +1920,15 @@
 +  done
  else
 -   status=$?
-+  status=$?
++  ret=$?
  fi
  
  # Remove the directory.
-@@ -141,3 +211,12 @@
+ cd ..
  rm -rf $dirname
  
- exit $status
+-exit $status
++exit $ret
 +
 +# Local Variables:
 +# mode: shell-script

Modified: trunk/packages/kdenetwork/debian/patches/03_libtool_arm.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/03_libtool_arm.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdenetwork/debian/patches/03_libtool_arm.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,6 +1,5 @@
-diff -Nrua kdenetwork-3.2.2/admin/libtool.m4.in kdenetwork-patched/admin/libtool.m4.in
---- kdenetwork-3.2.2/admin/libtool.m4.in	2004-04-02 09:41:05.000000000 -0600
-+++ kdenetwork-patched/admin/libtool.m4.in	2004-04-16 03:44:45.000000000 -0500
+--- kdenetwork-orig/admin/libtool.m4.in
++++ kdenetwork-patched/admin/libtool.m4.in
 @@ -2180,17 +2180,7 @@
  
  # This must be Linux ELF.

Modified: trunk/packages/kdenetwork/debian/patches/04_am_maintainer_mode.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/04_am_maintainer_mode.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdenetwork/debian/patches/04_am_maintainer_mode.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,6 +1,5 @@
-diff -Nru kdenetwork-3.1.4/admin/configure.in.min kdenetwork-patched/admin/configure.in.min
---- kdenetwork-3.1.4/admin/configure.in.min	2001-11-07 05:17:28.000000000 -0600
-+++ kdenetwork-patched/admin/configure.in.min	2003-10-18 00:29:11.000000000 -0500
+--- kdenetwork-orig/admin/configure.in.min
++++ kdenetwork-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

Modified: trunk/packages/kdenetwork/debian/patches/05_pedantic-errors.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/05_pedantic-errors.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdenetwork/debian/patches/05_pedantic-errors.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,6 +1,5 @@
-diff -Nrua kdenetwork-3.3.0/admin/acinclude.m4.in kdenetwork-patched/admin/acinclude.m4.in
---- kdenetwork-3.3.0/admin/acinclude.m4.in	2004-07-26 09:13:36.000000000 -0500
-+++ kdenetwork-patched/admin/acinclude.m4.in	2004-08-14 18:03:32.000000000 -0500
+--- kdenetwork-orig/admin/acinclude.m4.in
++++ kdenetwork-patched/admin/acinclude.m4.in
 @@ -2087,9 +2087,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"

Copied: trunk/packages/kdenetwork/debian/patches/06_automake-1.9.diff (from rev 378, branches/kde-3.3.2/kdenetwork/debian/patches/06_automake-1.9.diff)

Deleted: trunk/packages/kdenetwork/debian/patches/06_xlibs-static-pic.diff

Copied: trunk/packages/kdenetwork/debian/patches/07_xlibs-static-pic.diff (from rev 378, branches/kde-3.3.2/kdenetwork/debian/patches/07_xlibs-static-pic.diff)

Copied: trunk/packages/kdenetwork/debian/patches/10_kppp_options.diff (from rev 378, branches/kde-3.3.2/kdenetwork/debian/patches/10_kppp_options.diff)

Deleted: trunk/packages/kdenetwork/debian/patches/10_pppdargs.diff

Deleted: trunk/packages/kdenetwork/debian/patches/11_kget.diff

Copied: trunk/packages/kdenetwork/debian/patches/11_kpf-non-ascii-too.diff (from rev 378, branches/kde-3.3.2/kdenetwork/debian/patches/11_kpf-non-ascii-too.diff)

Modified: trunk/packages/kdenetwork/debian/rules
===================================================================
--- trunk/packages/kdenetwork/debian/rules	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdenetwork/debian/rules	2005-01-07 17:35:10 UTC (rev 379)
@@ -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
 
@@ -160,10 +161,16 @@
 	cd $(objdir) && \
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
+	# Create special ppp config file for kppp
+	mkdir -p debian/tmp/etc/ppp/peers
+	echo "#noauth" > debian/tmp/etc/ppp/peers/kppp-options
+
 	# kppp permissions
 	chown root:dip debian/tmp/usr/bin/kppp*
-	chmod 2754 debian/tmp/usr/bin/kppp
+	chown root:dip debian/tmp/etc/ppp/peers/kppp-options
+	chmod 4754 debian/tmp/usr/bin/kppp
 	chmod 0754 debian/tmp/usr/bin/kppplogview
+	chmod 0640 debian/tmp/etc/ppp/peers/kppp-options
 
 	#chmod 4755 debian/tmp/usr/sbin/reslisa
 
@@ -205,10 +212,10 @@
 	dh_link
 	dh_strip
 	dh_compress -X.bz2 -X.css -X.dcl -X.docbook -X-license -X.tag
-	dh_fixperms -Xusr/bin/kppp -Xusr/bin/kppplogview
+	dh_fixperms -Xusr/bin/kppp -Xusr/bin/kppplogview -Xetc/ppp/peers/kppp-options
 	dh_perl
 #	dh_python
-	dh_makeshlibs -V
+	env DH_COMPAT=3 dh_makeshlibs -V
 	dh_installdeb
 	dh_shlibdeps -ldebian/kopete/usr/lib:debian/librss1/usr/lib
 	dh_gencontrol

Modified: trunk/packages/kdeutils/debian/changelog
===================================================================
--- trunk/packages/kdeutils/debian/changelog	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdeutils/debian/changelog	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,3 +1,18 @@
+kdeutils (4:3.3.2-0pre1) experimental; urgency=low
+
+  * New upstream release:
+    - khexedit sorts numerically the 'Occurrence' and 'Percentage' columns in
+      the Statistics window. (Closes: #260929)
+  * KDE_3_3_BRANCH update.
+  * Remove build-dependency on automake1.9.
+  * Strengthen Suggests to Recommends on compression utilties found in
+    main. Also add Recommends on bzip2.
+  * Add patch fixing kfloppy + udev. (Closes: #273890)
+  * Add kcharselect manpage from Karolina Lindqvist. (Closes: #192570)
+  * Updated kmilo and ksim package descriptions. (Closes: #250094, #235347)
+
+ -- Christopher Martin <chrsmrtn@freeshell.org>  Thu, 16 Dec 2004 15:26:40 -0500
+
 kdeutils (4:3.3.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/kdeutils/debian/control
===================================================================
--- trunk/packages/kdeutils/debian/control	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdeutils/debian/control	2005-01-07 17:35:10 UTC (rev 379)
@@ -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, gettext, kdelibs4-dev (>> 4:3.3.1), libkonq4-dev (>> 4:3.3.1), libsnmp5-dev, libxtst-dev, pbbuttonsd-dev [powerpc], sharutils, tpctl [i386]
-Standards-Version: 3.6.1.0
+Uploaders: Christopher L Cheney <ccheney@debian.org>, Christopher Martin <chrsmrtn@freeshell.org>, Adeodato Simó <asp16@alu.ua.es>
+Build-Depends: debhelper (>> 4.2.0), gawk, gettext, kdelibs4-dev (>> 4:3.3.2), libkonq4-dev (>> 4:3.3.2), libsnmp5-dev, libxtst-dev, pbbuttonsd-dev [powerpc], sharutils, tpctl [i386]
+Standards-Version: 3.6.1
 
 Package: kdeutils
 Section: kde
@@ -37,7 +37,8 @@
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
-Suggests: khelpcenter, arj, ncompress, rar, unzip, zip, zoo
+Recommends: arj, ncompress, unzip, zip, zoo, bzip2
+Suggests: khelpcenter, rar
 Description: KDE archiving tool
  KDE is a powerful Open Source graphical desktop environment for Unix
  workstations. It combines ease of use, contemporary functionality, and
@@ -238,7 +239,10 @@
  outstanding graphical design with the technological superiority of the Unix
  operating system.
  .
- KDE kded hardware support module.
+ KMilo lets you use the special keys on some keyboards and laptops.  Usually
+ this includes volume keys and other features. Currently, KMilo comes with
+ plugins for Powerbooks, Thinkpads, Vaios and generic keyboards
+ with special keys.
  .
  This package is part of the official KDE utils module.
 
@@ -268,7 +272,9 @@
  outstanding graphical design with the technological superiority of the Unix
  operating system.
  .
- KSim is a plugin-based system information monitor.
+ KSim is a system monitor app which has its own plugin system with support
+ for GKrellm skins. It allows users to follow uptime, memory usage, network
+ connections, power, etc.
  .
  This package is part of the official KDE utils module.
 

Copied: trunk/packages/kdeutils/debian/kcharselect.manpages (from rev 378, branches/kde-3.3.2/kdeutils/debian/kcharselect.manpages)

Copied: trunk/packages/kdeutils/debian/man/kcharselect.1 (from rev 378, branches/kde-3.3.2/kdeutils/debian/man/kcharselect.1)

Deleted: trunk/packages/kdeutils/debian/patches/01_kdeutils_branch.diff.uu

Copied: trunk/packages/kdeutils/debian/patches/01_kdeutils_branch.diff.uu (from rev 378, branches/kde-3.3.2/kdeutils/debian/patches/01_kdeutils_branch.diff.uu)

Modified: trunk/packages/kdeutils/debian/patches/02_autotools_update.diff
===================================================================
--- trunk/packages/kdeutils/debian/patches/02_autotools_update.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdeutils/debian/patches/02_autotools_update.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,6 +1,5 @@
-diff -Nrua kdeutils-3.3.1/admin/compile kdeutils-patched/admin/compile
---- kdeutils-3.3.1/admin/compile	2002-09-30 07:18:17.000000000 -0500
-+++ kdeutils-patched/admin/compile	2004-11-03 20:01:22.000000000 -0600
+--- kdeutils-orig/admin/compile
++++ kdeutils-patched/admin/compile
 @@ -1,8 +1,9 @@
  #! /bin/sh
 -
@@ -182,9 +181,8 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nrua kdeutils-3.3.1/admin/config.guess kdeutils-patched/admin/config.guess
---- kdeutils-3.3.1/admin/config.guess	2004-08-02 09:17:40.000000000 -0500
-+++ kdeutils-patched/admin/config.guess	2004-08-25 09:25:50.000000000 -0500
+--- kdeutils-orig/admin/config.guess
++++ kdeutils-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 +244,8 @@
  	esac
  	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
  	exit 0 ;;
-diff -Nrua kdeutils-3.3.1/admin/depcomp kdeutils-patched/admin/depcomp
---- kdeutils-3.3.1/admin/depcomp	2003-04-16 16:53:18.000000000 -0500
-+++ kdeutils-patched/admin/depcomp	2004-11-03 20:01:22.000000000 -0600
+--- kdeutils-orig/admin/depcomp
++++ kdeutils-patched/admin/depcomp
 @@ -1,7 +1,9 @@
  #! /bin/sh
 -
@@ -719,9 +716,8 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nrua kdeutils-3.3.1/admin/install-sh kdeutils-patched/admin/install-sh
---- kdeutils-3.3.1/admin/install-sh	2003-08-07 04:41:31.000000000 -0500
-+++ kdeutils-patched/admin/install-sh	2004-11-03 20:01:22.000000000 -0600
+--- kdeutils-orig/admin/install-sh
++++ kdeutils-patched/admin/install-sh
 @@ -1,19 +1,38 @@
  #!/bin/sh
 -#
@@ -1271,9 +1267,8 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nrua kdeutils-3.3.1/admin/missing kdeutils-patched/admin/missing
---- kdeutils-3.3.1/admin/missing	2002-10-26 11:44:28.000000000 -0500
-+++ kdeutils-patched/admin/missing	2004-11-03 20:01:22.000000000 -0600
+--- kdeutils-orig/admin/missing
++++ kdeutils-patched/admin/missing
 @@ -1,6 +1,10 @@
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.
@@ -1530,9 +1525,8 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nrua kdeutils-3.3.1/admin/mkinstalldirs kdeutils-patched/admin/mkinstalldirs
---- kdeutils-3.3.1/admin/mkinstalldirs	2002-10-26 11:53:16.000000000 -0500
-+++ kdeutils-patched/admin/mkinstalldirs	2004-11-03 20:01:22.000000000 -0600
+--- kdeutils-orig/admin/mkinstalldirs
++++ kdeutils-patched/admin/mkinstalldirs
 @@ -1,20 +1,32 @@
  #! /bin/sh
  # mkinstalldirs --- make directory hierarchy
@@ -1657,9 +1651,8 @@
 +# time-stamp-end: "$"
  # End:
 -# mkinstalldirs ends here
-diff -Nrua kdeutils-3.3.1/admin/ylwrap kdeutils-patched/admin/ylwrap
---- kdeutils-3.3.1/admin/ylwrap	2001-10-04 19:46:36.000000000 -0500
-+++ kdeutils-patched/admin/ylwrap	2004-11-03 20:01:22.000000000 -0600
+--- kdeutils-orig/admin/ylwrap
++++ kdeutils-patched/admin/ylwrap
 @@ -1,6 +1,11 @@
  #! /bin/sh
  # ylwrap - wrapper for lex/yacc invocations.

Modified: trunk/packages/kdeutils/debian/patches/03_libtool_arm.diff
===================================================================
--- trunk/packages/kdeutils/debian/patches/03_libtool_arm.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdeutils/debian/patches/03_libtool_arm.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,6 +1,5 @@
-diff -Nrua kdeutils-3.2.2/admin/libtool.m4.in kdeutils-patched/admin/libtool.m4.in
---- kdeutils-3.2.2/admin/libtool.m4.in	2004-04-02 09:41:05.000000000 -0600
-+++ kdeutils-patched/admin/libtool.m4.in	2004-04-16 19:51:52.000000000 -0500
+--- kdeutils-orig/admin/libtool.m4.in
++++ kdeutils-patched/admin/libtool.m4.in
 @@ -2180,17 +2180,7 @@
  
  # This must be Linux ELF.

Modified: trunk/packages/kdeutils/debian/patches/04_am_maintainer_mode.diff
===================================================================
--- trunk/packages/kdeutils/debian/patches/04_am_maintainer_mode.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdeutils/debian/patches/04_am_maintainer_mode.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -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
+--- kdeutils-orig/admin/configure.in.min
++++ kdeutils-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: trunk/packages/kdeutils/debian/patches/05_pedantic-errors.diff
===================================================================
--- trunk/packages/kdeutils/debian/patches/05_pedantic-errors.diff	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdeutils/debian/patches/05_pedantic-errors.diff	2005-01-07 17:35:10 UTC (rev 379)
@@ -1,6 +1,5 @@
-diff -Nrua kdeutils-3.3.0/admin/acinclude.m4.in kdeutils-patched/admin/acinclude.m4.in
---- kdeutils-3.3.0/admin/acinclude.m4.in	2004-07-26 09:13:36.000000000 -0500
-+++ kdeutils-patched/admin/acinclude.m4.in	2004-08-14 23:15:02.000000000 -0500
+--- kdeutils-orig/admin/acinclude.m4.in
++++ kdeutils-patched/admin/acinclude.m4.in
 @@ -2087,9 +2087,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"

Copied: trunk/packages/kdeutils/debian/patches/06_automake-1.9.diff (from rev 378, branches/kde-3.3.2/kdeutils/debian/patches/06_automake-1.9.diff)

Copied: trunk/packages/kdeutils/debian/patches/07_kfloppy-devicename-table.diff (from rev 378, branches/kde-3.3.2/kdeutils/debian/patches/07_kfloppy-devicename-table.diff)

Modified: trunk/packages/kdeutils/debian/rules
===================================================================
--- trunk/packages/kdeutils/debian/rules	2005-01-05 20:29:11 UTC (rev 378)
+++ trunk/packages/kdeutils/debian/rules	2005-01-07 17:35:10 UTC (rev 379)
@@ -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
 
@@ -201,7 +202,7 @@
 	dh_fixperms
 #	dh_perl
 #	dh_python
-	dh_makeshlibs -V
+	env DH_COMPAT=3 dh_makeshlibs -V
 	dh_installdeb
 	dh_shlibdeps -ldebian/klaptopdaemon/usr/lib:debian/kmilo/usr/lib:debian/kregexpeditor/usr/lib:debian/ksim/usr/lib
 	dh_gencontrol