5 files changed, 157 insertions, 254 deletions

diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile
index d84d501240dd..388d511f2bd0 100644
--- a/devel/kdesdk4/Makefile
+++ b/devel/kdesdk4/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	kdesdk
 PORTVERSION=	${KDE_VERSION}
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
@@ -31,6 +31,11 @@ GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
+CONFIGURE_ARGS+=--with-db-include-dir=/usr/local/include/db4 \
+		--with-db-lib-dir=/usr/local/lib --with-db-name=db4
+
+MAN1=		cervisia.1 cvsversion.1 noncvslist.1 kde-build.1 cvsblame.1 cvscheck.1
+
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
@@ -47,8 +52,4 @@ pre-everything::
 RUN_DEPENDS+=	calltree:${PORTSDIR}/devel/calltree
 .endif
 
-pre-configure:
-	@${REINPLACE_CMD} -e 's|-I$$ac_db_includes|-I${LOCALBASE}/include/db4|g' \
-			-e 's|ac_db_name="db"|ac_db_name="db4"|g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
diff --git a/devel/kdesdk4/distinfo b/devel/kdesdk4/distinfo
index 458bd11c96e0..25c174c6a15c 100644
--- a/devel/kdesdk4/distinfo
+++ b/devel/kdesdk4/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdesdk-3.2.3.tar.bz2) = 82808f2780ae970fb38d44512ff9e2f3
-SIZE (KDE/kdesdk-3.2.3.tar.bz2) = 3886983
+MD5 (KDE/kdesdk-3.3.0.tar.bz2) = d3f02d71b7211265a89a7e499faa1b61
+SIZE (KDE/kdesdk-3.3.0.tar.bz2) = 4360274
diff --git a/devel/kdesdk4/files/patch-cervisia-Makefile.in b/devel/kdesdk4/files/patch-cervisia-Makefile.in
deleted file mode 100644
index 28780d5fece2..000000000000
--- a/devel/kdesdk4/files/patch-cervisia-Makefile.in
+++ /dev/null
@@ -1,38 +0,0 @@
---- cervisia/Makefile.in.orig	Sun May 30 19:05:43 2004
-+++ cervisia/Makefile.in	Fri Jun  4 16:55:59 2004
-@@ -574,11 +574,9 @@
- cervisia_SOURCES = main.cpp cervisiashell.cpp
- cervisia_LDFLAGS = $(all_libraries) $(KDE_RPATH)
- cervisia_LDADD = $(LIB_KPARTS) $(LIB_KUTILS) cvsservice/libcvsservice.la libcervisia.la
--man_MANS = cervisia.1
- #>- METASOURCES = AUTO
- KDE_ICON = AUTO
- EXTRA_DIST = cervisia.desktop cervisia.png cervisia-small.png
--CLEANFILES = cervisia.1
- xdg_apps_DATA = cervisia.desktop
- partrcdir = $(kde_datadir)/cervisiapart
- partrc_DATA = cervisiaui.rc
-@@ -1224,14 +1222,6 @@
- srcdoc:
- 	$(kde_bindir)/kdoc -a -p -d classdocs -n 'Cervisia' *.h -lqt -lkdecore -lkdeui -lkparts
- 
--cervisia.1: $(srcdir)/cervisia.1.in
--	sed -e 's%_KDEHTMLDIR_%'${kde_htmldir}'%g;' \
--	    -e 's%_KDECONFDIR_%'${kde_confdir}'%g;' \
--	  < $(srcdir)/cervisia.1.in > cervisia.1
--
--cervisia.1.in: cervisia.pod
--	pod2man --center "Cervisia" --release "${CERVISIA_VERSION}" \
--		cervisia.pod > cervisia.1.in
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-@@ -1437,7 +1427,7 @@
- 	-rm -f  loglist.moc tagdlg.moc checkoutdlg.moc cervisiashell.moc repositorydlg.moc diffdlg.moc logplainview.moc resolvedlg.moc tiplabel.moc mergedlg.moc annotateview.moc diffview.moc updatedlg.moc logdlg.moc progressdlg.moc historydlg.moc logtree.moc updateview.moc qttableview.moc cvsprogressdlg.moc settingsdlg.moc commitdlg.moc addrepositorydlg.moc protocolview.moc cervisiapart.moc
- 
- #>+ 2
--KDE_DIST=repositories.h cr22-app-cervisia.png configutils.h cervisia.lsm cervisia.upd tiplabel.h loginfo.h annotatectl.h cervisiaui.rc repositorydlg.h cvsprogressdlg.h watchersdlg.h HACKING cr16-app-cervisia.png logdlg.h updateview_visitors.h watchdlg.h misc.h cervisia.1.in updateview_items.h annotateview.h updatedlg.h logplainview.h resolvedlg_p.h stringmatcher.h globalconfig.h cervisiashellui.rc checkoutdlg.h resolvedlg.h logtree.h move_repositories.pl protocolview.h changelogdlg.h LICENSE.QPL annotatedlg.h cr48-app-cervisia.png updateview.h qttableview.h diffview.h diffdlg.h loglist.h addrepositorydlg.h addremovedlg.h cervisiapart.h settingsdlg.h cr32-app-cervisia.png tagdlg.h cervisia.pod Makefile.in commitdlg.h version.h overview.h cvsdir.h mergedlg.h historydlg.h entry.h Makefile.am progressdlg.h cervisiashell.h change_colors.pl 
-+KDE_DIST=repositories.h cr22-app-cervisia.png configutils.h cervisia.lsm cervisia.upd tiplabel.h loginfo.h annotatectl.h cervisiaui.rc repositorydlg.h cvsprogressdlg.h watchersdlg.h HACKING cr16-app-cervisia.png logdlg.h updateview_visitors.h watchdlg.h misc.h updateview_items.h annotateview.h updatedlg.h logplainview.h resolvedlg_p.h stringmatcher.h globalconfig.h cervisiashellui.rc checkoutdlg.h resolvedlg.h logtree.h move_repositories.pl protocolview.h changelogdlg.h LICENSE.QPL annotatedlg.h cr48-app-cervisia.png updateview.h qttableview.h diffview.h diffdlg.h loglist.h addrepositorydlg.h addremovedlg.h cervisiapart.h settingsdlg.h cr32-app-cervisia.png tagdlg.h cervisia.pod Makefile.in commitdlg.h version.h overview.h cvsdir.h mergedlg.h historydlg.h entry.h Makefile.am progressdlg.h cervisiashell.h change_colors.pl 
- 
- #>+ 5
- clean-idl:
diff --git a/devel/kdesdk4/files/patch-scripts-Makefile.in b/devel/kdesdk4/files/patch-scripts-Makefile.in
deleted file mode 100644
index 8fcf11e8249f..000000000000
--- a/devel/kdesdk4/files/patch-scripts-Makefile.in
+++ /dev/null
@@ -1,94 +0,0 @@
---- scripts/Makefile.in.orig	Thu Apr  8 08:22:21 2004
-+++ scripts/Makefile.in	Thu Apr  8 08:23:44 2004
-@@ -339,16 +339,6 @@
-   cxxmetric extend_dmalloc kdekillall kdelnk2desktop.py
- 
- 
--# sorted by bin_SCRIPTS reference
--man1_MANS = \
--  kde-build.1 \
--  cvsversion.1 cvscheck.1 \
--  noncvslist.1 \
--  cvsblame.1 \
--  includemocs.1 
--
--CLEANFILES = $(man1_MANS)
--
- # sorted alphabetically
- noinst_SCRIPTS = \
-   add_trace.pl alldcop.rb authors2xml.pl check_licenses colorcvs \
-@@ -435,51 +425,6 @@
- distclean-libtool:
- 	-rm -f libtool
- uninstall-info-am:
--install-man1: $(man1_MANS) $(man_MANS)
--	@$(NORMAL_INSTALL)
--	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
--	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
--	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
--	for i in $$l2; do \
--	  case "$$i" in \
--	    *.1*) list="$$list $$i" ;; \
--	  esac; \
--	done; \
--	for i in $$list; do \
--	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
--	  else file=$$i; fi; \
--	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
--	  case "$$ext" in \
--	    1*) ;; \
--	    *) ext='1' ;; \
--	  esac; \
--	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
--	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
--	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
--	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
--	done
--uninstall-man1:
--	@$(NORMAL_UNINSTALL)
--	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
--	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
--	for i in $$l2; do \
--	  case "$$i" in \
--	    *.1*) list="$$list $$i" ;; \
--	  esac; \
--	done; \
--	for i in $$list; do \
--	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
--	  case "$$ext" in \
--	    1*) ;; \
--	    *) ext='1' ;; \
--	  esac; \
--	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
--	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
--	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
--	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
--	done
- tags: TAGS
- TAGS:
- 
-@@ -610,22 +555,6 @@
- 	uninstall-info-am uninstall-man uninstall-man1
- 
- 
--# it'd be too good if this worked everywhere ...
--#%.1: %
--#	pod2man $< $@
--
--kde-build.1: kde-build
--	pod2man $< > $@
--cvsversion.1: cvsversion
--	pod2man $< > $@
--cvscheck.1: cvscheck
--	pod2man $< > $@
--noncvslist.1: noncvslist
--	pod2man $< > $@
--cvsblame.1: cvsblame
--	pod2man $< > $@
--includemocs.1: includemocs
--	pod2man $< > $@
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/devel/kdesdk4/pkg-plist b/devel/kdesdk4/pkg-plist
index d85698980f0f..61df2eaa9a3c 100644
--- a/devel/kdesdk4/pkg-plist
+++ b/devel/kdesdk4/pkg-plist
@@ -9,6 +9,7 @@ bin/create_makefiles
 bin/cvs-clean
 bin/cvs2dist
 bin/cvsaskpass
