diff options
Diffstat (limited to 'devel/kdesdk3')
| -rw-r--r-- | devel/kdesdk3/distinfo | 4 | ||||
| -rw-r--r-- | devel/kdesdk3/files/patch-cervisia-Makefile.in | 24 | ||||
| -rw-r--r-- | devel/kdesdk3/files/patch-scripts-Makefile.in | 26 | ||||
| -rw-r--r-- | devel/kdesdk3/pkg-plist | 18 |
4 files changed, 34 insertions, 38 deletions
diff --git a/devel/kdesdk3/distinfo b/devel/kdesdk3/distinfo index 047845bff070..d5620a175213 100644 --- a/devel/kdesdk3/distinfo +++ b/devel/kdesdk3/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kdesdk-3.2.1.tar.bz2) = f52a69718705b32f0068fb605b604b45 -SIZE (KDE/kdesdk-3.2.1.tar.bz2) = 3970806 +MD5 (KDE/kdesdk-3.2.2.tar.bz2) = dd3c690444fef79de620c26abfaafd37 +SIZE (KDE/kdesdk-3.2.2.tar.bz2) = 3931291 diff --git a/devel/kdesdk3/files/patch-cervisia-Makefile.in b/devel/kdesdk3/files/patch-cervisia-Makefile.in index 0a591c1d00b6..866b9f165608 100644 --- a/devel/kdesdk3/files/patch-cervisia-Makefile.in +++ b/devel/kdesdk3/files/patch-cervisia-Makefile.in @@ -1,20 +1,18 @@ ---- cervisia/Makefile.in.orig Sun Feb 29 22:52:03 2004 -+++ cervisia/Makefile.in Wed Mar 3 00:16:46 2004 -@@ -351,13 +351,10 @@ +--- cervisia/Makefile.in.orig Wed Apr 7 09:09:30 2004 ++++ cervisia/Makefile.in Wed Apr 7 09:09:58 2004 +@@ -571,11 +571,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 - -@@ -1209,14 +1206,6 @@ + partrcdir = $(kde_datadir)/cervisiapart + partrc_DATA = cervisiaui.rc +@@ -1220,14 +1218,6 @@ srcdoc: $(kde_bindir)/kdoc -a -p -d classdocs -n 'Cervisia' *.h -lqt -lkdecore -lkdeui -lkparts @@ -29,12 +27,12 @@ # 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: -@@ -1422,7 +1411,7 @@ - -rm -f cvsprogressdlg.moc updatedlg.moc cervisiashell.moc updateview.moc protocolview.moc annotateview.moc historydlg.moc tagdlg.moc diffview.moc qttableview.moc commitdlg.moc cervisiapart.moc mergedlg.moc loglist.moc settingsdlg.moc tiplabel.moc logtree.moc logplainview.moc checkoutdlg.moc repositorydlg.moc progressdlg.moc resolvedlg.moc addrepositorydlg.moc logdlg.moc diffdlg.moc +@@ -1433,7 +1423,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=stringmatcher.h HACKING logtree.h misc.h cervisia.1.in updateview_items.h cervisiashell.h repositories.h cvsprogressdlg.h addrepositorydlg.h loginfo.h LICENSE.QPL annotatedlg.h settingsdlg.h overview.h annotateview.h resolvedlg.h annotatectl.h cervisiaui.rc cr16-app-cervisia.png diffdlg.h globalconfig.h updateview_visitors.h historydlg.h changelogdlg.h checkoutdlg.h protocolview.h cvsdir.h qttableview.h tiplabel.h cervisiapart.h updatedlg.h addremovedlg.h progressdlg.h cervisiashellui.rc diffview.h logdlg.h tagdlg.h cr22-app-cervisia.png configutils.h mergedlg.h change_colors.pl move_repositories.pl version.h logplainview.h loglist.h cervisia.pod watchdlg.h updateview.h cr48-app-cervisia.png entry.h repositorydlg.h cr32-app-cervisia.png commitdlg.h cervisia.upd watchersdlg.h cervisia.lsm -+KDE_DIST=stringmatcher.h HACKING logtree.h misc.h updateview_items.h cervisiashell.h repositories.h cvsprogressdlg.h addrepositorydlg.h loginfo.h LICENSE.QPL annotatedlg.h settingsdlg.h overview.h annotateview.h resolvedlg.h annotatectl.h cervisiaui.rc cr16-app-cervisia.png diffdlg.h globalconfig.h updateview_visitors.h historydlg.h changelogdlg.h checkoutdlg.h protocolview.h cvsdir.h qttableview.h tiplabel.h cervisiapart.h updatedlg.h addremovedlg.h progressdlg.h cervisiashellui.rc diffview.h logdlg.h tagdlg.h cr22-app-cervisia.png configutils.h mergedlg.h change_colors.pl move_repositories.pl version.h logplainview.h loglist.h cervisia.pod watchdlg.h updateview.h cr48-app-cervisia.png entry.h repositorydlg.h cr32-app-cervisia.png commitdlg.h cervisia.upd watchersdlg.h cervisia.lsm +-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 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 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/kdesdk3/files/patch-scripts-Makefile.in b/devel/kdesdk3/files/patch-scripts-Makefile.in index c2d77d483697..8fcf11e8249f 100644 --- a/devel/kdesdk3/files/patch-scripts-Makefile.in +++ b/devel/kdesdk3/files/patch-scripts-Makefile.in @@ -1,6 +1,6 @@ ---- scripts/Makefile.in.orig Sat Feb 7 10:55:57 2004 -+++ scripts/Makefile.in Sat Feb 7 10:58:13 2004 -@@ -318,17 +318,6 @@ +--- 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 @@ -12,20 +12,18 @@ - cvsblame.1 \ - includemocs.1 - -- -CLEANFILES = $(man1_MANS) - # sorted alphabetically noinst_SCRIPTS = \ add_trace.pl alldcop.rb authors2xml.pl check_licenses colorcvs \ -@@ -397,52 +386,6 @@ +@@ -435,51 +425,6 @@ + distclean-libtool: -rm -f libtool uninstall-info-am: - --man1dir = $(mandir)/man1 -install-man1: $(man1_MANS) $(man_MANS) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(man1dir) +- 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 \ @@ -44,8 +42,8 @@ - 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; \ +- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ +- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ - done -uninstall-man1: - @$(NORMAL_UNINSTALL) @@ -65,14 +63,14 @@ - 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; \ +- echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ +- rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ - done tags: TAGS TAGS: -@@ -576,22 +519,6 @@ - uninstall-man uninstall-man1 +@@ -610,22 +555,6 @@ + uninstall-info-am uninstall-man uninstall-man1 -# it'd be too good if this worked everywhere ... diff --git a/devel/kdesdk3/pkg-plist b/devel/kdesdk3/pkg-plist index 66de7c788916..d85698980f0f 100644 --- a/devel/kdesdk3/pkg-plist +++ b/devel/kdesdk3/pkg-plist @@ -205,7 +205,7 @@ share/apps/kapptemplate/appframework/no-exe/INSTALL share/apps/kapptemplate/appframework/po-Makefile.am share/apps/kapptemplate/bin/mkinstalldirs share/apps/kapptemplate/existing/app-Makefile.am -share/apps/kapptemplate/existing/app.desktop +share/apps/kapptemplate/existing/app-desktop share/apps/kapptemplate/include/existing.module share/apps/kapptemplate/include/kapptemplate.common share/apps/kapptemplate/include/kapptemplate.module @@ -213,8 +213,8 @@ share/apps/kapptemplate/include/kpartapp.module share/apps/kapptemplate/include/kpartplugin.module share/apps/kapptemplate/kapp/app-Makefile.am share/apps/kapptemplate/kapp/app-configure.in.in +share/apps/kapptemplate/kapp/app-desktop share/apps/kapptemplate/kapp/app.cpp -share/apps/kapptemplate/kapp/app.desktop share/apps/kapptemplate/kapp/app.h share/apps/kapptemplate/kapp/app_client.cpp share/apps/kapptemplate/kapp/appiface.h @@ -240,11 +240,11 @@ share/apps/kapptemplate/kapp/no-exe/lo32-app-app.png share/apps/kapptemplate/kapp/pics-Makefile.am share/apps/kapptemplate/kpartapp/app-Makefile.am share/apps/kapptemplate/kpartapp/app-configure.in.in +share/apps/kapptemplate/kpartapp/app-desktop share/apps/kapptemplate/kpartapp/app.cpp -share/apps/kapptemplate/kpartapp/app.desktop share/apps/kapptemplate/kpartapp/app.h +share/apps/kapptemplate/kpartapp/app_part-desktop share/apps/kapptemplate/kpartapp/app_part.cpp -share/apps/kapptemplate/kpartapp/app_part.desktop share/apps/kapptemplate/kpartapp/app_part.h share/apps/kapptemplate/kpartapp/app_part.rc share/apps/kapptemplate/kpartapp/app_shell.rc @@ -271,6 +271,7 @@ share/apps/kapptemplate/kpartplugin/plugin_app.cpp share/apps/kapptemplate/kpartplugin/plugin_app.h share/apps/kapptemplate/kpartplugin/plugin_app.rc share/apps/kbabel/icons/hicolor/16x16/actions/autodiff.png +share/apps/kbabel/icons/hicolor/16x16/actions/catalogmanager.png share/apps/kbabel/icons/hicolor/16x16/actions/diff.png share/apps/kbabel/icons/hicolor/16x16/actions/insert_arg.png share/apps/kbabel/icons/hicolor/16x16/actions/insert_tag.png @@ -299,6 +300,7 @@ share/apps/kbabel/icons/hicolor/16x16/actions/syntax.png share/apps/kbabel/icons/hicolor/16x16/actions/togglefuzzy.png share/apps/kbabel/icons/hicolor/16x16/actions/transsearch.png share/apps/kbabel/icons/hicolor/22x22/actions/autodiff.png +share/apps/kbabel/icons/hicolor/22x22/actions/catalogmanager.png share/apps/kbabel/icons/hicolor/22x22/actions/diff.png share/apps/kbabel/icons/hicolor/22x22/actions/insert_arg.png share/apps/kbabel/icons/hicolor/22x22/actions/insert_tag.png @@ -323,6 +325,7 @@ share/apps/kbabel/icons/hicolor/22x22/actions/syntax.png share/apps/kbabel/icons/hicolor/22x22/actions/togglefuzzy.png share/apps/kbabel/icons/hicolor/22x22/actions/transsearch.png share/apps/kbabel/icons/hicolor/32x32/actions/autodiff.png +share/apps/kbabel/icons/hicolor/32x32/actions/catalogmanager.png share/apps/kbabel/icons/hicolor/32x32/actions/diff.png share/apps/kbabel/icons/hicolor/32x32/actions/insert_arg.png share/apps/kbabel/icons/hicolor/32x32/actions/insert_tag.png @@ -347,6 +350,7 @@ share/apps/kbabel/icons/hicolor/32x32/actions/syntax.png share/apps/kbabel/icons/hicolor/32x32/actions/togglefuzzy.png share/apps/kbabel/icons/hicolor/32x32/actions/transsearch.png share/apps/kbabel/icons/locolor/16x16/actions/autodiff.png +share/apps/kbabel/icons/locolor/16x16/actions/catalogmanager.png share/apps/kbabel/icons/locolor/16x16/actions/diff.png share/apps/kbabel/icons/locolor/16x16/actions/insert_arg.png share/apps/kbabel/icons/locolor/16x16/actions/insert_tag.png @@ -377,6 +381,7 @@ share/apps/kbabel/icons/locolor/16x16/actions/transsearch.png share/apps/kbabel/icons/locolor/22x22/actions/statistics.png share/apps/kbabel/icons/locolor/22x22/actions/syntax.png share/apps/kbabel/icons/locolor/32x32/actions/autodiff.png +share/apps/kbabel/icons/locolor/32x32/actions/catalogmanager.png share/apps/kbabel/icons/locolor/32x32/actions/diff.png share/apps/kbabel/icons/locolor/32x32/actions/insert_arg.png share/apps/kbabel/icons/locolor/32x32/actions/insert_tag.png @@ -506,11 +511,6 @@ 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/folder_green.png -share/apps/umbrello/pics/folder_green_open.png -share/apps/umbrello/pics/folder_grey.png -share/apps/umbrello/pics/folder_grey_open.png -share/apps/umbrello/pics/folder_home.png share/apps/umbrello/pics/fork.xpm share/apps/umbrello/pics/generalization.xpm share/apps/umbrello/pics/hline.xpm |