+bin/cvsbackport
 bin/cvsblame
 bin/cvscheck
 bin/cvslastchange
@@ -17,10 +18,13 @@ bin/cvsrevertlast
 bin/cvsservice
 bin/cvsversion
 bin/cxxmetric
+bin/dprof2calltree
 bin/extend_dmalloc
 bin/extractrc
 bin/findmissingcrystal
 bin/fixkdeincludes
+bin/fixuifiles
+bin/hotshot2calltree
 bin/includemocs
 bin/kapptemplate
 bin/kbabel
@@ -31,12 +35,18 @@ bin/kde-build
 bin/kdedoc
 bin/kdekillall
 bin/kdelnk2desktop.py
+bin/kdemangen.pl
 bin/kompare
 bin/kuiviewer
 bin/licensecheck
 bin/makeobj
+bin/memprof2calltree
 bin/noncvslist
+bin/op2calltree
+bin/package_crystalsvg
+bin/png2mng.pl
 bin/po2xml
+bin/pprof2calltree
 bin/pruneemptydirs
 bin/qtdoc
 bin/split2po
@@ -60,8 +70,11 @@ include/kbabel/itempart.h
 include/kbabel/kbabeldatatool.h
 include/kbabel/kbabeldictbox.h
 include/kbabel/kbabeldictiface.h
+include/kbabel/kbproject.h
+include/kbabel/kbprojectmanager.h
 include/kbabel/msgfmt.h
 include/kbabel/poinfo.h
+include/kbabel/projectsettings.h
 include/kbabel/regexpextractor.h
 include/kbabel/searchengine.h
 include/kbabel/tagextractor.h
@@ -118,6 +131,9 @@ lib/kde3/kfile_ts.la
 lib/kde3/kfile_ts.so
 lib/kde3/libcervisiapart.la
 lib/kde3/libcervisiapart.so
+lib/kde3/libdialogpages.la
+lib/kde3/libdialogpages.so
+lib/kde3/libdialogpages.so.0
 lib/kde3/libkomparenavtreepart.la
 lib/kde3/libkomparenavtreepart.so
 lib/kde3/libkomparepart.la
@@ -427,18 +443,15 @@ share/apps/kcachegrind/kcachegrindui.rc
 share/apps/kcachegrind/tips
 share/apps/kconf_update/cervisia.upd
 share/apps/kconf_update/change_colors.pl
+share/apps/kconf_update/kbabel-project.upd
 share/apps/kconf_update/move_repositories.pl
-share/apps/kompare/icons/crystalsvg/128x128/apps/kompare.png
-share/apps/kompare/icons/crystalsvg/16x16/apps/kompare.png
-share/apps/kompare/icons/crystalsvg/32x32/apps/kompare.png
-share/apps/kompare/icons/crystalsvg/48x48/apps/kompare.png
-share/apps/kompare/icons/locolor/16x16/apps/kompare.png
-share/apps/kompare/icons/locolor/32x32/apps/kompare.png
+share/apps/kompare/komparepartui.rc
 share/apps/kompare/kompareui.rc
-share/apps/komparepart/komparepartui.rc
 share/apps/kstyle/themes/scheck.themerc
 share/apps/kuiviewer/kuiviewer.rc
 share/apps/kuiviewerpart/kuiviewer_part.rc
+share/apps/umbrello/headings/heading.adb
+share/apps/umbrello/headings/heading.ads
 share/apps/umbrello/headings/heading.as
 share/apps/umbrello/headings/heading.cpp
 share/apps/umbrello/headings/heading.cs
@@ -467,81 +480,75 @@ share/apps/umbrello/pics/CVpublic_signal.png
 share/apps/umbrello/pics/CVpublic_slot.png
 share/apps/umbrello/pics/CVpublic_var.png
 share/apps/umbrello/pics/CVstruct.png
-share/apps/umbrello/pics/actor.xpm
-share/apps/umbrello/pics/aggregation.xpm
-share/apps/umbrello/pics/anchor.xpm
+share/apps/umbrello/pics/actor.png
+share/apps/umbrello/pics/aggregation.png
+share/apps/umbrello/pics/align_bottom.png
+share/apps/umbrello/pics/align_hori_middle.png
+share/apps/umbrello/pics/align_left.png
+share/apps/umbrello/pics/align_right.png
+share/apps/umbrello/pics/align_top.png
+share/apps/umbrello/pics/align_vert_middle.png
+share/apps/umbrello/pics/anchor.png
 share/apps/umbrello/pics/arrow.png
-share/apps/umbrello/pics/artifact.xpm
-share/apps/umbrello/pics/association.xpm
-share/apps/umbrello/pics/box.xpm
-share/apps/umbrello/pics/branch.xpm
-share/apps/umbrello/pics/broom.xpm
-share/apps/umbrello/pics/case.xpm
-share/apps/umbrello/pics/component.xpm
-share/apps/umbrello/pics/composition.xpm
-share/apps/umbrello/pics/constraint.xpm
-share/apps/umbrello/pics/cursor-actor.xpm
-share/apps/umbrello/pics/cursor-aggregation.xpm
-share/apps/umbrello/pics/cursor-anchor.xpm
-share/apps/umbrello/pics/cursor-artifact.xpm
-share/apps/umbrello/pics/cursor-association.xpm
-share/apps/umbrello/pics/cursor-box.xpm
-share/apps/umbrello/pics/cursor-branch.xpm
-share/apps/umbrello/pics/cursor-case.xpm
-share/apps/umbrello/pics/cursor-component.xpm
-share/apps/umbrello/pics/cursor-composition.xpm
-share/apps/umbrello/pics/cursor-datatype.xpm
-share/apps/umbrello/pics/cursor-dependency.xpm
-share/apps/umbrello/pics/cursor-end-state.xpm
-share/apps/umbrello/pics/cursor-enum.xpm
-share/apps/umbrello/pics/cursor-fork.xpm
-share/apps/umbrello/pics/cursor-generalisation.xpm
-share/apps/umbrello/pics/cursor-initial-state.xpm
-share/apps/umbrello/pics/cursor-interface.xpm
-share/apps/umbrello/pics/cursor-message-asynchronous.xpm
-share/apps/umbrello/pics/cursor-message-synchronous.xpm
-share/apps/umbrello/pics/cursor-node.xpm
-share/apps/umbrello/pics/cursor-note.xpm
-share/apps/umbrello/pics/cursor-object.xpm
-share/apps/umbrello/pics/cursor-package.xpm
-share/apps/umbrello/pics/cursor-text.xpm
-share/apps/umbrello/pics/cursor-umlclass.xpm
-share/apps/umbrello/pics/cursor-uniassoc.xpm
-share/apps/umbrello/pics/datatype.xpm
-share/apps/umbrello/pics/dependency.xpm
-share/apps/umbrello/pics/end_state.xpm
-share/apps/umbrello/pics/enum.xpm
-share/apps/umbrello/pics/fork.xpm
-share/apps/umbrello/pics/generalization.xpm
-share/apps/umbrello/pics/hline.xpm
-share/apps/umbrello/pics/implements.xpm
-share/apps/umbrello/pics/initial_state.xpm
-share/apps/umbrello/pics/interface.xpm
-share/apps/umbrello/pics/largepackage.xpm
-share/apps/umbrello/pics/lifeline.xpm
-share/apps/umbrello/pics/line.xpm
-share/apps/umbrello/pics/message-asynchronous.xpm
-share/apps/umbrello/pics/message-synchronous.xpm
-share/apps/umbrello/pics/node.xpm
-share/apps/umbrello/pics/note.xpm
-share/apps/umbrello/pics/object.xpm
-share/apps/umbrello/pics/output_win.xpm
-share/apps/umbrello/pics/package.xpm
-share/apps/umbrello/pics/private.png
-share/apps/umbrello/pics/protected.png
-share/apps/umbrello/pics/public.png
-share/apps/umbrello/pics/realizes.xpm
-share/apps/umbrello/pics/smallpackage.xpm
-share/apps/umbrello/pics/snapshot.xpm
+share/apps/umbrello/pics/artifact.png
+share/apps/umbrello/pics/association.png
+share/apps/umbrello/pics/box.png
+share/apps/umbrello/pics/branch.png
+share/apps/umbrello/pics/class.png
+share/apps/umbrello/pics/component.png
+share/apps/umbrello/pics/composition.png
+share/apps/umbrello/pics/containment.png
+share/apps/umbrello/pics/cursor-actor.png
+share/apps/umbrello/pics/cursor-aggregation.png
+share/apps/umbrello/pics/cursor-anchor.png
+share/apps/umbrello/pics/cursor-artifact.png
+share/apps/umbrello/pics/cursor-association.png
+share/apps/umbrello/pics/cursor-box.png
+share/apps/umbrello/pics/cursor-branch.png
+share/apps/umbrello/pics/cursor-class.png
+share/apps/umbrello/pics/cursor-component.png
+share/apps/umbrello/pics/cursor-composition.png
+share/apps/umbrello/pics/cursor-containment.png
+share/apps/umbrello/pics/cursor-datatype.png
+share/apps/umbrello/pics/cursor-dependency.png
+share/apps/umbrello/pics/cursor-end-state.png
+share/apps/umbrello/pics/cursor-enum.png
+share/apps/umbrello/pics/cursor-fork.png
+share/apps/umbrello/pics/cursor-generalisation.png
+share/apps/umbrello/pics/cursor-initial-state.png
+share/apps/umbrello/pics/cursor-interface.png
+share/apps/umbrello/pics/cursor-message-asynchronous.png
+share/apps/umbrello/pics/cursor-message-synchronous.png
+share/apps/umbrello/pics/cursor-node.png
+share/apps/umbrello/pics/cursor-note.png
+share/apps/umbrello/pics/cursor-object.png
+share/apps/umbrello/pics/cursor-package.png
+share/apps/umbrello/pics/cursor-text.png
+share/apps/umbrello/pics/cursor-uniassociation.png
+share/apps/umbrello/pics/cursor-usecase.png
+share/apps/umbrello/pics/datatype.png
+share/apps/umbrello/pics/dependency.png
+share/apps/umbrello/pics/end_state.png
+share/apps/umbrello/pics/enum.png
+share/apps/umbrello/pics/fork.png
+share/apps/umbrello/pics/generalisation.png
+share/apps/umbrello/pics/initial_state.png
+share/apps/umbrello/pics/interface.png
+share/apps/umbrello/pics/message-asynchronous.png
+share/apps/umbrello/pics/message-synchronous.png
+share/apps/umbrello/pics/node.png
+share/apps/umbrello/pics/note.png
+share/apps/umbrello/pics/object.png
+share/apps/umbrello/pics/package.png
 share/apps/umbrello/pics/startlogo.png
-share/apps/umbrello/pics/text.xpm
-share/apps/umbrello/pics/umlclass.xpm
-share/apps/umbrello/pics/umlclass_template.xpm
-share/apps/umbrello/pics/uniassoc.xpm
-share/apps/umbrello/pics/usecaserelation.xpm
-share/apps/umbrello/pics/vline.xpm
+share/apps/umbrello/pics/template.png
+share/apps/umbrello/pics/text.png
+share/apps/umbrello/pics/uniassociation.png
+share/apps/umbrello/pics/usecase.png
 share/apps/umbrello/tips
 share/apps/umbrello/umbrelloui.rc
+share/config.kcfg/cervisiapart.kcfg
+share/config.kcfg/kbabel.kcfg
 share/doc/HTML/en/cervisia/annotate.png
 share/doc/HTML/en/cervisia/checkout.png
 share/doc/HTML/en/cervisia/commit.png
@@ -553,6 +560,9 @@ share/doc/HTML/en/cervisia/index.cache.bz2
 share/doc/HTML/en/cervisia/index.docbook
 share/doc/HTML/en/cervisia/logtree.png
 share/doc/HTML/en/cervisia/mainview.png
+share/doc/HTML/en/cervisia/patch.png
+share/doc/HTML/en/cervisia/popup.png
+share/doc/HTML/en/cervisia/repositories.png
 share/doc/HTML/en/cervisia/resolve.png
 share/doc/HTML/en/cervisia/updatetag.png
 share/doc/HTML/en/kbabel/TODO
@@ -615,37 +625,50 @@ share/doc/HTML/en/kcachegrind/index.docbook
 share/doc/HTML/en/kompare/common
 share/doc/HTML/en/kompare/index.cache.bz2
 share/doc/HTML/en/kompare/index.docbook
+share/doc/HTML/en/umbrello/activity-diagram.png
+share/doc/HTML/en/umbrello/add-remove-languages.png
+share/doc/HTML/en/umbrello/aggregation.png
+share/doc/HTML/en/umbrello/association.png
 share/doc/HTML/en/umbrello/authors.docbook
+share/doc/HTML/en/umbrello/class-diagram.png
+share/doc/HTML/en/umbrello/class.png
+share/doc/HTML/en/umbrello/code-import.png
 share/doc/HTML/en/umbrello/code_import_and_generation.docbook
+share/doc/HTML/en/umbrello/collaboration-diagram.png
 share/doc/HTML/en/umbrello/common
+share/doc/HTML/en/umbrello/composition.png
 share/doc/HTML/en/umbrello/credits.docbook
+share/doc/HTML/en/umbrello/folders.png
+share/doc/HTML/en/umbrello/generalization.png
+share/doc/HTML/en/umbrello/generation-options.png
 share/doc/HTML/en/umbrello/index.cache.bz2
 share/doc/HTML/en/umbrello/index.docbook
 share/doc/HTML/en/umbrello/introduction.docbook
 share/doc/HTML/en/umbrello/other_features.docbook
-share/doc/HTML/en/umbrello/pics/activity-diagram.png
-share/doc/HTML/en/umbrello/pics/add-remove-languages.png
-share/doc/HTML/en/umbrello/pics/aggregation.png
-share/doc/HTML/en/umbrello/pics/association.png
-share/doc/HTML/en/umbrello/pics/class-diagram.png
-share/doc/HTML/en/umbrello/pics/class.png
-share/doc/HTML/en/umbrello/pics/code-import.png
-share/doc/HTML/en/umbrello/pics/collaboration-diagram.png
-share/doc/HTML/en/umbrello/pics/composition.png
-share/doc/HTML/en/umbrello/pics/folders.png
-share/doc/HTML/en/umbrello/pics/generalization.png
-share/doc/HTML/en/umbrello/pics/generation-options.png
-share/doc/HTML/en/umbrello/pics/sequence-diagram.png
-share/doc/HTML/en/umbrello/pics/state-diagram.png
-share/doc/HTML/en/umbrello/pics/umbrello-main-screen.png
-share/doc/HTML/en/umbrello/pics/umbrello-ui-clean.png
-share/doc/HTML/en/umbrello/pics/umbrello-ui.png
-share/doc/HTML/en/umbrello/pics/use-case-diagram.png
+share/doc/HTML/en/umbrello/sequence-diagram.png
+share/doc/HTML/en/umbrello/state-diagram.png
+share/doc/HTML/en/umbrello/umbrello-main-screen.png
+share/doc/HTML/en/umbrello/umbrello-ui-clean.png
+share/doc/HTML/en/umbrello/umbrello-ui.png
 share/doc/HTML/en/umbrello/uml_basics.docbook
+share/doc/HTML/en/umbrello/use-case-diagram.png
 share/doc/HTML/en/umbrello/working_with_umbrello.docbook
 share/icons/crystalsvg/128x128/apps/kompare.png
 share/icons/crystalsvg/128x128/apps/umbrello.png
 share/icons/crystalsvg/128x128/mimetypes/umbrellofile.png
+share/icons/crystalsvg/16x16/actions/umbrello_diagram_activity.png
+share/icons/crystalsvg/16x16/actions/umbrello_diagram_class.png
+share/icons/crystalsvg/16x16/actions/umbrello_diagram_collaboration.png
+share/icons/crystalsvg/16x16/actions/umbrello_diagram_component.png
+share/icons/crystalsvg/16x16/actions/umbrello_diagram_deployment.png
+share/icons/crystalsvg/16x16/actions/umbrello_diagram_sequence.png
+share/icons/crystalsvg/16x16/actions/umbrello_diagram_state.png
+share/icons/crystalsvg/16x16/actions/umbrello_diagram_usecase.png
+share/icons/crystalsvg/16x16/actions/vcs_add.png
+share/icons/crystalsvg/16x16/actions/vcs_commit.png
+share/icons/crystalsvg/16x16/actions/vcs_remove.png
+share/icons/crystalsvg/16x16/actions/vcs_status.png
+share/icons/crystalsvg/16x16/actions/vcs_update.png
 share/icons/crystalsvg/16x16/apps/catalogmanager.png
 share/icons/crystalsvg/16x16/apps/cervisia.png
 share/icons/crystalsvg/16x16/apps/kbabel.png
@@ -654,9 +677,28 @@ share/icons/crystalsvg/16x16/apps/kbugbuster.png
 share/icons/crystalsvg/16x16/apps/kompare.png
 share/icons/crystalsvg/16x16/apps/umbrello.png
 share/icons/crystalsvg/16x16/mimetypes/umbrellofile.png
+share/icons/crystalsvg/22x22/actions/umbrello_diagram_activity.png
+share/icons/crystalsvg/22x22/actions/umbrello_diagram_class.png
+share/icons/crystalsvg/22x22/actions/umbrello_diagram_collaboration.png
+share/icons/crystalsvg/22x22/actions/umbrello_diagram_component.png
+share/icons/crystalsvg/22x22/actions/umbrello_diagram_deployment.png
+share/icons/crystalsvg/22x22/actions/umbrello_diagram_sequence.png
+share/icons/crystalsvg/22x22/actions/umbrello_diagram_state.png
+share/icons/crystalsvg/22x22/actions/umbrello_diagram_usecase.png
+share/icons/crystalsvg/22x22/actions/vcs_add.png
+share/icons/crystalsvg/22x22/actions/vcs_commit.png
+share/icons/crystalsvg/22x22/actions/vcs_remove.png
+share/icons/crystalsvg/22x22/actions/vcs_status.png
+share/icons/crystalsvg/22x22/actions/vcs_update.png
+share/icons/crystalsvg/22x22/apps/catalogmanager.png
 share/icons/crystalsvg/22x22/apps/cervisia.png
 share/icons/crystalsvg/22x22/apps/umbrello.png
 share/icons/crystalsvg/22x22/mimetypes/umbrellofile.png
+share/icons/crystalsvg/32x32/actions/vcs_add.png
+share/icons/crystalsvg/32x32/actions/vcs_commit.png
+share/icons/crystalsvg/32x32/actions/vcs_remove.png
+share/icons/crystalsvg/32x32/actions/vcs_status.png
+share/icons/crystalsvg/32x32/actions/vcs_update.png
 share/icons/crystalsvg/32x32/apps/catalogmanager.png
 share/icons/crystalsvg/32x32/apps/cervisia.png
 share/icons/crystalsvg/32x32/apps/kbabel.png
@@ -665,6 +707,11 @@ share/icons/crystalsvg/32x32/apps/kbugbuster.png
 share/icons/crystalsvg/32x32/apps/kompare.png
 share/icons/crystalsvg/32x32/apps/umbrello.png
 share/icons/crystalsvg/32x32/mimetypes/umbrellofile.png
+share/icons/crystalsvg/48x48/actions/vcs_add.png
+share/icons/crystalsvg/48x48/actions/vcs_commit.png
+share/icons/crystalsvg/48x48/actions/vcs_remove.png
+share/icons/crystalsvg/48x48/actions/vcs_status.png
+share/icons/crystalsvg/48x48/actions/vcs_update.png
 share/icons/crystalsvg/48x48/apps/catalogmanager.png
 share/icons/crystalsvg/48x48/apps/cervisia.png
 share/icons/crystalsvg/48x48/apps/kbabel.png
@@ -675,6 +722,12 @@ share/icons/crystalsvg/48x48/apps/umbrello.png
 share/icons/crystalsvg/48x48/mimetypes/umbrellofile.png
 share/icons/crystalsvg/64x64/apps/umbrello.png
 share/icons/crystalsvg/64x64/mimetypes/umbrellofile.png
+share/icons/crystalsvg/scalable/actions/vcs_add.svgz
+share/icons/crystalsvg/scalable/actions/vcs_commit.svgz
+share/icons/crystalsvg/scalable/actions/vcs_remove.svgz
+share/icons/crystalsvg/scalable/actions/vcs_status.svgz
+share/icons/crystalsvg/scalable/actions/vcs_update.svgz
+share/icons/crystalsvg/scalable/apps/kompare.svgz
 share/icons/crystalsvg/scalable/apps/umbrello.svgz
 share/icons/crystalsvg/scalable/mimetypes/umbrellofile.svgz
 share/icons/hicolor/16x16/apps/kuiviewer.png
@@ -691,7 +744,6 @@ share/icons/locolor/16x16/apps/kbabel.png
 share/icons/locolor/16x16/apps/kbabeldict.png
 share/icons/locolor/16x16/apps/kbugbuster.png
 share/icons/locolor/16x16/apps/kcachegrind.png
-share/icons/locolor/16x16/apps/kompare.png
 share/icons/locolor/16x16/apps/kuiviewer.png
 share/icons/locolor/16x16/apps/umbrello.png
 share/icons/locolor/16x16/mimetypes/umbrellofile.png
@@ -700,7 +752,6 @@ share/icons/locolor/32x32/apps/kbabel.png
 share/icons/locolor/32x32/apps/kbabeldict.png
 share/icons/locolor/32x32/apps/kbugbuster.png
 share/icons/locolor/32x32/apps/kcachegrind.png
-share/icons/locolor/32x32/apps/kompare.png
 share/icons/locolor/32x32/apps/kuiviewer.png
 share/icons/locolor/32x32/apps/umbrello.png
 share/icons/locolor/32x32/mimetypes/umbrellofile.png
@@ -748,7 +799,6 @@ share/servicetypes/kompareviewpart.desktop
 @dirrm share/icons/hicolor/48x48
 @dirrm share/icons/hicolor/32x32/mimetypes
 @dirrm share/icons/hicolor/16x16/mimetypes
-@dirrm share/doc/HTML/en/umbrello/pics
 @dirrm share/doc/HTML/en/umbrello
 @dirrm share/doc/HTML/en/kompare
 @dirrm share/doc/HTML/en/kcachegrind
@@ -760,22 +810,6 @@ share/servicetypes/kompareviewpart.desktop
 @dirrm share/apps/umbrello
 @dirrm share/apps/kuiviewerpart
 @dirrm share/apps/kuiviewer
-@dirrm share/apps/komparepart
-@dirrm share/apps/kompare/icons/locolor/32x32/apps
-@dirrm share/apps/kompare/icons/locolor/32x32
-@dirrm share/apps/kompare/icons/locolor/16x16/apps
-@dirrm share/apps/kompare/icons/locolor/16x16
-@dirrm share/apps/kompare/icons/locolor
-@dirrm share/apps/kompare/icons/crystalsvg/48x48/apps
-@dirrm share/apps/kompare/icons/crystalsvg/48x48
-@dirrm share/apps/kompare/icons/crystalsvg/32x32/apps
-@dirrm share/apps/kompare/icons/crystalsvg/32x32
-@dirrm share/apps/kompare/icons/crystalsvg/16x16/apps
-@dirrm share/apps/kompare/icons/crystalsvg/16x16
-@dirrm share/apps/kompare/icons/crystalsvg/128x128/apps
-@dirrm share/apps/kompare/icons/crystalsvg/128x128
-@dirrm share/apps/kompare/icons/crystalsvg
-@dirrm share/apps/kompare/icons
 @dirrm share/apps/kompare
 @dirrm share/apps/kcachegrind/icons/hicolor/32x32/actions
 @dirrm share/apps/kcachegrind/icons/hicolor/32x32